@gen3/core 0.11.35 → 0.11.37

package/dist/cjs/index.js

@@ -2312,14 +2312,14 @@ const explorerTags = guppyApi.enhanceEndpoints({
                 }
             }),
             getRawDataAndTotalCounts: builder.query({
-                query: ({ type, fields, filters, sort, offset = 0, size = 20, accessibility = Accessibility.ALL, format = undefined, indexPrefix = '' })=>{
+                query: ({ type, fields, filters, sort, offset = 0, size = 20, accessibility = Accessibility.ALL, format = undefined, indexPrefix = '', filterName = 'filter' })=>{
                     const gqlFilter = convertFilterSetToGqlFilter(filters);
                     const params = [
                         ...sort ? [
                             '$sort: JSON'
                         ] : [],
                         ...gqlFilter ? [
-                            '$filter: JSON'
+                            `$${filterName}: JSON`
                         ] : [],
                         ...format ? [
                             '$format: Format'
@@ -2334,12 +2334,12 @@ const explorerTags = guppyApi.enhanceEndpoints({
                             'sort: $sort'
                         ] : [],
                         ...gqlFilter ? [
-                            'filter: $filter'
+                            `filter: $${filterName}`
                         ] : []
                     ].join(',');
                     const dataTypeLine = `${indexPrefix}${type} (accessibility: ${accessibility}, offset: ${offset}, first: ${size},
         ${dataParams}) {`;
-                    const typeAggsLine = `${type} (${gqlFilter && 'filter: $filter,'} accessibility: ${accessibility}) {`;
+                    const typeAggsLine = `${type} (${gqlFilter && `filter: $${filterName},`} accessibility: ${accessibility}) {`;
                     const processedFields = fields.map((field)=>rawDataQueryStrForEachField(field));
                     const query = `${queryLine}
     ${dataTypeLine}
@@ -2373,8 +2373,8 @@ const explorerTags = guppyApi.enhanceEndpoints({
                 ]
             }),
             getAggs: builder.query({
-                query: ({ type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, indexPrefix = '' })=>{
-                    return buildGetAggregationQuery(type, fields, filters, accessibility, filterSelf, undefined, indexPrefix);
+                query: ({ type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, indexPrefix = '', filterName = 'filter' })=>{
+                    return buildGetAggregationQuery(type, fields, filters, accessibility, filterSelf, undefined, indexPrefix, filterName);
                 },
                 transformResponse: (response, _meta, args)=>{
                     const buckets = processHistogramResponse(response?.data?.[`${args?.indexPrefix ?? ''}_aggregation`][args.type] ?? {});
@@ -2395,8 +2395,8 @@ const explorerTags = guppyApi.enhanceEndpoints({
                 ]
             }),
             getStatsAggregations: builder.query({
-                query: ({ type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined, indexPrefix = '' })=>{
-                    return buildGetStatsAggregationQuery(type, fields, filters, accessibility, filterSelf, queryId, indexPrefix);
+                query: ({ type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined, indexPrefix = '', filterName = 'filter' })=>{
+                    return buildGetStatsAggregationQuery(type, fields, filters, accessibility, filterSelf, queryId, indexPrefix, filterName);
                 },
                 transformResponse: (response, _meta, args)=>{
                     return processHistogramResponse(response?.data?.[`${args?.indexPrefix ?? ''}_aggregation`][args.type] ?? {});
@@ -2406,14 +2406,14 @@ const explorerTags = guppyApi.enhanceEndpoints({
                 ]
             }),
             getSubAggs: builder.query({
-                query: ({ type, mainField, termsFields = undefined, missingFields = undefined, numericAggAsText = false, filters = undefined, accessibility = Accessibility.ALL, indexPrefix = '' })=>{
+                query: ({ type, mainField, termsFields = undefined, missingFields = undefined, numericAggAsText = false, filters = undefined, accessibility = Accessibility.ALL, indexPrefix = '', filterName = 'filter' })=>{
                     const nestedAggFields = {
                         termsFields: termsFields,
                         missingFields: missingFields
                     };
-                    const query = `query getSubAggs ( ${filters ?? '$filter: JSON,'} $nestedAggFields: JSON) {
+                    const query = `query getSubAggs ( ${filters ?? `$${filterName}: JSON,`} $nestedAggFields: JSON) {
     ${indexPrefix}_aggregation {
-      ${type} ( ${filters ?? 'filter: $filter, filterSelf: false,'} nestedAggFields: $nestedAggFields, accessibility: ${accessibility}) {
+      ${type} ( ${filters ?? `filter: $${filterName}, filterSelf: false,`} nestedAggFields: $nestedAggFields, accessibility: ${accessibility}) {
       _totalCounts
         ${nestedHistogramQueryStrForEachField(mainField, numericAggAsText)}
       }`;
@@ -2421,7 +2421,7 @@ const explorerTags = guppyApi.enhanceEndpoints({
                         query: query,
                         variables: {
                             ...filters && {
-                                filter: convertFilterSetToGqlFilter(filters)
+                                [filterName]: convertFilterSetToGqlFilter(filters)
                             },
                             nestedAggFields: nestedAggFields
                         }
@@ -2435,10 +2435,10 @@ const explorerTags = guppyApi.enhanceEndpoints({
                 ]
             }),
             getCounts: builder.query({
-                query: ({ type, filters, accessibility = Accessibility.ALL, queryId = undefined, indexPrefix = '' })=>{
+                query: ({ type, filters, accessibility = Accessibility.ALL, queryId = undefined, indexPrefix = '', filterName = 'filter' })=>{
                     const gqlFilters = convertFilterSetToGqlFilter(filters);
-                    const queryLine = `query totalCounts${queryId ? `${indexPrefix}_${queryId}` : ''} ${gqlFilters ? '($filter: JSON)' : ''}{`;
-                    const typeAggsLine = `${type} ${gqlFilters ? '(filter: $filter, ' : '('} accessibility: ${accessibility}) {`;
+                    const queryLine = `query totalCounts${queryId ? `${indexPrefix}_${queryId}` : ''} ${gqlFilters ? `($${filterName}: JSON)` : ''}{`;
+                    const typeAggsLine = `${type} ${gqlFilters ? `(filter: $${filterName}, ` : '('} accessibility: ${accessibility}) {`;
                     const query = `${queryLine} ${indexPrefix}_aggregation {
           ${typeAggsLine}
             _totalCount
@@ -2449,7 +2449,7 @@ const explorerTags = guppyApi.enhanceEndpoints({
                         query: query,
                         variables: {
                             ...gqlFilters && {
-                                filter: gqlFilters
+                                [filterName]: gqlFilters
                             }
                         }
                     };
@@ -2468,11 +2468,11 @@ const explorerTags = guppyApi.enhanceEndpoints({
                 ]
             }),
             getFieldCountSummary: builder.query({
-                query: ({ type, field, filters, accessibility = Accessibility.ALL, indexPrefix = '' })=>{
+                query: ({ type, field, filters, accessibility = Accessibility.ALL, indexPrefix = '', filterName = 'filter' })=>{
                     const gqlFilters = convertFilterSetToGqlFilter(filters);
-                    const query = `query summary ($filter: JSON) {
+                    const query = `query summary ($${filterName}: JSON) {
         ${indexPrefix}_aggregation {
-          ${type} (filter: $filter, accessibility: ${accessibility}) {
+          ${type} (filter: $${filterName}, accessibility: ${accessibility}) {
             ${field} {
               histogram {
                 sum,
@@ -2485,7 +2485,7 @@ const explorerTags = guppyApi.enhanceEndpoints({
                         query: query,
                         variables: {
                             ...gqlFilters && {
-                                filter: gqlFilters
+                                [filterName]: gqlFilters
                             }
                         }
                     };
@@ -2544,13 +2544,12 @@ const useGetIndexFields = (index, indexPrefix = '')=>{
     });
     return data ?? [];
 };
-const buildGetAggregationQuery = (type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined, indexPrefix = '')=>{
+const buildGetAggregationQuery = (type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined, indexPrefix = '', filterName = 'filter')=>{
     const queryStart = isFilterEmpty(filters) ? `query getAggs${queryId ? `_${queryId}` : ''} {
               ${indexPrefix}_aggregation {
-              ${type} (accessibility: ${accessibility}) {` : `query getAggs ($filter: JSON) {
+              ${type} (accessibility: ${accessibility}) {` : `query getAggs ($${filterName}: JSON) {
                ${indexPrefix}_aggregation {
-
-                      ${type} (filter: $filter, filterSelf: ${filterSelf ? 'true' : 'false'}, accessibility: ${accessibility}) { _totalCount`;
+                      ${type} (filter: $${filterName}, filterSelf: ${filterSelf ? 'true' : 'false'}, accessibility: ${accessibility}) { _totalCount`;
     const query = `${queryStart}
                   ${fields.map((field)=>histogramQueryStrForEachField(field))}
                 }
@@ -2559,18 +2558,18 @@ const buildGetAggregationQuery = (type, fields, filters, accessibility = Accessi
     const queryBody = {
         query: query,
         variables: {
-            filter: convertFilterSetToGqlFilter(filters)
+            [filterName]: convertFilterSetToGqlFilter(filters)
         }
     };
     return queryBody;
 };
-const buildGetStatsAggregationQuery = (type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined, indexPrefix = '')=>{
+const buildGetStatsAggregationQuery = (type, fields, filters, accessibility = Accessibility.ALL, filterSelf = false, queryId = undefined, indexPrefix = '', filterName = 'filter')=>{
     const queryStart = isFilterEmpty(filters) ? `
               query getStatsAggs${queryId ? `_${queryId}` : ''} {
               ${indexPrefix}_aggregation {
-              ${type} (accessibility: ${accessibility}) {` : `query getStatsAggs${queryId ? `_${queryId}` : ''} ($filter: JSON) {
+              ${type} (accessibility: ${accessibility}) {` : `query getStatsAggs${queryId ? `_${queryId}` : ''} ($${filterName}: JSON) {
                ${indexPrefix}_aggregation {
-                      ${type} (filter: $filter, filterSelf: ${filterSelf ? 'true' : 'false'}, accessibility: ${accessibility}) { _totalCount`;
+                      ${type} (filter: $${filterName}, filterSelf: ${filterSelf ? 'true' : 'false'}, accessibility: ${accessibility}) { _totalCount`;
     const query = `${queryStart}
                   ${fields.map((field)=>statsQueryStrForEachField(field))}
                 }
@@ -2579,7 +2578,7 @@ const buildGetStatsAggregationQuery = (type, fields, filters, accessibility = Ac
     const queryBody = {
         query: query,
         variables: {
-            filter: convertFilterSetToGqlFilter(filters)
+            [filterName]: convertFilterSetToGqlFilter(filters)
         }
     };
     return queryBody;
@@ -4969,7 +4968,7 @@ const { useGraphQLQuery } = graphQLAPI;
  * @returns: A guppy download API for fetching bulk metadata
  */ const downloadRequestApi = gen3Api.injectEndpoints({
     endpoints: (builder)=>({
-            downloadFromGuppy: builder.mutation({
+            downloadFromGuppy: builder.query({
                 query: ({ type, filter, accessibility, fields, sort })=>{
                     const queryBody = {
                         filter: convertFilterSetToGqlFilter(filter),
@@ -4993,7 +4992,7 @@ const { useGraphQLQuery } = graphQLAPI;
             })
         })
 });
-const { useDownloadFromGuppyMutation } = downloadRequestApi;
+const { useDownloadFromGuppyQuery, useLazyDownloadFromGuppyQuery } = downloadRequestApi;
 
 const TAGS = 'manifest';
 const manifestTags = gen3Api.enhanceEndpoints({
@@ -5868,6 +5867,7 @@ exports.cartReducerPath = cartReducerPath;
 exports.clearActiveWorkspaceId = clearActiveWorkspaceId;
 exports.clearCohortFilters = clearCohortFilters;
 exports.cohortReducer = cohortReducer;
+exports.conversion = conversion;
 exports.convertFilterSetToGqlFilter = convertFilterSetToGqlFilter;
 exports.convertFilterToGqlFilter = convertFilterToGqlFilter;
 exports.convertGqlFilterToFilter = convertGqlFilterToFilter;
@@ -6068,7 +6068,7 @@ exports.useCoreSelector = useCoreSelector;
 exports.useCreateAuthzResourceMutation = useCreateAuthzResourceMutation;
 exports.useCreateRequestMutation = useCreateRequestMutation;
 exports.useDataLibrary = useDataLibrary;
-exports.useDownloadFromGuppyMutation = useDownloadFromGuppyMutation;
+exports.useDownloadFromGuppyQuery = useDownloadFromGuppyQuery;
 exports.useFetchUserDetailsQuery = useFetchUserDetailsQuery;
 exports.useGeneralGQLQuery = useGeneralGQLQuery;
 exports.useGetAISearchStatusQuery = useGetAISearchStatusQuery;
@@ -6125,6 +6125,7 @@ exports.useGraphQLQuery = useGraphQLQuery;
 exports.useIsExternalConnectedQuery = useIsExternalConnectedQuery;
 exports.useIsUserLoggedIn = useIsUserLoggedIn;
 exports.useLaunchWorkspaceMutation = useLaunchWorkspaceMutation;
+exports.useLazyDownloadFromGuppyQuery = useLazyDownloadFromGuppyQuery;
 exports.useLazyFetchUserDetailsQuery = useLazyFetchUserDetailsQuery;
 exports.useLazyGeneralGQLQuery = useLazyGeneralGQLQuery;
 exports.useLazyGetAggsQuery = useLazyGetAggsQuery;