feat(es2): CR followup

Author: adlius

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

@@ -92,6 +92,18 @@ describe('GlobalSearchState', () => {
       expect(mockGetFilterOptions).not.toHaveBeenCalled();
     });
 
+    it('should set isLoaded to true for a CEDAR filter when short-circuiting', () => {
+      const { store } = setup();
+
+      store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
+      store.dispatch(new FetchResources());
+      store.dispatch(new LoadFilterOptions(CEDAR_FILTER.key));
+
+      const filters = store.selectSnapshot(GlobalSearchSelectors.getFilters);
+      const cedarFilterState = filters.find((f) => f.key === CEDAR_FILTER.key);
+      expect(cedarFilterState?.isLoaded).toBe(true);
+    });
+
     it('should call the API for a regular filter', () => {
       const { store, mockGetFilterOptions } = setup();
 
@@ -180,10 +192,35 @@ describe('GlobalSearchState', () => {
       store.dispatch(new FetchResources());
 
       const params = mockGetResources.mock.calls[0][0];
-      expect(params[`cardSearchText[osf:hasCedarRecord.cedar:${CEDAR_FILTER.cedarPropertyIri}]`]).toBe('"High School"');
+      expect(params[`cardSearchText[osf:hasCedarRecord.cedar:${CEDAR_FILTER.cedarPropertyIri}][]`]).toEqual([
+        '"High School"',
+      ]);
       expect(params[`cardSearchFilter[${CEDAR_FILTER.key}][]`]).toBeUndefined();
     });
 
+    it('should include all selected values for a CEDAR filter', () => {
+      const { store, mockGetResources } = setup();
+      store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
+      store.dispatch(new FetchResources());
+      mockGetResources.mockClear();
+
+      store.dispatch(
+        new LoadFilterOptionsAndSetValues({
+          [CEDAR_FILTER.key]: [
+            { label: 'High School', value: 'High School', cardSearchResultCount: null },
+            { label: 'Middle School', value: 'Middle School', cardSearchResultCount: null },
+          ],
+        })
+      );
+      store.dispatch(new FetchResources());
+
+      const params = mockGetResources.mock.calls[0][0];
+      expect(params[`cardSearchText[osf:hasCedarRecord.cedar:${CEDAR_FILTER.cedarPropertyIri}][]`]).toEqual([
+        '"High School"',
+        '"Middle School"',
+      ]);
+    });
+
     it('should use extraFilters as fallback for CEDAR lookup before state.filters is populated', () => {
       const { store, mockGetResources } = setup();
       store.dispatch(new SetExtraFilters([CEDAR_FILTER]));
@@ -197,7 +234,9 @@ describe('GlobalSearchState', () => {
       store.dispatch(new FetchResources());
 
       const params = mockGetResources.mock.calls[0][0];
-      expect(params[`cardSearchText[osf:hasCedarRecord.cedar:${CEDAR_FILTER.cedarPropertyIri}]`]).toBe('"High School"');
+      expect(params[`cardSearchText[osf:hasCedarRecord.cedar:${CEDAR_FILTER.cedarPropertyIri}][]`]).toEqual([
+        '"High School"',
+      ]);
     });
   });
 });

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

@@ -65,6 +65,9 @@ export class GlobalSearchState {
 
     const filter = state.filters.find((f) => f.key === filterKey);
     if (filter?.cedarPropertyIri) {
+      ctx.patchState({
+        filters: state.filters.map((f) => (f.key === filterKey ? { ...f, isLoaded: true } : f)),
+      });
       return EMPTY;
     }
 
@@ -328,9 +331,9 @@ export class GlobalSearchState {
 
       if (filter?.cedarPropertyIri) {
         hasCedarFilters = true;
-        const value = options[0]?.value;
-        if (value) {
-          filtersParams[`cardSearchText[osf:hasCedarRecord.cedar:${filter.cedarPropertyIri}]`] = `"${value}"`;
+        const values = options.map((o) => `"${o.value}"`);
+        if (values.length) {
+          filtersParams[`cardSearchText[osf:hasCedarRecord.cedar:${filter.cedarPropertyIri}][]`] = values;
         }
       } else {
         const firstOptionValue = options[0]?.value;