@gen3/frontend 0.12.65 → 0.12.67

package/dist/dts/pages/StudyForms/VLMDSubmissionAccessRequest/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/pages/StudyForms/VLMDSubmissionAccessRequest/index.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE7D,OAAO,oCAAoC,MAAM,mEAAmE,CAAC;AAOrH,MAAM,mCAAmC,GAAG,CAAC,EAC3C,WAAW,EACX,WAAW,EACX,MAAM,GACmC,EAAE,EAAE;IAC7C,OAAO,CACL,KAAC,aAAa,IACN,WAAW,EAAE,WAAW,EAC9B,cAAc,EAAE;YACd,KAAK,EAAE,iBAAiB;YACxB,OAAO,EAAE,YAAY;YACrB,GAAG,EAAE,iBAAiB;SACvB,YAED,KAAC,oCAAoC,IAAC,MAAM,EAAE,MAAM,GAAI,GAC1C,CACjB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,mCAAmC,CAAC"}

package/dist/index/cjs/{QueryPanel-DNGXxrpC.js → QueryPanel-aGaJfxNv.js}

@@ -10,7 +10,7 @@ function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 var dynamic__default = /*#__PURE__*/_interopDefault(dynamic);
 
 // Wrapper function for displaying loading element before GqlQueryEditor renders
-const GqlQueryEditor = dynamic__default.default(()=>Promise.resolve().then(function () { return require('./index-7sUtTikC.js'); }).then(function (n) { return n.GqlQueryEditor$1; }), {
+const GqlQueryEditor = dynamic__default.default(()=>Promise.resolve().then(function () { return require('./index-Br1lKHDn.js'); }).then(function (n) { return n.GqlQueryEditor$1; }), {
     loading: ()=>/*#__PURE__*/ jsxRuntime.jsx(core.LoadingOverlay, {
             visible: true
         }),
@@ -40,4 +40,4 @@ const GqlQueryEditor = dynamic__default.default(()=>Promise.resolve().then(funct
 };
 
 exports.default = QueryPanel;
-//# sourceMappingURL=QueryPanel-DNGXxrpC.js.map
+//# sourceMappingURL=QueryPanel-aGaJfxNv.js.map

package/dist/index/cjs/{QueryPanel-DNGXxrpC.js.map → QueryPanel-aGaJfxNv.js.map}

@@ -1 +1 @@
-{"version":3,"file":"QueryPanel-DNGXxrpC.js","sources":["../../../src/features/Query/QueryPanel.tsx"],"sourcesContent":["import dynamic from 'next/dynamic';\nimport React from 'react';\nimport { LoadingOverlay } from '@mantine/core';\nimport type { QueryPanelConfiguration } from './types';\n\n// Wrapper function for displaying loading element before GqlQueryEditor renders\nconst GqlQueryEditor = dynamic(() => import('./GqlQueryEditor'), {\n  loading: () => <LoadingOverlay visible={true} />,\n  ssr: false,\n});\n\n/**\n * Represents the QueryPanel component responsible for rendering a GraphQL query editor.\n *\n * @param {QueryPanelConfiguration} config - The configuration object for the QueryPanel.\n * @param {Array<{ url: string, label: string }>} [config.graphQLEndpoints=[{ url: 'guppy/graphql', label: 'Flat' }]]\n *        An array of GraphQL endpoint objects. Each endpoint object contains the following:\n *        - `url` (string): The URL of the GraphQL endpoint. Note this should only be the Gen3 service path (e.g., 'guppy/graphql').\n *        - `label` (string): A label for the GraphQL endpoint.\n *\n * @returns {React.Element} The rendered GraphQL query editor.\n */\n\nconst QueryPanel = ({\n  graphQLEndpoints = [{ url: 'guppy/graphql', label: 'Flat' }],\n}: QueryPanelConfiguration) => {\n  // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n  // @ts-ignore\n  return <GqlQueryEditor graphQLEndpoints={graphQLEndpoints} />;\n};\n\nexport default QueryPanel;\n"],"names":["GqlQueryEditor","dynamic","loading","_jsx","LoadingOverlay","visible","ssr","QueryPanel","graphQLEndpoints","url","label"],"mappings":";;;;;;;;;;;AAKA;AACA,MAAMA,cAAAA,GAAiBC,wBAAAA,CAAQ,IAAM,oDAAO,qBAAA,uDAAA,EAAqB;AAC/DC,IAAAA,OAAAA,EAAS,kBAAMC,cAAA,CAACC,mBAAAA,EAAAA;YAAeC,OAAAA,EAAS;;IACxCC,GAAAA,EAAK;AACP,CAAA,CAAA;AAEA;;;;;;;;;;AAUC,IAED,MAAMC,UAAAA,GAAa,CAAC,EAClBC,gBAAAA,GAAmB;AAAC,IAAA;QAAEC,GAAAA,EAAK,eAAA;QAAiBC,KAAAA,EAAO;AAAO;CAAE,EACpC,GAAA;;;AAGxB,IAAA,qBAAOP,cAAA,CAACH,cAAAA,EAAAA;QAAeQ,gBAAAA,EAAkBA;;AAC3C;;;;"}
+{"version":3,"file":"QueryPanel-aGaJfxNv.js","sources":["../../../src/features/Query/QueryPanel.tsx"],"sourcesContent":["import dynamic from 'next/dynamic';\nimport React from 'react';\nimport { LoadingOverlay } from '@mantine/core';\nimport type { QueryPanelConfiguration } from './types';\n\n// Wrapper function for displaying loading element before GqlQueryEditor renders\nconst GqlQueryEditor = dynamic(() => import('./GqlQueryEditor'), {\n  loading: () => <LoadingOverlay visible={true} />,\n  ssr: false,\n});\n\n/**\n * Represents the QueryPanel component responsible for rendering a GraphQL query editor.\n *\n * @param {QueryPanelConfiguration} config - The configuration object for the QueryPanel.\n * @param {Array<{ url: string, label: string }>} [config.graphQLEndpoints=[{ url: 'guppy/graphql', label: 'Flat' }]]\n *        An array of GraphQL endpoint objects. Each endpoint object contains the following:\n *        - `url` (string): The URL of the GraphQL endpoint. Note this should only be the Gen3 service path (e.g., 'guppy/graphql').\n *        - `label` (string): A label for the GraphQL endpoint.\n *\n * @returns {React.Element} The rendered GraphQL query editor.\n */\n\nconst QueryPanel = ({\n  graphQLEndpoints = [{ url: 'guppy/graphql', label: 'Flat' }],\n}: QueryPanelConfiguration) => {\n  // eslint-disable-next-line @typescript-eslint/ban-ts-comment\n  // @ts-ignore\n  return <GqlQueryEditor graphQLEndpoints={graphQLEndpoints} />;\n};\n\nexport default QueryPanel;\n"],"names":["GqlQueryEditor","dynamic","loading","_jsx","LoadingOverlay","visible","ssr","QueryPanel","graphQLEndpoints","url","label"],"mappings":";;;;;;;;;;;AAKA;AACA,MAAMA,cAAAA,GAAiBC,wBAAAA,CAAQ,IAAM,oDAAO,qBAAA,uDAAA,EAAqB;AAC/DC,IAAAA,OAAAA,EAAS,kBAAMC,cAAA,CAACC,mBAAAA,EAAAA;YAAeC,OAAAA,EAAS;;IACxCC,GAAAA,EAAK;AACP,CAAA,CAAA;AAEA;;;;;;;;;;AAUC,IAED,MAAMC,UAAAA,GAAa,CAAC,EAClBC,gBAAAA,GAAmB;AAAC,IAAA;QAAEC,GAAAA,EAAK,eAAA;QAAiBC,KAAAA,EAAO;AAAO;CAAE,EACpC,GAAA;;;AAGxB,IAAA,qBAAOP,cAAA,CAACH,cAAAA,EAAAA;QAAeQ,gBAAAA,EAAkBA;;AAC3C;;;;"}

package/dist/index/cjs/{index-7sUtTikC.js → index-Br1lKHDn.js}

@@ -7909,6 +7909,7 @@ const OverflowTooltippedLabel = ({ children, label, className = 'flex-grow font-
 
 const QueryExpressionContext = /*#__PURE__*/ React__namespace.default.createContext({
     displayOnly: false,
+    showLogicalOperators: false,
     fieldsAreFlat: true,
     cohortId: null,
     cohortName: 'default',
@@ -7969,6 +7970,12 @@ const QueryExpressionsExpandedContext = /*#__PURE__*/ React__namespace.default.c
     ()=>null
 ]);
 
+const LogicalOperatorLabel = ({ operator, className = '' })=>/*#__PURE__*/ jsxRuntime.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__*/ jsxRuntime.jsx(core.ActionIcon, {
         size: "xs",
         color: "base.0",
@@ -8030,9 +8037,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] = React.useContext(QueryExpressionsExpandedContext);
-    const { cohortId: currentCohortId, useRemoveFilter, useUpdateFilters, shouldShowSummary, fieldsAreFlat } = React.useContext(QueryExpressionContext);
+    const { cohortId: currentCohortId, useRemoveFilter, useUpdateFilters, shouldShowSummary, fieldsAreFlat, showLogicalOperators } = React.useContext(QueryExpressionContext);
     const removeCohortFilter = useRemoveFilter();
     const updateCohortFilter = useUpdateFilters();
     useDeepCompare.useDeepCompareEffect(()=>{
@@ -8123,45 +8144,45 @@ const IncludeExcludeQueryElement = ({ index, field, path, operator, operands, di
                     gap: "xs",
                     children: operandsArray.map((x, i)=>{
                         const value = x.toString();
-                        return /*#__PURE__*/ jsxRuntime.jsx(core.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__*/ jsxRuntime.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
-                                    } : core$1.buildNestedFilterForOperation(fieldToUpdate, {
-                                        operator: operator,
-                                        field: field,
-                                        operands: newOperands
-                                    }));
-                                }
-                            },
-                            children: /*#__PURE__*/ jsxRuntime.jsx(OverflowTooltippedLabel, {
-                                label: value,
-                                className: "flex-grow text-md font-content",
-                                children: /*#__PURE__*/ jsxRuntime.jsx(QueryRepresentationLabel, {
-                                    value: value.toString(),
-                                    field: field
+                        return /*#__PURE__*/ jsxRuntime.jsxs(React__namespace.default.Fragment, {
+                            children: [
+                                showLogicalOperators && i > 0 && /*#__PURE__*/ jsxRuntime.jsx(LogicalOperatorLabel, {
+                                    operator: combineMode
+                                }),
+                                /*#__PURE__*/ jsxRuntime.jsx(core.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__*/ jsxRuntime.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 : core$1.buildNestedFilterForOperation(fieldToUpdate, updatedOperation));
+                                        }
+                                    },
+                                    children: /*#__PURE__*/ jsxRuntime.jsx(OverflowTooltippedLabel, {
+                                        label: value,
+                                        className: "flex-grow text-md font-content",
+                                        children: /*#__PURE__*/ jsxRuntime.jsx(QueryRepresentationLabel, {
+                                            value: value.toString(),
+                                            field: field
+                                        })
+                                    })
                                 })
-                            })
+                            ]
                         }, `query-rep-${field}-${value}-${i}`);
                     })
                 })
@@ -8409,6 +8430,25 @@ const QueryElement = ({ index, field, path, children, displayOnly = false })=>{
                     upper: f.operands[1]
                 }, f.operands[0].field);
             }
+            const enumOperands = f.operands.filter(core$1.isIncludes);
+            const field = enumOperands[0]?.field;
+            if (enumOperands.length === f.operands.length && field && enumOperands.every((operand)=>operand.field === field)) {
+                return /*#__PURE__*/ jsxRuntime.jsx(QueryElement, {
+                    field: field,
+                    index: this.index,
+                    path: this.path,
+                    displayOnly: this.displayOnly,
+                    children: /*#__PURE__*/ jsxRuntime.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;
         };
@@ -8725,7 +8765,7 @@ const QueryExpressionSection = ({ index, showImportExport = false, displayOnly =
     const [filtersSectionCollapsed, setFiltersSectionCollapsed] = React.useState(true);
     const filtersRef = React.useRef(null);
     const [QESectionHeight, setQESectionHeight] = React.useState(0);
-    const { cohortName, cohortId, useClearCohortFilters, useGetFilters } = React.useContext(QueryExpressionContext);
+    const { cohortName, cohortId, showLogicalOperators, useClearCohortFilters, useGetFilters } = React.useContext(QueryExpressionContext);
     const clearCohortFilters = useClearCohortFilters();
     const filters = useGetFilters(index);
     useDeepCompare.useDeepCompareEffect(()=>{
@@ -8866,8 +8906,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__*/ jsxRuntime.jsxs(React__namespace.default.Fragment, {
+                                children: [
+                                    showLogicalOperators && indexInFilters > 0 && /*#__PURE__*/ jsxRuntime.jsx(LogicalOperatorLabel, {
+                                        operator: filters.mode,
+                                        className: "mr-1 mb-2"
+                                    }),
+                                    convertFilterToComponent(filters.root[k], index, '.', displayOnly)
+                                ]
+                            }, k);
                         })
                     })
                 ]
@@ -8914,7 +8962,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 = core$1.useCoreSelector((state)=>core$1.selectCurrentCohortId(state));
     const currentCohortName = core$1.useCoreSelector((state)=>core$1.selectCurrentCohortName(state));
     return /*#__PURE__*/ jsxRuntime.jsx(QueryExpressionContext.Provider, {
@@ -8922,6 +8970,7 @@ const QueryExpression = ({ index, shouldShowSummary = DefaultShouldShowSummary,
             cohortName: currentCohortName,
             cohortId: currentCohortId,
             displayOnly: false,
+            showLogicalOperators,
             fieldsAreFlat: fieldsAreFlat,
             shouldShowSummary: shouldShowSummary,
             useClearCohortFilters: ()=>{
@@ -9423,6 +9472,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])),
@@ -10727,7 +10777,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__default.default.div`
 text-secondary-contrast font-heading font-semibold text-sm break-words
 `;
@@ -10850,12 +10900,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__*/ jsxRuntime.jsx(react.Icon, {
-                                width: 12,
-                                height: 12,
-                                icon: "gen3:settings",
+                            children: /*#__PURE__*/ jsxRuntime.jsx(md.MdSettings, {
+                                size: "1.35em",
+                                className: header.iconStyle,
                                 "aria-hidden": "true"
                             })
                         })
@@ -12214,8 +12263,8 @@ const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false
     const searchInputRef = React.useRef(null);
     const settingRef = React.useRef(null);
     const [searchTerm, setSearchTerm] = React.useState('');
-    // const [combineMode, setCombineMode] = useState<'or' | 'and'>('or');
     const { data, enumFilters, combineMode, isSuccess, error } = hooks.useGetFacetData(field);
+    const [selectedCombineMode, setSelectedCombineMode] = React.useState(combineMode ?? 'or');
     const [selectedEnums, setSelectedEnums] = React.useState(enumFilters ?? []);
     const totalCount = hooks?.useTotalCounts ? hooks.useTotalCounts() : 1;
     const clearFilters = hooks.useClearFilter();
@@ -12249,6 +12298,17 @@ const FacetEnumList = ({ field, facetName, hooks, valueLabel, isSettings = false
     }, [
         enumFilters
     ]);
+    React.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$2;
     // update filters when checkbox is selected
     const handleChange = (value, checked)=>{
@@ -12263,13 +12323,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] = React.useState({
@@ -12404,23 +12466,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__*/ jsxRuntime.jsx(core.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__*/ jsxRuntime.jsx(react.Icon, {
                                         icon: "gen3:info",
                                         height: 12,
@@ -13256,6 +13319,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 ?? [],
@@ -17482,17 +17546,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 = core$1.useCoreSelector((state)=>core$1.selectUserDetails(state));
     const requiresLogin = !userInfo.active;
     const { discoveryConfig: config } = useDiscoveryContext();
+    const router$1 = router.useRouter();
     const index = config.minimalFieldMapping.uid;
     const { studyDetails } = useStudyContext();
     const studyUID = _.toString(studyDetails[index]);
@@ -17500,44 +17558,55 @@ const StudyDetailsHeaderButtons = ({ onClose, permalink })=>{
     const studyRegistrationAuthZ = studyDetails.registration_authz;
     const studyProjectNumber = studyDetails.project_number;
     const showSubmitButton = config.detailView.showSubmitButton;
-    const router$1 = router.useRouter();
-    const isStudyRegisterable = userCanRegisterStudy(userInfo, studyRegistrationAuthZ);
-    const handleRegisterButtonClick = ()=>{
+    const userAuthMapping = core$1.useCoreSelector((state)=>core$1.selectAuthzMappingData(state));
+    const userHasStudyRegistrationAccess = core$1.userHasMethodForServiceOnResource('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$1.push('/Login');
-        } else if (isStudyRegisterable) {
+        } else if (userHasStudyRegistrationAccess) {
             void router$1.push({
                 pathname: '/study-reg',
-                query: {
-                    studyUID: studyUID,
-                    studyName: studyName,
-                    studyRegistrationAuthZ: studyRegistrationAuthZ,
-                    studyProjectNumber: studyProjectNumber
-                }
+                query: studyNavQuery
             }, '/study-reg');
         } else {
             void router$1.push({
                 pathname: '/study-reg/request-access',
-                query: {
-                    studyUID: studyUID,
-                    studyName: studyName,
-                    studyRegistrationAuthZ: studyRegistrationAuthZ,
-                    studyProjectNumber: studyProjectNumber
-                }
+                query: studyNavQuery
             }, '/study-reg/request-access');
         }
     };
-    const submitButtonText = React.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$1.push({
+            pathname: '/vlmd-submission',
+            query: studyNavQuery
+        }, '/vlmd-submission');
+    };
+    const handleRequestVLMDAccessClick = ()=>{
+        void router$1.push({
+            pathname: '/vlmd-submission/request-access',
+            query: studyNavQuery
+        }, '/vlmd-submission/request-access');
+    };
+    const studyRegistrationButtonText = React.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__*/ jsxRuntime.jsxs(jsxRuntime.Fragment, {
         children: [
@@ -17547,15 +17616,45 @@ const StudyDetailsHeaderButtons = ({ onClose, permalink })=>{
                 variant: "outline",
                 children: "Back"
             }),
-            showSubmitButton && /*#__PURE__*/ jsxRuntime.jsx(core.Button, {
+            showStudyRegistrationButton && /*#__PURE__*/ jsxRuntime.jsx(core.Button, {
                 leftSection: /*#__PURE__*/ jsxRuntime.jsx(fi.FiLogIn, {
                     size: 14
                 }),
                 variant: "subtle",
                 color: "black",
                 size: "xs",
-                onClick: handleRegisterButtonClick,
-                children: submitButtonText
+                onClick: handleStudyRegistrationClick,
+                children: studyRegistrationButtonText
+            }),
+            showSubmitVLMDButton && /*#__PURE__*/ jsxRuntime.jsx(core.Button, {
+                leftSection: /*#__PURE__*/ jsxRuntime.jsx(fi.FiLogIn, {
+                    size: 14
+                }),
+                variant: "subtle",
+                color: "black",
+                size: "xs",
+                onClick: handleSubmitVLMDClick,
+                children: "Submit Variable-level Metadata"
+            }),
+            showRequestVLMDAccessButton && /*#__PURE__*/ jsxRuntime.jsx(core.Button, {
+                leftSection: /*#__PURE__*/ jsxRuntime.jsx(fi.FiLogIn, {
+                    size: 14
+                }),
+                variant: "subtle",
+                color: "black",
+                size: "xs",
+                onClick: handleRequestVLMDAccessClick,
+                children: "Request Access to Submit Variable-level Metadata"
+            }),
+            showLoginToSubmitVLMDButton && /*#__PURE__*/ jsxRuntime.jsx(core.Button, {
+                leftSection: /*#__PURE__*/ jsxRuntime.jsx(fi.FiLogIn, {
+                    size: 14
+                }),
+                variant: "subtle",
+                color: "black",
+                size: "xs",
+                onClick: ()=>void router$1.push('/Login'),
+                children: "Login to Submit Variable-level Metadata"
             }),
             /*#__PURE__*/ jsxRuntime.jsx(core.CopyButton, {
                 value: permalink,
@@ -30064,7 +30163,7 @@ const DiscoveryPageGetServerSideProps = async ()=>{
     }
 };
 
-const QueryPanel = dynamic__default.default(()=>Promise.resolve().then(function () { return require('./QueryPanel-DNGXxrpC.js'); }), {
+const QueryPanel = dynamic__default.default(()=>Promise.resolve().then(function () { return require('./QueryPanel-aGaJfxNv.js'); }), {
     ssr: false
 });
 const QueryPage = ({ headerProps, footerProps, configuration: queryProps })=>{
@@ -32779,7 +32878,7 @@ const AdminAuthZPageGetServerSideProps = async ()=>{
  * @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) {
@@ -32905,7 +33004,8 @@ const AdminAuthZPageGetServerSideProps = async ()=>{
                     disabled: disabled || form.submitting,
                     required: required,
                     inputContainer: inputContainer,
-                    ...form.getInputProps(keyString)
+                    ...form.getInputProps(keyString),
+                    autosize: autosize
                 }, form.key(keyString));
             }
         default:
@@ -34051,7 +34151,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);
 };
 
@@ -42114,4 +42214,4 @@ exports.useUpdateFiltersFlat = useUpdateFiltersFlat;
 exports.userHasMethodForServiceOnResource = userHasMethodForServiceOnResource$1;
 exports.validateObjectHasRequiredFields = validateObjectHasRequiredFields;
 exports.withBasePath = withBasePath;
-//# sourceMappingURL=index-7sUtTikC.js.map
+//# sourceMappingURL=index-Br1lKHDn.js.map