Add filter CombineModeSlice

Author: craigrbarnes

packages/core/src/features/cohort/cohortBuilderConfigSlice.ts

@@ -173,16 +173,16 @@ export const {
 } = cohortSlice.actions;
 
 export const selectCohortFilters = (state: CoreState): IndexedFilterSet =>
-  state.cohorts.cohort.filters;
+  state.cohort.cohort.cohort.filters;
 
 export const selectCurrentCohortId = (state: CoreState): string =>
-  state.cohorts.cohort.id;
+  state.cohort.cohort.cohort.id;
 
 export const selectCurrentCohort = (state: CoreState): Cohort =>
-  state.cohorts.cohort;
+  state.cohort.cohort.cohort;
 
 export const selectCurrentCohortName = (state: CoreState): string =>
-  state.cohorts.cohort.name;
+  state.cohort.cohort.cohort.name;
 
 /**
  * Select a filter by its name from the current cohort. If the filter is not found
@@ -196,7 +196,7 @@ export const selectIndexedFilterByName = (
   index: string,
   name: string,
 ): Operation | undefined => {
-  return state.cohorts.cohort.filters[index]?.root[name];
+  return state.cohort.cohort.cohort.filters[index]?.root[name];
 };
 
 const EmptyFilterSet: FilterSet = { mode: 'and', root: {} };
@@ -211,7 +211,7 @@ export const selectIndexFilters = (
   state: CoreState,
   index: string,
 ): FilterSet => {
-  return state.cohorts.cohort.filters?.[index] ?? EmptyFilterSet; // TODO: check if this is undefined
+  return state.cohort.cohort.cohort.filters?.[index] ?? EmptyFilterSet; // TODO: check if this is undefined
 };
 
 export const cohortReducer = cohortSlice.reducer;

packages/core/src/features/cohort/cohortSlice.ts

@@ -0,0 +1,40 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+import type { CoreState } from '../../reducers';
+import { CombineMode } from './types';
+
+type CombineModeFiltersState = Record<string, Record<string, CombineMode>>;
+
+const initialState: CombineModeFiltersState = {};
+
+const expandSlice = createSlice({
+  name: 'CohortBuilder/filterCombineMode',
+  initialState: initialState,
+  reducers: {
+    setCohortFilterCombineMode: (
+      state,
+      action: PayloadAction<{
+        index: string;
+        field: string;
+        mode: CombineMode;
+      }>,
+    ) => {
+      return {
+        ...state,
+        [action.payload.index]: {
+          ...state[action.payload.index],
+          [action.payload.field]: action.payload.mode,
+        },
+      };
+    },
+  },
+});
+
+export const cohortBuilderFiltersCombineModeReducer = expandSlice.reducer;
+
+export const { setCohortFilterCombineMode } = expandSlice.actions;
+
+export const selectCohortFilterCombineMode = (
+  state: CoreState,
+  index: string,
+  field: string,
+): CombineMode => state.cohort.filtersCombineMode?.[index]?.[field] ?? 'or';

packages/core/src/features/cohort/filterCombineModeSlice.ts

@@ -55,12 +55,12 @@ export const selectCohortFilterExpanded = (
   state: CoreState,
   index: string,
   field: string,
-): boolean => state.cohortFiltersExpanded?.[index]?.[field];
+): boolean => state.cohort.filtersExpanded?.[index]?.[field];
 
 export const selectAllCohortFiltersCollapsed = (
   state: CoreState,
   index: string,
 ): boolean =>
   index in state.cohortFiltersExpanded
-    ? Object.values(state.cohortFiltersExpanded?.[index]).every((e) => !e)
+    ? Object.values(state.cohort.filtersExpanded?.[index]).every((e) => !e)
     : false;

packages/core/src/features/cohort/filterExpandSlice.ts

@@ -1,6 +1,5 @@
 // import all the components from this directory
 import {
-  cohortReducer,
   selectCohortFilters,
   selectIndexFilters,
   selectIndexedFilterByName,
@@ -20,6 +19,12 @@ import {
   selectCohortFilterExpanded,
   selectAllCohortFiltersCollapsed,
 } from './filterExpandSlice';
+import { type CombineMode } from './types';
+
+import {
+  setCohortFilterCombineMode,
+  selectCohortFilterCombineMode,
+} from './filterCombineModeSlice';
 
 export {
   selectCohortFilters,
@@ -28,14 +33,16 @@ export {
   selectCurrentCohortId,
   selectCurrentCohortName,
   selectCurrentCohort,
-  cohortReducer,
+  selectCohortFilterExpanded,
+  selectAllCohortFiltersCollapsed,
+  selectCohortFilterCombineMode,
   updateCohortFilter,
   setCohortFilter,
   setCohortIndexFilters,
   removeCohortFilter,
   clearCohortFilters,
   toggleCohortBuilderCategoryFilter,
   toggleCohortBuilderAllFilters,
-  selectCohortFilterExpanded,
-  selectAllCohortFiltersCollapsed,
+  setCohortFilterCombineMode,
+  type CombineMode,
 };

packages/core/src/features/cohort/index.ts

@@ -0,0 +1,10 @@
+import { combineReducers } from '@reduxjs/toolkit';
+import { cohortReducer } from './cohortSlice';
+import { cohortBuilderFiltersExpandedReducer } from './filterExpandSlice';
+import { cohortBuilderFiltersCombineModeReducer } from './filterCombineModeSlice';
+
+export const cohortReducers = combineReducers({
+  filtersExpanded: cohortBuilderFiltersExpandedReducer,
+  filtersCombineMode: cohortBuilderFiltersCombineModeReducer,
+  cohort: cohortReducer,
+});

packages/core/src/features/cohort/reducers.ts

@@ -0,0 +1 @@
+export type CombineMode = 'and' | 'or';

packages/core/src/features/cohort/types.ts

@@ -20,11 +20,36 @@ import {
   Union,
 } from './types';
 
+export type OperatorWithFieldAndArrayOfOperands =
+  | Includes
+  | Excludes
+  | ExcludeIfAny;
+
 export const isOperationWithField = (
   operation: OperationWithField | Operation,
 ): operation is OperationWithField => {
   return (operation as OperationWithField)?.field !== undefined;
 };
+
+export const isOperatorWithFieldAndArrayOfOperands = (
+  operation: unknown,
+): operation is OperatorWithFieldAndArrayOfOperands => {
+  if (
+    typeof operation === 'object' &&
+    operation !== null &&
+    'operands' in operation &&
+    Array.isArray((operation as any).operands) &&
+    'field' in operation &&
+    typeof (operation as any).field === 'string' // Assuming `field` should be a string
+  ) {
+    const { operator } = (operation as any).operator;
+    return (
+      operator === 'in' || operator === 'exclude' || operator === 'excludeifany'
+    );
+  }
+  return false;
+};
+
 export const extractFilterValue = (op: Operation): FilterValue => {
   const valueExtractorHandler = new ValueExtractorHandler();
   return handleOperation<FilterValue>(valueExtractorHandler, op);

packages/core/src/features/filters/filters.ts

@@ -2,9 +2,11 @@ import {
   isFilterEmpty,
   isOperationWithField,
   convertFilterSetToGqlFilter,
+  isOperatorWithFieldAndArrayOfOperands,
   handleOperation,
   extractEnumFilterValue,
   extractFilterValue,
+  type OperatorWithFieldAndArrayOfOperands,
   type GQLFilter,
 } from './filters';
 
@@ -15,8 +17,10 @@ export {
   handleOperation,
   isFilterEmpty,
   isOperationWithField,
+  isOperatorWithFieldAndArrayOfOperands,
   convertFilterSetToGqlFilter,
   extractFilterValue,
   extractEnumFilterValue,
+  type OperatorWithFieldAndArrayOfOperands,
   type GQLFilter,
 };

packages/core/src/features/filters/index.ts

@@ -4,24 +4,22 @@ import { userReducer } from './features/user/userSlice';
 import { gen3AppReducer } from './features/gen3Apps/gen3AppsSlice';
 import { drsHostnamesReducer } from './features/drsResolver';
 import { modalReducer } from './features/modals/modalsSlice';
-import { cohortReducer } from './features/cohort';
 import { dataLibrarySelectionReducer } from './features/dataLibrary';
 import { activeWorkspaceReducer } from './features/workspace/workspaceSlice';
 import { guppyApiReducer, guppyApiSliceReducerPath } from './features/guppy';
 import {
   userAuthApiReducerPath,
   userAuthApiReducer,
 } from './features/user/userSliceRTK';
-import { cohortBuilderFiltersExpandedReducer } from './features/cohort/filterExpandSlice';
+import { cohortReducers } from './features/cohort/reducers';
 
 export const rootReducer = combineReducers({
   gen3Services: gen3ServicesReducer,
   user: userReducer,
   gen3Apps: gen3AppReducer,
   drsHostnames: drsHostnamesReducer,
   modals: modalReducer,
-  cohorts: cohortReducer,
-  cohortFiltersExpanded: cohortBuilderFiltersExpandedReducer,
+  cohorts: cohortReducers,
   activeWorkspace: activeWorkspaceReducer,
   dataLibrarySelection: dataLibrarySelectionReducer,
   [guppyApiSliceReducerPath]: guppyApiReducer,