fix: reset isSearch flag when filters are empty (#3978)

webiny · Mar 6, 2024 · 044028b · 044028b
1 parent 1383e9e
commit 044028b
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/packages/app-aco/src/contexts/acoList.tsx b/packages/app-aco/src/contexts/acoList.tsx
@@ -293,7 +293,15 @@ export const AcoListProvider = ({ children, ...props }: AcoListProviderProps) =>
             setState({ searchQuery: query, after: undefined });
         },
         setFilters(data) {
-            setState({ filters: data, after: undefined });
+            // Create filters object excluding entries with `undefined` values
+            const filters = Object.fromEntries(
+                Object.entries(data).filter(([, value]) => value !== undefined)
+            );
+
+            setState({
+                filters: Object.keys(filters).length ? filters : undefined,
+                after: undefined
+            });
         },
         setListSort(sort: ListSearchRecordsSort) {
             setState({ listSort: sort, after: undefined });

diff --git a/...anager/src/modules/FileManagerRenderer/FileManagerViewProvider/FileManagerViewContext.tsx b/...anager/src/modules/FileManagerRenderer/FileManagerViewProvider/FileManagerViewContext.tsx
@@ -411,10 +411,15 @@ export const FileManagerViewProvider = ({ children, ...props }: FileManagerViewP
             }));
         },
         setFilters(data) {
+            // Create filters object excluding entries with `undefined` values
+            const filters = Object.fromEntries(
+                Object.entries(data).filter(([, value]) => value !== undefined)
+            );
+
             setState(state => ({
                 ...state,
                 selected: [],
-                filters: data,
+                filters: Object.keys(filters).length ? filters : undefined,
                 selection: {}
             }));
         },