[Discover] Moved breakdown field to URL app state instead of local st…

…orage
davismcphee · Nov 2, 2022 · 017a7cb · 017a7cb
1 parent 838445c
commit 017a7cb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts b/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts
@@ -212,21 +212,20 @@ export const useDiscoverHistogram = ({
    * Breakdown
    */
 
-  const [field, setField] = useState(() => {
-    const fieldName = storage.get(HISTOGRAM_BREAKDOWN_FIELD_KEY);
-    return dataView.getFieldByName(fieldName);
-  });
-
   const onBreakdownFieldChange = useCallback(
     (breakdownField: DataViewField | undefined) => {
-      storage.set(HISTOGRAM_BREAKDOWN_FIELD_KEY, breakdownField?.name);
-      setField(breakdownField);
+      stateContainer.setAppState({ breakdownField: breakdownField?.name });
     },
-    [storage]
+    [stateContainer]
+  );
+
+  const field = useMemo(
+    () => (state.breakdownField ? dataView.getFieldByName(state.breakdownField) : undefined),
+    [dataView, state.breakdownField]
   );
 
   const breakdown = useMemo(
-    () => (isPlainRecord || !isTimeBased ? undefined : { field }),
+    () => (isPlainRecord || !isTimeBased || !field ? undefined : { field }),
     [field, isPlainRecord, isTimeBased]
   );
 

diff --git a/src/plugins/discover/public/application/main/services/discover_state.ts b/src/plugins/discover/public/application/main/services/discover_state.ts
@@ -98,6 +98,10 @@ export interface AppState {
    * Number of rows in the grid per page
    */
   rowsPerPage?: number;
+  /**
+   * Current histogram breakdown field name
+   */
+  breakdownField?: string;
 }
 
 export interface AppStateUrl extends Omit<AppState, 'sort'> {

diff --git a/src/plugins/discover/public/application/main/utils/get_state_defaults.ts b/src/plugins/discover/public/application/main/utils/get_state_defaults.ts
@@ -70,6 +70,7 @@ export function getStateDefaults({
     rowHeight: undefined,
     rowsPerPage: undefined,
     grid: undefined,
+    breakdownField: undefined,
   };
   if (savedSearch.grid) {
     defaultState.grid = savedSearch.grid;