@gen3/core 0.11.50 → 0.11.51

package/dist/cjs/index.js

@@ -2293,7 +2293,7 @@ const nestedHistogramQueryStrForEachField = (mainField, numericAggAsText)=>`
       }
     }
   }`;
-const rawDataQueryStrForEachField = (field)=>{
+const rawDataQueryStrForEachField$1 = (field)=>{
     const splitFieldArray = field.split('.');
     const splitField = splitFieldArray.shift();
     if (splitFieldArray.length === 0) {
@@ -2303,10 +2303,361 @@ const rawDataQueryStrForEachField = (field)=>{
     }
     return `
   ${splitField} {
-    ${rawDataQueryStrForEachField(splitFieldArray.join('.'))}
+    ${rawDataQueryStrForEachField$1(splitFieldArray.join('.'))}
   }`;
 };
 
+const convertNumericFromToArrayToFilters = (field, range, isNested = true)=>{
+    const { from, to } = range;
+    return {
+        operator: 'and',
+        operands: [
+            isNested ? buildNestedFilterForOperation(field, {
+                operator: '>=',
+                field,
+                operand: from
+            }) : {
+                operator: '>=',
+                field,
+                operand: from
+            },
+            isNested ? buildNestedFilterForOperation(field, {
+                operator: '<',
+                field,
+                operand: to
+            }) : {
+                operator: '<',
+                field,
+                operand: to
+            }
+        ]
+    };
+};
+const rawDataQueryStrForEachField = (field)=>{
+    const splitFieldArray = field.split('.');
+    const splitField = splitFieldArray.shift();
+    let middleQuery = '';
+    if (splitFieldArray.length === 0) {
+        middleQuery = `${splitField} { histogram { count } }`;
+    } else {
+        middleQuery = `${splitField} { ${rawDataQueryStrForEachField(splitFieldArray.join('.'))} }`;
+    }
+    return middleQuery;
+};
+const buildAliasedNestedCountsQuery = ({ type, field, rangeName })=>{
+    const dataParams = [
+        `filter: $${rangeName}`
+    ];
+    const dataTypeLine = `${rangeName} : ${type} (accessibility: $accessibility ${dataParams}) {`;
+    const processedFields = rawDataQueryStrForEachField(field);
+    return `${dataTypeLine} ${processedFields} }`;
+};
+const buildRangeFilters = (field, ranges, filters, rangeBaseName, isNested = true)=>{
+    return Object.entries(ranges).reduce((acc, [, rangeValue], idx)=>{
+        acc[`${rangeBaseName}_${idx}`] = {
+            mode: filters.mode,
+            root: {
+                ...filters.root,
+                [field]: convertNumericFromToArrayToFilters(field, rangeValue, isNested)
+            }
+        };
+        return acc;
+    }, {});
+};
+const buildRangeQuery = (field, ranges, filters, rangeBaseName = 'range', index = 'cases', indexPrefix = '', isNested = true)=>{
+    const rangeFilters = buildRangeFilters(field, ranges, filters, rangeBaseName, isNested);
+    let query = `query rangeQuery ($accessibility: Accessibility, ${Object.keys(rangeFilters).map((rangeKey)=>`$${rangeKey}: JSON`).join(',')} ) { ${indexPrefix}_aggregation {`;
+    Object.keys(rangeFilters).forEach((rangeKey)=>{
+        const rangeQuery = buildAliasedNestedCountsQuery({
+            type: index,
+            field,
+            rangeName: rangeKey
+        });
+        query += rangeQuery + ' \n';
+    });
+    query += `}}`;
+    return {
+        query: query,
+        filters: rangeFilters
+    };
+};
+
+const { selectAll: selectAllCohorts, selectTotal: selectTotalCohorts, selectById: selectCohortById, selectIds: selectCohortIds } = cohortsAdapter.getSelectors((state)=>state.cohorts.cohortManager);
+/**
+ * Internally used selector for the exported selectora
+ * @param state
+ */ const getCurrentCohortFromCoreState = (state)=>{
+    return state.cohorts.cohortManager.currentCohortId;
+};
+const selectCohortFilters = (state)=>{
+    const currentCohortId = getCurrentCohortFromCoreState(state);
+    return state.cohorts.cohortManager.entities[currentCohortId]?.filters;
+};
+const selectCurrentCohortFilters = (state)=>{
+    const currentCohortId = getCurrentCohortFromCoreState(state);
+    return state.cohorts.cohortManager.entities[currentCohortId]?.filters;
+};
+const selectCurrentCohortId = (state)=>{
+    return state.cohorts.cohortManager.currentCohortId;
+};
+const selectCurrentCohort = (state)=>cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
+const selectCurrentCohortName = (state)=>cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state)).name;
+/**
+ * Select a filter by its name from the current cohort. If the filter is not found
+ * returns undefined.
+ * @param state - Core
+ * @param index which cohort index to select from
+ * @param name name of the filter to select
+ */ const selectIndexedFilterByName = (state, index, name)=>{
+    return cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state)).filters[index]?.root[name];
+};
+/**
+ * Returns all the cohorts in the state
+ * @param state - the CoreState
+ *
+ * @category Cohort
+ * @category Selectors
+ */ const selectAvailableCohorts = (state)=>cohortSelectors.selectAll(state);
+/**
+ * Returns if the current cohort is modified
+ * @param state - the CoreState
+ * @category Cohort
+ * @category Selectors
+ * @hidden
+ */ const selectCurrentCohortModified = (state)=>{
+    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
+    return cohort?.modified;
+};
+/**
+ * Returns if the current cohort has been saved
+ * @param state - the CoreState
+ * @category Cohort
+ * @category Selectors
+ * @hidden
+ */ const selectCurrentCohortSaved = (state)=>{
+    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
+    return cohort?.saved;
+};
+/**
+ * Select a filter by its name from the current cohort. If the filter is not found
+ * returns undefined.
+ * @param state - Core
+ * @param name name of the filter to select
+ */ const selectAvailableCohortByName = (state, name)=>cohortSelectors.selectAll(state).find((cohort)=>cohort.name === name);
+/**
+ * Select a filter from the index.
+ * returns undefined.
+ * @param state - Core
+ * @param index which cohort index to select from
+ */ const selectIndexFilters = (state, index)=>{
+    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
+    if (!cohort) {
+        console.error('No Cohort Defined');
+    }
+    return cohort?.filters?.[index] ?? EmptyFilterSet;
+};
+
+class ToGqlAllNested {
+    constructor(){
+        this.handleEquals = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '=': {
+                        [leafField]: op.operand
+                    }
+                });
+            }
+            return {
+                '=': {
+                    [op.field]: op.operand
+                }
+            };
+        };
+        this.handleNotEquals = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '!=': {
+                        [leafField]: op.operand
+                    }
+                });
+            }
+            return {
+                '!=': {
+                    [op.field]: op.operand
+                }
+            };
+        };
+        this.handleLessThan = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '<': {
+                        [leafField]: op.operand
+                    }
+                });
+            }
+            return {
+                '<': {
+                    [op.field]: op.operand
+                }
+            };
+        };
+        this.handleLessThanOrEquals = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '<=': {
+                        [leafField]: op.operand
+                    }
+                });
+            }
+            return {
+                '<=': {
+                    [op.field]: op.operand
+                }
+            };
+        };
+        this.handleGreaterThan = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '>': {
+                        [leafField]: op.operand
+                    }
+                });
+            }
+            return {
+                '>': {
+                    [op.field]: op.operand
+                }
+            };
+        };
+        this.handleGreaterThanOrEquals = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    '>=': {
+                        [leafField]: op.operand
+                    }
+                });
+            }
+            return {
+                '>=': {
+                    [op.field]: op.operand
+                }
+            };
+        };
+        this.handleIncludes = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    in: {
+                        [leafField]: op.operands
+                    }
+                });
+            }
+            return {
+                in: {
+                    [op.field]: op.operands
+                }
+            };
+        };
+        this.handleExcludes = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    exclude: {
+                        [leafField]: op.operands
+                    }
+                });
+            }
+            return {
+                exclude: {
+                    [op.field]: op.operands
+                }
+            };
+        };
+        this.handleExcludeIfAny = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    excludeifany: {
+                        [leafField]: op.operands
+                    }
+                });
+            }
+            return {
+                excludeifany: {
+                    [op.field]: op.operands
+                }
+            };
+        };
+        this.handleIntersection = (op)=>({
+                and: op.operands.map((x)=>convertFilterToGqlFilter(x))
+            });
+        this.handleUnion = (op)=>({
+                or: op.operands.map((x)=>convertFilterToGqlFilter(x))
+            });
+        this.handleMissing = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    is: {
+                        [leafField]: 'MISSING'
+                    }
+                });
+            }
+            return {
+                is: {
+                    [op.field]: 'MISSING'
+                }
+            };
+        };
+        this.handleExists = (op)=>{
+            if (op.field.includes('.')) {
+                const leafField = op.field.split('.').at(-1) ?? 'unset';
+                return buildNestedGQLFilter(op.field, {
+                    not: {
+                        [leafField]: op?.operand ?? null
+                    }
+                });
+            }
+            return {
+                not: {
+                    [op.field]: op?.operand ?? null
+                }
+            };
+        };
+        this.handleNestedFilter = (op)=>{
+            const child = convertFilterToGqlFilter(op.operand);
+            return {
+                nested: {
+                    path: op.path,
+                    ...child
+                }
+            };
+        };
+    }
+}
+const convertFilterToNestedGqlFilter = (filter)=>{
+    const handler = new ToGqlAllNested();
+    return handleOperation(handler, filter);
+};
+const convertFilterSetToNestedGqlFilter = (fs, toplevelOp = 'and')=>{
+    const fsKeys = Object.keys(fs.root);
+    // if no keys return undefined
+    if (fsKeys.length === 0) return {
+        and: []
+    };
+    return toplevelOp === 'and' ? {
+        and: fsKeys.map((key)=>convertFilterToNestedGqlFilter(fs.root[key]))
+    } : {
+        or: fsKeys.map((key)=>convertFilterToNestedGqlFilter(fs.root[key]))
+    };
+};
+
 const statusEndpoint = '/_status';
 const fetchJson = async (url)=>{
     const res = await fetch(url, {
@@ -2399,7 +2750,7 @@ const explorerTags = guppyApi.enhanceEndpoints({
                     const dataTypeLine = `${indexPrefix}${type} (accessibility: ${accessibility}, offset: ${offset}, first: ${size},
         ${dataParams}) {`;
                     const typeAggsLine = `${type} (${gqlFilter && `filter: $${filterName},`} accessibility: ${accessibility}) {`;
-                    const processedFields = fields.map((field)=>rawDataQueryStrForEachField(field));
+                    const processedFields = fields.map((field)=>rawDataQueryStrForEachField$1(field));
                     const query = `${queryLine}
     ${dataTypeLine}
       ${processedFields.join(' ')}
@@ -2630,6 +2981,23 @@ const explorerTags = guppyApi.enhanceEndpoints({
                     return {};
                 }
             }),
+            customRange: builder.query({
+                query: ({ filters, field, ranges, rangeBaseName, index, indexPrefix, accessibility = Accessibility.ALL, isNested = true })=>{
+                    // remove field from FilterSet
+                    const queryData = buildRangeQuery(field, ranges, filters, rangeBaseName, index, indexPrefix, isNested);
+                    const gqlFilters = Object.entries(queryData.filters).reduce((acc, [key, filter])=>{
+                        acc[key] = isNested ? convertFilterSetToNestedGqlFilter(filter) : convertFilterSetToGqlFilter(filter);
+                        return acc;
+                    }, {});
+                    return {
+                        query: queryData.query,
+                        variables: {
+                            accessibility,
+                            ...gqlFilters
+                        }
+                    };
+                }
+            }),
             generalGQL: builder.query({
                 query: ({ query, variables })=>{
                     return {
@@ -2695,7 +3063,7 @@ const buildGetStatsAggregationQuery = (type, fields, filters, accessibility = Ac
     };
     return queryBody;
 };
-const { useGetRawDataAndTotalCountsQuery, useGetAccessibleDataQuery, useGetAllFieldsForTypeQuery, useGetAggsQuery, useLazyGetAggsQuery, useGetStatsAggregationsQuery, useLazyGetStatsAggregationsQuery, useGetSubAggsQuery, useGetCountsQuery, useLazyGetCountsQuery, useGetFieldCountSummaryQuery, useGetFieldsForIndexQuery, useGetSharedFieldsForIndexQuery, useGeneralGQLQuery, useLazyGeneralGQLQuery } = explorerApi;
+const { useGetRawDataAndTotalCountsQuery, useGetAccessibleDataQuery, useGetAllFieldsForTypeQuery, useGetAggsQuery, useLazyGetAggsQuery, useGetStatsAggregationsQuery, useLazyGetStatsAggregationsQuery, useGetSubAggsQuery, useGetCountsQuery, useLazyGetCountsQuery, useGetFieldCountSummaryQuery, useGetFieldsForIndexQuery, useGetSharedFieldsForIndexQuery, useGeneralGQLQuery, useLazyGeneralGQLQuery, useCustomRangeQuery, useLazyCustomRangeQuery } = explorerApi;
 
 /**
  * Defines coreListeners for adding middleware.
@@ -3722,81 +4090,6 @@ class CohortStorage {
     }
 }
 
-const { selectAll: selectAllCohorts, selectTotal: selectTotalCohorts, selectById: selectCohortById, selectIds: selectCohortIds } = cohortsAdapter.getSelectors((state)=>state.cohorts.cohortManager);
-/**
- * Internally used selector for the exported selectora
- * @param state
- */ const getCurrentCohortFromCoreState = (state)=>{
-    return state.cohorts.cohortManager.currentCohortId;
-};
-const selectCohortFilters = (state)=>{
-    const currentCohortId = getCurrentCohortFromCoreState(state);
-    return state.cohorts.cohortManager.entities[currentCohortId]?.filters;
-};
-const selectCurrentCohortFilters = (state)=>{
-    const currentCohortId = getCurrentCohortFromCoreState(state);
-    return state.cohorts.cohortManager.entities[currentCohortId]?.filters;
-};
-const selectCurrentCohortId = (state)=>{
-    return state.cohorts.cohortManager.currentCohortId;
-};
-const selectCurrentCohort = (state)=>cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
-const selectCurrentCohortName = (state)=>cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state)).name;
-/**
- * Select a filter by its name from the current cohort. If the filter is not found
- * returns undefined.
- * @param state - Core
- * @param index which cohort index to select from
- * @param name name of the filter to select
- */ const selectIndexedFilterByName = (state, index, name)=>{
-    return cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state)).filters[index]?.root[name];
-};
-/**
- * Returns all the cohorts in the state
- * @param state - the CoreState
- *
- * @category Cohort
- * @category Selectors
- */ const selectAvailableCohorts = (state)=>cohortSelectors.selectAll(state);
-/**
- * Returns if the current cohort is modified
- * @param state - the CoreState
- * @category Cohort
- * @category Selectors
- * @hidden
- */ const selectCurrentCohortModified = (state)=>{
-    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
-    return cohort?.modified;
-};
-/**
- * Returns if the current cohort has been saved
- * @param state - the CoreState
- * @category Cohort
- * @category Selectors
- * @hidden
- */ const selectCurrentCohortSaved = (state)=>{
-    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
-    return cohort?.saved;
-};
-/**
- * Select a filter by its name from the current cohort. If the filter is not found
- * returns undefined.
- * @param state - Core
- * @param name name of the filter to select
- */ const selectAvailableCohortByName = (state, name)=>cohortSelectors.selectAll(state).find((cohort)=>cohort.name === name);
-/**
- * Select a filter from the index.
- * returns undefined.
- * @param state - Core
- * @param index which cohort index to select from
- */ const selectIndexFilters = (state, index)=>{
-    const cohort = cohortSelectors.selectById(state, getCurrentCohortFromCoreState(state));
-    if (!cohort) {
-        console.error('No Cohort Defined');
-    }
-    return cohort?.filters?.[index] ?? EmptyFilterSet;
-};
-
 const isFileItem = (item)=>{
     return item && 'guid' in item;
 };
@@ -6129,7 +6422,7 @@ exports.prependIndexToFieldName = prependIndexToFieldName;
 exports.processHistogramResponse = processHistogramResponse;
 exports.projectCodeFromResourcePath = projectCodeFromResourcePath;
 exports.queryMultipleMDSRecords = queryMultipleMDSRecords;
-exports.rawDataQueryStrForEachField = rawDataQueryStrForEachField;
+exports.rawDataQueryStrForEachField = rawDataQueryStrForEachField$1;
 exports.registerDefaultRemoteSupport = registerDefaultRemoteSupport;
 exports.removeCohort = removeCohort;
 exports.removeCohortFilter = removeCohortFilter;
@@ -6215,6 +6508,7 @@ exports.useCoreDispatch = useCoreDispatch;
 exports.useCoreSelector = useCoreSelector;
 exports.useCreateAuthzResourceMutation = useCreateAuthzResourceMutation;
 exports.useCreateRequestMutation = useCreateRequestMutation;
+exports.useCustomRangeQuery = useCustomRangeQuery;
 exports.useDataLibrary = useDataLibrary;
 exports.useDownloadFromGuppyQuery = useDownloadFromGuppyQuery;
 exports.useFetchUserDetailsQuery = useFetchUserDetailsQuery;
@@ -6273,6 +6567,7 @@ exports.useGraphQLQuery = useGraphQLQuery;
 exports.useIsExternalConnectedQuery = useIsExternalConnectedQuery;
 exports.useIsUserLoggedIn = useIsUserLoggedIn;
 exports.useLaunchWorkspaceMutation = useLaunchWorkspaceMutation;
+exports.useLazyCustomRangeQuery = useLazyCustomRangeQuery;
 exports.useLazyDownloadFromGuppyQuery = useLazyDownloadFromGuppyQuery;
 exports.useLazyFetchUserDetailsQuery = useLazyFetchUserDetailsQuery;
 exports.useLazyGeneralGQLQuery = useLazyGeneralGQLQuery;