handle filters when deleting kind/categories

piximi · Apr 16, 2024 · 06317ac · 06317ac
1 parent cc91c83
commit 06317ac
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 2 deletions.
diff --git a/src/store/imageViewer/imageViewerListeners.ts b/src/store/imageViewer/imageViewerListeners.ts
@@ -9,6 +9,7 @@ import {
   DecodedAnnotationObject,
   ImageObject,
 } from "store/data/types";
+import { difference, intersection } from "lodash";
 
 export const imageViewerMiddleware = createListenerMiddleware();
 const startAppListening =
@@ -124,3 +125,29 @@ startAppListening({
     listenerAPI.subscribe();
   },
 });
+
+startAppListening({
+  predicate: (action, currentState, previousState) => {
+    return (
+      currentState.newData.categories.ids.length <
+      previousState.newData.categories.ids.length
+    );
+  },
+  effect: async (action, listenerApi) => {
+    const { imageViewer, newData } = listenerApi.getState();
+    const { newData: oldData } = listenerApi.getOriginalState();
+    const deletedCategories = difference(
+      oldData.categories.ids,
+      newData.categories.ids
+    ) as string[];
+    const filteredCats = imageViewer.filters.categoryId;
+    const deletedFilters = intersection(filteredCats, deletedCategories);
+    if (deletedFilters.length > 0) {
+      listenerApi.dispatch(
+        imageViewerSlice.actions.removeFilters({
+          categoryIds: deletedFilters,
+        })
+      );
+    }
+  },
+});
diff --git a/src/store/project/projectListeners.ts b/src/store/project/projectListeners.ts
@@ -6,6 +6,8 @@ import { classifierSlice } from "store/classifier";
 import { segmenterSlice } from "store/segmenter";
 import { imageViewerSlice } from "store/imageViewer";
 import { newDataSlice } from "store/data";
+import { difference, intersection } from "lodash";
+import { dataSlice } from "store/data/dataSlice";
 
 export const projectMiddleware = createListenerMiddleware();
 const startAppListening =
@@ -43,3 +45,69 @@ startAppListening({
     listenerApi.subscribe();
   },
 });
+
+startAppListening({
+  actionCreator: projectSlice.actions.resetProject,
+  effect: (action, listenerAPI) => {
+    listenerAPI.dispatch(newDataSlice.actions.resetData());
+    listenerAPI.dispatch(annotatorSlice.actions.resetAnnotator());
+    listenerAPI.dispatch(classifierSlice.actions.resetClassifier());
+    listenerAPI.dispatch(segmenterSlice.actions.resetSegmenter());
+    listenerAPI.dispatch(imageViewerSlice.actions.resetImageViewer());
+  },
+});
+
+startAppListening({
+  predicate: (action, currentState, previousState) => {
+    return (
+      currentState.newData.categories.ids.length <
+      previousState.newData.categories.ids.length
+    );
+  },
+  effect: async (action, listenerApi) => {
+    const { project, newData } = listenerApi.getState();
+    const { newData: oldData } = listenerApi.getOriginalState();
+    const deletedCategories = difference(
+      oldData.categories.ids,
+      newData.categories.ids
+    ) as string[];
+    const filters = project.thingFilters;
+    for (let kind in filters) {
+      const filteredCats = filters[kind].categoryId;
+      const deletedFilters = intersection(filteredCats, deletedCategories);
+      if (deletedFilters.length > 0) {
+        listenerApi.dispatch(
+          projectSlice.actions.removeThingCategoryFilters({
+            categoryIds: deletedFilters,
+            kinds: [kind],
+          })
+        );
+      }
+    }
+  },
+});
+
+startAppListening({
+  actionCreator: dataSlice.actions.deleteKind,
+  effect: async (action, listenerApi) => {
+    const { newData } = listenerApi.getState();
+    const { newData: oldData } = listenerApi.getOriginalState();
+    const deletedKinds = difference(
+      oldData.kinds.ids,
+      newData.kinds.ids
+    ) as string[];
+
+    listenerApi.dispatch(
+      projectSlice.actions.removeThingCategoryFilters({
+        categoryIds: "all",
+        kinds: deletedKinds,
+      })
+    );
+    listenerApi.dispatch(
+      projectSlice.actions.removeThingPartitionFilters({
+        partitions: "all",
+        kinds: deletedKinds,
+      })
+    );
+  },
+});
diff --git a/src/store/project/projectSlice.ts b/src/store/project/projectSlice.ts
@@ -137,13 +137,18 @@ export const projectSlice = createSlice({
         if (!(kind in state.thingFilters)) continue;
         if (categoryIds === "all") {
           state.thingFilters[kind].categoryId = [];
-          return;
         } else {
           mutatingFilter(
             state.thingFilters[kind].categoryId,
             (id) => !categoryIds!.includes(id)
           );
         }
+        if (
+          state.thingFilters[kind].categoryId.length === 0 &&
+          state.thingFilters[kind].partition.length === 0
+        ) {
+          delete state.thingFilters[kind];
+        }
       }
     },
     addThingPartitionFilters(
@@ -183,13 +188,18 @@ export const projectSlice = createSlice({
         if (!(kind in state.thingFilters)) continue;
         if (partitions === "all") {
           state.thingFilters[kind].partition = [];
-          return;
         } else {
           mutatingFilter(
             state.thingFilters[kind].partition,
             (id) => !partitions.includes(id)
           );
         }
+        if (
+          state.thingFilters[kind].partition.length === 0 &&
+          state.thingFilters[kind].categoryId.length === 0
+        ) {
+          delete state.thingFilters[kind];
+        }
       }
     },
   },