From 6c75ce281ee9c6d3f660817aba579ddc43f334c2 Mon Sep 17 00:00:00 2001
From: Darin Kelkhoff <darin.kelkhoff@gmail.com>
Date: Tue, 30 Jan 2024 09:56:31 -0600
Subject: [PATCH] CE-793 - pre-code-review cleanups

---
 .../query/BasicAndAdvancedQueryControls.tsx         |  2 +-
 src/qqq/pages/records/query/RecordQuery.tsx         | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/qqq/components/query/BasicAndAdvancedQueryControls.tsx b/src/qqq/components/query/BasicAndAdvancedQueryControls.tsx
index beef1dc..b43dc6f 100644
--- a/src/qqq/components/query/BasicAndAdvancedQueryControls.tsx
+++ b/src/qqq/components/query/BasicAndAdvancedQueryControls.tsx
@@ -550,7 +550,7 @@ const BasicAndAdvancedQueryControls = forwardRef((props: BasicAndAdvancedQueryCo
                                     handleFieldChange={(e, newValue, reason) => addQuickFilterField(newValue, reason)}
                                     autoFocus={true}
                                     forceOpen={Boolean(addQuickFilterMenu)}
-                                    hiddenFieldNames={[...defaultQuickFilterFieldNames, ...quickFilterFieldNames]}
+                                    hiddenFieldNames={[...(defaultQuickFilterFieldNames??[]), ...(quickFilterFieldNames??[])]}
                                  />
                               </Box>
                            </Menu>
diff --git a/src/qqq/pages/records/query/RecordQuery.tsx b/src/qqq/pages/records/query/RecordQuery.tsx
index 005f114..0a66e1d 100644
--- a/src/qqq/pages/records/query/RecordQuery.tsx
+++ b/src/qqq/pages/records/query/RecordQuery.tsx
@@ -1134,7 +1134,7 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
 
       setRowsPerPage(view.rowsPerPage ?? defaultRowsPerPage);
       setMode(view.mode ?? defaultMode);
-      setQuickFilterFieldNames(view.quickFilterFieldNames) // todo not i think ?? getDefaultQuickFilterFieldNames(tableMetaData));
+      setQuickFilterFieldNames(view.quickFilterFieldNames ?? []) // todo not i think ?? getDefaultQuickFilterFieldNames(tableMetaData));
 
       //////////////////////////////////////////////////////////////////////////////////////////////////
       // do this last - in case anything in the view got modified in any of those other doSet methods //
@@ -1227,10 +1227,11 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
 
    /*******************************************************************************
     ** Event handler from BasicAndAdvancedQueryControls for when quickFilterFields change
+    ** or other times we need to change them (e.g., activating a view)
     *******************************************************************************/
-   const doSetQuickFilterFieldNames = (names: string[]) =>
+   const doSetQuickFilterFieldNames = (names: string[]): void =>
    {
-      setQuickFilterFieldNames([...names]);
+      setQuickFilterFieldNames([...(names ?? [])]);
 
       view.quickFilterFieldNames = names;
       doSetView(view)
@@ -1501,10 +1502,14 @@ function RecordQuery({table, launchProcess}: Props): JSX.Element
          // go back to a default query filter for the table //
          /////////////////////////////////////////////////////
          doSetQueryFilter(new QQueryFilter());
-         // todo not i think doSetQuickFilterFieldNames(getDefaultQuickFilterFieldNames(tableMetaData));
 
          const queryColumns = QQueryColumns.buildDefaultForTable(tableMetaData);
          doSetQueryColumns(queryColumns)
+
+         /////////////////////////////////////////////////////
+         // also reset the (user-added) quick-filter fields //
+         /////////////////////////////////////////////////////
+         doSetQuickFilterFieldNames([]);
       }
    }