combine coveredqueries data into an obj

Author: rubydong

packages/compass-indexes/src/components/create-index-form/index-flow-section.tsx

@@ -115,9 +115,11 @@ export type IndexFlowSectionProps = {
     optimalQueries,
     showCoveredQueries,
   }: CoveredQueriesFetchedProps) => void;
-  coveredQueries: JSX.Element | null;
-  optimalQueries: string | JSX.Element | null;
-  showCoveredQueries: boolean;
+  coveredQueriesObj: {
+    coveredQueries: JSX.Element | null;
+    optimalQueries: string | JSX.Element | null;
+    showCoveredQueries: boolean;
+  };
   hasIndexFieldChanges: boolean;
 };
 
@@ -207,9 +209,8 @@ const IndexFlowSection = ({
   onErrorEncountered,
   onErrorCleared,
   onCoveredQueriesFetched,
-  coveredQueries,
-  optimalQueries,
-  showCoveredQueries,
+  coveredQueriesObj,
+
   hasIndexFieldChanges,
 }: IndexFlowSectionProps) => {
   const darkMode = useDarkMode();
@@ -260,6 +261,9 @@ const IndexFlowSection = ({
     onErrorCleared();
   }, [fields, onErrorCleared]);
 
+  const { coveredQueries, optimalQueries, showCoveredQueries } =
+    coveredQueriesObj;
+
   return (
     <div>
       <div
@@ -423,16 +427,9 @@ const IndexFlowSection = ({
 };
 
 const mapState = ({ createIndex }: RootState) => {
-  const {
-    coveredQueries,
-    optimalQueries,
-    showCoveredQueries,
-    hasIndexFieldChanges,
-  } = createIndex;
+  const { coveredQueriesObj, hasIndexFieldChanges } = createIndex;
   return {
-    coveredQueries,
-    optimalQueries,
-    showCoveredQueries,
+    coveredQueriesObj,
     hasIndexFieldChanges,
   };
 };

packages/compass-indexes/src/modules/create-index.tsx

@@ -323,14 +323,12 @@ export type State = {
   // to determine whether there has been new query changes since user last pressed the button
   hasQueryChanges: boolean;
 
-  // covered queries for the index flow
-  coveredQueries: JSX.Element | null;
-
-  // optimal queries for the index flow
-  optimalQueries: string | JSX.Element | null;
-
-  // to determine whether to show the covered queries or not
-  showCoveredQueries: boolean;
+  // covered queries obj for the index flow
+  coveredQueriesObj: {
+    coveredQueries: JSX.Element | null;
+    optimalQueries: string | JSX.Element | null;
+    showCoveredQueries: boolean;
+  };
 
   // to determine whether there has been new index field changes since user last pressed the button
   hasIndexFieldChanges: boolean;
@@ -352,9 +350,11 @@ export const INITIAL_STATE: State = {
   hasQueryChanges: false,
 
   // Index flow
-  coveredQueries: null,
-  optimalQueries: null,
-  showCoveredQueries: false,
+  coveredQueriesObj: {
+    coveredQueries: null,
+    optimalQueries: null,
+    showCoveredQueries: false,
+  },
   hasIndexFieldChanges: false,
 };
 
@@ -866,9 +866,11 @@ const reducer: Reducer<State, Action> = (state = INITIAL_STATE, action) => {
   ) {
     return {
       ...state,
-      coveredQueries: action.coveredQueries,
-      optimalQueries: action.optimalQueries,
-      showCoveredQueries: action.showCoveredQueries,
+      coveredQueriesObj: {
+        coveredQueries: action.coveredQueries,
+        optimalQueries: action.optimalQueries,
+        showCoveredQueries: action.showCoveredQueries,
+      },
       hasIndexFieldChanges: false,
     };
   }