@gen3/core 0.11.20 → 0.11.22

package/dist/cjs/index.js

@@ -10,9 +10,9 @@ var reduxPersist = require('redux-persist');
 var createWebStorage = require('redux-persist/lib/storage/createWebStorage');
 var lodash = require('lodash');
 var react$1 = require('redux-persist/integration/react');
+var idb = require('idb');
 var useDeepCompare = require('use-deep-compare');
 var graphql = require('graphql');
-var idb = require('idb');
 var uuid = require('uuid');
 var reactCookie = require('react-cookie');
 var useSWR = require('swr');
@@ -188,7 +188,7 @@ const userAuthApi = react.createApi({
                     } catch (error) {
                         if (error instanceof Error) {
                             return {
-                                error: error
+                                error: error.message
                             };
                         } else {
                             return {
@@ -717,6 +717,9 @@ const isTimeGreaterThan = (startTime, minutes)=>{
     const diffMinutes = diffMs / (1000 * 60);
     return diffMinutes > minutes;
 };
+const getTimestamp = ()=>{
+    return new Date(Date.now()).toLocaleString();
+};
 
 const NO_WORKSPACE_ID = 'none';
 const initialState$4 = {
@@ -817,15 +820,39 @@ 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 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;
+};
+
 /**
  *  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 is means that all the cohorts for the index changes.
- */ const UNSAVED_COHORT_NAME = 'Cohort';
-const NULL_COHORT_ID = 'null_cohort_id';
+ */ const DEFAULT_COHORT_NAME = 'Cohort';
 const newCohort = ({ filters = {}, customName })=>{
-    const ts = new Date();
-    const newName = customName;
+    const ts = new Date().toISOString();
+    const newName = customName ?? defaultCohortNameGenerator();
     const newId = createCohortId();
     return {
         name: newName,
@@ -833,73 +860,92 @@ const newCohort = ({ filters = {}, customName })=>{
         filters: filters ?? {},
         modified: false,
         saved: false,
-        modified_datetime: ts.toISOString(),
+        createdDatetime: ts,
+        modifiedDatetime: ts,
         counts: {}
     };
 };
 const createCohortId = ()=>toolkit.nanoid();
 const cohortsAdapter = toolkit.createEntityAdapter({
     sortComparer: (a, b)=>{
-        if (a.modified_datetime <= b.modified_datetime) return 1;
+        if (a.modifiedDatetime <= b.modifiedDatetime) return 1;
         else return -1;
     },
     selectId: (cohort)=>cohort.id
 });
 // Create an initial unsaved cohort
 const initialCohort = newCohort({
-    customName: UNSAVED_COHORT_NAME
+    customName: DEFAULT_COHORT_NAME
 });
 const emptyInitialState = cohortsAdapter.getInitialState({
-    currentCohort: initialCohort.id,
+    currentCohortId: initialCohort.id,
     message: undefined
 });
 // Set the initial cohort in the adapter state
 const initialState$3 = cohortsAdapter.setOne(emptyInitialState, initialCohort);
-const getCurrentCohort = (state)=>{
-    if (state.currentCohort) {
-        return state.currentCohort;
-    }
-    return NULL_COHORT_ID;
-};
+const getCurrentCohortId = (state)=>state.currentCohortId;
 /**
  * Redux slice for cohort filters
- */ const cohortSlice = toolkit.createSlice({
+ */ const cohortManagerSlice = toolkit.createSlice({
     name: 'cohort',
     initialState: initialState$3,
     reducers: {
-        addNewDefaultUnsavedCohort: (state)=>{
+        createNewCohort: (state, action)=>{
+            const baseName = action.payload.name || `Cohort`;
+            const uniqueName = generateUniqueName(Object.values(state.entities), baseName);
             const cohort = newCohort({
-                customName: UNSAVED_COHORT_NAME
+                filters: action.payload.filters,
+                customName: uniqueName
             });
             cohortsAdapter.addOne(state, cohort);
-            state.currentCohort = cohort.id;
-            state.message = [
-                `newCohort|${cohort.name}|${cohort.id}`
-            ];
+            state.currentCohortId = cohort.id;
         },
         updateCohortName: (state, action)=>{
+            const { id, name } = action.payload;
             cohortsAdapter.updateOne(state, {
-                id: getCurrentCohort(state),
+                id: id,
                 changes: {
-                    name: action.payload,
+                    name: name,
                     modified: true,
-                    modified_datetime: new Date().toISOString()
+                    modifiedDatetime: new Date().toISOString()
                 }
             });
         },
         removeCohort: (state, action)=>{
-            const removedCohort = state.entities[action?.payload?.id || getCurrentCohort(state)];
-            cohortsAdapter.removeOne(state, action?.payload?.id || getCurrentCohort(state));
+            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 most recent cohort
+            if (state.currentCohortId === cohortId) {
+                const remainingIds = Object.keys(state.entities);
+                state.currentCohortId = remainingIds[0];
+            }
             if (action?.payload.shouldShowMessage) {
                 state.message = [
-                    `deleteCohort|${removedCohort?.name}|${state.currentCohort}`
+                    `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 = getCurrentCohort(state);
+            const currentCohortId = getCurrentCohortId(state);
             if (!state.entities[currentCohortId]) {
                 return;
             }
@@ -917,13 +963,13 @@ const getCurrentCohort = (state)=>{
                         }
                     },
                     modified: true,
-                    modified_datetime: new Date().toISOString()
+                    modifiedDatetime: new Date().toISOString()
                 }
             });
         },
         setCohortFilter: (state, action)=>{
             const { index, filters } = action.payload;
-            const currentCohortId = getCurrentCohort(state);
+            const currentCohortId = getCurrentCohortId(state);
             if (!state.entities[currentCohortId]) {
                 console.error(`no cohort with id=${currentCohortId} defined`);
                 return;
@@ -936,12 +982,12 @@ const getCurrentCohort = (state)=>{
                         [index]: filters
                     },
                     modified: true,
-                    modified_datetime: new Date().toISOString()
+                    modifiedDatetime: new Date().toISOString()
                 }
             });
         },
         setCohortIndexFilters: (state, action)=>{
-            const currentCohortId = getCurrentCohort(state);
+            const currentCohortId = getCurrentCohortId(state);
             if (!state.entities[currentCohortId]) {
                 console.error(`no cohort with id=${currentCohortId} defined`);
                 return;
@@ -951,14 +997,14 @@ const getCurrentCohort = (state)=>{
                 changes: {
                     filters: action.payload.filters,
                     modified: true,
-                    modified_datetime: new Date().toISOString()
+                    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 = getCurrentCohort(state);
+            const currentCohortId = getCurrentCohortId(state);
             if (!state.entities[currentCohortId]) {
                 console.error(`no cohort with id=${currentCohortId} defined`);
                 return;
@@ -980,14 +1026,25 @@ const getCurrentCohort = (state)=>{
                         }
                     },
                     modified: true,
-                    modified_datetime: new Date().toISOString()
+                    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);
+            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 = getCurrentCohort(state);
+            const currentCohortId = getCurrentCohortId(state);
             if (!state.entities[currentCohortId]) {
                 console.error(`no cohort with id=${currentCohortId} defined`);
                 return;
@@ -1007,30 +1064,12 @@ const getCurrentCohort = (state)=>{
                         }
                     },
                     modified: true,
-                    modified_datetime: new Date().toISOString()
-                }
-            });
-        },
-        discardCohortChanges: (state, action)=>{
-            const { index, id, filters } = action.payload;
-            const cohortId = id ?? getCurrentCohort(state);
-            cohortsAdapter.updateOne(state, {
-                id: cohortId,
-                changes: {
-                    filters: {
-                        ...state.entities[cohortId].filters,
-                        [index]: filters || {
-                            mode: 'and',
-                            root: {}
-                        }
-                    },
-                    modified: false,
-                    modified_datetime: new Date().toISOString()
+                    modifiedDatetime: new Date().toISOString()
                 }
             });
         },
         setCurrentCohortId: (state, action)=>{
-            state.currentCohort = action.payload;
+            state.currentCohortId = action.payload;
         },
         /** @hidden */ setCohortList: (state, action)=>{
             if (!action.payload) {
@@ -1048,104 +1087,10 @@ const getCurrentCohort = (state)=>{
  * @param state - the CoreState
  *
  * @hidden
- */ const cohortSelectors = cohortsAdapter.getSelectors((state)=>state.cohorts.cohort);
-/**
- * Returns an array of all the cohorts
- * @param state - the CoreState
- * @category Cohort
- * @category Selectors
- */ const selectAllCohorts = (state)=>cohortSelectors.selectEntities(state);
-const getCurrentCohortFromCoreState = (state)=>{
-    if (state.cohorts.cohort.currentCohort) {
-        return state.cohorts.cohort.currentCohort;
-    }
-    return NULL_COHORT_ID;
-};
+ */ const cohortSelectors = cohortsAdapter.getSelectors((state)=>state.cohorts.cohortManager);
 // Filter actions: addFilter, removeFilter, updateFilter
-const { updateCohortFilter, setCohortFilter, setCohortIndexFilters, removeCohortFilter, clearCohortFilters, removeCohort, discardCohortChanges, addNewDefaultUnsavedCohort, setCurrentCohortId, setCohortList } = cohortSlice.actions;
-const selectCohortFilters = (state)=>{
-    const currentCohortId = getCurrentCohortFromCoreState(state);
-    return state.cohorts.cohort.entities[currentCohortId]?.filters;
-};
-const selectCurrentCohortFilters = (state)=>{
-    const currentCohortId = getCurrentCohortFromCoreState(state);
-    return state.cohorts.cohort.entities[currentCohortId]?.filters;
-};
-const selectCurrentCohortId = (state)=>{
-    return getCurrentCohort(state.cohorts.cohort);
-};
-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];
-};
-/**
- * a thunk to optionally create a caseSet when switching cohorts.
- * Note the assumption if the caseset member has ids then the caseset has previously been created.
- */ const setActiveCohort = (cohortId)=>async (dispatch /* getState */ )=>{
-        dispatch(setCurrentCohortId(cohortId));
-    };
-/**
- * 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;
-};
-const EmptyFilterSet = {
-    mode: 'and',
-    root: {}
-};
-/**
- * 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 setActiveCohortList = (cohorts)=>async (dispatch, getState)=>{
-        // set the list of all cohorts
-        if (cohorts) {
-            dispatch(setCohortList(cohorts));
-            return;
-        }
-        const availableCohorts = selectAllCohorts(getState());
-        if (Object.keys(availableCohorts).length === 0) {
-            dispatch(addNewDefaultUnsavedCohort());
-        }
-    };
-const cohortReducer = cohortSlice.reducer;
+const { createNewCohort, updateCohortFilter, setCohortFilter, setCohortIndexFilters, duplicateCohort, removeCohortFilter, clearCohortFilters, removeCohort, setCurrentCohortId, updateCohortName, setCohortList } = cohortManagerSlice.actions;
+const cohortReducer = cohortManagerSlice.reducer;
 
 const initialState$2 = {};
 const expandSlice$1 = toolkit.createSlice({
@@ -1226,7 +1171,7 @@ const cohortReducers = toolkit.combineReducers({
     filtersExpanded: cohortBuilderFiltersExpandedReducer,
     filtersCombineMode: cohortBuilderFiltersCombineModeReducer,
     sharedFilters: cohortSharedFiltersReducer,
-    cohort: cohortReducer
+    cohortManager: cohortReducer
 });
 
 const rootReducer = toolkit.combineReducers({
@@ -1879,424 +1824,212 @@ const selectAuthzMappingData = toolkit.createSelector(selectAuthzMapping, (authz
         mappings: []
     });
 
-const isFileItem = (item)=>{
-    return item && 'guid' in item;
-};
-const isAdditionalDataItem = (item)=>{
-    return item.itemType === 'AdditionalData'; // TODO resolve this with type from the api
-};
-// Type guard for CohortItem
-const isCohortItem = (item)=>{
-    return item && 'data' in item && 'schemaVersion' in item && item.itemType === 'Gen3GraphQL';
-};
-// Type guard for DatalistAPI
-const isDatalistAPI = (value)=>{
-    if (typeof value !== 'object' || value === null) {
-        return false;
+class CohortStorage {
+    constructor(config){
+        this.databaseName = config.databaseName;
+        this.storeName = config.storeName;
+        this.schemaVersion = config.schemaVersion || 1;
     }
-    const data = value;
-    // Check required properties in DataItemBaseData
-    if (typeof data.name !== 'string' || typeof data.created_time !== 'string' || typeof data.updated_time !== 'string' || typeof data.version !== 'number' || typeof data.authz !== 'object' || data.authz === null || !Array.isArray(data.authz.authz)) {
-        return false;
+    getDb() {
+        try {
+            const storeName = this.storeName;
+            return idb.openDB(this.databaseName, this.schemaVersion, {
+                upgrade (db) {
+                    if (!db.objectStoreNames.contains(storeName)) {
+                        db.createObjectStore(storeName, {
+                            keyPath: 'id'
+                        });
+                    }
+                }
+            });
+        } catch (error) {
+            let errorMessage = 'Unknown error';
+            if (error instanceof Error) {
+                errorMessage = error.message;
+            }
+            throw new Error(`Database initialization failed: ${errorMessage}`);
+        }
     }
-    // Check required properties in DatalistAsItems
-    if (typeof data.items !== 'object' || data.items === null || typeof data.items !== 'object') {
-        return false;
+    // ===== CREATE OPERATIONS =====
+    /**
+   * Save a single cohort to the database
+   */ async saveCohort(cohort) {
+        try {
+            const db = await this.getDb();
+            const tx = db.transaction(this.storeName, 'readwrite');
+            tx.objectStore(this.storeName).put(cohort);
+            await tx.done;
+            return {
+                status: 200,
+                message: 'cohort added'
+            };
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        } catch (_error) {
+            return {
+                isError: true,
+                status: 500,
+                message: 'unable to save cohort'
+            };
+        }
     }
-    return true;
-};
-/**
- * Type guard for DataLibraryAPIResponse
- */ const isDataLibraryAPIResponse = (obj)=>{
-    return typeof obj === 'object' && obj !== null && 'lists' in obj && typeof obj.lists === 'object';
-};
-var DataLibraryStoreMode = /*#__PURE__*/ function(DataLibraryStoreMode) {
-    DataLibraryStoreMode["ApiOnly"] = "apiOnly";
-    DataLibraryStoreMode["ApiAndLocal"] = "apiAndLocal";
-    DataLibraryStoreMode["LocalOnly"] = "localOnly";
-    return DataLibraryStoreMode;
-}({});
-
-const processItem = (id, data)=>{
-    if (data?.type === 'AdditionalData') {
-        return {
-            name: data.name,
-            itemType: 'AdditionalData',
-            description: data?.description,
-            documentationUrl: data?.documentationUrl,
-            url: data?.url
+    /**
+   * Save multiple cohorts in a single transaction (bulk operation)
+   */ async saveCohorts(cohorts) {
+        if (cohorts.length === 0) return {
+            isError: true,
+            status: 400,
+            message: 'cannot add an empty array'
         };
+        try {
+            const db = await this.getDb();
+            const tx = db.transaction(this.storeName, 'readwrite');
+            // Batch all operations in a single transaction for better performance
+            await Promise.all([
+                ...cohorts.map((cohort)=>tx.store.put({
+                        ...cohort,
+                        saved: true
+                    })),
+                tx.done
+            ]);
+            return {
+                status: 200,
+                message: 'cohorts added'
+            };
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        } catch (_error) {
+            return {
+                isError: true,
+                status: 500,
+                message: 'unable to save cohort'
+            };
+        }
     }
-    return {
-        ...data,
-        itemType: 'Data',
-        guid: data.id,
-        id: id
-    };
-};
-const buildListItemsGroupedByDataset = (listData)=>{
-    const items = Object.entries(listData).reduce((acc, [id, data])=>{
-        if (data?.type === 'Gen3GraphQL') {
-            const cohortData = data;
-            acc[id] = {
-                itemType: 'Gen3GraphQL',
-                id: data.guid,
-                schemaVersion: cohortData.schema_version,
-                data: cohortData.data,
-                name: data.name,
-                index: cohortData.index
+    // ===== READ OPERATIONS =====
+    /**
+   * Get a specific cohort by ID
+   */ async getCohort(id) {
+        try {
+            const db = await this.getDb();
+            const tx = db.transaction(this.storeName, 'readonly');
+            const store = tx.objectStore(this.storeName);
+            const cohort = await store.get(id);
+            return {
+                status: 200,
+                message: 'success',
+                data: cohort
             };
-        } else {
-            // Dataset
-            if (!(data?.dataset_guid && data.dataset_guid in acc)) {
-                acc[data.dataset_guid] = {
-                    id: data.dataset_guid,
-                    name: '',
-                    members: {
-                        [id]: processItem(id, data)
-                    }
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        } catch (_error) {
+            return {
+                isError: true,
+                status: 401,
+                message: `cannot find cohort ${id}`
+            };
+        }
+    }
+    /**
+   * Get all cohorts from the database
+   */ async getAllCohorts() {
+        try {
+            const db = await this.getDb();
+            const tx = db.transaction(this.storeName, 'readonly');
+            const store = tx.objectStore(this.storeName);
+            const savedCohorts = await store.getAll();
+            if (!savedCohorts) {
+                return {
+                    isError: true,
+                    status: 500,
+                    message: 'no cohorts returned'
                 };
-            } else {
-                acc[data.dataset_guid].members[id] = processItem(id, data);
             }
+            const cohorts = savedCohorts.reduce((acc, cohort)=>{
+                const { id } = cohort;
+                acc[id] = cohort;
+                return acc;
+            }, {});
+            return {
+                status: 200,
+                message: 'success',
+                data: cohorts
+            };
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        } catch (_error) {
+            return {
+                isError: true,
+                status: 401,
+                message: 'cannot return cohorts'
+            };
         }
-        return acc;
-    }, {});
-    return items;
-};
-const BuildList = (listId, listData)=>{
-    if (!Object.keys(listData).includes('items')) return undefined;
-    const items = buildListItemsGroupedByDataset(listData?.items ?? {});
-    return {
-        items: items,
-        version: listData?.version ?? 0,
-        created_time: listData?.created_time,
-        updated_time: listData?.updated_time,
-        name: listData?.name ?? listId,
-        id: listId,
-        authz: listData?.authz
-    };
-};
-/**
- * Constructs a `DataLibrary` object by transforming the input `DataLibraryAPIResponse`.
- *
- * This function takes an API response containing lists and processes each list entry.
- * It uses `BuildList` to build individual list objects for each entry in the provided data.
- * The resulting lists are accumulated and structured into a `DataLibrary` object. which
- * groups File Object by dataset_guid.
- *
- * @param {DataLibraryAPIResponse} data - The API response containing the lists to process.
- * @returns {DataLibrary} A structured `DataLibrary` object containing the processed lists.
- */ const BuildLists = (data)=>{
-    return Object.entries(data?.lists).reduce((acc, [listId, listData])=>{
-        const list = BuildList(listId, listData);
-        if (list) acc[listId] = list;
-        return acc;
-    }, {});
-};
-/**
- * Calculates the total number of items within a DataList object.
- *
- * @param {DataList} dataList - The DataList object to count items from.
- * @return {number} The total number of items in the DataList.
- */ const getNumberOfItemsInDatalist = (dataList)=>{
-    if (!dataList?.items) return 0;
-    return Object.values(dataList.items).reduce((count, item)=>{
-        if (isCohortItem(item)) {
-            return count + 1;
-        } else {
-            return count + Object.values(item?.members ?? {}).reduce((fileCount, x)=>{
-                if (isFileItem(x)) {
-                    return fileCount + 1;
-                }
-                return fileCount;
-            }, 0);
-        }
-    }, 0);
-};
-const getTimestamp = ()=>{
-    return new Date(Date.now()).toLocaleString();
-};
-const flattenDataList = (dataList)=>{
-    // convert datalist into user-data-library API for for updating.
-    const items = Object.entries(dataList.items).reduce((acc, [id, value])=>{
-        if (isCohortItem(value)) {
-            acc[id] = value;
-        } else {
+    }
+    /**
+   * Search cohorts by name (case-insensitive partial match)
+   */ async searchCohortsByName(searchTerm) {
+        try {
+            const db = await this.getDb();
+            const tx = db.transaction(this.storeName, 'readonly');
+            const store = tx.objectStore(this.storeName);
+            const allCohorts = await store.getAll(this.storeName);
+            // Filter in memory for partial name matching
+            const searchLower = searchTerm.toLowerCase();
             return {
-                ...acc,
-                ...value.members
-            }; // TODO: might need to convert this to the API version
-        }
-        return acc;
-    }, {});
-    return {
-        name: dataList.name,
-        items: items
-    };
-};
-const convertDatasetOrCohortToLibraryListItemsAPI = (list)=>{
-    const result = {};
-    // Iterate through each entry in the DatasetOrCohort object
-    Object.entries(list).forEach(([datasetId, item])=>{
-        if (isCohortItem(item)) {
-            // Handle cohort items
-            result[datasetId] = {
-                itemType: 'Gen3GraphQL',
-                id: item.id,
-                schemaVersion: item.schemaVersion,
-                data: item.data,
-                name: item.name,
-                index: item.index
+                status: 200,
+                message: 'success',
+                data: allCohorts.filter((cohort)=>cohort.name.toLowerCase().includes(searchLower)).reduce((acc, cohort)=>{
+                    const { id } = cohort;
+                    acc[id] = cohort;
+                    return acc;
+                }, {})
             };
-        } else {
-            // Handle dataset items
-            const members = item.members || {};
-            // Process each member of the dataset
-            Object.entries(members).forEach(([memberId, memberData])=>{
-                if (isFileItem(memberData)) {
-                    result[memberId] = {
-                        ...memberData.guid && {
-                            guid: memberData.guid
-                        },
-                        ...memberData.name && {
-                            name: memberData.name
-                        },
-                        ...memberData.name && {
-                            name: memberData.name
-                        },
-                        ...memberData.description && {
-                            description: memberData.description
-                        },
-                        ...memberData.type && {
-                            type: memberData.type
-                        },
-                        dataset_guid: datasetId
-                    };
-                } else if (memberData.itemType === 'AdditionalData') {
-                    // Handle additional data items
-                    result[memberId] = {
-                        itemType: 'AdditionalData',
-                        name: memberData.name,
-                        description: memberData.description,
-                        documentationUrl: memberData.documentationUrl,
-                        url: memberData.url,
-                        dataset_guid: datasetId
-                    };
-                }
-            });
-        }
-    });
-    return result;
-};
-const convertDataLibraryToDataLibraryAPI = (dataLibrary)=>{
-    const result = {};
-    Object.entries(dataLibrary).forEach(([listId, list])=>{
-        result[listId] = {
-            name: list.name,
-            items: convertDatasetOrCohortToLibraryListItemsAPI(list.items),
-            version: list.version,
-            created_time: list.created_time,
-            updated_time: list.updated_time,
-            authz: list.authz
-        };
-    });
-    return result;
-};
-const extractIndexFromDataLibraryCohort = (query)=>{
-    try {
-        const parsedQuery = graphql.parse(query['query']);
-        const aggregationField = parsedQuery.definitions.filter((def)=>def.kind === 'OperationDefinition').flatMap((def)=>def.selectionSet.selections).find((sel)=>sel.kind === 'Field' && sel.name.value === '_aggregation');
-        if (aggregationField && 'selectionSet' in aggregationField) {
-            const indexField = aggregationField?.selectionSet?.selections.find((sel)=>sel.kind === 'Field');
-            return indexField ? indexField.name.value : null;
-        }
-    } catch (error) {
-        console.error('Invalid GraphQL query:', error);
-    }
-    return null;
-};
-/**
- *  Takes a list of file items from anb array of manifest entries
- *  and creates an Object of Files grouped by their dataset guid, which is
- *  used to add these to a Data Library List
- * @param data
- * @param dataFieldMapping
- * @constructor
- */ const extractFileDatasetsInRecords = (data, dataFieldMapping)=>{
-    const items = data.reduce((acc, resource)=>{
-        const dataObjects = resource[dataFieldMapping.dataObjectField];
-        // Check if dataObjects exists and is an array
-        if (!dataObjects || !Array.isArray(dataObjects)) {
-            return acc;
-        }
-        const datasetId = resource[dataFieldMapping.datasetIdField]; // Note: typo still preserved
-        if (datasetId === undefined) {
-            return acc; // Skip if dataset ID is missing
-        }
-        const datafiles = dataObjects.reduce((dataAcc, dataObject)=>{
-            const fileId = dataObject[dataFieldMapping.dataObjectIdField];
-            // Skip items without a valid ID
-            if (typeof fileId !== 'string' || !fileId) {
-                return dataAcc;
-            }
-            const name = dataObject[dataFieldMapping?.dataObjectNameField ?? 'name'] ?? 'No Name';
-            const size = dataObject[dataFieldMapping?.dataObjectSizeField ?? 'size'];
-            let sizeString = 'N/A';
-            if (typeof size === 'number') {
-                sizeString = size.toString();
-            }
-            if (typeof size === 'string') {
-                sizeString = size;
-            }
-            const md5Sum = dataObject[dataFieldMapping?.dataObjectMd5sumField ?? 'md5sum'] ?? 'N/A';
-            const url = dataObject[dataFieldMapping?.dataObjectUrlField ?? 'url'] ?? 'N/A';
-            let fileType = 'GA4GH_DRS';
-            if (dataFieldMapping?.dataObjectFileTypeValue) fileType = dataFieldMapping.dataObjectFileTypeValue;
-            if (dataFieldMapping?.dataObjectFileTypeField) fileType = dataObject[dataFieldMapping?.dataObjectFileTypeField];
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        } catch (_error) {
             return {
-                ...dataAcc,
-                [fileId]: {
-                    dataset_guid: datasetId,
-                    id: fileId,
-                    guid: fileId,
-                    itemType: 'Data',
-                    name: name,
-                    size: sizeString,
-                    md5sum: md5Sum,
-                    type: fileType,
-                    url: url
-                }
+                isError: true,
+                status: 401,
+                message: 'cannot find cohorts'
             };
-        }, {});
-        return {
-            ...acc,
-            ...datafiles
-        };
-    }, {});
-    return items;
-};
-
-const DATABASE_NAME = 'Gen3DataLibrary';
-const STORE_NAME = 'DataLibraryLists';
-class LocalStorageService {
-    getDb() {
-        return idb.openDB(DATABASE_NAME, 1, {
-            upgrade (db) {
-                if (!db.objectStoreNames.contains(STORE_NAME)) {
-                    db.createObjectStore(STORE_NAME, {
-                        keyPath: 'id'
-                    });
-                }
-            }
-        });
+        }
     }
-    async getList(id) {
-        const db = await this.getDb();
-        const tx = db.transaction(STORE_NAME, 'readonly');
-        const store = tx.objectStore(STORE_NAME);
-        const lists = await store.get(id);
-        if (lists) {
+    /**
+   * Count total number of cohorts
+   */ async getCohortCount() {
+        try {
+            const db = await this.getDb();
+            const total = await db.count(this.storeName);
             return {
                 status: 200,
                 message: 'success',
-                lists: {
-                    [id]: {
-                        id: id,
-                        ...lists,
-                        items: lists.items
-                    }
-                }
+                data: total
             };
-        } else {
+        // eslint-disable-next-line @typescript-eslint/no-unused-vars
+        } catch (_error) {
             return {
                 isError: true,
-                status: 500,
-                message: `${id} does not exist`
+                status: 401,
+                message: 'cannot find cohort count'
             };
         }
     }
-    async getLists() {
-        const db = await this.getDb();
-        const tx = db.transaction(STORE_NAME, 'readonly');
-        const store = tx.objectStore(STORE_NAME);
-        const lists = await store.getAll();
-        if (!lists) {
-            return {
-                isError: true,
-                status: 500,
-                message: 'no lists returned'
-            };
-        }
-        const listMap = lists.reduce((acc, x)=>{
-            const { id } = x;
-            acc[id] = x;
-            return acc;
-        }, {});
-        const datalists = BuildLists({
-            lists: listMap
-        });
-        return {
-            status: 200,
-            message: 'success',
-            lists: datalists
-        };
-    }
-    async addList(list) {
-        const timestamp = getTimestamp();
-        try {
-            const db = await this.getDb();
-            const tx = db.transaction(STORE_NAME, 'readwrite');
-            const id = toolkit.nanoid(); // Create an id for the list
-            tx.objectStore(STORE_NAME).put({
-                id,
-                version: 0,
-                items: list?.items ?? {},
-                creator: '{{subject_id}}',
-                authz: {
-                    version: 0,
-                    authz: [
-                        `/users/{{subject_id}}/user-library/lists/${id}`
-                    ]
-                },
-                name: list?.name ?? 'New List',
-                created_time: timestamp,
-                updated_time: timestamp
-            });
-            await tx.done;
-            return {
-                status: 200,
-                message: 'list added'
-            };
-        } catch (_error) {
-            return {
-                isError: true,
-                status: 500,
-                message: `unable to add list ${list?.name ?? 'New List'}`
-            };
-        }
-    }
-    async updateList(id, update) {
-        const { name, items } = update;
+    // ===== UPDATE OPERATIONS =====
+    /**
+   * Update an existing cohort (full replacement)
+   */ async updateCohort(cohort) {
         try {
             const db = await this.getDb();
-            const tx = db.transaction(STORE_NAME, 'readwrite');
-            const store = tx.objectStore(STORE_NAME);
-            const listData = await store.get(id);
-            if (!listData) {
-                throw new Error(`List ${id} does not exist`);
+            // Verify cohort exists before updating
+            const tx = db.transaction(this.storeName, 'readwrite');
+            const store = tx.objectStore(this.storeName);
+            const existing = await store.get(cohort.id);
+            if (!existing) {
+                return {
+                    isError: true,
+                    status: 401,
+                    message: 'cohort not found'
+                };
             }
             const timestamp = getTimestamp();
-            const version = listData.version ? listData.version + 1 : 0;
             const updated = {
-                ...listData,
-                ...{
-                    name,
-                    items
-                },
-                version: version,
-                updated_time: timestamp,
-                created_time: listData.created_time
+                ...existing,
+                modifiedDatetime: timestamp
             };
             store.put(updated);
             await tx.done;
@@ -2312,18 +2045,26 @@ class LocalStorageService {
             return {
                 isError: true,
                 status: 500,
-                message: `Unable to update list: ${id}. Error: ${errorMessage}`
+                message: `Unable to update cohort: ${cohort.id}. Error: ${errorMessage}`
             };
         }
     }
-    async deleteList(id) {
+    // ===== DELETE OPERATIONS =====
+    /**
+   * Delete a specific cohort by ID
+   */ async deleteCohort(id) {
         try {
             const db = await this.getDb();
-            const tx = db.transaction(STORE_NAME, 'readwrite');
-            const store = tx.objectStore(STORE_NAME);
-            const item = await store.get(id);
-            if (!item) {
-                throw new Error(`List ${id} does not exist`);
+            const tx = db.transaction(this.storeName, 'readwrite');
+            const store = tx.objectStore(this.storeName);
+            // Verify cohort exists before deleting
+            const existing = await db.get(this.storeName, id);
+            if (!existing) {
+                return {
+                    isError: true,
+                    status: 401,
+                    message: 'cohort not found'
+                };
             }
             store.delete(id);
             await tx.done;
@@ -2336,926 +2077,1708 @@ class LocalStorageService {
             return {
                 isError: true,
                 status: 500,
-                message: `Unable to delete list: ${id}. Error: ${errorMessage}`
+                message: `Unable to delete cohort: ${id}. Error: ${errorMessage}`
             };
         }
     }
-    async clearLists() {
+    /**
+   * Delete all cohorts from the database
+   */ async deleteAllCohorts() {
         try {
             const db = await this.getDb();
-            const tx = db.transaction(STORE_NAME, 'readwrite');
-            tx.objectStore(STORE_NAME).clear();
+            const tx = db.transaction(this.storeName, 'readwrite');
+            const store = tx.objectStore(this.storeName);
+            store.clear();
             await tx.done;
             return {
                 status: 200,
-                message: 'list cleared'
+                message: `all cohorts deleted`
             };
         } catch (error) {
             const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
             return {
                 isError: true,
                 status: 500,
-                message: `Unable to clear library. Error: ${errorMessage}`
+                message: `Unable to delete all cohorts. Error: ${errorMessage}`
             };
         }
     }
-    async cacheLists(data) {
-        if (!data || typeof data !== 'object') {
-            return {
-                isError: true,
-                status: 500,
-                message: 'Invalid or missing lists property in request'
-            };
-        }
-        const allLists = Object.entries(data).reduce((acc, [id, x])=>{
-            if (!isDatalistAPI(x)) return acc;
-            acc[id] = {
-                ...x
-            };
-            return acc;
-        }, {});
+    // ===== UTILITY OPERATIONS =====
+    /**
+   * Check if a cohort exists
+   */ async cohortExists(id) {
         try {
             const db = await this.getDb();
-            const tx = db.transaction(STORE_NAME, 'readwrite');
-            for (const [id, list] of Object.entries(allLists)){
-                tx.objectStore(STORE_NAME).put({
-                    id,
-                    ...list
-                });
-            }
-            await tx.done;
+            // Verify cohort exists before deleting
+            const existing = await db.get(this.storeName, id);
             return {
                 status: 200,
-                message: 'success'
+                message: `${id}: ${existing ? 'true' : 'false'}`
             };
         } catch (error) {
             const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
-            return {
-                isError: true,
-                status: 200,
-                message: `unable to cache library to local storage. Error: ${errorMessage}`
-            };
-        }
-    }
-    async cacheList(id, data) {
-        if (!data || typeof data !== 'object') {
             return {
                 isError: true,
                 status: 500,
-                message: 'Invalid or missing lists property in request'
+                message: `Unable search for cohort. Error: ${errorMessage}`
             };
         }
+    }
+    /**
+   * Export all cohorts as JSON
+   */ async exportCohorts() {
+        return await this.getAllCohorts();
+    }
+    /**
+   * Import cohorts from JSON data
+   */ async importCohorts(cohorts, overwrite = false) {
         try {
-            const db = await this.getDb();
-            const tx = db.transaction(STORE_NAME, 'readwrite');
-            tx.objectStore(STORE_NAME).put({
-                id: id,
-                ...data
-            });
-            await tx.done;
-            return {
-                status: 200,
-                message: 'success'
-            };
+            if (overwrite) {
+                await this.deleteAllCohorts();
+            }
+            await this.saveCohorts(cohorts);
         } catch (error) {
             const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
             return {
                 isError: true,
                 status: 500,
-                message: `unable to clear library. Error: ${errorMessage}`
+                message: `Failed to import cohorts: ${errorMessage}`
             };
         }
     }
-    constructor(){
-        this.setAllLists = async (data)=>{
-            const timestamp = getTimestamp();
-            const allLists = data.reduce((acc, x)=>{
-                if (!isJSONObject(x)) return acc;
-                const id = toolkit.nanoid(10);
-                acc[id] = {
-                    ...x,
-                    version: 0,
-                    created_time: timestamp,
-                    updated_time: timestamp,
-                    creator: '{{subject_id}}',
-                    authz: {
-                        version: 0,
-                        authz: [
-                            `/users/{{subject_id}}/user-library/lists/${id}`
-                        ]
-                    }
-                };
-                return acc;
-            }, {});
-            try {
-                const db = await this.getDb();
-                const tx = db.transaction(STORE_NAME, 'readwrite');
-                for (const [id, list] of Object.entries(allLists)){
-                    tx.objectStore(STORE_NAME).put({
-                        id,
-                        ...list
-                    });
-                }
-                await tx.done;
-                return {
-                    status: 200,
-                    message: 'success'
-                };
-            // eslint-disable-next-line @typescript-eslint/no-unused-vars
-            } catch (_error) {
-                return {
-                    isError: true,
-                    status: 500,
-                    message: 'unable to add lists'
-                };
-            }
-        };
+    /**
+   * Close the database connection
+   */ async close() {
+        try {
+            const db = await this.getDb();
+            db.close();
+        } catch (error) {
+            console.error('Failed to close database:', error);
+        }
     }
 }
 
-const fetchFromDataLibraryAPI = async (url, method = HttpMethod.GET, body = undefined)=>{
-    try {
-        return {
-            data: await fetchJSONDataFromURL(url, true, method, body)
-        };
-    } catch (error) {
-        if (error instanceof HTTPError) {
-            return {
-                error: {
-                    status: error.status,
-                    message: HTTPErrorMessages[error.status] || error.responseData?.message || 'No HTTP Error Message'
-                }
-            };
-        } else {
-            return {
-                error: {
-                    status: 500,
-                    message: 'Unknown Error'
-                }
-            };
-        }
-    }
+const isOperationWithField = (operation)=>{
+    return operation?.field !== undefined;
 };
-const responseFromMutation = (responseReceived)=>{
-    if (responseReceived.error) {
-        return {
-            isError: true,
-            ...responseReceived.error
-        };
+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 {
-        lists: responseReceived.data,
-        message: 'success',
-        status: 200
-    };
+    return false;
 };
-class APIStorageService {
-    constructor(apiBaseUrl = `${GEN3_DATA_LIBRARY_API}`){
-        this.pendingRequests = new Map();
-        this.apiBaseUrl = apiBaseUrl;
-    }
-    async dedupedRequest(url, method = HttpMethod.GET, body = undefined) {
-        // Create a unique key for this request
-        const requestKey = `${method}:${url}:${body ? JSON.stringify(body) : ''}`;
-        // If this exact request is already in progress, return the pending promise
-        if (this.pendingRequests.has(requestKey)) {
-            return this.pendingRequests.get(requestKey);
-        }
-        // Otherwise, make the request and store the promise
-        const requestPromise = fetchFromDataLibraryAPI(url, method, body);
-        this.pendingRequests.set(requestKey, requestPromise);
-        try {
-            // Wait for the request to complete
-            const result = await requestPromise;
-            return result;
-        } finally{
-            // Remove the request from pending requests after it completes
-            this.pendingRequests.delete(requestKey);
-        }
-    }
-    async getLists() {
-        const { data, error } = await this.dedupedRequest(`${this.apiBaseUrl}`);
-        if (error) {
-            return {
-                isError: true,
-                ...error
-            };
-        }
-        if (data && isDataLibraryAPIResponse(data)) {
-            const datalists = BuildLists(data);
+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 {
-                lists: datalists,
-                status: 200,
-                message: 'success'
+                nested: {
+                    path: op.path,
+                    ...child
+                }
             };
-        }
-        return {
-            lists: {},
-            status: 200,
-            message: 'no list returned'
         };
     }
-    async addList(list) {
-        const response = await fetchFromDataLibraryAPI(`${this.apiBaseUrl}`, HttpMethod.PUT, JSON.stringify({
-            lists: [
-                list
-            ]
-        }));
-        return responseFromMutation(response);
+}
+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);
     }
-    async updateList(id, list) {
-        const response = await fetchFromDataLibraryAPI(`${this.apiBaseUrl}/${id}`, HttpMethod.PUT, JSON.stringify(list));
-        return responseFromMutation(response);
+    if (operationKeys.includes('!=')) {
+        return handler.handleNotEquals(op);
     }
-    async deleteList(id) {
-        const response = await fetchFromDataLibraryAPI(`${this.apiBaseUrl}/${id}`, HttpMethod.DELETE);
-        return responseFromMutation(response);
+    if (operationKeys.includes('<')) {
+        return handler.handleLessThan(op);
     }
-    async clearLists() {
-        const response = await fetchFromDataLibraryAPI(this.apiBaseUrl, HttpMethod.DELETE);
-        return responseFromMutation(response);
+    if (operationKeys.includes('<=')) {
+        return handler.handleLessThanOrEquals(op);
     }
-    async setAllLists(lists) {
-        const response = await fetchFromDataLibraryAPI(this.apiBaseUrl, HttpMethod.POST, JSON.stringify({
-            lists: Object.values(lists)
-        }));
-        return responseFromMutation(response);
+    if (operationKeys.includes('>')) {
+        return handler.handleGreaterThan(op);
     }
-    async getList(id) {
-        const { data, error } = await fetchFromDataLibraryAPI(`${this.apiBaseUrl}/${id}`);
-        if (error) {
+    if (operationKeys.includes('>=')) {
+        return handler.handleGreaterThanOrEquals(op);
+    }
+    if (operationKeys.includes('in')) {
+        return handler.handleIncludes(op);
+    }
+    if (operationKeys.includes('exclude')) {
+        return handler.handleExcludes(op);
+    }
+    if (operationKeys.includes('excludeifany')) {
+        return handler.handleExcludeIfAny(op);
+    }
+    if (operationKeys.includes('and')) {
+        return handler.handleIntersection(op);
+    }
+    if (operationKeys.includes('or')) {
+        return handler.handleUnion(op);
+    }
+    if (operationKeys.includes('nested')) {
+        return handler.handleNestedFilter(op);
+    }
+    if (operationKeys.includes('is')) {
+        return handler.handleExists(op);
+    }
+    if (operationKeys.includes('not')) {
+        return handler.handleMissing(op);
+    }
+    return assertNever(op);
+};
+const convertGqlFilterToFilter = (gqlFilter)=>{
+    const handler = new ToOperationHandler();
+    return handleGqlOperation(handler, gqlFilter);
+};
+/**
+ * Convert GQL to Filterset
+ * Note assumes all GqlOperators have one field: value
+ */ class ToOperationHandler {
+    constructor(){
+        this.handleEquals = (op)=>{
+            const [field, value] = Object.entries(op['='])[0];
             return {
-                isError: true,
-                ...error
+                operator: '=',
+                field: field,
+                operand: value
             };
-        }
-        if (isDataLibraryAPIResponse(data)) {
-            const datalists = BuildLists(data);
+        };
+        this.handleNotEquals = (op)=>{
+            const [field, value] = Object.entries(op['!='])[0];
             return {
-                lists: datalists,
-                status: 200,
-                message: 'success'
+                operator: '!=',
+                field: field,
+                operand: value
             };
-        }
-        return {
-            isError: true,
-            status: 500,
-            message: `Unknown error getting list ${id}`
         };
-    }
-}
-
-class CachedAPIService {
-    constructor(){
-        this.localStorageDataLibrary = new LocalStorageService(); // always update local storage
-        this.apiDataLibrary = new APIStorageService();
-    }
-    async getLists() {
-        // do a network request to get the library
-        // get the remote list
-        const apiResults = await this.apiDataLibrary.getLists();
-        if (apiResults.isError) {
+        this.handleLessThan = (op)=>{
+            const [field, value] = Object.entries(op['<'])[0];
             return {
-                ...apiResults,
-                lists: undefined
+                operator: '<',
+                field: field,
+                operand: value
             };
-        }
-        const dataLibrary = convertDataLibraryToDataLibraryAPI(apiResults?.lists ?? {});
-        await this.localStorageDataLibrary.cacheLists(dataLibrary);
-        return apiResults;
-    }
-    async getList(id) {
-        return await this.localStorageDataLibrary.getList(id);
-    }
-    async getCachedLists(id) {
-        return await this.localStorageDataLibrary.getList(id);
-    }
-    async setAllLists(lists) {
-        const apiResults = await this.apiDataLibrary.setAllLists(lists);
-        if (apiResults.isError) {
+        };
+        this.handleLessThanOrEquals = (op)=>{
+            const [field, value] = Object.entries(op['<='])[0];
             return {
-                ...apiResults,
-                lists: undefined
+                operator: '<=',
+                field: field,
+                operand: value
             };
-        }
-        const dataLibrary = convertDataLibraryToDataLibraryAPI(apiResults?.lists ?? {});
-        await this.localStorageDataLibrary.cacheLists(dataLibrary);
-        return apiResults;
-    }
-    async addList(list) {
-        // update the API list
-        const apiResults = await this.apiDataLibrary.addList(list);
-        if (apiResults.isError) {
+        };
+        this.handleGreaterThan = (op)=>{
+            const [field, value] = Object.entries(op['>'])[0];
             return {
-                ...apiResults,
-                lists: undefined
+                operator: '>',
+                field: field,
+                operand: value
             };
-        }
-        const cacheResults = await this.localStorageDataLibrary.addList(list);
-        return {
-            ...cacheResults,
-            lists: undefined
         };
-    }
-    async updateList(id, list) {
-        const apiResults = await this.apiDataLibrary.updateList(id, list);
-        if (apiResults.isError) {
+        this.handleGreaterThanOrEquals = (op)=>{
+            const [field, value] = Object.entries(op['>='])[0];
             return {
-                ...apiResults,
-                lists: undefined
+                operator: '>=',
+                field: field,
+                operand: value
             };
-        }
-        return await this.localStorageDataLibrary.cacheList(id, apiResults.lists ?? {});
-    }
-    async deleteList(id) {
-        const apiResults = await this.apiDataLibrary.deleteList(id);
-        if (apiResults.isError) {
+        };
+        this.handleIncludes = (op)=>{
+            const [field, value] = Object.entries(op.in)[0];
             return {
-                ...apiResults,
-                lists: undefined
+                operator: 'in',
+                field: field,
+                operands: value
             };
-        }
-        return await this.localStorageDataLibrary.deleteList(id);
-    }
-    async clearLists() {
-        const apiResults = await this.apiDataLibrary.clearLists();
-        if (apiResults.isError) {
+        };
+        this.handleExcludes = (op)=>{
+            const [field, value] = Object.entries(op.exclude)[0];
             return {
-                ...apiResults,
-                lists: undefined
+                operator: 'excludes',
+                field: field,
+                operands: value
             };
-        }
-        return await this.localStorageDataLibrary.clearLists();
+        };
+        this.handleExcludeIfAny = (op)=>{
+            const [field, value] = Object.entries(op.excludeifany)[0];
+            return {
+                operator: 'excludeifany',
+                field: field,
+                operands: value
+            };
+        };
+        this.handleIntersection = (op)=>({
+                operator: 'and',
+                operands: op.and.map(convertGqlFilterToFilter)
+            });
+        this.handleUnion = (op)=>({
+                operator: 'or',
+                operands: op.or.map(convertGqlFilterToFilter)
+            });
+        this.handleExists = (op)=>{
+            const [field, value] = Object.entries(op.not)[0];
+            return {
+                operator: 'exists',
+                field: field,
+                operand: value
+            };
+        };
+        this.handleMissing = (op)=>{
+            const field = Object.keys(op.is)[0];
+            return {
+                operator: 'missing',
+                field: field
+            };
+        };
+        this.handleNestedFilter = (op)=>({
+                operator: 'nested',
+                path: op.nested.path,
+                operand: convertGqlFilterToFilter(op.nested)
+            });
     }
 }
-
-class DataLibraryStorageService {
-    constructor(mode = DataLibraryStoreMode.ApiOnly){
-        if (mode === DataLibraryStoreMode.ApiOnly) {
-            this.storageService = new APIStorageService();
-        } else if (mode === DataLibraryStoreMode.ApiAndLocal) this.storageService = new CachedAPIService();
-        else this.storageService = new LocalStorageService();
-    }
-    async setStorageMode(mode) {
-        if (mode === DataLibraryStoreMode.ApiOnly) {
-            this.storageService = new APIStorageService();
-        } else if (mode === DataLibraryStoreMode.ApiAndLocal) this.storageService = new CachedAPIService();
-        else this.storageService = new LocalStorageService();
-    }
-    // private async syncApiAndLocal() {
-    //   const { lists: localData, isError: localError } =
-    //     await this.localStorageDataLibrary.getLists();
-    //   const { lists: apiData, isError: apiError } =
-    //     await this.apiDataLibrary.getLists();
-    //
-    //   if (localError || apiError) {
-    //     return;
-    //   }
-    //
-    //   const mergedData: Record<string, Datalist> = { ...localData };
-    //
-    //   // First, update any existing items with newer versions from API
-    //   Object.values(apiData?.lists ?? {}).forEach((apiList) => {
-    //     const id = apiList.id as keyof DataLibrary;
-    //     const localList = localData?.[id];
-    //     if (
-    //       !localList ||
-    //       storage Date(apiList.updatedTime) > storage Date(localList.updatedTime)
-    //     ) {
-    //       mergedData[id] = apiList;
-    //     }
-    //   });
-    //
-    //   //  Push local-only changes to API
-    //   const syncPromises: Promise<any>[] = [];
-    //
-    //   for (const [id, localList] of Object.entries(localData?.lists ?? {})) {
-    //     if (!apiData?.[id]) {
-    //       // This list exists locally but not in API, so push it to API
-    //       syncPromises.push(this.apiDataLibrary.addList(localList));
-    //     } else if (
-    //       storage Date(localList.updatedTime) > storage Date(apiData[id].updatedTime)
-    //     ) {
-    //       // Local list is newer than API, so update API
-    //       syncPromises.push(this.apiDataLibrary.updateList(localList));
-    //     }
-    //   }
-    //
-    //   // Wait for all API operations to complete
-    //   await Promise.all(syncPromises);
-    //   await this.localStorageDataLibrary.cacheLists({ lists: mergedData });
-    // }
-    async getLists() {
-        return await this.storageService.getLists();
-    }
-    async getList(id) {
-        return await this.storageService.getList(id);
-    }
-    async getCachedLists(id) {
-        return await this.storageService.getList(id);
+/**
+ * Extract the operand values, if operands themselves have values, otherwise undefined.
+ */ class ValueExtractorHandler {
+    constructor(){
+        this.handleEquals = (op)=>op.operand;
+        this.handleNotEquals = (op)=>op.operand;
+        this.handleIncludes = (op)=>op.operands;
+        this.handleExcludes = (op)=>op.operands;
+        this.handleExcludeIfAny = (op)=>op.operands;
+        this.handleGreaterThanOrEquals = (op)=>op.operand;
+        this.handleGreaterThan = (op)=>op.operand;
+        this.handleLessThan = (op)=>op.operand;
+        this.handleLessThanOrEquals = (op)=>op.operand;
+        this.handleIntersection = (_arg)=>undefined;
+        this.handleUnion = (_)=>undefined;
+        this.handleNestedFilter = (_)=>undefined;
+        this.handleExists = (_)=>undefined;
+        this.handleMissing = (_)=>undefined;
     }
-    async setAllLists(lists) {
-        return await this.storageService.setAllLists(lists ?? {});
+}
+/**
+ * Extract the operand values, if operands themselves have values, otherwise undefined.
+ */ class EnumValueExtractorHandler {
+    constructor(){
+        this.handleEquals = (_)=>undefined;
+        this.handleNotEquals = (_)=>undefined;
+        this.handleIncludes = (op)=>op.operands;
+        this.handleExcludes = (op)=>op.operands;
+        this.handleExcludeIfAny = (op)=>op.operands;
+        this.handleGreaterThanOrEquals = (_)=>undefined;
+        this.handleGreaterThan = (_)=>undefined;
+        this.handleLessThan = (_)=>undefined;
+        this.handleLessThanOrEquals = (_)=>undefined;
+        this.handleIntersection = (_)=>undefined;
+        this.handleUnion = (_)=>undefined;
+        this.handleNestedFilter = (op)=>{
+            return extractEnumFilterValue(op.operand);
+        };
+        this.handleExists = (_)=>undefined;
+        this.handleMissing = (_)=>undefined;
     }
-    async addList(list) {
-        return await this.storageService.addList(list);
+}
+const appendFilterToOperation = (filter, addition)=>{
+    if (filter === undefined && addition === undefined) return {
+        operator: 'and',
+        operands: []
+    };
+    if (addition === undefined && filter) return filter;
+    if (filter === undefined && addition) return addition;
+    return {
+        ...filter,
+        operands: [
+            ...filter?.operands || [],
+            addition
+        ]
+    };
+};
+const filterSetToOperation = (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];
+                })
+            };
     }
-    async updateList(id, list) {
-        return await this.storageService.updateList(id, list);
+    return undefined;
+};
+
+const isFilterSet = (input)=>{
+    if (typeof input !== 'object' || input === null) {
+        return false;
     }
-    async deleteList(id) {
-        return await this.storageService.deleteList(id);
+    const { root, mode } = input;
+    if (typeof root !== 'object' || root === null) {
+        return false;
     }
-    async clearLists() {
-        return await this.storageService.clearLists();
+    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);
+};
+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 EMPTY_LIST = {
-    items: {},
-    version: 0,
-    created_time: 'not_set',
-    updated_time: 'not_set',
-    name: '',
-    id: '',
-    authz: {
-        version: -1,
-        authz: []
+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 = (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);
 };
-const DEFAULT_LIST_NAME = 'List';
-const useDataLibrary = (options = {
-    storageMode: DataLibraryStoreMode.ApiOnly
-})=>{
-    // State management
-    const [isLoggedIn, setIsLoggedIn] = React.useState(false);
-    const [isLoading, setIsLoading] = React.useState(false);
-    const [isUpdating, setIsUpdating] = React.useState(null);
-    const [error, setError] = React.useState(null);
-    const [lists, setLists] = React.useState({});
-    // Refs
-    const initialLoadRef = React.useRef(false);
-    // Services
-    const dataLibraryStoreAPI = React.useRef(new DataLibraryStorageService(options.storageMode)).current;
-    const handleErrorOrSetLists = React.useCallback(async (error)=>{
-        if (error.isError) {
-            setError(error);
-        } else {
-            const getListResults = await dataLibraryStoreAPI.getLists();
-            if (getListResults.isError) {
-                setError(getListResults);
-            } else {
-                setLists(getListResults.lists ?? {});
-                setError(null);
-            }
-        }
-    }, [
-        dataLibraryStoreAPI
-    ]);
-    const generateUniqueName = React.useCallback((baseName = DEFAULT_LIST_NAME)=>{
-        let uniqueName = baseName;
-        let counter = 1;
-        const existingNames = Object.values(lists).map((x)=>x.name);
-        while(existingNames.includes(uniqueName)){
-            uniqueName = `${baseName} ${counter}`;
-            counter++;
-        }
-        return uniqueName;
-    }, [
-        lists
-    ]);
-    const performLibraryOperation = React.useCallback(async (operation, updateId)=>{
-        setError(null);
-        if (updateId) {
-            setIsUpdating(updateId);
-        } else setIsLoading(true);
-        const operationResults = await operation();
-        await handleErrorOrSetLists(operationResults);
-        if (updateId) setIsUpdating(null);
-        else setIsLoading(false);
-        return operationResults;
-    }, [
-        handleErrorOrSetLists
-    ]);
-    // Lifecycle effects
-    React.useEffect(()=>{
-        const initializeData = async ()=>{
-            if (!initialLoadRef.current) {
-                setError(null);
-                setIsLoading(true);
-                const results = await dataLibraryStoreAPI.getLists(); // get the initial lists
-                if (results.isError) setError(results);
-                else setLists(results.lists ?? {});
-                setIsLoading(false);
-                initialLoadRef.current = true;
-            }
-        };
-        initializeData();
-    }, [
-        dataLibraryStoreAPI
-    ]);
-    React.useEffect(()=>{
-        const handleLogin = async ()=>{
-        // setIsLoading(true);
-        // await dataLibraryStoreAPI.setUseAPI(options.requiresAPI && isLoggedIn);
-        // setIsLoading(false);
-        };
-        handleLogin();
-    }, [
-        dataLibraryStoreAPI,
-        isLoggedIn
-    ]);
-    // CRUD operations
-    const addListToDataLibrary = React.useCallback(async (items, name)=>{
-        const apiItems = convertDatasetOrCohortToLibraryListItemsAPI(items);
-        const namedItems = {
-            items: apiItems,
-            name: generateUniqueName(name ?? DEFAULT_LIST_NAME)
-        };
-        return await performLibraryOperation(()=>dataLibraryStoreAPI.addList(namedItems));
-    }, [
-        dataLibraryStoreAPI,
-        generateUniqueName,
-        performLibraryOperation
-    ]);
-    const updateListInDataLibrary = React.useCallback(async (payload)=>{
-        const flattened = flattenDataList(payload);
-        return await performLibraryOperation(()=>dataLibraryStoreAPI.updateList(payload.id, {
-                name: payload.name,
-                items: flattened.items
-            }), payload.id);
-    }, [
-        dataLibraryStoreAPI,
-        performLibraryOperation
-    ]);
-    const deleteListFromDataLibrary = React.useCallback(async (id)=>{
-        return await performLibraryOperation(()=>dataLibraryStoreAPI.deleteList(id));
-    }, [
-        dataLibraryStoreAPI,
-        performLibraryOperation
-    ]);
-    const clearLibrary = React.useCallback(async ()=>{
-        return await performLibraryOperation(()=>dataLibraryStoreAPI.clearLists());
-    }, [
-        dataLibraryStoreAPI,
-        performLibraryOperation
-    ]);
-    const setAllListsInDataLibrary = React.useCallback(async (data)=>{
-        const flattenedLists = data.map((x)=>flattenDataList(x));
-        return await performLibraryOperation(()=>dataLibraryStoreAPI.setAllLists(flattenedLists));
-    }, [
-        dataLibraryStoreAPI,
-        performLibraryOperation
-    ]);
-    const getDatalist = React.useCallback((id)=>{
-        if (id in lists) return lists[id];
-        setError({
-            isError: true,
-            status: 404,
-            message: `List not found. Returning empty list.`
-        });
-        return EMPTY_LIST;
-    }, [
-        lists
-    ]);
-    const setLoginState = React.useCallback((loggedIn)=>setIsLoggedIn(loggedIn), []);
-    const results = useDeepCompare.useDeepCompareMemo(()=>({
-            dataLibrary: lists,
-            isLoading,
-            isUpdating,
-            error,
-            addListToDataLibrary,
-            updateListInDataLibrary,
-            deleteListFromDataLibrary,
-            clearLibrary,
-            setAllListsInDataLibrary,
-            setLoginState,
-            getDatalist
-        }), [
-        addListToDataLibrary,
-        clearLibrary,
-        deleteListFromDataLibrary,
-        error,
-        getDatalist,
-        isLoading,
-        isUpdating,
-        lists,
-        setAllListsInDataLibrary,
-        setLoginState,
-        updateListInDataLibrary
-    ]);
-    return results;
-};
-
-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';
+/**
+ * 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];
     }
-    return false;
+    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)).join(' ');
 };
-const extractFilterValue = (op)=>{
-    const valueExtractorHandler = new ValueExtractorHandler();
-    return handleOperation(valueExtractorHandler, op);
+/**
+ * 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 extractEnumFilterValue = (op)=>{
-    const enumValueExtractorHandler = new EnumValueExtractorHandler();
-    const results = handleOperation(enumValueExtractorHandler, op);
-    return results ?? [];
+
+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 assertNever = (x)=>{
-    throw Error(`Exhaustive comparison did not handle: ${x}`);
+const selectCohortFilters = (state)=>{
+    const currentCohortId = getCurrentCohortFromCoreState(state);
+    return state.cohorts.cohortManager.entities[currentCohortId]?.filters;
 };
-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);
-    }
+const selectCurrentCohortFilters = (state)=>{
+    const currentCohortId = getCurrentCohortFromCoreState(state);
+    return state.cohorts.cohortManager.entities[currentCohortId]?.filters;
 };
-/**
- * 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 selectCurrentCohortId = (state)=>{
+    return state.cohorts.cohortManager.currentCohortId;
 };
+const selectCurrentCohort = (state)=>cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
+const selectCurrentCohortName = (state)=>cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state)).name;
 /**
- * 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);
+ * 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];
 };
-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]))
-    };
+/**
+ * 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;
 };
 /**
- * Extract the operand values, if operands themselves have values, otherwise undefined.
- */ class ValueExtractorHandler {
-    constructor(){
-        this.handleEquals = (op)=>op.operand;
-        this.handleNotEquals = (op)=>op.operand;
-        this.handleIncludes = (op)=>op.operands;
-        this.handleExcludes = (op)=>op.operands;
-        this.handleExcludeIfAny = (op)=>op.operands;
-        this.handleGreaterThanOrEquals = (op)=>op.operand;
-        this.handleGreaterThan = (op)=>op.operand;
-        this.handleLessThan = (op)=>op.operand;
-        this.handleLessThanOrEquals = (op)=>op.operand;
-        this.handleIntersection = (_arg)=>undefined;
-        this.handleUnion = (_)=>undefined;
-        this.handleNestedFilter = (_)=>undefined;
-        this.handleExists = (_)=>undefined;
-        this.handleMissing = (_)=>undefined;
-    }
-}
+ * 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;
+};
 /**
- * Extract the operand values, if operands themselves have values, otherwise undefined.
- */ class EnumValueExtractorHandler {
-    constructor(){
-        this.handleEquals = (_)=>undefined;
-        this.handleNotEquals = (_)=>undefined;
-        this.handleIncludes = (op)=>op.operands;
-        this.handleExcludes = (op)=>op.operands;
-        this.handleExcludeIfAny = (op)=>op.operands;
-        this.handleGreaterThanOrEquals = (_)=>undefined;
-        this.handleGreaterThan = (_)=>undefined;
-        this.handleLessThan = (_)=>undefined;
-        this.handleLessThanOrEquals = (_)=>undefined;
-        this.handleIntersection = (_)=>undefined;
-        this.handleUnion = (_)=>undefined;
-        this.handleNestedFilter = (op)=>{
-            return extractEnumFilterValue(op.operand);
-        };
-        this.handleExists = (_)=>undefined;
-        this.handleMissing = (_)=>undefined;
-    }
-}
-const filterSetToOperation = (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];
-                })
-            };
+ * 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 undefined;
+    return cohort?.filters?.[index] ?? EmptyFilterSet;
 };
 
-const isFilterSet = (input)=>{
-    if (typeof input !== 'object' || input === null) {
+const isFileItem = (item)=>{
+    return item && 'guid' in item;
+};
+const isAdditionalDataItem = (item)=>{
+    return item.itemType === 'AdditionalData'; // TODO resolve this with type from the api
+};
+// Type guard for CohortItem
+const isCohortItem = (item)=>{
+    return item && 'data' in item && 'schemaVersion' in item && item.itemType === 'Gen3GraphQL';
+};
+// Type guard for DatalistAPI
+const isDatalistAPI = (value)=>{
+    if (typeof value !== 'object' || value === null) {
         return false;
     }
-    const { root, mode } = input;
-    if (typeof root !== 'object' || root === null) {
+    const data = value;
+    // Check required properties in DataItemBaseData
+    if (typeof data.name !== 'string' || typeof data.created_time !== 'string' || typeof data.updated_time !== 'string' || typeof data.version !== 'number' || typeof data.authz !== 'object' || data.authz === null || !Array.isArray(data.authz.authz)) {
         return false;
     }
-    if (![
-        'and',
-        'or'
-    ].includes(mode)) {
+    // Check required properties in DatalistAsItems
+    if (typeof data.items !== 'object' || data.items === null || typeof data.items !== 'object') {
         return false;
     }
     return true;
 };
-function isUnion(value) {
-    return typeof value === 'object' && value !== null && value.operator === 'or' && Array.isArray(value.operands);
-}
-function isIntersection(value) {
-    return typeof value === 'object' && value !== null && value.operator === 'and' && Array.isArray(value.operands);
-}
-const isOperandsType = (operation)=>{
-    return operation?.operands !== undefined;
+/**
+ * Type guard for DataLibraryAPIResponse
+ */ const isDataLibraryAPIResponse = (obj)=>{
+    return typeof obj === 'object' && obj !== null && 'lists' in obj && typeof obj.lists === 'object';
 };
+var DataLibraryStoreMode = /*#__PURE__*/ function(DataLibraryStoreMode) {
+    DataLibraryStoreMode["ApiOnly"] = "apiOnly";
+    DataLibraryStoreMode["ApiAndLocal"] = "apiAndLocal";
+    DataLibraryStoreMode["LocalOnly"] = "localOnly";
+    return DataLibraryStoreMode;
+}({});
 
-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 = (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];
+const processItem = (id, data)=>{
+    if (data?.type === 'AdditionalData') {
+        return {
+            name: data.name,
+            itemType: 'AdditionalData',
+            description: data?.description,
+            documentationUrl: data?.documentationUrl,
+            url: data?.url
+        };
     }
-    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)).join(' ');
+    return {
+        ...data,
+        itemType: 'Data',
+        guid: data.id,
+        id: id
+    };
+};
+const buildListItemsGroupedByDataset = (listData)=>{
+    const items = Object.entries(listData).reduce((acc, [id, data])=>{
+        if (data?.type === 'Gen3GraphQL') {
+            const cohortData = data;
+            acc[id] = {
+                itemType: 'Gen3GraphQL',
+                id: data.guid,
+                schemaVersion: cohortData.schema_version,
+                data: cohortData.data,
+                name: data.name,
+                index: cohortData.index
+            };
+        } else {
+            // Dataset
+            if (!(data?.dataset_guid && data.dataset_guid in acc)) {
+                acc[data.dataset_guid] = {
+                    id: data.dataset_guid,
+                    name: '',
+                    members: {
+                        [id]: processItem(id, data)
+                    }
+                };
+            } else {
+                acc[data.dataset_guid].members[id] = processItem(id, data);
+            }
+        }
+        return acc;
+    }, {});
+    return items;
+};
+const BuildList = (listId, listData)=>{
+    if (!Object.keys(listData).includes('items')) return undefined;
+    const items = buildListItemsGroupedByDataset(listData?.items ?? {});
+    return {
+        items: items,
+        version: listData?.version ?? 0,
+        created_time: listData?.created_time,
+        updated_time: listData?.updated_time,
+        name: listData?.name ?? listId,
+        id: listId,
+        authz: listData?.authz
+    };
 };
 /**
- * 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}`;
+ * Constructs a `DataLibrary` object by transforming the input `DataLibraryAPIResponse`.
+ *
+ * This function takes an API response containing lists and processes each list entry.
+ * It uses `BuildList` to build individual list objects for each entry in the provided data.
+ * The resulting lists are accumulated and structured into a `DataLibrary` object. which
+ * groups File Object by dataset_guid.
+ *
+ * @param {DataLibraryAPIResponse} data - The API response containing the lists to process.
+ * @returns {DataLibrary} A structured `DataLibrary` object containing the processed lists.
+ */ const BuildLists = (data)=>{
+    return Object.entries(data?.lists).reduce((acc, [listId, listData])=>{
+        const list = BuildList(listId, listData);
+        if (list) acc[listId] = list;
+        return acc;
+    }, {});
+};
 /**
- * extract the field name from the index.field name
- */ const extractFieldNameFromFullFieldName = (fieldName)=>fieldName.split('.').slice(1).join('.');
+ * Calculates the total number of items within a DataList object.
+ *
+ * @param {DataList} dataList - The DataList object to count items from.
+ * @return {number} The total number of items in the DataList.
+ */ const getNumberOfItemsInDatalist = (dataList)=>{
+    if (!dataList?.items) return 0;
+    return Object.values(dataList.items).reduce((count, item)=>{
+        if (isCohortItem(item)) {
+            return count + 1;
+        } else {
+            return count + Object.values(item?.members ?? {}).reduce((fileCount, x)=>{
+                if (isFileItem(x)) {
+                    return fileCount + 1;
+                }
+                return fileCount;
+            }, 0);
+        }
+    }, 0);
+};
+const flattenDataList = (dataList)=>{
+    // convert datalist into user-data-library API for for updating.
+    const items = Object.entries(dataList.items).reduce((acc, [id, value])=>{
+        if (isCohortItem(value)) {
+            acc[id] = value;
+        } else {
+            return {
+                ...acc,
+                ...value.members
+            }; // TODO: might need to convert this to the API version
+        }
+        return acc;
+    }, {});
+    return {
+        name: dataList.name,
+        items: items
+    };
+};
+const convertDatasetOrCohortToLibraryListItemsAPI = (list)=>{
+    const result = {};
+    // Iterate through each entry in the DatasetOrCohort object
+    Object.entries(list).forEach(([datasetId, item])=>{
+        if (isCohortItem(item)) {
+            // Handle cohort items
+            result[datasetId] = {
+                itemType: 'Gen3GraphQL',
+                id: item.id,
+                schemaVersion: item.schemaVersion,
+                data: item.data,
+                name: item.name,
+                index: item.index
+            };
+        } else {
+            // Handle dataset items
+            const members = item.members || {};
+            // Process each member of the dataset
+            Object.entries(members).forEach(([memberId, memberData])=>{
+                if (isFileItem(memberData)) {
+                    result[memberId] = {
+                        ...memberData.guid && {
+                            guid: memberData.guid
+                        },
+                        ...memberData.name && {
+                            name: memberData.name
+                        },
+                        ...memberData.name && {
+                            name: memberData.name
+                        },
+                        ...memberData.description && {
+                            description: memberData.description
+                        },
+                        ...memberData.type && {
+                            type: memberData.type
+                        },
+                        dataset_guid: datasetId
+                    };
+                } else if (memberData.itemType === 'AdditionalData') {
+                    // Handle additional data items
+                    result[memberId] = {
+                        itemType: 'AdditionalData',
+                        name: memberData.name,
+                        description: memberData.description,
+                        documentationUrl: memberData.documentationUrl,
+                        url: memberData.url,
+                        dataset_guid: datasetId
+                    };
+                }
+            });
+        }
+    });
+    return result;
+};
+const convertDataLibraryToDataLibraryAPI = (dataLibrary)=>{
+    const result = {};
+    Object.entries(dataLibrary).forEach(([listId, list])=>{
+        result[listId] = {
+            name: list.name,
+            items: convertDatasetOrCohortToLibraryListItemsAPI(list.items),
+            version: list.version,
+            created_time: list.created_time,
+            updated_time: list.updated_time,
+            authz: list.authz
+        };
+    });
+    return result;
+};
+const extractIndexFromDataLibraryCohort = (query)=>{
+    try {
+        const parsedQuery = graphql.parse(query['query']);
+        const aggregationField = parsedQuery.definitions.filter((def)=>def.kind === 'OperationDefinition').flatMap((def)=>def.selectionSet.selections).find((sel)=>sel.kind === 'Field' && sel.name.value === '_aggregation');
+        if (aggregationField && 'selectionSet' in aggregationField) {
+            const indexField = aggregationField?.selectionSet?.selections.find((sel)=>sel.kind === 'Field');
+            return indexField ? indexField.name.value : null;
+        }
+    } catch (error) {
+        console.error('Invalid GraphQL query:', error);
+    }
+    return null;
+};
 /**
- * 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('.')
-    ];
+ *  Takes a list of file items from anb array of manifest entries
+ *  and creates an Object of Files grouped by their dataset guid, which is
+ *  used to add these to a Data Library List
+ * @param data
+ * @param dataFieldMapping
+ * @constructor
+ */ const extractFileDatasetsInRecords = (data, dataFieldMapping)=>{
+    const items = data.reduce((acc, resource)=>{
+        const dataObjects = resource[dataFieldMapping.dataObjectField];
+        // Check if dataObjects exists and is an array
+        if (!dataObjects || !Array.isArray(dataObjects)) {
+            return acc;
+        }
+        const datasetId = resource[dataFieldMapping.datasetIdField]; // Note: typo still preserved
+        if (datasetId === undefined) {
+            return acc; // Skip if dataset ID is missing
+        }
+        const datafiles = dataObjects.reduce((dataAcc, dataObject)=>{
+            const fileId = dataObject[dataFieldMapping.dataObjectIdField];
+            // Skip items without a valid ID
+            if (typeof fileId !== 'string' || !fileId) {
+                return dataAcc;
+            }
+            const name = dataObject[dataFieldMapping?.dataObjectNameField ?? 'name'] ?? 'No Name';
+            const size = dataObject[dataFieldMapping?.dataObjectSizeField ?? 'size'];
+            let sizeString = 'N/A';
+            if (typeof size === 'number') {
+                sizeString = size.toString();
+            }
+            if (typeof size === 'string') {
+                sizeString = size;
+            }
+            const md5Sum = dataObject[dataFieldMapping?.dataObjectMd5sumField ?? 'md5sum'] ?? 'N/A';
+            const url = dataObject[dataFieldMapping?.dataObjectUrlField ?? 'url'] ?? 'N/A';
+            let fileType = 'GA4GH_DRS';
+            if (dataFieldMapping?.dataObjectFileTypeValue) fileType = dataFieldMapping.dataObjectFileTypeValue;
+            if (dataFieldMapping?.dataObjectFileTypeField) fileType = dataObject[dataFieldMapping?.dataObjectFileTypeField];
+            return {
+                ...dataAcc,
+                [fileId]: {
+                    dataset_guid: datasetId,
+                    id: fileId,
+                    guid: fileId,
+                    itemType: 'Data',
+                    name: name,
+                    size: sizeString,
+                    md5sum: md5Sum,
+                    type: fileType,
+                    url: url
+                }
+            };
+        }, {});
+        return {
+            ...acc,
+            ...datafiles
+        };
+    }, {});
+    return items;
+};
+
+const DATABASE_NAME = 'Gen3DataLibrary';
+const STORE_NAME = 'DataLibraryLists';
+class LocalStorageService {
+    getDb() {
+        return idb.openDB(DATABASE_NAME, 1, {
+            // TODO add more complete upgrade
+            upgrade (db) {
+                if (!db.objectStoreNames.contains(STORE_NAME)) {
+                    db.createObjectStore(STORE_NAME, {
+                        keyPath: 'id'
+                    });
+                }
+            }
+        });
+    }
+    async getList(id) {
+        const db = await this.getDb();
+        const tx = db.transaction(STORE_NAME, 'readonly');
+        const store = tx.objectStore(STORE_NAME);
+        const lists = await store.get(id);
+        if (lists) {
+            return {
+                status: 200,
+                message: 'success',
+                lists: {
+                    [id]: {
+                        id: id,
+                        ...lists,
+                        items: lists.items
+                    }
+                }
+            };
+        } else {
+            return {
+                isError: true,
+                status: 500,
+                message: `${id} does not exist`
+            };
+        }
+    }
+    async getLists() {
+        const db = await this.getDb();
+        const tx = db.transaction(STORE_NAME, 'readonly');
+        const store = tx.objectStore(STORE_NAME);
+        const lists = await store.getAll();
+        if (!lists) {
+            return {
+                isError: true,
+                status: 500,
+                message: 'no lists returned'
+            };
+        }
+        const listMap = lists.reduce((acc, x)=>{
+            const { id } = x;
+            acc[id] = x;
+            return acc;
+        }, {});
+        const datalists = BuildLists({
+            lists: listMap
+        });
+        return {
+            status: 200,
+            message: 'success',
+            lists: datalists
+        };
+    }
+    async addList(list) {
+        const timestamp = getTimestamp();
+        try {
+            const db = await this.getDb();
+            const tx = db.transaction(STORE_NAME, 'readwrite');
+            const id = toolkit.nanoid(); // Create an id for the list
+            tx.objectStore(STORE_NAME).put({
+                id,
+                version: 0,
+                items: list?.items ?? {},
+                creator: '{{subject_id}}',
+                authz: {
+                    version: 0,
+                    authz: [
+                        `/users/{{subject_id}}/user-library/lists/${id}`
+                    ]
+                },
+                name: list?.name ?? 'New List',
+                created_time: timestamp,
+                updated_time: timestamp
+            });
+            await tx.done;
+            return {
+                status: 200,
+                message: 'list added'
+            };
+        } catch (_error) {
+            return {
+                isError: true,
+                status: 500,
+                message: `unable to add list ${list?.name ?? 'New List'}`
+            };
+        }
+    }
+    async updateList(id, update) {
+        const { name, items } = update;
+        try {
+            const db = await this.getDb();
+            const tx = db.transaction(STORE_NAME, 'readwrite');
+            const store = tx.objectStore(STORE_NAME);
+            const listData = await store.get(id);
+            if (!listData) {
+                throw new Error(`List ${id} does not exist`);
+            }
+            const timestamp = getTimestamp();
+            const version = listData.version ? listData.version + 1 : 0;
+            const updated = {
+                ...listData,
+                ...{
+                    name,
+                    items
+                },
+                version: version,
+                updated_time: timestamp,
+                created_time: listData.created_time
+            };
+            store.put(updated);
+            await tx.done;
+            return {
+                status: 200,
+                message: 'success'
+            };
+        } catch (error) {
+            let errorMessage = 'An unknown error occurred';
+            if (error instanceof Error) {
+                errorMessage = error.message;
+            }
+            return {
+                isError: true,
+                status: 500,
+                message: `Unable to update list: ${id}. Error: ${errorMessage}`
+            };
+        }
+    }
+    async deleteList(id) {
+        try {
+            const db = await this.getDb();
+            const tx = db.transaction(STORE_NAME, 'readwrite');
+            const store = tx.objectStore(STORE_NAME);
+            const item = await store.get(id);
+            if (!item) {
+                throw new Error(`List ${id} does not exist`);
+            }
+            store.delete(id);
+            await tx.done;
+            return {
+                status: 200,
+                message: `${id} deleted`
+            };
+        } catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
+            return {
+                isError: true,
+                status: 500,
+                message: `Unable to delete list: ${id}. Error: ${errorMessage}`
+            };
+        }
+    }
+    async clearLists() {
+        try {
+            const db = await this.getDb();
+            const tx = db.transaction(STORE_NAME, 'readwrite');
+            tx.objectStore(STORE_NAME).clear();
+            await tx.done;
+            return {
+                status: 200,
+                message: 'list cleared'
+            };
+        } catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
+            return {
+                isError: true,
+                status: 500,
+                message: `Unable to clear library. Error: ${errorMessage}`
+            };
+        }
+    }
+    async cacheLists(data) {
+        if (!data || typeof data !== 'object') {
+            return {
+                isError: true,
+                status: 500,
+                message: 'Invalid or missing lists property in request'
+            };
+        }
+        const allLists = Object.entries(data).reduce((acc, [id, x])=>{
+            if (!isDatalistAPI(x)) return acc;
+            acc[id] = {
+                ...x
+            };
+            return acc;
+        }, {});
+        try {
+            const db = await this.getDb();
+            const tx = db.transaction(STORE_NAME, 'readwrite');
+            for (const [id, list] of Object.entries(allLists)){
+                tx.objectStore(STORE_NAME).put({
+                    id,
+                    ...list
+                });
+            }
+            await tx.done;
+            return {
+                status: 200,
+                message: 'success'
+            };
+        } catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
+            return {
+                isError: true,
+                status: 200,
+                message: `unable to cache library to local storage. Error: ${errorMessage}`
+            };
+        }
+    }
+    async cacheList(id, data) {
+        if (!data || typeof data !== 'object') {
+            return {
+                isError: true,
+                status: 500,
+                message: 'Invalid or missing lists property in request'
+            };
+        }
+        try {
+            const db = await this.getDb();
+            const tx = db.transaction(STORE_NAME, 'readwrite');
+            tx.objectStore(STORE_NAME).put({
+                id: id,
+                ...data
+            });
+            await tx.done;
+            return {
+                status: 200,
+                message: 'success'
+            };
+        } catch (error) {
+            const errorMessage = error instanceof Error ? error.message : 'An unknown error occurred';
+            return {
+                isError: true,
+                status: 500,
+                message: `unable to clear library. Error: ${errorMessage}`
+            };
+        }
+    }
+    constructor(){
+        this.setAllLists = async (data)=>{
+            const timestamp = getTimestamp();
+            const allLists = data.reduce((acc, x)=>{
+                if (!isJSONObject(x)) return acc;
+                const id = toolkit.nanoid(10);
+                acc[id] = {
+                    ...x,
+                    version: 0,
+                    created_time: timestamp,
+                    updated_time: timestamp,
+                    creator: '{{subject_id}}',
+                    authz: {
+                        version: 0,
+                        authz: [
+                            `/users/{{subject_id}}/user-library/lists/${id}`
+                        ]
+                    }
+                };
+                return acc;
+            }, {});
+            try {
+                const db = await this.getDb();
+                const tx = db.transaction(STORE_NAME, 'readwrite');
+                for (const [id, list] of Object.entries(allLists)){
+                    tx.objectStore(STORE_NAME).put({
+                        id,
+                        ...list
+                    });
+                }
+                await tx.done;
+                return {
+                    status: 200,
+                    message: 'success'
+                };
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            } catch (_error) {
+                return {
+                    isError: true,
+                    status: 500,
+                    message: 'unable to add lists'
+                };
+            }
+        };
+    }
+}
+
+const fetchFromDataLibraryAPI = async (url, method = HttpMethod.GET, body = undefined)=>{
+    try {
+        return {
+            data: await fetchJSONDataFromURL(url, true, method, body)
+        };
+    } catch (error) {
+        if (error instanceof HTTPError) {
+            return {
+                error: {
+                    status: error.status,
+                    message: HTTPErrorMessages[error.status] || error.responseData?.message || 'No HTTP Error Message'
+                }
+            };
+        } else {
+            return {
+                error: {
+                    status: 500,
+                    message: 'Unknown Error'
+                }
+            };
+        }
+    }
+};
+const responseFromMutation = (responseReceived)=>{
+    if (responseReceived.error) {
+        return {
+            isError: true,
+            ...responseReceived.error
+        };
+    }
+    return {
+        lists: responseReceived.data,
+        message: 'success',
+        status: 200
+    };
+};
+class APIStorageService {
+    constructor(apiBaseUrl = `${GEN3_DATA_LIBRARY_API}`){
+        this.pendingRequests = new Map();
+        this.apiBaseUrl = apiBaseUrl;
+    }
+    async dedupedRequest(url, method = HttpMethod.GET, body = undefined) {
+        // Create a unique key for this request
+        const requestKey = `${method}:${url}:${body ? JSON.stringify(body) : ''}`;
+        // If this exact request is already in progress, return the pending promise
+        if (this.pendingRequests.has(requestKey)) {
+            return this.pendingRequests.get(requestKey);
+        }
+        // Otherwise, make the request and store the promise
+        const requestPromise = fetchFromDataLibraryAPI(url, method, body);
+        this.pendingRequests.set(requestKey, requestPromise);
+        try {
+            // Wait for the request to complete
+            const result = await requestPromise;
+            return result;
+        } finally{
+            // Remove the request from pending requests after it completes
+            this.pendingRequests.delete(requestKey);
+        }
+    }
+    async getLists() {
+        const { data, error } = await this.dedupedRequest(`${this.apiBaseUrl}`);
+        if (error) {
+            return {
+                isError: true,
+                ...error
+            };
+        }
+        if (data && isDataLibraryAPIResponse(data)) {
+            const datalists = BuildLists(data);
+            return {
+                lists: datalists,
+                status: 200,
+                message: 'success'
+            };
+        }
+        return {
+            lists: {},
+            status: 200,
+            message: 'no list returned'
+        };
+    }
+    async addList(list) {
+        const response = await fetchFromDataLibraryAPI(`${this.apiBaseUrl}`, HttpMethod.PUT, JSON.stringify({
+            lists: [
+                list
+            ]
+        }));
+        return responseFromMutation(response);
+    }
+    async updateList(id, list) {
+        const response = await fetchFromDataLibraryAPI(`${this.apiBaseUrl}/${id}`, HttpMethod.PUT, JSON.stringify(list));
+        return responseFromMutation(response);
+    }
+    async deleteList(id) {
+        const response = await fetchFromDataLibraryAPI(`${this.apiBaseUrl}/${id}`, HttpMethod.DELETE);
+        return responseFromMutation(response);
+    }
+    async clearLists() {
+        const response = await fetchFromDataLibraryAPI(this.apiBaseUrl, HttpMethod.DELETE);
+        return responseFromMutation(response);
+    }
+    async setAllLists(lists) {
+        const response = await fetchFromDataLibraryAPI(this.apiBaseUrl, HttpMethod.POST, JSON.stringify({
+            lists: Object.values(lists)
+        }));
+        return responseFromMutation(response);
+    }
+    async getList(id) {
+        const { data, error } = await fetchFromDataLibraryAPI(`${this.apiBaseUrl}/${id}`);
+        if (error) {
+            return {
+                isError: true,
+                ...error
+            };
+        }
+        if (isDataLibraryAPIResponse(data)) {
+            const datalists = BuildLists(data);
+            return {
+                lists: datalists,
+                status: 200,
+                message: 'success'
+            };
+        }
+        return {
+            isError: true,
+            status: 500,
+            message: `Unknown error getting list ${id}`
+        };
+    }
+}
+
+class CachedAPIService {
+    constructor(){
+        this.localStorageDataLibrary = new LocalStorageService(); // always update local storage
+        this.apiDataLibrary = new APIStorageService();
+    }
+    async getLists() {
+        // do a network request to get the library
+        // get the remote list
+        const apiResults = await this.apiDataLibrary.getLists();
+        if (apiResults.isError) {
+            return {
+                ...apiResults,
+                lists: undefined
+            };
+        }
+        const dataLibrary = convertDataLibraryToDataLibraryAPI(apiResults?.lists ?? {});
+        await this.localStorageDataLibrary.cacheLists(dataLibrary);
+        return apiResults;
+    }
+    async getList(id) {
+        return await this.localStorageDataLibrary.getList(id);
+    }
+    async getCachedLists(id) {
+        return await this.localStorageDataLibrary.getList(id);
+    }
+    async setAllLists(lists) {
+        const apiResults = await this.apiDataLibrary.setAllLists(lists);
+        if (apiResults.isError) {
+            return {
+                ...apiResults,
+                lists: undefined
+            };
+        }
+        const dataLibrary = convertDataLibraryToDataLibraryAPI(apiResults?.lists ?? {});
+        await this.localStorageDataLibrary.cacheLists(dataLibrary);
+        return apiResults;
+    }
+    async addList(list) {
+        // update the API list
+        const apiResults = await this.apiDataLibrary.addList(list);
+        if (apiResults.isError) {
+            return {
+                ...apiResults,
+                lists: undefined
+            };
+        }
+        const cacheResults = await this.localStorageDataLibrary.addList(list);
+        return {
+            ...cacheResults,
+            lists: undefined
+        };
+    }
+    async updateList(id, list) {
+        const apiResults = await this.apiDataLibrary.updateList(id, list);
+        if (apiResults.isError) {
+            return {
+                ...apiResults,
+                lists: undefined
+            };
+        }
+        return await this.localStorageDataLibrary.cacheList(id, apiResults.lists ?? {});
+    }
+    async deleteList(id) {
+        const apiResults = await this.apiDataLibrary.deleteList(id);
+        if (apiResults.isError) {
+            return {
+                ...apiResults,
+                lists: undefined
+            };
+        }
+        return await this.localStorageDataLibrary.deleteList(id);
+    }
+    async clearLists() {
+        const apiResults = await this.apiDataLibrary.clearLists();
+        if (apiResults.isError) {
+            return {
+                ...apiResults,
+                lists: undefined
+            };
+        }
+        return await this.localStorageDataLibrary.clearLists();
+    }
+}
+
+class DataLibraryStorageService {
+    constructor(mode = DataLibraryStoreMode.ApiOnly){
+        if (mode === DataLibraryStoreMode.ApiOnly) {
+            this.storageService = new APIStorageService();
+        } else if (mode === DataLibraryStoreMode.ApiAndLocal) this.storageService = new CachedAPIService();
+        else this.storageService = new LocalStorageService();
+    }
+    async setStorageMode(mode) {
+        if (mode === DataLibraryStoreMode.ApiOnly) {
+            this.storageService = new APIStorageService();
+        } else if (mode === DataLibraryStoreMode.ApiAndLocal) this.storageService = new CachedAPIService();
+        else this.storageService = new LocalStorageService();
+    }
+    // private async syncApiAndLocal() {
+    //   const { lists: localData, isError: localError } =
+    //     await this.localStorageDataLibrary.getLists();
+    //   const { lists: apiData, isError: apiError } =
+    //     await this.apiDataLibrary.getLists();
+    //
+    //   if (localError || apiError) {
+    //     return;
+    //   }
+    //
+    //   const mergedData: Record<string, Datalist> = { ...localData };
+    //
+    //   // First, update any existing items with newer versions from API
+    //   Object.values(apiData?.lists ?? {}).forEach((apiList) => {
+    //     const id = apiList.id as keyof DataLibrary;
+    //     const localList = localData?.[id];
+    //     if (
+    //       !localList ||
+    //       storage Date(apiList.updatedTime) > storage Date(localList.updatedTime)
+    //     ) {
+    //       mergedData[id] = apiList;
+    //     }
+    //   });
+    //
+    //   //  Push local-only changes to API
+    //   const syncPromises: Promise<any>[] = [];
+    //
+    //   for (const [id, localList] of Object.entries(localData?.lists ?? {})) {
+    //     if (!apiData?.[id]) {
+    //       // This list exists locally but not in API, so push it to API
+    //       syncPromises.push(this.apiDataLibrary.addList(localList));
+    //     } else if (
+    //       storage Date(localList.updatedTime) > storage Date(apiData[id].updatedTime)
+    //     ) {
+    //       // Local list is newer than API, so update API
+    //       syncPromises.push(this.apiDataLibrary.updateList(localList));
+    //     }
+    //   }
+    //
+    //   // Wait for all API operations to complete
+    //   await Promise.all(syncPromises);
+    //   await this.localStorageDataLibrary.cacheLists({ lists: mergedData });
+    // }
+    async getLists() {
+        return await this.storageService.getLists();
+    }
+    async getList(id) {
+        return await this.storageService.getList(id);
+    }
+    async getCachedLists(id) {
+        return await this.storageService.getList(id);
+    }
+    async setAllLists(lists) {
+        return await this.storageService.setAllLists(lists ?? {});
+    }
+    async addList(list) {
+        return await this.storageService.addList(list);
+    }
+    async updateList(id, list) {
+        return await this.storageService.updateList(id, list);
+    }
+    async deleteList(id) {
+        return await this.storageService.deleteList(id);
+    }
+    async clearLists() {
+        return await this.storageService.clearLists();
+    }
+}
+
+const EMPTY_LIST = {
+    items: {},
+    version: 0,
+    created_time: 'not_set',
+    updated_time: 'not_set',
+    name: '',
+    id: '',
+    authz: {
+        version: -1,
+        authz: []
+    }
+};
+const DEFAULT_LIST_NAME = 'List';
+const useDataLibrary = (options = {
+    storageMode: DataLibraryStoreMode.ApiOnly
+})=>{
+    // State management
+    const [isLoggedIn, setIsLoggedIn] = React.useState(false);
+    const [isLoading, setIsLoading] = React.useState(false);
+    const [isUpdating, setIsUpdating] = React.useState(null);
+    const [error, setError] = React.useState(null);
+    const [lists, setLists] = React.useState({});
+    // Refs
+    const initialLoadRef = React.useRef(false);
+    // Services
+    const dataLibraryStoreAPI = React.useRef(new DataLibraryStorageService(options.storageMode)).current;
+    const handleErrorOrSetLists = React.useCallback(async (error)=>{
+        if (error.isError) {
+            setError(error);
+        } else {
+            const getListResults = await dataLibraryStoreAPI.getLists();
+            if (getListResults.isError) {
+                setError(getListResults);
+            } else {
+                setLists(getListResults.lists ?? {});
+                setError(null);
+            }
+        }
+    }, [
+        dataLibraryStoreAPI
+    ]);
+    const generateUniqueName = React.useCallback((baseName = DEFAULT_LIST_NAME)=>{
+        let uniqueName = baseName;
+        let counter = 1;
+        const existingNames = Object.values(lists).map((x)=>x.name);
+        while(existingNames.includes(uniqueName)){
+            uniqueName = `${baseName} ${counter}`;
+            counter++;
+        }
+        return uniqueName;
+    }, [
+        lists
+    ]);
+    const performLibraryOperation = React.useCallback(async (operation, updateId)=>{
+        setError(null);
+        if (updateId) {
+            setIsUpdating(updateId);
+        } else setIsLoading(true);
+        const operationResults = await operation();
+        await handleErrorOrSetLists(operationResults);
+        if (updateId) setIsUpdating(null);
+        else setIsLoading(false);
+        return operationResults;
+    }, [
+        handleErrorOrSetLists
+    ]);
+    // Lifecycle effects
+    React.useEffect(()=>{
+        const initializeData = async ()=>{
+            if (!initialLoadRef.current) {
+                setError(null);
+                setIsLoading(true);
+                const results = await dataLibraryStoreAPI.getLists(); // get the initial lists
+                if (results.isError) setError(results);
+                else setLists(results.lists ?? {});
+                setIsLoading(false);
+                initialLoadRef.current = true;
+            }
+        };
+        initializeData();
+    }, [
+        dataLibraryStoreAPI
+    ]);
+    React.useEffect(()=>{
+        const handleLogin = async ()=>{
+        // setIsLoading(true);
+        // await dataLibraryStoreAPI.setUseAPI(options.requiresAPI && isLoggedIn);
+        // setIsLoading(false);
+        };
+        handleLogin();
+    }, [
+        dataLibraryStoreAPI,
+        isLoggedIn
+    ]);
+    // CRUD operations
+    const addListToDataLibrary = React.useCallback(async (items, name)=>{
+        const apiItems = convertDatasetOrCohortToLibraryListItemsAPI(items);
+        const namedItems = {
+            items: apiItems,
+            name: generateUniqueName(name ?? DEFAULT_LIST_NAME)
+        };
+        return await performLibraryOperation(()=>dataLibraryStoreAPI.addList(namedItems));
+    }, [
+        dataLibraryStoreAPI,
+        generateUniqueName,
+        performLibraryOperation
+    ]);
+    const updateListInDataLibrary = React.useCallback(async (payload)=>{
+        const flattened = flattenDataList(payload);
+        return await performLibraryOperation(()=>dataLibraryStoreAPI.updateList(payload.id, {
+                name: payload.name,
+                items: flattened.items
+            }), payload.id);
+    }, [
+        dataLibraryStoreAPI,
+        performLibraryOperation
+    ]);
+    const deleteListFromDataLibrary = React.useCallback(async (id)=>{
+        return await performLibraryOperation(()=>dataLibraryStoreAPI.deleteList(id));
+    }, [
+        dataLibraryStoreAPI,
+        performLibraryOperation
+    ]);
+    const clearLibrary = React.useCallback(async ()=>{
+        return await performLibraryOperation(()=>dataLibraryStoreAPI.clearLists());
+    }, [
+        dataLibraryStoreAPI,
+        performLibraryOperation
+    ]);
+    const setAllListsInDataLibrary = React.useCallback(async (data)=>{
+        const flattenedLists = data.map((x)=>flattenDataList(x));
+        return await performLibraryOperation(()=>dataLibraryStoreAPI.setAllLists(flattenedLists));
+    }, [
+        dataLibraryStoreAPI,
+        performLibraryOperation
+    ]);
+    const getDatalist = React.useCallback((id)=>{
+        if (id in lists) return lists[id];
+        setError({
+            isError: true,
+            status: 404,
+            message: `List not found. Returning empty list.`
+        });
+        return EMPTY_LIST;
+    }, [
+        lists
+    ]);
+    const setLoginState = React.useCallback((loggedIn)=>setIsLoggedIn(loggedIn), []);
+    const results = useDeepCompare.useDeepCompareMemo(()=>({
+            dataLibrary: lists,
+            isLoading,
+            isUpdating,
+            error,
+            addListToDataLibrary,
+            updateListInDataLibrary,
+            deleteListFromDataLibrary,
+            clearLibrary,
+            setAllListsInDataLibrary,
+            setLoginState,
+            getDatalist
+        }), [
+        addListToDataLibrary,
+        clearLibrary,
+        deleteListFromDataLibrary,
+        error,
+        getDatalist,
+        isLoading,
+        isUpdating,
+        lists,
+        setAllListsInDataLibrary,
+        setLoginState,
+        updateListInDataLibrary
+    ]);
+    return results;
 };
 
 // using a random uuid v4 as the namespace
@@ -4922,9 +5445,12 @@ const coreCreateApi = react.buildCreateApi(react.coreModule(), react.reactHooksM
 }));
 
 exports.Accessibility = Accessibility;
+exports.CohortStorage = CohortStorage;
 exports.CoreProvider = CoreProvider;
 exports.DataLibraryStoreMode = DataLibraryStoreMode;
+exports.EmptyFilterSet = EmptyFilterSet;
 exports.EmptyWorkspaceStatusResponse = EmptyWorkspaceStatusResponse;
+exports.EnumValueExtractorHandler = EnumValueExtractorHandler;
 exports.GEN3_API = GEN3_API;
 exports.GEN3_AUTHZ_API = GEN3_AUTHZ_API;
 exports.GEN3_COMMONS_NAME = GEN3_COMMONS_NAME;
@@ -4947,8 +5473,10 @@ exports.Modals = Modals;
 exports.PodConditionType = PodConditionType;
 exports.PodStatus = PodStatus;
 exports.RequestedWorkspaceStatus = RequestedWorkspaceStatus;
+exports.ToGqlHandler = ToGqlHandler;
+exports.ValueExtractorHandler = ValueExtractorHandler;
 exports.WorkspaceStatus = WorkspaceStatus;
-exports.addNewDefaultUnsavedCohort = addNewDefaultUnsavedCohort;
+exports.appendFilterToOperation = appendFilterToOperation;
 exports.buildGetAggregationQuery = buildGetAggregationQuery;
 exports.buildListItemsGroupedByDataset = buildListItemsGroupedByDataset;
 exports.calculatePercentageAsNumber = calculatePercentageAsNumber;
@@ -4958,6 +5486,7 @@ exports.clearCohortFilters = clearCohortFilters;
 exports.cohortReducer = cohortReducer;
 exports.convertFilterSetToGqlFilter = convertFilterSetToGqlFilter;
 exports.convertFilterToGqlFilter = convertFilterToGqlFilter;
+exports.convertGqlFilterToFilter = convertGqlFilterToFilter;
 exports.convertToHistogramDataAsStringKey = convertToHistogramDataAsStringKey;
 exports.convertToQueryString = convertToQueryString;
 exports.coreCreateApi = coreCreateApi;
@@ -4966,10 +5495,13 @@ exports.createAppApiForRTKQ = createAppApiForRTKQ;
 exports.createAppStore = createAppStore;
 exports.createGen3App = createGen3App;
 exports.createGen3AppWithOwnStore = createGen3AppWithOwnStore;
+exports.createNewCohort = createNewCohort;
 exports.createUseCoreDataHook = createUseCoreDataHook;
+exports.defaultCohortNameGenerator = defaultCohortNameGenerator;
 exports.downloadFromGuppyToBlob = downloadFromGuppyToBlob;
 exports.downloadJSONDataFromGuppy = downloadJSONDataFromGuppy;
 exports.drsHostnamesReducer = drsHostnamesReducer;
+exports.duplicateCohort = duplicateCohort;
 exports.extractEnumFilterValue = extractEnumFilterValue;
 exports.extractFieldNameFromFullFieldName = extractFieldNameFromFullFieldName;
 exports.extractFileDatasetsInRecords = extractFileDatasetsInRecords;
@@ -4985,6 +5517,7 @@ exports.fetchUserState = fetchUserState;
 exports.fieldNameToTitle = fieldNameToTitle;
 exports.filterSetToOperation = filterSetToOperation;
 exports.gen3Api = gen3Api;
+exports.generateUniqueName = generateUniqueName;
 exports.getCurrentTimestamp = getCurrentTimestamp;
 exports.getFederatedLoginStatus = getFederatedLoginStatus;
 exports.getGen3AppId = getGen3AppId;
@@ -4998,6 +5531,7 @@ exports.guppyAPISliceMiddleware = guppyAPISliceMiddleware;
 exports.guppyApi = guppyApi;
 exports.guppyApiReducer = guppyApiReducer;
 exports.guppyApiSliceReducerPath = guppyApiSliceReducerPath;
+exports.handleGqlOperation = handleGqlOperation;
 exports.handleOperation = handleOperation;
 exports.hideModal = hideModal;
 exports.histogramQueryStrForEachField = histogramQueryStrForEachField;
@@ -5026,10 +5560,12 @@ exports.isHistogramDataArrayAnEnum = isHistogramDataArrayAnEnum;
 exports.isHistogramDataCollection = isHistogramDataCollection;
 exports.isHistogramRangeData = isHistogramRangeData;
 exports.isHttpStatusError = isHttpStatusError;
+exports.isIndexedFilterSetEmpty = isIndexedFilterSetEmpty;
 exports.isIntersection = isIntersection;
 exports.isJSONObject = isJSONObject;
 exports.isJSONValue = isJSONValue;
 exports.isJSONValueArray = isJSONValueArray;
+exports.isNameUnique = isNameUnique;
 exports.isNotDefined = isNotDefined;
 exports.isObject = isObject;
 exports.isOperandsType = isOperandsType;
@@ -5064,6 +5600,7 @@ exports.roundHistogramResponse = roundHistogramResponse;
 exports.selectActiveWorkspaceId = selectActiveWorkspaceId;
 exports.selectActiveWorkspaceStatus = selectActiveWorkspaceStatus;
 exports.selectAllCohortFiltersCollapsed = selectAllCohortFiltersCollapsed;
+exports.selectAllCohorts = selectAllCohorts;
 exports.selectAuthzMappingData = selectAuthzMappingData;
 exports.selectAvailableCohorts = selectAvailableCohorts;
 exports.selectCSRFToken = selectCSRFToken;
@@ -5097,14 +5634,14 @@ exports.selectUserDetails = selectUserDetails;
 exports.selectUserLoginStatus = selectUserLoginStatus;
 exports.selectWorkspaceStatus = selectWorkspaceStatus;
 exports.selectWorkspaceStatusFromService = selectWorkspaceStatusFromService;
-exports.setActiveCohort = setActiveCohort;
-exports.setActiveCohortList = setActiveCohortList;
 exports.setActiveWorkspace = setActiveWorkspace;
 exports.setActiveWorkspaceId = setActiveWorkspaceId;
 exports.setActiveWorkspaceStatus = setActiveWorkspaceStatus;
 exports.setCohortFilter = setCohortFilter;
 exports.setCohortFilterCombineMode = setCohortFilterCombineMode;
 exports.setCohortIndexFilters = setCohortIndexFilters;
+exports.setCohortList = setCohortList;
+exports.setCurrentCohortId = setCurrentCohortId;
 exports.setDRSHostnames = setDRSHostnames;
 exports.setRequestedWorkspaceStatus = setRequestedWorkspaceStatus;
 exports.setSharedFilters = setSharedFilters;
@@ -5116,6 +5653,7 @@ exports.toggleCohortBuilderAllFilters = toggleCohortBuilderAllFilters;
 exports.toggleCohortBuilderCategoryFilter = toggleCohortBuilderCategoryFilter;
 exports.trimFirstFieldNameToTitle = trimFirstFieldNameToTitle;
 exports.updateCohortFilter = updateCohortFilter;
+exports.updateCohortName = updateCohortName;
 exports.useAddCohortManifestMutation = useAddCohortManifestMutation;
 exports.useAddFileManifestMutation = useAddFileManifestMutation;
 exports.useAddMetadataManifestMutation = useAddMetadataManifestMutation;