@gen3/frontend 0.12.30 → 0.12.32

package/dist/pages/esm/{index-DkUVZQPS.js → index-Dy9pEhcC.js}

@@ -6276,6 +6276,7 @@ const OverflowTooltippedLabel = ({ children, label, className = 'flex-grow font-
 
 const QueryExpressionContext = /*#__PURE__*/ React__default.createContext({
     displayOnly: false,
+    fieldsAreFlat: true,
     cohortId: null,
     cohortName: 'default',
     shouldShowSummary: ()=>false,
@@ -6398,7 +6399,7 @@ const isNestedFilter = (x)=>{
 };
 const IncludeExcludeQueryElement = ({ index, field, path, operator, operands, displayOnly = false })=>{
     const [queryExpressionsExpanded, setQueryExpressionsExpanded] = useContext(QueryExpressionsExpandedContext);
-    const { cohortId: currentCohortId, useRemoveFilter, useUpdateFilters, shouldShowSummary } = useContext(QueryExpressionContext);
+    const { cohortId: currentCohortId, useRemoveFilter, useUpdateFilters, shouldShowSummary, fieldsAreFlat } = useContext(QueryExpressionContext);
     const removeCohortFilter = useRemoveFilter();
     const updateCohortFilter = useUpdateFilters();
     useDeepCompareEffect(()=>{
@@ -6509,7 +6510,11 @@ const IncludeExcludeQueryElement = ({ index, field, path, operator, operands, di
                                     });
                                     removeCohortFilter(index, fieldToUpdate);
                                 } else {
-                                    updateCohortFilter(index, fieldToUpdate, buildNestedFilterForOperation(fieldToUpdate, {
+                                    updateCohortFilter(index, fieldToUpdate, fieldsAreFlat ? {
+                                        operator: operator,
+                                        field: field,
+                                        operands: newOperands
+                                    } : buildNestedFilterForOperation(fieldToUpdate, {
                                         operator: operator,
                                         field: field,
                                         operands: newOperands
@@ -7082,7 +7087,7 @@ const reducer = (state, action)=>{
             }
     }
 };
-const QueryExpressionSection = ({ index, showImportExport = false, displayOnly = false, showTitle = true })=>{
+const QueryExpressionSection = ({ index, showImportExport = false, displayOnly = false, showTitle = true, fieldsAreFlat = true })=>{
     const [expandedState, setExpandedState] = useReducer(reducer, {});
     const [filtersSectionCollapsed, setFiltersSectionCollapsed] = useState(true);
     const filtersRef = useRef(null);
@@ -7855,19 +7860,24 @@ class DiscoveryCellRendererFactory {
 };
 
 const DiscoveryContext = /*#__PURE__*/ createContext({
-    discoveryConfig: {}
+    discoveryConfig: {},
+    selectedTags: {},
+    setSelectedTags: ()=>{}
 });
 const useDiscoveryContext = ()=>{
     const context = React__default.useContext(DiscoveryContext);
     if (context === undefined) {
-        throw Error('Discovery must be used must be used inside of a DiscoveryContext');
+        throw new Error('Discovery must be used inside of a DiscoveryContext');
     }
     return context;
 };
 const DiscoveryProvider = ({ children, discoveryIndexConfig })=>{
+    const [selectedTags, setSelectedTags] = useState({});
     return /*#__PURE__*/ jsx(DiscoveryContext.Provider, {
         value: {
-            discoveryConfig: discoveryIndexConfig
+            discoveryConfig: discoveryIndexConfig,
+            selectedTags,
+            setSelectedTags
         },
         children: children
     });
@@ -8714,17 +8724,71 @@ const HighlightSearchTerm = (value, searchTerm)=>{
     });
 };
 
-const RowDetailPanel = ({ row, config, searchTerm })=>{
+const RowDetailPanelTags = ({ rowTags })=>{
+    const { discoveryConfig: config, selectedTags, setSelectedTags } = useDiscoveryContext();
+    return /*#__PURE__*/ jsx("div", {
+        className: "flex mt-2",
+        children: rowTags.map((tag)=>{
+            const { color, display, label } = getTagInfo(tag, config.tags);
+            if (!display) return null;
+            const active = Object.keys(selectedTags).includes(tag.name);
+            const handleChange = (e)=>{
+                e.stopPropagation();
+                if (active) {
+                    // If already active, remove the tag
+                    setSelectedTags((prevTags)=>{
+                        const { [tag.name]: _, ...newTags } = prevTags;
+                        return newTags;
+                    });
+                } else {
+                    // Otherwise add the tag
+                    setSelectedTags((prevObj)=>({
+                            ...prevObj,
+                            [tag.name]: true
+                        }));
+                }
+            };
+            return /*#__PURE__*/ jsx(Badge, {
+                className: "mr-2 mt-2 cursor-pointer",
+                onClick: (e)=>{
+                    handleChange(e);
+                },
+                role: "button",
+                size: "lg",
+                radius: "sm",
+                variant: "filled",
+                tabIndex: 0,
+                "aria-label": tag.name,
+                style: {
+                    backgroundColor: active ? color : 'transparent',
+                    borderColor: color,
+                    color: active ? '#fff' : 'inherit'
+                },
+                children: label
+            }, tag.name);
+        })
+    });
+};
+
+const RowDetailPanel = ({ row, searchTerm })=>{
+    const { discoveryConfig: config } = useDiscoveryContext();
     if (config.studyPreviewField) {
         const studyPreviewData = _.get(row.original, config.studyPreviewField.field);
-        return /*#__PURE__*/ jsx(Box, {
-            display: 'flex',
-            w: '100%',
-            children: /*#__PURE__*/ jsx(Text, {
-                size: "xs",
-                lineClamp: 2,
-                children: HighlightSearchTerm(studyPreviewData, searchTerm)
-            })
+        return /*#__PURE__*/ jsxs(Fragment, {
+            children: [
+                /*#__PURE__*/ jsx(Box, {
+                    display: 'flex',
+                    w: '100%',
+                    children: /*#__PURE__*/ jsx(Text, {
+                        size: "xs",
+                        lineClamp: 2,
+                        children: HighlightSearchTerm(studyPreviewData, searchTerm)
+                    })
+                }),
+                /*#__PURE__*/ jsx(RowDetailPanelTags, {
+                    rowTags: row.original.tags
+                })
+            ]
         });
     } else {
         return undefined;
@@ -8821,7 +8885,6 @@ const DiscoveryTable = ({ data, hits, dataRequestStatus, setSorting, setPaginati
         getRowId: (originalRow)=>config?.minimalFieldMapping?.uid && config.minimalFieldMapping.uid in originalRow ? originalRow[config.minimalFieldMapping.uid] : originalRow?.id ?? undefined,
         renderDetailPanel: ({ row })=>/*#__PURE__*/ jsx(RowDetailPanel, {
                 row: row,
-                config: config,
                 searchTerm: searchTerm
             }),
         onRowSelectionChange: setRowSelection,
@@ -12087,47 +12150,44 @@ const renderMultiSelectOption = ({ option }, highlightColor, containerSelections
         })
     });
 };
-const MultiSelectContainer = ({ category, selectedTags, setSelectedTags })=>{
+const MultiSelectContainer = ({ category })=>{
+    const { discoveryConfig: discoveryConfig, selectedTags, setSelectedTags } = useDiscoveryContext();
     const containerData = category.tags.map((tag)=>({
             value: tag,
             label: tag
         }));
     const [containerSelections, setContainerSelections] = useState([]);
+    const prevSelectionsRef = useRef([]);
     useEffect(()=>{
         const updatedSelections = Object.keys(selectedTags).filter((tag)=>selectedTags[tag]);
         const selectedItemsThatExistInContainer = updatedSelections.filter((item)=>category.tags.includes(item));
         setContainerSelections(selectedItemsThatExistInContainer);
+        prevSelectionsRef.current = selectedItemsThatExistInContainer;
     }, [
         selectedTags
     ]);
-    const [previousContainerValues, setPreviousContainerValues] = useState([]);
-    const handleChange = (category, value)=>{
-        setPreviousContainerValues(value);
-        setSelectedTags((prevTags)=>{
-            // Create a copy of the previous tags
-            const updatedTags = {
-                ...prevTags
+    const handleChange = (value)=>{
+        const previousValues = prevSelectionsRef.current;
+        const removedTags = previousValues.filter((tag)=>!value.includes(tag));
+        const addedTags = value.filter((tag)=>!previousValues.includes(tag));
+        setSelectedTags((prev)=>{
+            const updated = {
+                ...prev
             };
-            if (previousContainerValues.length > value.length) {
-                // Need to remove tags since the update removes tags
-                const valuesToBeRemoved = previousContainerValues.filter((curr)=>!value.includes(curr));
-                valuesToBeRemoved.forEach((valueToBeRemoved)=>delete updatedTags[valueToBeRemoved]);
-            } else {
-                // Need to add tags
-                _.forEach(value, (tag)=>{
-                    if (!updatedTags[tag]) {
-                        updatedTags[tag] = true;
-                    }
-                });
-            }
-            return updatedTags; // Update state with the new tags
+            removedTags.forEach((tag)=>delete updated[tag]);
+            addedTags.forEach((tag)=>{
+                updated[tag] = true;
+            });
+            return updated;
         });
+        setContainerSelections(value);
+        prevSelectionsRef.current = value;
     };
     return /*#__PURE__*/ jsx("div", {
         children: /*#__PURE__*/ jsx(MultiSelect, {
             placeholder: category.categoryDisplayName,
             value: containerSelections,
-            onChange: (value)=>handleChange(category.categoryDisplayName, value),
+            onChange: (value)=>handleChange(value),
             clearable: true,
             searchable: true,
             data: containerData,
@@ -12141,20 +12201,16 @@ const MultiSelectContainer = ({ category, selectedTags, setSelectedTags })=>{
         })
     }, category.categoryDisplayName?.toString());
 };
-const DiscoveryDropdownTagViewer = ({ tagCategoryData, selectedTags, setSelectedTags })=>{
+const DiscoveryDropdownTagViewer = ({ tagCategoryData })=>{
     if (!tagCategoryData || tagCategoryData?.length === 0) return null;
     return /*#__PURE__*/ jsx("div", {
-        children: /*#__PURE__*/ jsx("div", {
-            className: `grid sm:grid-cols-1
+        className: `grid sm:grid-cols-1
           ${tagCategoryData.length > 1 && ' md:grid-cols-2 gap-4'}`,
-            children: tagCategoryData.map((category, i)=>/*#__PURE__*/ jsx("div", {
-                    children: /*#__PURE__*/ jsx(MultiSelectContainer, {
-                        category: category,
-                        selectedTags: selectedTags,
-                        setSelectedTags: setSelectedTags
-                    })
-                }, i))
-        })
+        children: tagCategoryData.map((category, i)=>/*#__PURE__*/ jsx("div", {
+                children: /*#__PURE__*/ jsx(MultiSelectContainer, {
+                    category: category
+                })
+            }, i))
     });
 };
 
@@ -12170,7 +12226,8 @@ const DiscoveryDropdownTagViewer = ({ tagCategoryData, selectedTags, setSelected
  * @param {JSX.Element} props.indexSelector - React component for selecting an index in the discovery panel.
  *
  * @return {JSX.Element} A fully featured discovery interface including search functionality, a table, charts, filters, and more.
- */ const DiscoveryIndexPanel = ({ discoveryConfig, indexSelector })=>{
+ */ const DiscoveryIndexPanel = ({ indexSelector })=>{
+    const { discoveryConfig: discoveryConfig, selectedTags, setSelectedTags } = useDiscoveryContext();
     const dataHook = useMemo(()=>getDiscoveryDataLoader(discoveryConfig?.features?.dataLoader?.dataFetchFunction) ?? useLoadAllMDSData, [
         discoveryConfig?.features?.dataLoader?.dataFetchFunction
     ]);
@@ -12183,7 +12240,6 @@ const DiscoveryDropdownTagViewer = ({ tagCategoryData, selectedTags, setSelected
     const [debouncedSearchBarTerms] = useDebouncedValue(searchBarTerms, DEBOUNCE_DELAY_TIME);
     const [selections, setSelections] = useState([]); // table selections
     const [sorting, setSorting] = useState([]);
-    const [selectedTags, setSelectedTags] = useState({});
     const [advancedSearchTerms, setAdvancedSearchTerms] = useState({
         operation: SearchCombination.and,
         filters: {}
@@ -12231,153 +12287,148 @@ const DiscoveryDropdownTagViewer = ({ tagCategoryData, selectedTags, setSelected
     const enableSearchableTags = discoveryConfig?.features?.search?.tagSearchDropdown?.enabled;
     return /*#__PURE__*/ jsx("div", {
         className: "flex flex-col items-center p-4 w-full bg-base-lightest",
-        children: /*#__PURE__*/ jsx(DiscoveryProvider, {
-            discoveryIndexConfig: discoveryConfig,
-            children: /*#__PURE__*/ jsx(StudyProvider, {
-                children: /*#__PURE__*/ jsxs("div", {
-                    className: "w-full",
-                    children: [
-                        discoveryConfig.features?.pageTitle && discoveryConfig?.features?.pageTitle.enabled ? /*#__PURE__*/ jsx(Text, {
-                            size: "xl",
-                            children: discoveryConfig?.features?.pageTitle.text
-                        }) : null,
-                        discoveryConfig.features?.chartsSection?.enabled && /*#__PURE__*/ jsx(CollapsableCharts, {
-                            config: discoveryConfig.features?.chartsSection,
-                            data: chartData,
-                            isSuccess: dataRequestStatus.isSuccess
-                        }),
-                        /*#__PURE__*/ jsxs("div", {
-                            className: "flex items-center p-2 mb-4 bg-base-max rounded-lg",
-                            children: [
-                                indexSelector,
-                                /*#__PURE__*/ jsx(SummaryStatisticPanel, {
-                                    summaries: summaryStatistics
-                                }),
-                                enableSearchBar && /*#__PURE__*/ jsxs("div", {
-                                    className: "w-3/4 flex flex-col",
-                                    children: [
-                                        /*#__PURE__*/ jsxs(Grid, {
-                                            children: [
-                                                /*#__PURE__*/ jsx(Grid.Col, {
-                                                    span: {
-                                                        md: enableSearchableTags ? 7 : 10,
-                                                        sm: 12
-                                                    },
-                                                    children: /*#__PURE__*/ jsx(SearchInputWithSuggestions, {
-                                                        searchBarTerms: searchBarTerms,
-                                                        setSearchBarTerms: setSearchBarTerms,
-                                                        suggestions: suggestions,
-                                                        clearSearch: ()=>{
-                                                            setSearchBarTerms([]);
-                                                        },
-                                                        searchChanged: (v)=>setSearchBarTerms(v.split(' ')),
-                                                        placeholder: discoveryConfig?.features?.search?.searchBar?.placeholder ?? 'Search...',
-                                                        label: discoveryConfig?.features?.search?.searchBar?.inputSubtitle
-                                                    })
-                                                }),
-                                                enableSearchableTags && /*#__PURE__*/ jsxs(Grid.Col, {
-                                                    span: {
-                                                        sm: 12,
-                                                        md: 5
+        children: /*#__PURE__*/ jsx(StudyProvider, {
+            children: /*#__PURE__*/ jsxs("div", {
+                className: "w-full",
+                children: [
+                    discoveryConfig.features?.pageTitle && discoveryConfig?.features?.pageTitle.enabled ? /*#__PURE__*/ jsx(Text, {
+                        size: "xl",
+                        children: discoveryConfig?.features?.pageTitle.text
+                    }) : null,
+                    discoveryConfig.features?.chartsSection?.enabled && /*#__PURE__*/ jsx(CollapsableCharts, {
+                        config: discoveryConfig.features?.chartsSection,
+                        data: chartData,
+                        isSuccess: dataRequestStatus.isSuccess
+                    }),
+                    /*#__PURE__*/ jsxs("div", {
+                        className: "flex items-center p-2 mb-4 bg-base-max rounded-lg",
+                        children: [
+                            indexSelector,
+                            /*#__PURE__*/ jsx(SummaryStatisticPanel, {
+                                summaries: summaryStatistics
+                            }),
+                            enableSearchBar && /*#__PURE__*/ jsxs("div", {
+                                className: "w-3/4 flex flex-col",
+                                children: [
+                                    /*#__PURE__*/ jsxs(Grid, {
+                                        children: [
+                                            /*#__PURE__*/ jsx(Grid.Col, {
+                                                span: {
+                                                    md: enableSearchableTags ? 7 : 10,
+                                                    sm: 12
+                                                },
+                                                children: /*#__PURE__*/ jsx(SearchInputWithSuggestions, {
+                                                    searchBarTerms: searchBarTerms,
+                                                    setSearchBarTerms: setSearchBarTerms,
+                                                    suggestions: suggestions,
+                                                    clearSearch: ()=>{
+                                                        setSearchBarTerms([]);
                                                     },
-                                                    className: "md:mt-5 sm:mt-1",
-                                                    children: [
-                                                        /*#__PURE__*/ jsx(Button, {
-                                                            onClick: ()=>setSelectedTags({}),
-                                                            variant: "outline",
-                                                            leftSection: /*#__PURE__*/ jsx(IoIosRefresh, {}),
-                                                            className: Object.keys(selectedTags).length === 0 ? 'border-gray-400 mr-1 mt-1' : 'mr-1  mt-1',
-                                                            "data-disabled": Object.keys(selectedTags).length === 0,
-                                                            children: "Reset"
-                                                        }),
-                                                        /*#__PURE__*/ jsx(Button, {
-                                                            className: "mt-1",
-                                                            onClick: ()=>setIsDropdownTagViewerOpen((prev)=>!prev),
-                                                            disabled: data.length === 0,
-                                                            variant: "outline",
-                                                            leftSection: isDropdownTagViewerOpen ? /*#__PURE__*/ jsx(IoIosArrowUp, {}) : /*#__PURE__*/ jsx(IoIosArrowDown, {}),
-                                                            children: `${discoveryConfig?.features?.search?.tagSearchDropdown?.collapsibleButtonText || 'Tag Panel'}`
-                                                        })
-                                                    ]
+                                                    searchChanged: (v)=>setSearchBarTerms(v.split(' ')),
+                                                    placeholder: discoveryConfig?.features?.search?.searchBar?.placeholder ?? 'Search...',
+                                                    label: discoveryConfig?.features?.search?.searchBar?.inputSubtitle
                                                 })
-                                            ]
-                                        }),
-                                        /*#__PURE__*/ jsx(SearchInputSelectableFields, {
-                                            searchMode: searchMode,
-                                            setSearchMode: setSearchMode,
-                                            searchableTextFields: discoveryConfig?.features?.search?.searchBar?.searchableTextFields,
-                                            searchableAndSelectableTextFields: discoveryConfig?.features?.search?.searchBar?.searchableAndSelectableTextFields,
-                                            setSelectedFieldsForSearchIndexing: setSelectedFieldsForSearchIndexing
-                                        }),
-                                        /*#__PURE__*/ jsx("div", {
-                                            ref: tagViewerContentRef,
-                                            className: `transition-all duration-300 ease-in-out mt-2 ${isDropdownTagViewerOpen ? 'max-h-screen opacity-100' : 'max-h-0 opacity-0'} overflow-hidden`,
-                                            style: {
-                                                height: isDropdownTagViewerOpen && tagViewerContentRef.current ? `${tagViewerContentRef.current.scrollHeight}px` : '0px'
-                                            },
-                                            children: /*#__PURE__*/ jsx(DiscoveryDropdownTagViewer, {
-                                                tagCategoryData: tagCategoryData,
-                                                selectedTags: selectedTags,
-                                                setSelectedTags: setSelectedTags
+                                            }),
+                                            enableSearchableTags && /*#__PURE__*/ jsxs(Grid.Col, {
+                                                span: {
+                                                    sm: 12,
+                                                    md: 5
+                                                },
+                                                className: "md:mt-5 sm:mt-1",
+                                                children: [
+                                                    /*#__PURE__*/ jsx(Button, {
+                                                        onClick: ()=>setSelectedTags({}),
+                                                        variant: "outline",
+                                                        leftSection: /*#__PURE__*/ jsx(IoIosRefresh, {}),
+                                                        className: Object.keys(selectedTags).length === 0 ? 'border-gray-400 mr-1 mt-1' : 'mr-1  mt-1',
+                                                        "data-disabled": Object.keys(selectedTags).length === 0,
+                                                        children: "Reset"
+                                                    }),
+                                                    /*#__PURE__*/ jsx(Button, {
+                                                        className: "mt-1",
+                                                        onClick: ()=>setIsDropdownTagViewerOpen((prev)=>!prev),
+                                                        disabled: data.length === 0,
+                                                        variant: "outline",
+                                                        leftSection: isDropdownTagViewerOpen ? /*#__PURE__*/ jsx(IoIosArrowUp, {}) : /*#__PURE__*/ jsx(IoIosArrowDown, {}),
+                                                        children: `${discoveryConfig?.features?.search?.tagSearchDropdown?.collapsibleButtonText || 'Tag Panel'}`
+                                                    })
+                                                ]
                                             })
+                                        ]
+                                    }),
+                                    /*#__PURE__*/ jsx(SearchInputSelectableFields, {
+                                        searchMode: searchMode,
+                                        setSearchMode: setSearchMode,
+                                        searchableTextFields: discoveryConfig?.features?.search?.searchBar?.searchableTextFields,
+                                        searchableAndSelectableTextFields: discoveryConfig?.features?.search?.searchBar?.searchableAndSelectableTextFields,
+                                        setSelectedFieldsForSearchIndexing: setSelectedFieldsForSearchIndexing
+                                    }),
+                                    /*#__PURE__*/ jsx("div", {
+                                        ref: tagViewerContentRef,
+                                        className: `transition-all duration-300 ease-in-out mt-2 ${isDropdownTagViewerOpen ? 'max-h-screen opacity-100' : 'max-h-0 opacity-0'} overflow-hidden`,
+                                        style: {
+                                            height: isDropdownTagViewerOpen && tagViewerContentRef.current ? `${tagViewerContentRef.current.scrollHeight}px` : '0px'
+                                        },
+                                        children: /*#__PURE__*/ jsx(DiscoveryDropdownTagViewer, {
+                                            tagCategoryData: tagCategoryData
                                         })
-                                    ]
-                                })
-                            ]
-                        }),
-                        discoveryConfig?.features?.aiSearch && /*#__PURE__*/ jsx("div", {
-                            className: "mb-4",
-                            children: /*#__PURE__*/ jsx("div", {
-                                className: "flex w-full bg-base-max p-4 rounded-lg",
-                                children: /*#__PURE__*/ jsx(AiSearch, {})
-                            })
-                        }),
-                        /*#__PURE__*/ jsxs("div", {
-                            className: "flex flex-row",
-                            children: [
-                                discoveryConfig?.features?.advSearchFilters?.enabled ? /*#__PURE__*/ jsx(Button, {
-                                    onClick: toggleAdvancedSearch,
-                                    color: "accent",
-                                    children: "Filters"
-                                }) : false,
-                                discoveryConfig?.features?.exportFromDiscovery?.enabled ? /*#__PURE__*/ jsx(ActionBar, {
-                                    buttons: discoveryConfig.features.exportFromDiscovery.buttons,
-                                    exportDataFields: discoveryConfig.features.exportFromDiscovery.exportDataFields,
-                                    selectedResources: selectedRecords,
-                                    verifyExternalLogins: discoveryConfig.features.exportFromDiscovery.verifyExternalLogins,
-                                    dataLibraryStoreMode: discoveryConfig.features.exportFromDiscovery.dataLibraryStoreMode
-                                }) : null
-                            ]
-                        }),
-                        /*#__PURE__*/ jsxs("div", {
-                            className: "flex justify-start",
-                            children: [
-                                discoveryConfig?.features?.advSearchFilters?.enabled ? /*#__PURE__*/ jsx(AdvancedSearchPanel, {
-                                    advSearchFilters: advancedSearchFilterValues,
-                                    opened: showAdvancedSearch,
-                                    setAdvancedSearchFilters: setAdvancedSearchTerms
-                                }) : false,
-                                /*#__PURE__*/ jsx("div", {
-                                    className: "flex w-full grow-0 bg-base-max border-1 border-base-lighter p-4 rounded-md",
-                                    ref: parentDivRef,
-                                    children: /*#__PURE__*/ jsx(DiscoveryTable, {
-                                        data: data,
-                                        hits: hits,
-                                        dataRequestStatus: dataRequestStatus,
-                                        setPagination: setPagination,
-                                        setSorting: setSorting,
-                                        setSelection: setSelections,
-                                        pagination: pagination,
-                                        sorting: sorting,
-                                        searchTerm: debouncedSearchBarTerms.join(' '),
-                                        selectedFieldsForSearchIndexing: selectedFieldsForSearchIndexing,
-                                        discoveryConfig: discoveryConfig
                                     })
-                                })
-                            ]
+                                ]
+                            })
+                        ]
+                    }),
+                    discoveryConfig?.features?.aiSearch && /*#__PURE__*/ jsx("div", {
+                        className: "mb-4",
+                        children: /*#__PURE__*/ jsx("div", {
+                            className: "flex w-full bg-base-max p-4 rounded-lg",
+                            children: /*#__PURE__*/ jsx(AiSearch, {})
                         })
-                    ]
-                })
+                    }),
+                    /*#__PURE__*/ jsxs("div", {
+                        className: "flex flex-row",
+                        children: [
+                            discoveryConfig?.features?.advSearchFilters?.enabled ? /*#__PURE__*/ jsx(Button, {
+                                onClick: toggleAdvancedSearch,
+                                color: "accent",
+                                children: "Filters"
+                            }) : false,
+                            discoveryConfig?.features?.exportFromDiscovery?.enabled ? /*#__PURE__*/ jsx(ActionBar, {
+                                buttons: discoveryConfig.features.exportFromDiscovery.buttons,
+                                exportDataFields: discoveryConfig.features.exportFromDiscovery.exportDataFields,
+                                selectedResources: selectedRecords,
+                                verifyExternalLogins: discoveryConfig.features.exportFromDiscovery.verifyExternalLogins,
+                                dataLibraryStoreMode: discoveryConfig.features.exportFromDiscovery.dataLibraryStoreMode
+                            }) : null
+                        ]
+                    }),
+                    /*#__PURE__*/ jsxs("div", {
+                        className: "flex justify-start",
+                        children: [
+                            discoveryConfig?.features?.advSearchFilters?.enabled ? /*#__PURE__*/ jsx(AdvancedSearchPanel, {
+                                advSearchFilters: advancedSearchFilterValues,
+                                opened: showAdvancedSearch,
+                                setAdvancedSearchFilters: setAdvancedSearchTerms
+                            }) : false,
+                            /*#__PURE__*/ jsx("div", {
+                                className: "flex w-full grow-0 bg-base-max border-1 border-base-lighter p-4 rounded-md",
+                                ref: parentDivRef,
+                                children: /*#__PURE__*/ jsx(DiscoveryTable, {
+                                    data: data,
+                                    hits: hits,
+                                    dataRequestStatus: dataRequestStatus,
+                                    setPagination: setPagination,
+                                    setSorting: setSorting,
+                                    setSelection: setSelections,
+                                    pagination: pagination,
+                                    sorting: sorting,
+                                    searchTerm: debouncedSearchBarTerms.join(' '),
+                                    selectedFieldsForSearchIndexing: selectedFieldsForSearchIndexing,
+                                    discoveryConfig: discoveryConfig
+                                })
+                            })
+                        ]
+                    })
+                ]
             })
         })
     });
@@ -12423,42 +12474,46 @@ const Discovery = ({ discoveryConfig })=>{
     }
     if (menuItems.length === 1) {
         // no need for tabs
-        return /*#__PURE__*/ jsx(DiscoveryIndexPanel, {
-            discoveryConfig: discoveryConfig.metadataConfig[0],
-            indexSelector: null
+        return /*#__PURE__*/ jsx(DiscoveryProvider, {
+            discoveryIndexConfig: discoveryConfig.metadataConfig[0],
+            children: /*#__PURE__*/ jsx(DiscoveryIndexPanel, {
+                indexSelector: null
+            })
         });
     }
-    return /*#__PURE__*/ jsx("div", {
-        className: "flex flex-col items-center p-4 w-full bg-base-lightest",
-        children: /*#__PURE__*/ jsxs(Tabs, {
-            className: "w-full",
-            defaultValue: metadataIndex,
-            variant: discoveryConfig.metadataConfig[0]?.tabType,
-            onChange: (v)=>{
-                setMetadataIndex(v ?? '0');
-            },
-            children: [
-                /*#__PURE__*/ jsx(Tabs.List, {
-                    children: menuItems.map((item)=>/*#__PURE__*/ jsx(Tabs.Tab, {
+    return /*#__PURE__*/ jsx(DiscoveryProvider, {
+        discoveryIndexConfig: discoveryConfig.metadataConfig[0],
+        children: /*#__PURE__*/ jsx("div", {
+            className: "flex flex-col items-center p-4 w-full bg-base-lightest",
+            children: /*#__PURE__*/ jsxs(Tabs, {
+                className: "w-full",
+                defaultValue: metadataIndex,
+                variant: discoveryConfig.metadataConfig[0]?.tabType,
+                onChange: (v)=>{
+                    setMetadataIndex(v ?? '0');
+                },
+                children: [
+                    /*#__PURE__*/ jsx(Tabs.List, {
+                        children: menuItems.map((item)=>/*#__PURE__*/ jsx(Tabs.Tab, {
+                                value: item.value,
+                                children: item.label
+                            }, item.value))
+                    }),
+                    menuItems.map((item, i)=>/*#__PURE__*/ jsx(Tabs.Panel, {
                             value: item.value,
-                            children: item.label
+                            children: /*#__PURE__*/ jsx(DiscoveryIndexPanel, {
+                                indexSelector: menuItems.length < 0 ? /*#__PURE__*/ jsx(Select, {
+                                    label: "Metadata:",
+                                    data: menuItems,
+                                    value: metadataIndex,
+                                    onChange: (v)=>{
+                                        setMetadataIndex(v ?? '0');
+                                    }
+                                }) : null
+                            })
                         }, item.value))
-                }),
-                menuItems.map((item, i)=>/*#__PURE__*/ jsx(Tabs.Panel, {
-                        value: item.value,
-                        children: /*#__PURE__*/ jsx(DiscoveryIndexPanel, {
-                            discoveryConfig: discoveryConfig.metadataConfig[Number.parseInt(item.value)],
-                            indexSelector: menuItems.length < 0 ? /*#__PURE__*/ jsx(Select, {
-                                label: "Metadata:",
-                                data: menuItems,
-                                value: metadataIndex,
-                                onChange: (v)=>{
-                                    setMetadataIndex(v ?? '0');
-                                }
-                            }) : null
-                        })
-                    }, item.value))
-            ]
+                ]
+            })
         })
     });
 };
@@ -17409,7 +17464,7 @@ const SUMMARY_THRESHOLD = 10;
  */ const DefaultShouldShowSummary = (field, count)=>{
     return count > SUMMARY_THRESHOLD;
 };
-const QueryExpression = ({ index, shouldShowSummary = DefaultShouldShowSummary, hooks })=>{
+const QueryExpression = ({ index, shouldShowSummary = DefaultShouldShowSummary, hooks, fieldsAreFlat = true })=>{
     const currentCohortId = useCoreSelector((state)=>selectCurrentCohortId(state));
     const currentCohortName = useCoreSelector((state)=>selectCurrentCohortName(state));
     return /*#__PURE__*/ jsx(QueryExpressionContext.Provider, {
@@ -17417,6 +17472,7 @@ const QueryExpression = ({ index, shouldShowSummary = DefaultShouldShowSummary,
             cohortName: currentCohortName,
             cohortId: currentCohortId,
             displayOnly: false,
+            fieldsAreFlat: fieldsAreFlat,
             shouldShowSummary: shouldShowSummary,
             useClearCohortFilters: ()=>{
                 const dispatch = useCoreDispatch();
@@ -17619,7 +17675,7 @@ const getActiveTab = (router)=>{
     else if (typeof activeTab === 'object') return activeTab[0];
     return undefined;
 };
-const CohortBuilder = dynamic(()=>import('./CohortBuilder-BFRGbSQX.js'), {
+const CohortBuilder = dynamic(()=>import('./CohortBuilder-DAIbe43z.js'), {
     ssr: false
 });
 const ExplorerPage = ({ headerProps, footerProps, explorerConfig, headerMetadata, tabsLayout, sharedFiltersMap })=>{
@@ -18006,7 +18062,8 @@ function hashCode(str) {
         case "markdown":
             {
                 return /*#__PURE__*/ jsx(MarkdownContent, {
-                    content: text
+                    content: text,
+                    className: className
                 });
             }
         case "textWithEmail":
@@ -18282,11 +18339,19 @@ const TexturedSidePanel = ({ url })=>{
     });
 };
 
-const LoginProviderMultipleItems = ({ provider, handleLoginSelected })=>{
+const logninExtraText = (extra)=>{
+    return extra?.map((content, index)=>/*#__PURE__*/ createElement(TextContent, {
+            ...content,
+            key: index
+        }));
+};
+const LoginProviderMultipleItems = ({ provider, handleLoginSelected, loginProviderExtra })=>{
     const [value, setValue] = useState(null);
+    const extra = loginProviderExtra && loginProviderExtra[provider.name];
     return /*#__PURE__*/ jsxs("div", {
         className: "flex flex-col w-full font-medium hover:text-accent-light hover:font-bold",
         children: [
+            extra && logninExtraText(extra),
             /*#__PURE__*/ jsx(Select, {
                 data: provider.urls.map((item)=>({
                         value: item.url,
@@ -18320,19 +18385,25 @@ const LoginProviderMultipleItems = ({ provider, handleLoginSelected })=>{
         ]
     }, `${provider.name}-login-item`);
 };
-const LoginProviderSingleItem = ({ provider, handleLoginSelected })=>{
-    return /*#__PURE__*/ jsxs(Button, {
-        fullWidth: true,
-        color: "accent.3",
-        onClick: ()=>handleLoginSelected(provider.urls[0].url),
+const LoginProviderSingleItem = ({ provider, handleLoginSelected, loginProviderExtra })=>{
+    const extra = loginProviderExtra && loginProviderExtra[provider.name];
+    return /*#__PURE__*/ jsxs(React__default.Fragment, {
         children: [
-            ' ',
-            provider.name,
-            ' '
+            extra && logninExtraText(extra),
+            /*#__PURE__*/ jsxs(Button, {
+                fullWidth: true,
+                color: "accent.3",
+                onClick: ()=>handleLoginSelected(provider.urls[0].url),
+                children: [
+                    ' ',
+                    provider.name,
+                    ' '
+                ]
+            }, provider.name)
         ]
-    }, provider.name);
+    });
 };
-const LoginProvidersPanel = ({ handleLoginSelected })=>{
+const LoginProvidersPanel = ({ handleLoginSelected, loginProviderExtra })=>{
     const { data, isSuccess, isError, isLoading, isFetching } = useGetLoginProvidersQuery();
     if (isError) {
         return /*#__PURE__*/ jsx(Center, {
@@ -18361,17 +18432,21 @@ const LoginProvidersPanel = ({ handleLoginSelected })=>{
             children: [
                 data && data.default_provider.urls.length > 1 ? /*#__PURE__*/ jsx(LoginProviderMultipleItems, {
                     provider: data.default_provider,
-                    handleLoginSelected: handleLoginSelected
+                    handleLoginSelected: handleLoginSelected,
+                    loginProviderExtra: loginProviderExtra
                 }) : data && /*#__PURE__*/ jsx(LoginProviderSingleItem, {
                     provider: data.default_provider,
-                    handleLoginSelected: handleLoginSelected
+                    handleLoginSelected: handleLoginSelected,
+                    loginProviderExtra: loginProviderExtra
                 }),
                 data?.providers.filter((x)=>x.name !== data.default_provider.name).map((x)=>x.urls.length > 1 ? /*#__PURE__*/ jsx(LoginProviderMultipleItems, {
                         provider: x,
-                        handleLoginSelected: handleLoginSelected
+                        handleLoginSelected: handleLoginSelected,
+                        loginProviderExtra: loginProviderExtra
                     }, x.name) : /*#__PURE__*/ jsx(LoginProviderSingleItem, {
                         provider: x,
-                        handleLoginSelected: handleLoginSelected
+                        handleLoginSelected: handleLoginSelected,
+                        loginProviderExtra: loginProviderExtra
                     }, x.name))
             ]
         })
@@ -18541,7 +18616,7 @@ const filterRedirect = (redirect)=>{
     return cleanPath ? `${baseUrl}/${cleanPath}` : baseUrl;
 };
 const LoginPanel = (loginConfig)=>{
-    const { image, topContent, bottomContent } = loginConfig;
+    const { image, topContent, loginProviderExtra, bottomContent } = loginConfig;
     const router = useRouter();
     const { query: { referer: refererQuery, redirect: redirectQuery } } = router;
     const referer = redirectQuery || refererQuery; // either referer or redirect query param
@@ -18582,7 +18657,8 @@ const LoginPanel = (loginConfig)=>{
                             key: index
                         })),
                     /*#__PURE__*/ jsx(LoginProvidersPanel, {
-                        handleLoginSelected: handleFenceLoginSelected
+                        handleLoginSelected: handleFenceLoginSelected,
+                        loginProviderExtra: loginProviderExtra
                     }),
                     loginConfig?.showCredentialsLogin && process.env.NODE_ENV === 'development' && /*#__PURE__*/ jsx(CredentialsLogin, {
                         handleLogin: handleCredentialsLogin
@@ -26403,7 +26479,8 @@ const TabbedCohortBuilderPage = ({ headerProps, footerProps, configuration })=>{
                             })
                         }),
                         /*#__PURE__*/ jsx(QueryExpression, {
-                            index: configuration.index
+                            index: configuration.index,
+                            fieldsAreFlat: configuration.fieldsAreFlat
                         })
                     ]
                 }),
@@ -27753,4 +27830,4 @@ const WorkspaceNoAccessPageServerSideProps = async ()=>{
 };
 
 export { QueryPageGetServerSideProps as $, AISearchPage as A, CrosswalkPage as B, CountsValue as C, DropdownPanel as D, ErrorCard as E, CrosswalkPageGetServerSideProps as F, Custom403Page as G, Custom404Page as H, DictionaryPage as I, DataLibraryPage as J, DataLibraryPageGetServerSideProps as K, DictionaryPageGetServerSideProps as L, DiscoveryPageGetServerSideProps as M, DiscoveryPage as N, ExplorerPage as O, ExplorerPageGetServerSideProps as P, QueryExpression as Q, ExplorerPageGetServerSidePropsForConfigId as R, LandingPage as S, LandingPageGetServerSideProps as T, LoginPage as U, LoginPageGetServerSideProps as V, NotebookLitePage as W, NotebookLitePageGetStaticProps as X, ProfilePage as Y, ProfilePageGetServerSideProps as Z, QueryPage as _, processRangeData as a, RepositoryPage as a0, RepositoryPageGetServerSideProps as a1, SubmissionPageGetServerSideProps as a2, SubmissionPage as a3, TabbedCohortBuilderPage as a4, TabbedCohortBuilderPageGetServerSideProps as a5, WorkspaceNoAccessPage as a6, WorkspaceNoAccessPageServerSideProps as a7, WorkspacePage as a8, WorkspacePageGetServerSideProps as a9, useToggleExpandFilter as b, useFilterExpandedState as c, useClearFilters as d, extractRangeValues$1 as e, useGetFacetFilters as f, getAllFieldsFromFilterConfigs as g, useUpdateFilters as h, useSetCohortFilterCombineState as i, useCohortFilterCombineState as j, classifyFacets as k, DownloadsPanel as l, CollapsableCharts as m, Charts as n, ExplorerTable as o, processBucketData as p, CohortManager as q, removeIntersectionFromEnum as r, AISearchPageGetServerSideProps as s, AnalysisPage as t, useFieldNameToLabel as u, AnalysisPageGetServerSideProps as v, ClinicalDataAnalysisPage as w, ClinicalDataAnalysisServerSideProps as x, ColorThemePage as y, ColorThemePageGetServerSideProps as z };
-//# sourceMappingURL=index-DkUVZQPS.js.map
+//# sourceMappingURL=index-Dy9pEhcC.js.map