feat(admin-ui): Preset filters should preserve query parameters

vendure-ecommerce · Nov 9, 2024 · d41f30a · d41f30a
1 parent 19d9f2a
commit d41f30a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/.../src/shared/components/data-table-filter-presets/data-table-filter-presets.component.html b/.../src/shared/components/data-table-filter-presets/data-table-filter-presets.component.html
@@ -19,7 +19,7 @@
             </div>
             <a
                 [routerLink]="['./']"
-                [queryParams]="preset.value === serializedActiveFilters ? {} : { filters: preset.value, page: 1 }"
+                [queryParams]="getQueryParamsForPreset(preset.value, serializedActiveFilters)"
             >
                 <div>{{ preset.name }}</div>
             </a>

diff --git a/...re/src/shared/components/data-table-filter-presets/data-table-filter-presets.component.ts b/...re/src/shared/components/data-table-filter-presets/data-table-filter-presets.component.ts
@@ -53,6 +53,23 @@ export class DataTableFilterPresetsComponent implements OnInit, OnDestroy {
         );
     }
 
+    getQueryParamsForPreset(preset: string, serializedActiveFilters: string): Record<string, string> {
+        // Clone the current query params to avoid mutating them directly
+        const currentParams = { ...this.route.snapshot.queryParams };
+
+        if (preset === serializedActiveFilters) {
+            // Toggling off: remove 'filters' and 'page' params
+            delete currentParams['filters'];
+            delete currentParams['page'];
+        } else {
+            // Toggling on: set 'filters' and 'page' params
+            currentParams['filters'] = preset;
+            currentParams['page'] = 1;
+        }
+
+        return currentParams;
+    }
+
     ngOnDestroy() {
         this.destroy$.next();
         this.destroy$.complete();