@gen3/core 0.11.33 → 0.11.35

package/dist/cjs/index.js

@@ -8,9 +8,9 @@ var reactRedux = require('react-redux');
 var React = require('react');
 var graphql = require('graphql');
 var jsonpathPlus = require('jsonpath-plus');
+var lodash = require('lodash');
 var nanoid$1 = require('nanoid');
 var useSWR = require('swr');
-var lodash = require('lodash');
 var flat = require('flat');
 var Papa = require('papaparse');
 var reduxPersist = require('redux-persist');
@@ -72,6 +72,7 @@ const FILE_DELIMITERS = {
     tsv: '\t',
     csv: ','
 };
+const CART_LIMIT = 10000;
 
 const isFetchError = (obj)=>{
     if (typeof obj !== 'object' || obj === null) {
@@ -426,7 +427,7 @@ const useCoreDispatch = reactRedux.useDispatch.withTypes();
 });
 const isAuthenticated = (loginStatus)=>loginStatus === 'authenticated';
 const isPending = (loginStatus)=>loginStatus === 'pending';
-const initialState$8 = {
+const initialState$9 = {
     status: 'uninitialized',
     loginStatus: 'unauthenticated',
     error: undefined
@@ -437,9 +438,9 @@ const initialState$8 = {
  * @returns: status messages wrapped around fetchUserState response dict
  */ const slice$4 = toolkit.createSlice({
     name: 'fence/user',
-    initialState: initialState$8,
+    initialState: initialState$9,
     reducers: {
-        resetUserState: ()=>initialState$8
+        resetUserState: ()=>initialState$9
     },
     extraReducers: (builder)=>{
         builder.addCase(fetchUserState.fulfilled, (_, action)=>{
@@ -581,11 +582,11 @@ const { useGetExternalLoginsQuery, useLazyGetExternalLoginsQuery, useLazyIsExter
     }
 };
 
-const initialState$7 = {};
+const initialState$8 = {};
 // TODO: document what this does
 const slice$3 = toolkit.createSlice({
     name: 'drsResolver',
-    initialState: initialState$7,
+    initialState: initialState$8,
     reducers: {
         setDRSHostnames: (_state, action)=>{
             return action.payload;
@@ -607,12 +608,12 @@ const lookupGen3App = (id)=>{
     else return null;
 };
 
-const initialState$6 = {
+const initialState$7 = {
     gen3Apps: {}
 };
 const slice$2 = toolkit.createSlice({
     name: 'gen3Apps',
-    initialState: initialState$6,
+    initialState: initialState$7,
     reducers: {
         addGen3AppMetadata: (state, action)=>{
             const { name, requiredEntityTypes } = action.payload;
@@ -643,13 +644,13 @@ const selectGen3AppByName = (appName)=>lookupGen3App(appName); // TODO: memoize
     Modals["GeneralErrorModal"] = "GeneralErrorModal";
     return Modals;
 }({});
-const initialState$5 = {
+const initialState$6 = {
     currentModal: null
 };
 //Creates a modal slice for tracking showModal and hideModal state.
 const slice$1 = toolkit.createSlice({
     name: 'modals',
-    initialState: initialState$5,
+    initialState: initialState$6,
     reducers: {
         showModal: (state, action)=>{
             state.currentModal = action.payload.modal;
@@ -722,7 +723,7 @@ const getTimestamp = ()=>{
 };
 
 const NO_WORKSPACE_ID = 'none';
-const initialState$4 = {
+const initialState$5 = {
     id: NO_WORKSPACE_ID,
     status: WorkspaceStatus.NotFound,
     requestedStatus: RequestedWorkspaceStatus.Unset,
@@ -730,7 +731,7 @@ const initialState$4 = {
 };
 const slice = toolkit.createSlice({
     name: 'ActiveWorkspace',
-    initialState: initialState$4,
+    initialState: initialState$5,
     reducers: {
         setActiveWorkspaceId: (state, action)=>{
             state = {
@@ -772,6 +773,25 @@ const selectActiveWorkspaceStatus = (state)=>state.activeWorkspace.status;
 const selectRequestedWorkspaceStatus = (state)=>state.activeWorkspace.requestedStatus;
 const selectRequestedWorkspaceStatusTimestamp = (state)=>state.activeWorkspace.requestedStatusTimestamp;
 
+const cartAdapter = toolkit.createEntityAdapter({
+    selectId: (item)=>item.id
+});
+const initialState$4 = cartAdapter.getInitialState({});
+const cartSlice = toolkit.createSlice({
+    name: 'cart',
+    initialState: initialState$4,
+    reducers: {
+        addItemsToCart: cartAdapter.addMany,
+        removeItemsFromCart: cartAdapter.removeMany
+    }
+});
+const cartReducer = cartSlice.reducer;
+const { addItemsToCart, removeItemsFromCart } = cartSlice.actions;
+
+const { selectById: selectCartItem, selectIds: selectCartItems, selectAll: selectCart, selectTotal: selectCartCount } = cartAdapter.getSelectors((state)=>state.cart);
+
+const cartReducerPath = 'cart';
+
 /**
  * Creates a base class core API for guppy API calls.
  * @returns: guppy core API with guppyAPIFetch base query
@@ -829,578 +849,176 @@ const guppyAPISliceMiddleware = guppyApi.middleware;
 const guppyApiSliceReducerPath = guppyApi.reducerPath;
 const guppyApiReducer = guppyApi.reducer;
 
-const defaultCohortNameGenerator = ()=>`Custom cohort ${new Date().toLocaleString('en-CA', {
-        timeZone: 'America/Chicago',
-        hour12: false
-    }).replace(',', '')}`;
-const isNameUnique = (entities, name, excludeId)=>{
-    const trimmedName = name.trim();
-    if (!trimmedName) return false;
-    return !entities.some((cohort)=>cohort && cohort.id !== excludeId && cohort.name.trim().toLowerCase() === trimmedName.toLowerCase());
+const isOperationWithField = (operation)=>{
+    return operation?.field !== undefined;
 };
-const generateUniqueName = (entities, baseName)=>{
-    const trimmedBaseName = baseName.trim();
-    // If base name is unique, use it
-    if (isNameUnique(entities, trimmedBaseName)) {
-        return trimmedBaseName;
+const isOperatorWithFieldAndArrayOfOperands = (operation)=>{
+    if (typeof operation === 'object' && operation !== null && 'operands' in operation && Array.isArray(operation.operands) && 'field' in operation && typeof operation.field === 'string' // Assuming `field` should be a string
+    ) {
+        const { operator } = operation.operator;
+        return operator === 'in' || operator === 'exclude' || operator === 'excludeifany';
+    }
+    return false;
+};
+const extractFilterValue = (op)=>{
+    const valueExtractorHandler = new ValueExtractorHandler();
+    return handleOperation(valueExtractorHandler, op);
+};
+const extractEnumFilterValue = (op)=>{
+    const enumValueExtractorHandler = new EnumValueExtractorHandler();
+    const results = handleOperation(enumValueExtractorHandler, op);
+    return results ?? [];
+};
+const assertNever = (x)=>{
+    throw Error(`Exhaustive comparison did not handle: ${x}`);
+};
+const handleOperation = (handler, op)=>{
+    switch(op.operator){
+        case '=':
+            return handler.handleEquals(op);
+        case '!=':
+            return handler.handleNotEquals(op);
+        case '<':
+            return handler.handleLessThan(op);
+        case '<=':
+            return handler.handleLessThanOrEquals(op);
+        case '>':
+            return handler.handleGreaterThan(op);
+        case '>=':
+            return handler.handleGreaterThanOrEquals(op);
+        case 'and':
+            return handler.handleIntersection(op);
+        case 'or':
+            return handler.handleUnion(op);
+        case 'nested':
+            return handler.handleNestedFilter(op);
+        case 'in':
+        case 'includes':
+            return handler.handleIncludes(op);
+        case 'excludeifany':
+            return handler.handleExcludeIfAny(op);
+        case 'excludes':
+            return handler.handleExcludes(op);
+        case 'exists':
+            return handler.handleExists(op);
+        case 'missing':
+            return handler.handleMissing(op);
+        default:
+            return assertNever(op);
     }
-    // Find a unique name by appending numbers
-    let counter = 1;
-    let uniqueName;
-    do {
-        uniqueName = `${trimmedBaseName} (${counter})`;
-        counter++;
-    }while (!isNameUnique(entities, uniqueName))
-    return uniqueName;
 };
-
 /**
- *  Cohorts in Gen3 are defined as a set of filters for each index in the data.
- *  This means one cohort id defined for all "tabs" in CohortBuilder (explorer)
- *  Switching a cohort id means all the cohorts for the index are changed.
- */ const DEFAULT_COHORT_NAME = 'Cohort';
-const newCohort = ({ filters = {}, customName })=>{
-    const ts = new Date().toISOString();
-    const newName = customName ?? defaultCohortNameGenerator();
-    const newId = createCohortId();
-    return {
-        name: newName,
-        id: newId,
-        filters: filters ?? {},
-        modified: false,
-        saved: false,
-        createdDatetime: ts,
-        modifiedDatetime: ts,
-        counts: {}
-    };
+ * Return true if a FilterSet's root value is an empty object
+ * @param fs - FilterSet to test
+ */ const isFilterEmpty = (fs)=>lodash.isEqual({}, fs);
+/**
+ * Type guard to check if an object is a GQLIntersection
+ * @param value - The value to check
+ * @returns True if the value is a GQLIntersection
+ */ const isGQLIntersection = (value)=>{
+    return typeof value === 'object' && value !== null && 'and' in value && Array.isArray(value.and);
 };
-const nanoid = nanoid$1.customAlphabet('1234567890abcdef', 16);
-const createCohortId = ()=>nanoid();
-const cohortsAdapter = toolkit.createEntityAdapter({
-    sortComparer: (a, b)=>{
-        if (a.modifiedDatetime <= b.modifiedDatetime) return 1;
-        else return -1;
-    },
-    selectId: (cohort)=>cohort.id
-});
-// Create an initial unsaved cohort
-const initialCohort = newCohort({
-    customName: DEFAULT_COHORT_NAME
-});
-const emptyInitialState = cohortsAdapter.getInitialState({
-    currentCohortId: initialCohort.id,
-    message: undefined
-});
-// Set the initial cohort in the adapter state
-const initialState$3 = cohortsAdapter.setOne(emptyInitialState, initialCohort);
-const getCurrentCohortId = (state)=>state.currentCohortId;
 /**
- * Redux slice for cohort filters
- */ const cohortManagerSlice = toolkit.createSlice({
-    name: 'cohort',
-    initialState: initialState$3,
-    reducers: {
-        createNewCohort: (state, action)=>{
-            const baseName = action.payload.name || `Cohort`;
-            const uniqueName = generateUniqueName(Object.values(state.entities), baseName);
-            const cohort = newCohort({
-                filters: action.payload.filters,
-                customName: uniqueName
+ * Type guard to check if an object is a GQLIntersection
+ * @param value - The value to check
+ * @returns True if the value is a GQLIntersection
+ */ const isGQLUnion = (value)=>{
+    return typeof value === 'object' && value !== null && 'or' in value && Array.isArray(value.or);
+};
+class ToGqlHandler {
+    constructor(){
+        this.handleEquals = (op)=>({
+                '=': {
+                    [op.field]: op.operand
+                }
             });
-            cohortsAdapter.addOne(state, cohort);
-            state.currentCohortId = cohort.id;
-        },
-        updateCohortName: (state, action)=>{
-            const { id, name } = action.payload;
-            cohortsAdapter.updateOne(state, {
-                id: id,
-                changes: {
-                    name: name,
-                    modified: true,
-                    modifiedDatetime: new Date().toISOString()
+        this.handleNotEquals = (op)=>({
+                '!=': {
+                    [op.field]: op.operand
                 }
             });
-        },
-        removeCohort: (state, action)=>{
-            const { id: cohortId } = action.payload;
-            const removedCohortName = state.entities[cohortId].name;
-            const totalCohorts = Object.keys(state.entities).length;
-            if (totalCohorts <= 1) {
-                cohortsAdapter.removeAll(state);
-                const defaultCohort = newCohort({
-                    filters: {},
-                    customName: DEFAULT_COHORT_NAME
-                });
-                cohortsAdapter.addOne(state, defaultCohort);
-                state.currentCohortId = defaultCohort.id;
-                if (action?.payload.shouldShowMessage) {
-                    state.message = [
-                        `deleteCohort|${removedCohortName}|${state.currentCohortId}`
-                    ];
+        this.handleLessThan = (op)=>({
+                '<': {
+                    [op.field]: op.operand
                 }
-                return;
-            }
-            cohortsAdapter.removeOne(state, cohortId);
-            // deleted the current cohort so set to the most recent cohort
-            if (state.currentCohortId === cohortId) {
-                const remainingIds = Object.keys(state.entities);
-                state.currentCohortId = remainingIds[0];
-            }
-            if (action?.payload.shouldShowMessage) {
-                state.message = [
-                    `deleteCohort|${removedCohortName}|${state.currentCohortId}`
-                ];
-            }
-        },
-        // adds a filter to the cohort filter set at the given index
-        updateCohortFilter: (state, action)=>{
-            const { index, field, filter } = action.payload;
-            const currentCohortId = getCurrentCohortId(state);
-            if (!state.entities[currentCohortId]) {
-                return;
-            }
-            cohortsAdapter.updateOne(state, {
-                id: currentCohortId,
-                changes: {
-                    filters: {
-                        ...state.entities[currentCohortId].filters,
-                        [index]: {
-                            mode: state.entities[currentCohortId]?.filters[index]?.mode ?? 'and',
-                            root: {
-                                ...state.entities[currentCohortId]?.filters[index]?.root ?? {},
-                                [field]: filter
-                            }
-                        }
-                    },
-                    modified: true,
-                    modifiedDatetime: new Date().toISOString()
+            });
+        this.handleLessThanOrEquals = (op)=>({
+                '<=': {
+                    [op.field]: op.operand
                 }
             });
-        },
-        setCohortFilter: (state, action)=>{
-            const { index, filters } = action.payload;
-            const currentCohortId = getCurrentCohortId(state);
-            if (!state.entities[currentCohortId]) {
-                console.error(`no cohort with id=${currentCohortId} defined`);
-                return;
-            }
-            cohortsAdapter.updateOne(state, {
-                id: currentCohortId,
-                changes: {
-                    filters: {
-                        ...state.entities[currentCohortId].filters,
-                        [index]: filters
-                    },
-                    modified: true,
-                    modifiedDatetime: new Date().toISOString()
+        this.handleGreaterThan = (op)=>({
+                '>': {
+                    [op.field]: op.operand
                 }
             });
-        },
-        setCohortIndexFilters: (state, action)=>{
-            const currentCohortId = getCurrentCohortId(state);
-            if (!state.entities[currentCohortId]) {
-                console.error(`no cohort with id=${currentCohortId} defined`);
-                return;
-            }
-            cohortsAdapter.updateOne(state, {
-                id: currentCohortId,
-                changes: {
-                    filters: action.payload.filters,
-                    modified: true,
-                    modifiedDatetime: new Date().toISOString()
+        this.handleGreaterThanOrEquals = (op)=>({
+                '>=': {
+                    [op.field]: op.operand
                 }
             });
-        },
-        // removes a filter to the cohort filter set at the given index
-        removeCohortFilter: (state, action)=>{
-            const { index, field } = action.payload;
-            const currentCohortId = getCurrentCohortId(state);
-            if (!state.entities[currentCohortId]) {
-                console.error(`no cohort with id=${currentCohortId} defined`);
-                return;
-            }
-            const filters = state.entities[currentCohortId]?.filters[index]?.root;
-            if (!filters) {
-                return;
-            }
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            const { [field]: _a, ...updated } = filters;
-            cohortsAdapter.updateOne(state, {
-                id: currentCohortId,
-                changes: {
-                    filters: {
-                        ...state.entities[currentCohortId]?.filters,
-                        [index]: {
-                            mode: state.entities[currentCohortId].filters[index].mode,
-                            root: updated
-                        }
-                    },
-                    modified: true,
-                    modifiedDatetime: new Date().toISOString()
+        this.handleIncludes = (op)=>({
+                in: {
+                    [op.field]: op.operands
                 }
             });
-        },
-        duplicateCohort: (state)=>{
-            const currentCohortId = getCurrentCohortId(state);
-            const currentCohort = state.entities[currentCohortId];
-            const newName = generateUniqueName(Object.values(state.entities), currentCohort.name);
-            const duplicatedCohort = newCohort({
-                filters: {
-                    ...currentCohort.filters
-                },
-                customName: newName
-            });
-            cohortsAdapter.addOne(state, {
-                ...duplicatedCohort,
-                counts: {
-                    ...currentCohort.counts
+        this.handleExcludes = (op)=>({
+                exclude: {
+                    [op.field]: op.operands
                 }
             });
-            state.currentCohortId = duplicatedCohort.id;
-        },
-        // removes all filters from the cohort filter set at the given index
-        clearCohortFilters: (state, action)=>{
-            const { index } = action.payload;
-            const currentCohortId = getCurrentCohortId(state);
-            if (!state.entities[currentCohortId]) {
-                console.error(`no cohort with id=${currentCohortId} defined`);
-                return;
-            }
-            const filters = state.entities[currentCohortId]?.filters[index]?.root;
-            if (!filters) {
-                return;
-            }
-            cohortsAdapter.updateOne(state, {
-                id: currentCohortId,
-                changes: {
-                    filters: {
-                        ...state.entities[currentCohortId]?.filters,
-                        [index]: {
-                            mode: 'and',
-                            root: {}
-                        }
-                    },
-                    modified: true,
-                    modifiedDatetime: new Date().toISOString()
+        this.handleExcludeIfAny = (op)=>({
+                excludeifany: {
+                    [op.field]: op.operands
                 }
             });
-        },
-        updateCohortCounts: (state, action)=>{
-            const currentCohortId = getCurrentCohortId(state);
-            const currentCohort = state.entities[currentCohortId];
-            cohortsAdapter.updateOne(state, {
-                id: currentCohortId,
-                changes: {
-                    counts: {
-                        ...currentCohort.counts,
-                        ...action.payload
-                    }
-                }
+        this.handleIntersection = (op)=>({
+                and: op.operands.map((x)=>convertFilterToGqlFilter(x))
             });
-        },
-        updateCohortIndexCountById: (state, action)=>{
-            const { index, cohortId, counts } = action.payload;
-            const cohort = state.entities[cohortId];
-            cohortsAdapter.updateOne(state, {
-                id: cohortId,
-                changes: {
-                    counts: {
-                        ...cohort.counts,
-                        ...{
-                            [index]: counts
-                        }
-                    }
+        this.handleUnion = (op)=>({
+                or: op.operands.map((x)=>convertFilterToGqlFilter(x))
+            });
+        this.handleMissing = (op)=>({
+                is: {
+                    [op.field]: 'MISSING'
                 }
             });
-        },
-        setCurrentCohortId: (state, action)=>{
-            state.currentCohortId = action.payload;
-        },
-        /** @hidden */ setCohortList: (state, action)=>{
-            if (!action.payload) {
-                cohortsAdapter.removeMany(state, state.ids);
-            } else {
-                cohortsAdapter.upsertMany(state, [
-                    ...action.payload
-                ]);
-            }
-        }
-    }
-});
-/**
- * Returns the selectors for the cohorts EntityAdapter
- * @param state - the CoreState
- *
- * @hidden
- */ const cohortSelectors = cohortsAdapter.getSelectors((state)=>state.cohorts.cohortManager);
-// Filter actions: addFilter, removeFilter, updateFilter
-const { createNewCohort, updateCohortFilter, setCohortFilter, setCohortIndexFilters, duplicateCohort, removeCohortFilter, clearCohortFilters, removeCohort, setCurrentCohortId, updateCohortName, updateCohortCounts, updateCohortIndexCountById, setCohortList } = cohortManagerSlice.actions;
-const cohortReducer = cohortManagerSlice.reducer;
-
-const initialState$2 = {};
-const expandSlice$1 = toolkit.createSlice({
-    name: 'CohortBuilder/filterExpand',
-    initialState: initialState$2,
-    reducers: {
-        toggleCohortBuilderCategoryFilter: (state, action)=>{
-            return {
-                ...state,
-                [action.payload.index]: {
-                    ...state[action.payload.index],
-                    [action.payload.field]: action.payload.expanded
+        this.handleExists = (op)=>({
+                not: {
+                    [op.field]: op?.operand ?? null
                 }
-            };
-        },
-        toggleCohortBuilderAllFilters: (state, action)=>{
-            return {
-                ...state,
-                [action.payload.index]: Object.keys(state[action.payload.index]).reduce((acc, k)=>{
-                    acc[k] = action.payload.expand;
-                    return acc;
-                }, {})
-            };
-        }
-    }
-});
-const cohortBuilderFiltersExpandedReducer = expandSlice$1.reducer;
-const { toggleCohortBuilderCategoryFilter, toggleCohortBuilderAllFilters } = expandSlice$1.actions;
-const selectCohortFilterExpanded = (state, index, field)=>state.cohorts.filtersExpanded?.[index]?.[field];
-const selectAllCohortFiltersCollapsed = (state, index)=>index in state.cohorts.filtersExpanded ? Object.values(state.cohorts.filtersExpanded?.[index]).every((e)=>!e) : false;
-
-const initialState$1 = {};
-const expandSlice = toolkit.createSlice({
-    name: 'CohortBuilder/filterCombineMode',
-    initialState: initialState$1,
-    reducers: {
-        setCohortFilterCombineMode: (state, action)=>{
+            });
+        this.handleNestedFilter = (op)=>{
+            const child = convertFilterToGqlFilter(op.operand);
             return {
-                ...state,
-                [action.payload.index]: {
-                    ...state[action.payload.index],
-                    [action.payload.field]: action.payload.mode
+                nested: {
+                    path: op.path,
+                    ...child
                 }
             };
-        }
+        };
     }
-});
-const cohortBuilderFiltersCombineModeReducer = expandSlice.reducer;
-const { setCohortFilterCombineMode } = expandSlice.actions;
-const selectCohortFilterCombineMode = (state, index, field)=>state.cohorts.filtersCombineMode?.[index]?.[field] ?? 'or';
-
-const initialState = {
-    shouldShareFilters: false,
-    sharedFiltersMap: {}
+}
+const convertFilterToGqlFilter = (filter)=>{
+    const handler = new ToGqlHandler();
+    return handleOperation(handler, filter);
 };
-const cohortSharedFiltersSlice = toolkit.createSlice({
-    name: 'cohortSharedFilters',
-    initialState: initialState,
-    reducers: {
-        setShouldShareFilters: (state, action)=>{
-            state.shouldShareFilters = action.payload;
-            return state;
-        },
-        setSharedFilters: (state, action)=>{
-            state.sharedFiltersMap = action.payload;
-        }
-    }
-});
-const selectShouldShareFilters = (state)=>state.cohorts.sharedFilters.shouldShareFilters;
-const selectSharedFilters = (state)=>state.cohorts.sharedFilters.sharedFiltersMap;
-const selectSharedFiltersForFields = (state, field)=>state.cohorts.sharedFilters.sharedFiltersMap?.[field] ?? [
-        field
-    ];
-const { setShouldShareFilters, setSharedFilters } = cohortSharedFiltersSlice.actions;
-const cohortSharedFiltersReducer = cohortSharedFiltersSlice.reducer;
-
-const cohortReducers = toolkit.combineReducers({
-    filtersExpanded: cohortBuilderFiltersExpandedReducer,
-    filtersCombineMode: cohortBuilderFiltersCombineModeReducer,
-    sharedFilters: cohortSharedFiltersReducer,
-    cohortManager: cohortReducer
-});
-
-const rootReducer = toolkit.combineReducers({
-    gen3Services: gen3ServicesReducer,
-    user: userReducer,
-    gen3Apps: gen3AppReducer,
-    drsHostnames: drsHostnamesReducer,
-    modals: modalReducer,
-    cohorts: cohortReducers,
-    activeWorkspace: activeWorkspaceReducer,
-    [guppyApiSliceReducerPath]: guppyApiReducer,
-    [userAuthApiReducerPath]: userAuthApiReducer
-});
-
-const isOperationWithField = (operation)=>{
-    return operation?.field !== undefined;
-};
-const isOperatorWithFieldAndArrayOfOperands = (operation)=>{
-    if (typeof operation === 'object' && operation !== null && 'operands' in operation && Array.isArray(operation.operands) && 'field' in operation && typeof operation.field === 'string' // Assuming `field` should be a string
-    ) {
-        const { operator } = operation.operator;
-        return operator === 'in' || operator === 'exclude' || operator === 'excludeifany';
-    }
-    return false;
-};
-const extractFilterValue = (op)=>{
-    const valueExtractorHandler = new ValueExtractorHandler();
-    return handleOperation(valueExtractorHandler, op);
-};
-const extractEnumFilterValue = (op)=>{
-    const enumValueExtractorHandler = new EnumValueExtractorHandler();
-    const results = handleOperation(enumValueExtractorHandler, op);
-    return results ?? [];
-};
-const assertNever = (x)=>{
-    throw Error(`Exhaustive comparison did not handle: ${x}`);
-};
-const handleOperation = (handler, op)=>{
-    switch(op.operator){
-        case '=':
-            return handler.handleEquals(op);
-        case '!=':
-            return handler.handleNotEquals(op);
-        case '<':
-            return handler.handleLessThan(op);
-        case '<=':
-            return handler.handleLessThanOrEquals(op);
-        case '>':
-            return handler.handleGreaterThan(op);
-        case '>=':
-            return handler.handleGreaterThanOrEquals(op);
-        case 'and':
-            return handler.handleIntersection(op);
-        case 'or':
-            return handler.handleUnion(op);
-        case 'nested':
-            return handler.handleNestedFilter(op);
-        case 'in':
-        case 'includes':
-            return handler.handleIncludes(op);
-        case 'excludeifany':
-            return handler.handleExcludeIfAny(op);
-        case 'excludes':
-            return handler.handleExcludes(op);
-        case 'exists':
-            return handler.handleExists(op);
-        case 'missing':
-            return handler.handleMissing(op);
-        default:
-            return assertNever(op);
-    }
-};
-/**
- * Return true if a FilterSet's root value is an empty object
- * @param fs - FilterSet to test
- */ const isFilterEmpty = (fs)=>lodash.isEqual({}, fs);
-/**
- * Type guard to check if an object is a GQLIntersection
- * @param value - The value to check
- * @returns True if the value is a GQLIntersection
- */ const isGQLIntersection = (value)=>{
-    return typeof value === 'object' && value !== null && 'and' in value && Array.isArray(value.and);
-};
-/**
- * Type guard to check if an object is a GQLIntersection
- * @param value - The value to check
- * @returns True if the value is a GQLIntersection
- */ const isGQLUnion = (value)=>{
-    return typeof value === 'object' && value !== null && 'or' in value && Array.isArray(value.or);
-};
-class ToGqlHandler {
-    constructor(){
-        this.handleEquals = (op)=>({
-                '=': {
-                    [op.field]: op.operand
-                }
-            });
-        this.handleNotEquals = (op)=>({
-                '!=': {
-                    [op.field]: op.operand
-                }
-            });
-        this.handleLessThan = (op)=>({
-                '<': {
-                    [op.field]: op.operand
-                }
-            });
-        this.handleLessThanOrEquals = (op)=>({
-                '<=': {
-                    [op.field]: op.operand
-                }
-            });
-        this.handleGreaterThan = (op)=>({
-                '>': {
-                    [op.field]: op.operand
-                }
-            });
-        this.handleGreaterThanOrEquals = (op)=>({
-                '>=': {
-                    [op.field]: op.operand
-                }
-            });
-        this.handleIncludes = (op)=>({
-                in: {
-                    [op.field]: op.operands
-                }
-            });
-        this.handleExcludes = (op)=>({
-                exclude: {
-                    [op.field]: op.operands
-                }
-            });
-        this.handleExcludeIfAny = (op)=>({
-                excludeifany: {
-                    [op.field]: op.operands
-                }
-            });
-        this.handleIntersection = (op)=>({
-                and: op.operands.map((x)=>convertFilterToGqlFilter(x))
-            });
-        this.handleUnion = (op)=>({
-                or: op.operands.map((x)=>convertFilterToGqlFilter(x))
-            });
-        this.handleMissing = (op)=>({
-                is: {
-                    [op.field]: 'MISSING'
-                }
-            });
-        this.handleExists = (op)=>({
-                not: {
-                    [op.field]: op?.operand ?? null
-                }
-            });
-        this.handleNestedFilter = (op)=>{
-            const child = convertFilterToGqlFilter(op.operand);
-            return {
-                nested: {
-                    path: op.path,
-                    ...child
-                }
-            };
-        };
-    }
-}
-const convertFilterToGqlFilter = (filter)=>{
-    const handler = new ToGqlHandler();
-    return handleOperation(handler, filter);
-};
-const convertFilterSetToGqlFilter = (fs, toplevelOp = 'and')=>{
-    const fsKeys = Object.keys(fs.root);
-    // if no keys return undefined
-    if (fsKeys.length === 0) return {
-        and: []
-    };
-    return toplevelOp === 'and' ? {
-        and: fsKeys.map((key)=>convertFilterToGqlFilter(fs.root[key]))
-    } : {
-        or: fsKeys.map((key)=>convertFilterToGqlFilter(fs.root[key]))
-    };
-};
-const handleGqlOperation = (handler, op)=>{
-    const operationKeys = Object.keys(op);
-    if (operationKeys.includes('=')) {
-        return handler.handleEquals(op);
+const convertFilterSetToGqlFilter = (fs, toplevelOp = 'and')=>{
+    const fsKeys = Object.keys(fs.root);
+    // if no keys return undefined
+    if (fsKeys.length === 0) return {
+        and: []
+    };
+    return toplevelOp === 'and' ? {
+        and: fsKeys.map((key)=>convertFilterToGqlFilter(fs.root[key]))
+    } : {
+        or: fsKeys.map((key)=>convertFilterToGqlFilter(fs.root[key]))
+    };
+};
+const handleGqlOperation = (handler, op)=>{
+    const operationKeys = Object.keys(op);
+    if (operationKeys.includes('=')) {
+        return handler.handleEquals(op);
     }
     if (operationKeys.includes('!=')) {
         return handler.handleNotEquals(op);
@@ -1622,132 +1240,571 @@ const filterSetToOperation = (fs)=>{
                 })
             };
     }
-    return undefined;
-};
+    return undefined;
+};
+/**
+ * Constructs a nested operation object based on the provided field and leaf operand.
+ * If the field does not contain a dot '.', it either assigns the field to the leaf operand (if applicable)
+ * or returns the leaf operand as is. When the field contains dots, it splits the field into parts,
+ * creates a "nested" operation for the root field, and recursively constructs the nested structure
+ * for the remaining portion of the field.
+ *
+ * @param {string} field - The hierarchical field path, with segments separated by dots (e.g., "root.child").
+ * @param {Operation} leafOperand - The operation to be nested within the specified path.
+ * @param parentPath - The parent path of the current field. Guppy nested filters require a parent path.
+ * @param depth
+ * @returns {Operation} A nested operation object that represents the structured path and operand.
+ */ const buildNestedGQLFilter = (field, leafOperand, parentPath = undefined)=>{
+    if (!field.includes('.')) {
+        return leafOperand;
+    }
+    const splitFieldArray = field.split('.');
+    const nextField = splitFieldArray.shift();
+    if (!nextField) {
+        console.warn('Invalid field path:', field);
+        return leafOperand;
+    }
+    const currentPath = parentPath ? `${parentPath}.${nextField}` : nextField;
+    return {
+        nested: {
+            path: currentPath,
+            ...buildNestedGQLFilter(splitFieldArray.join('.'), leafOperand, currentPath)
+        }
+    };
+};
+
+const isFilterSet = (input)=>{
+    if (typeof input !== 'object' || input === null) {
+        return false;
+    }
+    const { root, mode } = input;
+    if (typeof root !== 'object' || root === null) {
+        return false;
+    }
+    if (![
+        'and',
+        'or'
+    ].includes(mode)) {
+        return false;
+    }
+    return true;
+};
+const isUnion = (value)=>{
+    return typeof value === 'object' && value !== null && value.operator === 'or' && Array.isArray(value.operands);
+};
+const isIntersection = (value)=>{
+    return typeof value === 'object' && value !== null && value.operator === 'and' && Array.isArray(value.operands);
+};
+/**
+ * Type guard for Union or Intersection
+ * @param o - operator to check
+ * @category Filters
+ */ const isIntersectionOrUnion = (o)=>o.operator === 'and' || o.operator === 'or';
+const isOperandsType = (operation)=>{
+    return operation?.operands !== undefined;
+};
+const isNestedFilter = (operation)=>{
+    return operation.operator === 'nested';
+};
+const isIndexedFilterSetEmpty = (filters)=>Object.values(filters).every((filterSet)=>Object.keys(filterSet).length === 0);
+const EmptyFilterSet = {
+    mode: 'and',
+    root: {}
+};
+
+const FieldNameOverrides = {};
+const COMMON_PREPOSITIONS = [
+    'a',
+    'an',
+    'and',
+    'at',
+    'but',
+    'by',
+    'for',
+    'in',
+    'is',
+    'nor',
+    'of',
+    'on',
+    'or',
+    'out',
+    'so',
+    'the',
+    'to',
+    'up',
+    'yet'
+];
+const capitalize$1 = (s)=>s.length > 0 ? s[0].toUpperCase() + s.slice(1) : '';
+const trimFirstFieldNameToTitle = (fieldName, trim = false)=>{
+    if (trim) {
+        const source = fieldName.slice(fieldName.indexOf('.') + 1);
+        return fieldNameToTitle(source ? source : fieldName, 0);
+    }
+    return fieldNameToTitle(fieldName);
+};
+/**
+ * Converts a filter name to a title,
+ * For example files.input.experimental_strategy will get converted to Experimental Strategy
+ * if sections == 2 then the output would be Input Experimental Strategy
+ * @param fieldName input filter expected to be: string.firstpart_secondpart
+ * @param sections number of "sections" string.string.string to got back from the end of the field
+ */ const fieldNameToTitle = (fieldName, sections = 1)=>{
+    if (fieldName in FieldNameOverrides) {
+        return FieldNameOverrides[fieldName];
+    }
+    if (fieldName === undefined) return 'No Title';
+    return fieldName.split('.').slice(-sections).map((s)=>s.split('_')).flat().map((word)=>COMMON_PREPOSITIONS.includes(word) ? word : capitalize$1(word)).join(' ');
+};
+/**
+ * Extracts the index name from the field name
+ * @param fieldName
+ */ const extractIndexFromFullFieldName = (fieldName)=>fieldName.split('.')[0];
+/**
+ * prepend the index name to the field name
+ */ const prependIndexToFieldName = (fieldName, index)=>`${index}.${fieldName}`;
+/**
+ * extract the field name from the index.field name
+ */ const extractFieldNameFromFullFieldName = (fieldName)=>fieldName.split('.').slice(1).join('.');
+/**
+ * extract the field name and the index from the index.field name returning as a tuple
+ */ const extractIndexAndFieldNameFromFullFieldName = (fieldName)=>{
+    const [index, ...rest] = fieldName.split('.');
+    return [
+        index,
+        rest.join('.')
+    ];
+};
+
+const defaultCohortNameGenerator = ()=>`Custom cohort ${new Date().toLocaleString('en-CA', {
+        timeZone: 'America/Chicago',
+        hour12: false
+    }).replace(',', '')}`;
+const isNameUnique = (entities, name, excludeId)=>{
+    const trimmedName = name.trim();
+    if (!trimmedName) return false;
+    return !entities.some((cohort)=>cohort && cohort.id !== excludeId && cohort.name.trim().toLowerCase() === trimmedName.toLowerCase());
+};
+const generateUniqueName = (entities, baseName)=>{
+    const trimmedBaseName = baseName.trim();
+    // If base name is unique, use it
+    if (isNameUnique(entities, trimmedBaseName)) {
+        return trimmedBaseName;
+    }
+    // Find a unique name by appending numbers
+    let counter = 1;
+    let uniqueName;
+    do {
+        uniqueName = `${trimmedBaseName} (${counter})`;
+        counter++;
+    }while (!isNameUnique(entities, uniqueName))
+    return uniqueName;
+};
+/**
+ * This function takes a FilterSet object and a prefix string as input.
+ * It filters the root property of the FilterSet object and returns a
+ * new FilterSet object that only contains filters with field names
+ * that start with the specified prefix.
+ *
+ *  @param fs - The FilterSet object to filter
+ *  @param prefix - The prefix to filter by
+ *  @returns - A new FilterSet object that only contains filters with field names that start with the specified prefix
+ *  @category Filters
+ */ const extractFiltersWithPrefixFromFilterSet = (fs, prefix)=>{
+    if (fs === undefined || fs.root === undefined) {
+        return {
+            mode: 'and',
+            root: {}
+        };
+    }
+    return Object.values(fs.root).reduce((acc, filter)=>{
+        if (isIntersectionOrUnion(filter) || isNestedFilter(filter)) return acc;
+        if (filter.field.startsWith(prefix)) {
+            acc.root[filter.field] = filter;
+        }
+        return acc;
+    }, {
+        mode: 'and',
+        root: {}
+    });
+};
+
+/**
+ *  Cohorts in Gen3 are defined as a set of filters for each index in the data.
+ *  This means one cohort id defined for all "tabs" in CohortBuilder (explorer)
+ *  Switching a cohort id means all the cohorts for the index are changed.
+ */ const DEFAULT_COHORT_NAME = 'Cohort';
+const newCohort = ({ filters = {}, customName })=>{
+    const ts = new Date().toISOString();
+    const newName = customName ?? defaultCohortNameGenerator();
+    const newId = createCohortId();
+    return {
+        name: newName,
+        id: newId,
+        filters: filters ?? {},
+        modified: false,
+        saved: false,
+        createdDatetime: ts,
+        modifiedDatetime: ts,
+        counts: {}
+    };
+};
+const nanoid = nanoid$1.customAlphabet('1234567890abcdef', 16);
+const createCohortId = ()=>nanoid();
+const cohortsAdapter = toolkit.createEntityAdapter({
+    sortComparer: (a, b)=>{
+        if (a.modifiedDatetime <= b.modifiedDatetime) return 1;
+        else return -1;
+    },
+    selectId: (cohort)=>cohort.id
+});
+// Create an initial unsaved cohort
+const initialCohort = newCohort({
+    customName: DEFAULT_COHORT_NAME
+});
+const emptyInitialState = cohortsAdapter.getInitialState({
+    currentCohortId: initialCohort.id,
+    message: undefined
+});
+// Set the initial cohort in the adapter state
+const initialState$3 = cohortsAdapter.setOne(emptyInitialState, initialCohort);
+const getCurrentCohortId = (state)=>state.currentCohortId;
+/**
+ * Redux slice for cohort filters
+ */ const cohortManagerSlice = toolkit.createSlice({
+    name: 'cohort',
+    initialState: initialState$3,
+    reducers: {
+        createNewCohort: (state, action)=>{
+            const baseName = action.payload.name || `Cohort`;
+            const uniqueName = generateUniqueName(Object.values(state.entities), baseName);
+            const cohort = newCohort({
+                filters: action.payload.filters,
+                customName: uniqueName
+            });
+            cohortsAdapter.addOne(state, cohort);
+            state.currentCohortId = cohort.id;
+        },
+        updateCohortName: (state, action)=>{
+            const { id, name } = action.payload;
+            cohortsAdapter.updateOne(state, {
+                id: id,
+                changes: {
+                    name: name,
+                    modified: true,
+                    modifiedDatetime: new Date().toISOString()
+                }
+            });
+        },
+        removeCohort: (state, action)=>{
+            const { id: cohortId } = action.payload;
+            const removedCohortName = state.entities[cohortId].name;
+            const totalCohorts = Object.keys(state.entities).length;
+            if (totalCohorts <= 1) {
+                cohortsAdapter.removeAll(state);
+                const defaultCohort = newCohort({
+                    filters: {},
+                    customName: DEFAULT_COHORT_NAME
+                });
+                cohortsAdapter.addOne(state, defaultCohort);
+                state.currentCohortId = defaultCohort.id;
+                if (action?.payload.shouldShowMessage) {
+                    state.message = [
+                        `deleteCohort|${removedCohortName}|${state.currentCohortId}`
+                    ];
+                }
+                return;
+            }
+            cohortsAdapter.removeOne(state, cohortId);
+            // deleted the current cohort so set to the most recent cohort
+            if (state.currentCohortId === cohortId) {
+                const remainingIds = Object.keys(state.entities);
+                state.currentCohortId = remainingIds[0];
+            }
+            if (action?.payload.shouldShowMessage) {
+                state.message = [
+                    `deleteCohort|${removedCohortName}|${state.currentCohortId}`
+                ];
+            }
+        },
+        // adds a filter to the cohort filter set at the given index
+        updateCohortFilter: (state, action)=>{
+            const { index, field, filter } = action.payload;
+            const currentCohortId = getCurrentCohortId(state);
+            if (!state.entities[currentCohortId]) {
+                return;
+            }
+            cohortsAdapter.updateOne(state, {
+                id: currentCohortId,
+                changes: {
+                    filters: {
+                        ...state.entities[currentCohortId].filters,
+                        [index]: {
+                            mode: state.entities[currentCohortId]?.filters[index]?.mode ?? 'and',
+                            root: {
+                                ...state.entities[currentCohortId]?.filters[index]?.root ?? {},
+                                [field]: filter
+                            }
+                        }
+                    },
+                    modified: true,
+                    modifiedDatetime: new Date().toISOString()
+                }
+            });
+        },
+        setCohortFilter: (state, action)=>{
+            const { index, filters } = action.payload;
+            const currentCohortId = getCurrentCohortId(state);
+            if (!state.entities[currentCohortId]) {
+                console.error(`no cohort with id=${currentCohortId} defined`);
+                return;
+            }
+            cohortsAdapter.updateOne(state, {
+                id: currentCohortId,
+                changes: {
+                    filters: {
+                        ...state.entities[currentCohortId].filters,
+                        [index]: filters
+                    },
+                    modified: true,
+                    modifiedDatetime: new Date().toISOString()
+                }
+            });
+        },
+        setCohortIndexFilters: (state, action)=>{
+            const currentCohortId = getCurrentCohortId(state);
+            if (!state.entities[currentCohortId]) {
+                console.error(`no cohort with id=${currentCohortId} defined`);
+                return;
+            }
+            cohortsAdapter.updateOne(state, {
+                id: currentCohortId,
+                changes: {
+                    filters: action.payload.filters,
+                    modified: true,
+                    modifiedDatetime: new Date().toISOString()
+                }
+            });
+        },
+        // removes a filter to the cohort filter set at the given index
+        removeCohortFilter: (state, action)=>{
+            const { index, field } = action.payload;
+            const currentCohortId = getCurrentCohortId(state);
+            if (!state.entities[currentCohortId]) {
+                console.error(`no cohort with id=${currentCohortId} defined`);
+                return;
+            }
+            const filters = state.entities[currentCohortId]?.filters[index]?.root;
+            if (!filters) {
+                return;
+            }
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            const { [field]: _a, ...updated } = filters;
+            cohortsAdapter.updateOne(state, {
+                id: currentCohortId,
+                changes: {
+                    filters: {
+                        ...state.entities[currentCohortId]?.filters,
+                        [index]: {
+                            mode: state.entities[currentCohortId].filters[index].mode,
+                            root: updated
+                        }
+                    },
+                    modified: true,
+                    modifiedDatetime: new Date().toISOString()
+                }
+            });
+        },
+        duplicateCohort: (state)=>{
+            const currentCohortId = getCurrentCohortId(state);
+            const currentCohort = state.entities[currentCohortId];
+            const newName = generateUniqueName(Object.values(state.entities), currentCohort.name);
+            const duplicatedCohort = newCohort({
+                filters: {
+                    ...currentCohort.filters
+                },
+                customName: newName
+            });
+            cohortsAdapter.addOne(state, {
+                ...duplicatedCohort,
+                counts: {
+                    ...currentCohort.counts
+                }
+            });
+            state.currentCohortId = duplicatedCohort.id;
+        },
+        // removes all filters from the cohort filter set at the given index
+        clearCohortFilters: (state, action)=>{
+            const { index } = action.payload;
+            const currentCohortId = getCurrentCohortId(state);
+            if (!state.entities[currentCohortId]) {
+                console.error(`no cohort with id=${currentCohortId} defined`);
+                return;
+            }
+            const filters = state.entities[currentCohortId]?.filters[index]?.root;
+            if (!filters) {
+                return;
+            }
+            cohortsAdapter.updateOne(state, {
+                id: currentCohortId,
+                changes: {
+                    filters: {
+                        ...state.entities[currentCohortId]?.filters,
+                        [index]: {
+                            mode: 'and',
+                            root: {}
+                        }
+                    },
+                    modified: true,
+                    modifiedDatetime: new Date().toISOString()
+                }
+            });
+        },
+        updateCohortCounts: (state, action)=>{
+            const currentCohortId = getCurrentCohortId(state);
+            const currentCohort = state.entities[currentCohortId];
+            cohortsAdapter.updateOne(state, {
+                id: currentCohortId,
+                changes: {
+                    counts: {
+                        ...currentCohort.counts,
+                        ...action.payload
+                    }
+                }
+            });
+        },
+        updateCohortIndexCountById: (state, action)=>{
+            const { index, cohortId, counts } = action.payload;
+            const cohort = state.entities[cohortId];
+            cohortsAdapter.updateOne(state, {
+                id: cohortId,
+                changes: {
+                    counts: {
+                        ...cohort.counts,
+                        ...{
+                            [index]: counts
+                        }
+                    }
+                }
+            });
+        },
+        setCurrentCohortId: (state, action)=>{
+            state.currentCohortId = action.payload;
+        },
+        /** @hidden */ setCohortList: (state, action)=>{
+            if (!action.payload) {
+                cohortsAdapter.removeMany(state, state.ids);
+            } else {
+                cohortsAdapter.upsertMany(state, [
+                    ...action.payload
+                ]);
+            }
+        }
+    }
+});
 /**
- * Constructs a nested operation object based on the provided field and leaf operand.
- * If the field does not contain a dot '.', it either assigns the field to the leaf operand (if applicable)
- * or returns the leaf operand as is. When the field contains dots, it splits the field into parts,
- * creates a "nested" operation for the root field, and recursively constructs the nested structure
- * for the remaining portion of the field.
+ * Returns the selectors for the cohorts EntityAdapter
+ * @param state - the CoreState
  *
- * @param {string} field - The hierarchical field path, with segments separated by dots (e.g., "root.child").
- * @param {Operation} leafOperand - The operation to be nested within the specified path.
- * @param parentPath - The parent path of the current field. Guppy nested filters require a parent path.
- * @param depth
- * @returns {Operation} A nested operation object that represents the structured path and operand.
- */ const buildNestedGQLFilter = (field, leafOperand, parentPath = undefined)=>{
-    if (!field.includes('.')) {
-        return leafOperand;
-    }
-    const splitFieldArray = field.split('.');
-    const nextField = splitFieldArray.shift();
-    if (!nextField) {
-        console.warn('Invalid field path:', field);
-        return leafOperand;
-    }
-    const currentPath = parentPath ? `${parentPath}.${nextField}` : nextField;
-    return {
-        nested: {
-            path: currentPath,
-            ...buildNestedGQLFilter(splitFieldArray.join('.'), leafOperand, currentPath)
-        }
-    };
-};
+ * @hidden
+ */ const cohortSelectors = cohortsAdapter.getSelectors((state)=>state.cohorts.cohortManager);
+// Filter actions: addFilter, removeFilter, updateFilter
+const { createNewCohort, updateCohortFilter, setCohortFilter, setCohortIndexFilters, duplicateCohort, removeCohortFilter, clearCohortFilters, removeCohort, setCurrentCohortId, updateCohortName, updateCohortCounts, updateCohortIndexCountById, setCohortList } = cohortManagerSlice.actions;
+const cohortReducer = cohortManagerSlice.reducer;
 
-const isFilterSet = (input)=>{
-    if (typeof input !== 'object' || input === null) {
-        return false;
-    }
-    const { root, mode } = input;
-    if (typeof root !== 'object' || root === null) {
-        return false;
-    }
-    if (![
-        'and',
-        'or'
-    ].includes(mode)) {
-        return false;
+const initialState$2 = {};
+const expandSlice$1 = toolkit.createSlice({
+    name: 'CohortBuilder/filterExpand',
+    initialState: initialState$2,
+    reducers: {
+        toggleCohortBuilderCategoryFilter: (state, action)=>{
+            return {
+                ...state,
+                [action.payload.index]: {
+                    ...state[action.payload.index],
+                    [action.payload.field]: action.payload.expanded
+                }
+            };
+        },
+        toggleCohortBuilderAllFilters: (state, action)=>{
+            return {
+                ...state,
+                [action.payload.index]: Object.keys(state[action.payload.index]).reduce((acc, k)=>{
+                    acc[k] = action.payload.expand;
+                    return acc;
+                }, {})
+            };
+        }
     }
-    return true;
-};
-const isUnion = (value)=>{
-    return typeof value === 'object' && value !== null && value.operator === 'or' && Array.isArray(value.operands);
-};
-const isIntersection = (value)=>{
-    return typeof value === 'object' && value !== null && value.operator === 'and' && Array.isArray(value.operands);
-};
-const isOperandsType = (operation)=>{
-    return operation?.operands !== undefined;
-};
-const isIndexedFilterSetEmpty = (filters)=>Object.values(filters).every((filterSet)=>Object.keys(filterSet).length === 0);
-const EmptyFilterSet = {
-    mode: 'and',
-    root: {}
-};
+});
+const cohortBuilderFiltersExpandedReducer = expandSlice$1.reducer;
+const { toggleCohortBuilderCategoryFilter, toggleCohortBuilderAllFilters } = expandSlice$1.actions;
+const selectCohortFilterExpanded = (state, index, field)=>state.cohorts.filtersExpanded?.[index]?.[field];
+const selectAllCohortFiltersCollapsed = (state, index)=>index in state.cohorts.filtersExpanded ? Object.values(state.cohorts.filtersExpanded?.[index]).every((e)=>!e) : false;
 
-const FieldNameOverrides = {};
-const COMMON_PREPOSITIONS = [
-    'a',
-    'an',
-    'and',
-    'at',
-    'but',
-    'by',
-    'for',
-    'in',
-    'is',
-    'nor',
-    'of',
-    'on',
-    'or',
-    'out',
-    'so',
-    'the',
-    'to',
-    'up',
-    'yet'
-];
-const capitalize$1 = (s)=>s.length > 0 ? s[0].toUpperCase() + s.slice(1) : '';
-const trimFirstFieldNameToTitle = (fieldName, trim = false)=>{
-    if (trim) {
-        const source = fieldName.slice(fieldName.indexOf('.') + 1);
-        return fieldNameToTitle(source ? source : fieldName, 0);
+const initialState$1 = {};
+const expandSlice = toolkit.createSlice({
+    name: 'CohortBuilder/filterCombineMode',
+    initialState: initialState$1,
+    reducers: {
+        setCohortFilterCombineMode: (state, action)=>{
+            return {
+                ...state,
+                [action.payload.index]: {
+                    ...state[action.payload.index],
+                    [action.payload.field]: action.payload.mode
+                }
+            };
+        }
     }
-    return fieldNameToTitle(fieldName);
+});
+const cohortBuilderFiltersCombineModeReducer = expandSlice.reducer;
+const { setCohortFilterCombineMode } = expandSlice.actions;
+const selectCohortFilterCombineMode = (state, index, field)=>state.cohorts.filtersCombineMode?.[index]?.[field] ?? 'or';
+
+const initialState = {
+    shouldShareFilters: false,
+    sharedFiltersMap: {}
 };
-/**
- * Converts a filter name to a title,
- * For example files.input.experimental_strategy will get converted to Experimental Strategy
- * if sections == 2 then the output would be Input Experimental Strategy
- * @param fieldName input filter expected to be: string.firstpart_secondpart
- * @param sections number of "sections" string.string.string to got back from the end of the field
- */ const fieldNameToTitle = (fieldName, sections = 1)=>{
-    if (fieldName in FieldNameOverrides) {
-        return FieldNameOverrides[fieldName];
+const cohortSharedFiltersSlice = toolkit.createSlice({
+    name: 'cohortSharedFilters',
+    initialState: initialState,
+    reducers: {
+        setShouldShareFilters: (state, action)=>{
+            state.shouldShareFilters = action.payload;
+            return state;
+        },
+        setSharedFilters: (state, action)=>{
+            state.sharedFiltersMap = action.payload;
+        }
     }
-    if (fieldName === undefined) return 'No Title';
-    return fieldName.split('.').slice(-sections).map((s)=>s.split('_')).flat().map((word)=>COMMON_PREPOSITIONS.includes(word) ? word : capitalize$1(word)).join(' ');
-};
-/**
- * Extracts the index name from the field name
- * @param fieldName
- */ const extractIndexFromFullFieldName = (fieldName)=>fieldName.split('.')[0];
-/**
- * prepend the index name to the field name
- */ const prependIndexToFieldName = (fieldName, index)=>`${index}.${fieldName}`;
-/**
- * extract the field name from the index.field name
- */ const extractFieldNameFromFullFieldName = (fieldName)=>fieldName.split('.').slice(1).join('.');
-/**
- * extract the field name and the index from the index.field name returning as a tuple
- */ const extractIndexAndFieldNameFromFullFieldName = (fieldName)=>{
-    const [index, ...rest] = fieldName.split('.');
-    return [
-        index,
-        rest.join('.')
+});
+const selectShouldShareFilters = (state)=>state.cohorts.sharedFilters.shouldShareFilters;
+const selectSharedFilters = (state)=>state.cohorts.sharedFilters.sharedFiltersMap;
+const selectSharedFiltersForFields = (state, field)=>state.cohorts.sharedFilters.sharedFiltersMap?.[field] ?? [
+        field
     ];
-};
+const { setShouldShareFilters, setSharedFilters } = cohortSharedFiltersSlice.actions;
+const cohortSharedFiltersReducer = cohortSharedFiltersSlice.reducer;
+
+const cohortReducers = toolkit.combineReducers({
+    filtersExpanded: cohortBuilderFiltersExpandedReducer,
+    filtersCombineMode: cohortBuilderFiltersCombineModeReducer,
+    sharedFilters: cohortSharedFiltersReducer,
+    cohortManager: cohortReducer
+});
+
+const rootReducer = toolkit.combineReducers({
+    gen3Services: gen3ServicesReducer,
+    user: userReducer,
+    gen3Apps: gen3AppReducer,
+    drsHostnames: drsHostnamesReducer,
+    modals: modalReducer,
+    cohorts: cohortReducers,
+    activeWorkspace: activeWorkspaceReducer,
+    [guppyApiSliceReducerPath]: guppyApiReducer,
+    [userAuthApiReducerPath]: userAuthApiReducer,
+    [cartReducerPath]: cartReducer
+});
 
 /**
  * Flattens a deep nested JSON object skipping
@@ -2235,18 +2292,18 @@ const explorerTags = guppyApi.enhanceEndpoints({
  */ const explorerApi = explorerTags.injectEndpoints({
     endpoints: (builder)=>({
             getAllFieldsForType: builder.query({
-                query: (type)=>({
-                        query: `{ _mapping ${type} } }`
+                query: ({ type, indexPrefix = '' })=>({
+                        query: `{ ${indexPrefix}_mapping ${type} } }`
                     }),
                 transformResponse: (response, _meta, params)=>{
                     return response[params.type];
                 }
             }),
             getAccessibleData: builder.query({
-                query: ({ type, fields, accessibility })=>{
+                query: ({ type, fields, accessibility, indexPrefix = '' })=>{
                     const fieldParts = fields.map((field)=>`${field} { histogram { key count } }`);
                     return {
-                        query: `_aggregation {
+                        query: `${indexPrefix}_aggregation {
               ${type} (accessibility: ${accessibility}) {
                 ${fieldParts.join(',')}
               }
@@ -2255,7 +2312,7 @@ const explorerTags = guppyApi.enhanceEndpoints({
                 }
             }),
             getRawDataAndTotalCounts: builder.query({
-                query: ({ type, fields, filters, sort, offset = 0, size = 20, accessibility = Accessibility.ALL, format = undefined })=>{
+                query: ({ type, fields, filters, sort, offset = 0, size = 20, accessibility = Accessibility.ALL, format = undefined, indexPrefix = '' })=>{
                     const gqlFilter = convertFilterSetToGqlFilter(filters);
                     const params = [
                         ...sort ? [
@@ -2280,7 +2337,7 @@ const explorerTags = guppyApi.enhanceEndpoints({
                             'filter: $filter'
                         ] : []
                     ].join(',');
-                    const dataTypeLine = `${type} (accessibility: ${accessibility}, offset: ${offset}, first: ${size},
+                    const dataTypeLine = `${indexPrefix}${type} (accessibility: ${accessibility}, offset: ${offset}, first: ${size},
         ${dataParams}) {`;
                     const typeAggsLine = `${type} (${gqlFilter && 'filter: $filter,'} accessibility: ${accessibility}) {`;
                     const processedFields = fields.map((field)=>rawDataQueryStrForEachField(field));
@@ -2288,7 +2345,7 @@ const explorerTags = guppyApi.enhanceEndpoints({
     ${dataTypeLine}
       ${processedFields.join(' ')}
             }
-            _aggregation {
+            ${indexPrefix}_aggregation {
               ${typeAggsLine}
                 _totalCount
               }
@@ -2316,13 +2373,13 @@ const explorerTags = guppyApi.enhanceEndpoints({
                 ]
             }),
             getAggs: builder.query({
-                query: ({ type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false })=>{
-                    return buildGetAggregationQuery(type, fields, filters, accessibility, filterSelf);
+                query: ({ type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, indexPrefix = '' })=>{
+                    return buildGetAggregationQuery(type, fields, filters, accessibility, filterSelf, undefined, indexPrefix);
                 },
                 transformResponse: (response, _meta, args)=>{
-                    const buckets = processHistogramResponse(response?.data?._aggregation[args.type] ?? {});
+                    const buckets = processHistogramResponse(response?.data?.[`${args?.indexPrefix ?? ''}_aggregation`][args.type] ?? {});
                     // check for totals
-                    const count = response?.data?._aggregation[args.type]?._totalCount ?? null;
+                    const count = response?.data?.[`${args?.indexPrefix ?? ''}_aggregation`][args.type]?._totalCount ?? null;
                     return {
                         _totalCount: [
                             {
@@ -2338,24 +2395,24 @@ const explorerTags = guppyApi.enhanceEndpoints({
                 ]
             }),
             getStatsAggregations: builder.query({
-                query: ({ type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined })=>{
-                    return buildGetStatsAggregationQuery(type, fields, filters, accessibility, filterSelf, queryId);
+                query: ({ type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined, indexPrefix = '' })=>{
+                    return buildGetStatsAggregationQuery(type, fields, filters, accessibility, filterSelf, queryId, indexPrefix);
                 },
                 transformResponse: (response, _meta, args)=>{
-                    return processHistogramResponse(response?.data?._aggregation[args.type] ?? {});
+                    return processHistogramResponse(response?.data?.[`${args?.indexPrefix ?? ''}_aggregation`][args.type] ?? {});
                 },
                 providesTags: [
                     'STATS'
                 ]
             }),
             getSubAggs: builder.query({
-                query: ({ type, mainField, termsFields = undefined, missingFields = undefined, numericAggAsText = false, filters = undefined, accessibility = Accessibility.ALL })=>{
+                query: ({ type, mainField, termsFields = undefined, missingFields = undefined, numericAggAsText = false, filters = undefined, accessibility = Accessibility.ALL, indexPrefix = '' })=>{
                     const nestedAggFields = {
                         termsFields: termsFields,
                         missingFields: missingFields
                     };
                     const query = `query getSubAggs ( ${filters ?? '$filter: JSON,'} $nestedAggFields: JSON) {
-    _aggregation {
+    ${indexPrefix}_aggregation {
       ${type} ( ${filters ?? 'filter: $filter, filterSelf: false,'} nestedAggFields: $nestedAggFields, accessibility: ${accessibility}) {
       _totalCounts
         ${nestedHistogramQueryStrForEachField(mainField, numericAggAsText)}
@@ -2371,18 +2428,18 @@ const explorerTags = guppyApi.enhanceEndpoints({
                     };
                 },
                 transformResponse: (response, _meta, args)=>{
-                    return processHistogramResponse(response?.data?._aggregation[args.type] ?? {});
+                    return processHistogramResponse(response?.data?.[`${args?.indexPrefix ?? ''}_aggregation`][args.type] ?? {});
                 },
                 providesTags: [
                     'AGGS'
                 ]
             }),
             getCounts: builder.query({
-                query: ({ type, filters, accessibility = Accessibility.ALL, queryId = undefined })=>{
+                query: ({ type, filters, accessibility = Accessibility.ALL, queryId = undefined, indexPrefix = '' })=>{
                     const gqlFilters = convertFilterSetToGqlFilter(filters);
-                    const queryLine = `query totalCounts${queryId ? `_${queryId}` : ''} ${gqlFilters ? '($filter: JSON)' : ''}{`;
+                    const queryLine = `query totalCounts${queryId ? `${indexPrefix}_${queryId}` : ''} ${gqlFilters ? '($filter: JSON)' : ''}{`;
                     const typeAggsLine = `${type} ${gqlFilters ? '(filter: $filter, ' : '('} accessibility: ${accessibility}) {`;
-                    const query = `${queryLine} _aggregation {
+                    const query = `${queryLine} ${indexPrefix}_aggregation {
           ${typeAggsLine}
             _totalCount
             }
@@ -2398,23 +2455,23 @@ const explorerTags = guppyApi.enhanceEndpoints({
                     };
                 },
                 transformResponse: (response, _meta, args)=>{
-                    if (!response.data || !response.data._aggregation) {
+                    if (!response.data || !response.data[`${args?.indexPrefix ?? ''}_aggregation`]) {
                         throw new Error('Invalid response: Missing data or _aggregation field');
                     }
-                    if (!(args.type in response.data._aggregation)) {
+                    if (!(args.type in response.data[`${args?.indexPrefix ?? ''}_aggregation`])) {
                         throw new Error(`Invalid response: Missing expected key '${args.type}' in _aggregation`);
                     }
-                    return response.data._aggregation[args.type]._totalCount ?? 0;
+                    return response.data[`${args?.indexPrefix ?? ''}_aggregation`][args.type]._totalCount ?? 0;
                 },
                 providesTags: [
                     'COUNTS'
                 ]
             }),
             getFieldCountSummary: builder.query({
-                query: ({ type, field, filters, accessibility = Accessibility.ALL })=>{
+                query: ({ type, field, filters, accessibility = Accessibility.ALL, indexPrefix = '' })=>{
                     const gqlFilters = convertFilterSetToGqlFilter(filters);
                     const query = `query summary ($filter: JSON) {
-        _aggregation {
+        ${indexPrefix}_aggregation {
           ${type} (filter: $filter, accessibility: ${accessibility}) {
             ${field} {
               histogram {
@@ -2435,15 +2492,15 @@ const explorerTags = guppyApi.enhanceEndpoints({
                 }
             }),
             getFieldsForIndex: builder.query({
-                query: (index)=>{
+                query: ({ index, indexPrefix = '' })=>{
                     return {
                         query: `{
-            _mapping { ${index} }
+            ${indexPrefix}_mapping { ${index} }
           }`
                     };
                 },
-                transformResponse: (response)=>{
-                    return response['_mapping'];
+                transformResponse: (response, _meta, args)=>{
+                    return response[`${args.indexPrefix}_mapping`];
                 }
             }),
             getSharedFieldsForIndex: builder.query({
@@ -2480,16 +2537,18 @@ const useGetArrayTypes = ()=>{
         return data ? data['indices'] : {};
     }
 };
-const useGetIndexFields = (index)=>{
-    const { data } = useGetFieldsForIndexQuery(index);
+const useGetIndexFields = (index, indexPrefix = '')=>{
+    const { data } = useGetFieldsForIndexQuery({
+        index: index,
+        indexPrefix: indexPrefix
+    });
     return data ?? [];
 };
-const buildGetAggregationQuery = (type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined)=>{
-    const queryStart = isFilterEmpty(filters) ? `
-              query getAggs${queryId ? `_${queryId}` : ''} {
-              _aggregation {
+const buildGetAggregationQuery = (type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined, indexPrefix = '')=>{
+    const queryStart = isFilterEmpty(filters) ? `query getAggs${queryId ? `_${queryId}` : ''} {
+              ${indexPrefix}_aggregation {
               ${type} (accessibility: ${accessibility}) {` : `query getAggs ($filter: JSON) {
-               _aggregation {
+               ${indexPrefix}_aggregation {
 
                       ${type} (filter: $filter, filterSelf: ${filterSelf ? 'true' : 'false'}, accessibility: ${accessibility}) { _totalCount`;
     const query = `${queryStart}
@@ -2505,12 +2564,12 @@ const buildGetAggregationQuery = (type, fields, filters, accessibility = Accessi
     };
     return queryBody;
 };
-const buildGetStatsAggregationQuery = (type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined)=>{
+const buildGetStatsAggregationQuery = (type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined, indexPrefix = '')=>{
     const queryStart = isFilterEmpty(filters) ? `
               query getStatsAggs${queryId ? `_${queryId}` : ''} {
-              _aggregation {
+              ${indexPrefix}_aggregation {
               ${type} (accessibility: ${accessibility}) {` : `query getStatsAggs${queryId ? `_${queryId}` : ''} ($filter: JSON) {
-               _aggregation {
+               ${indexPrefix}_aggregation {
                       ${type} (filter: $filter, filterSelf: ${filterSelf ? 'true' : 'false'}, accessibility: ${accessibility}) { _totalCount`;
     const query = `${queryStart}
                   ${fields.map((field)=>statsQueryStrForEachField(field))}
@@ -2574,7 +2633,8 @@ const persistConfig = {
     storage,
     whitelist: [
         'cohorts',
-        'activeWorkspace'
+        'activeWorkspace',
+        'cart'
     ]
 };
 const persistedReducer = reduxPersist.persistReducer(persistConfig, rootReducer);
@@ -5759,6 +5819,7 @@ const isWorkspaceActive = (status)=>status === WorkspaceStatus.Running || status
 const isWorkspaceRunningOrStopping = (status)=>status === WorkspaceStatus.Running || status === WorkspaceStatus.Terminating;
 
 exports.Accessibility = Accessibility;
+exports.CART_LIMIT = CART_LIMIT;
 exports.CohortStorage = CohortStorage;
 exports.CoreProvider = CoreProvider;
 exports.DAYS_IN_YEAR = DAYS_IN_YEAR;
@@ -5792,6 +5853,7 @@ exports.RequestedWorkspaceStatus = RequestedWorkspaceStatus;
 exports.ToGqlHandler = ToGqlHandler;
 exports.ValueExtractorHandler = ValueExtractorHandler;
 exports.WorkspaceStatus = WorkspaceStatus;
+exports.addItemsToCart = addItemsToCart;
 exports.ageDisplay = ageDisplay;
 exports.appendFilterToOperation = appendFilterToOperation;
 exports.buildGetAggregationQuery = buildGetAggregationQuery;
@@ -5801,6 +5863,8 @@ exports.buildNestedGQLFilter = buildNestedGQLFilter;
 exports.calculatePercentageAsNumber = calculatePercentageAsNumber;
 exports.calculatePercentageAsString = calculatePercentageAsString;
 exports.capitalize = capitalize;
+exports.cartReducer = cartReducer;
+exports.cartReducerPath = cartReducerPath;
 exports.clearActiveWorkspaceId = clearActiveWorkspaceId;
 exports.clearCohortFilters = clearCohortFilters;
 exports.cohortReducer = cohortReducer;
@@ -5828,6 +5892,7 @@ exports.extractEnumFilterValue = extractEnumFilterValue;
 exports.extractFieldNameFromFullFieldName = extractFieldNameFromFullFieldName;
 exports.extractFileDatasetsInRecords = extractFileDatasetsInRecords;
 exports.extractFilterValue = extractFilterValue;
+exports.extractFiltersWithPrefixFromFilterSet = extractFiltersWithPrefixFromFilterSet;
 exports.extractIndexAndFieldNameFromFullFieldName = extractIndexAndFieldNameFromFullFieldName;
 exports.extractIndexFromDataLibraryCohort = extractIndexFromDataLibraryCohort;
 exports.extractIndexFromFullFieldName = extractIndexFromFullFieldName;
@@ -5885,10 +5950,12 @@ exports.isHistogramRangeData = isHistogramRangeData;
 exports.isHttpStatusError = isHttpStatusError;
 exports.isIndexedFilterSetEmpty = isIndexedFilterSetEmpty;
 exports.isIntersection = isIntersection;
+exports.isIntersectionOrUnion = isIntersectionOrUnion;
 exports.isJSONObject = isJSONObject;
 exports.isJSONValue = isJSONValue;
 exports.isJSONValueArray = isJSONValueArray;
 exports.isNameUnique = isNameUnique;
+exports.isNestedFilter = isNestedFilter;
 exports.isNotDefined = isNotDefined;
 exports.isObject = isObject;
 exports.isOperandsType = isOperandsType;
@@ -5918,6 +5985,7 @@ exports.rawDataQueryStrForEachField = rawDataQueryStrForEachField;
 exports.registerDefaultRemoteSupport = registerDefaultRemoteSupport;
 exports.removeCohort = removeCohort;
 exports.removeCohortFilter = removeCohortFilter;
+exports.removeItemsFromCart = removeItemsFromCart;
 exports.requestorApi = requestorApi;
 exports.resetUserState = resetUserState;
 exports.resourcePathFromProjectID = resourcePathFromProjectID;
@@ -5931,6 +5999,10 @@ exports.selectAvailableCohortByName = selectAvailableCohortByName;
 exports.selectAvailableCohorts = selectAvailableCohorts;
 exports.selectCSRFToken = selectCSRFToken;
 exports.selectCSRFTokenData = selectCSRFTokenData;
+exports.selectCart = selectCart;
+exports.selectCartCount = selectCartCount;
+exports.selectCartItem = selectCartItem;
+exports.selectCartItems = selectCartItems;
 exports.selectCohortById = selectCohortById;
 exports.selectCohortFilterCombineMode = selectCohortFilterCombineMode;
 exports.selectCohortFilterExpanded = selectCohortFilterExpanded;