@gen3/frontend 0.12.65 → 0.12.67

package/dist/pages/esm/{index-BoZwM5wd.js → index-CxrByAhv.js}

@@ -10,7 +10,7 @@ import _, { toString, capitalize as capitalize$1, isArray, omitBy, some, isNumbe
 import Link from 'next/link';
 import { FaExternalLinkAlt, FaExclamationTriangle, FaExclamation, FaQuestion, FaAngleDoubleLeft, FaAngleDoubleRight, FaCaretDown, FaEyeSlash, FaEye, FaExclamationCircle, FaPencilAlt, FaUndo, FaPlus, FaCircle, FaVideo, FaRegQuestionCircle, FaGraduationCap, FaUser, FaRegStopCircle } from 'react-icons/fa';
 import { Icon } from '@iconify-icon/react';
-import { useCoreSelector, selectUserDetails, selectUserAuthStatus, isAuthenticated, WorkspaceStatus, useGetAuthzResourcesQuery, useUserRequestQuery, useCreateRequestMutation, getRemoteSupportServiceRegistry, isHttpStatusError, GEN3_COMMONS_NAME, useAskQuestionMutation, useGetAggsQuery, Accessibility, useGetStatsAggregationsQuery, fieldNameToLabel, isObject as isObject$1, isIncludes, selectAvailableCohorts, useLazyGetObjectIdsQuery, EmptyFilterSet as EmptyFilterSet$1, selectCurrentCohortFilters, useCustomRangeQuery, usePrevious, selectCohortFilters, filterSetToOperation, useCoreDispatch, selectAllCohorts as selectAllCohorts$1, selectCurrentCohort as selectCurrentCohort$1, setCurrentCohortId as setCurrentCohortId$1, updateCohortName as updateCohortName$1, createNewCohort as createNewCohort$1, duplicateCohort, removeCohort as removeCohort$1, setCohortFilter as setCohortFilter$1, updateCohortFilter as updateCohortFilter$1, removeCohortFilter as removeCohortFilter$1, clearCohortFilters as clearCohortFilters$1, handleOperation, buildNestedFilterForOperation, selectCurrentCohortId, selectCurrentCohortModified, selectCurrentCohortSaved, setCohortIndexFilters, toggleCohortBuilderCategoryFilter, selectCohortFilterExpanded, setCohortFilterCombineMode, selectCohortFilterCombineMode, selectCurrentCohortName, selectShouldShareFilters, selectSharedFilters, useLazyGetCountsQuery, selectIndexFilters, isOperationWithField, extractEnumFilterValue, selectIndexedFilterByName, isOperatorWithFieldAndArrayOfOperands, trimFirstfieldNameToLabel, setShouldShareFilters, CohortStorage, createAppStore, GEN3_API, GEN3_FENCE_API, useIsUserLoggedIn, GEN3_DOMAIN, DataLibraryStoreMode, useDataLibrary, buildListItemsGroupedByDataset, extractFileDatasetsInRecords, useGetMDSQuery, selectAuthzMappingData, useGetAggMDSQuery, useGetIndexAggMDSQuery, useGetRawDataAndTotalCountsQuery, humanify, selectCart, selectCartItem, removeItemsFromCart, CART_LIMIT, addItemsToCart, isJSONValue, showModal, Modals, downloadFromGuppyToBlob, downloadJSONDataFromGuppy, coreStore, fetchJSONDataFromURL, GEN3_MANIFEST_API, useGetCountsQuery, isIntersection, useGeneralGQLQuery, convertFilterSetToGqlFilter, customQueryStrForField, selectAllCohortFiltersCollapsed, toggleCohortBuilderAllFilters, getGen3AppId, createAppApiForRTKQ, useGetDictionaryQuery, hideModal, GEN3_GUPPY_API, HttpMethod, groupSharedFields, useGetCSRFQuery, useGetCredentialsQuery, useRemoveCredentialMutation, useAddNewCredentialMutation, selectCurrentModal, useGetAuthzMappingsQuery, useGetExternalLoginsQuery, useGetLoginProvidersQuery, GEN3_REDIRECT_URL, useGetProjectsDetailsQuery, useGetSubmissionsQuery, useLaunchWorkspaceMutation, useTerminateWorkspaceMutation, useGetWorkspacePayModelsQuery, selectActiveWorkspaceStatus, setRequestedWorkspaceStatus, RequestedWorkspaceStatus, setActiveWorkspaceStatus, isFetchBaseQueryError, isSerializedError, normalizeRtkError, setActiveWorkspace, getCurrentTimestamp, selectWorkspaceStatusFromService, selectRequestedWorkspaceStatus, selectActiveWorkspaceId, useGetWorkspaceOptionsQuery, useGetWorkspaceStatusQuery, GEN3_WORKSPACE_API, useSetCurrentPayModelMutation, PodStatus, PodConditionType, isWorkspaceRunningOrStopping, isCohortItem, isFileItem, fetchFencePresignedURL, HTTPError, HTTPUserFriendlyErrorMessages, getFederatedLoginStatus, queryMultipleMDSRecords, extractIndexFromDataLibraryCohort, isFilterSet, getNumberOfItemsInDatalist, isAdditionalDataItem, useLazyGetCrosswalkDataQuery, selectHeadersWithCSRFToken, selectCSRFToken } from '@gen3/core';
+import { useCoreSelector, selectUserDetails, selectUserAuthStatus, isAuthenticated, WorkspaceStatus, useGetAuthzResourcesQuery, useUserRequestQuery, useCreateRequestMutation, getRemoteSupportServiceRegistry, isHttpStatusError, GEN3_COMMONS_NAME, useAskQuestionMutation, useGetAggsQuery, Accessibility, useGetStatsAggregationsQuery, fieldNameToLabel, isObject as isObject$1, isIncludes, selectAvailableCohorts, useLazyGetObjectIdsQuery, EmptyFilterSet as EmptyFilterSet$1, selectCurrentCohortFilters, useCustomRangeQuery, usePrevious, selectCohortFilters, filterSetToOperation, useCoreDispatch, selectAllCohorts as selectAllCohorts$1, selectCurrentCohort as selectCurrentCohort$1, setCurrentCohortId as setCurrentCohortId$1, updateCohortName as updateCohortName$1, createNewCohort as createNewCohort$1, duplicateCohort, removeCohort as removeCohort$1, setCohortFilter as setCohortFilter$1, updateCohortFilter as updateCohortFilter$1, removeCohortFilter as removeCohortFilter$1, clearCohortFilters as clearCohortFilters$1, handleOperation, buildNestedFilterForOperation, selectCurrentCohortId, selectCurrentCohortModified, selectCurrentCohortSaved, setCohortIndexFilters, toggleCohortBuilderCategoryFilter, selectCohortFilterExpanded, setCohortFilterCombineMode, selectCohortFilterCombineMode, selectCurrentCohortName, selectShouldShareFilters, selectSharedFilters, useLazyGetCountsQuery, selectIndexFilters, isOperationWithField, extractEnumFilterValue, selectIndexedFilterByName, isOperatorWithFieldAndArrayOfOperands, trimFirstfieldNameToLabel, setShouldShareFilters, CohortStorage, createAppStore, GEN3_API, GEN3_FENCE_API, selectAuthzMappingData, userHasMethodForServiceOnResource as userHasMethodForServiceOnResource$1, useIsUserLoggedIn, GEN3_DOMAIN, DataLibraryStoreMode, useDataLibrary, buildListItemsGroupedByDataset, extractFileDatasetsInRecords, useGetMDSQuery, useGetAggMDSQuery, useGetIndexAggMDSQuery, useGetRawDataAndTotalCountsQuery, humanify, selectCart, selectCartItem, removeItemsFromCart, CART_LIMIT, addItemsToCart, isJSONValue, showModal, Modals, downloadFromGuppyToBlob, downloadJSONDataFromGuppy, coreStore, fetchJSONDataFromURL, GEN3_MANIFEST_API, useGetCountsQuery, isIntersection, useGeneralGQLQuery, convertFilterSetToGqlFilter, customQueryStrForField, selectAllCohortFiltersCollapsed, toggleCohortBuilderAllFilters, getGen3AppId, createAppApiForRTKQ, useGetDictionaryQuery, hideModal, GEN3_GUPPY_API, HttpMethod, groupSharedFields, useGetCSRFQuery, useGetCredentialsQuery, useRemoveCredentialMutation, useAddNewCredentialMutation, selectCurrentModal, useGetAuthzMappingsQuery, useGetExternalLoginsQuery, useGetLoginProvidersQuery, GEN3_REDIRECT_URL, useGetProjectsDetailsQuery, useGetSubmissionsQuery, useLaunchWorkspaceMutation, useTerminateWorkspaceMutation, useGetWorkspacePayModelsQuery, selectActiveWorkspaceStatus, setRequestedWorkspaceStatus, RequestedWorkspaceStatus, setActiveWorkspaceStatus, isFetchBaseQueryError, isSerializedError, normalizeRtkError, setActiveWorkspace, getCurrentTimestamp, selectWorkspaceStatusFromService, selectRequestedWorkspaceStatus, selectActiveWorkspaceId, useGetWorkspaceOptionsQuery, useGetWorkspaceStatusQuery, GEN3_WORKSPACE_API, useSetCurrentPayModelMutation, PodStatus, PodConditionType, isWorkspaceRunningOrStopping, isCohortItem, isFileItem, fetchFencePresignedURL, HTTPError, HTTPUserFriendlyErrorMessages, getFederatedLoginStatus, queryMultipleMDSRecords, extractIndexFromDataLibraryCohort, isFilterSet, getNumberOfItemsInDatalist, isAdditionalDataItem, useLazyGetCrosswalkDataQuery, selectHeadersWithCSRFToken, selectCSRFToken } from '@gen3/core';
 import { useDeepCompareMemo, useDeepCompareEffect, useDeepCompareCallback } from 'use-deep-compare';
 import 'swr';
 import { getCookie } from 'cookies-next';
@@ -21,7 +21,7 @@ import { notifications, cleanNotifications, showNotification } from '@mantine/no
 import { useResizeObserver, useElementSize, useClickOutside, useScrollIntoView, useDisclosure, useDidUpdate, mergeRefs, useReducedMotion, useDebouncedValue, useViewportSize, useMediaQuery, useLocalStorage, useClipboard, useFullscreenDocument, getHotkeyHandler } from '@mantine/hooks';
 import { modals } from '@mantine/modals';
 import Markdown from 'react-markdown';
-import { MdLogin, MdInfo, MdClose, MdKeyboardArrowUp, MdKeyboardArrowDown, MdPlayArrow, MdArrowDropDown, MdAddCircle, MdRemoveCircle, MdSearch, MdDownload, MdTrendingDown, MdReplay, MdHorizontalSplit, MdOutlineHorizontalSplit, MdBarChart, MdAdd, MdContentCopy, MdOutlineArrowBack, MdOutlineArrowForward, MdWarning, MdExpandLess, MdExpandMore, MdFlip, MdLockOutline, MdLibraryAdd, MdKeyboardDoubleArrowLeft, MdOutlineWatchLater, MdOutlineLockOpen, MdOutlineLock, MdUndo, MdDragIndicator, MdShoppingCart, MdPerson, MdSave, MdGroup, MdOutlineBarChart, MdOutlineSearch, MdFormatQuote, MdDelete, MdOutlineRemoveCircle } from 'react-icons/md';
+import { MdLogin, MdInfo, MdClose, MdKeyboardArrowUp, MdKeyboardArrowDown, MdPlayArrow, MdArrowDropDown, MdAddCircle, MdRemoveCircle, MdSearch, MdDownload, MdTrendingDown, MdReplay, MdHorizontalSplit, MdOutlineHorizontalSplit, MdBarChart, MdAdd, MdContentCopy, MdOutlineArrowBack, MdOutlineArrowForward, MdWarning, MdExpandLess, MdExpandMore, MdSettings, MdFlip, MdLockOutline, MdLibraryAdd, MdKeyboardDoubleArrowLeft, MdOutlineWatchLater, MdOutlineLockOpen, MdOutlineLock, MdUndo, MdDragIndicator, MdShoppingCart, MdPerson, MdSave, MdGroup, MdOutlineBarChart, MdOutlineSearch, MdFormatQuote, MdDelete, MdOutlineRemoveCircle } from 'react-icons/md';
 import { AiOutlineLogin, AiOutlineDash } from 'react-icons/ai';
 import { PiDotsThreeCircleThin, PiTrash, PiSparkleFill, PiCaretUpFill, PiCaretDownFill, PiCaretUpDownFill, PiCaretCircleDownFill } from 'react-icons/pi';
 import Head from 'next/head';
@@ -1825,7 +1825,7 @@ function hashCode(str) {
  * @param {string} props.keyString - For mantine form to identify elements
  * @param {FormContentProps['form']} props.form - @mantine/form useForm() object
  * @returns {JSX.Element} A JSX element that renders the content dynamically based on the input type and properties.
- */ const FormContent = ({ text, label, initialValue, dropdownData, description, placeholder, disabled, required, tooltip, className = '', type = ContentType.Text, keyString, form })=>{
+ */ const FormContent = ({ text, label, initialValue, dropdownData, description, placeholder, disabled, required, tooltip, className = '', autosize = false, type = ContentType.Text, keyString, form })=>{
     //code for tooltips on form items
     let inputContainer;
     if (tooltip) {
@@ -1951,7 +1951,8 @@ function hashCode(str) {
                     disabled: disabled || form.submitting,
                     required: required,
                     inputContainer: inputContainer,
-                    ...form.getInputProps(keyString)
+                    ...form.getInputProps(keyString),
+                    autosize: autosize
                 }, form.key(keyString));
             }
         default:
@@ -8551,6 +8552,7 @@ const OverflowTooltippedLabel = ({ children, label, className = 'flex-grow font-
 
 const QueryExpressionContext = /*#__PURE__*/ React__default.createContext({
     displayOnly: false,
+    showLogicalOperators: false,
     fieldsAreFlat: true,
     cohortId: null,
     cohortName: 'default',
@@ -8611,6 +8613,12 @@ const QueryExpressionsExpandedContext = /*#__PURE__*/ React__default.createConte
     ()=>null
 ]);
 
+const LogicalOperatorLabel = ({ operator, className = '' })=>/*#__PURE__*/ jsx("span", {
+        className: `flex items-center justify-center px-1 text-xs font-bold uppercase text-base-darkest ${className}`,
+        "data-testid": `query-logical-operator-${operator}`,
+        children: operator
+    });
+
 const RemoveButton$1 = ({ value })=>/*#__PURE__*/ jsx(ActionIcon, {
         size: "xs",
         color: "base.0",
@@ -8672,9 +8680,23 @@ const isRangeOperation = (x)=>{
 const isNestedFilter = (x)=>{
     return 'path' in x;
 };
-const IncludeExcludeQueryElement = ({ index, field, path, operator, operands, displayOnly = false })=>{
+const buildSetOperation = (field, operator, operands, combineMode)=>combineMode === 'and' ? {
+        operator: 'and',
+        operands: operands.map((value)=>({
+                operator,
+                field,
+                operands: [
+                    value
+                ]
+            }))
+    } : {
+        operator,
+        field,
+        operands
+    };
+const IncludeExcludeQueryElement = ({ index, field, path, operator, operands, displayOnly = false, combineMode = 'or' })=>{
     const [queryExpressionsExpanded, setQueryExpressionsExpanded] = useContext(QueryExpressionsExpandedContext);
-    const { cohortId: currentCohortId, useRemoveFilter, useUpdateFilters, shouldShowSummary, fieldsAreFlat } = useContext(QueryExpressionContext);
+    const { cohortId: currentCohortId, useRemoveFilter, useUpdateFilters, shouldShowSummary, fieldsAreFlat, showLogicalOperators } = useContext(QueryExpressionContext);
     const removeCohortFilter = useRemoveFilter();
     const updateCohortFilter = useUpdateFilters();
     useDeepCompareEffect(()=>{
@@ -8765,45 +8787,45 @@ const IncludeExcludeQueryElement = ({ index, field, path, operator, operands, di
                     gap: "xs",
                     children: operandsArray.map((x, i)=>{
                         const value = x.toString();
-                        return /*#__PURE__*/ jsx(Badge, {
-                            "data-testid": `query-rep-${field}-${value}-${i}`,
-                            variant: "filled",
-                            color: "accent.5",
-                            size: "md",
-                            className: `normal-case items-center max-w-[162px] cursor-pointer hover:bg-accent-darker pl-2 ${displayOnly ? 'pr-3' : 'pr-0'}`,
-                            rightSection: !displayOnly && /*#__PURE__*/ jsx(RemoveButton$1, {
-                                value: value
-                            }),
-                            onClick: ()=>{
-                                if (displayOnly) return;
-                                const newOperands = operandsArray.filter((o)=>o !== x);
-                                if (currentCohortId && newOperands.length === 0) {
-                                    setQueryExpressionsExpanded({
-                                        type: 'clear',
-                                        cohortId: currentCohortId,
-                                        field: fieldToUpdate
-                                    });
-                                    removeCohortFilter(index, fieldToUpdate);
-                                } else {
-                                    updateCohortFilter(index, fieldToUpdate, fieldsAreFlat ? {
-                                        operator: operator,
-                                        field: field,
-                                        operands: newOperands
-                                    } : buildNestedFilterForOperation(fieldToUpdate, {
-                                        operator: operator,
-                                        field: field,
-                                        operands: newOperands
-                                    }));
-                                }
-                            },
-                            children: /*#__PURE__*/ jsx(OverflowTooltippedLabel, {
-                                label: value,
-                                className: "flex-grow text-md font-content",
-                                children: /*#__PURE__*/ jsx(QueryRepresentationLabel, {
-                                    value: value.toString(),
-                                    field: field
+                        return /*#__PURE__*/ jsxs(React__default.Fragment, {
+                            children: [
+                                showLogicalOperators && i > 0 && /*#__PURE__*/ jsx(LogicalOperatorLabel, {
+                                    operator: combineMode
+                                }),
+                                /*#__PURE__*/ jsx(Badge, {
+                                    "data-testid": `query-rep-${field}-${value}-${i}`,
+                                    variant: "filled",
+                                    color: "accent.5",
+                                    size: "md",
+                                    className: `normal-case items-center max-w-[162px] cursor-pointer hover:bg-accent-darker pl-2 ${displayOnly ? 'pr-3' : 'pr-0'}`,
+                                    rightSection: !displayOnly && /*#__PURE__*/ jsx(RemoveButton$1, {
+                                        value: value
+                                    }),
+                                    onClick: ()=>{
+                                        if (displayOnly) return;
+                                        const newOperands = operandsArray.filter((o)=>o !== x);
+                                        if (currentCohortId && newOperands.length === 0) {
+                                            setQueryExpressionsExpanded({
+                                                type: 'clear',
+                                                cohortId: currentCohortId,
+                                                field: fieldToUpdate
+                                            });
+                                            removeCohortFilter(index, fieldToUpdate);
+                                        } else {
+                                            const updatedOperation = buildSetOperation(field, operator, newOperands, combineMode);
+                                            updateCohortFilter(index, fieldToUpdate, fieldsAreFlat ? updatedOperation : buildNestedFilterForOperation(fieldToUpdate, updatedOperation));
+                                        }
+                                    },
+                                    children: /*#__PURE__*/ jsx(OverflowTooltippedLabel, {
+                                        label: value,
+                                        className: "flex-grow text-md font-content",
+                                        children: /*#__PURE__*/ jsx(QueryRepresentationLabel, {
+                                            value: value.toString(),
+                                            field: field
+                                        })
+                                    })
                                 })
-                            })
+                            ]
                         }, `query-rep-${field}-${value}-${i}`);
                     })
                 })
@@ -9051,6 +9073,25 @@ const QueryElement = ({ index, field, path, children, displayOnly = false })=>{
                     upper: f.operands[1]
                 }, f.operands[0].field);
             }
+            const enumOperands = f.operands.filter(isIncludes);
+            const field = enumOperands[0]?.field;
+            if (enumOperands.length === f.operands.length && field && enumOperands.every((operand)=>operand.field === field)) {
+                return /*#__PURE__*/ jsx(QueryElement, {
+                    field: field,
+                    index: this.index,
+                    path: this.path,
+                    displayOnly: this.displayOnly,
+                    children: /*#__PURE__*/ jsx(IncludeExcludeQueryElement, {
+                        field: field,
+                        operator: enumOperands[0].operator,
+                        operands: enumOperands.flatMap((operand)=>operand.operands),
+                        combineMode: "and",
+                        index: this.index,
+                        path: this.path,
+                        displayOnly: this.displayOnly
+                    })
+                }, field);
+            }
             // TODO: handle deeper nesting
             return null;
         };
@@ -9367,7 +9408,7 @@ const QueryExpressionSection = ({ index, showImportExport = false, displayOnly =
     const [filtersSectionCollapsed, setFiltersSectionCollapsed] = useState(true);
     const filtersRef = useRef(null);
     const [QESectionHeight, setQESectionHeight] = useState(0);
-    const { cohortName, cohortId, useClearCohortFilters, useGetFilters } = useContext(QueryExpressionContext);
+    const { cohortName, cohortId, showLogicalOperators, useClearCohortFilters, useGetFilters } = useContext(QueryExpressionContext);
     const clearCohortFilters = useClearCohortFilters();
     const filters = useGetFilters(index);
     useDeepCompareEffect(()=>{
@@ -9508,8 +9549,16 @@ const QueryExpressionSection = ({ index, showImportExport = false, displayOnly =
                             "data-testid": "text-no-active-cohort-filter",
                             className: "flex items-center font-content h-10",
                             children: "No filters currently applied."
-                        }) : Object.keys(filters.root).map((k)=>{
-                            return convertFilterToComponent(filters.root[k], index, '.', displayOnly);
+                        }) : Object.keys(filters.root).map((k, indexInFilters)=>{
+                            return /*#__PURE__*/ jsxs(React__default.Fragment, {
+                                children: [
+                                    showLogicalOperators && indexInFilters > 0 && /*#__PURE__*/ jsx(LogicalOperatorLabel, {
+                                        operator: filters.mode,
+                                        className: "mr-1 mb-2"
+                                    }),
+                                    convertFilterToComponent(filters.root[k], index, '.', displayOnly)
+                                ]
+                            }, k);
                         })
                     })
                 ]
@@ -9556,7 +9605,7 @@ const SUMMARY_THRESHOLD = 10;
  */ const DefaultShouldShowSummary = (field, count)=>{
     return count > SUMMARY_THRESHOLD;
 };
-const QueryExpression = ({ index, shouldShowSummary = DefaultShouldShowSummary, hooks, fieldsAreFlat = true })=>{
+const QueryExpression = ({ index, shouldShowSummary = DefaultShouldShowSummary, hooks, fieldsAreFlat = true, showLogicalOperators = false })=>{
     const currentCohortId = useCoreSelector((state)=>selectCurrentCohortId(state));
     const currentCohortName = useCoreSelector((state)=>selectCurrentCohortName(state));
     return /*#__PURE__*/ jsx(QueryExpressionContext.Provider, {
@@ -9564,6 +9613,7 @@ const QueryExpression = ({ index, shouldShowSummary = DefaultShouldShowSummary,
             cohortName: currentCohortName,
             cohortId: currentCohortId,
             displayOnly: false,
+            showLogicalOperators,
             fieldsAreFlat: fieldsAreFlat,
             shouldShowSummary: shouldShowSummary,
             useClearCohortFilters: ()=>{
@@ -9859,6 +9909,7 @@ const classifyFacets = (data, index, fieldMapping = [], facetDefinitionsFromConf
                 moveValuesToBottom: facetDef?.moveValuesToBottom,
                 excludeValues: facetDef?.excludeValues,
                 defaultSort: facetDef?.defaultSort,
+                showMatchModeSelector: facetDef?.showMatchModeSelector,
                 valueLabel: facetDef?.valueLabel,
                 range: facetDef?.range ? {
                     minimum: facetDef.range?.minimum ?? Math.floor(Number(value[0].key[0])),
@@ -11121,7 +11172,7 @@ inline-flex
 items-center
 hover:text-primary-lightest
 `;
-const controlsIconStyle = 'text-secondary-contrast hover:text-secondary-lighter';
+const controlsIconStyle = 'text-secondary-contrast hover:text-secondary-contrast-lighter';
 const FacetText = tw.div`
 text-secondary-contrast font-heading font-semibold text-sm break-words
 `;
@@ -11244,12 +11295,11 @@ flex items-start justify-between items-center flex-nowrap bg-secondary px-1.5 ro
                                 if (toggleExpandFilter) toggleExpandFilter(field, true);
                                 if (toggleSettings) toggleSettings();
                             },
-                            "aria-label": "Search",
+                            "aria-label": "Filter settings",
                             className: header.iconStyle,
-                            children: /*#__PURE__*/ jsx(Icon, {
-                                width: 12,
-                                height: 12,
-                                icon: "gen3:settings",
+                            children: /*#__PURE__*/ jsx(MdSettings, {
+                                size: "1.35em",
+                                className: header.iconStyle,
                                 "aria-hidden": "true"
                             })
                         })
@@ -12570,8 +12620,8 @@ const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false
     const searchInputRef = useRef(null);
     const settingRef = useRef(null);
     const [searchTerm, setSearchTerm] = useState('');
-    // const [combineMode, setCombineMode] = useState<'or' | 'and'>('or');
     const { data, enumFilters, combineMode, isSuccess, error } = hooks.useGetFacetData(field);
+    const [selectedCombineMode, setSelectedCombineMode] = useState(combineMode ?? 'or');
     const [selectedEnums, setSelectedEnums] = useState(enumFilters ?? []);
     const totalCount = hooks?.useTotalCounts ? hooks.useTotalCounts() : 1;
     const clearFilters = hooks.useClearFilter();
@@ -12605,6 +12655,17 @@ const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false
     }, [
         enumFilters
     ]);
+    useEffect(()=>{
+        // Existing filters are the source of truth when loading or externally
+        // updating a cohort. Keep a user's selected mode when the facet is empty
+        // so they can choose "Match all" before selecting values.
+        if ((enumFilters?.length ?? 0) > 0) {
+            setSelectedCombineMode(combineMode ?? 'or');
+        }
+    }, [
+        combineMode,
+        enumFilters
+    ]);
     const maxValuesToDisplay = DEFAULT_VISIBLE_ITEMS$1;
     // update filters when checkbox is selected
     const handleChange = (value, checked)=>{
@@ -12619,13 +12680,15 @@ const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false
             ] : [
                 value
             ];
-            updateFacetEnum(field, updated, updateFacetFilters, clearFilters, combineMode);
+            updateFacetEnum(field, updated, updateFacetFilters, clearFilters, selectedCombineMode);
         } else {
             const updated = selectedEnums?.filter((x)=>x !== value);
-            updateFacetEnum(field, updated ?? [], updateFacetFilters, clearFilters, combineMode);
+            updateFacetEnum(field, updated ?? [], updateFacetFilters, clearFilters, selectedCombineMode);
         }
     };
     const handleCombineModeChange = (mode)=>{
+        setSelectedCombineMode(mode);
+        if ((selectedEnums?.length ?? 0) === 0) return;
         updateFacetEnum(field, selectedEnums ?? [], updateFacetFilters, clearFilters, mode);
     };
     const [facetChartData, setFacetChartData] = useState({
@@ -12760,23 +12823,24 @@ const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false
                                         indicator: 'bg-accent text-accent-contrast'
                                     },
                                     ref: settingRef,
-                                    value: combineMode,
+                                    value: selectedCombineMode,
+                                    "aria-label": "How selected facet values are matched",
                                     onChange: (value)=>{
                                         handleCombineModeChange(value);
                                     },
                                     data: [
                                         {
-                                            label: 'AND',
-                                            value: 'and'
+                                            label: 'Match any',
+                                            value: 'or'
                                         },
                                         {
-                                            label: 'OR',
-                                            value: 'or'
+                                            label: 'Match all',
+                                            value: 'and'
                                         }
                                     ]
                                 }),
                                 /*#__PURE__*/ jsx(Tooltip, {
-                                    label: "Combine filters with AND or OR 2",
+                                    label: "Match any includes cases with at least one selected value. Match all requires every selected value.",
                                     children: /*#__PURE__*/ jsx(Icon, {
                                         icon: "gen3:info",
                                         height: 12,
@@ -13612,6 +13676,7 @@ const createFacetCard = ({ facetDefinition, valueLabel, hooks: dataFunctions, fa
                 width: width,
                 hooks: dataFunctions,
                 showPercent: showPercent,
+                showSettings: facetDefinition?.showMatchModeSelector,
                 sharedWithIndices: facetDefinition?.sharedWithIndices,
                 defaultSort: facetDefinition?.defaultSort,
                 moveValuesToBottom: facetDefinition?.moveValuesToBottom ?? [],
@@ -16417,17 +16482,11 @@ const SinglePageStudyDetailsPanel = ({ data, studyConfig, authorization })=>{
     });
 };
 
-const userCanRegisterStudy = (userInfo, studyRegistrationAuthZ)=>{
-    const actions = userInfo?.authz && studyRegistrationAuthZ ? userInfo.authz[studyRegistrationAuthZ] : undefined;
-    const method = 'access';
-    const service = 'study_registration';
-    return actions?.some((x)=>(x.service === service || x.service === '*') && (x.method === method || x.method === '*')) ?? false;
-};
-
 const StudyDetailsHeaderButtons = ({ onClose, permalink })=>{
     const userInfo = useCoreSelector((state)=>selectUserDetails(state));
     const requiresLogin = !userInfo.active;
     const { discoveryConfig: config } = useDiscoveryContext();
+    const router = useRouter();
     const index = config.minimalFieldMapping.uid;
     const { studyDetails } = useStudyContext();
     const studyUID = toString(studyDetails[index]);
@@ -16435,44 +16494,55 @@ const StudyDetailsHeaderButtons = ({ onClose, permalink })=>{
     const studyRegistrationAuthZ = studyDetails.registration_authz;
     const studyProjectNumber = studyDetails.project_number;
     const showSubmitButton = config.detailView.showSubmitButton;
-    const router = useRouter();
-    const isStudyRegisterable = userCanRegisterStudy(userInfo, studyRegistrationAuthZ);
-    const handleRegisterButtonClick = ()=>{
+    const userAuthMapping = useCoreSelector((state)=>selectAuthzMappingData(state));
+    const userHasStudyRegistrationAccess = userHasMethodForServiceOnResource$1('access', 'study_registration', toString(studyRegistrationAuthZ), userAuthMapping);
+    const isStudyRegistered = studyDetails.is_registered;
+    // Study is not yet registered — show register/request-access/login button
+    const showStudyRegistrationButton = showSubmitButton && isStudyRegistered === false;
+    // Study is registered — show appropriate VLMD submission button based on auth state
+    const showSubmitVLMDButton = showSubmitButton && isStudyRegistered && !requiresLogin && userHasStudyRegistrationAccess;
+    const showRequestVLMDAccessButton = showSubmitButton && isStudyRegistered && !requiresLogin && !userHasStudyRegistrationAccess;
+    const showLoginToSubmitVLMDButton = showSubmitButton && isStudyRegistered && requiresLogin;
+    const studyNavQuery = {
+        studyUID,
+        studyName,
+        studyRegistrationAuthZ: toString(studyRegistrationAuthZ),
+        studyProjectNumber
+    };
+    const handleStudyRegistrationClick = ()=>{
         if (requiresLogin) {
             void router.push('/Login');
-        } else if (isStudyRegisterable) {
+        } else if (userHasStudyRegistrationAccess) {
             void router.push({
                 pathname: '/study-reg',
-                query: {
-                    studyUID: studyUID,
-                    studyName: studyName,
-                    studyRegistrationAuthZ: studyRegistrationAuthZ,
-                    studyProjectNumber: studyProjectNumber
-                }
+                query: studyNavQuery
             }, '/study-reg');
         } else {
             void router.push({
                 pathname: '/study-reg/request-access',
-                query: {
-                    studyUID: studyUID,
-                    studyName: studyName,
-                    studyRegistrationAuthZ: studyRegistrationAuthZ,
-                    studyProjectNumber: studyProjectNumber
-                }
+                query: studyNavQuery
             }, '/study-reg/request-access');
         }
     };
-    const submitButtonText = useMemo(()=>{
-        if (requiresLogin) {
-            return 'Login to Register This Study';
-        } else if (isStudyRegisterable) {
-            return 'Register Study';
-        } else {
-            return `Request Access to Register this Study`;
-        }
+    const handleSubmitVLMDClick = ()=>{
+        void router.push({
+            pathname: '/vlmd-submission',
+            query: studyNavQuery
+        }, '/vlmd-submission');
+    };
+    const handleRequestVLMDAccessClick = ()=>{
+        void router.push({
+            pathname: '/vlmd-submission/request-access',
+            query: studyNavQuery
+        }, '/vlmd-submission/request-access');
+    };
+    const studyRegistrationButtonText = useMemo(()=>{
+        if (requiresLogin) return 'Login to Register This Study';
+        if (userHasStudyRegistrationAccess) return 'Register This Study';
+        return 'Request Access to Register This Study';
     }, [
         requiresLogin,
-        isStudyRegisterable
+        userHasStudyRegistrationAccess
     ]);
     return /*#__PURE__*/ jsxs(Fragment, {
         children: [
@@ -16482,15 +16552,45 @@ const StudyDetailsHeaderButtons = ({ onClose, permalink })=>{
                 variant: "outline",
                 children: "Back"
             }),
-            showSubmitButton && /*#__PURE__*/ jsx(Button, {
+            showStudyRegistrationButton && /*#__PURE__*/ jsx(Button, {
                 leftSection: /*#__PURE__*/ jsx(FiLogIn, {
                     size: 14
                 }),
                 variant: "subtle",
                 color: "black",
                 size: "xs",
-                onClick: handleRegisterButtonClick,
-                children: submitButtonText
+                onClick: handleStudyRegistrationClick,
+                children: studyRegistrationButtonText
+            }),
+            showSubmitVLMDButton && /*#__PURE__*/ jsx(Button, {
+                leftSection: /*#__PURE__*/ jsx(FiLogIn, {
+                    size: 14
+                }),
+                variant: "subtle",
+                color: "black",
+                size: "xs",
+                onClick: handleSubmitVLMDClick,
+                children: "Submit Variable-level Metadata"
+            }),
+            showRequestVLMDAccessButton && /*#__PURE__*/ jsx(Button, {
+                leftSection: /*#__PURE__*/ jsx(FiLogIn, {
+                    size: 14
+                }),
+                variant: "subtle",
+                color: "black",
+                size: "xs",
+                onClick: handleRequestVLMDAccessClick,
+                children: "Request Access to Submit Variable-level Metadata"
+            }),
+            showLoginToSubmitVLMDButton && /*#__PURE__*/ jsx(Button, {
+                leftSection: /*#__PURE__*/ jsx(FiLogIn, {
+                    size: 14
+                }),
+                variant: "subtle",
+                color: "black",
+                size: "xs",
+                onClick: ()=>void router.push('/Login'),
+                children: "Login to Submit Variable-level Metadata"
             }),
             /*#__PURE__*/ jsx(CopyButton, {
                 value: permalink,
@@ -24303,7 +24403,7 @@ const DiscoveryPageGetServerSideProps = async ()=>{
     }
 };
 
-const QueryPanel = dynamic(()=>import('./QueryPanel-BEqldpr5.js'), {
+const QueryPanel = dynamic(()=>import('./QueryPanel-0Znj4lFa.js'), {
     ssr: false
 });
 const QueryPage = ({ headerProps, footerProps, configuration: queryProps })=>{
@@ -24537,7 +24637,7 @@ const getActiveTab = (router)=>{
     else if (typeof activeTab === 'object') return activeTab[0];
     return undefined;
 };
-const CohortBuilder = dynamic(()=>import('./CohortBuilder-CI9PAFLd.js'), {
+const CohortBuilder = dynamic(()=>import('./CohortBuilder-D3EM-FLr.js'), {
     ssr: false
 });
 const ExplorerPage = ({ headerProps, footerProps, explorerConfig, headerMetadata, tabsLayout, sharedFiltersMap })=>{
@@ -26995,7 +27095,7 @@ const ExternalLoginsStatus = ()=>{
 };
 
 const PaymentNumberToString = (x, undefinedValue = 'N/A', precision = 2)=>{
-    if (!x || Number.isNaN(x)) return undefinedValue;
+    if (typeof x !== 'number' || Number.isNaN(x)) return undefinedValue;
     return x.toFixed(precision);
 };
 
@@ -32386,4 +32486,4 @@ const AnalysisPageGetServerSideProps = async ()=>{
 };
 
 export { ProfilePage as $, AISearchPage as A, ColorThemePageGetServerSideProps as B, CountsValue as C, DropdownPanel as D, ErrorCard as E, CrosswalkPage as F, CrosswalkPageGetServerSideProps as G, Custom403Page as H, Custom403PageGetServerSideProps as I, Custom404Page as J, Custom404PageGetServerSideProps as K, DictionaryPage as L, DataLibraryPage as M, DataLibraryPageGetServerSideProps as N, DictionaryPageGetServerSideProps as O, DiscoveryPageGetServerSideProps as P, QueryExpression as Q, DiscoveryPage as R, ExplorerPage as S, ExplorerPageGetServerSideProps as T, ExplorerPageGetServerSidePropsForConfigId as U, LandingPage as V, LandingPageGetServerSideProps as W, LoginPage as X, LoginPageGetServerSideProps as Y, NotebookLitePage as Z, NotebookLitePageGetStaticProps as _, processRangeData as a, ProfilePageGetServerSideProps as a0, QueryPage as a1, QueryPageGetServerSideProps as a2, RepositoryPage as a3, RepositoryPageGetServerSideProps as a4, SubmissionPageGetServerSideProps as a5, SubmissionPage as a6, TabbedCohortBuilderPage as a7, TabbedCohortBuilderPageGetServerSideProps as a8, WorkspaceNoAccessPage as a9, WorkspaceNoAccessPageServerSideProps as aa, WorkspacePage as ab, WorkspacePageGetServerSideProps as ac, GqlQueryEditor$1 as ad, useToggleExpandFilter as b, useFilterExpandedState as c, useClearFilters as d, extractRangeValues$1 as e, useGetFacetFilters as f, getAllFieldsFromFilterConfigs as g, useUpdateFilters as h, useSetCohortFilterCombineState as i, useCohortFilterCombineState as j, classifyFacets as k, DownloadsPanel as l, CollapsableCharts as m, Charts as n, ExplorerTable as o, processBucketData as p, CohortManager as q, removeIntersectionFromEnum as r, AISearchPageGetServerSideProps as s, toDisplayName$1 as t, useFieldNameToLabel as u, AnalysisPage as v, AnalysisPageGetServerSideProps as w, ClinicalDataAnalysisPage as x, ClinicalDataAnalysisServerSideProps as y, ColorThemePage as z };
-//# sourceMappingURL=index-BoZwM5wd.js.map
+//# sourceMappingURL=index-CxrByAhv.js.map