From a37cdb9d11271a28b0d9265fcb598747a6a0074a Mon Sep 17 00:00:00 2001
From: Andy Rickert <andrew_rickert@brown.edu>
Date: Wed, 12 Aug 2020 16:33:59 -0400
Subject: f

---
 src/client/views/search/SearchBox.tsx | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'src/client/views/search')

diff --git a/src/client/views/search/SearchBox.tsx b/src/client/views/search/SearchBox.tsx
index 2e2e87092..da3bafa95 100644
--- a/src/client/views/search/SearchBox.tsx
+++ b/src/client/views/search/SearchBox.tsx
@@ -168,7 +168,6 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
                 result[0].searchMatch = undefined;
             });
 
-            this.props.Document._schemaHeaders = new List<SchemaHeaderField>([]);
             if (this.currentSelectedCollection !== undefined) {
                 this.currentSelectedCollection.props.Document._searchDocs = new List<Doc>([]);
                 this.currentSelectedCollection = undefined;
@@ -805,12 +804,21 @@ export class SearchBox extends ViewBoxBaseComponent<FieldViewProps, SearchBoxDoc
 
             }
         }
-        const schemaheaders: SchemaHeaderField[] = [];
         this.headerscale = headers.size;
-        headers.forEach((item) => schemaheaders.push(new SchemaHeaderField(item, "#f1efeb")));
-        this.headercount = schemaheaders.length;
         if (Cast(this.props.Document._docFilters, listSpec("string"), []).length === 0) {
-            this.props.Document._schemaHeaders = new List<SchemaHeaderField>(schemaheaders);
+            const oldSchemaHeaders = Cast(this.props.Document._schemaHeaders, listSpec("string"), []);
+            if (oldSchemaHeaders?.length && typeof oldSchemaHeaders[0] !== "object") {
+                const newSchemaHeaders = oldSchemaHeaders.map(i => typeof i === "string" ? new SchemaHeaderField(i, "#f1efeb") : i);
+                headers.forEach(header => {
+                    if (oldSchemaHeaders.includes(header) === false) {
+                        newSchemaHeaders.push(new SchemaHeaderField(header, "#f1efeb"))
+                    }
+                });
+                this.headercount = newSchemaHeaders.length;
+                this.props.Document._schemaHeaders = new List<SchemaHeaderField>(newSchemaHeaders);
+            } else if (this.props.Document._schemaHeaders === undefined) {
+                this.props.Document._schemaHeaders = new List<SchemaHeaderField>([new SchemaHeaderField("title", "#f1efeb")]);
+            }
         }
         if (this._maxSearchIndex >= this._numTotalResults) {
             this._visibleElements.length = this._results.length;
-- 
cgit v1.2.3-70-g09d2