feat: changed file manifest state property name to selectedFormFacetN…

…ames (#287)
DataBiosphere · Dec 12, 2024 · db5670c · db5670c
1 parent 8cb7ca3
commit db5670c
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/src/providers/fileManifestState.tsx b/src/providers/fileManifestState.tsx
@@ -51,7 +51,7 @@ export type FileManifestState = {
   isSummaryLoading: boolean;
   requestParams?: URLSearchParams;
   requestURL?: string;
-  setOfFormFacetNames: Set<FileFacet["name"]>;
+  selectedFormFacetNames: Set<FileFacet["name"]>;
   summary?: AzulSummaryResponse;
 };
 
@@ -284,7 +284,7 @@ function fileManifestReducer(
         isEnabled: false,
         requestParams: undefined,
         requestURL: undefined,
-        setOfFormFacetNames: new Set(),
+        selectedFormFacetNames: new Set(),
       };
     }
     // Fetches file manifest.
@@ -339,7 +339,7 @@ function fileManifestReducer(
         state.fileSummaryFacetName
       );
       // Update set of form facet names.
-      state.setOfFormFacetNames.add(payload.categoryKey);
+      state.selectedFormFacetNames.add(payload.categoryKey);
       return {
         ...state,
         fileSummaryFilters,
@@ -363,7 +363,7 @@ function fileManifestReducer(
         state.fileSummaryFacetName
       );
       // Update set of form facet names.
-      state.setOfFormFacetNames.add(payload);
+      state.selectedFormFacetNames.add(payload);
       return {
         ...state,
         fileSummaryFilters,

diff --git a/src/providers/fileManifestState/constants.ts b/src/providers/fileManifestState/constants.ts
@@ -18,6 +18,6 @@ export const FILE_MANIFEST_STATE: FileManifestState = {
   isSummaryLoading: false,
   requestParams: undefined,
   requestURL: undefined,
-  setOfFormFacetNames: new Set(),
+  selectedFormFacetNames: new Set(),
   summary: undefined,
 };
diff --git a/src/providers/fileManifestState/utils.ts b/src/providers/fileManifestState/utils.ts
@@ -12,9 +12,9 @@ import {
  * @returns true if all form facet terms are fully selected.
  */
 export function areAllFormFiltersSelected(state: FileManifestState): boolean {
-  const { filesFacets, filters, setOfFormFacetNames } = state;
+  const { filesFacets, filters, selectedFormFacetNames } = state;
   for (const { categoryKey, value } of filters) {
-    if (setOfFormFacetNames.has(categoryKey)) {
+    if (selectedFormFacetNames.has(categoryKey)) {
       const facet = findFacet(filesFacets, categoryKey);
       if (!facet) continue;
       if (value.length < facet.termCount) return false;
@@ -33,7 +33,7 @@ export function excludeFullySelectedFormFilters(
 ): Filters {
   const filters: Filters = [];
   for (const filter of state.filters) {
-    if (state.setOfFormFacetNames.has(filter.categoryKey)) continue;
+    if (state.selectedFormFacetNames.has(filter.categoryKey)) continue;
     filters.push(filter);
   }
   return filters;
@@ -49,7 +49,7 @@ export function getRequestFilters(
   state: FileManifestState
 ): Filters | undefined {
   if (state.filesFacetsStatus !== FILES_FACETS_STATUS.COMPLETED) return;
-  if (state.setOfFormFacetNames.size === 0) return;
+  if (state.selectedFormFacetNames.size === 0) return;
   // Form terms are partially selected; return filters.
   if (!areAllFormFiltersSelected(state)) return state.filters;
   // Form terms are fully selected; return filters excluding form filters.

diff --git a/tests/fileManifestRequestFilters.test.ts b/tests/fileManifestRequestFilters.test.ts
@@ -85,7 +85,7 @@ describe("fileManifestRequestFilters", () => {
       expect(
         getRequestFilters({
           ...FILE_MANIFEST_STATE_COMPLETED,
-          setOfFormFacetNames: new Set(FORM_FACET_NAMES),
+          selectedFormFacetNames: new Set(FORM_FACET_NAMES),
         })
       ).toEqual(FILE_MANIFEST_STATE_COMPLETED.filters);
     });
@@ -109,7 +109,7 @@ describe("fileManifestRequestFilters", () => {
           ...FILE_MANIFEST_STATE_COMPLETED,
           filesFacets: FILES_FACETS as FileFacet[],
           filters: FILTERS_SUBSET,
-          setOfFormFacetNames: new Set(FORM_FACET_NAMES),
+          selectedFormFacetNames: new Set(FORM_FACET_NAMES),
         })
       ).toEqual(FILTERS_SUBSET);
     });
@@ -122,7 +122,7 @@ describe("fileManifestRequestFilters", () => {
           ...FILE_MANIFEST_STATE_COMPLETED,
           filesFacets: FILES_FACETS as FileFacet[],
           filters: FILTERS_COMPLETE_SET,
-          setOfFormFacetNames: new Set(FORM_FACET_NAMES),
+          selectedFormFacetNames: new Set(FORM_FACET_NAMES),
         })
       ).toEqual(SELECTED_FILTERS);
     });