@gen3/frontend 0.11.29 → 0.11.31

package/dist/cjs/index.js

@@ -1727,7 +1727,7 @@ const LoginPanel = (loginConfig)=>{
         router$1
     ]);
     const handleCredentialsLogin = React.useCallback(async ()=>{
-        const redirect = !referer ? '/' : lodash.isArray(referer) ? referer[0] : referer;
+        const redirect = filterRedirect(referer);
         router$1.push(redirect).catch((e)=>{
             notifications.showNotification({
                 title: 'Login Error',
@@ -11197,20 +11197,19 @@ const DEFAULT_PAGE_LIMIT = 10000;
     });
 };
 
-const CountsValue = ({ label, isSuccess, counts })=>{
-    // TODO handle case of data.length == 1
+const CountsValue = ({ label, isFetching, isError, counts })=>{
     return /*#__PURE__*/ jsxRuntime.jsxs("div", {
-        className: "mr-4",
+        className: "mr-4 relative",
         children: [
             /*#__PURE__*/ jsxRuntime.jsx(core$1.LoadingOverlay, {
-                visible: !isSuccess
+                visible: isFetching
             }),
             /*#__PURE__*/ jsxRuntime.jsx(core$1.Paper, {
                 shadow: "xs",
                 p: "xs",
                 withBorder: true,
                 className: "bg-primary text-primary-contrast font-heading text-md font-semibold",
-                children: toCountsString(counts, label)
+                children: isError ? 'error' : toCountsString(counts, label)
             })
         ]
     });
@@ -13027,11 +13026,13 @@ const EmptyData = {};
     const [facetDefinitions, setFacetDefinitions] = React.useState({});
     const [summaryCharts, setSummaryCharts] = React.useState({});
     const cohortFilters = core.useCoreSelector((state)=>core.selectIndexFilters(state, index));
+    const cohortId = core.useCoreSelector((state)=>core.selectCurrentCohortId(state));
     const { data, isSuccess, isFetching: isAggsQueryFetching, isError: isAggsQueryError } = core.useGetAggsQuery({
         type: index,
         fields: fields,
         filters: cohortFilters,
-        accessibility: accessLevel
+        accessibility: accessLevel,
+        queryId: cohortId
     });
     const chartKeys = useDeepCompare.useDeepCompareMemo(()=>[
             ...Object.keys(chartsSection?.charts ?? {}),
@@ -13040,11 +13041,13 @@ const EmptyData = {};
         chartsSection?.charts,
         charts
     ]);
-    const { data: chartData, isSuccess: isChartSuccess, isFetching: isChartFetching, isError: isChartError } = core.useGetAggsNoFilterSelfQuery({
+    const { data: chartData, isSuccess: isChartSuccess, isFetching: isChartFetching, isError: isChartError } = core.useGetAggsQuery({
         type: index,
         fields: chartKeys,
         filters: cohortFilters,
-        accessibility: accessLevel
+        accessibility: accessLevel,
+        filterSelf: true,
+        queryId: cohortId
     }, {
         skip: chartKeys.length === 0
     });
@@ -13196,12 +13199,13 @@ const EmptyData = {};
         charts,
         chartsSection
     ]);
-    const { data: counts, isSuccess: isCountSuccess, isError } = core.useGetCountsQuery({
+    const { data: counts, isFetching: isCountsFetching, isSuccess: isCountSuccess, isError: isCountsError } = core.useGetCountsQuery({
         type: index,
         filters: cohortFilters,
-        accessibility: accessLevel
+        accessibility: accessLevel,
+        queryId: cohortId
     });
-    if (isError || isAggsQueryError) {
+    if (isCountsError || isAggsQueryError) {
         return /*#__PURE__*/ jsxRuntime.jsx(ErrorCard, {
             message: "Unable to fetch data from server"
         }); // TODO: replace with configurable message
@@ -13248,7 +13252,8 @@ const EmptyData = {};
                                     /*#__PURE__*/ jsxRuntime.jsx(CountsValue, {
                                         label: guppyConfig?.nodeCountTitle || toDisplayName(index),
                                         counts: counts,
-                                        isSuccess: isCountSuccess
+                                        isFetching: isCountsFetching,
+                                        isError: isCountsError
                                     })
                                 ]
                             }),
@@ -13315,7 +13320,7 @@ const IconSize = {
     'xl-2': 36
 };
 
-const CohortManagerPanel$1 = ({ size = 'md' })=>{
+const CohortManagerPanel$1 = ({ size = 'md', rightPanel })=>{
     const coreDispatch = core.useCoreDispatch();
     const [isEditing, setIsEditing] = React.useState(false);
     const [editingLabel, setEditingLabel] = React.useState('');
@@ -13534,15 +13539,22 @@ const CohortManagerPanel$1 = ({ size = 'md' })=>{
                     })
                 })
             }),
-            null
+            null,
+            rightPanel ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Group, {
+                gap: "xs",
+                className: "flex-grow",
+                justify: "flex-end",
+                children: rightPanel
+            }) : null
         ]
     });
 };
-const CohortManager$1 = ({ size = 'md' })=>{
+const CohortManager$1 = ({ size = 'md', rightPanel })=>{
     // TODO: initialize and load cohorts from cohort storage
     //  as right now the redux-persist is handling cohorts
     return /*#__PURE__*/ jsxRuntime.jsx(CohortManagerPanel$1, {
-        size: size
+        size: size,
+        rightPanel: rightPanel
     });
 };
 
@@ -13691,17 +13703,20 @@ const TabbedCohortBuilder = ({ index, tabsConfiguration })=>{
     const prevRouterTab = core.usePrevious(routerTab);
     const [activeTab, setActiveTab] = React.useState(routerTab ? routerTab : Object.keys(tabsConfig)[0]);
     const [accessLevel, setAccessLevel] = React.useState(core.Accessibility.ALL);
+    const cohortId = core.useCoreSelector((state)=>core.selectCurrentCohortId(state));
     const cohortFilters = core.useCoreSelector((state)=>core.selectIndexFilters(state, index));
     const { data, isSuccess, isFetching: isAggsQueryFetching, isError: isAggsQueryError } = core.useGetAggsQuery({
         type: index,
         fields: cohortBuilderFilters,
         filters: cohortFilters,
-        accessibility: accessLevel
+        accessibility: accessLevel,
+        queryId: cohortId
     });
     const { data: counts, isSuccess: isCountSuccess, isError } = core.useGetCountsQuery({
         type: index,
         filters: cohortFilters,
-        accessibility: accessLevel
+        accessibility: accessLevel,
+        queryId: cohortId
     });
     const [facetDefinitions, setFacetDefinitions] = React.useState({});
     React.useEffect(()=>{
@@ -13725,7 +13740,8 @@ const TabbedCohortBuilder = ({ index, tabsConfiguration })=>{
     }, [
         activeTab,
         routerTab,
-        prevRouterTab
+        prevRouterTab,
+        router$1
     ]);
     // Set the facet definitions based on the data only the first time the data is loaded
     useDeepCompare.useDeepCompareEffect(()=>{
@@ -13824,42 +13840,32 @@ const TabbedCohortBuilder = ({ index, tabsConfiguration })=>{
         getRangeFacetData,
         index
     ]);
-    return /*#__PURE__*/ jsxRuntime.jsxs(core$1.Stack, {
+    return /*#__PURE__*/ jsxRuntime.jsx(core$1.Stack, {
         gap: "xs",
         align: "stretch",
         classNames: {
             root: 'w-full'
         },
-        children: [
-            /*#__PURE__*/ jsxRuntime.jsx(core$1.Group, {
-                justify: "flex-end",
-                children: /*#__PURE__*/ jsxRuntime.jsx(CountsValue, {
-                    label: index,
-                    counts: counts,
-                    isSuccess: isCountSuccess
-                })
-            }),
-            /*#__PURE__*/ jsxRuntime.jsx(FacetTabs, {
-                activeTab: activeTab,
-                setActiveTab: setActiveTab,
-                facetDefinitions: facetDefinitions,
-                tabsConfig: tabsConfig,
-                usedFacets: cohortBuilderFilters,
-                hooks: facetDataHooks,
-                customFacetHooks: {
-                    useCustomFacets,
-                    useAvailableCustomFacets: (usedFacets, onlyFiltersWithValues, queryOptions)=>({
-                            data: {},
-                            isSuccess: true
-                        }),
-                    useAddCustomFilter: ()=>(filter)=>{},
-                    useRemoveCustomFilter: ()=>(filter)=>{}
-                },
-                getFacetLabel: ()=>'Cases',
-                cardScrollMargin: calculateStickyHeaderHeight(),
-                useFieldNameToTitle: useFieldNameToTitle
-            })
-        ]
+        children: /*#__PURE__*/ jsxRuntime.jsx(FacetTabs, {
+            activeTab: activeTab,
+            setActiveTab: setActiveTab,
+            facetDefinitions: facetDefinitions,
+            tabsConfig: tabsConfig,
+            usedFacets: cohortBuilderFilters,
+            hooks: facetDataHooks,
+            customFacetHooks: {
+                useCustomFacets,
+                useAvailableCustomFacets: (usedFacets, onlyFiltersWithValues, queryOptions)=>({
+                        data: {},
+                        isSuccess: true
+                    }),
+                useAddCustomFilter: ()=>(filter)=>{},
+                useRemoveCustomFilter: ()=>(filter)=>{}
+            },
+            getFacetLabel: ()=>'Cases',
+            cardScrollMargin: calculateStickyHeaderHeight(),
+            useFieldNameToTitle: useFieldNameToTitle
+        })
     });
 };
 
@@ -16375,7 +16381,8 @@ class QueryAllIndexedError extends Error {
                 fields: [
                     fieldConfig.resourceField
                 ],
-                accessibility: core.Accessibility.ALL
+                accessibility: core.Accessibility.ALL,
+                filterSelf: true
             }).unwrap().then((result)=>({
                     index,
                     result
@@ -16479,7 +16486,7 @@ const CohortManagerPanel = ({ indexResources, remoteSupportService, size = 'md'
     const [editingLabel, setEditingLabel] = React.useState('');
     const allCohorts = useAppSelector(selectAllCohorts);
     const currentCohort = useAppSelector(selectCurrentCohort);
-    const [getGetAggs] = core.useLazyGetAggsNoFilterSelfQuery();
+    const [getGetAggs] = core.useLazyGetAggsQuery();
     const [requestQuery] = core.useCreateRequestMutation();
     const user = core.useCoreSelector(core.selectUserDetails);
     const theme = core$1.useMantineTheme();
@@ -17088,7 +17095,7 @@ const commonTableSettings$1 = (size = 'sm')=>{
 
 const SavedCohortsTable = ({ indexResources, remoteSupportService, size = 'md' })=>{
     const appDispatch = useAppDispatch();
-    const [getGetAggs] = core.useLazyGetAggsNoFilterSelfQuery();
+    const [getGetAggs] = core.useLazyGetAggsQuery();
     const [requestQuery] = core.useCreateRequestMutation();
     const user = core.useCoreSelector(core.selectUserDetails);
     const columns = React.useMemo(()=>[
@@ -25879,6 +25886,29 @@ const CrosswalkPageGetServerSideProps = async ()=>{
     }
 };
 
+const CountsPanel = ({ index, accessibility = core.Accessibility.ALL })=>{
+    const [getCounts, { data: counts, isFetching, isError, isSuccess }] = core.useLazyGetCountsQuery();
+    const currentCohortId = core.useCoreSelector((state)=>core.selectCurrentCohortId(state));
+    const cohortFilters = core.useCoreSelector((state)=>core.selectIndexFilters(state, index));
+    useDeepCompare.useDeepCompareEffect(()=>{
+        getCounts({
+            type: index,
+            filters: cohortFilters,
+            accessibility: accessibility,
+            queryId: currentCohortId
+        });
+    }, [
+        cohortFilters,
+        currentCohortId,
+        accessibility
+    ]);
+    return /*#__PURE__*/ jsxRuntime.jsx(CountsValue, {
+        label: "Case",
+        counts: counts,
+        isFetching: isFetching,
+        isError: isError
+    });
+};
 const TabbedCohortBuilderPage = ({ headerProps, footerProps, configuration })=>{
     return /*#__PURE__*/ jsxRuntime.jsx(NavPageLayout, {
         headerProps,
@@ -25897,7 +25927,11 @@ const TabbedCohortBuilderPage = ({ headerProps, footerProps, configuration })=>{
                 /*#__PURE__*/ jsxRuntime.jsxs("div", {
                     className: "w-full flex-col flex gap-4 fixed bg-white z-10",
                     children: [
-                        /*#__PURE__*/ jsxRuntime.jsx(CohortManager$1, {}),
+                        /*#__PURE__*/ jsxRuntime.jsx(CohortManager$1, {
+                            rightPanel: /*#__PURE__*/ jsxRuntime.jsx(CountsPanel, {
+                                index: "case"
+                            })
+                        }),
                         /*#__PURE__*/ jsxRuntime.jsx(QueryExpression, {
                             index: configuration.index
                         })
@@ -26410,6 +26444,7 @@ exports.CollapsableSidebar = CollapsableSidebar;
 exports.ColorThemePage = ColorThemePage;
 exports.ColorThemePageGetServerSideProps = ColorThemePageGetServerSideProps;
 exports.ContentSource = ContentSource$1;
+exports.CountsValue = CountsValue;
 exports.CreateCredentialsAPIKeyModal = CreateCredentialsAPIKeyModal;
 exports.CrosswalkPage = CrosswalkPage;
 exports.CrosswalkPageGetServerSideProps = CrosswalkPageGetServerSideProps;