@gen3/frontend 0.12.30 → 0.12.32

package/dist/index/cjs/{index-BB8seQLc.js → index-Bjn2PM9I.js}

@@ -1247,227 +1247,6 @@ const MessagePage = ({ children })=>{
     });
 };
 
-const LoginProviderMultipleItems = ({ provider, handleLoginSelected })=>{
-    const [value, setValue] = React.useState(null);
-    return /*#__PURE__*/ jsxRuntime.jsxs("div", {
-        className: "flex flex-col w-full font-medium hover:text-accent-light hover:font-bold",
-        children: [
-            /*#__PURE__*/ jsxRuntime.jsx(core$1.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__*/ jsxRuntime.jsxs(core$1.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__*/ jsxRuntime.jsxs(core$1.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 } = core.useGetLoginProvidersQuery();
-    if (isError) {
-        return /*#__PURE__*/ jsxRuntime.jsx(core$1.Center, {
-            children: /*#__PURE__*/ jsxRuntime.jsx(ErrorCard, {
-                message: 'request to authentication service failed'
-            })
-        });
-    }
-    if (isLoading || isFetching) {
-        return /*#__PURE__*/ jsxRuntime.jsx(core$1.LoadingOverlay, {
-            visible: !isSuccess
-        });
-    }
-    if (isSuccess && !data) {
-        return /*#__PURE__*/ jsxRuntime.jsx(core$1.Center, {
-            children: /*#__PURE__*/ jsxRuntime.jsx(ErrorCard, {
-                message: 'no logins defined'
-            })
-        });
-    }
-    return /*#__PURE__*/ jsxRuntime.jsx(core$1.Box, {
-        className: "flex flex-col items-center justify-center",
-        children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Stack, {
-            align: "center",
-            className: "w-1/3",
-            children: [
-                data && data.default_provider.urls.length > 1 ? /*#__PURE__*/ jsxRuntime.jsx(LoginProviderMultipleItems, {
-                    provider: data.default_provider,
-                    handleLoginSelected: handleLoginSelected
-                }) : data && /*#__PURE__*/ jsxRuntime.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__*/ jsxRuntime.jsx(LoginProviderMultipleItems, {
-                        provider: x,
-                        handleLoginSelected: handleLoginSelected
-                    }, x.name) : /*#__PURE__*/ jsxRuntime.jsx(LoginProviderSingleItem, {
-                        provider: x,
-                        handleLoginSelected: handleLoginSelected
-                    }, x.name))
-            ]
-        })
-    });
-};
-
-const TexturedSidePanel = ({ url })=>{
-    return /*#__PURE__*/ jsxRuntime.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 = React.useContext(SessionContext);
-    const [credentials, setCredentials] = React.useState(null);
-    const [selectedFile, setSelectedFile] = React.useState(null);
-    const [isLoading, setIsLoading] = React.useState(false);
-    const { basePath } = router.useRouter();
-    React.useEffect(()=>{
-        if (selectedFile) {
-            readFileContent(selectedFile, setCredentials);
-        }
-    }, [
-        selectedFile
-    ]);
-    const handleCredentialsLogin = React.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.notifications.show({
-                    title: CREDENTIALS_LOGIN_ERROR,
-                    message: response.statusText
-                });
-            } else {
-                updateSession();
-                handleLogin();
-            }
-        } catch (error) {
-            if (error instanceof Error) {
-                notifications.notifications.show({
-                    title: FORMAT_ERROR,
-                    message: INVALID_JSON_MESSAGE
-                });
-            }
-        } finally{
-            setIsLoading(false);
-        }
-    }, [
-        handleLogin,
-        sessionContext?.updateSession,
-        basePath
-    ]);
-    return /*#__PURE__*/ jsxRuntime.jsxs(core$1.Box, {
-        className: "flex flex-col items-center justify-center my-2",
-        children: [
-            /*#__PURE__*/ jsxRuntime.jsx(core$1.Divider, {
-                color: "black",
-                size: "md",
-                className: "w-1/3",
-                label: /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
-                    size: "md",
-                    c: "primary.4",
-                    children: "Authorize with credentials"
-                }),
-                labelPosition: "center"
-            }),
-            /*#__PURE__*/ jsxRuntime.jsxs(core$1.Group, {
-                children: [
-                    /*#__PURE__*/ jsxRuntime.jsx(core$1.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__*/ jsxRuntime.jsx(md.MdClose, {
-                            onClick: ()=>setCredentials(''),
-                            className: "cursor-pointer",
-                            "data-testid": "search-input-clear-search"
-                        })
-                    }),
-                    /*#__PURE__*/ jsxRuntime.jsx(core$1.FileButton, {
-                        onChange: setSelectedFile,
-                        accept: "application/json",
-                        children: (props)=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
-                                ...props,
-                                children: "Upload File"
-                            })
-                    }),
-                    /*#__PURE__*/ jsxRuntime.jsx(core$1.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;
@@ -1647,7 +1426,8 @@ function hashCode(str) {
         case "markdown":
             {
                 return /*#__PURE__*/ jsxRuntime.jsx(MarkdownContent, {
-                    content: text
+                    content: text,
+                    className: className
                 });
             }
         case "textWithEmail":
@@ -1736,6 +1516,245 @@ function hashCode(str) {
     }
 };
 
+const logninExtraText = (extra)=>{
+    return extra?.map((content, index)=>/*#__PURE__*/ React.createElement(TextContent, {
+            ...content,
+            key: index
+        }));
+};
+const LoginProviderMultipleItems = ({ provider, handleLoginSelected, loginProviderExtra })=>{
+    const [value, setValue] = React.useState(null);
+    const extra = loginProviderExtra && loginProviderExtra[provider.name];
+    return /*#__PURE__*/ jsxRuntime.jsxs("div", {
+        className: "flex flex-col w-full font-medium hover:text-accent-light hover:font-bold",
+        children: [
+            extra && logninExtraText(extra),
+            /*#__PURE__*/ jsxRuntime.jsx(core$1.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__*/ jsxRuntime.jsxs(core$1.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__*/ jsxRuntime.jsxs(React.Fragment, {
+        children: [
+            extra && logninExtraText(extra),
+            /*#__PURE__*/ jsxRuntime.jsxs(core$1.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 } = core.useGetLoginProvidersQuery();
+    if (isError) {
+        return /*#__PURE__*/ jsxRuntime.jsx(core$1.Center, {
+            children: /*#__PURE__*/ jsxRuntime.jsx(ErrorCard, {
+                message: 'request to authentication service failed'
+            })
+        });
+    }
+    if (isLoading || isFetching) {
+        return /*#__PURE__*/ jsxRuntime.jsx(core$1.LoadingOverlay, {
+            visible: !isSuccess
+        });
+    }
+    if (isSuccess && !data) {
+        return /*#__PURE__*/ jsxRuntime.jsx(core$1.Center, {
+            children: /*#__PURE__*/ jsxRuntime.jsx(ErrorCard, {
+                message: 'no logins defined'
+            })
+        });
+    }
+    return /*#__PURE__*/ jsxRuntime.jsx(core$1.Box, {
+        className: "flex flex-col items-center justify-center",
+        children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Stack, {
+            align: "center",
+            className: "w-1/3",
+            children: [
+                data && data.default_provider.urls.length > 1 ? /*#__PURE__*/ jsxRuntime.jsx(LoginProviderMultipleItems, {
+                    provider: data.default_provider,
+                    handleLoginSelected: handleLoginSelected,
+                    loginProviderExtra: loginProviderExtra
+                }) : data && /*#__PURE__*/ jsxRuntime.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__*/ jsxRuntime.jsx(LoginProviderMultipleItems, {
+                        provider: x,
+                        handleLoginSelected: handleLoginSelected,
+                        loginProviderExtra: loginProviderExtra
+                    }, x.name) : /*#__PURE__*/ jsxRuntime.jsx(LoginProviderSingleItem, {
+                        provider: x,
+                        handleLoginSelected: handleLoginSelected,
+                        loginProviderExtra: loginProviderExtra
+                    }, x.name))
+            ]
+        })
+    });
+};
+
+const TexturedSidePanel = ({ url })=>{
+    return /*#__PURE__*/ jsxRuntime.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 = React.useContext(SessionContext);
+    const [credentials, setCredentials] = React.useState(null);
+    const [selectedFile, setSelectedFile] = React.useState(null);
+    const [isLoading, setIsLoading] = React.useState(false);
+    const { basePath } = router.useRouter();
+    React.useEffect(()=>{
+        if (selectedFile) {
+            readFileContent(selectedFile, setCredentials);
+        }
+    }, [
+        selectedFile
+    ]);
+    const handleCredentialsLogin = React.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.notifications.show({
+                    title: CREDENTIALS_LOGIN_ERROR,
+                    message: response.statusText
+                });
+            } else {
+                updateSession();
+                handleLogin();
+            }
+        } catch (error) {
+            if (error instanceof Error) {
+                notifications.notifications.show({
+                    title: FORMAT_ERROR,
+                    message: INVALID_JSON_MESSAGE
+                });
+            }
+        } finally{
+            setIsLoading(false);
+        }
+    }, [
+        handleLogin,
+        sessionContext?.updateSession,
+        basePath
+    ]);
+    return /*#__PURE__*/ jsxRuntime.jsxs(core$1.Box, {
+        className: "flex flex-col items-center justify-center my-2",
+        children: [
+            /*#__PURE__*/ jsxRuntime.jsx(core$1.Divider, {
+                color: "black",
+                size: "md",
+                className: "w-1/3",
+                label: /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
+                    size: "md",
+                    c: "primary.4",
+                    children: "Authorize with credentials"
+                }),
+                labelPosition: "center"
+            }),
+            /*#__PURE__*/ jsxRuntime.jsxs(core$1.Group, {
+                children: [
+                    /*#__PURE__*/ jsxRuntime.jsx(core$1.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__*/ jsxRuntime.jsx(md.MdClose, {
+                            onClick: ()=>setCredentials(''),
+                            className: "cursor-pointer",
+                            "data-testid": "search-input-clear-search"
+                        })
+                    }),
+                    /*#__PURE__*/ jsxRuntime.jsx(core$1.FileButton, {
+                        onChange: setSelectedFile,
+                        accept: "application/json",
+                        children: (props)=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
+                                ...props,
+                                children: "Upload File"
+                            })
+                    }),
+                    /*#__PURE__*/ jsxRuntime.jsx(core$1.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
@@ -1784,7 +1803,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$1 = router.useRouter();
     const { query: { referer: refererQuery, redirect: redirectQuery } } = router$1;
     const referer = redirectQuery || refererQuery; // either referer or redirect query param
@@ -1825,7 +1844,8 @@ const LoginPanel = (loginConfig)=>{
                             key: index
                         })),
                     /*#__PURE__*/ jsxRuntime.jsx(LoginProvidersPanel, {
-                        handleLoginSelected: handleFenceLoginSelected
+                        handleLoginSelected: handleFenceLoginSelected,
+                        loginProviderExtra: loginProviderExtra
                     }),
                     loginConfig?.showCredentialsLogin && process.env.NODE_ENV === 'development' && /*#__PURE__*/ jsxRuntime.jsx(CredentialsLogin, {
                         handleLogin: handleCredentialsLogin
@@ -9441,19 +9461,24 @@ class DiscoveryCellRendererFactory {
 };
 
 const DiscoveryContext = /*#__PURE__*/ React.createContext({
-    discoveryConfig: {}
+    discoveryConfig: {},
+    selectedTags: {},
+    setSelectedTags: ()=>{}
 });
 const useDiscoveryContext = ()=>{
     const context = React.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] = React.useState({});
     return /*#__PURE__*/ jsxRuntime.jsx(DiscoveryContext.Provider, {
         value: {
-            discoveryConfig: discoveryIndexConfig
+            discoveryConfig: discoveryIndexConfig,
+            selectedTags,
+            setSelectedTags
         },
         children: children
     });
@@ -10319,17 +10344,71 @@ const HighlightSearchTerm = (value, searchTerm)=>{
     });
 };
 
-const RowDetailPanel = ({ row, config, searchTerm })=>{
+const RowDetailPanelTags = ({ rowTags })=>{
+    const { discoveryConfig: config, selectedTags, setSelectedTags } = useDiscoveryContext();
+    return /*#__PURE__*/ jsxRuntime.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__*/ jsxRuntime.jsx(core$1.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__*/ jsxRuntime.jsx(core$1.Box, {
-            display: 'flex',
-            w: '100%',
-            children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
-                size: "xs",
-                lineClamp: 2,
-                children: HighlightSearchTerm(studyPreviewData, searchTerm)
-            })
+        return /*#__PURE__*/ jsxRuntime.jsxs(jsxRuntime.Fragment, {
+            children: [
+                /*#__PURE__*/ jsxRuntime.jsx(core$1.Box, {
+                    display: 'flex',
+                    w: '100%',
+                    children: /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
+                        size: "xs",
+                        lineClamp: 2,
+                        children: HighlightSearchTerm(studyPreviewData, searchTerm)
+                    })
+                }),
+                /*#__PURE__*/ jsxRuntime.jsx(RowDetailPanelTags, {
+                    rowTags: row.original.tags
+                })
+            ]
         });
     } else {
         return undefined;
@@ -10426,7 +10505,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__*/ jsxRuntime.jsx(RowDetailPanel, {
                 row: row,
-                config: config,
                 searchTerm: searchTerm
             }),
         onRowSelectionChange: setRowSelection,
@@ -12739,47 +12817,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] = React.useState([]);
+    const prevSelectionsRef = React.useRef([]);
     React.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] = React.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__*/ jsxRuntime.jsx("div", {
         children: /*#__PURE__*/ jsxRuntime.jsx(core$1.MultiSelect, {
             placeholder: category.categoryDisplayName,
             value: containerSelections,
-            onChange: (value)=>handleChange(category.categoryDisplayName, value),
+            onChange: (value)=>handleChange(value),
             clearable: true,
             searchable: true,
             data: containerData,
@@ -12793,20 +12868,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__*/ jsxRuntime.jsx("div", {
-        children: /*#__PURE__*/ jsxRuntime.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__*/ jsxRuntime.jsx("div", {
-                    children: /*#__PURE__*/ jsxRuntime.jsx(MultiSelectContainer, {
-                        category: category,
-                        selectedTags: selectedTags,
-                        setSelectedTags: setSelectedTags
-                    })
-                }, i))
-        })
+        children: tagCategoryData.map((category, i)=>/*#__PURE__*/ jsxRuntime.jsx("div", {
+                children: /*#__PURE__*/ jsxRuntime.jsx(MultiSelectContainer, {
+                    category: category
+                })
+            }, i))
     });
 };
 
@@ -12822,7 +12893,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 = React.useMemo(()=>getDiscoveryDataLoader(discoveryConfig?.features?.dataLoader?.dataFetchFunction) ?? useLoadAllMDSData, [
         discoveryConfig?.features?.dataLoader?.dataFetchFunction
     ]);
@@ -12835,7 +12907,6 @@ const DiscoveryDropdownTagViewer = ({ tagCategoryData, selectedTags, setSelected
     const [debouncedSearchBarTerms] = hooks.useDebouncedValue(searchBarTerms, DEBOUNCE_DELAY_TIME);
     const [selections, setSelections] = React.useState([]); // table selections
     const [sorting, setSorting] = React.useState([]);
-    const [selectedTags, setSelectedTags] = React.useState({});
     const [advancedSearchTerms, setAdvancedSearchTerms] = React.useState({
         operation: SearchCombination.and,
         filters: {}
@@ -12883,153 +12954,148 @@ const DiscoveryDropdownTagViewer = ({ tagCategoryData, selectedTags, setSelected
     const enableSearchableTags = discoveryConfig?.features?.search?.tagSearchDropdown?.enabled;
     return /*#__PURE__*/ jsxRuntime.jsx("div", {
         className: "flex flex-col items-center p-4 w-full bg-base-lightest",
-        children: /*#__PURE__*/ jsxRuntime.jsx(DiscoveryProvider, {
-            discoveryIndexConfig: discoveryConfig,
-            children: /*#__PURE__*/ jsxRuntime.jsx(StudyProvider, {
-                children: /*#__PURE__*/ jsxRuntime.jsxs("div", {
-                    className: "w-full",
-                    children: [
-                        discoveryConfig.features?.pageTitle && discoveryConfig?.features?.pageTitle.enabled ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
-                            size: "xl",
-                            children: discoveryConfig?.features?.pageTitle.text
-                        }) : null,
-                        discoveryConfig.features?.chartsSection?.enabled && /*#__PURE__*/ jsxRuntime.jsx(CollapsableCharts, {
-                            config: discoveryConfig.features?.chartsSection,
-                            data: chartData,
-                            isSuccess: dataRequestStatus.isSuccess
-                        }),
-                        /*#__PURE__*/ jsxRuntime.jsxs("div", {
-                            className: "flex items-center p-2 mb-4 bg-base-max rounded-lg",
-                            children: [
-                                indexSelector,
-                                /*#__PURE__*/ jsxRuntime.jsx(SummaryStatisticPanel, {
-                                    summaries: summaryStatistics
-                                }),
-                                enableSearchBar && /*#__PURE__*/ jsxRuntime.jsxs("div", {
-                                    className: "w-3/4 flex flex-col",
-                                    children: [
-                                        /*#__PURE__*/ jsxRuntime.jsxs(core$1.Grid, {
-                                            children: [
-                                                /*#__PURE__*/ jsxRuntime.jsx(core$1.Grid.Col, {
-                                                    span: {
-                                                        md: enableSearchableTags ? 7 : 10,
-                                                        sm: 12
-                                                    },
-                                                    children: /*#__PURE__*/ jsxRuntime.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__*/ jsxRuntime.jsxs(core$1.Grid.Col, {
-                                                    span: {
-                                                        sm: 12,
-                                                        md: 5
+        children: /*#__PURE__*/ jsxRuntime.jsx(StudyProvider, {
+            children: /*#__PURE__*/ jsxRuntime.jsxs("div", {
+                className: "w-full",
+                children: [
+                    discoveryConfig.features?.pageTitle && discoveryConfig?.features?.pageTitle.enabled ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Text, {
+                        size: "xl",
+                        children: discoveryConfig?.features?.pageTitle.text
+                    }) : null,
+                    discoveryConfig.features?.chartsSection?.enabled && /*#__PURE__*/ jsxRuntime.jsx(CollapsableCharts, {
+                        config: discoveryConfig.features?.chartsSection,
+                        data: chartData,
+                        isSuccess: dataRequestStatus.isSuccess
+                    }),
+                    /*#__PURE__*/ jsxRuntime.jsxs("div", {
+                        className: "flex items-center p-2 mb-4 bg-base-max rounded-lg",
+                        children: [
+                            indexSelector,
+                            /*#__PURE__*/ jsxRuntime.jsx(SummaryStatisticPanel, {
+                                summaries: summaryStatistics
+                            }),
+                            enableSearchBar && /*#__PURE__*/ jsxRuntime.jsxs("div", {
+                                className: "w-3/4 flex flex-col",
+                                children: [
+                                    /*#__PURE__*/ jsxRuntime.jsxs(core$1.Grid, {
+                                        children: [
+                                            /*#__PURE__*/ jsxRuntime.jsx(core$1.Grid.Col, {
+                                                span: {
+                                                    md: enableSearchableTags ? 7 : 10,
+                                                    sm: 12
+                                                },
+                                                children: /*#__PURE__*/ jsxRuntime.jsx(SearchInputWithSuggestions, {
+                                                    searchBarTerms: searchBarTerms,
+                                                    setSearchBarTerms: setSearchBarTerms,
+                                                    suggestions: suggestions,
+                                                    clearSearch: ()=>{
+                                                        setSearchBarTerms([]);
                                                     },
-                                                    className: "md:mt-5 sm:mt-1",
-                                                    children: [
-                                                        /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
-                                                            onClick: ()=>setSelectedTags({}),
-                                                            variant: "outline",
-                                                            leftSection: /*#__PURE__*/ jsxRuntime.jsx(io.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__*/ jsxRuntime.jsx(core$1.Button, {
-                                                            className: "mt-1",
-                                                            onClick: ()=>setIsDropdownTagViewerOpen((prev)=>!prev),
-                                                            disabled: data.length === 0,
-                                                            variant: "outline",
-                                                            leftSection: isDropdownTagViewerOpen ? /*#__PURE__*/ jsxRuntime.jsx(io.IoIosArrowUp, {}) : /*#__PURE__*/ jsxRuntime.jsx(io.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__*/ jsxRuntime.jsx(SearchInputSelectableFields, {
-                                            searchMode: searchMode,
-                                            setSearchMode: setSearchMode,
-                                            searchableTextFields: discoveryConfig?.features?.search?.searchBar?.searchableTextFields,
-                                            searchableAndSelectableTextFields: discoveryConfig?.features?.search?.searchBar?.searchableAndSelectableTextFields,
-                                            setSelectedFieldsForSearchIndexing: setSelectedFieldsForSearchIndexing
-                                        }),
-                                        /*#__PURE__*/ jsxRuntime.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__*/ jsxRuntime.jsx(DiscoveryDropdownTagViewer, {
-                                                tagCategoryData: tagCategoryData,
-                                                selectedTags: selectedTags,
-                                                setSelectedTags: setSelectedTags
+                                            }),
+                                            enableSearchableTags && /*#__PURE__*/ jsxRuntime.jsxs(core$1.Grid.Col, {
+                                                span: {
+                                                    sm: 12,
+                                                    md: 5
+                                                },
+                                                className: "md:mt-5 sm:mt-1",
+                                                children: [
+                                                    /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
+                                                        onClick: ()=>setSelectedTags({}),
+                                                        variant: "outline",
+                                                        leftSection: /*#__PURE__*/ jsxRuntime.jsx(io.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__*/ jsxRuntime.jsx(core$1.Button, {
+                                                        className: "mt-1",
+                                                        onClick: ()=>setIsDropdownTagViewerOpen((prev)=>!prev),
+                                                        disabled: data.length === 0,
+                                                        variant: "outline",
+                                                        leftSection: isDropdownTagViewerOpen ? /*#__PURE__*/ jsxRuntime.jsx(io.IoIosArrowUp, {}) : /*#__PURE__*/ jsxRuntime.jsx(io.IoIosArrowDown, {}),
+                                                        children: `${discoveryConfig?.features?.search?.tagSearchDropdown?.collapsibleButtonText || 'Tag Panel'}`
+                                                    })
+                                                ]
                                             })
+                                        ]
+                                    }),
+                                    /*#__PURE__*/ jsxRuntime.jsx(SearchInputSelectableFields, {
+                                        searchMode: searchMode,
+                                        setSearchMode: setSearchMode,
+                                        searchableTextFields: discoveryConfig?.features?.search?.searchBar?.searchableTextFields,
+                                        searchableAndSelectableTextFields: discoveryConfig?.features?.search?.searchBar?.searchableAndSelectableTextFields,
+                                        setSelectedFieldsForSearchIndexing: setSelectedFieldsForSearchIndexing
+                                    }),
+                                    /*#__PURE__*/ jsxRuntime.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__*/ jsxRuntime.jsx(DiscoveryDropdownTagViewer, {
+                                            tagCategoryData: tagCategoryData
                                         })
-                                    ]
-                                })
-                            ]
-                        }),
-                        discoveryConfig?.features?.aiSearch && /*#__PURE__*/ jsxRuntime.jsx("div", {
-                            className: "mb-4",
-                            children: /*#__PURE__*/ jsxRuntime.jsx("div", {
-                                className: "flex w-full bg-base-max p-4 rounded-lg",
-                                children: /*#__PURE__*/ jsxRuntime.jsx(AiSearch, {})
-                            })
-                        }),
-                        /*#__PURE__*/ jsxRuntime.jsxs("div", {
-                            className: "flex flex-row",
-                            children: [
-                                discoveryConfig?.features?.advSearchFilters?.enabled ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
-                                    onClick: toggleAdvancedSearch,
-                                    color: "accent",
-                                    children: "Filters"
-                                }) : false,
-                                discoveryConfig?.features?.exportFromDiscovery?.enabled ? /*#__PURE__*/ jsxRuntime.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__*/ jsxRuntime.jsxs("div", {
-                            className: "flex justify-start",
-                            children: [
-                                discoveryConfig?.features?.advSearchFilters?.enabled ? /*#__PURE__*/ jsxRuntime.jsx(AdvancedSearchPanel, {
-                                    advSearchFilters: advancedSearchFilterValues,
-                                    opened: showAdvancedSearch,
-                                    setAdvancedSearchFilters: setAdvancedSearchTerms
-                                }) : false,
-                                /*#__PURE__*/ jsxRuntime.jsx("div", {
-                                    className: "flex w-full grow-0 bg-base-max border-1 border-base-lighter p-4 rounded-md",
-                                    ref: parentDivRef,
-                                    children: /*#__PURE__*/ jsxRuntime.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__*/ jsxRuntime.jsx("div", {
+                        className: "mb-4",
+                        children: /*#__PURE__*/ jsxRuntime.jsx("div", {
+                            className: "flex w-full bg-base-max p-4 rounded-lg",
+                            children: /*#__PURE__*/ jsxRuntime.jsx(AiSearch, {})
                         })
-                    ]
-                })
+                    }),
+                    /*#__PURE__*/ jsxRuntime.jsxs("div", {
+                        className: "flex flex-row",
+                        children: [
+                            discoveryConfig?.features?.advSearchFilters?.enabled ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Button, {
+                                onClick: toggleAdvancedSearch,
+                                color: "accent",
+                                children: "Filters"
+                            }) : false,
+                            discoveryConfig?.features?.exportFromDiscovery?.enabled ? /*#__PURE__*/ jsxRuntime.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__*/ jsxRuntime.jsxs("div", {
+                        className: "flex justify-start",
+                        children: [
+                            discoveryConfig?.features?.advSearchFilters?.enabled ? /*#__PURE__*/ jsxRuntime.jsx(AdvancedSearchPanel, {
+                                advSearchFilters: advancedSearchFilterValues,
+                                opened: showAdvancedSearch,
+                                setAdvancedSearchFilters: setAdvancedSearchTerms
+                            }) : false,
+                            /*#__PURE__*/ jsxRuntime.jsx("div", {
+                                className: "flex w-full grow-0 bg-base-max border-1 border-base-lighter p-4 rounded-md",
+                                ref: parentDivRef,
+                                children: /*#__PURE__*/ jsxRuntime.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
+                                })
+                            })
+                        ]
+                    })
+                ]
             })
         })
     });
@@ -17981,6 +18047,7 @@ const useSetCohortFilterCombineState = (index)=>{
 
 const QueryExpressionContext = /*#__PURE__*/ React.createContext({
     displayOnly: false,
+    fieldsAreFlat: true,
     cohortId: null,
     cohortName: 'default',
     shouldShowSummary: ()=>false,
@@ -18098,7 +18165,7 @@ const isNestedFilter = (x)=>{
 };
 const IncludeExcludeQueryElement = ({ index, field, path, operator, operands, displayOnly = false })=>{
     const [queryExpressionsExpanded, setQueryExpressionsExpanded] = React.useContext(QueryExpressionsExpandedContext);
-    const { cohortId: currentCohortId, useRemoveFilter, useUpdateFilters, shouldShowSummary } = React.useContext(QueryExpressionContext);
+    const { cohortId: currentCohortId, useRemoveFilter, useUpdateFilters, shouldShowSummary, fieldsAreFlat } = React.useContext(QueryExpressionContext);
     const removeCohortFilter = useRemoveFilter();
     const updateCohortFilter = useUpdateFilters();
     useDeepCompare.useDeepCompareEffect(()=>{
@@ -18209,7 +18276,11 @@ const IncludeExcludeQueryElement = ({ index, field, path, operator, operands, di
                                     });
                                     removeCohortFilter(index, fieldToUpdate);
                                 } else {
-                                    updateCohortFilter(index, fieldToUpdate, core.buildNestedFilterForOperation(fieldToUpdate, {
+                                    updateCohortFilter(index, fieldToUpdate, fieldsAreFlat ? {
+                                        operator: operator,
+                                        field: field,
+                                        operands: newOperands
+                                    } : core.buildNestedFilterForOperation(fieldToUpdate, {
                                         operator: operator,
                                         field: field,
                                         operands: newOperands
@@ -18782,7 +18853,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] = React.useReducer(reducer, {});
     const [filtersSectionCollapsed, setFiltersSectionCollapsed] = React.useState(true);
     const filtersRef = React.useRef(null);
@@ -18946,7 +19017,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 = core.useCoreSelector((state)=>core.selectCurrentCohortId(state));
     const currentCohortName = core.useCoreSelector((state)=>core.selectCurrentCohortName(state));
     return /*#__PURE__*/ jsxRuntime.jsx(QueryExpressionContext.Provider, {
@@ -18954,6 +19025,7 @@ const QueryExpression = ({ index, shouldShowSummary = DefaultShouldShowSummary,
             cohortName: currentCohortName,
             cohortId: currentCohortId,
             displayOnly: false,
+            fieldsAreFlat: fieldsAreFlat,
             shouldShowSummary: shouldShowSummary,
             useClearCohortFilters: ()=>{
                 const dispatch = core.useCoreDispatch();
@@ -28272,7 +28344,7 @@ const useUnsecureRoundedAggsQuery = ({ type, fields, filters, accessibility = co
     };
 };
 
-const CohortQueryExpression = ({ index })=>{
+const CohortQueryExpression = ({ index, fieldsAreFlat = true })=>{
     const currentCohortId = useAppSelector((state)=>selectCurrentCohortId(state));
     const currentCohortName = useAppSelector((state)=>selectCurrentCohortName(state));
     return /*#__PURE__*/ jsxRuntime.jsx("div", {
@@ -28282,6 +28354,7 @@ const CohortQueryExpression = ({ index })=>{
                 cohortName: currentCohortName,
                 cohortId: currentCohortId,
                 displayOnly: false,
+                fieldsAreFlat: true,
                 useClearCohortFilters: ()=>{
                     const dispatch = useAppDispatch();
                     return (index)=>dispatch(clearCohortFilters({
@@ -30772,42 +30845,46 @@ const Discovery = ({ discoveryConfig })=>{
     }
     if (menuItems.length === 1) {
         // no need for tabs
-        return /*#__PURE__*/ jsxRuntime.jsx(DiscoveryIndexPanel, {
-            discoveryConfig: discoveryConfig.metadataConfig[0],
-            indexSelector: null
+        return /*#__PURE__*/ jsxRuntime.jsx(DiscoveryProvider, {
+            discoveryIndexConfig: discoveryConfig.metadataConfig[0],
+            children: /*#__PURE__*/ jsxRuntime.jsx(DiscoveryIndexPanel, {
+                indexSelector: null
+            })
         });
     }
-    return /*#__PURE__*/ jsxRuntime.jsx("div", {
-        className: "flex flex-col items-center p-4 w-full bg-base-lightest",
-        children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Tabs, {
-            className: "w-full",
-            defaultValue: metadataIndex,
-            variant: discoveryConfig.metadataConfig[0]?.tabType,
-            onChange: (v)=>{
-                setMetadataIndex(v ?? '0');
-            },
-            children: [
-                /*#__PURE__*/ jsxRuntime.jsx(core$1.Tabs.List, {
-                    children: menuItems.map((item)=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Tabs.Tab, {
+    return /*#__PURE__*/ jsxRuntime.jsx(DiscoveryProvider, {
+        discoveryIndexConfig: discoveryConfig.metadataConfig[0],
+        children: /*#__PURE__*/ jsxRuntime.jsx("div", {
+            className: "flex flex-col items-center p-4 w-full bg-base-lightest",
+            children: /*#__PURE__*/ jsxRuntime.jsxs(core$1.Tabs, {
+                className: "w-full",
+                defaultValue: metadataIndex,
+                variant: discoveryConfig.metadataConfig[0]?.tabType,
+                onChange: (v)=>{
+                    setMetadataIndex(v ?? '0');
+                },
+                children: [
+                    /*#__PURE__*/ jsxRuntime.jsx(core$1.Tabs.List, {
+                        children: menuItems.map((item)=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Tabs.Tab, {
+                                value: item.value,
+                                children: item.label
+                            }, item.value))
+                    }),
+                    menuItems.map((item, i)=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Tabs.Panel, {
                             value: item.value,
-                            children: item.label
+                            children: /*#__PURE__*/ jsxRuntime.jsx(DiscoveryIndexPanel, {
+                                indexSelector: menuItems.length < 0 ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Select, {
+                                    label: "Metadata:",
+                                    data: menuItems,
+                                    value: metadataIndex,
+                                    onChange: (v)=>{
+                                        setMetadataIndex(v ?? '0');
+                                    }
+                                }) : null
+                            })
                         }, item.value))
-                }),
-                menuItems.map((item, i)=>/*#__PURE__*/ jsxRuntime.jsx(core$1.Tabs.Panel, {
-                        value: item.value,
-                        children: /*#__PURE__*/ jsxRuntime.jsx(DiscoveryIndexPanel, {
-                            discoveryConfig: discoveryConfig.metadataConfig[Number.parseInt(item.value)],
-                            indexSelector: menuItems.length < 0 ? /*#__PURE__*/ jsxRuntime.jsx(core$1.Select, {
-                                label: "Metadata:",
-                                data: menuItems,
-                                value: metadataIndex,
-                                onChange: (v)=>{
-                                    setMetadataIndex(v ?? '0');
-                                }
-                            }) : null
-                        })
-                    }, item.value))
-            ]
+                ]
+            })
         })
     });
 };
@@ -30864,7 +30941,7 @@ const DiscoveryPageGetServerSideProps = async ()=>{
     }
 };
 
-const QueryPanel = dynamic(()=>Promise.resolve().then(function () { return require('./QueryPanel-BwtKHbn1.js'); }), {
+const QueryPanel = dynamic(()=>Promise.resolve().then(function () { return require('./QueryPanel-sz-FVioZ.js'); }), {
     ssr: false
 });
 const QueryPage = ({ headerProps, footerProps, queryProps })=>{
@@ -36100,7 +36177,8 @@ const TabbedCohortBuilderPage = ({ headerProps, footerProps, configuration })=>{
                             })
                         }),
                         /*#__PURE__*/ jsxRuntime.jsx(QueryExpression, {
-                            index: configuration.index
+                            index: configuration.index,
+                            fieldsAreFlat: configuration.fieldsAreFlat
                         })
                     ]
                 }),
@@ -36781,4 +36859,4 @@ exports.useUpdateFilters = useUpdateFilters$1;
 exports.useUpdateFiltersFlat = useUpdateFiltersFlat;
 exports.userHasMethodForServiceOnResource = userHasMethodForServiceOnResource$1;
 exports.validateObjectHasRequiredFields = validateObjectHasRequiredFields;
-//# sourceMappingURL=index-BB8seQLc.js.map
+//# sourceMappingURL=index-Bjn2PM9I.js.map