From c76598b7105e31e24ae771a839e63c27d787d3ed Mon Sep 17 00:00:00 2001
From: dg314 <david_grossman@brown.edu>
Date: Thu, 24 Jun 2021 04:54:33 -0400
Subject: removed search db option

---
 src/client/views/search/SearchBox.tsx | 44 ++++-------------------------------
 1 file changed, 4 insertions(+), 40 deletions(-)

(limited to 'src')

diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx
index 5c168d8a9..b722868d6 100644
--- a/src/client/views/search/SearchBox.tsx
+++ b/src/client/views/search/SearchBox.tsx
@@ -63,7 +63,6 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
     @observable _deletedDocsStatus: boolean = false;
     @observable _onlyAliases: boolean = true;
     @observable _searchbarOpen = false;
-    @observable _searchFullDB = "DB"; // "DB" means searh the entire database.  "My Stuff" adds a flag that selects only documents that the current user has authored
     @observable _noResults = "";
     @observable _pageStart = 0;
     @observable open = false;
@@ -112,7 +111,7 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
         if (!e || e.key === "Enter") {
             this.layoutDoc._searchString = this.newsearchstring;
             this._pageStart = 0;
-            this.open = StrCast(this.layoutDoc._searchString) !== "" || this._searchFullDB !== "DB";
+            this.open = true;
             this.submitSearch();
         }
     });
@@ -265,17 +264,16 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
         this.children = 0;
         let query = StrCast(this.layoutDoc._searchString);
         Doc.SetSearchQuery(query);
-        this._searchFullDB && (query = this.getFinalQuery(query));
         this._results = [];
         this._resultsSet.clear();
         this._visibleElements = [];
         this._visibleDocuments = [];
 
-        if (query || this._searchFullDB === "My Stuff") {
+        if (query) {
             this._endIndex = 12;
             this._maxSearchIndex = 0;
             this._numTotalResults = -1;
-            this._searchFullDB ? await this.searchDatabase(query) : this.searchCollection(query);
+            this.searchCollection(query);
             runInAction(() => {
                 this.open = this._searchbarOpen = true;
                 this.resultsScrolled();
@@ -289,7 +287,7 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
 
     private get filterQuery() {
         const baseExpr = "NOT system_b:true";
-        const authorExpr = this._searchFullDB === "My Stuff" ? ` author_t:${Doc.CurrentUserEmail}` : undefined;
+        const authorExpr = undefined;
         const includeDeleted = this._deletedDocsStatus ? "" : " NOT deleted_b:true";
         const typeExpr = this._onlyAliases ? "NOT {!join from=id to=proto_i}type_t:*" : `(type_t:* OR {!join from=id to=proto_i}type_t:*) ${this._blockedTypes.map(type => `NOT ({!join from=id to=proto_i}type_t:${type}) AND NOT type_t:${type}`).join(" AND ")}`;
         // fq: type_t:collection OR {!join from=id to=proto_i}type_t:collection   q:text_t:hello
@@ -471,39 +469,6 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
     returnHeight = () => NumCast(this.layoutDoc._height);
     returnLength = () => Math.min(window.innerWidth, 51 + 205 * Cast(this.props.Document._schemaHeaders, listSpec(SchemaHeaderField), []).length);
 
-    @action
-    changeSearchScope = (scope: string) => {
-        this.docsforfilter = undefined;
-        this.setSearchFilter(this.currentSelectedCollection, undefined);
-        this._searchFullDB = scope;
-        this.dataDoc[this.fieldKey] = new List<Doc>([]);
-        this.submitSearch();
-    }
-
-    @computed get scopeButtons() {
-        return <div style={{ height: 25, paddingLeft: "4px", paddingRight: "4px" }}>
-            <form className="beta" style={{ justifyContent: "space-evenly", display: "flex" }}>
-                <div style={{ display: "contents" }}>
-                    <div className="radio" style={{ margin: 0 }}>
-                        <label style={{ fontSize: 12, marginTop: 6 }} >
-                            <input type="radio" style={{ marginLeft: -16, marginTop: -1 }} checked={!this._searchFullDB} onChange={() => this.changeSearchScope("")} />
-                            Dashboard
-                        </label>
-                    </div>
-                    <div className="radio" style={{ margin: 0 }}>
-                        <label style={{ fontSize: 12, marginTop: 6 }} >
-                            <input type="radio" style={{ marginLeft: -16, marginTop: -1 }} checked={this._searchFullDB?.length ? true : false} onChange={() => this.changeSearchScope("DB")} />
-                            DB
-                            <span onClick={action(() => this._searchFullDB = this._searchFullDB === "My Stuff" ? "DB" : "My Stuff")}>
-                                {this._searchFullDB === "My Stuff" ? "(me)" : "(full)"}
-                            </span>
-                        </label>
-                    </div>
-                </div>
-            </form>
-        </div>;
-    }
-
     setSearchFilter = action((collectionView: { props: { Document: Doc } }, docsForFilter: Doc[] | undefined) => {
         if (collectionView) {
             const docFilters = Cast(this.props.Document._docFilters, listSpec("string"), null);
@@ -564,7 +529,6 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
                                     </div>
                                 </Tooltip>
                             </div>}
-                            {this.scopeButtons}
                         </div>
                     </div >
                 </div >
-- 
cgit v1.2.3-70-g09d2