@gen3/core 0.11.54 → 0.11.56

package/dist/cjs/index.js

@@ -1541,7 +1541,9 @@ const getCurrentCohortId = (state)=>state.currentCohortId;
                 customName: uniqueName
             });
             cohortsAdapter.addOne(state, cohort);
-            state.currentCohortId = cohort.id;
+            if (action.payload?.setAsCurrent) {
+                state.currentCohortId = cohort.id;
+            }
         },
         updateCohortName: (state, action)=>{
             const { id, name } = action.payload;
@@ -2333,23 +2335,23 @@ const convertNumericFromToArrayToFilters = (field, range, isNested = true)=>{
         ]
     };
 };
-const rawDataQueryStrForEachField = (field)=>{
+const rawDataQueryStrForEachField = (field, asTextHistogram = false)=>{
     const splitFieldArray = field.split('.');
     const splitField = splitFieldArray.shift();
     let middleQuery = '';
     if (splitFieldArray.length === 0) {
-        middleQuery = `${splitField} { histogram { count } }`;
+        middleQuery = `${splitField} { ${asTextHistogram ? "histogram: asTextHistogram" : "histogram"} { count } }`;
     } else {
-        middleQuery = `${splitField} { ${rawDataQueryStrForEachField(splitFieldArray.join('.'))} }`;
+        middleQuery = `${splitField} { ${rawDataQueryStrForEachField(splitFieldArray.join('.'), asTextHistogram)} }`;
     }
     return middleQuery;
 };
-const buildAliasedNestedCountsQuery = ({ type, field, rangeName })=>{
+const buildAliasedNestedCountsQuery = ({ type, field, rangeName, asTextHistogram = false })=>{
     const dataParams = [
         `filter: $${rangeName}`
     ];
     const dataTypeLine = `${rangeName} : ${type} (accessibility: $accessibility ${dataParams}) {`;
-    const processedFields = rawDataQueryStrForEachField(field);
+    const processedFields = rawDataQueryStrForEachField(field, asTextHistogram);
     return `${dataTypeLine} ${processedFields} }`;
 };
 const buildRangeFilters = (field, ranges, filters, rangeBaseName, isNested = true)=>{
@@ -2364,14 +2366,15 @@ const buildRangeFilters = (field, ranges, filters, rangeBaseName, isNested = tru
         return acc;
     }, {});
 };
-const buildRangeQuery = (field, ranges, filters, rangeBaseName = 'range', index = 'cases', indexPrefix = '', isNested = true)=>{
+const buildRangeQuery = (field, ranges, filters, rangeBaseName = 'range', index = 'cases', indexPrefix = '', isNested = true, asTextHistogram = false)=>{
     const rangeFilters = buildRangeFilters(field, ranges, filters, rangeBaseName, isNested);
     let query = `query rangeQuery ($accessibility: Accessibility, ${Object.keys(rangeFilters).map((rangeKey)=>`$${rangeKey}: JSON`).join(',')} ) { ${indexPrefix}_aggregation {`;
     Object.keys(rangeFilters).forEach((rangeKey)=>{
         const rangeQuery = buildAliasedNestedCountsQuery({
             type: index,
             field,
-            rangeName: rangeKey
+            rangeName: rangeKey,
+            asTextHistogram
         });
         query += rangeQuery + ' \n';
     });
@@ -2982,9 +2985,9 @@ const explorerTags = guppyApi.enhanceEndpoints({
                 }
             }),
             customRange: builder.query({
-                query: ({ filters, field, ranges, rangeBaseName, index, indexPrefix, accessibility = Accessibility.ALL, isNested = true })=>{
+                query: ({ filters, field, ranges, rangeBaseName, index, indexPrefix, accessibility = Accessibility.ALL, isNested = true, asTextHistogram = false })=>{
                     // remove field from FilterSet
-                    const queryData = buildRangeQuery(field, ranges, filters, rangeBaseName, index, indexPrefix, isNested);
+                    const queryData = buildRangeQuery(field, ranges, filters, rangeBaseName, index, indexPrefix, isNested, asTextHistogram);
                     const gqlFilters = Object.entries(queryData.filters).reduce((acc, [key, filter])=>{
                         acc[key] = isNested ? convertFilterSetToNestedGqlFilter(filter) : convertFilterSetToGqlFilter(filter);
                         return acc;
@@ -6295,6 +6298,7 @@ exports.buildGetStatsAggregationQuery = buildGetStatsAggregationQuery;
 exports.buildListItemsGroupedByDataset = buildListItemsGroupedByDataset;
 exports.buildNestedFilterForOperation = buildNestedFilterForOperation;
 exports.buildNestedGQLFilter = buildNestedGQLFilter;
+exports.buildRangeQuery = buildRangeQuery;
 exports.calculatePercentageAsNumber = calculatePercentageAsNumber;
 exports.calculatePercentageAsString = calculatePercentageAsString;
 exports.capitalize = capitalize;