Merge pull request #1010 from Vlad0n20/fix/ENG-11333

feat(ENG-11333): fix selected filters from overriding default filters

Author: adlius

src/app/shared/stores/global-search/global-search.state.spec.ts

@@ -20,7 +20,9 @@ import {
   FetchResources,
   LoadFilterOptions,
   LoadFilterOptionsAndSetValues,
+  SetDefaultFilterValue,
   SetExtraFilters,
+  UpdateSelectedFilterOption,
 } from './global-search.actions';
 import { GlobalSearchSelectors } from './global-search.selectors';
 import { GlobalSearchState } from './global-search.state';
@@ -239,4 +241,27 @@ describe('GlobalSearchState', () => {
       ]);
     });
   });
+
+  describe('SetDefaultFilterValue', () => {
+    it('should include the default filter in the API call', () => {
+      const { store, mockGetResources } = setup();
+
+      store.dispatch(new SetDefaultFilterValue('defaultKey', 'default-value'));
+      store.dispatch(new FetchResources());
+
+      const params = mockGetResources.mock.calls[0][0];
+      expect(params['cardSearchFilter[defaultKey][]']).toBe('default-value');
+    });
+
+    it('should not be overridden when a selected filter for the same key is cleared', () => {
+      const { store, mockGetResources } = setup();
+
+      store.dispatch(new SetDefaultFilterValue('defaultKey', 'default-value'));
+      store.dispatch(new UpdateSelectedFilterOption('defaultKey', []));
+      store.dispatch(new FetchResources());
+
+      const params = mockGetResources.mock.calls[0][0];
+      expect(params['cardSearchFilter[defaultKey][]']).toBe('default-value');
+    });
+  });
 });

src/app/shared/stores/global-search/global-search.state.ts

@@ -327,6 +327,7 @@ export class GlobalSearchState {
     let hasCedarFilters = state.extraFilters.length > 0;
 
     Object.entries(state.selectedFilterOptions).forEach(([key, options]) => {
+      if (key in state.defaultFilterOptions) return;
       const filter = state.filters.find((f) => f.key === key) ?? state.extraFilters.find((f) => f.key === key);
 
       if (filter?.cedarPropertyIri) {