@gen3/core 0.12.22 → 0.12.24

package/dist/cjs/index.js

@@ -64,6 +64,7 @@ const GEN3_CROSSWALK_API = process.env.NEXT_PUBLIC_GEN3_CROSSWALK_API || `${GEN3
 const GEN3_SOWER_API = process.env.NEXT_PUBLIC_GEN3_SOWER_API || `${GEN3_API}/jobs`;
 const GEN3_MANIFEST_API = process.env.NEXT_PUBLIC_GEN3_MANIFEST_API || `${GEN3_API}/manifests`;
 const GEN3_REQUESTOR_API = process.env.NEXT_PUBLIC_GEN3_REQUESTOR_API || `${GEN3_API}/requestor`;
+const GEN3_ANALYSIS_API = process.env.NEXT_PUBLIC_GEN3_ANALYSIS_API || `${GEN3_API}/analysis/v0`;
 var Accessibility = /*#__PURE__*/ function(Accessibility) {
     Accessibility["ACCESSIBLE"] = "accessible";
     Accessibility["UNACCESSIBLE"] = "unaccessible";
@@ -1780,12 +1781,12 @@ const COMMON_PREPOSITIONS = [
     'yet'
 ];
 const capitalize = (s)=>s.length > 0 ? s[0].toUpperCase() + s.slice(1) : '';
-const trimFirstFieldNameToTitle = (fieldName, trim = false)=>{
+const trimFirstfieldNameToLabel = (fieldName, trim = false)=>{
     if (trim) {
         const source = fieldName.slice(fieldName.indexOf('.') + 1);
-        return fieldNameToTitle(source ? source : fieldName, 0);
+        return fieldNameToLabel(source ? source : fieldName, 0);
     }
-    return fieldNameToTitle(fieldName);
+    return fieldNameToLabel(fieldName);
 };
 /**
  * Converts a filter name to a title,
@@ -1793,7 +1794,7 @@ const trimFirstFieldNameToTitle = (fieldName, trim = false)=>{
  * 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)=>{
+ */ const fieldNameToLabel = (fieldName, sections = 1)=>{
     if (fieldName === undefined) return 'No Title';
     return fieldName.split('.').slice(-sections).map((s)=>s.split('_')).flat().map((word)=>COMMON_PREPOSITIONS.includes(word) ? word : capitalize(word)).map((word)=>word in FieldNameOverrides ? FieldNameOverrides[word] : word).join(' ');
 };
@@ -1817,492 +1818,808 @@ const trimFirstFieldNameToTitle = (fieldName, trim = false)=>{
     ];
 };
 
-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.
+ * 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 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: {}
-        };
+ * @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 buildNestedWithParentPathGQLFilter = (field, leafOperand, parentPath = undefined)=>{
+    if (!field.includes('.')) {
+        return leafOperand;
     }
-    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;
+    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)
         }
-        return acc;
-    }, {
-        mode: 'and',
-        root: {}
-    });
+    };
+};
+const buildCohortGqlOperator = (fs)=>{
+    if (!fs || !fs.root) return undefined;
+    const fsKeys = Object.keys(fs.root);
+    // if no keys return undefined
+    if (fsKeys.length === 0) return undefined;
+    // TODO consider changing FilterSet: mode to support joinOrToAll as FilterSet mode
+    // find key using keyword "joinOrToAll"
+    const joinOrToAllKey = fsKeys.filter((x)=>x.includes('joinOrToAll'));
+    switch(fs.mode){
+        case 'and':
+            if (joinOrToAllKey.length === 1) {
+                const firstJoinOrToAllKey = joinOrToAllKey[0];
+                // Remove firstJoinOrToAllKey from Array
+                fsKeys.splice(fsKeys.indexOf(firstJoinOrToAllKey), 1);
+                const firstJoinOrToAllObj = fs.root[firstJoinOrToAllKey];
+                // make sure type is or/ Union
+                if (firstJoinOrToAllObj.operator === 'or') {
+                    return {
+                        or: firstJoinOrToAllObj?.operands.map((orObj)=>{
+                            // go through each or statement and add all other filters to it
+                            return {
+                                and: [
+                                    convertFilterToNestedGqlFilter(orObj),
+                                    ...fsKeys.map((k)=>{
+                                        return convertFilterToNestedGqlFilter(fs.root[k]);
+                                    })
+                                ]
+                            };
+                        })
+                    };
+                } else {
+                    console.error(`function buildCohortGqlOperator expecting "or" received "${firstJoinOrToAllObj.operator}" on key "${firstJoinOrToAllKey}"`);
+                }
+            } else if (joinOrToAllKey.length > 1) {
+                console.error(`function buildCohortGqlOperator expecting only one joinOrToAll received: ${joinOrToAllKey.length}`, fsKeys);
+            }
+            return {
+                // TODO: Replace fixed AND with cohort top level operation like Union or Intersection
+                [fs.mode]: fsKeys.map((k)=>{
+                    return convertFilterToGqlFilter(fs.root[k]);
+                })
+            };
+        case 'or':
+            return {
+                [fs.mode]: fsKeys.map((k)=>{
+                    return convertFilterToGqlFilter(fs.root[k]);
+                })
+            };
+    }
 };
-
 /**
- *  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();
+ * Merged two FilterSets returning the merged pair.
+ * @param a - first FilterSet
+ * @param b - other FilterSet
+ */ const joinFilters = (a, b)=>{
     return {
-        name: newName,
-        id: newId,
-        filters: filters ?? {},
-        modified: false,
-        saved: false,
-        createdDatetime: ts,
-        modifiedDatetime: ts,
-        counts: {}
+        mode: a.mode,
+        root: {
+            ...a.root,
+            ...b.root
+        }
     };
 };
-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);
-            if (action.payload?.setAsCurrent) {
-                state.currentCohortId = cohort.id;
+const convertFilterSetToOperation = (fs)=>{
+    if (!fs) return undefined;
+    switch(fs.mode){
+        case 'and':
+            return Object.keys(fs.root).length == 0 ? undefined : {
+                operator: fs.mode,
+                operands: Object.keys(fs.root).map((k)=>{
+                    return fs.root[k];
+                })
+            };
+    }
+    return undefined;
+};
+const extractContents = (filter)=>{
+    if (isGQLUnion(filter)) {
+        return filter.or;
+    }
+    if (isGQLIntersection(filter)) {
+        return filter.and;
+    }
+    return undefined;
+};
+class ToGqlAllNested {
+    constructor(){
+        this.handleEquals = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '=': {
+                        [leafField]: op.operand
+                    }
+                });
             }
-        },
-        updateCohortName: (state, action)=>{
-            const { id, name } = action.payload;
-            cohortsAdapter.updateOne(state, {
-                id: id,
-                changes: {
-                    name: name,
-                    modified: true,
-                    modifiedDatetime: new Date().toISOString()
+            return {
+                '=': {
+                    [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
+            };
+        };
+        this.handleNotEquals = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '!=': {
+                        [leafField]: op.operand
+                    }
                 });
-                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];
+            return {
+                '!=': {
+                    [op.field]: op.operand
+                }
+            };
+        };
+        this.handleLessThan = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '<': {
+                        [leafField]: op.operand
+                    }
+                });
             }
-            if (action?.payload.shouldShowMessage) {
-                state.message = [
-                    `deleteCohort|${removedCohortName}|${state.currentCohortId}`
-                ];
+            return {
+                '<': {
+                    [op.field]: op.operand
+                }
+            };
+        };
+        this.handleLessThanOrEquals = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '<=': {
+                        [leafField]: op.operand
+                    }
+                });
             }
-        },
-        // 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;
+            return {
+                '<=': {
+                    [op.field]: op.operand
+                }
+            };
+        };
+        this.handleGreaterThan = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '>': {
+                        [leafField]: op.operand
+                    }
+                });
             }
-            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()
+            return {
+                '>': {
+                    [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;
+            };
+        };
+        this.handleGreaterThanOrEquals = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '>=': {
+                        [leafField]: op.operand
+                    }
+                });
             }
-            cohortsAdapter.updateOne(state, {
-                id: currentCohortId,
-                changes: {
-                    filters: {
-                        ...state.entities[currentCohortId].filters,
-                        [index]: filters
-                    },
-                    modified: true,
-                    modifiedDatetime: new Date().toISOString()
+            return {
+                '>=': {
+                    [op.field]: op.operand
                 }
-            });
-        },
-        setCohortIndexFilters: (state, action)=>{
-            const currentCohortId = getCurrentCohortId(state);
-            if (!state.entities[currentCohortId]) {
-                console.error(`no cohort with id=${currentCohortId} defined`);
-                return;
+            };
+        };
+        this.handleIncludes = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    in: {
+                        [leafField]: op.operands
+                    }
+                });
             }
-            cohortsAdapter.updateOne(state, {
-                id: currentCohortId,
-                changes: {
-                    filters: action.payload.filters,
-                    modified: true,
-                    modifiedDatetime: new Date().toISOString()
+            return {
+                in: {
+                    [op.field]: op.operands
                 }
-            });
-        },
-        // 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;
+            };
+        };
+        this.handleExcludes = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    exclude: {
+                        [leafField]: op.operands
+                    }
+                });
             }
-            const filters = state.entities[currentCohortId]?.filters[index]?.root;
-            if (!filters) {
-                return;
+            return {
+                exclude: {
+                    [op.field]: op.operands
+                }
+            };
+        };
+        this.handleExcludeIfAny = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    excludeifany: {
+                        [leafField]: op.operands
+                    }
+                });
             }
-            // 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()
+            return {
+                excludeifany: {
+                    [op.field]: op.operands
                 }
+            };
+        };
+        this.handleIntersection = (op)=>({
+                and: op.operands.map((x)=>convertFilterToGqlFilter(x))
             });
-        },
-        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.handleUnion = (op)=>({
+                or: op.operands.map((x)=>convertFilterToGqlFilter(x))
             });
-            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;
+        this.handleMissing = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    is: {
+                        [leafField]: 'MISSING'
+                    }
+                });
             }
-            cohortsAdapter.updateOne(state, {
-                id: currentCohortId,
-                changes: {
-                    filters: {
-                        ...state.entities[currentCohortId]?.filters,
-                        [index]: {
-                            mode: 'and',
-                            root: {}
-                        }
-                    },
-                    modified: true,
-                    modifiedDatetime: new Date().toISOString()
+            return {
+                is: {
+                    [op.field]: 'MISSING'
                 }
-            });
-        },
-        updateCohortCounts: (state, action)=>{
-            const currentCohortId = getCurrentCohortId(state);
-            const currentCohort = state.entities[currentCohortId];
-            cohortsAdapter.updateOne(state, {
-                id: currentCohortId,
-                changes: {
-                    counts: {
-                        ...currentCohort.counts,
-                        ...action.payload
+            };
+        };
+        this.handleExists = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    not: {
+                        [leafField]: op?.operand ?? null
                     }
+                });
+            }
+            return {
+                not: {
+                    [op.field]: op?.operand ?? null
                 }
-            });
-        },
-        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.handleNestedFilter = (op)=>{
+            const child = convertFilterToGqlFilter(op.operand);
+            return {
+                nested: {
+                    path: op.path,
+                    ...child
                 }
-            });
-        },
-        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
-                ]);
-            }
-        }
+            };
+        };
     }
-});
+}
+const convertFilterToNestedGqlFilter = (filter)=>{
+    const handler = new ToGqlAllNested();
+    return handleOperation(handler, filter);
+};
+const convertFilterSetToNestedGqlFilter = (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)=>convertFilterToNestedGqlFilter(fs.root[key]))
+    } : {
+        or: fsKeys.map((key)=>convertFilterToNestedGqlFilter(fs.root[key]))
+    };
+};
+
+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;
+};
 /**
- * Returns the selectors for the cohorts EntityAdapter
- * @param state - the CoreState
+ * 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.
  *
- * @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
-                }
-            };
-        },
-        toggleCohortBuilderAllFilters: (state, action)=>{
-            return {
-                ...state,
-                [action.payload.index]: Object.keys(state[action.payload.index]).reduce((acc, k)=>{
-                    acc[k] = action.payload.expand;
-                    return acc;
-                }, {})
-            };
-        }
+ *  @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: {}
+        };
     }
-});
-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)=>{
-            return {
-                ...state,
-                [action.payload.index]: {
-                    ...state[action.payload.index],
-                    [action.payload.field]: action.payload.mode
-                }
-            };
+    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;
         }
-    }
-});
-const cohortBuilderFiltersCombineModeReducer = expandSlice.reducer;
-const { setCohortFilterCombineMode } = expandSlice.actions;
-const selectCohortFilterCombineMode = (state, index, field)=>state.cohorts.filtersCombineMode?.[index]?.[field] ?? 'or';
+        return acc;
+    }, {
+        mode: 'and',
+        root: {}
+    });
+};
 
-const initialState = {
-    shouldShareFilters: false,
-    sharedFiltersMap: {}
+/**
+ *  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 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 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
 });
-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
+// Create an initial unsaved cohort
+const initialCohort = newCohort({
+    customName: DEFAULT_COHORT_NAME
 });
-
-const rootReducer = toolkit.combineReducers({
-    gen3Services: gen3ServicesReducer,
-    user: userReducer,
-    gen3Apps: gen3AppReducer,
-    drsHostnames: drsHostnamesReducer,
-    modals: modalReducer,
-    cohorts: cohortReducers,
-    activeWorkspace: activeWorkspaceReducer,
-    [guppyApiSliceReducerPath]: guppyApiReducer,
-    [userAuthApiReducerPath]: userAuthApiReducer,
-    [cartReducerPath]: cartReducer
+const emptyInitialState = cohortsAdapter.getInitialState({
+    currentCohortId: initialCohort.id,
+    message: undefined
 });
-
-/**
- * Flattens a deep nested JSON object skipping
- * the first level to avoid potentially flattening
- * non-nested data.
- * @param {JSON} json
- */ function flattenJson(json) {
-    const flattenedJson = [];
-    Object.keys(json).forEach((key)=>{
-        flattenedJson.push(flat.flatten(json[key], {
-            delimiter: '_'
-        }));
-    });
-    return flattenedJson;
-}
-/**
- * Converts JSON based on a config.
- * @param {JSON} json
- * @param {Object} config
- */ async function conversion(json, config) {
-    return Papa.unparse(json, config);
-}
+// Set the initial cohort in the adapter state
+const initialState$3 = cohortsAdapter.setOne(emptyInitialState, initialCohort);
+const getCurrentCohortId = (state)=>state.currentCohortId;
 /**
- * Converts JSON to a specified file format.
- * Defaults to JSON if file format is not supported.
- * @param {JSON} json
- * @param {string} format
- */ async function jsonToFormat(json, format) {
-    if (Object.keys(FILE_DELIMITERS).includes(format)) {
-        const flatJson = flattenJson(json);
-        const data = await conversion(flatJson, {
-            delimiter: FILE_DELIMITERS[format]
-        });
-        return data;
-    }
-    return json;
-}
-
-// type guard functions
-const isHistogramRangeData = (key)=>{
-    return Array.isArray(key) && key.length === 2 && key.every((item)=>typeof item === 'number');
-};
-const isJSONObject = (data)=>{
-    return typeof data === 'object' && data !== null && !Array.isArray(data);
-};
-const isJSONValue = (data)=>{
-    return typeof data === 'string' || typeof data === 'number' || typeof data === 'boolean' || Array.isArray(data) && data.every(isJSONValue) || isJSONObject(data);
-};
-const isJSONValueArray = (data)=>{
-    return Array.isArray(data) && data.every(isJSONValue);
-};
-const isValidObject = (input)=>typeof input === 'object' && input !== null;
-const isHistogramData = (data)=>{
-    return isValidObject(data) && 'key' in data && 'count' in data;
+ * 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);
+            if (action.payload?.setAsCurrent) {
+                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
+                ]);
+            }
+        }
+    }
+});
+/**
+ * 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
+                }
+            };
+        },
+        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)=>{
+            return {
+                ...state,
+                [action.payload.index]: {
+                    ...state[action.payload.index],
+                    [action.payload.field]: action.payload.mode
+                }
+            };
+        }
+    }
+});
+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 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,
+    [cartReducerPath]: cartReducer
+});
+
+/**
+ * Flattens a deep nested JSON object skipping
+ * the first level to avoid potentially flattening
+ * non-nested data.
+ * @param {JSON} json
+ */ function flattenJson(json) {
+    const flattenedJson = [];
+    Object.keys(json).forEach((key)=>{
+        flattenedJson.push(flat.flatten(json[key], {
+            delimiter: '_'
+        }));
+    });
+    return flattenedJson;
+}
+/**
+ * Converts JSON based on a config.
+ * @param {JSON} json
+ * @param {Object} config
+ */ async function conversion(json, config) {
+    return Papa.unparse(json, config);
+}
+/**
+ * Converts JSON to a specified file format.
+ * Defaults to JSON if file format is not supported.
+ * @param {JSON} json
+ * @param {string} format
+ */ async function jsonToFormat(json, format) {
+    if (Object.keys(FILE_DELIMITERS).includes(format)) {
+        const flatJson = flattenJson(json);
+        const data = await conversion(flatJson, {
+            delimiter: FILE_DELIMITERS[format]
+        });
+        return data;
+    }
+    return json;
+}
+
+// type guard functions
+const isHistogramRangeData = (key)=>{
+    return Array.isArray(key) && key.length === 2 && key.every((item)=>typeof item === 'number');
+};
+const isJSONObject = (data)=>{
+    return typeof data === 'object' && data !== null && !Array.isArray(data);
+};
+const isJSONValue = (data)=>{
+    return typeof data === 'string' || typeof data === 'number' || typeof data === 'boolean' || Array.isArray(data) && data.every(isJSONValue) || isJSONObject(data);
+};
+const isJSONValueArray = (data)=>{
+    return Array.isArray(data) && data.every(isJSONValue);
+};
+const isValidObject = (input)=>typeof input === 'object' && input !== null;
+const isHistogramData = (data)=>{
+    return isValidObject(data) && 'key' in data && 'count' in data;
 };
 const isHistogramDataArray = (input)=>{
     if (!isValidObject(input) || !Array.isArray(input.histogram)) {
@@ -2341,10 +2658,8 @@ const isStatsValue = (item)=>{
         'stddev',
         'median'
     ];
-    for (const field of numericFields){
-        if (field in obj && typeof obj[field] !== 'number') {
-            return false;
-        }
+    if (!numericFields.some((field)=>field in obj && typeof obj[field] !== 'number')) {
+        return false;
     }
     // Check percentiles structure if present
     if ('percentiles' in obj) {
@@ -2352,17 +2667,6 @@ const isStatsValue = (item)=>{
         if (typeof percentiles !== 'object' || percentiles === null) {
             return false;
         }
-        const pObj = percentiles;
-        const requiredPercentiles = [
-            'p25',
-            'p50',
-            'p75'
-        ];
-        for (const p of requiredPercentiles){
-            if (p in pObj && typeof pObj[p] !== 'number') {
-                return false;
-            }
-        }
     }
     return true;
 };
@@ -2607,443 +2911,168 @@ const groupSharedFields = (data)=>{
             x.count = x.count < minValue ? -1 : x.count;
         });
     });
-    return data;
-};
-
-const customQueryStrForField = (field, query, depth = 0)=>{
-    const indent = '  '.repeat(depth);
-    const splittedFieldArray = field.split('.');
-    const splittedField = splittedFieldArray.shift();
-    if (splittedFieldArray.length === 0) {
-        return `${indent}${splittedField} ${query}`;
-    }
-    return `${indent}${splittedField} {
-${customQueryStrForField(splittedFieldArray.join('.'), query, depth + 1)}
-${indent}}`;
-};
-// TODO: refactor the function below using customQueryStrForEachField and a wrapper function that passes the query
-const histogramQueryStrForEachField = (field)=>{
-    const splittedFieldArray = field.split('.');
-    const splittedField = splittedFieldArray.shift();
-    if (splittedFieldArray.length === 0) {
-        return `
-    ${splittedField} {
-      histogram {
-        key
-        count
-      }
-    }`;
-    }
-    return `
-  ${splittedField} {
-    ${histogramQueryStrForEachField(splittedFieldArray.join('.'))}
-  }`;
-};
-const statsQueryStrForEachField = (field)=>{
-    const splittedFieldArray = field.split('.');
-    const splittedField = splittedFieldArray.shift();
-    if (splittedFieldArray.length === 0) {
-        return `
-    ${splittedField} {
-      histogram {
-                count
-                min
-                max
-                avg
-                sum
-      }
-    }`;
-    }
-    return `
-  ${splittedField} {
-    ${statsQueryStrForEachField(splittedFieldArray.join('.'))}
-  }`;
-};
-const nestedHistogramQueryStrForEachField = (mainField, numericAggAsText)=>`
-  ${mainField} {
-    ${numericAggAsText ? 'asTextHistogram' : 'histogram'} {
-      key
-      count
-      missingFields {
-        field
-        count
-      }
-      termsFields {
-        field
-        count
-        terms {
-          key
-          count
-        }
-      }
-    }
-  }`;
-const rawDataQueryStrForEachField$1 = (field)=>{
-    const splitFieldArray = field.split('.');
-    const splitField = splitFieldArray.shift();
-    if (splitFieldArray.length === 0) {
-        return `
-    ${splitField}
-    `;
-    }
-    return `
-  ${splitField} {
-    ${rawDataQueryStrForEachField$1(splitFieldArray.join('.'))}
-  }`;
-};
-
-const convertNumericFromToArrayToFilters = (field, range, isNested = true)=>{
-    const { from, to } = range;
-    return {
-        operator: 'and',
-        operands: [
-            isNested ? buildNestedFilterForOperation(field, {
-                operator: '>=',
-                field,
-                operand: from
-            }) : {
-                operator: '>=',
-                field,
-                operand: from
-            },
-            isNested ? buildNestedFilterForOperation(field, {
-                operator: '<',
-                field,
-                operand: to
-            }) : {
-                operator: '<',
-                field,
-                operand: to
-            }
-        ]
-    };
-};
-const rawDataQueryStrForEachField = (field, asTextHistogram = false)=>{
-    const splitFieldArray = field.split('.');
-    const splitField = splitFieldArray.shift();
-    let middleQuery = '';
-    if (splitFieldArray.length === 0) {
-        middleQuery = `${splitField} { ${asTextHistogram ? 'histogram: asTextHistogram' : 'histogram'} { count } }`;
-    } else {
-        middleQuery = `${splitField} { ${rawDataQueryStrForEachField(splitFieldArray.join('.'), asTextHistogram)} }`;
-    }
-    return middleQuery;
-};
-const buildAliasedNestedCountsQuery = ({ type, field, rangeName, asTextHistogram = false })=>{
-    const dataParams = [
-        `filter: $${rangeName}`
-    ];
-    const dataTypeLine = `${rangeName} : ${type} (accessibility: $accessibility ${dataParams}) {`;
-    const processedFields = rawDataQueryStrForEachField(field, asTextHistogram);
-    return `${dataTypeLine} ${processedFields} }`;
-};
-const buildRangeFilters = (field, ranges, filters, rangeBaseName, isNested = true)=>{
-    return Object.entries(ranges).reduce((acc, [, rangeValue], idx)=>{
-        acc[`${rangeBaseName}_${idx}`] = {
-            mode: filters.mode,
-            root: {
-                ...filters.root,
-                [field]: convertNumericFromToArrayToFilters(field, rangeValue, isNested)
-            }
-        };
-        return acc;
-    }, {});
-};
-const buildRangeQuery = (field, ranges, filters, rangeBaseName = 'range', index = 'cases', indexPrefix = '', isNested = true, asTextHistogram = false)=>{
-    const rangeFilters = buildRangeFilters(field, ranges, filters, rangeBaseName, isNested);
-    let query = `query rangeQuery ($accessibility: Accessibility, ${Object.keys(rangeFilters).map((rangeKey)=>`$${rangeKey}: JSON`).join(',')} ) { ${indexPrefix}_aggregation {`;
-    Object.keys(rangeFilters).forEach((rangeKey)=>{
-        const rangeQuery = buildAliasedNestedCountsQuery({
-            type: index,
-            field,
-            rangeName: rangeKey,
-            asTextHistogram
-        });
-        query += rangeQuery + ' \n';
-    });
-    query += `}}`;
-    return {
-        query: query,
-        filters: rangeFilters
-    };
-};
-
-const { selectAll: selectAllCohorts, selectTotal: selectTotalCohorts, selectById: selectCohortById, selectIds: selectCohortIds } = cohortsAdapter.getSelectors((state)=>state.cohorts.cohortManager);
-/**
- * Internally used selector for the exported selectora
- * @param state
- */ const getCurrentCohortFromCoreState = (state)=>{
-    return state.cohorts.cohortManager.currentCohortId;
-};
-const selectCohortFilters = (state)=>{
-    const currentCohortId = getCurrentCohortFromCoreState(state);
-    return state.cohorts.cohortManager.entities[currentCohortId]?.filters;
-};
-const selectCurrentCohortFilters = (state)=>{
-    const currentCohortId = getCurrentCohortFromCoreState(state);
-    return state.cohorts.cohortManager.entities[currentCohortId]?.filters;
-};
-const selectCurrentCohortId = (state)=>{
-    return state.cohorts.cohortManager.currentCohortId;
-};
-const selectCurrentCohort = (state)=>cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
-const selectCurrentCohortName = (state)=>cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state)).name;
-/**
- * Select a filter by its name from the current cohort. If the filter is not found
- * returns undefined.
- * @param state - Core
- * @param index which cohort index to select from
- * @param name name of the filter to select
- */ const selectIndexedFilterByName = (state, index, name)=>{
-    return cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state)).filters[index]?.root[name];
+    return data;
 };
-/**
- * Returns all the cohorts in the state
- * @param state - the CoreState
- *
- * @category Cohort
- * @category Selectors
- */ const selectAvailableCohorts = (state)=>cohortSelectors.selectAll(state);
-/**
- * Returns if the current cohort is modified
- * @param state - the CoreState
- * @category Cohort
- * @category Selectors
- * @hidden
- */ const selectCurrentCohortModified = (state)=>{
-    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
-    return cohort?.modified;
+
+const customQueryStrForField = (field, query, depth = 0)=>{
+    const indent = '  '.repeat(depth);
+    const splittedFieldArray = field.split('.');
+    const splittedField = splittedFieldArray.shift();
+    if (splittedFieldArray.length === 0) {
+        return `${indent}${splittedField} ${query}`;
+    }
+    return `${indent}${splittedField} {
+${customQueryStrForField(splittedFieldArray.join('.'), query, depth + 1)}
+${indent}}`;
 };
-/**
- * Returns if the current cohort has been saved
- * @param state - the CoreState
- * @category Cohort
- * @category Selectors
- * @hidden
- */ const selectCurrentCohortSaved = (state)=>{
-    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
-    return cohort?.saved;
+// TODO: refactor the function below using customQueryStrForEachField and a wrapper function that passes the query
+const histogramQueryStrForEachField = (field)=>{
+    const splittedFieldArray = field.split('.');
+    const splittedField = splittedFieldArray.shift();
+    if (splittedFieldArray.length === 0) {
+        return `
+    ${splittedField} {
+      histogram {
+        key
+        count
+      }
+    }`;
+    }
+    return `
+  ${splittedField} {
+    ${histogramQueryStrForEachField(splittedFieldArray.join('.'))}
+  }`;
 };
-/**
- * Select a filter by its name from the current cohort. If the filter is not found
- * returns undefined.
- * @param state - Core
- * @param name name of the filter to select
- */ const selectAvailableCohortByName = (state, name)=>cohortSelectors.selectAll(state).find((cohort)=>cohort.name === name);
-/**
- * Select a filter from the index.
- * returns undefined.
- * @param state - Core
- * @param index which cohort index to select from
- */ const selectIndexFilters = (state, index)=>{
-    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
-    if (!cohort) {
-        console.error('No Cohort Defined');
+const statsQueryStrForEachField = (field)=>{
+    const splittedFieldArray = field.split('.');
+    const splittedField = splittedFieldArray.shift();
+    if (splittedFieldArray.length === 0) {
+        return `
+    ${splittedField} {
+      histogram {
+                count
+                min
+                max
+                avg
+                sum
+      }
+    }`;
     }
-    return cohort?.filters?.[index] ?? EmptyFilterSet;
+    return `
+  ${splittedField} {
+    ${statsQueryStrForEachField(splittedFieldArray.join('.'))}
+  }`;
 };
-
-class ToGqlAllNested {
-    constructor(){
-        this.handleEquals = (op)=>{
-            if (op.field.includes('.')) {
-                const leafField = op.field.split('.').at(-1) ?? 'unset';
-                return buildNestedGQLFilter(op.field, {
-                    '=': {
-                        [leafField]: op.operand
-                    }
-                });
-            }
-            return {
-                '=': {
-                    [op.field]: op.operand
-                }
-            };
-        };
-        this.handleNotEquals = (op)=>{
-            if (op.field.includes('.')) {
-                const leafField = op.field.split('.').at(-1) ?? 'unset';
-                return buildNestedGQLFilter(op.field, {
-                    '!=': {
-                        [leafField]: op.operand
-                    }
-                });
-            }
-            return {
-                '!=': {
-                    [op.field]: op.operand
-                }
-            };
-        };
-        this.handleLessThan = (op)=>{
-            if (op.field.includes('.')) {
-                const leafField = op.field.split('.').at(-1) ?? 'unset';
-                return buildNestedGQLFilter(op.field, {
-                    '<': {
-                        [leafField]: op.operand
-                    }
-                });
-            }
-            return {
-                '<': {
-                    [op.field]: op.operand
-                }
-            };
-        };
-        this.handleLessThanOrEquals = (op)=>{
-            if (op.field.includes('.')) {
-                const leafField = op.field.split('.').at(-1) ?? 'unset';
-                return buildNestedGQLFilter(op.field, {
-                    '<=': {
-                        [leafField]: op.operand
-                    }
-                });
-            }
-            return {
-                '<=': {
-                    [op.field]: op.operand
-                }
-            };
-        };
-        this.handleGreaterThan = (op)=>{
-            if (op.field.includes('.')) {
-                const leafField = op.field.split('.').at(-1) ?? 'unset';
-                return buildNestedGQLFilter(op.field, {
-                    '>': {
-                        [leafField]: op.operand
-                    }
-                });
-            }
-            return {
-                '>': {
-                    [op.field]: op.operand
-                }
-            };
-        };
-        this.handleGreaterThanOrEquals = (op)=>{
-            if (op.field.includes('.')) {
-                const leafField = op.field.split('.').at(-1) ?? 'unset';
-                return buildNestedGQLFilter(op.field, {
-                    '>=': {
-                        [leafField]: op.operand
-                    }
-                });
-            }
-            return {
-                '>=': {
-                    [op.field]: op.operand
-                }
-            };
-        };
-        this.handleIncludes = (op)=>{
-            if (op.field.includes('.')) {
-                const leafField = op.field.split('.').at(-1) ?? 'unset';
-                return buildNestedGQLFilter(op.field, {
-                    in: {
-                        [leafField]: op.operands
-                    }
-                });
-            }
-            return {
-                in: {
-                    [op.field]: op.operands
-                }
-            };
-        };
-        this.handleExcludes = (op)=>{
-            if (op.field.includes('.')) {
-                const leafField = op.field.split('.').at(-1) ?? 'unset';
-                return buildNestedGQLFilter(op.field, {
-                    exclude: {
-                        [leafField]: op.operands
-                    }
-                });
-            }
-            return {
-                exclude: {
-                    [op.field]: op.operands
-                }
-            };
-        };
-        this.handleExcludeIfAny = (op)=>{
-            if (op.field.includes('.')) {
-                const leafField = op.field.split('.').at(-1) ?? 'unset';
-                return buildNestedGQLFilter(op.field, {
-                    excludeifany: {
-                        [leafField]: op.operands
-                    }
-                });
-            }
-            return {
-                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)=>{
-            if (op.field.includes('.')) {
-                const leafField = op.field.split('.').at(-1) ?? 'unset';
-                return buildNestedGQLFilter(op.field, {
-                    is: {
-                        [leafField]: 'MISSING'
-                    }
-                });
+const nestedHistogramQueryStrForEachField = (mainField, numericAggAsText)=>`
+  ${mainField} {
+    ${numericAggAsText ? 'asTextHistogram' : 'histogram'} {
+      key
+      count
+      missingFields {
+        field
+        count
+      }
+      termsFields {
+        field
+        count
+        terms {
+          key
+          count
+        }
+      }
+    }
+  }`;
+const rawDataQueryStrForEachField$1 = (field)=>{
+    const splitFieldArray = field.split('.');
+    const splitField = splitFieldArray.shift();
+    if (splitFieldArray.length === 0) {
+        return `
+    ${splitField}
+    `;
+    }
+    return `
+  ${splitField} {
+    ${rawDataQueryStrForEachField$1(splitFieldArray.join('.'))}
+  }`;
+};
+
+const convertNumericFromToArrayToFilters = (field, range, isNested = true)=>{
+    const { from, to } = range;
+    return {
+        operator: 'and',
+        operands: [
+            isNested ? buildNestedFilterForOperation(field, {
+                operator: '>=',
+                field,
+                operand: from
+            }) : {
+                operator: '>=',
+                field,
+                operand: from
+            },
+            isNested ? buildNestedFilterForOperation(field, {
+                operator: '<',
+                field,
+                operand: to
+            }) : {
+                operator: '<',
+                field,
+                operand: to
             }
-            return {
-                is: {
-                    [op.field]: 'MISSING'
-                }
-            };
-        };
-        this.handleExists = (op)=>{
-            if (op.field.includes('.')) {
-                const leafField = op.field.split('.').at(-1) ?? 'unset';
-                return buildNestedGQLFilter(op.field, {
-                    not: {
-                        [leafField]: op?.operand ?? null
-                    }
-                });
+        ]
+    };
+};
+const rawDataQueryStrForEachField = (field, asTextHistogram = false)=>{
+    const splitFieldArray = field.split('.');
+    const splitField = splitFieldArray.shift();
+    let middleQuery = '';
+    if (splitFieldArray.length === 0) {
+        middleQuery = `${splitField} { ${asTextHistogram ? 'histogram: asTextHistogram' : 'histogram'} { count } }`;
+    } else {
+        middleQuery = `${splitField} { ${rawDataQueryStrForEachField(splitFieldArray.join('.'), asTextHistogram)} }`;
+    }
+    return middleQuery;
+};
+const buildAliasedNestedCountsQuery = ({ type, field, rangeName, asTextHistogram = false })=>{
+    const dataParams = [
+        `filter: $${rangeName}`
+    ];
+    const dataTypeLine = `${rangeName} : ${type} (accessibility: $accessibility ${dataParams}) {`;
+    const processedFields = rawDataQueryStrForEachField(field, asTextHistogram);
+    return `${dataTypeLine} ${processedFields} }`;
+};
+const buildRangeFilters = (field, ranges, filters, rangeBaseName, isNested = true)=>{
+    return Object.entries(ranges).reduce((acc, [, rangeValue], idx)=>{
+        acc[`${rangeBaseName}_${idx}`] = {
+            mode: filters.mode,
+            root: {
+                ...filters.root,
+                [field]: convertNumericFromToArrayToFilters(field, rangeValue, isNested)
             }
-            return {
-                not: {
-                    [op.field]: op?.operand ?? null
-                }
-            };
-        };
-        this.handleNestedFilter = (op)=>{
-            const child = convertFilterToGqlFilter(op.operand);
-            return {
-                nested: {
-                    path: op.path,
-                    ...child
-                }
-            };
         };
-    }
-}
-const convertFilterToNestedGqlFilter = (filter)=>{
-    const handler = new ToGqlAllNested();
-    return handleOperation(handler, filter);
+        return acc;
+    }, {});
 };
-const convertFilterSetToNestedGqlFilter = (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)=>convertFilterToNestedGqlFilter(fs.root[key]))
-    } : {
-        or: fsKeys.map((key)=>convertFilterToNestedGqlFilter(fs.root[key]))
+const buildRangeQuery = (field, ranges, filters, rangeBaseName = 'range', index = 'cases', indexPrefix = '', isNested = true, asTextHistogram = false)=>{
+    const rangeFilters = buildRangeFilters(field, ranges, filters, rangeBaseName, isNested);
+    let query = `query rangeQuery ($accessibility: Accessibility, ${Object.keys(rangeFilters).map((rangeKey)=>`$${rangeKey}: JSON`).join(',')} ) { ${indexPrefix}_aggregation {`;
+    Object.keys(rangeFilters).forEach((rangeKey)=>{
+        const rangeQuery = buildAliasedNestedCountsQuery({
+            type: index,
+            field,
+            rangeName: rangeKey,
+            asTextHistogram
+        });
+        query += rangeQuery + ' \n';
+    });
+    query += `}}`;
+    return {
+        query: query,
+        filters: rangeFilters
     };
 };
 
+const GUPPY_MAX_ITEMS = 10000;
 const statusEndpoint = '/_status';
 const fetchJson = async (url)=>{
     const res = await fetch(url, {
@@ -3395,6 +3424,34 @@ const explorerTags = guppyApi.enhanceEndpoints({
                     };
                 }
             }),
+            getObjectIds: builder.query({
+                query: ({ filters, field, index, indexPrefix = '', accessibility = Accessibility.ALL, limit = GUPPY_MAX_ITEMS })=>{
+                    const gqlFilter = convertFilterSetToGqlFilter(filters);
+                    const query = `query getObjectIds ($filter: JSON) {
+          ${indexPrefix}${index} (filter: $filter, accessibility: ${accessibility}, first: ${limit}) {
+              ${rawDataQueryStrForEachField$1(field)}
+              }
+           }`;
+                    return {
+                        query,
+                        variables: {
+                            filter: gqlFilter,
+                            accessibility
+                        }
+                    };
+                },
+                transformResponse: (response, _, args)=>{
+                    const valueData = jsonpathPlus.JSONPath({
+                        json: response?.data ?? [],
+                        path: `$..${args.field}`,
+                        resultType: 'value'
+                    });
+                    return {
+                        ids: valueData,
+                        index: args.index
+                    };
+                }
+            }),
             generalGQL: builder.query({
                 query: ({ query, variables })=>{
                     return {
@@ -3460,7 +3517,7 @@ const buildGetStatsAggregationQuery = (type, fields, filters, accessibility = Ac
     };
     return queryBody;
 };
-const { useGetRawDataAndTotalCountsQuery, useGetAccessibleDataQuery, useGetAllFieldsForTypeQuery, useGetAggsQuery, useLazyGetAggsQuery, useGetStatsAggregationsQuery, useLazyGetStatsAggregationsQuery, useGetSubAggsQuery, useGetCountsQuery, useLazyGetCountsQuery, useGetFieldCountSummaryQuery, useGetFieldsForIndexQuery, useGetSharedFieldsForIndexQuery, useGeneralGQLQuery, useLazyGeneralGQLQuery, useCustomRangeQuery, useLazyCustomRangeQuery } = explorerApi;
+const { useGetRawDataAndTotalCountsQuery, useGetAccessibleDataQuery, useGetAllFieldsForTypeQuery, useGetAggsQuery, useLazyGetAggsQuery, useGetStatsAggregationsQuery, useLazyGetStatsAggregationsQuery, useGetSubAggsQuery, useGetCountsQuery, useLazyGetCountsQuery, useGetFieldCountSummaryQuery, useGetFieldsForIndexQuery, useGetSharedFieldsForIndexQuery, useGeneralGQLQuery, useLazyGeneralGQLQuery, useCustomRangeQuery, useLazyCustomRangeQuery, useGetObjectIdsQuery, useLazyGetObjectIdsQuery } = explorerApi;
 
 /**
  * Defines coreListeners for adding middleware.
@@ -4030,6 +4087,81 @@ class CohortStorage {
     }
 }
 
+const { selectAll: selectAllCohorts, selectTotal: selectTotalCohorts, selectById: selectCohortById, selectIds: selectCohortIds } = cohortsAdapter.getSelectors((state)=>state.cohorts.cohortManager);
+/**
+ * Internally used selector for the exported selectora
+ * @param state
+ */ const getCurrentCohortFromCoreState = (state)=>{
+    return state.cohorts.cohortManager.currentCohortId;
+};
+const selectCohortFilters = (state)=>{
+    const currentCohortId = getCurrentCohortFromCoreState(state);
+    return state.cohorts.cohortManager.entities[currentCohortId]?.filters;
+};
+const selectCurrentCohortFilters = (state)=>{
+    const currentCohortId = getCurrentCohortFromCoreState(state);
+    return state.cohorts.cohortManager.entities[currentCohortId]?.filters;
+};
+const selectCurrentCohortId = (state)=>{
+    return state.cohorts.cohortManager.currentCohortId;
+};
+const selectCurrentCohort = (state)=>cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
+const selectCurrentCohortName = (state)=>cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state)).name;
+/**
+ * Select a filter by its name from the current cohort. If the filter is not found
+ * returns undefined.
+ * @param state - Core
+ * @param index which cohort index to select from
+ * @param name name of the filter to select
+ */ const selectIndexedFilterByName = (state, index, name)=>{
+    return cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state)).filters[index]?.root[name];
+};
+/**
+ * Returns all the cohorts in the state
+ * @param state - the CoreState
+ *
+ * @category Cohort
+ * @category Selectors
+ */ const selectAvailableCohorts = (state)=>cohortSelectors.selectAll(state);
+/**
+ * Returns if the current cohort is modified
+ * @param state - the CoreState
+ * @category Cohort
+ * @category Selectors
+ * @hidden
+ */ const selectCurrentCohortModified = (state)=>{
+    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
+    return cohort?.modified;
+};
+/**
+ * Returns if the current cohort has been saved
+ * @param state - the CoreState
+ * @category Cohort
+ * @category Selectors
+ * @hidden
+ */ const selectCurrentCohortSaved = (state)=>{
+    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
+    return cohort?.saved;
+};
+/**
+ * Select a filter by its name from the current cohort. If the filter is not found
+ * returns undefined.
+ * @param state - Core
+ * @param name name of the filter to select
+ */ const selectAvailableCohortByName = (state, name)=>cohortSelectors.selectAll(state).find((cohort)=>cohort.name === name);
+/**
+ * Select a filter from the index.
+ * returns undefined.
+ * @param state - Core
+ * @param index which cohort index to select from
+ */ const selectIndexFilters = (state, index)=>{
+    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
+    if (!cohort) {
+        console.error('No Cohort Defined');
+    }
+    return cohort?.filters?.[index] ?? EmptyFilterSet;
+};
+
 const isFileItem = (item)=>{
     return item && 'guid' in item;
 };
@@ -6298,6 +6430,87 @@ class ConfigRegistry {
 }
 const configRegistry = new ConfigRegistry();
 
+const DAYS_IN_DECADE = 3652; // Note: an approximation
+const cohortFacetSlice = graphQLAPI.injectEndpoints({
+    endpoints: (builder)=>({
+            cohortFacets: builder.query({
+                query: ({ index, facetFields, continuousFacets, primaryCohort, comparisonCohort })=>({
+                        url: `${GEN3_ANALYSIS_API}/compare/facets`,
+                        method: 'POST',
+                        body: {
+                            doc_type: index,
+                            cohort1: primaryCohort,
+                            cohort2: comparisonCohort,
+                            facets: facetFields,
+                            interval: continuousFacets.reduce((acc, x)=>{
+                                acc[x] = DAYS_IN_DECADE;
+                                return acc;
+                            }, {})
+                        }
+                    }),
+                transformResponse: (response)=>{
+                    const facets1 = response?.cohort1?.facets;
+                    const facets2 = response?.cohort2?.facets;
+                    return {
+                        aggregations: [
+                            facets1,
+                            facets2
+                        ]
+                    };
+                }
+            })
+        })
+});
+const { useCohortFacetsQuery } = cohortFacetSlice;
+
+const vennDiagramApiSlice = graphQLAPI.injectEndpoints({
+    endpoints: (builder)=>({
+            vennDiagram: builder.query({
+                query: (queryParameters)=>{
+                    return {
+                        url: `${GEN3_ANALYSIS_API}/compare/intersection`,
+                        method: 'POST',
+                        body: JSON.stringify({
+                            cohort1: queryParameters.set1Filters,
+                            cohort2: queryParameters.set2Filters,
+                            doc_type: queryParameters.index
+                        })
+                    };
+                },
+                transformResponse: (response)=>({
+                        set1: response?.cohort1,
+                        set2: response?.cohort2,
+                        intersection: response?.intersection
+                    })
+            })
+        })
+});
+const { useVennDiagramQuery } = vennDiagramApiSlice;
+
+const graphQLQuery = `
+    query pValue($data: [[Int]]!) {
+      analysis {
+        pvalue(data: $data)
+      }
+    }
+  `;
+const pValueSlice = graphQLAPI.injectEndpoints({
+    endpoints: (builder)=>({
+            pValue: builder.query({
+                query: (data)=>({
+                        url: `${GEN3_ANALYSIS_API}/pvalue`,
+                        method: 'POST',
+                        body: {
+                            query: graphQLQuery,
+                            variables: data
+                        }
+                    }),
+                transformResponse: (response)=>response?.data?.analysis.pvalue
+            })
+        })
+});
+const { usePValueQuery } = pValueSlice;
+
 exports.Accessibility = Accessibility;
 exports.CART_LIMIT = CART_LIMIT;
 exports.CohortStorage = CohortStorage;
@@ -6334,17 +6547,20 @@ exports.Modals = Modals;
 exports.PodConditionType = PodConditionType;
 exports.PodStatus = PodStatus;
 exports.RequestedWorkspaceStatus = RequestedWorkspaceStatus;
+exports.ToGqlAllNested = ToGqlAllNested;
 exports.ToGqlHandler = ToGqlHandler;
 exports.ValueExtractorHandler = ValueExtractorHandler;
 exports.WorkspaceStatus = WorkspaceStatus;
 exports.addItemsToCart = addItemsToCart;
 exports.ageDisplay = ageDisplay;
 exports.appendFilterToOperation = appendFilterToOperation;
+exports.buildCohortGqlOperator = buildCohortGqlOperator;
 exports.buildGetAggregationQuery = buildGetAggregationQuery;
 exports.buildGetStatsAggregationQuery = buildGetStatsAggregationQuery;
 exports.buildListItemsGroupedByDataset = buildListItemsGroupedByDataset;
 exports.buildNestedFilterForOperation = buildNestedFilterForOperation;
 exports.buildNestedGQLFilter = buildNestedGQLFilter;
+exports.buildNestedWithParentPathGQLFilter = buildNestedWithParentPathGQLFilter;
 exports.buildRangeQuery = buildRangeQuery;
 exports.calculatePercentageAsNumber = calculatePercentageAsNumber;
 exports.calculatePercentageAsString = calculatePercentageAsString;
@@ -6357,7 +6573,10 @@ exports.cohortReducer = cohortReducer;
 exports.configRegistry = configRegistry;
 exports.conversion = conversion;
 exports.convertFilterSetToGqlFilter = convertFilterSetToGqlFilter;
+exports.convertFilterSetToNestedGqlFilter = convertFilterSetToNestedGqlFilter;
+exports.convertFilterSetToOperation = convertFilterSetToOperation;
 exports.convertFilterToGqlFilter = convertFilterToGqlFilter;
+exports.convertFilterToNestedGqlFilter = convertFilterToNestedGqlFilter;
 exports.convertGqlFilterToFilter = convertGqlFilterToFilter;
 exports.convertToHistogramDataAsStringKey = convertToHistogramDataAsStringKey;
 exports.convertToQueryString = convertToQueryString;
@@ -6376,6 +6595,7 @@ exports.drsHostnamesReducer = drsHostnamesReducer;
 exports.duplicateCohort = duplicateCohort;
 exports.explorerApi = explorerApi;
 exports.explorerTags = explorerTags;
+exports.extractContents = extractContents;
 exports.extractEnumFilterValue = extractEnumFilterValue;
 exports.extractFieldNameFromFullFieldName = extractFieldNameFromFullFieldName;
 exports.extractFileDatasetsInRecords = extractFileDatasetsInRecords;
@@ -6390,7 +6610,7 @@ exports.fetchFencePresignedURL = fetchFencePresignedURL;
 exports.fetchJSONDataFromURL = fetchJSONDataFromURL;
 exports.fetchJson = fetchJson;
 exports.fetchUserState = fetchUserState;
-exports.fieldNameToTitle = fieldNameToTitle;
+exports.fieldNameToLabel = fieldNameToLabel;
 exports.filterSetToOperation = filterSetToOperation;
 exports.gen3Api = gen3Api;
 exports.generateUniqueName = generateUniqueName;
@@ -6463,6 +6683,7 @@ exports.isTimeGreaterThan = isTimeGreaterThan;
 exports.isUnion = isUnion;
 exports.isWorkspaceActive = isWorkspaceActive;
 exports.isWorkspaceRunningOrStopping = isWorkspaceRunningOrStopping;
+exports.joinFilters = joinFilters;
 exports.jsonToFormat = jsonToFormat;
 exports.listifyMethodsFromMapping = listifyMethodsFromMapping;
 exports.logoutFence = logoutFence;
@@ -6547,7 +6768,7 @@ exports.stringifyJSONParam = stringifyJSONParam;
 exports.submissionApi = submissionApi;
 exports.toggleCohortBuilderAllFilters = toggleCohortBuilderAllFilters;
 exports.toggleCohortBuilderCategoryFilter = toggleCohortBuilderCategoryFilter;
-exports.trimFirstFieldNameToTitle = trimFirstFieldNameToTitle;
+exports.trimFirstfieldNameToLabel = trimFirstfieldNameToLabel;
 exports.updateCohortFilter = updateCohortFilter;
 exports.updateCohortName = updateCohortName;
 exports.useAddCohortManifestMutation = useAddCohortManifestMutation;
@@ -6556,6 +6777,7 @@ exports.useAddMetadataManifestMutation = useAddMetadataManifestMutation;
 exports.useAddNewCredentialMutation = useAddNewCredentialMutation;
 exports.useAskQuestionMutation = useAskQuestionMutation;
 exports.useAuthorizeFromCredentialsMutation = useAuthorizeFromCredentialsMutation;
+exports.useCohortFacetsQuery = useCohortFacetsQuery;
 exports.useCoreDispatch = useCoreDispatch;
 exports.useCoreSelector = useCoreSelector;
 exports.useCreateAuthzResourceMutation = useCreateAuthzResourceMutation;
@@ -6598,6 +6820,7 @@ exports.useGetManifestServiceStatusQuery = useGetManifestServiceStatusQuery;
 exports.useGetMetadataByIdQuery = useGetMetadataByIdQuery;
 exports.useGetMetadataFromManifestQuery = useGetMetadataFromManifestQuery;
 exports.useGetMetadataManifestQuery = useGetMetadataManifestQuery;
+exports.useGetObjectIdsQuery = useGetObjectIdsQuery;
 exports.useGetPresignedUrlQuery = useGetPresignedUrlQuery;
 exports.useGetProjectsDetailsQuery = useGetProjectsDetailsQuery;
 exports.useGetProjectsQuery = useGetProjectsQuery;
@@ -6633,6 +6856,7 @@ exports.useLazyGetCrosswalkDataQuery = useLazyGetCrosswalkDataQuery;
 exports.useLazyGetDownloadQuery = useLazyGetDownloadQuery;
 exports.useLazyGetExternalLoginsQuery = useLazyGetExternalLoginsQuery;
 exports.useLazyGetManifestServiceStatusQuery = useLazyGetManifestServiceStatusQuery;
+exports.useLazyGetObjectIdsQuery = useLazyGetObjectIdsQuery;
 exports.useLazyGetPresignedUrlQuery = useLazyGetPresignedUrlQuery;
 exports.useLazyGetProjectsQuery = useLazyGetProjectsQuery;
 exports.useLazyGetSowerJobListQuery = useLazyGetSowerJobListQuery;
@@ -6640,6 +6864,7 @@ exports.useLazyGetStatsAggregationsQuery = useLazyGetStatsAggregationsQuery;
 exports.useLazyGetSubmissionGraphQLQuery = useLazyGetSubmissionGraphQLQuery;
 exports.useLazyIsExternalConnectedQuery = useLazyIsExternalConnectedQuery;
 exports.useLazyRequestQuery = useLazyRequestQuery;
+exports.usePValueQuery = usePValueQuery;
 exports.usePrevious = usePrevious;
 exports.useRemoveCredentialMutation = useRemoveCredentialMutation;
 exports.useRequestByIdQuery = useRequestByIdQuery;
@@ -6650,6 +6875,7 @@ exports.useSubmitSowerJobMutation = useSubmitSowerJobMutation;
 exports.useTerminateWorkspaceMutation = useTerminateWorkspaceMutation;
 exports.useUserAuth = useUserAuth;
 exports.useUserRequestQuery = useUserRequestQuery;
+exports.useVennDiagramQuery = useVennDiagramQuery;
 exports.userHasCreateOrUpdateOnAnyProject = userHasCreateOrUpdateOnAnyProject;
 exports.userHasDataUpload = userHasDataUpload;
 exports.userHasMethodForServiceOnProject = userHasMethodForServiceOnProject;