@gen3/frontend 0.11.12 → 0.11.13

package/dist/cjs/index.js

@@ -1480,7 +1480,7 @@ function hashCode(str) {
                     dangerouslySetInnerHTML: {
                         __html: textString
                     },
-                    "aria-label": "HTML content" // Provide context for HTML rendered content
+                    "aria-label": "HTML content"
                 });
             }
         case "textArray":
@@ -1620,7 +1620,7 @@ function hashCode(str) {
  * @param {string} paramValue - The parameter value
  * @returns {string} - The URL with the added parameter
  */ const appendParameterToUrl = (url, paramName, paramValue)=>{
-    if (!url || false) {
+    if (!url || !paramName) {
         return url;
     }
     // Extract hash fragment if present
@@ -1956,8 +1956,7 @@ const saveToFile = (savingStr, filename = 'credentials.json')=>{
             children: [
                 credentials.api_key === '' && /*#__PURE__*/ jsxRuntime.jsx(core$1.LoadingOverlay, {
                     visible: true
-                }) // pragma: allowlist-secret;
-                ,
+                }),
                 /*#__PURE__*/ jsxRuntime.jsx("p", {
                     children: "This key is only shown once. Please copy or save it and store it in a safe place."
                 }),
@@ -2514,7 +2513,7 @@ const processChartData$2 = (facetData, valueType = 'count', total, maxBins = 100
 };
 const HorizontalBarChart = ({ data, valueType, total, showLegendInChart = true })=>{
     const chartData = processChartData$2(data, valueType, total);
-    const chartDefinition = React.useMemo(()=>{
+    const chartDefinition = useDeepCompare.useDeepCompareMemo(()=>{
         return {
             tooltip: {
                 trigger: 'item',
@@ -2556,12 +2555,17 @@ const HorizontalBarChart = ({ data, valueType, total, showLegendInChart = true }
             series: chartData
         };
     }, [
-        chartData
+        chartData,
+        showLegendInChart
     ]);
     return /*#__PURE__*/ jsxRuntime.jsx("div", {
         className: "w-full h-64",
         children: /*#__PURE__*/ jsxRuntime.jsx(ReactECharts, {
-            option: chartDefinition
+            option: chartDefinition,
+            settings: {
+                notMerge: true,
+                lazyUpdate: false
+            }
         })
     });
 };
@@ -2589,7 +2593,11 @@ const ChartRendererFactory = ()=>{
     // TODO: add default chart chart for missing chart type
     const element = ChartRendererFactory().getRenderer('chart', type);
     return element({
-        ...chartProps
+        total: chartProps.total,
+        valueType: chartProps.valueType,
+        label: chartProps.label,
+        data: chartProps.data,
+        showLegendInChart: chartProps.showLegendInChart
     }, parameters);
 };
 
@@ -2607,6 +2615,106 @@ const chartColors = [
     '#9a60b4',
     '#ea7ccc'
 ];
+const LegendRows = ({ data })=>{
+    const moreThanMaxRows = data.length > MAX_LEGEND_ROWS;
+    const limitedRows = moreThanMaxRows ? data.slice(0, MAX_LEGEND_ROWS) : data;
+    return limitedRows.map((element, elIndex)=>/*#__PURE__*/ jsxRuntime.jsxs(core$1.Table.Tr, {
+            children: [
+                /*#__PURE__*/ jsxRuntime.jsxs(core$1.Table.Td, {
+                    children: [
+                        /*#__PURE__*/ jsxRuntime.jsx(core$1.ColorSwatch, {
+                            className: "inline-block mr-2 align-middle",
+                            size: "1em",
+                            radius: "xs",
+                            color: chartColors?.[elIndex % chartColors.length] || ''
+                        }),
+                        element.key
+                    ]
+                }),
+                /*#__PURE__*/ jsxRuntime.jsx(core$1.Table.Td, {
+                    className: "text-right",
+                    children: element.count
+                })
+            ]
+        }, elIndex));
+};
+const LegendOverflow = ({ chart, data, chartTitle, counts })=>{
+    const [openedMoreRows, { open: openMoreRows, close: closeMoreRows }] = hooks.useDisclosure(false);
+    const theme = core$1.useMantineTheme();
+    return /*#__PURE__*/ jsxRuntime.jsxs(React.Fragment, {
+        children: [
+            /*#__PURE__*/ jsxRuntime.jsx(core$1.Modal, {
+                opened: openedMoreRows,
+                onClose: closeMoreRows,
+                title: chartTitle,
+                size: "xl",
+                children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Grid, {
+                    children: [
+                        /*#__PURE__*/ jsxRuntime.jsx(core$1.Grid.Col, {
+                            span: 6,
+                            children: createChart(chart.chartType, {
+                                data: data === undefined ? [] : data,
+                                total: counts ?? 1,
+                                valueType: chart.valueType ?? 'count',
+                                label: chart.label,
+                                showLegendInChart: chart.showLegendInChart
+                            })
+                        }, "modal-col-1"),
+                        /*#__PURE__*/ jsxRuntime.jsx(core$1.Grid.Col, {
+                            span: 6,
+                            children: /*#__PURE__*/ jsxRuntime.jsx("div", {
+                                className: "border-solid border-[1px] border-[var(--mantine-color-gray-3)] h-full p-1",
+                                children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Table, {
+                                    withRowBorders: false,
+                                    classNames: {
+                                        table: '',
+                                        td: 'p-1 leading-3'
+                                    },
+                                    children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Table.Tbody, {
+                                        children: data.map((element, elIndex)=>/*#__PURE__*/ jsxRuntime.jsxs(core$1.Table.Tr, {
+                                                children: [
+                                                    /*#__PURE__*/ jsxRuntime.jsxs(core$1.Table.Td, {
+                                                        children: [
+                                                            /*#__PURE__*/ jsxRuntime.jsx(core$1.ColorSwatch, {
+                                                                className: "inline-block mr-2 align-middle",
+                                                                size: "1em",
+                                                                radius: "xs",
+                                                                color: chartColors?.[elIndex % chartColors.length] || ''
+                                                            }),
+                                                            element.key
+                                                        ]
+                                                    }),
+                                                    /*#__PURE__*/ jsxRuntime.jsx(core$1.Table.Td, {
+                                                        className: "text-right",
+                                                        children: element.count
+                                                    })
+                                                ]
+                                            }, elIndex))
+                                    })
+                                })
+                            })
+                        }, "modal-col-2")
+                    ]
+                })
+            }),
+            /*#__PURE__*/ jsxRuntime.jsxs(core$1.Button, {
+                variant: "subtle",
+                onClick: openMoreRows,
+                leftSection: /*#__PURE__*/ jsxRuntime.jsx(react.Icon, {
+                    icon: "gen3:open-in-modal",
+                    height: 24,
+                    width: 24,
+                    color: theme.colors.accent[5]
+                }),
+                className: "text-black hover:text-black",
+                children: [
+                    data.length - MAX_LEGEND_ROWS,
+                    " more"
+                ]
+            })
+        ]
+    });
+};
 //The Charts component maps the data from ChartsProps into a grid of createChart() ReactNodes
 const Charts = ({ charts, data, counts, isSuccess, numCols = DEFAULT_COLS, style = 'tile', showLegends = false })=>{
     const spans = computeRowSpan(Object.keys(charts).length, numCols);
@@ -2617,109 +2725,10 @@ const Charts = ({ charts, data, counts, isSuccess, numCols = DEFAULT_COLS, style
                 message: `${field} not found in data`
             });
         }
-        const LegendRows = ({ data })=>{
-            const moreThanMaxRows = data.length > MAX_LEGEND_ROWS;
-            const limitedRows = moreThanMaxRows ? data.slice(0, MAX_LEGEND_ROWS) : data;
-            return limitedRows.map((element, elIndex)=>/*#__PURE__*/ jsxRuntime.jsxs(core$1.Table.Tr, {
-                    children: [
-                        /*#__PURE__*/ jsxRuntime.jsxs(core$1.Table.Td, {
-                            children: [
-                                /*#__PURE__*/ jsxRuntime.jsx(core$1.ColorSwatch, {
-                                    className: "inline-block mr-2 align-middle",
-                                    size: "1em",
-                                    radius: "xs",
-                                    color: chartColors?.[elIndex % chartColors.length] || ''
-                                }),
-                                element.key
-                            ]
-                        }),
-                        /*#__PURE__*/ jsxRuntime.jsx(core$1.Table.Td, {
-                            className: "text-right",
-                            children: element.count
-                        })
-                    ]
-                }, elIndex));
-        };
-        const LegendOverflow = ({ chart, data, chartTitle })=>{
-            const [openedMoreRows, { open: openMoreRows, close: closeMoreRows }] = hooks.useDisclosure(false);
-            const theme = core$1.useMantineTheme();
-            return /*#__PURE__*/ jsxRuntime.jsxs(React.Fragment, {
-                children: [
-                    /*#__PURE__*/ jsxRuntime.jsx(core$1.Modal, {
-                        opened: openedMoreRows,
-                        onClose: closeMoreRows,
-                        title: chartTitle,
-                        size: "xl",
-                        children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Grid, {
-                            children: [
-                                /*#__PURE__*/ jsxRuntime.jsx(core$1.Grid.Col, {
-                                    span: 6,
-                                    children: createChart(chart.chartType, {
-                                        data: data === undefined ? [] : data,
-                                        total: counts ?? 1,
-                                        valueType: chart.valueType ?? 'count',
-                                        label: chart.label,
-                                        showLegendInChart: chart.showLegendInChart
-                                    })
-                                }, "modal-col-1"),
-                                /*#__PURE__*/ jsxRuntime.jsx(core$1.Grid.Col, {
-                                    span: 6,
-                                    children: /*#__PURE__*/ jsxRuntime.jsx("div", {
-                                        className: "border-solid border-[1px] border-[var(--mantine-color-gray-3)] h-full p-1",
-                                        children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Table, {
-                                            withRowBorders: false,
-                                            classNames: {
-                                                table: '',
-                                                td: 'p-1 leading-3'
-                                            },
-                                            children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Table.Tbody, {
-                                                children: data.map((element, elIndex)=>/*#__PURE__*/ jsxRuntime.jsxs(core$1.Table.Tr, {
-                                                        children: [
-                                                            /*#__PURE__*/ jsxRuntime.jsxs(core$1.Table.Td, {
-                                                                children: [
-                                                                    /*#__PURE__*/ jsxRuntime.jsx(core$1.ColorSwatch, {
-                                                                        className: "inline-block mr-2 align-middle",
-                                                                        size: "1em",
-                                                                        radius: "xs",
-                                                                        color: chartColors?.[elIndex % chartColors.length] || ''
-                                                                    }),
-                                                                    element.key
-                                                                ]
-                                                            }),
-                                                            /*#__PURE__*/ jsxRuntime.jsx(core$1.Table.Td, {
-                                                                className: "text-right",
-                                                                children: element.count
-                                                            })
-                                                        ]
-                                                    }, elIndex))
-                                            })
-                                        })
-                                    })
-                                }, "modal-col-2")
-                            ]
-                        })
-                    }),
-                    /*#__PURE__*/ jsxRuntime.jsxs(core$1.Button, {
-                        variant: "subtle",
-                        onClick: openMoreRows,
-                        leftSection: /*#__PURE__*/ jsxRuntime.jsx(react.Icon, {
-                            icon: "gen3:open-in-modal",
-                            height: 24,
-                            width: 24,
-                            color: theme.colors.accent[5]
-                        }),
-                        className: "text-black hover:text-black",
-                        children: [
-                            data.length - MAX_LEGEND_ROWS,
-                            " more"
-                        ]
-                    })
-                ]
-            });
-        };
         const dataKeys = field in data && data?.[field].length > 0 ? Object.keys(data[field][0]) : [];
         const chartTitle = charts[field].title ?? core.fieldNameToTitle(field);
-        const moreThanMaxRows = data?.[field] && data[field].length > MAX_LEGEND_ROWS;
+        const numberOfDataItems = data?.[field] && data[field].length;
+        const moreThanMaxRows = numberOfDataItems > MAX_LEGEND_ROWS;
         return /*#__PURE__*/ jsxRuntime.jsx(core$1.Grid.Col, {
             span: spans[indexNum],
             children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Card, {
@@ -2750,7 +2759,7 @@ const Charts = ({ charts, data, counts, isSuccess, numCols = DEFAULT_COLS, style
                         label: charts[field].label,
                         showLegendInChart: charts[field].showLegendInChart
                     }),
-                    showLegends && /*#__PURE__*/ jsxRuntime.jsx(core$1.Card.Section, {
+                    numberOfDataItems > 0 && showLegends && /*#__PURE__*/ jsxRuntime.jsx(core$1.Card.Section, {
                         inheritPadding: true,
                         py: "xs",
                         withBorder: style === 'box',
@@ -2788,7 +2797,8 @@ const Charts = ({ charts, data, counts, isSuccess, numCols = DEFAULT_COLS, style
                         children: /*#__PURE__*/ jsxRuntime.jsx(LegendOverflow, {
                             chart: charts[field],
                             data: data[field],
-                            chartTitle: chartTitle
+                            chartTitle: chartTitle,
+                            counts: counts ?? 0
                         })
                     })
                 ]
@@ -2801,7 +2811,7 @@ const Charts = ({ charts, data, counts, isSuccess, numCols = DEFAULT_COLS, style
     });
 };
 
-const CollapsableCharts = ({ config, data })=>{
+const CollapsableCharts = ({ config, data, isError, isFetching, isSuccess })=>{
     const [showLegends, setShowLegends] = React.useState(config.showLegends?.enabled);
     if (!(config?.charts && Object.keys(config.charts).length > 0)) {
         return /*#__PURE__*/ jsxRuntime.jsx(core$1.Center, {
@@ -2853,7 +2863,7 @@ const CollapsableCharts = ({ config, data })=>{
                                 charts: config.charts,
                                 data: data,
                                 counts: 2,
-                                isSuccess: true,
+                                isSuccess: isSuccess,
                                 numCols: 4
                             })
                         })
@@ -3165,6 +3175,8 @@ const classifyFacets = (data, index, fieldMapping = [], facetDefinitionsFromConf
                 label: facetDef.label ?? facetName,
                 // assumption is that the initial data has the min and max values
                 sharedWithIndices: (sharedFieldMapping && fieldKey in sharedFieldMapping && sharedFieldMapping[fieldKey].filter((x)=>x.index !== index)) ?? undefined,
+                moveValuesToBottom: facetDef?.moveValuesToBottom,
+                excludeValues: facetDef?.excludeValues,
                 range: facetDef.range ?? type === 'range' ? {
                     minimum: Math.floor(Number(value[0].key[0])),
                     maximum: Math.ceil(Number(value[0].key[1]))
@@ -3343,6 +3355,22 @@ const convertToStringArray = (inputArray)=>inputArray.map(String);
  * @param {FacetSortType} facetSort - The facet sort type represented as a string in the format "type-direction".
  * @returns {SortType} - The mapped sort type object containing type and direction.
  */ const mapFacetSortToSortType = (facetSort)=>{
+    // Default fallback values
+    const defaultSort = {
+        type: 'value',
+        direction: 'dsc'
+    };
+    // Validate input
+    if (!facetSort) {
+        console.warn(`Invalid facetSort: expected string, got ${typeof facetSort}. Using default.`);
+        return defaultSort;
+    }
+    const parts = facetSort.split('-');
+    // Check if we have exactly 2 parts
+    if (parts.length !== 2) {
+        console.warn(`Invalid facetSort format: expected 'type-direction', got '${facetSort}'. Using default.`);
+        return defaultSort;
+    }
     const [type, direction] = facetSort.split('-');
     return {
         type: type === 'label' ? 'alpha' : 'value',
@@ -3820,7 +3848,7 @@ const OverflowTooltippedLabel = ({ children, label, className = 'flex-grow font-
     });
 };
 
-const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false, isFacetView = true, isSearching = false, showPercent = false, hideIfEmpty = false, showSorting = true, sort = 'value-dsc' })=>{
+const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false, isFacetView = true, isSearching = false, showPercent = false, hideIfEmpty = false, showSorting = true, sort = 'value-dsc', moveValuesToBottom = [], excludeValues = [] })=>{
     const [isGroupExpanded, setIsGroupExpanded] = React.useState(false);
     const cardRef = React.useRef(null);
     const searchInputRef = React.useRef(null);
@@ -3877,7 +3905,7 @@ const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false
             ];
             updateFacetEnum(field, updated, updateFacetFilters, clearFilters, combineMode);
         } else {
-            const updated = selectedEnums?.filter((x)=>x != value);
+            const updated = selectedEnums?.filter((x)=>x !== value);
             updateFacetEnum(field, updated ?? [], updateFacetFilters, clearFilters, combineMode);
         }
     };
@@ -3914,7 +3942,7 @@ const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false
     useDeepCompare.useDeepCompareEffect(()=>{
         if (isSuccess && data) {
             // get all the data except the missing and empty values
-            const tempFilteredData = Object.entries(data).filter((entry)=>entry[0] != '_missing' && entry[0] != '').filter((entry)=>searchTerm === '' ? entry : entry[0].toLowerCase().includes(searchTerm.toLowerCase().trim()));
+            const tempFilteredData = Object.entries(data).filter((entry)=>entry[0] !== '_missing' && entry[0] !== '').filter((entry)=>searchTerm === '' ? entry : entry[0].toLowerCase().includes(searchTerm.toLowerCase().trim()));
             // it is possible that the selected enums are not in the data as their counts are 0
             // therefore we need to add them to the data
             const selectedEnumNotInData = selectedEnums ? selectedEnums.reduce((acc, curr)=>{
@@ -3929,16 +3957,16 @@ const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false
             const remainingValues = tempFilteredData.length + selectedEnumNotInData.length - maxValuesToDisplay;
             const cardStyle = calcCardStyle(remainingValues);
             const numberOfBarsToDisplay = calcNumberOfBarsToDisplay(tempFilteredData.length + selectedEnumNotInData.length);
+            const allData = [
+                ...tempFilteredData,
+                ...selectedEnumNotInData
+            ];
+            // remove any enum in excludeValues
+            const filteredData = allData.filter((x)=>!excludeValues?.includes(x[0].toString()));
             setFacetChartData((prevFacetChartData)=>({
                     ...prevFacetChartData,
-                    filteredData: [
-                        ...tempFilteredData,
-                        ...selectedEnumNotInData
-                    ],
-                    filteredDataObj: Object.fromEntries([
-                        ...tempFilteredData,
-                        ...selectedEnumNotInData
-                    ]),
+                    filteredData: filteredData,
+                    filteredDataObj: Object.fromEntries(filteredData),
                     remainingValues,
                     numberOfBarsToDisplay,
                     isSuccess: true,
@@ -3964,8 +3992,9 @@ const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false
     useDeepCompare.useDeepCompareEffect(()=>{
         if (facetChartData.filteredData && facetChartData.filteredData.length > 0) {
             const obj = [
-                ...facetChartData.filteredData
-            ].sort(sortType.type === 'value' ? ([, a], [, b])=>sortType.direction === 'dsc' ? b - a : a - b : ([a], [b])=>sortType.direction === 'dsc' ? compareKeysDescending(a, b) : compareKeysAscending(a, b)).slice(0, !isGroupExpanded ? maxValuesToDisplay : undefined);
+                ...facetChartData.filteredData.filter((x)=>!moveValuesToBottom.includes(x[0].toString())).sort(sortType.type === 'value' ? ([, a], [, b])=>sortType.direction === 'dsc' ? b - a : a - b : ([a], [b])=>sortType.direction === 'dsc' ? compareKeysDescending(a, b) : compareKeysAscending(a, b)),
+                ...facetChartData.filteredData.filter((x)=>moveValuesToBottom.includes(x[0].toString()))
+            ].slice(0, !isGroupExpanded ? maxValuesToDisplay : undefined);
             setSortedData(obj);
             if (updateVisibleValues) updateVisibleValues(obj);
         }
@@ -4178,7 +4207,7 @@ const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false
     });
 };
 
-const EnumFacet = ({ field, hooks, valueLabel, description, facetName, showPercent = true, hideIfEmpty = true, showSearch = true, showFlip = false, showSettings = false, startShowingData = true, dismissCallback = undefined, width = undefined, sharedWithIndices = undefined, header = {
+const EnumFacet = ({ field, hooks, valueLabel, description, facetName, showPercent = true, hideIfEmpty = true, showSearch = true, showFlip = false, showSettings = false, startShowingData = true, dismissCallback = undefined, width = undefined, sharedWithIndices = undefined, moveValuesToBottom = [], excludeValues = [], header = {
     Panel: FacetHeader,
     Label: FacetText,
     iconStyle: controlsIconStyle
@@ -4229,7 +4258,9 @@ const EnumFacet = ({ field, hooks, valueLabel, description, facetName, showPerce
                     isFacetView: isFacetView,
                     isSearching: isSearching,
                     hideIfEmpty: hideIfEmpty,
-                    showPercent: showPercent
+                    showPercent: showPercent,
+                    moveValuesToBottom: moveValuesToBottom,
+                    excludeValues: excludeValues
                 })
             })
         ]
@@ -4628,7 +4659,9 @@ const createFacetCard = ({ facetDefinition, valueLabel, hooks: dataFunctions, fa
                 width: width,
                 hooks: dataFunctions,
                 showPercent: showPercent,
-                sharedWithIndices: facetDefinition?.sharedWithIndices
+                sharedWithIndices: facetDefinition?.sharedWithIndices,
+                moveValuesToBottom: facetDefinition?.moveValuesToBottom ?? [],
+                excludeValues: facetDefinition?.excludeValues ?? []
             }, `${idPrefix}-enum-${field}`),
             range: /*#__PURE__*/ jsxRuntime.jsx(RangeFacet, {
                 valueLabel: valueTypeLabel,
@@ -7536,6 +7569,20 @@ const TableIcons = {
         })
 };
 
+const CompareFn = (fieldValue, cmpOp, value)=>{
+    switch(cmpOp){
+        case 'alwaysTrue':
+            return true;
+        case 'arrayNotEmpty':
+            return Array.isArray(fieldValue) && fieldValue.length > 0;
+    }
+};
+const isSelectable = (row, config)=>{
+    if (!config) return false;
+    if (!Object.hasOwn(row.original, config.field)) return false;
+    const fieldValue = row.original[config.field];
+    return CompareFn(fieldValue, config.comparer, config.value);
+};
 const extractCellValue = (func)=>({ cell, row })=>func({
             value: cell.getValue(),
             cell,
@@ -7568,6 +7615,13 @@ const DiscoveryTable = ({ data, hits, dataRequestStatus, setSorting, setPaginati
     }, [
         config.studyColumns
     ]);
+    const checkIfRowIsSelectable = (row)=>{
+        if (config.tableConfig?.selectableRows) return true;
+        if (config.tableConfig?.selectableRowConfiguration) {
+            return isSelectable(row, config.tableConfig.selectableRowConfiguration);
+        }
+        return false;
+    };
     const table = mantineReactTable.useMantineReactTable({
         columns: cols,
         data: data ?? [],
@@ -7578,7 +7632,7 @@ const DiscoveryTable = ({ data, hits, dataRequestStatus, setSorting, setPaginati
             onPaginationChange: setPagination,
             onSortingChange: setSorting
         } : {},
-        enableRowSelection: config.tableConfig?.selectableRows ?? false,
+        enableRowSelection: checkIfRowIsSelectable,
         rowCount: hits,
         icons: TableIcons,
         enableTopToolbar: false,
@@ -8806,6 +8860,7 @@ const useSearchMetadata = ({ discoveryConfig, searchTerms, mdsData, isSuccess })
             uidField
         ],
         idField: uidField,
+        tokenize: (string, _fieldName)=>string.split(' '),
         extractField: extractValue,
         //  processTerm: (term) => suffixes(term, 3),
         searchOptions: {
@@ -9709,7 +9764,8 @@ registerDefaultDiscoveryDataLoaders();
                         }) : null,
                         discoveryConfig.features?.chartsSection?.enabled && /*#__PURE__*/ jsxRuntime.jsx(CollapsableCharts, {
                             config: discoveryConfig.features?.chartsSection,
-                            data: chartData
+                            data: chartData,
+                            isSuccess: dataRequestStatus.isSuccess
                         }),
                         /*#__PURE__*/ jsxRuntime.jsxs("div", {
                             className: "flex items-center p-2 mb-4 bg-base-max rounded-lg",
@@ -10139,6 +10195,23 @@ const RenderParagraphsCell = ({ value })=>{
             }, i))
     });
 };
+const RenderIfArrayHasData = ({ value })=>{
+    const content = value;
+    if (lodash.isArray(content) && content.length > 0) {
+        return /*#__PURE__*/ jsxRuntime.jsx(react.Icon, {
+            icon: "gen3:checked-filled",
+            height: 22,
+            width: 22,
+            className: "text-utility-success"
+        });
+    }
+    return /*#__PURE__*/ jsxRuntime.jsx(react.Icon, {
+        icon: "gen3:cancel-filled",
+        height: 22,
+        width: 22,
+        className: "text-utility-error"
+    });
+};
 // TODO Fix below
 // eslint-disable-next-line react/prop-types
 const DiscoveryRenderTagsCell = ({ value })=>{
@@ -10169,6 +10242,7 @@ const DiscoveryRenderTagsCell = ({ value })=>{
 const Gen3DiscoveryStandardCellRenderers = {
     array: {
         NegativePositive: RenderArrayCellNegativePositive$1,
+        HasData: RenderIfArrayHasData,
         default: RenderArrayCell$1
     },
     string: {
@@ -12618,10 +12692,22 @@ const EmptyData = {};
     const isXl = hooks.useMediaQuery('(min-width: 1600px)');
     const [accessLevel, setAccessLevel] = React.useState(core.Accessibility.ALL);
     const sharedFiltersMap = core.useCoreSelector((state)=>core.selectSharedFilters(state));
-    let numCols = 3;
-    if (isSm) numCols = 1;
-    if (isMd) numCols = 2;
-    if (isXl) numCols = 4;
+    const defaultDropdowns = React.useMemo(()=>dropdowns ?? {}, [
+        dropdowns
+    ]);
+    const defaultButtons = React.useMemo(()=>buttons ?? [], [
+        buttons
+    ]);
+    const numCols = React.useMemo(()=>{
+        if (isSm) return 1;
+        if (isMd) return 2;
+        if (isXl) return 4;
+        return 3;
+    }, [
+        isSm,
+        isMd,
+        isXl
+    ]);
     const index = guppyConfig.dataType;
     const fields = React.useMemo(()=>getAllFieldsFromFilterConfigs(filters?.tabs ?? []), [
         filters?.tabs
@@ -12635,14 +12721,20 @@ const EmptyData = {};
         filters: cohortFilters,
         accessibility: accessLevel
     });
-    const { data: chartData, isSuccess: isChartSuccess, isFetching: isChartFetching, isError: isChartError } = core.useGetAggsNoFilterSelfQuery({
-        type: index,
-        fields: [
+    const chartKeys = useDeepCompare.useDeepCompareMemo(()=>[
             ...Object.keys(chartsSection?.charts ?? {}),
             ...Object.keys(charts)
-        ],
+        ], [
+        chartsSection?.charts,
+        charts
+    ]);
+    const { data: chartData, isSuccess: isChartSuccess, isFetching: isChartFetching, isError: isChartError } = core.useGetAggsNoFilterSelfQuery({
+        type: index,
+        fields: chartKeys,
         filters: cohortFilters,
         accessibility: accessLevel
+    }, {
+        skip: chartKeys.length === 0
     });
     const getEnumFacetData = useDeepCompare.useDeepCompareCallback((field)=>{
         let filters = undefined;
@@ -12665,7 +12757,7 @@ const EmptyData = {};
             isSuccess: isSuccess
         };
     }, [
-        cohortFilters,
+        cohortFilters.root,
         data,
         isSuccess
     ]);
@@ -12814,8 +12906,8 @@ const EmptyData = {};
                                 className: "flex justify-between mb-2 ml-2",
                                 children: [
                                     /*#__PURE__*/ jsxRuntime.jsx(DownloadsPanel, {
-                                        dropdowns: dropdowns ?? {},
-                                        buttons: buttons ?? [],
+                                        dropdowns: defaultDropdowns,
+                                        buttons: defaultButtons,
                                         loginForDownload: loginForDownload,
                                         index: index,
                                         totalCount: counts ?? 0,
@@ -12834,7 +12926,8 @@ const EmptyData = {};
                                     ...chartsSection,
                                     charts: summaryCharts
                                 },
-                                data: chartData ?? EmptyData
+                                data: chartData ?? EmptyData,
+                                isSuccess: isChartSuccess
                             }) : /*#__PURE__*/ jsxRuntime.jsx(Charts, {
                                 charts: summaryCharts,
                                 data: chartData ?? EmptyData,
@@ -12888,6 +12981,9 @@ const TabsLayoutToComponentProp = (tabsLayout)=>{
 const CohortBuilder = ({ explorerConfig, sharedFiltersMap = null, tabsLayout = 'left' })=>{
     const dispatch = core.useCoreDispatch();
     dispatch(core.setSharedFilters(sharedFiltersMap ?? {}));
+    const configuration = useDeepCompare.useDeepCompareMemo(()=>explorerConfig, [
+        explorerConfig
+    ]);
     return /*#__PURE__*/ jsxRuntime.jsx("div", {
         className: "w-full",
         children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Tabs, {
@@ -12898,17 +12994,24 @@ const CohortBuilder = ({ explorerConfig, sharedFiltersMap = null, tabsLayout = '
                 /*#__PURE__*/ jsxRuntime.jsx(core$1.Tabs.List, {
                     className: "w-full",
                     justify: TabsLayoutToComponentProp(tabsLayout),
-                    children: explorerConfig.map((panelConfig)=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Tabs.Tab, {
+                    children: configuration.map((panelConfig)=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Tabs.Tab, {
                             value: panelConfig.tabTitle,
                             children: panelConfig.tabTitle
                         }, `${panelConfig.tabTitle}-tabList`))
                 }),
-                explorerConfig.map((panelConfig)=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Tabs.Panel, {
+                configuration.map((panelConfig)=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Tabs.Panel, {
                         value: panelConfig.tabTitle,
-                        children: /*#__PURE__*/ React.createElement(CohortPanel, {
-                            ...panelConfig,
-                            key: `${panelConfig.tabTitle}-CohortPanel`
-                        })
+                        children: /*#__PURE__*/ jsxRuntime.jsx(CohortPanel, {
+                            guppyConfig: panelConfig.guppyConfig,
+                            chartsSection: panelConfig?.chartsSection,
+                            filters: panelConfig.filters,
+                            tabTitle: panelConfig.tabTitle,
+                            table: panelConfig.table,
+                            dropdowns: panelConfig.dropdowns,
+                            buttons: panelConfig.buttons,
+                            loginForDownload: panelConfig.loginForDownload,
+                            sharedFiltersMap: panelConfig.sharedFiltersMap
+                        }, `${panelConfig.tabTitle}-CohortPanel`)
                     }, `${panelConfig.tabTitle}-tabPanel`))
             ]
         })
@@ -14023,47 +14126,25 @@ const Workspace = ({ config })=>{
 };
 
 const TextDescription = ({ description })=>{
-    const [extend, setExtend] = React.useState(false);
-    const textRef = React.useRef(null);
-    const [isClamped, setClamped] = React.useState(false);
-    React.useEffect(()=>{
-        // Function that should be called on window resize
-        function handleResize() {
-            if (textRef && textRef.current) {
-                setClamped(textRef.current.scrollHeight > textRef.current.clientHeight);
-            }
-        }
-        // Add event listener to window resize
-        window.addEventListener('resize', handleResize);
-        // Remove event listener on cleanup
-        return ()=>window.removeEventListener('resize', handleResize);
-    }, []); // Empty array ensures that it would only run on mount
-    return /*#__PURE__*/ jsxRuntime.jsxs(jsxRuntime.Fragment, {
-        children: [
-            !extend ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
-                ref: textRef,
-                size: "sm",
-                lineClamp: 4,
-                children: description
-            }) : /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
-                size: "sm",
-                children: description
-            }),
-            isClamped && /*#__PURE__*/ jsxRuntime.jsx("button", {
-                onClick: ()=>setExtend((extend)=>!extend),
-                children: /*#__PURE__*/ jsxRuntime.jsxs("div", {
-                    className: "flex text-xs font-semibold text-base-contrast-light",
-                    children: [
-                        !extend ? 'Extend Text' : 'Collapse Text',
-                        ' ',
-                        /*#__PURE__*/ jsxRuntime.jsx("div", {
-                            className: "my-auto",
-                            children: !extend ? /*#__PURE__*/ jsxRuntime.jsx(md.MdKeyboardArrowDown, {}) : /*#__PURE__*/ jsxRuntime.jsx(md.MdKeyboardArrowUp, {})
-                        })
-                    ]
+    return /*#__PURE__*/ jsxRuntime.jsx(core$1.Spoiler, {
+        maxHeight: 80,
+        showLabel: /*#__PURE__*/ jsxRuntime.jsxs("span", {
+            children: [
+                "Extend Text ",
+                /*#__PURE__*/ jsxRuntime.jsx(md.MdKeyboardArrowDown, {
+                    className: "inline"
                 })
-            })
-        ]
+            ]
+        }),
+        hideLabel: /*#__PURE__*/ jsxRuntime.jsxs("span", {
+            children: [
+                "Collapse Text ",
+                /*#__PURE__*/ jsxRuntime.jsx(md.MdKeyboardArrowUp, {
+                    className: "inline"
+                })
+            ]
+        }),
+        children: description
     });
 };
 
@@ -14071,20 +14152,22 @@ const AnalysisCard = ({ title, description, type, icon, image, hasDemo, loginReq
     return /*#__PURE__*/ jsxRuntime.jsxs(core$1.Stack, {
         align: "stretch",
         justify: "space-between",
-        className: "rounded-sm rounded-t-md bg-base-max p-0",
+        className: "rounded-sm rounded-t-md bg-base-max p-0 h-full",
         children: [
             /*#__PURE__*/ jsxRuntime.jsxs("div", {
-                className: "h-full",
+                className: "relative",
                 children: [
                     /*#__PURE__*/ jsxRuntime.jsx("div", {
-                        className: "p-0 rounded-sm h-1/2 h-max-1/2 flex justify-center items-center overflow-hidden",
-                        children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Image, {
-                            component: Image,
-                            src: `${image}`,
-                            alt: `${title} image`,
-                            height: 1000,
-                            width: 1000,
-                            radius: "md"
+                        className: "p-0 rounded-sm h-[200px] h-max-1/2 flex justify-center items-center relative overflow-hidden",
+                        children: /*#__PURE__*/ jsxRuntime.jsx("div", {
+                            children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Image, {
+                                component: Image,
+                                src: `${image}`,
+                                alt: "",
+                                radius: "md",
+                                width: 500,
+                                height: 500
+                            })
                         })
                     }),
                     /*#__PURE__*/ jsxRuntime.jsxs("div", {
@@ -14095,7 +14178,7 @@ const AnalysisCard = ({ title, description, type, icon, image, hasDemo, loginReq
                                 children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Image, {
                                     component: Image,
                                     src: `${icon}`,
-                                    alt: `${title} logo`,
+                                    alt: "",
                                     width: 40,
                                     height: 40,
                                     radius: "lg"
@@ -17139,7 +17222,7 @@ const registerCohortDiscoveryApp = ()=>core.createGen3AppWithOwnStore({
         App: CohortDiscovery,
         id: AppId$1,
         name: _APP_NAME$2,
-        version: 'v1.0.0',
+        version: _APP_VERSION$1,
         requiredEntityTypes: [],
         store: AppStore,
         context: AppContext
@@ -19331,45 +19414,44 @@ const registerMetadataSchemaApp = ()=>core.createGen3App({
         requiredEntityTypes: []
     });
 
-const DropdownWithIcon = ({ disableTargetWidth, LeftIcon, RightIcon = /*#__PURE__*/ jsxRuntime.jsx(io.IoMdArrowDropdown, {
-    size: "1.25em",
-    "aria-hidden": "true",
-    "data-testid": "dropdown-icon"
-}), TargetButtonChildren, targetButtonDisabled, dropdownElements, menuLabelText, menuLabelCustomClass, customPosition, fullHeight, zIndex = undefined, customDataTestId = undefined, tooltip = undefined, buttonAriaLabel = undefined })=>{
+const ADDITIONAL_DOWNLOAD_MESSAGE = 'A previous download is being processed. Additional downloads may be started.';
+const DropdownWithIcon = ({ disableTargetWidth, LeftSection, RightSection = /*#__PURE__*/ jsxRuntime.jsx("div", {
+    className: "border-l pl-1 -mr-2",
+    children: /*#__PURE__*/ jsxRuntime.jsx(io.IoMdArrowDropdown, {
+        size: "1.25em",
+        "aria-hidden": "true",
+        "data-testid": "dropdown-icon"
+    })
+}), TargetButtonChildren, targetButtonDisabled, dropdownElements, menuLabelText, menuLabelCustomClass, customPosition, fullHeight, zIndex = 900, customTargetButtonDataTestId = undefined, targetButtonTooltip = undefined, buttonAriaLabel = undefined, closeOnItemClick = true })=>{
+    const targetRef = React.useRef(null);
     return /*#__PURE__*/ jsxRuntime.jsxs(core$1.Menu, {
-        width: disableTargetWidth ?? 'target',
+        width: !disableTargetWidth ? 'target' : null,
         ...customPosition && {
             position: customPosition
         },
-        "data-testid": customDataTestId ?? 'menu-elem',
         zIndex: zIndex,
+        closeOnItemClick: closeOnItemClick,
         children: [
             /*#__PURE__*/ jsxRuntime.jsx(core$1.Menu.Target, {
-                children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
-                    variant: "outline",
-                    color: "primary",
-                    className: `bg-base-max border-primary data-disabled:opacity-50 data-disabled:bg-base-max data-disabled:text-primary ${focusStyles}`,
-                    ...LeftIcon && {
-                        leftIcon: LeftIcon
-                    },
-                    rightSection: RightIcon,
-                    disabled: targetButtonDisabled,
-                    classNames: {
-                        // rightIcon: 'border-l pl-1 -mr-2',
-                        root: fullHeight ? 'h-full' : undefined
-                    },
-                    "aria-label": buttonAriaLabel,
-                    children: /*#__PURE__*/ jsxRuntime.jsx("div", {
-                        children: tooltip?.length && !targetButtonDisabled ? /*#__PURE__*/ jsxRuntime.jsx("div", {
-                            children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
-                                label: tooltip,
-                                children: /*#__PURE__*/ jsxRuntime.jsx("div", {
-                                    children: TargetButtonChildren
-                                })
-                            })
-                        }) : /*#__PURE__*/ jsxRuntime.jsx("div", {
-                            children: TargetButtonChildren
-                        })
+                children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+                    label: targetButtonTooltip,
+                    disabled: !targetButtonTooltip,
+                    children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
+                        variant: "outline",
+                        color: "primary",
+                        className: `flex items-center bg-base-max border-primary data-disabled:opacity-50 data-disabled:bg-base-max data-disabled:text-primary ${focusStyles}`,
+                        ...LeftSection && {
+                            leftSection: LeftSection
+                        },
+                        rightSection: RightSection,
+                        disabled: targetButtonDisabled,
+                        classNames: {
+                            root: `${fullHeight ? 'h-full' : undefined}`
+                        },
+                        ref: targetRef,
+                        "aria-label": buttonAriaLabel,
+                        "data-testid": customTargetButtonDataTestId ?? 'menu-elem',
+                        children: TargetButtonChildren
                     })
                 })
             }),
@@ -19377,7 +19459,7 @@ const DropdownWithIcon = ({ disableTargetWidth, LeftIcon, RightIcon = /*#__PURE_
                 "data-testid": "dropdown-menu-options",
                 className: "border-1 border-secondary",
                 children: [
-                    menuLabelText && /*#__PURE__*/ jsxRuntime.jsxs(React.Fragment, {
+                    menuLabelText && /*#__PURE__*/ jsxRuntime.jsxs(jsxRuntime.Fragment, {
                         children: [
                             /*#__PURE__*/ jsxRuntime.jsx(core$1.Menu.Label, {
                                 className: menuLabelCustomClass ?? 'font-bold',
@@ -19387,15 +19469,37 @@ const DropdownWithIcon = ({ disableTargetWidth, LeftIcon, RightIcon = /*#__PURE_
                             /*#__PURE__*/ jsxRuntime.jsx(core$1.Menu.Divider, {})
                         ]
                     }),
-                    dropdownElements?.map(({ title, onClick, icon, disabled }, idx)=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Menu.Item, {
+                    dropdownElements.map(({ title, onClick, icon, disabled, isLoading, loadingTooltip }, idx)=>{
+                        const menuItem = /*#__PURE__*/ jsxRuntime.jsx(core$1.Menu.Item, {
                             onClick: ()=>{
-                                if (onClick) onClick();
+                                if (onClick) {
+                                    onClick();
+                                }
+                                // This is done inorder to set the last focused element as the menu target element
+                                // This is done to return focus to the target element if the modal is closed with ESC
+                                if (targetRef?.current) {
+                                    targetRef?.current?.focus();
+                                }
                             },
                             "data-testid": `${title}-${idx}`,
                             leftSection: icon && icon,
                             disabled: disabled,
                             children: title
-                        }, `${title}-${idx}`))
+                        }, `${title}-${idx}`);
+                        if (isLoading) {
+                            return /*#__PURE__*/ jsxRuntime.jsx(core$1.Tooltip, {
+                                label: loadingTooltip || ADDITIONAL_DOWNLOAD_MESSAGE,
+                                position: "right",
+                                withArrow: true,
+                                multiline: true,
+                                w: 400,
+                                children: /*#__PURE__*/ jsxRuntime.jsx("div", {
+                                    children: menuItem
+                                })
+                            }, `${title}-${idx}`);
+                        }
+                        return menuItem;
+                    })
                 ]
             })
         ]