Merge pull request #2271 from voxel51/sidebar-reset

Sidebar resets
voxel51 · Nov 9, 2022 · 88737bc · 88737bc
2 parents dd201fc + d789f5c
commit 88737bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/app/packages/state/src/hooks/useStateUpdate.ts b/app/packages/state/src/hooks/useStateUpdate.ts
@@ -100,23 +100,19 @@ const useStateUpdate = () => {
         dataset.evaluations = Object.values(dataset.evaluations || {});
         dataset.sampleFields = collapseFields(dataset.sampleFields);
         dataset.frameFields = collapseFields(dataset.frameFields);
+        const previousDataset = get(datasetAtom);
 
         const currentSidebar = get(sidebarGroupsDefinition(false));
-        const groups = resolveGroups(dataset, currentSidebar);
-
-        if (JSON.stringify(groups) !== JSON.stringify(currentSidebar)) {
-          set(sidebarGroupsDefinition(false), groups);
-          set(aggregationsTick, get(aggregationsTick) + 1);
-        }
+        let groups = resolveGroups(dataset, currentSidebar);
 
-        const previousDataset = get(datasetAtom);
         if (
           !previousDataset ||
           previousDataset.id !== dataset.id ||
           dataset.groupSlice !== previousDataset.groupSlice
         ) {
           if (dataset?.name !== previousDataset?.name) {
             reset(sidebarMode(false));
+            groups = resolveGroups(dataset);
           }
           reset(_activeFields({ modal: false }));
           let slice = dataset.groupSlice;
@@ -141,6 +137,9 @@ const useStateUpdate = () => {
           reset(filters);
         }
 
+        if (JSON.stringify(groups) !== JSON.stringify(currentSidebar)) {
+          set(sidebarGroupsDefinition(false), groups);
+        }
         set(datasetAtom, dataset);
       }
 

diff --git a/app/packages/state/src/recoil/sidebar.ts b/app/packages/state/src/recoil/sidebar.ts
@@ -214,11 +214,12 @@ export const resolveGroups = (
 ): State.SidebarGroup[] => {
   let groups = dataset?.appConfig?.sidebarGroups;
 
-  const expanded = current.reduce((map, { name, expanded }) => {
-    map[name] = expanded;
-    return map;
-  }, {});
-
+  const expanded = current
+    ? current.reduce((map, { name, expanded }) => {
+        map[name] = expanded;
+        return map;
+      }, {})
+    : {};
   if (!groups) {
     groups = dataset.frameFields.length
       ? DEFAULT_VIDEO_GROUPS