merge

2 files changed, 22 insertions, 21 deletions

diff --git a/src/client/views/search/SearchBox.scss b/src/client/views/search/SearchBox.scss
index 09e459f7d..94e64b952 100644
--- a/src/client/views/search/SearchBox.scss
+++ b/src/client/views/search/SearchBox.scss
@@ -8,6 +8,7 @@
     background: none;
     z-index: 1000;
     padding: 0px;
+    overflow: auto;
     cursor: default;
 
     .searchBox-bar {
diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx
index 4d29573d4..0b664beaa 100644
--- a/src/client/views/search/SearchBox.tsx
+++ b/src/client/views/search/SearchBox.tsx
@@ -3,7 +3,7 @@ import { action, computed, makeObservable, observable } from 'mobx';
 import { observer } from 'mobx-react';
 import * as React from 'react';
 import { Doc, DocListCastAsync, Field } from '../../../fields/Doc';
-import { DirectLinks } from '../../../fields/DocSymbols';
+import { DirectLinks, DocData } from '../../../fields/DocSymbols';
 import { Id } from '../../../fields/FieldSymbols';
 import { DocCast, StrCast } from '../../../fields/Types';
 import { DocumentType } from '../../documents/DocumentTypes';
@@ -55,10 +55,7 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
     @observable _deletedDocsStatus: boolean = false;
     @observable _onlyEmbeddings: boolean = true;
 
-    /**
-     * This is the constructor for the SearchBox class.
-     */
-    constructor(props: any) {
+    constructor(props: SearchBoxProps) {
         super(props);
         makeObservable(this);
         SearchBox.Instance = this;
@@ -69,11 +66,11 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
      * the search panel, the search input box is automatically selected. This allows the user to
      * type in the search input box immediately, without needing clicking on it first.
      */
-    componentDidMount = action(() => {
+    componentDidMount() {
         if (this._inputRef.current) {
             this._inputRef.current.focus();
         }
-    });
+    }
 
     /**
      * This method is called when the SearchBox component is about to be unmounted. When the user
@@ -165,12 +162,13 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
      * which the first letter is capitalized. This is used when displaying the type on the
      * right side of each search result.
      */
-    static formatType(type: String): String {
-        if (type === 'pdf') {
-            return 'PDF';
-        } else if (type === 'image') {
-            return 'Img';
-        }
+    static formatType(type: string, colType: string): String {
+        switch (type) {
+            case DocumentType.PDF : return 'PDF';
+            case DocumentType.IMG : return 'Img';
+            case DocumentType.RTF : return 'Rtf';
+            case DocumentType.COL : return 'Col:'+colType.substring(0,3);
+        } // prettier-ignore
 
         return type.charAt(0).toUpperCase() + type.substring(1, 3);
     }
@@ -186,7 +184,7 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
     @action
     searchCollection(query: string) {
         this._selectedResult = undefined;
-        this._results = SearchUtil.SearchCollection(CollectionDockingView.Instance?.Document, query);
+        this._results = SearchUtil.SearchCollection(CollectionDockingView.Instance?.Document, query, this._docTypeString === 'keys');
 
         this.computePageRanks();
     }
@@ -207,7 +205,7 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
         this._results.forEach((_, doc) => {
             this._pageRanks.set(doc, 1.0 / this._results.size);
 
-            if (Doc.GetProto(doc)[DirectLinks].size === 0) {
+            if (doc[DocData][DirectLinks].size === 0) {
                 this._linkedDocsOut.set(doc, new Set(this._results.keys()));
 
                 this._results.forEach((_, linkedDoc) => {
@@ -216,7 +214,7 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
             } else {
                 const linkedDocSet = new Set<Doc>();
 
-                Doc.GetProto(doc)[DirectLinks].forEach(link => {
+                doc[DocData][DirectLinks].forEach(link => {
                     const d1 = link?.link_anchor_1 as Doc;
                     const d2 = link?.link_anchor_2 as Doc;
                     if (doc === d1 && this._results.has(d2)) {
@@ -360,11 +358,11 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
      */
     @computed
     public get selectOptions() {
-        const selectValues = ['all', DocumentType.RTF, DocumentType.IMG, DocumentType.PDF, DocumentType.WEB, DocumentType.VID, DocumentType.AUDIO, DocumentType.COL];
+        const selectValues = ['all', DocumentType.RTF, DocumentType.IMG, DocumentType.PDF, DocumentType.WEB, DocumentType.VID, DocumentType.AUDIO, DocumentType.COL, 'keys'];
 
         return selectValues.map(value => (
             <option key={value} value={value}>
-                {SearchBox.formatType(value)}
+                {SearchBox.formatType(value, '')}
             </option>
         ));
     }
@@ -390,10 +388,10 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
                 className += ' searchBox-results-scroll-view-result-selected';
             }
 
-            const formattedType = SearchBox.formatType(StrCast(result[0].type));
+            const formattedType = SearchBox.formatType(StrCast(result[0].type), StrCast(result[0].type_collection));
             const title = result[0].title;
 
-            if (this._docTypeString === 'all' || this._docTypeString === result[0].type) {
+            if (this._docTypeString === 'keys' || this._docTypeString === 'all' || this._docTypeString === result[0].type) {
                 validResults++;
                 resultsJSX.push(
                     <Tooltip key={result[0][Id]} placement={'right'} title={<div className="dash-tooltip">{title as string}</div>}>
@@ -415,7 +413,9 @@ export class SearchBox extends ViewBoxBaseComponent<SearchBoxProps>() {
                             }}
                             className={className}>
                             <div className="searchBox-result-title">{title as string}</div>
-                            <div className="searchBox-result-type">{formattedType}</div>
+                            <div className="searchBox-result-type" style={{ color: SettingsManager.userVariantColor }}>
+                                {formattedType}
+                            </div>
                             <div className="searchBox-result-keys" style={{ color: SettingsManager.userVariantColor }}>
                                 {result[1].join(', ')}
                             </div>