feat: donors multi-level filter

globalfund · Oct 7, 2022 · 22afc2e · 22afc2e
1 parent ae972ea
commit 22afc2e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/src/app/components/ToolBoxPanel/components/filters/data.ts b/src/app/components/ToolBoxPanel/components/filters/data.ts
@@ -147,7 +147,7 @@ export const filtergroups: FilterGroupProps[] = [
   },
   {
     name: "Donors",
-    addSubOptionFilters: false,
+    addSubOptionFilters: true,
   },
   {
     name: "Replenishment Periods",

diff --git a/src/app/hooks/useAppliedFilters.tsx b/src/app/hooks/useAppliedFilters.tsx
@@ -7,9 +7,7 @@ interface UseAppliedFiltersProps {
   type: string;
 }
 
-export function useAppliedFilters(
-  props: UseAppliedFiltersProps
-): {
+export function useAppliedFilters(props: UseAppliedFiltersProps): {
   setAppliedFilters: ActionCreator<string[]>;
   appliedFilters: string[];
   setAppliedFiltersChildren?: ActionCreator<string[]>;
@@ -59,8 +57,10 @@ export function useAppliedFilters(
         return {
           setAppliedFilters: actions.setDonorCategories,
           appliedFilters: data.donorCategories,
-          setAppliedFiltersChildren: actions.setDonors,
-          appliedFiltersChildren: data.donors,
+          setAppliedFiltersChildren: actions.setDonorSubCategories,
+          appliedFiltersChildren: data.donorSubCategories,
+          setAppliedFiltersGrandChildren: actions.setDonors,
+          appliedFiltersGrandChildren: data.donors,
         };
       }
       return {

diff --git a/src/app/state/api/action-reducers/sync/filters/index.ts b/src/app/state/api/action-reducers/sync/filters/index.ts
@@ -11,6 +11,7 @@ export const defaultAppliedFilters: AppliedFiltersModel = {
   replenishmentPeriods: [] as string[],
   donors: [] as string[],
   donorCategories: [] as string[],
+  donorSubCategories: [] as string[],
 };
 
 export interface AppliedFiltersModel {
@@ -23,6 +24,7 @@ export interface AppliedFiltersModel {
   replenishmentPeriods: string[];
   donors: string[];
   donorCategories: string[];
+  donorSubCategories: string[];
 }
 
 export interface AppliedFiltersStateModel {
@@ -44,6 +46,8 @@ export interface AppliedFiltersStateModel {
   setDonors: Action<AppliedFiltersStateModel, string[]>;
   donorCategories: string[];
   setDonorCategories: Action<AppliedFiltersStateModel, string[]>;
+  donorSubCategories: string[];
+  setDonorSubCategories: Action<AppliedFiltersStateModel, string[]>;
   setAll: Action<AppliedFiltersStateModel, AppliedFiltersModel>;
   actionDefaultNone: Action<AppliedFiltersStateModel, string[]>;
   appliedFiltersCount: number;
@@ -95,6 +99,11 @@ export const AppliedFiltersState: AppliedFiltersStateModel = {
     state.donorCategories = payload;
     state.appliedFiltersCount += payload.length;
   }),
+  donorSubCategories: [],
+  setDonorSubCategories: action((state, payload: string[]) => {
+    state.donorSubCategories = payload;
+    state.appliedFiltersCount += payload.length;
+  }),
   setAll: action((state, payload: AppliedFiltersModel) => {
     state.locations = payload.locations;
     state.components = payload.components;
@@ -105,6 +114,7 @@ export const AppliedFiltersState: AppliedFiltersStateModel = {
     state.replenishmentPeriods = payload.replenishmentPeriods;
     state.donors = payload.donors;
     state.donorCategories = payload.donorCategories;
+    state.donorSubCategories = payload.donorSubCategories;
     state.appliedFiltersCount =
       payload.locations.length +
       payload.components.length +