Fix combining regular and advanced filters

twentyhq · Oct 18, 2024 · cbb4b6b · cbb4b6b
1 parent 109a283
commit cbb4b6b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/packages/twenty-front/src/modules/views/hooks/useUpsertCombinedViewFilters.ts b/packages/twenty-front/src/modules/views/hooks/useUpsertCombinedViewFilters.ts
@@ -76,7 +76,8 @@ export const useUpsertCombinedViewFilters = (viewBarComponentId?: string) => {
         if (isDefined(matchingFilterInUnsavedFilters)) {
           const updatedFilters = unsavedToUpsertViewFilters.map((viewFilter) =>
             viewFilter.fieldMetadataId ===
-            matchingFilterInUnsavedFilters.fieldMetadataId
+              matchingFilterInUnsavedFilters.fieldMetadataId &&
+            !viewFilter.viewFilterGroupId
               ? { ...viewFilter, ...upsertedFilter, id: viewFilter.id }
               : viewFilter,
           );

diff --git a/packages/twenty-front/src/modules/views/utils/getCombinedViewFilters.ts b/packages/twenty-front/src/modules/views/utils/getCombinedViewFilters.ts
@@ -9,24 +9,19 @@ export const getCombinedViewFilters = (
   const toCreateViewFilters = toUpsertViewFilters.filter(
     (toUpsertViewFilter) =>
       !viewFilters.some(
-        (viewFilter) =>
-          viewFilter.fieldMetadataId === toUpsertViewFilter.fieldMetadataId,
+        (viewFilter) => viewFilter.id === toUpsertViewFilter.id,
       ),
   );
 
   const toUpdateViewFilters = toUpsertViewFilters.filter((toUpsertViewFilter) =>
-    viewFilters.some(
-      (viewFilter) =>
-        viewFilter.fieldMetadataId === toUpsertViewFilter.fieldMetadataId,
-    ),
+    viewFilters.some((viewFilter) => viewFilter.id === toUpsertViewFilter.id),
   );
 
   const combinedViewFilters = viewFilters
     .filter((viewFilter) => !toDeleteViewFilterIds.includes(viewFilter.id))
     .map((viewFilter) => {
       const toUpdateViewFilter = toUpdateViewFilters.find(
-        (toUpdateViewFilter) =>
-          toUpdateViewFilter.fieldMetadataId === viewFilter.fieldMetadataId,
+        (toUpdateViewFilter) => toUpdateViewFilter.id === viewFilter.id,
       );
 
       return toUpdateViewFilter ?? viewFilter;