@gen3/core 0.10.94 → 0.10.95

package/dist/esm/index.js

@@ -1,4 +1,4 @@
-import { createSelector, createAsyncThunk, createSlice, combineReducers, configureStore, nanoid } from '@reduxjs/toolkit';
+import { createSelector, createAsyncThunk, createSlice, createEntityAdapter, nanoid, combineReducers, configureStore } from '@reduxjs/toolkit';
 import { createApi, fetchBaseQuery, buildCreateApi, coreModule, reactHooksModule } from '@reduxjs/toolkit/query/react';
 import { getCookie } from 'cookies-next';
 import { QueryStatus, setupListeners } from '@reduxjs/toolkit/query';
@@ -15,9 +15,9 @@ import { openDB } from 'idb';
 import { v5 } from 'uuid';
 import { CookiesProvider } from 'react-cookie';
 import useSWR from 'swr';
-import { JSONPath } from 'jsonpath-plus';
 import { flatten } from 'flat';
 import Papa from 'papaparse';
+import { JSONPath } from 'jsonpath-plus';
 import Queue from 'queue';
 
 const GEN3_COMMONS_NAME = process.env.NEXT_PUBLIC_GEN3_COMMONS_NAME || 'gen3';
@@ -40,6 +40,7 @@ const GEN3_DATA_LIBRARY_API = process.env.NEXT_PUBLIC_GEN3_DATA_LIBRARY_API || `
 const GEN3_CROSSWALK_API = process.env.NEXT_PUBLIC_GEN3_CROSSWALK_API || `${GEN3_API}/mds`;
 const GEN3_SOWER_API = process.env.NEXT_PUBLIC_GEN3_SOWER_API || `${GEN3_API}/jobs`;
 const GEN3_MANIFEST_API = process.env.NEXT_PUBLIC_GEN3_MANIFEST_API || `${GEN3_API}/manifests`;
+const GEN3_REQUESTOR_API = process.env.NEXT_PUBLIC_GEN3_REQUESTOR_API || `${GEN3_API}/requestor`;
 var Accessibility = /*#__PURE__*/ function(Accessibility) {
     Accessibility["ACCESSIBLE"] = "accessible";
     Accessibility["UNACCESSIBLE"] = "unaccessible";
@@ -180,7 +181,7 @@ const userAuthApi = createApi({
 const EMPTY_USER = {
     username: undefined
 };
-const { useFetchUserDetailsQuery, useLazyFetchUserDetailsQuery, useGetCSRFQuery } = userAuthApi;
+const { useFetchUserDetailsQuery, useLazyFetchUserDetailsQuery, useGetCSRFQuery, useLazyGetCSRFQuery } = userAuthApi;
 const userAuthApiMiddleware = userAuthApi.middleware;
 const userAuthApiReducerPath = userAuthApi.reducerPath;
 const userAuthApiReducer = userAuthApi.reducer;
@@ -396,7 +397,7 @@ const useCoreDispatch = useDispatch.withTypes();
 });
 const isAuthenticated = (loginStatus)=>loginStatus === 'authenticated';
 const isPending = (loginStatus)=>loginStatus === 'pending';
-const initialState$7 = {
+const initialState$8 = {
     status: 'uninitialized',
     loginStatus: 'unauthenticated',
     error: undefined
@@ -407,9 +408,9 @@ const initialState$7 = {
  * @returns: status messages wrapped around fetchUserState response dict
  */ const slice$4 = createSlice({
     name: 'fence/user',
-    initialState: initialState$7,
+    initialState: initialState$8,
     reducers: {
-        resetUserState: ()=>initialState$7
+        resetUserState: ()=>initialState$8
     },
     extraReducers: (builder)=>{
         builder.addCase(fetchUserState.fulfilled, (_, action)=>{
@@ -551,11 +552,11 @@ const { useGetExternalLoginsQuery, useLazyGetExternalLoginsQuery, useLazyIsExter
     }
 };
 
-const initialState$6 = {};
+const initialState$7 = {};
 // TODO: document what this does
 const slice$3 = createSlice({
     name: 'drsResolver',
-    initialState: initialState$6,
+    initialState: initialState$7,
     reducers: {
         setDRSHostnames: (_state, action)=>{
             return action.payload;
@@ -576,12 +577,12 @@ const lookupGen3App = (id)=>{
     return REGISTRY[id];
 };
 
-const initialState$5 = {
+const initialState$6 = {
     gen3Apps: {}
 };
 const slice$2 = createSlice({
     name: 'gen3Apps',
-    initialState: initialState$5,
+    initialState: initialState$6,
     reducers: {
         addGen3AppMetadata: (state, action)=>{
             const { name, requiredEntityTypes } = action.payload;
@@ -612,13 +613,13 @@ const selectGen3AppByName = (appName)=>lookupGen3App(appName); // TODO: memoize
     Modals["GeneralErrorModal"] = "GeneralErrorModal";
     return Modals;
 }({});
-const initialState$4 = {
+const initialState$5 = {
     currentModal: null
 };
 //Creates a modal slice for tracking showModal and hideModal state.
 const slice$1 = createSlice({
     name: 'modals',
-    initialState: initialState$4,
+    initialState: initialState$5,
     reducers: {
         showModal: (state, action)=>{
             state.currentModal = action.payload.modal;
@@ -688,7 +689,7 @@ const isTimeGreaterThan = (startTime, minutes)=>{
 };
 
 const NO_WORKSPACE_ID = 'none';
-const initialState$3 = {
+const initialState$4 = {
     id: NO_WORKSPACE_ID,
     status: WorkspaceStatus.NotFound,
     requestedStatus: RequestedWorkspaceStatus.Unset,
@@ -696,7 +697,7 @@ const initialState$3 = {
 };
 const slice = createSlice({
     name: 'ActiveWorkspace',
-    initialState: initialState$3,
+    initialState: initialState$4,
     reducers: {
         setActiveWorkspaceId: (state, action)=>{
             state = {
@@ -786,119 +787,260 @@ const guppyAPISliceMiddleware = guppyApi.middleware;
 const guppyApiSliceReducerPath = guppyApi.reducerPath;
 const guppyApiReducer = guppyApi.reducer;
 
-const EmptyCohort = {
-    id: 'default',
-    name: 'Filters',
-    filters: {},
-    modified_datetime: new Date().toISOString()
+/**
+ *  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 = 'Unsaved_Cohort';
+const NULL_COHORT_ID = 'null_cohort_id';
+const newCohort = ({ filters = {}, customName })=>{
+    const ts = new Date();
+    const newName = customName;
+    const newId = createCohortId();
+    return {
+        name: newName,
+        id: newId,
+        filters: filters ?? {},
+        modified: false,
+        saved: false,
+        modified_datetime: ts.toISOString()
+    };
 };
-const initialCohortState = {
-    cohort: {
-        ...EmptyCohort
+const createCohortId = ()=>nanoid();
+const cohortsAdapter = createEntityAdapter({
+    sortComparer: (a, b)=>{
+        if (a.modified_datetime <= b.modified_datetime) return 1;
+        else return -1;
+    },
+    selectId: (cohort)=>cohort.id
+});
+// Create an initial unsaved cohort
+const initialCohort = newCohort({
+    customName: UNSAVED_COHORT_NAME
+});
+const emptyInitialState = cohortsAdapter.getInitialState({
+    currentCohort: 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;
 };
-// TODO: start using this adapter
-/*
-const cohortsAdapter = createEntityAdapter<Cohort>({
-  sortComparer: (a, b) => {
-    if (a.modified_datetime <= b.modified_datetime) return 1;
-    else return -1;
-  },
-});
-*/ /**
+/**
  * Redux slice for cohort filters
  */ const cohortSlice = createSlice({
     name: 'cohort',
-    initialState: initialCohortState,
+    initialState: initialState$3,
     reducers: {
+        addNewDefaultUnsavedCohort: (state)=>{
+            const cohort = newCohort({
+                customName: UNSAVED_COHORT_NAME
+            });
+            cohortsAdapter.addOne(state, cohort);
+            state.currentCohort = cohort.id;
+            state.message = [
+                `newCohort|${cohort.name}|${cohort.id}`
+            ];
+        },
+        updateCohortName: (state, action)=>{
+            cohortsAdapter.updateOne(state, {
+                id: getCurrentCohort(state),
+                changes: {
+                    name: action.payload,
+                    modified: true,
+                    modified_datetime: new Date().toISOString()
+                }
+            });
+        },
+        removeCohort: (state, action)=>{
+            const removedCohort = state.entities[action?.payload?.id || getCurrentCohort(state)];
+            cohortsAdapter.removeOne(state, action?.payload?.id || getCurrentCohort(state));
+            if (action?.payload.shouldShowMessage) {
+                state.message = [
+                    `deleteCohort|${removedCohort?.name}|${state.currentCohort}`
+                ];
+            }
+        },
         // adds a filter to the cohort filter set at the given index
         updateCohortFilter: (state, action)=>{
             const { index, field, filter } = action.payload;
-            return {
-                cohort: {
-                    ...state.cohort,
+            const currentCohortId = getCurrentCohort(state);
+            if (!state.entities[currentCohortId]) {
+                return;
+            }
+            cohortsAdapter.updateOne(state, {
+                id: currentCohortId,
+                changes: {
                     filters: {
-                        ...state.cohort.filters,
+                        ...state.entities[currentCohortId].filters,
                         [index]: {
-                            mode: state.cohort.filters?.[index]?.mode ?? 'and',
+                            mode: state.entities[currentCohortId]?.filters[index]?.mode ?? 'and',
                             root: {
-                                ...state.cohort.filters?.[index]?.root ?? {},
+                                ...state.entities[currentCohortId]?.filters[index]?.root ?? {},
                                 [field]: filter
                             }
                         }
-                    }
+                    },
+                    modified: true,
+                    modified_datetime: new Date().toISOString()
                 }
-            };
+            });
         },
         setCohortFilter: (state, action)=>{
             const { index, filters } = action.payload;
-            return {
-                cohort: {
-                    ...state.cohort,
+            const currentCohortId = getCurrentCohort(state);
+            if (!state.entities[currentCohortId]) {
+                console.error(`no cohort with id=${currentCohortId} defined`);
+                return;
+            }
+            cohortsAdapter.updateOne(state, {
+                id: currentCohortId,
+                changes: {
                     filters: {
-                        ...state.cohort.filters,
+                        ...state.entities[currentCohortId].filters,
                         [index]: filters
-                    }
+                    },
+                    modified: true,
+                    modified_datetime: new Date().toISOString()
                 }
-            };
+            });
         },
         setCohortIndexFilters: (state, action)=>{
-            return {
-                cohort: {
-                    ...state.cohort,
-                    filters: {
-                        ...action.payload.filters
-                    }
+            const currentCohortId = getCurrentCohort(state);
+            if (!state.entities[currentCohortId]) {
+                console.error(`no cohort with id=${currentCohortId} defined`);
+                return;
+            }
+            cohortsAdapter.updateOne(state, {
+                id: currentCohortId,
+                changes: {
+                    filters: action.payload.filters,
+                    modified: true,
+                    modified_datetime: new Date().toISOString()
                 }
-            };
+            });
         },
         // removes a filter to the cohort filter set at the given index
         removeCohortFilter: (state, action)=>{
             const { index, field } = action.payload;
-            const filters = state.cohort?.filters?.[index]?.root;
+            const currentCohortId = getCurrentCohort(state);
+            if (!state.entities[currentCohortId]) {
+                console.error(`no cohort with id=${currentCohortId} defined`);
+                return;
+            }
+            const filters = state.entities[currentCohortId]?.filters[index]?.root;
             if (!filters) {
                 return;
             }
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const { [field]: _a, ...updated } = filters;
-            return {
-                cohort: {
-                    ...state.cohort,
+            cohortsAdapter.updateOne(state, {
+                id: currentCohortId,
+                changes: {
                     filters: {
-                        ...state.cohort.filters,
+                        ...state.entities[currentCohortId]?.filters,
                         [index]: {
-                            mode: state.cohort.filters[index].mode,
+                            mode: state.entities[currentCohortId].filters[index].mode,
                             root: updated
                         }
-                    }
+                    },
+                    modified: true,
+                    modified_datetime: new Date().toISOString()
                 }
-            };
+            });
         },
         // removes all filters from the cohort filter set at the given index
         clearCohortFilters: (state, action)=>{
             const { index } = action.payload;
-            return {
-                cohort: {
-                    ...state.cohort,
+            const currentCohortId = getCurrentCohort(state);
+            if (!state.entities[currentCohortId]) {
+                console.error(`no cohort with id=${currentCohortId} defined`);
+                return;
+            }
+            const filters = state.entities[currentCohortId]?.filters[index]?.root;
+            if (!filters) {
+                return;
+            }
+            cohortsAdapter.updateOne(state, {
+                id: currentCohortId,
+                changes: {
                     filters: {
-                        ...state.cohort.filters,
+                        ...state.entities[currentCohortId]?.filters,
                         [index]: {
-                            // empty filter set
                             mode: 'and',
                             root: {}
                         }
-                    }
+                    },
+                    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()
+                }
+            });
+        },
+        setCurrentCohortId: (state, action)=>{
+            state.currentCohort = action.payload;
+        },
+        /** @hidden */ setCohortList: (state, action)=>{
+            if (!action.payload) {
+                cohortsAdapter.removeMany(state, state.ids);
+            } else {
+                cohortsAdapter.upsertMany(state, [
+                    ...action.payload
+                ]);
+            }
         }
     }
 });
+/**
+ * Returns the selectors for the cohorts EntityAdapter
+ * @param state - the CoreState
+ *
+ * @hidden
+ */ const cohortSelectors = cohortsAdapter.getSelectors((state)=>state.cohorts.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;
+};
 // Filter actions: addFilter, removeFilter, updateFilter
-const { updateCohortFilter, setCohortFilter, setCohortIndexFilters, removeCohortFilter, clearCohortFilters } = cohortSlice.actions;
-const selectCohortFilters = (state)=>state.cohorts.cohort.cohort.filters;
-const selectCurrentCohortId = (state)=>state.cohorts.cohort.cohort.id;
-const selectCurrentCohort = (state)=>state.cohorts.cohort.cohort;
-const selectCurrentCohortName = (state)=>state.cohorts.cohort.cohort.name;
+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 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.
@@ -906,7 +1048,40 @@ const selectCurrentCohortName = (state)=>state.cohorts.cohort.cohort.name;
  * @param index which cohort index to select from
  * @param name name of the filter to select
  */ const selectIndexedFilterByName = (state, index, name)=>{
-    return state.cohorts.cohort.cohort.filters[index]?.root[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',
@@ -918,8 +1093,23 @@ const EmptyFilterSet = {
  * @param state - Core
  * @param index which cohort index to select from
  */ const selectIndexFilters = (state, index)=>{
-    return state.cohorts.cohort.cohort.filters?.[index] ?? EmptyFilterSet; // TODO: check if this is undefined
+    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 initialState$2 = {};
@@ -1038,7 +1228,7 @@ const persistConfig = {
     version: 1,
     storage,
     whitelist: [
-        'cohort',
+        'cohorts',
         'activeWorkspace'
     ]
 };
@@ -1278,13 +1468,13 @@ const fetchFencePresignedURL = async ({ guid, method = 'GET', onAbort = ()=>null
         } : {}
     });
     if (!response.ok) {
-        throw new HTTPError(response.status, response.statusText);
+        throw new HTTPError(response.status, response.statusText, response.text());
     }
     if (response.status === 204) {
         // no content so return null
         return null;
     }
-    return response.json();
+    return await response.json();
 };
 
 const queryWTSFederatedLoginStatus = async (signal)=>{
@@ -3066,9 +3256,11 @@ const createGen3AppWithOwnStore = (options)=>{
     return Gen3AppWrapper;
 };
 
-const createAppApiForRTKQ = (reducerPath, baseQuery)=>{
+const createAppApiForRTKQ = (reducerPath, name, version, additionalReducers, baseQuery)=>{
+    const nameVersion = `${name}::${version}`;
+    const id = v5(nameVersion, GEN3_APP_NAMESPACE);
     const appContext = React.createContext(null);
-    const useAppSelector = useSelector.withTypes();
+    const useAppSelector = createSelectorHook(appContext);
     const useAppDispatch = createDispatchHook(appContext);
     const useAppStore = createStoreHook(appContext);
     const appCreateApi = buildCreateApi(coreModule(), reactHooksModule({
@@ -3084,13 +3276,12 @@ const createAppApiForRTKQ = (reducerPath, baseQuery)=>{
             baseUrl: `${GEN3_API}`,
             prepareHeaders: (headers)=>{
                 headers.set('Content-Type', 'application/json');
-                let accessToken = undefined;
                 if (process.env.NODE_ENV === 'development') {
                     // NOTE: This cookie can only be accessed from the client side
                     // in development mode. Otherwise, the cookie is set as httpOnly
-                    accessToken = getCookie('credentials_token');
+                    const accessToken = getCookie('credentials_token');
+                    if (accessToken) headers.set('Authorization', `Bearer ${accessToken}`);
                 }
-                if (accessToken) headers.set('Authorization', `Bearer ${accessToken}`);
                 return headers;
             }
         }),
@@ -3098,8 +3289,12 @@ const createAppApiForRTKQ = (reducerPath, baseQuery)=>{
     });
     const appMiddleware = appRTKQApi.middleware;
     const appStore = configureStore({
+        devTools: {
+            name: `${nameVersion}::${id}`
+        },
         reducer: {
-            [appRTKQApi.reducerPath]: appRTKQApi.reducer
+            [appRTKQApi.reducerPath]: appRTKQApi.reducer,
+            ...additionalReducers
         },
         middleware: (getDefaultMiddleware)=>getDefaultMiddleware({
                 serializableCheck: {
@@ -3328,8 +3523,12 @@ const groupSharedFields = (data)=>{
     }, {});
 };
 
-const statusEndpoint = '/_status';
-const processHistogramResponse = (data)=>{
+/**
+ * Processes the histogram data from the given input object and returns an aggregated data object.
+ *
+ * @param {Record<string, unknown>} data - The input data object containing histogram information.
+ * @returns {AggregationsData} An object containing the processed histogram data, structured as key-value pairs.
+ */ const processHistogramResponse = (data)=>{
     const valueData = JSONPath({
         json: data,
         path: '$..histogram',
@@ -3349,6 +3548,42 @@ const processHistogramResponse = (data)=>{
     }, {});
     return results;
 };
+/**
+ * Adjusts histogram data in the provided object by rounding counts below a specified minimum value.
+ *
+ * This function traverses the input object for histogram data and updates it such that all count values
+ * falling below the defined `minValue` are set to `-1`. By default, the `minValue` is set to `100`.
+ *
+ * @param {Record<string, unknown>} origData - The original input data containing histogram structures to modify.
+ * @param {number} [minValue=100] - The minimum value of histogram counts. Counts below this value are replaced with `-1`.
+ * @returns {Record<string, unknown>} - A new object containing the modified histogram data while preserving other properties.
+ */ const roundHistogramResponse = (origData, minValue = 100)=>{
+    const data = {
+        ...origData
+    };
+    const pointerData = JSONPath({
+        json: data,
+        path: '$..histogram',
+        resultType: 'pointer'
+    });
+    if (pointerData.length === 0) {
+        return {};
+    }
+    pointerData.forEach((element)=>{
+        const key = element.slice(1).replace(/\//g, '.');
+        const histogramData = JSONPath({
+            json: data,
+            path: key,
+            resultType: 'value'
+        });
+        histogramData[0].forEach((x)=>{
+            x.count = x.count < minValue ? -1 : x.count;
+        });
+    });
+    return data;
+};
+
+const statusEndpoint = '/_status';
 const fetchJson = async (url)=>{
     const res = await fetch(url, {
         method: 'GET',
@@ -3461,24 +3696,7 @@ const useGetStatus = ()=>{
             }),
             getAggs: builder.query({
                 query: ({ type, fields, filters, accessibility = Accessibility.ALL })=>{
-                    const queryStart = isFilterEmpty(filters) ? `
-              query getAggs {
-              _aggregation {
-              ${type} (accessibility: ${accessibility}) {` : `query getAggs ($filter: JSON) {
-               _aggregation {
-                      ${type} (filter: $filter, filterSelf: false, accessibility: ${accessibility}) {`;
-                    const query = `${queryStart}
-                  ${fields.map((field)=>histogramQueryStrForEachField(field))}
-                }
-              }
-            }`;
-                    const queryBody = {
-                        query: query,
-                        variables: {
-                            filter: convertFilterSetToGqlFilter(filters)
-                        }
-                    };
-                    return queryBody;
+                    return buildGetAggregationQuery(type, fields, filters, accessibility, false);
                 },
                 transformResponse: (response, _meta, args)=>{
                     return processHistogramResponse(response?.data?._aggregation[args.type] ?? {});
@@ -3486,24 +3704,7 @@ const useGetStatus = ()=>{
             }),
             getAggsNoFilterSelf: builder.query({
                 query: ({ type, fields, filters, accessibility = Accessibility.ALL })=>{
-                    const queryStart = isFilterEmpty(filters) ? `
-              query getAggs {
-              _aggregation {
-              ${type} (accessibility: ${accessibility}) {` : `query getAggs ($filter: JSON) {
-               _aggregation {
-                      ${type} (filter: $filter, filterSelf: true, accessibility: ${accessibility}) {`;
-                    const query = `${queryStart}
-                  ${fields.map((field)=>histogramQueryStrForEachField(field))}
-                }
-              }
-            }`;
-                    const queryBody = {
-                        query: query,
-                        variables: {
-                            filter: convertFilterSetToGqlFilter(filters)
-                        }
-                    };
-                    return queryBody;
+                    return buildGetAggregationQuery(type, fields, filters, accessibility, true);
                 },
                 transformResponse: (response, _meta, args)=>{
                     return processHistogramResponse(response?.data?._aggregation[args.type] ?? {});
@@ -3689,6 +3890,26 @@ const useGetIndexFields = (index)=>{
     const { data } = useGetFieldsForIndexQuery(index);
     return data ?? [];
 };
+const buildGetAggregationQuery = (type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false)=>{
+    const queryStart = isFilterEmpty(filters) ? `
+              query getAggs {
+              _aggregation {
+              ${type} (accessibility: ${accessibility}) {` : `query getAggs ($filter: JSON) {
+               _aggregation {
+                      ${type} (filter: $filter, filterSelf: ${filterSelf ? 'true' : 'false'}, accessibility: ${accessibility}) {`;
+    const query = `${queryStart}
+                  ${fields.map((field)=>histogramQueryStrForEachField(field))}
+                }
+              }
+            }`;
+    const queryBody = {
+        query: query,
+        variables: {
+            filter: convertFilterSetToGqlFilter(filters)
+        }
+    };
+    return queryBody;
+};
 const { useGetRawDataAndTotalCountsQuery, useGetAccessibleDataQuery, useGetAllFieldsForTypeQuery, useGetAggsQuery, useGetAggsNoFilterSelfQuery, useLazyGetAggsQuery, useGetSubAggsQuery, useGetCountsQuery, useGetFieldCountSummaryQuery, useGetFieldsForIndexQuery, useGetSharedFieldsForIndexQuery, useGeneralGQLQuery, useLazyGeneralGQLQuery } = explorerApi;
 
 /**
@@ -3969,6 +4190,32 @@ const queryMultipleMDSRecords = async (guids, useAggMDS = false, signal)=>{
     });
 };
 
+/**
+ * Defines requester service using a base URL and expected endpoints. Derived from gen3Api core API.
+ *
+ * @param endpoints - Defines endpoints used in discovery page
+ *  @param request - Queries Requestor service
+ *    @see https://github.com/uc-cdis/requestor?tab=readme-ov-file#requestor
+ *    @see https://petstore.swagger.io/?url=https://raw.githubusercontent.com/uc-cdis/requestor/master/docs/openapi.yaml#/Query/list_requests_request_get
+ * @returns: Object of request made
+ */ const requestorApi = gen3Api.injectEndpoints({
+    endpoints: (builder)=>({
+            request: builder.query({
+                query: (queryBody)=>({
+                        url: `${GEN3_REQUESTOR_API}/request`,
+                        method: 'POST',
+                        credentials: 'include',
+                        headers: {
+                            Accept: 'application/json',
+                            'Content-Type': 'application/json'
+                        },
+                        body: JSON.stringify(queryBody)
+                    })
+            })
+        })
+});
+const { useRequestQuery, useLazyRequestQuery } = requestorApi;
+
 /**
  * Creates a loadingStatusApi for checking the status of a sower data download job
  * @param getJobList Shows the list of jobs currently running
@@ -4058,7 +4305,7 @@ const extractValuesFromObject = (jsonPathMappings, obj)=>{
     };
     for(const key in jsonPathMappings){
         if (key in Object.keys(jsonPathMappings)) {
-            // Extract value from object and store it in the result.
+            // Extract value from an object and store it in the result.
             result[key] = extractObjectValue(jsonPathMappings[key], obj);
         }
     }
@@ -4347,5 +4594,5 @@ const selectPaymodelStatus = createSelector(paymodelStatusSelector, (status)=>st
 const isWorkspaceActive = (status)=>status === WorkspaceStatus.Running || status === WorkspaceStatus.Launching || status === WorkspaceStatus.Terminating;
 const isWorkspaceRunningOrStopping = (status)=>status === WorkspaceStatus.Running || status === WorkspaceStatus.Terminating;
 
-export { Accessibility, CoreProvider, DataLibraryStoreMode, EmptyWorkspaceStatusResponse, GEN3_API, GEN3_AUTHZ_API, GEN3_COMMONS_NAME, GEN3_CROSSWALK_API, GEN3_DOMAIN, GEN3_DOWNLOADS_ENDPOINT, GEN3_FENCE_API, GEN3_GUPPY_API, GEN3_MANIFEST_API, GEN3_MDS_API, GEN3_REDIRECT_URL, GEN3_SOWER_API, GEN3_SUBMISSION_API, GEN3_WORKSPACE_API, HTTPError, HTTPErrorMessages, HttpMethod, Modals, PodConditionType, PodStatus, RequestedWorkspaceStatus, WorkspaceStatus, buildListItemsGroupedByDataset, clearActiveWorkspaceId, clearCohortFilters, convertFilterSetToGqlFilter, coreStore, createAppApiForRTKQ, createAppStore, createGen3App, createGen3AppWithOwnStore, createUseCoreDataHook, downloadFromGuppyToBlob, downloadJSONDataFromGuppy, drsHostnamesReducer, extractEnumFilterValue, extractFieldNameFromFullFieldName, extractFileDatasetsInRecords, extractFilterValue, extractIndexAndFieldNameFromFullFieldName, extractIndexFromDataLibraryCohort, extractIndexFromFullFieldName, fetchFence, fetchFencePresignedURL, fetchJSONDataFromURL, fetchJson, fetchUserState, fieldNameToTitle, gen3Api, getCurrentTimestamp, getFederatedLoginStatus, getGen3AppId, getNumberOfItemsInDatalist, getTimestamp, graphQLAPI, graphQLWithTags, groupSharedFields, guppyAPISliceMiddleware, guppyApi, guppyApiReducer, guppyApiSliceReducerPath, handleOperation, hideModal, isAdditionalDataItem, isArray, isAuthenticated, isCohortItem, isDataLibraryAPIResponse, isDatalistAPI, isErrorWithMessage, isFetchBaseQueryError, isFetchError, isFetchParseError, isFileItem, isFilterEmpty, isFilterSet, isGuppyAggregationData, isHistogramData, isHistogramDataAArray, isHistogramDataAnEnum, isHistogramDataArray, isHistogramDataArrayARange, isHistogramDataArrayAnEnum, isHistogramDataCollection, isHistogramRangeData, isHttpStatusError, isIntersection, isJSONObject, isJSONValue, isJSONValueArray, isNotDefined, isObject, isOperationWithField, isOperatorWithFieldAndArrayOfOperands, isPending, isProgramUrl, isRootUrl, isString, isTimeGreaterThan, isUnion, isWorkspaceActive, isWorkspaceRunningOrStopping, listifyMethodsFromMapping, logoutFence, manifestApi, manifestTags, prepareUrl$1 as prepareUrl, prependIndexToFieldName, processHistogramResponse, projectCodeFromResourcePath, queryMultipleMDSRecords, rawDataQueryStrForEachField, removeCohortFilter, resetUserState, resourcePathFromProjectID, selectActiveWorkspaceId, selectActiveWorkspaceStatus, selectAllCohortFiltersCollapsed, selectAuthzMappingData, selectCSRFToken, selectCSRFTokenData, selectCohortFilterCombineMode, selectCohortFilterExpanded, selectCohortFilters, selectCurrentCohort, selectCurrentCohortId, selectCurrentCohortName, selectCurrentMessage, selectCurrentModal, selectGen3AppByName, selectGen3AppMetadataByName, selectHeadersWithCSRFToken, selectIndexFilters, selectIndexedFilterByName, selectPaymodelStatus, selectRequestedWorkspaceStatus, selectRequestedWorkspaceStatusTimestamp, selectSharedFilters, selectSharedFiltersForFields, selectShouldShareFilters, selectUser, selectUserAuthStatus, selectUserData, selectUserDetails, selectUserLoginStatus, selectWorkspaceStatus, selectWorkspaceStatusFromService, setActiveWorkspace, setActiveWorkspaceId, setActiveWorkspaceStatus, setCohortFilter, setCohortFilterCombineMode, setCohortIndexFilters, setDRSHostnames, setRequestedWorkspaceStatus, setSharedFilters, setShouldShareFilters, setupCoreStore, showModal, submissionApi, toggleCohortBuilderAllFilters, toggleCohortBuilderCategoryFilter, trimFirstFieldNameToTitle, updateCohortFilter, useAddCohortManifestMutation, useAddFileManifestMutation, useAddMetadataManifestMutation, useAddNewCredentialMutation, useAskQuestionMutation, useAuthorizeFromCredentialsMutation, useCoreDispatch, useCoreSelector, useDataLibrary, useDownloadFromGuppyMutation, useFetchUserDetailsQuery, useGeneralGQLQuery, useGetAISearchStatusQuery, useGetAISearchVersionQuery, useGetAccessibleDataQuery, useGetActivePayModelQuery, useGetAggMDSQuery, useGetAggsNoFilterSelfQuery, useGetAggsQuery, useGetAllFieldsForTypeQuery, useGetArrayTypes, useGetAuthzMappingsQuery, useGetCSRFQuery, useGetCohortManifestQuery, useGetCountsQuery, useGetCredentialsQuery, useGetCrosswalkDataQuery, useGetDataQuery, useGetDictionaryQuery, useGetDownloadQuery, useGetExternalLoginsQuery, useGetFederatedLoginStatus, useGetFieldCountSummaryQuery, useGetFieldsForIndexQuery, useGetFileFromManifestQuery, useGetFileManifestQuery, useGetIndexAggMDSQuery, useGetIndexFields, useGetJWKKeysQuery, useGetLoginProvidersQuery, useGetMDSQuery, useGetManifestServiceStatusQuery, useGetMetadataByIdQuery, useGetMetadataFromManifestQuery, useGetMetadataManifestQuery, useGetProjectsDetailsQuery, useGetProjectsQuery, useGetRawDataAndTotalCountsQuery, useGetSharedFieldsForIndexQuery, useGetSowerJobListQuery, useGetSowerJobStatusQuery, useGetSowerOutputQuery, useGetSowerServiceStatusQuery, useGetStatus, useGetSubAggsQuery, useGetSubmissionGraphQLQuery, useGetSubmissionsQuery, useGetTagsQuery, useGetWorkspaceOptionsQuery, useGetWorkspacePayModelsQuery, useGetWorkspaceStatusQuery, useGraphQLQuery, useIsExternalConnectedQuery, useIsUserLoggedIn, useLaunchWorkspaceMutation, useLazyFetchUserDetailsQuery, useLazyGeneralGQLQuery, useLazyGetAggsQuery, useLazyGetAuthzMappingsQuery, useLazyGetCrosswalkDataQuery, useLazyGetDownloadQuery, useLazyGetExternalLoginsQuery, useLazyGetManifestServiceStatusQuery, useLazyGetProjectsQuery, useLazyGetSowerJobListQuery, useLazyGetSubmissionGraphQLQuery, useLazyIsExternalConnectedQuery, usePrevious, useRemoveCredentialMutation, useSetCurrentPayModelMutation, useSubmitSowerJobMutation, useTerminateWorkspaceMutation, useUserAuth, userHasCreateOrUpdateOnAnyProject, userHasDataUpload, userHasMethodForServiceOnProject, userHasMethodForServiceOnResource, userHasMethodOnAnyProject, userHasSheepdogProgramAdmin, userHasSheepdogProjectAdmin };
+export { Accessibility, CoreProvider, DataLibraryStoreMode, EmptyWorkspaceStatusResponse, GEN3_API, GEN3_AUTHZ_API, GEN3_COMMONS_NAME, GEN3_CROSSWALK_API, GEN3_DOMAIN, GEN3_DOWNLOADS_ENDPOINT, GEN3_FENCE_API, GEN3_GUPPY_API, GEN3_MANIFEST_API, GEN3_MDS_API, GEN3_REDIRECT_URL, GEN3_SOWER_API, GEN3_SUBMISSION_API, GEN3_WORKSPACE_API, HTTPError, HTTPErrorMessages, HttpMethod, Modals, PodConditionType, PodStatus, RequestedWorkspaceStatus, WorkspaceStatus, addNewDefaultUnsavedCohort, buildGetAggregationQuery, buildListItemsGroupedByDataset, clearActiveWorkspaceId, clearCohortFilters, cohortReducer, convertFilterSetToGqlFilter, convertFilterToGqlFilter, coreStore, createAppApiForRTKQ, createAppStore, createGen3App, createGen3AppWithOwnStore, createUseCoreDataHook, downloadFromGuppyToBlob, downloadJSONDataFromGuppy, drsHostnamesReducer, extractEnumFilterValue, extractFieldNameFromFullFieldName, extractFileDatasetsInRecords, extractFilterValue, extractIndexAndFieldNameFromFullFieldName, extractIndexFromDataLibraryCohort, extractIndexFromFullFieldName, fetchFence, fetchFencePresignedURL, fetchJSONDataFromURL, fetchJson, fetchUserState, fieldNameToTitle, gen3Api, getCurrentTimestamp, getFederatedLoginStatus, getGen3AppId, getNumberOfItemsInDatalist, getTimestamp, graphQLAPI, graphQLWithTags, groupSharedFields, guppyAPISliceMiddleware, guppyApi, guppyApiReducer, guppyApiSliceReducerPath, handleOperation, hideModal, histogramQueryStrForEachField, isAdditionalDataItem, isArray, isAuthenticated, isCohortItem, isDataLibraryAPIResponse, isDatalistAPI, isErrorWithMessage, isFetchBaseQueryError, isFetchError, isFetchParseError, isFileItem, isFilterEmpty, isFilterSet, isGuppyAggregationData, isHistogramData, isHistogramDataAArray, isHistogramDataAnEnum, isHistogramDataArray, isHistogramDataArrayARange, isHistogramDataArrayAnEnum, isHistogramDataCollection, isHistogramRangeData, isHttpStatusError, isIntersection, isJSONObject, isJSONValue, isJSONValueArray, isNotDefined, isObject, isOperationWithField, isOperatorWithFieldAndArrayOfOperands, isPending, isProgramUrl, isRootUrl, isString, isTimeGreaterThan, isUnion, isWorkspaceActive, isWorkspaceRunningOrStopping, listifyMethodsFromMapping, logoutFence, manifestApi, manifestTags, nestedHistogramQueryStrForEachField, prepareUrl$1 as prepareUrl, prependIndexToFieldName, processHistogramResponse, projectCodeFromResourcePath, queryMultipleMDSRecords, rawDataQueryStrForEachField, removeCohort, removeCohortFilter, requestorApi, resetUserState, resourcePathFromProjectID, roundHistogramResponse, selectActiveWorkspaceId, selectActiveWorkspaceStatus, selectAllCohortFiltersCollapsed, selectAuthzMappingData, selectAvailableCohorts, selectCSRFToken, selectCSRFTokenData, selectCohortFilterCombineMode, selectCohortFilterExpanded, selectCohortFilters, selectCurrentCohort, selectCurrentCohortId, selectCurrentCohortModified, selectCurrentCohortName, selectCurrentCohortSaved, selectCurrentMessage, selectCurrentModal, selectGen3AppByName, selectGen3AppMetadataByName, selectHeadersWithCSRFToken, selectIndexFilters, selectIndexedFilterByName, selectPaymodelStatus, selectRequestedWorkspaceStatus, selectRequestedWorkspaceStatusTimestamp, selectSharedFilters, selectSharedFiltersForFields, selectShouldShareFilters, selectUser, selectUserAuthStatus, selectUserData, selectUserDetails, selectUserLoginStatus, selectWorkspaceStatus, selectWorkspaceStatusFromService, setActiveCohort, setActiveCohortList, setActiveWorkspace, setActiveWorkspaceId, setActiveWorkspaceStatus, setCohortFilter, setCohortFilterCombineMode, setCohortIndexFilters, setDRSHostnames, setRequestedWorkspaceStatus, setSharedFilters, setShouldShareFilters, setupCoreStore, showModal, submissionApi, toggleCohortBuilderAllFilters, toggleCohortBuilderCategoryFilter, trimFirstFieldNameToTitle, updateCohortFilter, useAddCohortManifestMutation, useAddFileManifestMutation, useAddMetadataManifestMutation, useAddNewCredentialMutation, useAskQuestionMutation, useAuthorizeFromCredentialsMutation, useCoreDispatch, useCoreSelector, useDataLibrary, useDownloadFromGuppyMutation, useFetchUserDetailsQuery, useGeneralGQLQuery, useGetAISearchStatusQuery, useGetAISearchVersionQuery, useGetAccessibleDataQuery, useGetActivePayModelQuery, useGetAggMDSQuery, useGetAggsNoFilterSelfQuery, useGetAggsQuery, useGetAllFieldsForTypeQuery, useGetArrayTypes, useGetAuthzMappingsQuery, useGetCSRFQuery, useGetCohortManifestQuery, useGetCountsQuery, useGetCredentialsQuery, useGetCrosswalkDataQuery, useGetDataQuery, useGetDictionaryQuery, useGetDownloadQuery, useGetExternalLoginsQuery, useGetFederatedLoginStatus, useGetFieldCountSummaryQuery, useGetFieldsForIndexQuery, useGetFileFromManifestQuery, useGetFileManifestQuery, useGetIndexAggMDSQuery, useGetIndexFields, useGetJWKKeysQuery, useGetLoginProvidersQuery, useGetMDSQuery, useGetManifestServiceStatusQuery, useGetMetadataByIdQuery, useGetMetadataFromManifestQuery, useGetMetadataManifestQuery, useGetProjectsDetailsQuery, useGetProjectsQuery, useGetRawDataAndTotalCountsQuery, useGetSharedFieldsForIndexQuery, useGetSowerJobListQuery, useGetSowerJobStatusQuery, useGetSowerOutputQuery, useGetSowerServiceStatusQuery, useGetStatus, useGetSubAggsQuery, useGetSubmissionGraphQLQuery, useGetSubmissionsQuery, useGetTagsQuery, useGetWorkspaceOptionsQuery, useGetWorkspacePayModelsQuery, useGetWorkspaceStatusQuery, useGraphQLQuery, useIsExternalConnectedQuery, useIsUserLoggedIn, useLaunchWorkspaceMutation, useLazyFetchUserDetailsQuery, useLazyGeneralGQLQuery, useLazyGetAggsQuery, useLazyGetAuthzMappingsQuery, useLazyGetCSRFQuery, useLazyGetCrosswalkDataQuery, useLazyGetDownloadQuery, useLazyGetExternalLoginsQuery, useLazyGetManifestServiceStatusQuery, useLazyGetProjectsQuery, useLazyGetSowerJobListQuery, useLazyGetSubmissionGraphQLQuery, useLazyIsExternalConnectedQuery, useLazyRequestQuery, usePrevious, useRemoveCredentialMutation, useRequestQuery, useSetCurrentPayModelMutation, useSubmitSowerJobMutation, useTerminateWorkspaceMutation, useUserAuth, userHasCreateOrUpdateOnAnyProject, userHasDataUpload, userHasMethodForServiceOnProject, userHasMethodForServiceOnResource, userHasMethodOnAnyProject, userHasSheepdogProgramAdmin, userHasSheepdogProjectAdmin };
 //# sourceMappingURL=index.js.map