Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web

1 files changed, 21 insertions, 7 deletions

diff --git a/src/client/util/SearchUtil.ts b/src/client/util/SearchUtil.ts
index 27d27a3b8..ac2eb72e7 100644
--- a/src/client/util/SearchUtil.ts
+++ b/src/client/util/SearchUtil.ts
@@ -4,27 +4,41 @@ import { Doc } from '../../new_fields/Doc';
 import { Id } from '../../new_fields/FieldSymbols';
 
 export namespace SearchUtil {
-    export function Search(query: string, returnDocs: true): Promise<Doc[]>;
-    export function Search(query: string, returnDocs: false): Promise<string[]>;
+    export interface IdSearchResult {
+        ids: string[];
+        numFound: number;
+    }
+
+    export interface DocSearchResult {
+        docs: Doc[];
+        numFound: number;
+    }
+
+    export function Search(query: string, returnDocs: true): Promise<DocSearchResult>;
+    export function Search(query: string, returnDocs: false): Promise<IdSearchResult>;
     export async function Search(query: string, returnDocs: boolean) {
-        const ids = JSON.parse(await rp.get(DocServer.prepend("/search"), {
+        const result: IdSearchResult = JSON.parse(await rp.get(DocServer.prepend("/search"), {
             qs: { query }
         }));
         if (!returnDocs) {
-            return ids;
+            return result;
         }
+        const { ids, numFound } = result;
         const docMap = await DocServer.GetRefFields(ids);
-        return ids.map((id: string) => docMap[id]).filter((doc: any) => doc instanceof Doc);
+        const docs = ids.map((id: string) => docMap[id]).filter((doc: any) => doc instanceof Doc);
+        return { docs, numFound };
     }
 
     export async function GetAliasesOfDocument(doc: Doc): Promise<Doc[]> {
         const proto = await Doc.GetT(doc, "proto", Doc, true);
         const protoId = (proto || doc)[Id];
-        return Search(`proto_i:"${protoId}"`, true);
+        const result = await Search(`proto_i:"${protoId}"`, true);
+        return result.docs;
         // return Search(`{!join from=id to=proto_i}id:${protoId}`, true);
     }
 
     export async function GetViewsOfDocument(doc: Doc): Promise<Doc[]> {
-        return Search(`proto_i:"${doc[Id]}"`, true);
+        const results = await Search(`proto_i:"${doc[Id]}"`, true);
+        return results.docs;
     }
 }
\ No newline at end of file