@gen3/frontend 0.11.0 → 0.11.1

package/dist/cjs/index.js

@@ -15508,85 +15508,26 @@ const createFacetPanel = (facet, chartType, valueLabel, hooks)=>{
     return null;
 };
 
-const GEN3_COHORT_DISCOVERY_API = process.env.GEN3_COHORT_DISCOVERY_API || `${core.GEN3_API}/api/auth/analysis/cohortDiscovery`;
-
-const useGraphQLData = (url, body, skip)=>{
-    // Create a fetcher function that handles the GraphQL POST request
-    const fetcher = async (fetchUrl, fetchBody)=>{
-        const headers = new Headers({
-            Accept: 'application/json',
-            'Content-Type': 'application/json'
-        });
-        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
-            const accessToken = cookiesNext.getCookie('credentials_token');
-            if (accessToken) {
-                headers.set('Authorization', `Bearer ${accessToken}`);
-            }
-        }
-        const response = await fetch(fetchUrl, {
-            method: 'POST',
-            headers: headers,
-            body: JSON.stringify(fetchBody)
-        });
-        if (!response.ok) {
-            throw new Error(`Error ${response.status}: ${response.statusText}`);
-        }
-        return await response.json();
-    };
-    // Use SWR with the fetcher
-    const { data, error, isLoading, mutate } = useSWR(!skip ? [
-        url,
-        body
-    ] : null, ([fetchUrl, fetchBody])=>fetcher(fetchUrl, fetchBody), {
-        revalidateOnFocus: false
-    });
-    // Format error to match your ErrorDetails interface
-    const formattedError = error ? {
-        status: error.message.match(/\d+/)?.[0] || 'Unknown',
-        message: error.message
-    } : null;
-    return {
-        data,
-        isLoading,
-        isSuccess: !!data && !error,
-        isError: !!error,
-        error: formattedError,
-        mutate
-    };
-};
-const useRoundedAggsQuery = ({ type, fields, filters, accessibility = core.Accessibility.ALL }, { skip } = {
-    skip: false
-})=>{
-    const response = useGraphQLData(GEN3_COHORT_DISCOVERY_API, core.buildGetAggregationQuery(type, fields, filters, accessibility, false), skip);
-    return {
-        ...response,
-        data: response?.data?.data ? core.processHistogramResponse(response?.data.data?._aggregation[type] ?? {}) : {}
-    };
-};
-
 const NUM_COLS = 2; // TODO: add to config
 /**
  * CartsAndFacetsPanel component
  *
  * @param {string} index - The index type used for querying data.
+ * @param data
+ * @param isLoading
+ * @param isError
+ * @param isSuccess
  * @param {Array} facets - The list of facets to be rendered.
  * @returns {JSX.Element} The rendered component showing facets.
- */ const ChartsAndFacetsPanel = ({ index, facets })=>{
+ */ const ChartsAndFacetsPanel = ({ index, data, isLoading, isError, isSuccess, facets })=>{
     const cohortFilters = useAppSelector((state)=>selectCurrentCohortIndexFilters(state, index));
-    const { data, isSuccess, isLoading: isAggsQueryFetching, isError: isAggsQueryError } = useRoundedAggsQuery({
-        type: index,
-        fields: facets.map((x)=>x.field),
-        filters: cohortFilters
-    });
     const getEnumFacetData = useDeepCompare.useDeepCompareCallback((field)=>{
         return {
             data: processBucketData(data?.[field]),
             enumFilters: field in cohortFilters.root ? core.extractEnumFilterValue(cohortFilters.root[field]) : undefined,
             isSuccess: isSuccess,
-            isFetching: isAggsQueryFetching,
-            isError: isAggsQueryError
+            isFetching: isLoading,
+            isError: isError
         };
     }, [
         cohortFilters,
@@ -16125,6 +16066,67 @@ const CohortManager = ({ indexResources, remoteSupportService, size = 'md' })=>{
     });
 };
 
+process.env.GEN3_COHORT_DISCOVERY_API || `${core.GEN3_API}/api/auth/analysis/cohortDiscovery`;
+
+const useGraphQLData = (url, body, skip)=>{
+    // Create a fetcher function that handles the GraphQL POST request
+    const csrfToken = core.useCoreSelector((state)=>core.selectCSRFToken(state));
+    const fetcher = async (fetchUrl, fetchBody)=>{
+        const headers = new Headers({
+            Accept: 'application/json',
+            'Content-Type': 'application/json',
+            'X-CSRF-Token': csrfToken ?? ''
+        });
+        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
+            const accessToken = cookiesNext.getCookie('credentials_token');
+            if (accessToken) {
+                headers.set('Authorization', `Bearer ${accessToken}`);
+            }
+        }
+        const response = await fetch(fetchUrl, {
+            method: 'POST',
+            headers: headers,
+            body: JSON.stringify(fetchBody)
+        });
+        if (!response.ok) {
+            throw new Error(`Error ${response.status}: ${response.statusText}`);
+        }
+        return await response.json();
+    };
+    // Use SWR with the fetcher
+    const { data, error, isLoading, mutate } = useSWR(!skip ? [
+        url,
+        body
+    ] : null, ([fetchUrl, fetchBody])=>fetcher(fetchUrl, fetchBody), {
+        revalidateOnFocus: false
+    });
+    // Format error to match your ErrorDetails interface
+    const formattedError = error ? {
+        status: error.message.match(/\d+/)?.[0] || 'Unknown',
+        message: error.message
+    } : null;
+    return {
+        data,
+        isLoading,
+        isSuccess: !!data && !error,
+        isError: !!error,
+        error: formattedError,
+        mutate
+    };
+};
+const COHORT_DISCOVERY_LIMIT$1 = process.env.NEXT_PUBLIC_GEN3_COHORT_DISCOVERY_LIMIT ? Number(process.env.NEXT_PUBLIC_GEN3_COHORT_DISCOVERY_LIMIT) : 100;
+const useUnsecureRoundedAggsQuery = ({ type, fields, filters, accessibility = core.Accessibility.ALL }, { skip } = {
+    skip: false
+})=>{
+    const response = useGraphQLData(`${core.GEN3_GUPPY_API}/graphql`, core.buildGetAggregationQuery(type, fields, filters, accessibility, false), skip);
+    return {
+        ...response,
+        data: response?.data?.data ? core.processHistogramResponse(core.roundHistogramResponse(response?.data?.data._aggregation[type], COHORT_DISCOVERY_LIMIT$1)) : {}
+    };
+};
+
 const CohortQueryExpression = ({ index })=>{
     const currentCohortId = useAppSelector((state)=>selectCurrentCohortId(state));
     const currentCohortName = useAppSelector((state)=>selectCurrentCohortName(state));
@@ -16198,13 +16200,12 @@ const IndexPanel = ({ dataConfig, tabs, tabTitle, emptySelection, indexResources
         facetDefinitions
     ]);
     const cohortFilters = useAppSelector((state)=>selectCurrentCohortIndexFilters(state, index));
-    const queryFields = categories.length === 0 ? fields : activeFieldDefinitions.map((x)=>x.field);
-    const { data, isSuccess, isError: isAggsQueryError } = useRoundedAggsQuery({
+    const { data, isSuccess, isLoading: isAggsQueryFetching, isError: isAggsQueryError } = useUnsecureRoundedAggsQuery({
         type: index,
-        fields: queryFields,
+        fields: fields,
         filters: cohortFilters
     }, {
-        skip: queryFields.length === 0
+        skip: fields.length === 0
     });
     const updateFields = useDeepCompare.useDeepCompareCallback((field, checked)=>{
         if (!checked) {
@@ -16290,6 +16291,10 @@ const IndexPanel = ({ dataConfig, tabs, tabTitle, emptySelection, indexResources
                                 remoteSupportService: remoteSupportService
                             }),
                             selectedFacets.length > 0 ? /*#__PURE__*/ jsxRuntime.jsx(ChartsAndFacetsPanel, {
+                                data: data,
+                                isLoading: isAggsQueryFetching,
+                                isError: isAggsQueryError,
+                                isSuccess: isSuccess,
                                 index: index,
                                 facets: activeFieldDefinitions
                             }) : /*#__PURE__*/ jsxRuntime.jsx(core$1.Center, {