@gen3/frontend 0.12.30 → 0.12.32

package/dist/index/esm/{index-Df-CHhZ4.js → index-DxDRynQA.js}

@@ -2,7 +2,7 @@ import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import * as React from 'react';
 import React__default, { createContext, useState, useMemo, useEffect, useContext, useRef, useCallback, createElement, forwardRef, useImperativeHandle, useId, useLayoutEffect, useReducer } from 'react';
 import { useUserAuth, useCoreSelector, selectUserDetails, useGetAuthzMappingsQuery, WorkspaceStatus, useGetWorkspaceStatusQuery, useGetWorkspacePayModelsQuery, useTerminateWorkspaceMutation, selectRequestedWorkspaceStatus, selectRequestedWorkspaceStatusTimestamp, useCoreDispatch, setActiveWorkspaceStatus, RequestedWorkspaceStatus, setRequestedWorkspaceStatus, isTimeGreaterThan as isTimeGreaterThan$1, useGetCSRFQuery, useLazyFetchUserDetailsQuery, selectUserAuthStatus, GEN3_REDIRECT_URL, showModal, Modals, GEN3_FENCE_API, isAuthenticated, useGetLoginProvidersQuery, hideModal, selectCurrentModal, selectAvailableCohorts, createNewCohort as createNewCohort$1, fieldNameToLabel, isOperationWithField, extractEnumFilterValue, selectIndexedFilterByName, selectShouldShareFilters, selectSharedFilters, updateCohortFilter as updateCohortFilter$1, buildNestedFilterForOperation, isOperatorWithFieldAndArrayOfOperands, isUnion, removeCohortFilter as removeCohortFilter$1, trimFirstfieldNameToLabel, Accessibility, setShouldShareFilters, useGetAuthzResourcesQuery, useIsUserLoggedIn, GEN3_DOMAIN, DataLibraryStoreMode, useDataLibrary, buildListItemsGroupedByDataset, extractFileDatasetsInRecords, useGetMDSQuery, selectAuthzMappingData, useGetAggMDSQuery, useAskQuestionMutation, useGetIndexAggMDSQuery, useGetTagsQuery, useGetDictionaryQuery, useGetMetadataByIdQuery, createGen3App, ExtractValueFromObject, useGetRawDataAndTotalCountsQuery, humanify, selectCart, selectCartItem, removeItemsFromCart, CART_LIMIT, addItemsToCart, selectIndexFilters, isJSONValue, downloadFromGuppyToBlob, downloadJSONDataFromGuppy, selectCurrentCohortFilters as selectCurrentCohortFilters$1, coreStore, EmptyFilterSet as EmptyFilterSet$1, fetchJSONDataFromURL, GEN3_MANIFEST_API, toggleCohortBuilderCategoryFilter, selectCohortFilterExpanded, setCohortFilterCombineMode, selectCohortFilterCombineMode, selectCohortFilters, setCohortFilter as setCohortFilter$1, clearCohortFilters as clearCohortFilters$1, handleOperation, selectCurrentCohortId as selectCurrentCohortId$1, selectCurrentCohortModified, selectCurrentCohortSaved, setCohortIndexFilters, setCurrentCohortId as setCurrentCohortId$1, selectCurrentCohortName as selectCurrentCohortName$1, selectAllCohortFiltersCollapsed, useGetAggsQuery, isIntersection, useGetCountsQuery, toggleCohortBuilderAllFilters, selectAllCohorts as selectAllCohorts$1, selectCurrentCohort as selectCurrentCohort$1, updateCohortName as updateCohortName$1, duplicateCohort, removeCohort as removeCohort$1, setSharedFilters, usePrevious, useCustomRangeQuery, useGeneralGQLQuery, convertFilterSetToGqlFilter, customQueryStrForField, selectHeadersWithCSRFToken, GEN3_GUPPY_API, useLaunchWorkspaceMutation, selectActiveWorkspaceStatus, isFetchBaseQueryError, setActiveWorkspace, getCurrentTimestamp as getCurrentTimestamp$1, selectWorkspaceStatusFromService, selectActiveWorkspaceId, useGetWorkspaceOptionsQuery, GEN3_WORKSPACE_API, useGetExternalLoginsQuery, useSetCurrentPayModelMutation, PodStatus, PodConditionType, isWorkspaceRunningOrStopping, GEN3_API, useGetCredentialsQuery, useRemoveCredentialMutation, useAddNewCredentialMutation, useGetStatsAggregationsQuery, isObject, isIncludes, useLazyGetObjectIdsQuery, filterSetToOperation, useLazyGetCountsQuery, GEN3_COMMONS_NAME, CohortStorage, createAppStore, getRemoteSupportServiceRegistry, isHttpStatusError, MissingServiceConfigurationError, useLazyGetAggsQuery, useCreateRequestMutation, isIndexedFilterSetEmpty, buildGetAggregationQuery, processHistogramResponse, roundHistogramResponse, selectCSRFToken, useUserRequestQuery, getGen3AppId, createGen3AppWithOwnStore, createAppApiForRTKQ, useLazyGetIndexObjectQuery, useLazyGetIndexdMetdataQuery, useLazyGetDownloadQuery, CoreProvider, HttpMethod, groupSharedFields, useGetProjectsDetailsQuery, useGetSubmissionsQuery, isCohortItem, isFileItem, fetchFencePresignedURL, HTTPError, getFederatedLoginStatus, queryMultipleMDSRecords, extractIndexFromDataLibraryCohort, isFilterSet, getNumberOfItemsInDatalist, isAdditionalDataItem, useLazyGetCrosswalkDataQuery, fetchFence as fetchFence$1 } from '@gen3/core';
-import { LoadingOverlay, Card, Group, Avatar, Text, Checkbox, Stack, Center, Loader, Tooltip, UnstyledButton, ThemeIcon, Box, Select, Button, Divider, Textarea, FileButton, Anchor, Modal, TextInput, Menu, ActionIcon, Table, Pagination, Grid, ColorSwatch, useMantineTheme, Accordion, Switch, SegmentedControl as SegmentedControl$1, Radio, NumberInput, Badge, RangeSlider, MultiSelect, Tabs, SimpleGrid, Highlight, MantineProvider, Flex, Alert, Drawer, CopyButton, factory, useProps, getStyleObject, Paper, useCombobox, Combobox, ScrollArea, Autocomplete, Title, List as List$1, Transition, rem, Stepper, Spoiler, Image as Image$2, NavLink, Input, Collapse, InputBase, createTheme, FileInput, CloseButton } from '@mantine/core';
+import { LoadingOverlay, Card, Group, Avatar, Text, Checkbox, Stack, Center, Loader, Tooltip, UnstyledButton, ThemeIcon, Anchor, Box, Select, Button, Divider, Textarea, FileButton, Modal, TextInput, Menu, ActionIcon, Table, Pagination, Grid, ColorSwatch, useMantineTheme, Accordion, Switch, SegmentedControl as SegmentedControl$1, Radio, NumberInput, Badge, RangeSlider, MultiSelect, Tabs, SimpleGrid, Highlight, MantineProvider, Flex, Alert, Drawer, CopyButton, factory, useProps, getStyleObject, Paper, useCombobox, Combobox, ScrollArea, Autocomplete, Title, List as List$1, Transition, rem, Stepper, Spoiler, Image as Image$2, NavLink, Input, Collapse, InputBase, createTheme, FileInput, CloseButton } from '@mantine/core';
 import { useDeepCompareEffect, useDeepCompareMemo, useDeepCompareCallback } from 'use-deep-compare';
 import { useRouter } from 'next/router';
 import { usePathname } from 'next/navigation';
@@ -1227,227 +1227,6 @@ const MessagePage = ({ children })=>{
     });
 };
 
-const LoginProviderMultipleItems = ({ provider, handleLoginSelected })=>{
-    const [value, setValue] = useState(null);
-    return /*#__PURE__*/ jsxs("div", {
-        className: "flex flex-col w-full font-medium hover:text-accent-light hover:font-bold",
-        children: [
-            /*#__PURE__*/ jsx(Select, {
-                data: provider.urls.map((item)=>({
-                        value: item.url,
-                        label: item.name
-                    })),
-                classNames: {
-                    root: 'w-full'
-                },
-                onChange: setValue,
-                value: value,
-                searchable: true,
-                label: provider.name,
-                placeholder: "Select a login provider",
-                size: "sm",
-                clearable: true,
-                "aria-label": "Select a login provider"
-            }),
-            /*#__PURE__*/ jsxs(Button, {
-                fullWidth: true,
-                color: "accent.3",
-                disabled: !value,
-                classNames: {
-                    root: 'data-disabled:bg-accent-lightest'
-                },
-                onClick: ()=>value && handleLoginSelected(value),
-                children: [
-                    ' ',
-                    provider.name
-                ]
-            }, provider.name)
-        ]
-    }, `${provider.name}-login-item`);
-};
-const LoginProviderSingleItem = ({ provider, handleLoginSelected })=>{
-    return /*#__PURE__*/ jsxs(Button, {
-        fullWidth: true,
-        color: "accent.3",
-        onClick: ()=>handleLoginSelected(provider.urls[0].url),
-        children: [
-            ' ',
-            provider.name,
-            ' '
-        ]
-    }, provider.name);
-};
-const LoginProvidersPanel = ({ handleLoginSelected })=>{
-    const { data, isSuccess, isError, isLoading, isFetching } = useGetLoginProvidersQuery();
-    if (isError) {
-        return /*#__PURE__*/ jsx(Center, {
-            children: /*#__PURE__*/ jsx(ErrorCard, {
-                message: 'request to authentication service failed'
-            })
-        });
-    }
-    if (isLoading || isFetching) {
-        return /*#__PURE__*/ jsx(LoadingOverlay, {
-            visible: !isSuccess
-        });
-    }
-    if (isSuccess && !data) {
-        return /*#__PURE__*/ jsx(Center, {
-            children: /*#__PURE__*/ jsx(ErrorCard, {
-                message: 'no logins defined'
-            })
-        });
-    }
-    return /*#__PURE__*/ jsx(Box, {
-        className: "flex flex-col items-center justify-center",
-        children: /*#__PURE__*/ jsxs(Stack, {
-            align: "center",
-            className: "w-1/3",
-            children: [
-                data && data.default_provider.urls.length > 1 ? /*#__PURE__*/ jsx(LoginProviderMultipleItems, {
-                    provider: data.default_provider,
-                    handleLoginSelected: handleLoginSelected
-                }) : data && /*#__PURE__*/ jsx(LoginProviderSingleItem, {
-                    provider: data.default_provider,
-                    handleLoginSelected: handleLoginSelected
-                }),
-                data?.providers.filter((x)=>x.name !== data.default_provider.name).map((x)=>x.urls.length > 1 ? /*#__PURE__*/ jsx(LoginProviderMultipleItems, {
-                        provider: x,
-                        handleLoginSelected: handleLoginSelected
-                    }, x.name) : /*#__PURE__*/ jsx(LoginProviderSingleItem, {
-                        provider: x,
-                        handleLoginSelected: handleLoginSelected
-                    }, x.name))
-            ]
-        })
-    });
-};
-
-const TexturedSidePanel = ({ url })=>{
-    return /*#__PURE__*/ jsx("div", {
-        "aria-hidden": "true",
-        style: {
-            backgroundImage: `url(${url})`
-        },
-        className: "bg-contain flex h-full w-full bg-repeat-y last:-scale-x-100"
-    });
-};
-
-const CREDENTIALS_LOGIN_ERROR = 'Credentials Login Error';
-const FORMAT_ERROR = 'Format Error';
-const INVALID_JSON_MESSAGE = 'JSON is not valid';
-/**
- * Reads the content of a given file and executes a callback with the file's text content.
- *
- * @param {File} file - The file to be read.
- * @param {function(string): void} callback - A callback function that is invoked with the file content as a string.
- */ const readFileContent = (file, callback)=>{
-    const reader = new FileReader();
-    reader.onload = (event)=>{
-        if (event.target?.result) callback(event.target.result);
-    };
-    reader.readAsText(file);
-};
-const CredentialsLogin = ({ handleLogin })=>{
-    const sessionContext = useContext(SessionContext);
-    const [credentials, setCredentials] = useState(null);
-    const [selectedFile, setSelectedFile] = useState(null);
-    const [isLoading, setIsLoading] = useState(false);
-    const { basePath } = useRouter();
-    useEffect(()=>{
-        if (selectedFile) {
-            readFileContent(selectedFile, setCredentials);
-        }
-    }, [
-        selectedFile
-    ]);
-    const handleCredentialsLogin = useCallback(async (credentials)=>{
-        setIsLoading(true);
-        const updateSession = sessionContext?.updateSession ?? (()=>null);
-        const loginEndpoint = basePath ? `/${basePath}/api/auth/credentialsLogin` : '/api/auth/credentialsLogin';
-        try {
-            const parsedCredentials = JSON.parse(credentials);
-            const response = await fetch(loginEndpoint, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify(parsedCredentials)
-            });
-            if (!response.ok) {
-                notifications.show({
-                    title: CREDENTIALS_LOGIN_ERROR,
-                    message: response.statusText
-                });
-            } else {
-                updateSession();
-                handleLogin();
-            }
-        } catch (error) {
-            if (error instanceof Error) {
-                notifications.show({
-                    title: FORMAT_ERROR,
-                    message: INVALID_JSON_MESSAGE
-                });
-            }
-        } finally{
-            setIsLoading(false);
-        }
-    }, [
-        handleLogin,
-        sessionContext?.updateSession,
-        basePath
-    ]);
-    return /*#__PURE__*/ jsxs(Box, {
-        className: "flex flex-col items-center justify-center my-2",
-        children: [
-            /*#__PURE__*/ jsx(Divider, {
-                color: "black",
-                size: "md",
-                className: "w-1/3",
-                label: /*#__PURE__*/ jsx(Text, {
-                    size: "md",
-                    c: "primary.4",
-                    children: "Authorize with credentials"
-                }),
-                labelPosition: "center"
-            }),
-            /*#__PURE__*/ jsxs(Group, {
-                children: [
-                    /*#__PURE__*/ jsx(Textarea, {
-                        value: credentials ?? '',
-                        onChange: (e)=>setCredentials(e.target.value),
-                        classNames: {
-                            input: 'focus:border-2 focus:border-primary text-sm'
-                        },
-                        size: "sm",
-                        rightSection: credentials && credentials.length > 0 && /*#__PURE__*/ jsx(MdClose, {
-                            onClick: ()=>setCredentials(''),
-                            className: "cursor-pointer",
-                            "data-testid": "search-input-clear-search"
-                        })
-                    }),
-                    /*#__PURE__*/ jsx(FileButton, {
-                        onChange: setSelectedFile,
-                        accept: "application/json",
-                        children: (props)=>/*#__PURE__*/ jsx(Button, {
-                                ...props,
-                                children: "Upload File"
-                            })
-                    }),
-                    /*#__PURE__*/ jsx(Button, {
-                        color: "primary.5",
-                        loading: isLoading,
-                        onClick: ()=>handleCredentialsLogin(credentials ?? ''),
-                        disabled: !credentials,
-                        children: "Authorize"
-                    })
-                ]
-            })
-        ]
-    });
-};
-
 // separate function for hashing logic
 function hashString$1(str) {
     let hash = 0;
@@ -1627,7 +1406,8 @@ function hashCode(str) {
         case "markdown":
             {
                 return /*#__PURE__*/ jsx(MarkdownContent, {
-                    content: text
+                    content: text,
+                    className: className
                 });
             }
         case "textWithEmail":
@@ -1716,6 +1496,245 @@ function hashCode(str) {
     }
 };
 
+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,
+                        label: item.name
+                    })),
+                classNames: {
+                    root: 'w-full'
+                },
+                onChange: setValue,
+                value: value,
+                searchable: true,
+                label: provider.name,
+                placeholder: "Select a login provider",
+                size: "sm",
+                clearable: true,
+                "aria-label": "Select a login provider"
+            }),
+            /*#__PURE__*/ jsxs(Button, {
+                fullWidth: true,
+                color: "accent.3",
+                disabled: !value,
+                classNames: {
+                    root: 'data-disabled:bg-accent-lightest'
+                },
+                onClick: ()=>value && handleLoginSelected(value),
+                children: [
+                    ' ',
+                    provider.name
+                ]
+            }, provider.name)
+        ]
+    }, `${provider.name}-login-item`);
+};
+const LoginProviderSingleItem = ({ provider, handleLoginSelected, loginProviderExtra })=>{
+    const extra = loginProviderExtra && loginProviderExtra[provider.name];
+    return /*#__PURE__*/ jsxs(React__default.Fragment, {
+        children: [
+            extra && logninExtraText(extra),
+            /*#__PURE__*/ jsxs(Button, {
+                fullWidth: true,
+                color: "accent.3",
+                onClick: ()=>handleLoginSelected(provider.urls[0].url),
+                children: [
+                    ' ',
+                    provider.name,
+                    ' '
+                ]
+            }, provider.name)
+        ]
+    });
+};
+const LoginProvidersPanel = ({ handleLoginSelected, loginProviderExtra })=>{
+    const { data, isSuccess, isError, isLoading, isFetching } = useGetLoginProvidersQuery();
+    if (isError) {
+        return /*#__PURE__*/ jsx(Center, {
+            children: /*#__PURE__*/ jsx(ErrorCard, {
+                message: 'request to authentication service failed'
+            })
+        });
+    }
+    if (isLoading || isFetching) {
+        return /*#__PURE__*/ jsx(LoadingOverlay, {
+            visible: !isSuccess
+        });
+    }
+    if (isSuccess && !data) {
+        return /*#__PURE__*/ jsx(Center, {
+            children: /*#__PURE__*/ jsx(ErrorCard, {
+                message: 'no logins defined'
+            })
+        });
+    }
+    return /*#__PURE__*/ jsx(Box, {
+        className: "flex flex-col items-center justify-center",
+        children: /*#__PURE__*/ jsxs(Stack, {
+            align: "center",
+            className: "w-1/3",
+            children: [
+                data && data.default_provider.urls.length > 1 ? /*#__PURE__*/ jsx(LoginProviderMultipleItems, {
+                    provider: data.default_provider,
+                    handleLoginSelected: handleLoginSelected,
+                    loginProviderExtra: loginProviderExtra
+                }) : data && /*#__PURE__*/ jsx(LoginProviderSingleItem, {
+                    provider: data.default_provider,
+                    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,
+                        loginProviderExtra: loginProviderExtra
+                    }, x.name) : /*#__PURE__*/ jsx(LoginProviderSingleItem, {
+                        provider: x,
+                        handleLoginSelected: handleLoginSelected,
+                        loginProviderExtra: loginProviderExtra
+                    }, x.name))
+            ]
+        })
+    });
+};
+
+const TexturedSidePanel = ({ url })=>{
+    return /*#__PURE__*/ jsx("div", {
+        "aria-hidden": "true",
+        style: {
+            backgroundImage: `url(${url})`
+        },
+        className: "bg-contain flex h-full w-full bg-repeat-y last:-scale-x-100"
+    });
+};
+
+const CREDENTIALS_LOGIN_ERROR = 'Credentials Login Error';
+const FORMAT_ERROR = 'Format Error';
+const INVALID_JSON_MESSAGE = 'JSON is not valid';
+/**
+ * Reads the content of a given file and executes a callback with the file's text content.
+ *
+ * @param {File} file - The file to be read.
+ * @param {function(string): void} callback - A callback function that is invoked with the file content as a string.
+ */ const readFileContent = (file, callback)=>{
+    const reader = new FileReader();
+    reader.onload = (event)=>{
+        if (event.target?.result) callback(event.target.result);
+    };
+    reader.readAsText(file);
+};
+const CredentialsLogin = ({ handleLogin })=>{
+    const sessionContext = useContext(SessionContext);
+    const [credentials, setCredentials] = useState(null);
+    const [selectedFile, setSelectedFile] = useState(null);
+    const [isLoading, setIsLoading] = useState(false);
+    const { basePath } = useRouter();
+    useEffect(()=>{
+        if (selectedFile) {
+            readFileContent(selectedFile, setCredentials);
+        }
+    }, [
+        selectedFile
+    ]);
+    const handleCredentialsLogin = useCallback(async (credentials)=>{
+        setIsLoading(true);
+        const updateSession = sessionContext?.updateSession ?? (()=>null);
+        const loginEndpoint = basePath ? `/${basePath}/api/auth/credentialsLogin` : '/api/auth/credentialsLogin';
+        try {
+            const parsedCredentials = JSON.parse(credentials);
+            const response = await fetch(loginEndpoint, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify(parsedCredentials)
+            });
+            if (!response.ok) {
+                notifications.show({
+                    title: CREDENTIALS_LOGIN_ERROR,
+                    message: response.statusText
+                });
+            } else {
+                updateSession();
+                handleLogin();
+            }
+        } catch (error) {
+            if (error instanceof Error) {
+                notifications.show({
+                    title: FORMAT_ERROR,
+                    message: INVALID_JSON_MESSAGE
+                });
+            }
+        } finally{
+            setIsLoading(false);
+        }
+    }, [
+        handleLogin,
+        sessionContext?.updateSession,
+        basePath
+    ]);
+    return /*#__PURE__*/ jsxs(Box, {
+        className: "flex flex-col items-center justify-center my-2",
+        children: [
+            /*#__PURE__*/ jsx(Divider, {
+                color: "black",
+                size: "md",
+                className: "w-1/3",
+                label: /*#__PURE__*/ jsx(Text, {
+                    size: "md",
+                    c: "primary.4",
+                    children: "Authorize with credentials"
+                }),
+                labelPosition: "center"
+            }),
+            /*#__PURE__*/ jsxs(Group, {
+                children: [
+                    /*#__PURE__*/ jsx(Textarea, {
+                        value: credentials ?? '',
+                        onChange: (e)=>setCredentials(e.target.value),
+                        classNames: {
+                            input: 'focus:border-2 focus:border-primary text-sm'
+                        },
+                        size: "sm",
+                        rightSection: credentials && credentials.length > 0 && /*#__PURE__*/ jsx(MdClose, {
+                            onClick: ()=>setCredentials(''),
+                            className: "cursor-pointer",
+                            "data-testid": "search-input-clear-search"
+                        })
+                    }),
+                    /*#__PURE__*/ jsx(FileButton, {
+                        onChange: setSelectedFile,
+                        accept: "application/json",
+                        children: (props)=>/*#__PURE__*/ jsx(Button, {
+                                ...props,
+                                children: "Upload File"
+                            })
+                    }),
+                    /*#__PURE__*/ jsx(Button, {
+                        color: "primary.5",
+                        loading: isLoading,
+                        onClick: ()=>handleCredentialsLogin(credentials ?? ''),
+                        disabled: !credentials,
+                        children: "Authorize"
+                    })
+                ]
+            })
+        ]
+    });
+};
+
 /**
  * Determines the correct separator to append additional parameters to a URL
  * @param {string} url - The URL to examine
@@ -1764,7 +1783,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
@@ -1805,7 +1824,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
@@ -9421,19 +9441,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
     });
@@ -10299,17 +10324,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;
@@ -10406,7 +10485,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,
@@ -12719,47 +12797,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,
@@ -12773,20 +12848,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))
     });
 };
 
@@ -12802,7 +12873,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
     ]);
@@ -12815,7 +12887,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: {}
@@ -12863,153 +12934,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
+                                })
+                            })
+                        ]
+                    })
+                ]
             })
         })
     });
@@ -17961,6 +18027,7 @@ const useSetCohortFilterCombineState = (index)=>{
 
 const QueryExpressionContext = /*#__PURE__*/ React__default.createContext({
     displayOnly: false,
+    fieldsAreFlat: true,
     cohortId: null,
     cohortName: 'default',
     shouldShowSummary: ()=>false,
@@ -18078,7 +18145,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(()=>{
@@ -18189,7 +18256,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
@@ -18762,7 +18833,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);
@@ -18926,7 +18997,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$1(state));
     const currentCohortName = useCoreSelector((state)=>selectCurrentCohortName$1(state));
     return /*#__PURE__*/ jsx(QueryExpressionContext.Provider, {
@@ -18934,6 +19005,7 @@ const QueryExpression = ({ index, shouldShowSummary = DefaultShouldShowSummary,
             cohortName: currentCohortName,
             cohortId: currentCohortId,
             displayOnly: false,
+            fieldsAreFlat: fieldsAreFlat,
             shouldShowSummary: shouldShowSummary,
             useClearCohortFilters: ()=>{
                 const dispatch = useCoreDispatch();
@@ -28252,7 +28324,7 @@ const useUnsecureRoundedAggsQuery = ({ type, fields, filters, accessibility = Ac
     };
 };
 
-const CohortQueryExpression = ({ index })=>{
+const CohortQueryExpression = ({ index, fieldsAreFlat = true })=>{
     const currentCohortId = useAppSelector((state)=>selectCurrentCohortId(state));
     const currentCohortName = useAppSelector((state)=>selectCurrentCohortName(state));
     return /*#__PURE__*/ jsx("div", {
@@ -28262,6 +28334,7 @@ const CohortQueryExpression = ({ index })=>{
                 cohortName: currentCohortName,
                 cohortId: currentCohortId,
                 displayOnly: false,
+                fieldsAreFlat: true,
                 useClearCohortFilters: ()=>{
                     const dispatch = useAppDispatch();
                     return (index)=>dispatch(clearCohortFilters({
@@ -30752,42 +30825,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))
-            ]
+                ]
+            })
         })
     });
 };
@@ -30844,7 +30921,7 @@ const DiscoveryPageGetServerSideProps = async ()=>{
     }
 };
 
-const QueryPanel = dynamic(()=>import('./QueryPanel-DSqDH3j3.js'), {
+const QueryPanel = dynamic(()=>import('./QueryPanel-7-YhRPuT.js'), {
     ssr: false
 });
 const QueryPage = ({ headerProps, footerProps, queryProps })=>{
@@ -36080,7 +36157,8 @@ const TabbedCohortBuilderPage = ({ headerProps, footerProps, configuration })=>{
                             })
                         }),
                         /*#__PURE__*/ jsx(QueryExpression, {
-                            index: configuration.index
+                            index: configuration.index,
+                            fieldsAreFlat: configuration.fieldsAreFlat
                         })
                     ]
                 }),
@@ -36534,4 +36612,4 @@ const DefaultAuthorizedRoutesConfig = {
 };
 
 export { DownloadButton as $, AISearchPageGetServerSideProps as A, BAD_DATA_MESSAGE as B, CardContainer as C, ColorThemePage as D, ColorThemePageGetServerSideProps as E, ContentSource as F, CountsValue as G, CreateCredentialsAPIKeyModal as H, CrosswalkPage as I, CrosswalkPageGetServerSideProps as J, Custom403Page as K, Custom404Page as L, DAYS_IN_YEAR as M, DEFAULT_MAXIMUM as N, DEFAULT_MINIMUM as O, DEFAULT_VISIBLE_ITEMS$2 as P, DictionaryPage as Q, DataLibraryPage as R, DataLibraryPageGetServerSideProps as S, DefaultAuthorizedRoutesConfig as T, DictionaryPageGetServerSideProps as U, DictionaryWithContext as V, DiscoveryCellRendererFactory as W, DiscoveryProvider as X, DiscoveryIndexPanel as Y, DiscoveryPage as Z, DiscoveryPageGetServerSideProps as _, AccessLevel as a, ReactECharts as a$, DownloadsPanel as a0, DropdownButton as a1, DropdownPanel as a2, DropdownWithIcon as a3, EmptyTableMessage as a4, EnumFacet as a5, EnumFacetChart as a6, ErrorCard as a7, ExactValueFacet as a8, ExplorerPage as a9, LoginPage as aA, LoginPageGetServerSideProps as aB, LoginPanel as aC, LoginProvidersPanel as aD, MessageCard as aE, MessagePage as aF, MetadataDictionary as aG, MinutesToMilliseconds as aH, MultiSelectValueFacet as aI, NavPageLayout as aJ, NavigationBar as aK, NavigationButton as aL, NoAccessModal as aM, NotebookLitePage as aN, NotebookLitePageGetStaticProps as aO, Profile as aP, ProfilePage as aQ, ProfilePageGetServerSideProps as aR, ProfileProvider as aS, ProtectedContent as aT, ProtectedContentUI as aU, QueryExpression as aV, QueryExpressionContext as aW, QueryExpressionSection as aX, QueryPage as aY, QueryPageGetServerSideProps as aZ, RangeFacet as a_, ExplorerPageGetServerSideProps as aa, ExplorerPageGetServerSidePropsForConfigId as ab, ExplorerTable as ac, ExplorerTableCellRendererFactory as ad, ExplorerTableDetailsPanelFactory as ae, FacetControlsHeader as af, FacetExpander as ag, FacetSelector as ah, FacetSortPanel as ai, FacetTabs as aj, FiltersPanel as ak, FirstTimeModal as al, Footer as am, Gen3Button as an, Gen3ButtonReverse as ao, Gen3Link as ap, Gen3ModalsProvider as aq, Gen3Provider as ar, GqlQueryEditor as as, Header$1 as at, HoverLink as au, IconButton as av, JSONObjectDownloadButton as aw, LandingPage as ax, LandingPageGetServerSideProps as ay, LoginButton$1 as az, AccordionPanel as b, isArrayOfString as b$, Repository as b0, RepositoryPage as b1, RepositoryPageGetServerSideProps as b2, ResourcesFilters as b3, SPECIAL_CASE_FIELDS as b4, SegmentedControl as b5, SessionExpiredModal as b6, SinglePageStudyDetailsPanel as b7, StaticNotebookIFrame as b8, StudyDetailsPanel as b9, classifyFacets as bA, compareKeysAscending as bB, compareKeysDescending as bC, computeRowSpan as bD, convertMinutesToMilliseconds as bE, convertPathsToTree as bF, convertSecondsToMilliseconds as bG, convertToStringArray as bH, createCSSVariables as bI, createLabelFromHistogramData as bJ, createMantineTheme as bK, credentialsLogin as bL, credentialsLogout as bM, extractObjectKey as bN, extractRangeValues$1 as bO, filterAggregationsDataKeys as bP, focusStyles as bQ, gen3Modals as bR, getAllFieldsFromFilterConfigs as bS, getByPath as bT, getCurrentUnixTimestamp as bU, getFormattedTimestamp$1 as bV, getHighResolutionTimestamp as bW, getNavPageLayoutPropsFromConfig as bX, getParamsValueAsString as bY, getTagInfo as bZ, hasOwnProperty as b_, StudyGroup as ba, StudyGroupPanel as bb, StudyProvider as bc, SubmissionPage as bd, SubmissionPageGetServerSideProps as be, TabbedCohortBuilder as bf, TabbedCohortBuilderPage as bg, TabbedCohortBuilderPageGetServerSideProps as bh, TabbedPanel as bi, TableXPositionContext as bj, TagCloud as bk, TailwindConfig as bl, TopBar as bm, UploadJSONButton as bn, User as bo, WarningCard as bp, Workspace as bq, WorkspaceNoAccessPage as br, WorkspaceNoAccessPageServerSideProps as bs, WorkspacePage as bt, WorkspacePageGetServerSideProps as bu, accessibleFieldName as bv, addIntersectionToIncludes as bw, addUnion as bx, analysisApiCohortDiscovery as by, capitalize as bz, ActionBar as c, isEnumFacetResponse as c0, isHeaderMetadata as c1, isPropertyKey as c2, isTextTransform$1 as c3, isTimeGreaterThan as c4, itemsInCart as c5, mapFacetSortToSortType as c6, measureExecutionTime as c7, processBucketData as c8, processDefinedRangeData as c9, useExtractEnumFilterValues as cA, useExtractRangeFilterValues as cB, useFieldNameToLabel as cC, useGetFacetFilters$1 as cD, useGuppyActionButton as cE, useUpdateFilters$1 as cF, useUpdateFiltersFlat as cG, userHasMethodForServiceOnResource$1 as cH, validateObjectHasRequiredFields as cI, GqlQueryEditor$1 as cJ, processLabel$1 as ca, processRangeData as cb, processRangeKeyLabel as cc, registerCohortBuilderDefaultPreviewRenderers as cd, registerCohortDiscoveryApp as ce, registerCohortSimilarityApp as cf, registerDefaultDiscoveryDataLoaders as cg, registerDiscoveryDefaultCellRenderers as ch, registerDownloadButtonAction as ci, registerExplorerDefaultCellRenderers as cj, registerIGVApp as ck, registerMetadataSchemaApp as cl, removeIntersectionFromEnum as cm, removeKey$1 as cn, removeMultipleSlashes as co, removeUnion as cp, resourcePathFromProjectID as cq, sessionLogout as cr, handler as cs, stripTrailingSlash as ct, toDisplayName$1 as cu, truncateString as cv, unixTimeToString as cw, updateFacetEnum as cx, useClearFilters$1 as cy, useDiscoveryContext as cz, ActionButton as d, AdminAuthZPageGetServerSideProps as e, AiSearch as f, AISearchPage as g, AnalysisCenter as h, AnalysisCenterWithSections as i, AnalysisEditorPage as j, AnalysisEditorPageGetServerSideProps as k, AnalysisPage as l, AnalysisPageGetServerSideProps as m, AuthzPage as n, Banner as o, BaseModal as p, Charts as q, ClinicalDataAnalysisPage as r, ClinicalDataAnalysisServerSideProps as s, CohortActionButton as t, CohortBuilder$1 as u, CohortDropdownActionButton as v, CohortManager$1 as w, CohortManagerAndExpression as x, CollapsableCharts as y, CollapsableSidebar as z };
-//# sourceMappingURL=index-Df-CHhZ4.js.map
+//# sourceMappingURL=index-DxDRynQA.js.map