synapse-react-client 4.0.46 → 4.0.48

package/dist/SWC.index.js

@@ -117,7 +117,7 @@ var x = { BackendDestinationEnum: r }, S = {
 	sendSearchResultsReturnedEvent: y,
 	sendSearchResultReturnedEvent: v,
 	sendSearchResultClickedEvent: _
-}, T = "4.0.46";
+}, T = "4.0.48";
 //#endregion
 export { w as Analytics, a as HttpClient, d as Palettes, o as SynapseClient, C as SynapseComponents, n as SynapseConstants, S as SynapseContext, x as SynapseEnums, m as SynapseQueries, T as SynapseReactClientVersion, p as SynapseSessionManager, i as xssOptions };
 

package/dist/aridhia-queries/useSubmitAridhiaDar.js

@@ -27,8 +27,8 @@ function a(a) {
 		}
 	} }), {
 		...a,
-		onSuccess: (e, t, n) => {
-			c.invalidateQueries({ queryKey: s.requests() }), a?.onSuccess?.(e, t, n);
+		onSuccess: (e, t, n, ...r) => {
+			c.invalidateQueries({ queryKey: s.requests() }), a?.onSuccess?.(e, t, n, ...r);
 		}
 	});
 }

package/dist/aridhia-queries/useSubmitAridhiaDar.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSubmitAridhiaDar.js","names":[],"sources":["../../src/aridhia-queries/useSubmitAridhiaDar.ts"],"sourcesContent":["import { UseMutationOptions, useQueryClient } from '@tanstack/react-query'\nimport { RequestFull } from '@sage-bionetworks/aridhia-client/generated/models'\nimport { RequestsApi } from '@sage-bionetworks/aridhia-client/generated/apis'\nimport { useSynapseContext } from '@/utils/context/SynapseContext'\nimport { AridhiaKeyFactory } from './AridhiaKeyFactory'\nimport { AridhiaError, useAridhiaMutation } from './useAridhiaQuery'\nimport { TransferType } from './TransferType'\n\nexport type SubmitAridhiaDarVariables = {\n  code: string\n  name: string\n  /** Flat answer map (About ∪ Project ∪ Workspace-when-requested), minus `name` and `code`. */\n  fields: Record<string, unknown>\n  transferType: TransferType\n  workspaceRequested: boolean\n  /** Required when `workspaceRequested` is true — RDCA-DAP's \"Reference\" field, sent as\n   * `RequestPost.workspace_reference`. Unused when picking an existing workspace. */\n  workspaceReference?: string\n  /** Required when `workspaceRequested` is false — the chosen existing workspace. */\n  workspaceUuid?: string\n  selectedDictionaries: { code: string; name?: string }[]\n}\n\n/**\n * Submits a data access request to `POST /fair/requests/`. On success, invalidates the requests\n * list so the dataset table's access icon updates without a manual reload.\n */\nexport function useSubmitAridhiaDar(\n  options?: Partial<\n    UseMutationOptions<RequestFull, AridhiaError, SubmitAridhiaDarVariables>\n  >,\n) {\n  const { accessToken: synapseAccessToken } = useSynapseContext()\n  const keyFactory = new AridhiaKeyFactory(synapseAccessToken)\n  const queryClient = useQueryClient()\n\n  return useAridhiaMutation<RequestFull, SubmitAridhiaDarVariables>(\n    async (configuration, variables) => {\n      const requestsApi = new RequestsApi(configuration)\n      return await requestsApi.fairRequestsPost({\n        requestPost: {\n          code: variables.code,\n          name: variables.name,\n          fields: variables.fields,\n          terms: true,\n          transfer_type: variables.transferType,\n          workspace_requested: variables.workspaceRequested,\n          ...(variables.workspaceRequested\n            ? { workspace_reference: variables.workspaceReference }\n            : { workspace_uuid: variables.workspaceUuid }),\n          cohort: {\n            name: variables.name,\n            queries: [\n              {\n                name: variables.name,\n                clauses: variables.selectedDictionaries.map(dictionary => ({\n                  name: dictionary.name ?? dictionary.code,\n                  dictionary: { code: dictionary.code },\n                  filters: [], // empty = the whole table\n                })),\n              },\n            ],\n          },\n        },\n      })\n    },\n    {\n      ...options,\n      onSuccess: (data, variables, context) => {\n        queryClient.invalidateQueries({ queryKey: keyFactory.requests() })\n        options?.onSuccess?.(data, variables, context)\n      },\n    },\n  )\n}\n"],"mappings":";;;;;;AA2BA,SAAgB,EACd,GAGA;CACA,IAAM,EAAE,aAAa,MAAuB,EAAkB,GACxD,IAAa,IAAI,EAAkB,CAAkB,GACrD,IAAc,EAAe;CAEnC,OAAO,EACL,OAAO,GAAe,MAEb,MAAM,IADW,EAAY,CACvB,EAAY,iBAAiB,EACxC,aAAa;EACX,MAAM,EAAU;EAChB,MAAM,EAAU;EAChB,QAAQ,EAAU;EAClB,OAAO;EACP,eAAe,EAAU;EACzB,qBAAqB,EAAU;EAC/B,GAAI,EAAU,qBACV,EAAE,qBAAqB,EAAU,mBAAmB,IACpD,EAAE,gBAAgB,EAAU,cAAc;EAC9C,QAAQ;GACN,MAAM,EAAU;GAChB,SAAS,CACP;IACE,MAAM,EAAU;IAChB,SAAS,EAAU,qBAAqB,KAAI,OAAe;KACzD,MAAM,EAAW,QAAQ,EAAW;KACpC,YAAY,EAAE,MAAM,EAAW,KAAK;KACpC,SAAS,CAAC;IACZ,EAAE;GACJ,CACF;EACF;CACF,EACF,CAAC,GAEH;EACE,GAAG;EACH,YAAY,GAAM,GAAW,MAAY;GAEvC,AADA,EAAY,kBAAkB,EAAE,UAAU,EAAW,SAAS,EAAE,CAAC,GACjE,GAAS,YAAY,GAAM,GAAW,CAAO;EAC/C;CACF,CACF;AACF"}
+{"version":3,"file":"useSubmitAridhiaDar.js","names":[],"sources":["../../src/aridhia-queries/useSubmitAridhiaDar.ts"],"sourcesContent":["import { UseMutationOptions, useQueryClient } from '@tanstack/react-query'\nimport { RequestFull } from '@sage-bionetworks/aridhia-client/generated/models'\nimport { RequestsApi } from '@sage-bionetworks/aridhia-client/generated/apis'\nimport { useSynapseContext } from '@/utils/context/SynapseContext'\nimport { AridhiaKeyFactory } from './AridhiaKeyFactory'\nimport { AridhiaError, useAridhiaMutation } from './useAridhiaQuery'\nimport { TransferType } from './TransferType'\n\nexport type SubmitAridhiaDarVariables = {\n  code: string\n  name: string\n  /** Flat answer map (About ∪ Project ∪ Workspace-when-requested), minus `name` and `code`. */\n  fields: Record<string, unknown>\n  transferType: TransferType\n  workspaceRequested: boolean\n  /** Required when `workspaceRequested` is true — RDCA-DAP's \"Reference\" field, sent as\n   * `RequestPost.workspace_reference`. Unused when picking an existing workspace. */\n  workspaceReference?: string\n  /** Required when `workspaceRequested` is false — the chosen existing workspace. */\n  workspaceUuid?: string\n  selectedDictionaries: { code: string; name?: string }[]\n}\n\n/**\n * Submits a data access request to `POST /fair/requests/`. On success, invalidates the requests\n * list so the dataset table's access icon updates without a manual reload.\n */\nexport function useSubmitAridhiaDar(\n  options?: Partial<\n    UseMutationOptions<RequestFull, AridhiaError, SubmitAridhiaDarVariables>\n  >,\n) {\n  const { accessToken: synapseAccessToken } = useSynapseContext()\n  const keyFactory = new AridhiaKeyFactory(synapseAccessToken)\n  const queryClient = useQueryClient()\n\n  return useAridhiaMutation<RequestFull, SubmitAridhiaDarVariables>(\n    async (configuration, variables) => {\n      const requestsApi = new RequestsApi(configuration)\n      return await requestsApi.fairRequestsPost({\n        requestPost: {\n          code: variables.code,\n          name: variables.name,\n          fields: variables.fields,\n          terms: true,\n          transfer_type: variables.transferType,\n          workspace_requested: variables.workspaceRequested,\n          ...(variables.workspaceRequested\n            ? { workspace_reference: variables.workspaceReference }\n            : { workspace_uuid: variables.workspaceUuid }),\n          cohort: {\n            name: variables.name,\n            queries: [\n              {\n                name: variables.name,\n                clauses: variables.selectedDictionaries.map(dictionary => ({\n                  name: dictionary.name ?? dictionary.code,\n                  dictionary: { code: dictionary.code },\n                  filters: [], // empty = the whole table\n                })),\n              },\n            ],\n          },\n        },\n      })\n    },\n    {\n      ...options,\n      onSuccess: (data, variables, context, ...rest) => {\n        queryClient.invalidateQueries({ queryKey: keyFactory.requests() })\n        options?.onSuccess?.(data, variables, context, ...rest)\n      },\n    },\n  )\n}\n"],"mappings":";;;;;;AA2BA,SAAgB,EACd,GAGA;CACA,IAAM,EAAE,aAAa,MAAuB,EAAkB,GACxD,IAAa,IAAI,EAAkB,CAAkB,GACrD,IAAc,EAAe;CAEnC,OAAO,EACL,OAAO,GAAe,MAEb,MAAM,IADW,EAAY,CACvB,EAAY,iBAAiB,EACxC,aAAa;EACX,MAAM,EAAU;EAChB,MAAM,EAAU;EAChB,QAAQ,EAAU;EAClB,OAAO;EACP,eAAe,EAAU;EACzB,qBAAqB,EAAU;EAC/B,GAAI,EAAU,qBACV,EAAE,qBAAqB,EAAU,mBAAmB,IACpD,EAAE,gBAAgB,EAAU,cAAc;EAC9C,QAAQ;GACN,MAAM,EAAU;GAChB,SAAS,CACP;IACE,MAAM,EAAU;IAChB,SAAS,EAAU,qBAAqB,KAAI,OAAe;KACzD,MAAM,EAAW,QAAQ,EAAW;KACpC,YAAY,EAAE,MAAM,EAAW,KAAK;KACpC,SAAS,CAAC;IACZ,EAAE;GACJ,CACF;EACF;CACF,EACF,CAAC,GAEH;EACE,GAAG;EACH,YAAY,GAAM,GAAW,GAAS,GAAG,MAAS;GAEhD,AADA,EAAY,kBAAkB,EAAE,UAAU,EAAW,SAAS,EAAE,CAAC,GACjE,GAAS,YAAY,GAAM,GAAW,GAAS,GAAG,CAAI;EACxD;CACF,CACF;AACF"}

package/dist/components/AccessTokenPage/CreateAccessTokenModal.js

@@ -14,7 +14,7 @@ var g = "You must provide a token name and at least one permission.";
 function _(_) {
 	let { onClose: v = s, onCreate: y = s } = _, [b, x] = o(""), [S, C] = o(!0), [w, T] = o(!1), [E, D] = o(!1), [O, k] = o(null), { mutate: A, isPending: j, error: M, data: N } = r(), P = (e) => {
 		x(e.target.value);
-	}, F = (e, t) => !!e && t.some((e) => e), I = () => {
+	}, F = (e, t) => !!e && t.some(Boolean), I = () => {
 		if (F(b, [
 			S,
 			w,

package/dist/components/AccessTokenPage/CreateAccessTokenModal.js.map

@@ -1 +1 @@
-{"version":3,"file":"CreateAccessTokenModal.js","names":[],"sources":["../../../src/components/AccessTokenPage/CreateAccessTokenModal.tsx"],"sourcesContent":["import { useCreatePersonalAccessToken } from '@/synapse-queries/user/usePersonalAccessToken'\nimport { Checkbox, FormControlLabel, Stack, Typography } from '@mui/material'\nimport {\n  AccessTokenGenerationRequest,\n  scopeDescriptions,\n} from '@sage-bionetworks/synapse-types'\nimport { noop } from 'lodash-es'\nimport { ChangeEvent, useState } from 'react'\nimport { ConfirmationDialog } from '../ConfirmationDialog/ConfirmationDialog'\nimport { CopyToClipboardInput } from '../CopyToClipboardInput/CopyToClipboardInput'\nimport { ErrorBanner } from '../error/ErrorBanner'\nimport loadingScreen from '../LoadingScreen/LoadingScreen'\nimport TextField from '../TextField/TextField'\n\nconst INVALID_INPUT_MSG =\n  'You must provide a token name and at least one permission.'\n\nexport type CreateAccessTokenModalProps = {\n  onClose?: () => void\n  onCreate?: () => void\n}\n\nexport function CreateAccessTokenModal(props: CreateAccessTokenModalProps) {\n  const { onClose = noop, onCreate = noop } = props\n  const [tokenName, setTokenName] = useState('')\n  const [viewAccess, setViewAccess] = useState(true)\n  const [downloadAccess, setDownloadAccess] = useState(false)\n  const [modifyAccess, setModifyAccess] = useState(false)\n\n  const [validationError, setValidationError] = useState<string | null>(null)\n\n  const {\n    mutate,\n    isPending: createIsPending,\n    error: mutationError,\n    data: createdTokenResponse,\n  } = useCreatePersonalAccessToken()\n\n  const handleTokenNameChange = (event: ChangeEvent) => {\n    setTokenName((event.target as HTMLInputElement).value)\n  }\n\n  const validateInput = (tokenName: string, access: boolean[]): boolean => {\n    return !!tokenName && access.some(x => x)\n  }\n\n  const onSubmit = () => {\n    if (validateInput(tokenName, [viewAccess, downloadAccess, modifyAccess])) {\n      setValidationError(null)\n\n      const request: AccessTokenGenerationRequest = {\n        scope: [],\n        name: tokenName,\n      }\n      if (viewAccess) request.scope.push('view')\n      if (downloadAccess) request.scope.push('download')\n      if (modifyAccess) request.scope.push('modify')\n\n      mutate(request)\n\n      onCreate()\n    } else {\n      setValidationError(INVALID_INPUT_MSG)\n    }\n  }\n\n  const dialogContent = createdTokenResponse ? (\n    <>\n      <Typography variant={'body1'}>\n        <Typography\n          variant={'body1'}\n          component={'span'}\n          sx={{\n            fontWeight: 700,\n          }}\n        >\n          This token will not be able to be retrieved again.\n        </Typography>{' '}\n        If needed, generate a new personal access token, and delete this one.\n      </Typography>\n      <div>\n        <CopyToClipboardInput\n          value={createdTokenResponse.token}\n          inputWidth={'350px'}\n        />\n      </div>\n      <Typography variant={'body1'}>\n        This token grants access to your account functions and should be treated\n        like a password.\n      </Typography>\n    </>\n  ) : (\n    <Stack gap={2}>\n      <TextField\n        autoFocus\n        label=\"Token Name\"\n        value={tokenName}\n        onChange={handleTokenNameChange}\n        placeholder=\"e.g. Synapse command line access on my laptop\"\n        sx={{ mb: 2 }}\n      />\n      <div>\n        <Typography variant=\"label\">Token Permissions</Typography>\n        <Stack\n          sx={{\n            gap: 2,\n            my: 1,\n          }}\n        >\n          <div>\n            <FormControlLabel\n              control={<Checkbox />}\n              label={scopeDescriptions.view.displayName}\n              checked={viewAccess}\n              onChange={() => setViewAccess(!viewAccess)}\n            />\n            <Typography\n              variant={'smallText1'}\n              sx={{\n                color: 'grey.700',\n              }}\n            >\n              {scopeDescriptions.view.description}. Required to use Synapse\n              programmatic clients.\n            </Typography>\n          </div>\n          <div>\n            <FormControlLabel\n              control={<Checkbox />}\n              label={scopeDescriptions.download.displayName}\n              checked={downloadAccess}\n              onChange={() => setDownloadAccess(!downloadAccess)}\n            />\n            <Typography\n              variant={'smallText1'}\n              sx={{\n                color: 'grey.700',\n              }}\n            >\n              {scopeDescriptions.download.description}\n            </Typography>\n          </div>\n          <div>\n            <FormControlLabel\n              control={<Checkbox />}\n              label={scopeDescriptions.modify.displayName}\n              checked={modifyAccess}\n              onChange={() => setModifyAccess(!modifyAccess)}\n            />\n            <Typography\n              variant={'smallText1'}\n              sx={{\n                color: 'grey.700',\n              }}\n            >\n              {scopeDescriptions.modify.description}\n            </Typography>\n          </div>\n        </Stack>\n      </div>\n      {validationError && <ErrorBanner error={validationError} />}\n      {mutationError && <ErrorBanner error={mutationError.reason} />}\n    </Stack>\n  )\n\n  return (\n    <ConfirmationDialog\n      open={true}\n      title=\"Create New Personal Access Token\"\n      content={createIsPending ? loadingScreen : dialogContent}\n      confirmButtonProps={{\n        children: createdTokenResponse ? 'Close' : 'Create Token',\n        variant: createdTokenResponse ? 'outlined' : 'contained',\n      }}\n      hasCancelButton={!createdTokenResponse}\n      onCancel={onClose}\n      onConfirm={\n        createdTokenResponse\n          ? () => onClose()\n          : () => {\n              void onSubmit()\n            }\n      }\n    />\n  )\n}\n"],"mappings":"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"}
+{"version":3,"file":"CreateAccessTokenModal.js","names":[],"sources":["../../../src/components/AccessTokenPage/CreateAccessTokenModal.tsx"],"sourcesContent":["import { useCreatePersonalAccessToken } from '@/synapse-queries/user/usePersonalAccessToken'\nimport { Checkbox, FormControlLabel, Stack, Typography } from '@mui/material'\nimport {\n  AccessTokenGenerationRequest,\n  scopeDescriptions,\n} from '@sage-bionetworks/synapse-types'\nimport { noop } from 'lodash-es'\nimport { ChangeEvent, useState } from 'react'\nimport { ConfirmationDialog } from '../ConfirmationDialog/ConfirmationDialog'\nimport { CopyToClipboardInput } from '../CopyToClipboardInput/CopyToClipboardInput'\nimport { ErrorBanner } from '../error/ErrorBanner'\nimport loadingScreen from '../LoadingScreen/LoadingScreen'\nimport TextField from '../TextField/TextField'\n\nconst INVALID_INPUT_MSG =\n  'You must provide a token name and at least one permission.'\n\nexport type CreateAccessTokenModalProps = {\n  onClose?: () => void\n  onCreate?: () => void\n}\n\nexport function CreateAccessTokenModal(props: CreateAccessTokenModalProps) {\n  const { onClose = noop, onCreate = noop } = props\n  const [tokenName, setTokenName] = useState('')\n  const [viewAccess, setViewAccess] = useState(true)\n  const [downloadAccess, setDownloadAccess] = useState(false)\n  const [modifyAccess, setModifyAccess] = useState(false)\n\n  const [validationError, setValidationError] = useState<string | null>(null)\n\n  const {\n    mutate,\n    isPending: createIsPending,\n    error: mutationError,\n    data: createdTokenResponse,\n  } = useCreatePersonalAccessToken()\n\n  const handleTokenNameChange = (event: ChangeEvent) => {\n    setTokenName((event.target as HTMLInputElement).value)\n  }\n\n  const validateInput = (tokenName: string, access: boolean[]): boolean => {\n    return !!tokenName && access.some(Boolean)\n  }\n\n  const onSubmit = () => {\n    if (validateInput(tokenName, [viewAccess, downloadAccess, modifyAccess])) {\n      setValidationError(null)\n\n      const request: AccessTokenGenerationRequest = {\n        scope: [],\n        name: tokenName,\n      }\n      if (viewAccess) request.scope.push('view')\n      if (downloadAccess) request.scope.push('download')\n      if (modifyAccess) request.scope.push('modify')\n\n      mutate(request)\n\n      onCreate()\n    } else {\n      setValidationError(INVALID_INPUT_MSG)\n    }\n  }\n\n  const dialogContent = createdTokenResponse ? (\n    <>\n      <Typography variant={'body1'}>\n        <Typography\n          variant={'body1'}\n          component={'span'}\n          sx={{\n            fontWeight: 700,\n          }}\n        >\n          This token will not be able to be retrieved again.\n        </Typography>{' '}\n        If needed, generate a new personal access token, and delete this one.\n      </Typography>\n      <div>\n        <CopyToClipboardInput\n          value={createdTokenResponse.token}\n          inputWidth={'350px'}\n        />\n      </div>\n      <Typography variant={'body1'}>\n        This token grants access to your account functions and should be treated\n        like a password.\n      </Typography>\n    </>\n  ) : (\n    <Stack gap={2}>\n      <TextField\n        autoFocus\n        label=\"Token Name\"\n        value={tokenName}\n        onChange={handleTokenNameChange}\n        placeholder=\"e.g. Synapse command line access on my laptop\"\n        sx={{ mb: 2 }}\n      />\n      <div>\n        <Typography variant=\"label\">Token Permissions</Typography>\n        <Stack\n          sx={{\n            gap: 2,\n            my: 1,\n          }}\n        >\n          <div>\n            <FormControlLabel\n              control={<Checkbox />}\n              label={scopeDescriptions.view.displayName}\n              checked={viewAccess}\n              onChange={() => setViewAccess(!viewAccess)}\n            />\n            <Typography\n              variant={'smallText1'}\n              sx={{\n                color: 'grey.700',\n              }}\n            >\n              {scopeDescriptions.view.description}. Required to use Synapse\n              programmatic clients.\n            </Typography>\n          </div>\n          <div>\n            <FormControlLabel\n              control={<Checkbox />}\n              label={scopeDescriptions.download.displayName}\n              checked={downloadAccess}\n              onChange={() => setDownloadAccess(!downloadAccess)}\n            />\n            <Typography\n              variant={'smallText1'}\n              sx={{\n                color: 'grey.700',\n              }}\n            >\n              {scopeDescriptions.download.description}\n            </Typography>\n          </div>\n          <div>\n            <FormControlLabel\n              control={<Checkbox />}\n              label={scopeDescriptions.modify.displayName}\n              checked={modifyAccess}\n              onChange={() => setModifyAccess(!modifyAccess)}\n            />\n            <Typography\n              variant={'smallText1'}\n              sx={{\n                color: 'grey.700',\n              }}\n            >\n              {scopeDescriptions.modify.description}\n            </Typography>\n          </div>\n        </Stack>\n      </div>\n      {validationError && <ErrorBanner error={validationError} />}\n      {mutationError && <ErrorBanner error={mutationError.reason} />}\n    </Stack>\n  )\n\n  return (\n    <ConfirmationDialog\n      open={true}\n      title=\"Create New Personal Access Token\"\n      content={createIsPending ? loadingScreen : dialogContent}\n      confirmButtonProps={{\n        children: createdTokenResponse ? 'Close' : 'Create Token',\n        variant: createdTokenResponse ? 'outlined' : 'contained',\n      }}\n      hasCancelButton={!createdTokenResponse}\n      onCancel={onClose}\n      onConfirm={\n        createdTokenResponse\n          ? () => onClose()\n          : () => {\n              void onSubmit()\n            }\n      }\n    />\n  )\n}\n"],"mappings":"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"}

package/dist/components/AccountLevelBadges/AccountLevelBadges.js

@@ -15,7 +15,7 @@ function u({ userId: u }) {
 		certified: d?.isCertified || !1,
 		validated: d?.isVerified || !1,
 		enabledMFA: d?.userProfile?.twoFactorAuthEnabled || !1
-	}, h = Object.values(m).some((e) => e), { showButton: g, buttonProps: _, confirmationDialogProps: v } = i({
+	}, h = Object.values(m).some(Boolean), { showButton: g, buttonProps: _, confirmationDialogProps: v } = i({
 		userId: u,
 		buttonProps: { variant: "outlined" }
 	});

package/dist/components/AccountLevelBadges/AccountLevelBadges.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccountLevelBadges.js","names":[],"sources":["../../../src/components/AccountLevelBadges/AccountLevelBadges.tsx"],"sourcesContent":["import { useGetUserBundle } from '@/synapse-queries/user/useUserBundle'\nimport { SynapseConstants } from '@/utils'\nimport { Box } from '@mui/material'\nimport {\n  AccountLevelBadge,\n  AccountLevelBadgeType,\n} from '../AccountLevelBadge/AccountLevelBadge'\nimport { ConfirmationDialog } from '../ConfirmationDialog'\nimport { ErrorBanner } from '../error/ErrorBanner'\nimport useRevokeCertificationUI from './useRevokeCertificationUI'\n\nexport type AccountLevelBadgesProps = {\n  userId: string\n}\n\nconst CERTIFICATION_VERIFICATION_AND_USERPROFILE_BUNDLE_MASK =\n  SynapseConstants.USER_BUNDLE_MASK_IS_CERTIFIED |\n  SynapseConstants.USER_BUNDLE_MASK_IS_VERIFIED |\n  SynapseConstants.USER_BUNDLE_MASK_USER_PROFILE\n\nexport function AccountLevelBadges({ userId }: AccountLevelBadgesProps) {\n  const {\n    data: userBundle,\n    isLoading,\n    error,\n  } = useGetUserBundle(\n    userId,\n    CERTIFICATION_VERIFICATION_AND_USERPROFILE_BUNDLE_MASK,\n  )\n\n  const badgeStatuses: Record<AccountLevelBadgeType, boolean> = {\n    certified: userBundle?.isCertified || false,\n    validated: userBundle?.isVerified || false,\n    enabledMFA: userBundle?.userProfile?.twoFactorAuthEnabled || false,\n  }\n  const hasBadges = Object.values(badgeStatuses).some(value => value)\n\n  const {\n    showButton: showRevokeCertificationButton,\n    buttonProps: revokeCertificationButtonProps,\n    confirmationDialogProps: revokeCertificationConfirmationDialogProps,\n  } = useRevokeCertificationUI({\n    userId,\n    buttonProps: {\n      variant: 'outlined',\n    },\n  })\n\n  if (isLoading) {\n    return <></>\n  }\n  if (error) {\n    return <ErrorBanner error={error} />\n  }\n\n  return (\n    <>\n      <ConfirmationDialog {...revokeCertificationConfirmationDialogProps} />\n      {hasBadges && (\n        <Box\n          sx={{\n            display: 'flex',\n            gap: '10px',\n            justifyContent: 'flex-start',\n            flexWrap: 'wrap',\n          }}\n        >\n          {Object.entries(badgeStatuses).map(([key, value]) => {\n            const badgeType = key as AccountLevelBadgeType\n            const buttonProps =\n              badgeType === 'certified' && showRevokeCertificationButton\n                ? revokeCertificationButtonProps\n                : undefined\n            return (\n              value && (\n                <AccountLevelBadge\n                  key={badgeType}\n                  badgeType={badgeType}\n                  buttonProps={buttonProps}\n                />\n              )\n            )\n          })}\n        </Box>\n      )}\n    </>\n  )\n}\n\nexport default AccountLevelBadges\n"],"mappings":";;;;;;;;;;;AAeA,IAAM,IACJ;AAIF,SAAgB,EAAmB,EAAE,aAAmC;CACtE,IAAM,EACJ,MAAM,GACN,cACA,aACE,EACF,GACA,CACF,GAEM,IAAwD;EAC5D,WAAW,GAAY,eAAe;EACtC,WAAW,GAAY,cAAc;EACrC,YAAY,GAAY,aAAa,wBAAwB;CAC/D,GACM,IAAY,OAAO,OAAO,CAAa,EAAE,MAAK,MAAS,CAAK,GAE5D,EACJ,YAAY,GACZ,aAAa,GACb,yBAAyB,MACvB,EAAyB;EAC3B;EACA,aAAa,EACX,SAAS,WACX;CACF,CAAC;CASD,OAPI,IACK,kBAAA,GAAA,CAAI,CAAA,IAET,IACK,kBAAC,GAAD,EAAoB,SAAQ,CAAA,IAInC,kBAAA,GAAA,EAAA,UAAA,CACE,kBAAC,GAAD,EAAoB,GAAI,EAA6C,CAAA,GACpE,KACC,kBAAC,GAAD;EACE,IAAI;GACF,SAAS;GACT,KAAK;GACL,gBAAgB;GAChB,UAAU;EACZ;YAEC,OAAO,QAAQ,CAAa,EAAE,KAAK,CAAC,GAAK,OAAW;GACnD,IAAM,IAAY;GAKlB,OACE,KACE,kBAAC,GAAD;IAEa;IACE,aARjB,MAAc,eAAe,IACzB,IACA,KAAA;GAOD,GAHM,CAGN;EAGP,CAAC;CACE,CAAA,CAEP,EAAA,CAAA;AAEN"}
+{"version":3,"file":"AccountLevelBadges.js","names":[],"sources":["../../../src/components/AccountLevelBadges/AccountLevelBadges.tsx"],"sourcesContent":["import { useGetUserBundle } from '@/synapse-queries/user/useUserBundle'\nimport { SynapseConstants } from '@/utils'\nimport { Box } from '@mui/material'\nimport {\n  AccountLevelBadge,\n  AccountLevelBadgeType,\n} from '../AccountLevelBadge/AccountLevelBadge'\nimport { ConfirmationDialog } from '../ConfirmationDialog'\nimport { ErrorBanner } from '../error/ErrorBanner'\nimport useRevokeCertificationUI from './useRevokeCertificationUI'\n\nexport type AccountLevelBadgesProps = {\n  userId: string\n}\n\nconst CERTIFICATION_VERIFICATION_AND_USERPROFILE_BUNDLE_MASK =\n  SynapseConstants.USER_BUNDLE_MASK_IS_CERTIFIED |\n  SynapseConstants.USER_BUNDLE_MASK_IS_VERIFIED |\n  SynapseConstants.USER_BUNDLE_MASK_USER_PROFILE\n\nexport function AccountLevelBadges({ userId }: AccountLevelBadgesProps) {\n  const {\n    data: userBundle,\n    isLoading,\n    error,\n  } = useGetUserBundle(\n    userId,\n    CERTIFICATION_VERIFICATION_AND_USERPROFILE_BUNDLE_MASK,\n  )\n\n  const badgeStatuses: Record<AccountLevelBadgeType, boolean> = {\n    certified: userBundle?.isCertified || false,\n    validated: userBundle?.isVerified || false,\n    enabledMFA: userBundle?.userProfile?.twoFactorAuthEnabled || false,\n  }\n  const hasBadges = Object.values(badgeStatuses).some(Boolean)\n\n  const {\n    showButton: showRevokeCertificationButton,\n    buttonProps: revokeCertificationButtonProps,\n    confirmationDialogProps: revokeCertificationConfirmationDialogProps,\n  } = useRevokeCertificationUI({\n    userId,\n    buttonProps: {\n      variant: 'outlined',\n    },\n  })\n\n  if (isLoading) {\n    return <></>\n  }\n  if (error) {\n    return <ErrorBanner error={error} />\n  }\n\n  return (\n    <>\n      <ConfirmationDialog {...revokeCertificationConfirmationDialogProps} />\n      {hasBadges && (\n        <Box\n          sx={{\n            display: 'flex',\n            gap: '10px',\n            justifyContent: 'flex-start',\n            flexWrap: 'wrap',\n          }}\n        >\n          {Object.entries(badgeStatuses).map(([key, value]) => {\n            const badgeType = key as AccountLevelBadgeType\n            const buttonProps =\n              badgeType === 'certified' && showRevokeCertificationButton\n                ? revokeCertificationButtonProps\n                : undefined\n            return (\n              value && (\n                <AccountLevelBadge\n                  key={badgeType}\n                  badgeType={badgeType}\n                  buttonProps={buttonProps}\n                />\n              )\n            )\n          })}\n        </Box>\n      )}\n    </>\n  )\n}\n\nexport default AccountLevelBadges\n"],"mappings":";;;;;;;;;;;AAeA,IAAM,IACJ;AAIF,SAAgB,EAAmB,EAAE,aAAmC;CACtE,IAAM,EACJ,MAAM,GACN,cACA,aACE,EACF,GACA,CACF,GAEM,IAAwD;EAC5D,WAAW,GAAY,eAAe;EACtC,WAAW,GAAY,cAAc;EACrC,YAAY,GAAY,aAAa,wBAAwB;CAC/D,GACM,IAAY,OAAO,OAAO,CAAa,EAAE,KAAK,OAAO,GAErD,EACJ,YAAY,GACZ,aAAa,GACb,yBAAyB,MACvB,EAAyB;EAC3B;EACA,aAAa,EACX,SAAS,WACX;CACF,CAAC;CASD,OAPI,IACK,kBAAA,GAAA,CAAI,CAAA,IAET,IACK,kBAAC,GAAD,EAAoB,SAAQ,CAAA,IAInC,kBAAA,GAAA,EAAA,UAAA,CACE,kBAAC,GAAD,EAAoB,GAAI,EAA6C,CAAA,GACpE,KACC,kBAAC,GAAD;EACE,IAAI;GACF,SAAS;GACT,KAAK;GACL,gBAAgB;GAChB,UAAU;EACZ;YAEC,OAAO,QAAQ,CAAa,EAAE,KAAK,CAAC,GAAK,OAAW;GACnD,IAAM,IAAY;GAKlB,OACE,KACE,kBAAC,GAAD;IAEa;IACE,aARjB,MAAc,eAAe,IACzB,IACA,KAAA;GAOD,GAHM,CAGN;EAGP,CAAC;CACE,CAAA,CAEP,EAAA,CAAA;AAEN"}

package/dist/components/AclEditor/AclEditor.test-utils.js

@@ -44,9 +44,7 @@ async function m(e, t) {
 	let n = p();
 	expect(n).toBeInTheDocument(), await e.clear(n), await e.type(n, t);
 	let r = await a.findByText(RegExp(`\\(@${t}\\)`));
-	await e.click(r), await o(() => expect(r).not.toBeInTheDocument());
-	let i = a.getAllByRole("row");
-	return i[i.length - 1];
+	return await e.click(r), await o(() => expect(r).not.toBeInTheDocument()), a.getAllByRole("row").at(-1);
 }
 async function h(n) {
 	let r = a.getByRole("button", { name: i });
@@ -55,8 +53,8 @@ async function h(n) {
 	return await o(() => {
 		s = a.getAllByRole("row"), l = c(s, t), u = c(s, e), expect(l).toBeInTheDocument(), expect(u).toBeInTheDocument();
 	}), {
-		publicRow: s[s.length - 2],
-		authenticatedUsersRow: s[s.length - 1]
+		publicRow: s.at(-2),
+		authenticatedUsersRow: s.at(-1)
 	};
 }
 //#endregion

package/dist/components/AclEditor/AclEditor.test-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"AclEditor.test-utils.js","names":[],"sources":["../../../src/components/AclEditor/AclEditor.test-utils.ts"],"sourcesContent":["import userEvent from '@testing-library/user-event'\nimport { screen, waitFor, within } from '@testing-library/react'\nimport { REMOVE_BUTTON_LABEL } from './ResourceAccessItem'\nimport {\n  AUTHENTICATED_GROUP_DISPLAY_TEXT,\n  PUBLIC_GROUP_DISPLAY_TEXT,\n} from '../TeamBadge'\nimport {\n  ADD_PRINCIPAL_TO_ACL_COMBOBOX_LABEL,\n  ADD_PUBLIC_PRINCIPALS_BUTTON_TEXT,\n} from './AclEditor'\n\n/**\n * Find a row in the ACL editor that contains the specified principal name.\n * @param rows\n * @param principalName\n */\nexport function queryForRowWithPrincipalName(\n  rows: HTMLElement[],\n  principalName: string,\n) {\n  return rows.find(row => {\n    return within(row).queryByText(principalName, { exact: false })\n  })\n}\n\n/**\n * Verify that a row in the ACL editor contains the expected principal name and access type.\n * @param rows\n * @param principalName\n * @param accessTypeLabel\n */\nexport async function confirmItemViaQuery(\n  rows: HTMLElement[],\n  principalName: string,\n  accessTypeLabel: string,\n) {\n  let row: HTMLElement | undefined\n  try {\n    await waitFor(() => {\n      row = queryForRowWithPrincipalName(rows, principalName)!\n      expect(row).toBeInTheDocument()\n    })\n  } catch (e) {\n    screen.debug()\n    throw new Error(`Principal ${principalName} not found in ACL`, { cause: e })\n  }\n\n  const editorCombobox = within(row!).queryByRole('combobox')\n  if (editorCombobox) {\n    expect(editorCombobox).toHaveTextContent(accessTypeLabel)\n  } else {\n    within(row!).getByText(accessTypeLabel)\n  }\n  return row!\n}\n\n/**\n * Verify that a row in the ACL editor contains the expected principal name and access type.\n * @param row\n * @param principalName\n * @param accessTypeLabel\n */\nexport function confirmItem(\n  row: HTMLElement,\n  principalName: string,\n  accessTypeLabel: string,\n) {\n  expect(within(row).queryByRole('link') ?? row).toHaveTextContent(\n    principalName,\n  )\n  const editorCombobox = within(row).queryByRole('combobox')\n  if (editorCombobox) {\n    expect(editorCombobox).toHaveTextContent(accessTypeLabel)\n  } else {\n    within(row).getByText(accessTypeLabel)\n  }\n}\n\n/**\n * Remove a particular row from the HTML editor.\n * @param row\n * @param user\n * @param verifyRemoval\n */\nexport async function removeItem(\n  row: HTMLElement,\n  user: ReturnType<(typeof userEvent)['setup']>,\n  verifyRemoval = true,\n) {\n  const removeButton = within(row).getByRole('button', {\n    name: REMOVE_BUTTON_LABEL,\n  })\n  await user.click(removeButton)\n  if (verifyRemoval) {\n    await waitFor(() => {\n      expect(removeButton).not.toBeInTheDocument()\n      expect(row).not.toBeInTheDocument()\n    })\n  }\n}\n\n/**\n * Updates the permission level of a particular row in the ACL editor.\n * @param row\n * @param user\n * @param updatedPermissionLevelLabel\n */\nexport async function updatePermissionLevel(\n  row: HTMLElement,\n  user: ReturnType<(typeof userEvent)['setup']>,\n  updatedPermissionLevelLabel: string,\n) {\n  const menu = within(row).getByRole('combobox')\n  await user.click(menu)\n\n  const option = screen.getByRole('option', {\n    name: updatedPermissionLevelLabel,\n  })\n  await user.click(option)\n\n  await waitFor(() => {\n    expect(option).not.toBeInTheDocument()\n  })\n}\n\nexport function queryForAddUserCombobox() {\n  return screen.queryByRole('combobox', {\n    name: ADD_PRINCIPAL_TO_ACL_COMBOBOX_LABEL,\n  })\n}\n\n/**\n * Adds a user to the ACL editor.\n * @param user\n * @param userName\n */\nexport async function addUserToAcl(\n  user: ReturnType<(typeof userEvent)['setup']>,\n  userName: string,\n) {\n  const userInput = queryForAddUserCombobox()!\n  expect(userInput).toBeInTheDocument()\n  await user.clear(userInput)\n  await user.type(userInput, userName)\n\n  const option = await screen.findByText(new RegExp(`\\\\(@${userName}\\\\)`))\n  await user.click(option)\n\n  await waitFor(() => expect(option).not.toBeInTheDocument())\n  const rows = screen.getAllByRole('row')\n  return rows[rows.length - 1]\n}\n\n/**\n * Adds public / authenticated groups to the ACL editor.\n * @param user\n */\nexport async function addPublicToAcl(\n  user: ReturnType<(typeof userEvent)['setup']>,\n) {\n  const makePublicButton = screen.getByRole('button', {\n    name: ADD_PUBLIC_PRINCIPALS_BUTTON_TEXT,\n  })\n  await user.click(makePublicButton)\n\n  let rows: HTMLElement[] = []\n  let publicRow: HTMLElement | undefined = undefined\n  let authenticatedUsersRow: HTMLElement | undefined = undefined\n  await waitFor(() => {\n    rows = screen.getAllByRole('row')\n    publicRow = queryForRowWithPrincipalName(rows, PUBLIC_GROUP_DISPLAY_TEXT)\n    authenticatedUsersRow = queryForRowWithPrincipalName(\n      rows,\n      AUTHENTICATED_GROUP_DISPLAY_TEXT,\n    )\n    expect(publicRow).toBeInTheDocument()\n    expect(authenticatedUsersRow).toBeInTheDocument()\n  })\n\n  return {\n    publicRow: rows[rows.length - 2],\n    authenticatedUsersRow: rows[rows.length - 1],\n  }\n}\n"],"mappings":";;;;;AAiBA,SAAgB,EACd,GACA,GACA;CACA,OAAO,EAAK,MAAK,MACR,EAAO,CAAG,EAAE,YAAY,GAAe,EAAE,OAAO,GAAM,CAAC,CAC/D;AACH;AAQA,eAAsB,EACpB,GACA,GACA,GACA;CACA,IAAI;CACJ,IAAI;EACF,MAAM,QAAc;GAElB,AADA,IAAM,EAA6B,GAAM,CAAa,GACtD,OAAO,CAAG,EAAE,kBAAkB;EAChC,CAAC;CACH,SAAS,GAAG;EAEV,MADA,EAAO,MAAM,GACH,MAAM,aAAa,EAAc,oBAAoB,EAAE,OAAO,EAAE,CAAC;CAC7E;CAEA,IAAM,IAAiB,EAAO,CAAI,EAAE,YAAY,UAAU;CAM1D,OALI,IACF,OAAO,CAAc,EAAE,kBAAkB,CAAe,IAExD,EAAO,CAAI,EAAE,UAAU,CAAe,GAEjC;AACT;AAQA,SAAgB,EACd,GACA,GACA,GACA;CACA,OAAO,EAAO,CAAG,EAAE,YAAY,MAAM,KAAK,CAAG,EAAE,kBAC7C,CACF;CACA,IAAM,IAAiB,EAAO,CAAG,EAAE,YAAY,UAAU;CACzD,AAAI,IACF,OAAO,CAAc,EAAE,kBAAkB,CAAe,IAExD,EAAO,CAAG,EAAE,UAAU,CAAe;AAEzC;AAQA,eAAsB,EACpB,GACA,GACA,IAAgB,IAChB;CACA,IAAM,IAAe,EAAO,CAAG,EAAE,UAAU,UAAU,EACnD,MAAM,EACR,CAAC;CAED,AADA,MAAM,EAAK,MAAM,CAAY,GACzB,KACF,MAAM,QAAc;EAElB,AADA,OAAO,CAAY,EAAE,IAAI,kBAAkB,GAC3C,OAAO,CAAG,EAAE,IAAI,kBAAkB;CACpC,CAAC;AAEL;AAQA,eAAsB,EACpB,GACA,GACA,GACA;CACA,IAAM,IAAO,EAAO,CAAG,EAAE,UAAU,UAAU;CAC7C,MAAM,EAAK,MAAM,CAAI;CAErB,IAAM,IAAS,EAAO,UAAU,UAAU,EACxC,MAAM,EACR,CAAC;CAGD,AAFA,MAAM,EAAK,MAAM,CAAM,GAEvB,MAAM,QAAc;EAClB,OAAO,CAAM,EAAE,IAAI,kBAAkB;CACvC,CAAC;AACH;AAEA,SAAgB,IAA0B;CACxC,OAAO,EAAO,YAAY,YAAY,EACpC,MAAM,EACR,CAAC;AACH;AAOA,eAAsB,EACpB,GACA,GACA;CACA,IAAM,IAAY,EAAwB;CAG1C,AAFA,OAAO,CAAS,EAAE,kBAAkB,GACpC,MAAM,EAAK,MAAM,CAAS,GAC1B,MAAM,EAAK,KAAK,GAAW,CAAQ;CAEnC,IAAM,IAAS,MAAM,EAAO,WAAe,OAAO,OAAO,EAAS,IAAI,CAAC;CAGvE,AAFA,MAAM,EAAK,MAAM,CAAM,GAEvB,MAAM,QAAc,OAAO,CAAM,EAAE,IAAI,kBAAkB,CAAC;CAC1D,IAAM,IAAO,EAAO,aAAa,KAAK;CACtC,OAAO,EAAK,EAAK,SAAS;AAC5B;AAMA,eAAsB,EACpB,GACA;CACA,IAAM,IAAmB,EAAO,UAAU,UAAU,EAClD,MAAM,EACR,CAAC;CACD,MAAM,EAAK,MAAM,CAAgB;CAEjC,IAAI,IAAsB,CAAC,GACvB,GACA;CAYJ,OAXA,MAAM,QAAc;EAQlB,AAPA,IAAO,EAAO,aAAa,KAAK,GAChC,IAAY,EAA6B,GAAM,CAAyB,GACxE,IAAwB,EACtB,GACA,CACF,GACA,OAAO,CAAS,EAAE,kBAAkB,GACpC,OAAO,CAAqB,EAAE,kBAAkB;CAClD,CAAC,GAEM;EACL,WAAW,EAAK,EAAK,SAAS;EAC9B,uBAAuB,EAAK,EAAK,SAAS;CAC5C;AACF"}
+{"version":3,"file":"AclEditor.test-utils.js","names":[],"sources":["../../../src/components/AclEditor/AclEditor.test-utils.ts"],"sourcesContent":["import userEvent from '@testing-library/user-event'\nimport { screen, waitFor, within } from '@testing-library/react'\nimport { REMOVE_BUTTON_LABEL } from './ResourceAccessItem'\nimport {\n  AUTHENTICATED_GROUP_DISPLAY_TEXT,\n  PUBLIC_GROUP_DISPLAY_TEXT,\n} from '../TeamBadge'\nimport {\n  ADD_PRINCIPAL_TO_ACL_COMBOBOX_LABEL,\n  ADD_PUBLIC_PRINCIPALS_BUTTON_TEXT,\n} from './AclEditor'\n\n/**\n * Find a row in the ACL editor that contains the specified principal name.\n * @param rows\n * @param principalName\n */\nexport function queryForRowWithPrincipalName(\n  rows: HTMLElement[],\n  principalName: string,\n) {\n  return rows.find(row => {\n    return within(row).queryByText(principalName, { exact: false })\n  })\n}\n\n/**\n * Verify that a row in the ACL editor contains the expected principal name and access type.\n * @param rows\n * @param principalName\n * @param accessTypeLabel\n */\nexport async function confirmItemViaQuery(\n  rows: HTMLElement[],\n  principalName: string,\n  accessTypeLabel: string,\n) {\n  let row: HTMLElement | undefined\n  try {\n    await waitFor(() => {\n      row = queryForRowWithPrincipalName(rows, principalName)!\n      expect(row).toBeInTheDocument()\n    })\n  } catch (e) {\n    screen.debug()\n    throw new Error(`Principal ${principalName} not found in ACL`, { cause: e })\n  }\n\n  const editorCombobox = within(row!).queryByRole('combobox')\n  if (editorCombobox) {\n    expect(editorCombobox).toHaveTextContent(accessTypeLabel)\n  } else {\n    within(row!).getByText(accessTypeLabel)\n  }\n  return row!\n}\n\n/**\n * Verify that a row in the ACL editor contains the expected principal name and access type.\n * @param row\n * @param principalName\n * @param accessTypeLabel\n */\nexport function confirmItem(\n  row: HTMLElement,\n  principalName: string,\n  accessTypeLabel: string,\n) {\n  expect(within(row).queryByRole('link') ?? row).toHaveTextContent(\n    principalName,\n  )\n  const editorCombobox = within(row).queryByRole('combobox')\n  if (editorCombobox) {\n    expect(editorCombobox).toHaveTextContent(accessTypeLabel)\n  } else {\n    within(row).getByText(accessTypeLabel)\n  }\n}\n\n/**\n * Remove a particular row from the HTML editor.\n * @param row\n * @param user\n * @param verifyRemoval\n */\nexport async function removeItem(\n  row: HTMLElement,\n  user: ReturnType<(typeof userEvent)['setup']>,\n  verifyRemoval = true,\n) {\n  const removeButton = within(row).getByRole('button', {\n    name: REMOVE_BUTTON_LABEL,\n  })\n  await user.click(removeButton)\n  if (verifyRemoval) {\n    await waitFor(() => {\n      expect(removeButton).not.toBeInTheDocument()\n      expect(row).not.toBeInTheDocument()\n    })\n  }\n}\n\n/**\n * Updates the permission level of a particular row in the ACL editor.\n * @param row\n * @param user\n * @param updatedPermissionLevelLabel\n */\nexport async function updatePermissionLevel(\n  row: HTMLElement,\n  user: ReturnType<(typeof userEvent)['setup']>,\n  updatedPermissionLevelLabel: string,\n) {\n  const menu = within(row).getByRole('combobox')\n  await user.click(menu)\n\n  const option = screen.getByRole('option', {\n    name: updatedPermissionLevelLabel,\n  })\n  await user.click(option)\n\n  await waitFor(() => {\n    expect(option).not.toBeInTheDocument()\n  })\n}\n\nexport function queryForAddUserCombobox() {\n  return screen.queryByRole('combobox', {\n    name: ADD_PRINCIPAL_TO_ACL_COMBOBOX_LABEL,\n  })\n}\n\n/**\n * Adds a user to the ACL editor.\n * @param user\n * @param userName\n */\nexport async function addUserToAcl(\n  user: ReturnType<(typeof userEvent)['setup']>,\n  userName: string,\n) {\n  const userInput = queryForAddUserCombobox()!\n  expect(userInput).toBeInTheDocument()\n  await user.clear(userInput)\n  await user.type(userInput, userName)\n\n  const option = await screen.findByText(new RegExp(`\\\\(@${userName}\\\\)`))\n  await user.click(option)\n\n  await waitFor(() => expect(option).not.toBeInTheDocument())\n  const rows = screen.getAllByRole('row')\n  return rows.at(-1)!\n}\n\n/**\n * Adds public / authenticated groups to the ACL editor.\n * @param user\n */\nexport async function addPublicToAcl(\n  user: ReturnType<(typeof userEvent)['setup']>,\n) {\n  const makePublicButton = screen.getByRole('button', {\n    name: ADD_PUBLIC_PRINCIPALS_BUTTON_TEXT,\n  })\n  await user.click(makePublicButton)\n\n  let rows: HTMLElement[] = []\n  let publicRow: HTMLElement | undefined = undefined\n  let authenticatedUsersRow: HTMLElement | undefined = undefined\n  await waitFor(() => {\n    rows = screen.getAllByRole('row')\n    publicRow = queryForRowWithPrincipalName(rows, PUBLIC_GROUP_DISPLAY_TEXT)\n    authenticatedUsersRow = queryForRowWithPrincipalName(\n      rows,\n      AUTHENTICATED_GROUP_DISPLAY_TEXT,\n    )\n    expect(publicRow).toBeInTheDocument()\n    expect(authenticatedUsersRow).toBeInTheDocument()\n  })\n\n  return {\n    publicRow: rows.at(-2)!,\n    authenticatedUsersRow: rows.at(-1)!,\n  }\n}\n"],"mappings":";;;;;AAiBA,SAAgB,EACd,GACA,GACA;CACA,OAAO,EAAK,MAAK,MACR,EAAO,CAAG,EAAE,YAAY,GAAe,EAAE,OAAO,GAAM,CAAC,CAC/D;AACH;AAQA,eAAsB,EACpB,GACA,GACA,GACA;CACA,IAAI;CACJ,IAAI;EACF,MAAM,QAAc;GAElB,AADA,IAAM,EAA6B,GAAM,CAAa,GACtD,OAAO,CAAG,EAAE,kBAAkB;EAChC,CAAC;CACH,SAAS,GAAG;EAEV,MADA,EAAO,MAAM,GACH,MAAM,aAAa,EAAc,oBAAoB,EAAE,OAAO,EAAE,CAAC;CAC7E;CAEA,IAAM,IAAiB,EAAO,CAAI,EAAE,YAAY,UAAU;CAM1D,OALI,IACF,OAAO,CAAc,EAAE,kBAAkB,CAAe,IAExD,EAAO,CAAI,EAAE,UAAU,CAAe,GAEjC;AACT;AAQA,SAAgB,EACd,GACA,GACA,GACA;CACA,OAAO,EAAO,CAAG,EAAE,YAAY,MAAM,KAAK,CAAG,EAAE,kBAC7C,CACF;CACA,IAAM,IAAiB,EAAO,CAAG,EAAE,YAAY,UAAU;CACzD,AAAI,IACF,OAAO,CAAc,EAAE,kBAAkB,CAAe,IAExD,EAAO,CAAG,EAAE,UAAU,CAAe;AAEzC;AAQA,eAAsB,EACpB,GACA,GACA,IAAgB,IAChB;CACA,IAAM,IAAe,EAAO,CAAG,EAAE,UAAU,UAAU,EACnD,MAAM,EACR,CAAC;CAED,AADA,MAAM,EAAK,MAAM,CAAY,GACzB,KACF,MAAM,QAAc;EAElB,AADA,OAAO,CAAY,EAAE,IAAI,kBAAkB,GAC3C,OAAO,CAAG,EAAE,IAAI,kBAAkB;CACpC,CAAC;AAEL;AAQA,eAAsB,EACpB,GACA,GACA,GACA;CACA,IAAM,IAAO,EAAO,CAAG,EAAE,UAAU,UAAU;CAC7C,MAAM,EAAK,MAAM,CAAI;CAErB,IAAM,IAAS,EAAO,UAAU,UAAU,EACxC,MAAM,EACR,CAAC;CAGD,AAFA,MAAM,EAAK,MAAM,CAAM,GAEvB,MAAM,QAAc;EAClB,OAAO,CAAM,EAAE,IAAI,kBAAkB;CACvC,CAAC;AACH;AAEA,SAAgB,IAA0B;CACxC,OAAO,EAAO,YAAY,YAAY,EACpC,MAAM,EACR,CAAC;AACH;AAOA,eAAsB,EACpB,GACA,GACA;CACA,IAAM,IAAY,EAAwB;CAG1C,AAFA,OAAO,CAAS,EAAE,kBAAkB,GACpC,MAAM,EAAK,MAAM,CAAS,GAC1B,MAAM,EAAK,KAAK,GAAW,CAAQ;CAEnC,IAAM,IAAS,MAAM,EAAO,WAAe,OAAO,OAAO,EAAS,IAAI,CAAC;CAKvE,OAJA,MAAM,EAAK,MAAM,CAAM,GAEvB,MAAM,QAAc,OAAO,CAAM,EAAE,IAAI,kBAAkB,CAAC,GAC7C,EAAO,aAAa,KAC1B,EAAK,GAAG,EAAE;AACnB;AAMA,eAAsB,EACpB,GACA;CACA,IAAM,IAAmB,EAAO,UAAU,UAAU,EAClD,MAAM,EACR,CAAC;CACD,MAAM,EAAK,MAAM,CAAgB;CAEjC,IAAI,IAAsB,CAAC,GACvB,GACA;CAYJ,OAXA,MAAM,QAAc;EAQlB,AAPA,IAAO,EAAO,aAAa,KAAK,GAChC,IAAY,EAA6B,GAAM,CAAyB,GACxE,IAAwB,EACtB,GACA,CACF,GACA,OAAO,CAAS,EAAE,kBAAkB,GACpC,OAAO,CAAqB,EAAE,kBAAkB;CAClD,CAAC,GAEM;EACL,WAAW,EAAK,GAAG,EAAE;EACrB,uBAAuB,EAAK,GAAG,EAAE;CACnC;AACF"}

package/dist/components/Aridhia/AridhiaAccessStatus.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AridhiaAccessStatus.d.ts","sourceRoot":"","sources":["../../../src/components/Aridhia/AridhiaAccessStatus.tsx"],"names":[],"mappings":"AAoBA,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB,+FAA+F;IAC/F,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,2CAkK1E"}
+{"version":3,"file":"AridhiaAccessStatus.d.ts","sourceRoot":"","sources":["../../../src/components/Aridhia/AridhiaAccessStatus.tsx"],"names":[],"mappings":"AAoBA,MAAM,MAAM,wBAAwB,GAAG;IACrC;;OAEG;IACH,WAAW,EAAE,MAAM,CAAA;IACnB,+FAA+F;IAC/F,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED;;;;GAIG;AACH,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,KAAK,EAAE,wBAAwB,2CAqK1E"}

package/dist/components/Aridhia/AridhiaAccessStatus.js

@@ -6,7 +6,7 @@ import "../../synapse-queries/index.js";
 import { DialogBase as r } from "../DialogBase.js";
 import i, { RestrictionUiType as a } from "../HasAccess/AccessIcon.js";
 import { FeatureFlagEnum as o } from "../../utils/featureflag/FeatureFlags.js";
-import { findRequestForDataset as s, getRestrictionUiTypeFromAridhiaRequest as c } from "./aridhiaAccessStatusUtils.js";
+import { findRequestsForDataset as s, getRestrictionUiTypeFromAridhiaRequests as c } from "./aridhiaAccessStatusUtils.js";
 import { getAridhiaFairPortalDatasetUrl as l } from "./aridhiaFairPortalUrls.js";
 import { useGetAridhiaRequests as u } from "../../aridhia-queries/useGetAridhiaRequests.js";
 import "../../aridhia-queries/index.js";
@@ -21,12 +21,12 @@ var y = {
 	p: "0px",
 	minWidth: "unset"
 };
-function b(b) {
-	let { datasetCode: x, fairPortalUrl: S } = b, { isAuthenticated: C } = t(), w = n(o.AMPALS_RDCA_DAP_FORM_ENABLED), { data: T, isLoading: E, isError: D, error: O } = u(), [k, A] = m(null), [j, M] = m(!1), [N, P] = m(!1), { content: F, actions: I } = p({ datasetCode: x }, {
-		enabled: N,
-		onClose: () => P(!1)
-	});
-	if (!C) return /* @__PURE__ */ _(h, {
+function b(r) {
+	let { datasetCode: p, fairPortalUrl: b } = r, { isAuthenticated: S } = t(), C = n(o.AMPALS_RDCA_DAP_FORM_ENABLED), { data: w, isLoading: T, isError: E, error: D } = u(), [O, k] = m(null), [A, j] = m(!1), [M, N] = m(!1), [P, F] = m(0);
+	function I() {
+		k(null), F((e) => e + 1), N(!0);
+	}
+	if (!S) return /* @__PURE__ */ _(h, {
 		sx: y,
 		className: e,
 		onClick: (e) => {
@@ -38,48 +38,61 @@ function b(b) {
 		children: /* @__PURE__ */ _(i, { restrictionUiType: a.AccessBlockedToAnonymous })
 	});
 	let L = null;
-	if (!E) if (D && O.isEligibilityFailure) L = /* @__PURE__ */ v(g, { children: [/* @__PURE__ */ _(h, {
+	if (!T) if (E && D.isEligibilityFailure) L = /* @__PURE__ */ v(g, { children: [/* @__PURE__ */ _(h, {
 		sx: y,
-		onClick: () => M(!0),
+		onClick: () => j(!0),
 		"aria-label": "Link your RDCA-DAP account",
 		children: /* @__PURE__ */ _(i, { restrictionUiType: a.AccessBlockedByRDCADAPAccountNotLinked })
 	}), /* @__PURE__ */ _(f, {
-		open: j,
-		onClose: () => M(!1)
+		open: A,
+		onClose: () => j(!1)
 	})] });
 	else {
-		let e = s(T?.items ?? [], x), t = c(e), n = /* @__PURE__ */ _(i, { restrictionUiType: t });
-		t === a.AccessibleOnRDCADAP || !e && !w ? L = S ? /* @__PURE__ */ _("a", {
-			href: l(S, x),
+		let e = s(w?.items ?? [], p), t = c(e), n = /* @__PURE__ */ _(i, { restrictionUiType: t });
+		L = !C && (e.length === 0 || t === a.AccessibleOnRDCADAP) ? b ? /* @__PURE__ */ _("a", {
+			href: l(b, p),
 			target: "_blank",
 			rel: "noopener noreferrer",
 			children: n
-		}) : n : e ? L = /* @__PURE__ */ v(g, { children: [/* @__PURE__ */ _(h, {
+		}) : n : e.length > 0 ? /* @__PURE__ */ v(g, { children: [/* @__PURE__ */ _(h, {
 			sx: y,
-			onClick: (e) => A(e.currentTarget),
+			onClick: (e) => k(e.currentTarget),
 			"aria-label": "View data access request status",
 			children: n
 		}), /* @__PURE__ */ _(d, {
-			open: !!k,
-			anchorEl: k,
-			onClose: () => A(null),
-			request: e,
-			fairPortalUrl: S
-		})] }) : w && (L = /* @__PURE__ */ _(h, {
+			open: !!O,
+			anchorEl: O,
+			onClose: () => k(null),
+			datasetCode: p,
+			requests: e,
+			fairPortalUrl: b,
+			onNewRequest: C ? I : void 0
+		})] }) : /* @__PURE__ */ _(h, {
 			sx: y,
-			onClick: () => P(!0),
+			onClick: I,
 			"aria-label": "Request data access",
 			children: n
-		}));
+		});
 	}
-	return /* @__PURE__ */ v(g, { children: [L, /* @__PURE__ */ _(r, {
-		open: N,
-		onCancel: () => P(!1),
+	return /* @__PURE__ */ v(g, { children: [L, /* @__PURE__ */ _(x, {
+		datasetCode: p,
+		open: M,
+		onClose: () => N(!1)
+	}, P)] });
+}
+function x(e) {
+	let { datasetCode: t, open: n, onClose: i } = e, { content: a, actions: o } = p({ datasetCode: t }, {
+		enabled: n,
+		onClose: i
+	});
+	return /* @__PURE__ */ _(r, {
+		open: n,
+		onCancel: i,
 		maxWidth: "md",
 		title: "Request Data Access",
-		content: F,
-		actions: I
-	})] });
+		content: a,
+		actions: o
+	});
 }
 //#endregion
 export { b as default };

package/dist/components/Aridhia/AridhiaAccessStatus.js.map

@@ -1 +1 @@
-{"version":3,"file":"AridhiaAccessStatus.js","names":[],"sources":["../../../src/components/Aridhia/AridhiaAccessStatus.tsx"],"sourcesContent":["import { ReactNode, useState } from 'react'\nimport { useGetAridhiaRequests } from '@/aridhia-queries'\nimport { useGetFeatureFlag } from '@/synapse-queries'\nimport { useSynapseContext } from '@/utils'\nimport { FeatureFlagEnum } from '@/utils/featureflag/FeatureFlags'\nimport { SRC_SIGN_IN_CLASS } from '@/utils/SynapseConstants'\nimport { Button } from '@mui/material'\nimport { DialogBase } from '../DialogBase'\nimport AccessIcon, { RestrictionUiType } from '../HasAccess/AccessIcon'\nimport {\n  findRequestForDataset,\n  getRestrictionUiTypeFromAridhiaRequest,\n} from './aridhiaAccessStatusUtils'\nimport { getAridhiaFairPortalDatasetUrl } from './aridhiaFairPortalUrls'\nimport AridhiaDarStatusPopover from './AridhiaDarStatusPopover'\nimport { useAridhiaDarWizardParts } from './DarWizard/AridhiaDarWizard'\nimport RdcaDapEligibilityDialog from './RdcaDapEligibilityDialog'\n\nconst buttonSx = { p: '0px', minWidth: 'unset' }\n\nexport type AridhiaAccessStatusProps = {\n  /**\n   * dataset code\n   */\n  datasetCode: string\n  /** Base URL of the RDCA-DAP FAIR portal's browsable UI, e.g. `https://fair.dap.c-path.org`. */\n  fairPortalUrl?: string\n}\n\n/**\n * Component that displays the Aridhia data access request status.\n * If the user is not authenticated with Aridhia, shows a sign-in button.\n * Otherwise, shows the access status based on the data access requests.\n */\nexport default function AridhiaAccessStatus(props: AridhiaAccessStatusProps) {\n  const { datasetCode, fairPortalUrl } = props\n  const { isAuthenticated } = useSynapseContext()\n  const isDarFormEnabled = useGetFeatureFlag(\n    FeatureFlagEnum.AMPALS_RDCA_DAP_FORM_ENABLED,\n  )\n\n  const {\n    data: requestsResponse,\n    isLoading,\n    isError,\n    error,\n  } = useGetAridhiaRequests()\n  const [popoverAnchorEl, setPopoverAnchorEl] = useState<HTMLElement | null>(\n    null,\n  )\n  const [eligibilityDialogOpen, setEligibilityDialogOpen] = useState(false)\n  const [requestDialogOpen, setRequestDialogOpen] = useState(false)\n  const { content: wizardContent, actions: wizardActions } =\n    useAridhiaDarWizardParts(\n      { datasetCode },\n      {\n        enabled: requestDialogOpen,\n        onClose: () => setRequestDialogOpen(false),\n      },\n    )\n\n  if (!isAuthenticated) {\n    return (\n      <Button\n        sx={buttonSx}\n        className={SRC_SIGN_IN_CLASS}\n        onClick={ev => {\n          if (ev.isTrusted) {\n            /*\n                There is a tricky problem - \n                The portals listens to click events for buttons with the class SRC_SIGN_IN_CLASS set, it listens to this event\n                so that it can display the login modal.\n\n                This button has an svg inside of it which is problematic because more often than not clicking this button will \n                instead click that svg. The event listener in the portals will break as a result.\n\n                Though the svg may get the actual click event, because of event bubbling this button will get its onClick called.\n                Once onClick is called we can manually dispatch an event off of this button. This does pose a problem, we end up in a \n                infinite loop because this button keeps dispatching click events, so we can use the isTrusted to recognize if onClick was\n                triggered programmatically or by user click. Lastly, using { bubbles: true } ensures the event bubbles up to the document level.\n\n              */\n            const clickEvent = new MouseEvent('click', { bubbles: true })\n            ev.currentTarget.dispatchEvent(clickEvent)\n          }\n        }}\n      >\n        <AccessIcon\n          restrictionUiType={RestrictionUiType.AccessBlockedToAnonymous}\n        />\n      </Button>\n    )\n  }\n\n  let content: ReactNode = null\n  if (isLoading) {\n    // Show loading state — nothing to render yet.\n  } else if (isError && error.isEligibilityFailure) {\n    // The token exchange (or any other request) failed because this user has no linked\n    // RDCA-DAP account yet — the DAR wizard is unreachable until that's resolved.\n    content = (\n      <>\n        <Button\n          sx={buttonSx}\n          onClick={() => setEligibilityDialogOpen(true)}\n          aria-label=\"Link your RDCA-DAP account\"\n        >\n          <AccessIcon\n            restrictionUiType={\n              RestrictionUiType.AccessBlockedByRDCADAPAccountNotLinked\n            }\n          />\n        </Button>\n        <RdcaDapEligibilityDialog\n          open={eligibilityDialogOpen}\n          onClose={() => setEligibilityDialogOpen(false)}\n        />\n      </>\n    )\n  } else {\n    // Check if there's a request for this dataset\n    const entityRequest = findRequestForDataset(\n      requestsResponse?.items ?? [],\n      datasetCode,\n    )\n    const restrictionUiType =\n      getRestrictionUiTypeFromAridhiaRequest(entityRequest)\n    const icon = <AccessIcon restrictionUiType={restrictionUiType} />\n\n    if (\n      restrictionUiType === RestrictionUiType.AccessibleOnRDCADAP ||\n      (!entityRequest && !isDarFormEnabled)\n    ) {\n      // Approved, or no request yet with the in-app request form not enabled — keep the\n      // existing link-out to RDCA-DAP to access or request the data.\n      content = fairPortalUrl ? (\n        <a\n          href={getAridhiaFairPortalDatasetUrl(fairPortalUrl, datasetCode)}\n          target=\"_blank\"\n          rel=\"noopener noreferrer\"\n        >\n          {icon}\n        </a>\n      ) : (\n        icon\n      )\n    } else if (entityRequest) {\n      // Pending or denied — click opens the status popover.\n      content = (\n        <>\n          <Button\n            sx={buttonSx}\n            onClick={ev => setPopoverAnchorEl(ev.currentTarget)}\n            aria-label=\"View data access request status\"\n          >\n            {icon}\n          </Button>\n          <AridhiaDarStatusPopover\n            open={!!popoverAnchorEl}\n            anchorEl={popoverAnchorEl}\n            onClose={() => setPopoverAnchorEl(null)}\n            request={entityRequest}\n            fairPortalUrl={fairPortalUrl}\n          />\n        </>\n      )\n    } else if (isDarFormEnabled) {\n      // No request yet, and the in-app request form is enabled — the icon opens the request\n      // wizard in a dialog. The same wizard also renders at the route-based, non-modal\n      // `AridhiaDarWizard` page for a full-page entry point.\n      content = (\n        <Button\n          sx={buttonSx}\n          onClick={() => setRequestDialogOpen(true)}\n          aria-label=\"Request data access\"\n        >\n          {icon}\n        </Button>\n      )\n    }\n  }\n\n  return (\n    <>\n      {content}\n      {/*  Ensure all authenticated return paths render the wizard dialog to prevent flicker as the DAR state changes (e.g. on the confirmation screen). */}\n      <DialogBase\n        open={requestDialogOpen}\n        onCancel={() => setRequestDialogOpen(false)}\n        maxWidth=\"md\"\n        title=\"Request Data Access\"\n        content={wizardContent}\n        actions={wizardActions}\n      />\n    </>\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAkBA,IAAM,IAAW;CAAE,GAAG;CAAO,UAAU;AAAQ;AAgB/C,SAAwB,EAAoB,GAAiC;CAC3E,IAAM,EAAE,gBAAa,qBAAkB,GACjC,EAAE,uBAAoB,EAAkB,GACxC,IAAmB,EACvB,EAAgB,4BAClB,GAEM,EACJ,MAAM,GACN,cACA,YACA,aACE,EAAsB,GACpB,CAAC,GAAiB,KAAsB,EAC5C,IACF,GACM,CAAC,GAAuB,KAA4B,EAAS,EAAK,GAClE,CAAC,GAAmB,KAAwB,EAAS,EAAK,GAC1D,EAAE,SAAS,GAAe,SAAS,MACvC,EACE,EAAE,eAAY,GACd;EACE,SAAS;EACT,eAAe,EAAqB,EAAK;CAC3C,CACF;CAEF,IAAI,CAAC,GACH,OACE,kBAAC,GAAD;EACE,IAAI;EACJ,WAAW;EACX,UAAS,MAAM;GACb,IAAI,EAAG,WAAW;IAehB,IAAM,IAAa,IAAI,WAAW,SAAS,EAAE,SAAS,GAAK,CAAC;IAC5D,EAAG,cAAc,cAAc,CAAU;GAC3C;EACF;YAEA,kBAAC,GAAD,EACE,mBAAmB,EAAkB,yBACtC,CAAA;CACK,CAAA;CAIZ,IAAI,IAAqB;CACzB,IAAI,IAEG,IAAI,KAAW,EAAM,sBAG1B,IACE,kBAAA,GAAA,EAAA,UAAA,CACE,kBAAC,GAAD;EACE,IAAI;EACJ,eAAe,EAAyB,EAAI;EAC5C,cAAW;YAEX,kBAAC,GAAD,EACE,mBACE,EAAkB,uCAErB,CAAA;CACK,CAAA,GACR,kBAAC,GAAD;EACE,MAAM;EACN,eAAe,EAAyB,EAAK;CAC9C,CAAA,CACD,EAAA,CAAA;MAEC;EAEL,IAAM,IAAgB,EACpB,GAAkB,SAAS,CAAC,GAC5B,CACF,GACM,IACJ,EAAuC,CAAa,GAChD,IAAO,kBAAC,GAAD,EAA+B,qBAAoB,CAAA;EAEhE,AACE,MAAsB,EAAkB,uBACvC,CAAC,KAAiB,CAAC,IAIpB,IAAU,IACR,kBAAC,KAAD;GACE,MAAM,EAA+B,GAAe,CAAW;GAC/D,QAAO;GACP,KAAI;aAEH;EACA,CAAA,IAEH,IAEO,IAET,IACE,kBAAA,GAAA,EAAA,UAAA,CACE,kBAAC,GAAD;GACE,IAAI;GACJ,UAAS,MAAM,EAAmB,EAAG,aAAa;GAClD,cAAW;aAEV;EACK,CAAA,GACR,kBAAC,GAAD;GACE,MAAM,CAAC,CAAC;GACR,UAAU;GACV,eAAe,EAAmB,IAAI;GACtC,SAAS;GACM;EAChB,CAAA,CACD,EAAA,CAAA,IAEK,MAIT,IACE,kBAAC,GAAD;GACE,IAAI;GACJ,eAAe,EAAqB,EAAI;GACxC,cAAW;aAEV;EACK,CAAA;CAGd;CAEA,OACE,kBAAA,GAAA,EAAA,UAAA,CACG,GAED,kBAAC,GAAD;EACE,MAAM;EACN,gBAAgB,EAAqB,EAAK;EAC1C,UAAS;EACT,OAAM;EACN,SAAS;EACT,SAAS;CACV,CAAA,CACD,EAAA,CAAA;AAEN"}
+{"version":3,"file":"AridhiaAccessStatus.js","names":[],"sources":["../../../src/components/Aridhia/AridhiaAccessStatus.tsx"],"sourcesContent":["import { ReactNode, useState } from 'react'\nimport { useGetAridhiaRequests } from '@/aridhia-queries'\nimport { useGetFeatureFlag } from '@/synapse-queries'\nimport { useSynapseContext } from '@/utils'\nimport { FeatureFlagEnum } from '@/utils/featureflag/FeatureFlags'\nimport { SRC_SIGN_IN_CLASS } from '@/utils/SynapseConstants'\nimport { Button } from '@mui/material'\nimport { DialogBase } from '../DialogBase'\nimport AccessIcon, { RestrictionUiType } from '../HasAccess/AccessIcon'\nimport {\n  findRequestsForDataset,\n  getRestrictionUiTypeFromAridhiaRequests,\n} from './aridhiaAccessStatusUtils'\nimport { getAridhiaFairPortalDatasetUrl } from './aridhiaFairPortalUrls'\nimport AridhiaDarStatusPopover from './AridhiaDarStatusPopover'\nimport { useAridhiaDarWizardParts } from './DarWizard/AridhiaDarWizard'\nimport RdcaDapEligibilityDialog from './RdcaDapEligibilityDialog'\n\nconst buttonSx = { p: '0px', minWidth: 'unset' }\n\nexport type AridhiaAccessStatusProps = {\n  /**\n   * dataset code\n   */\n  datasetCode: string\n  /** Base URL of the RDCA-DAP FAIR portal's browsable UI, e.g. `https://fair.dap.c-path.org`. */\n  fairPortalUrl?: string\n}\n\n/**\n * Component that displays the Aridhia data access request status.\n * If the user is not authenticated with Aridhia, shows a sign-in button.\n * Otherwise, shows the access status based on the data access requests.\n */\nexport default function AridhiaAccessStatus(props: AridhiaAccessStatusProps) {\n  const { datasetCode, fairPortalUrl } = props\n  const { isAuthenticated } = useSynapseContext()\n  const isDarFormEnabled = useGetFeatureFlag(\n    FeatureFlagEnum.AMPALS_RDCA_DAP_FORM_ENABLED,\n  )\n\n  const {\n    data: requestsResponse,\n    isLoading,\n    isError,\n    error,\n  } = useGetAridhiaRequests()\n  const [popoverAnchorEl, setPopoverAnchorEl] = useState<HTMLElement | null>(\n    null,\n  )\n  const [eligibilityDialogOpen, setEligibilityDialogOpen] = useState(false)\n  const [requestDialogOpen, setRequestDialogOpen] = useState(false)\n  // Every opening of the wizard remounts it under a new session key, so a submitted request's\n  // confirmation screen never carries over. The remounted wizard resumes this dataset's\n  // unsubmitted draft if one exists, and otherwise starts a draft with a fresh request code.\n  const [wizardSession, setWizardSession] = useState(0)\n\n  function openRequestWizard() {\n    setPopoverAnchorEl(null)\n    setWizardSession(session => session + 1)\n    setRequestDialogOpen(true)\n  }\n\n  if (!isAuthenticated) {\n    return (\n      <Button\n        sx={buttonSx}\n        className={SRC_SIGN_IN_CLASS}\n        onClick={ev => {\n          if (ev.isTrusted) {\n            /*\n                There is a tricky problem - \n                The portals listens to click events for buttons with the class SRC_SIGN_IN_CLASS set, it listens to this event\n                so that it can display the login modal.\n\n                This button has an svg inside of it which is problematic because more often than not clicking this button will \n                instead click that svg. The event listener in the portals will break as a result.\n\n                Though the svg may get the actual click event, because of event bubbling this button will get its onClick called.\n                Once onClick is called we can manually dispatch an event off of this button. This does pose a problem, we end up in a \n                infinite loop because this button keeps dispatching click events, so we can use the isTrusted to recognize if onClick was\n                triggered programmatically or by user click. Lastly, using { bubbles: true } ensures the event bubbles up to the document level.\n\n              */\n            const clickEvent = new MouseEvent('click', { bubbles: true })\n            ev.currentTarget.dispatchEvent(clickEvent)\n          }\n        }}\n      >\n        <AccessIcon\n          restrictionUiType={RestrictionUiType.AccessBlockedToAnonymous}\n        />\n      </Button>\n    )\n  }\n\n  let content: ReactNode = null\n  if (isLoading) {\n    // Show loading state — nothing to render yet.\n  } else if (isError && error.isEligibilityFailure) {\n    // The token exchange (or any other request) failed because this user has no linked\n    // RDCA-DAP account yet — the DAR wizard is unreachable until that's resolved.\n    content = (\n      <>\n        <Button\n          sx={buttonSx}\n          onClick={() => setEligibilityDialogOpen(true)}\n          aria-label=\"Link your RDCA-DAP account\"\n        >\n          <AccessIcon\n            restrictionUiType={\n              RestrictionUiType.AccessBlockedByRDCADAPAccountNotLinked\n            }\n          />\n        </Button>\n        <RdcaDapEligibilityDialog\n          open={eligibilityDialogOpen}\n          onClose={() => setEligibilityDialogOpen(false)}\n        />\n      </>\n    )\n  } else {\n    const datasetRequests = findRequestsForDataset(\n      requestsResponse?.items ?? [],\n      datasetCode,\n    )\n    const restrictionUiType =\n      getRestrictionUiTypeFromAridhiaRequests(datasetRequests)\n    const icon = <AccessIcon restrictionUiType={restrictionUiType} />\n\n    if (\n      !isDarFormEnabled &&\n      (datasetRequests.length === 0 ||\n        restrictionUiType === RestrictionUiType.AccessibleOnRDCADAP)\n    ) {\n      // Without the in-app request form, RDCA-DAP is where the user accesses or requests the\n      // data — link straight out to it.\n      content = fairPortalUrl ? (\n        <a\n          href={getAridhiaFairPortalDatasetUrl(fairPortalUrl, datasetCode)}\n          target=\"_blank\"\n          rel=\"noopener noreferrer\"\n        >\n          {icon}\n        </a>\n      ) : (\n        icon\n      )\n    } else if (datasetRequests.length > 0) {\n      // The popover lists every request for this dataset; with the in-app form enabled it also\n      // offers another request (more tables, or a resubmission after a denial).\n      content = (\n        <>\n          <Button\n            sx={buttonSx}\n            onClick={ev => setPopoverAnchorEl(ev.currentTarget)}\n            aria-label=\"View data access request status\"\n          >\n            {icon}\n          </Button>\n          <AridhiaDarStatusPopover\n            open={!!popoverAnchorEl}\n            anchorEl={popoverAnchorEl}\n            onClose={() => setPopoverAnchorEl(null)}\n            datasetCode={datasetCode}\n            requests={datasetRequests}\n            fairPortalUrl={fairPortalUrl}\n            onNewRequest={isDarFormEnabled ? openRequestWizard : undefined}\n          />\n        </>\n      )\n    } else {\n      // No request yet, and the in-app request form is enabled — the icon opens the request\n      // wizard in a dialog. The same wizard also renders at the route-based, non-modal\n      // `AridhiaDarWizard` page for a full-page entry point.\n      content = (\n        <Button\n          sx={buttonSx}\n          onClick={openRequestWizard}\n          aria-label=\"Request data access\"\n        >\n          {icon}\n        </Button>\n      )\n    }\n  }\n\n  return (\n    <>\n      {content}\n      {/*  Ensure all authenticated return paths render the wizard dialog to prevent flicker as the DAR state changes (e.g. on the confirmation screen). */}\n      <AridhiaDarWizardDialog\n        key={wizardSession}\n        datasetCode={datasetCode}\n        open={requestDialogOpen}\n        onClose={() => setRequestDialogOpen(false)}\n      />\n    </>\n  )\n}\n\nfunction AridhiaDarWizardDialog(props: {\n  datasetCode: string\n  open: boolean\n  onClose: () => void\n}) {\n  const { datasetCode, open, onClose } = props\n  const { content, actions } = useAridhiaDarWizardParts(\n    { datasetCode },\n    { enabled: open, onClose },\n  )\n  return (\n    <DialogBase\n      open={open}\n      onCancel={onClose}\n      maxWidth=\"md\"\n      title=\"Request Data Access\"\n      content={content}\n      actions={actions}\n    />\n  )\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;AAkBA,IAAM,IAAW;CAAE,GAAG;CAAO,UAAU;AAAQ;AAgB/C,SAAwB,EAAoB,GAAiC;CAC3E,IAAM,EAAE,gBAAa,qBAAkB,GACjC,EAAE,uBAAoB,EAAkB,GACxC,IAAmB,EACvB,EAAgB,4BAClB,GAEM,EACJ,MAAM,GACN,cACA,YACA,aACE,EAAsB,GACpB,CAAC,GAAiB,KAAsB,EAC5C,IACF,GACM,CAAC,GAAuB,KAA4B,EAAS,EAAK,GAClE,CAAC,GAAmB,KAAwB,EAAS,EAAK,GAI1D,CAAC,GAAe,KAAoB,EAAS,CAAC;CAEpD,SAAS,IAAoB;EAG3B,AAFA,EAAmB,IAAI,GACvB,GAAiB,MAAW,IAAU,CAAC,GACvC,EAAqB,EAAI;CAC3B;CAEA,IAAI,CAAC,GACH,OACE,kBAAC,GAAD;EACE,IAAI;EACJ,WAAW;EACX,UAAS,MAAM;GACb,IAAI,EAAG,WAAW;IAehB,IAAM,IAAa,IAAI,WAAW,SAAS,EAAE,SAAS,GAAK,CAAC;IAC5D,EAAG,cAAc,cAAc,CAAU;GAC3C;EACF;YAEA,kBAAC,GAAD,EACE,mBAAmB,EAAkB,yBACtC,CAAA;CACK,CAAA;CAIZ,IAAI,IAAqB;CACzB,IAAI,IAEG,IAAI,KAAW,EAAM,sBAG1B,IACE,kBAAA,GAAA,EAAA,UAAA,CACE,kBAAC,GAAD;EACE,IAAI;EACJ,eAAe,EAAyB,EAAI;EAC5C,cAAW;YAEX,kBAAC,GAAD,EACE,mBACE,EAAkB,uCAErB,CAAA;CACK,CAAA,GACR,kBAAC,GAAD;EACE,MAAM;EACN,eAAe,EAAyB,EAAK;CAC9C,CAAA,CACD,EAAA,CAAA;MAEC;EACL,IAAM,IAAkB,EACtB,GAAkB,SAAS,CAAC,GAC5B,CACF,GACM,IACJ,EAAwC,CAAe,GACnD,IAAO,kBAAC,GAAD,EAA+B,qBAAoB,CAAA;EAEhE,AA6CE,IA5CA,CAAC,MACA,EAAgB,WAAW,KAC1B,MAAsB,EAAkB,uBAIhC,IACR,kBAAC,KAAD;GACE,MAAM,EAA+B,GAAe,CAAW;GAC/D,QAAO;GACP,KAAI;aAEH;EACA,CAAA,IAEH,IAEO,EAAgB,SAAS,IAIhC,kBAAA,GAAA,EAAA,UAAA,CACE,kBAAC,GAAD;GACE,IAAI;GACJ,UAAS,MAAM,EAAmB,EAAG,aAAa;GAClD,cAAW;aAEV;EACK,CAAA,GACR,kBAAC,GAAD;GACE,MAAM,CAAC,CAAC;GACR,UAAU;GACV,eAAe,EAAmB,IAAI;GACzB;GACb,UAAU;GACK;GACf,cAAc,IAAmB,IAAoB,KAAA;EACtD,CAAA,CACD,EAAA,CAAA,IAOF,kBAAC,GAAD;GACE,IAAI;GACJ,SAAS;GACT,cAAW;aAEV;EACK,CAAA;CAGd;CAEA,OACE,kBAAA,GAAA,EAAA,UAAA,CACG,GAED,kBAAC,GAAD;EAEe;EACb,MAAM;EACN,eAAe,EAAqB,EAAK;CAC1C,GAJM,CAIN,CACD,EAAA,CAAA;AAEN;AAEA,SAAS,EAAuB,GAI7B;CACD,IAAM,EAAE,gBAAa,SAAM,eAAY,GACjC,EAAE,YAAS,eAAY,EAC3B,EAAE,eAAY,GACd;EAAE,SAAS;EAAM;CAAQ,CAC3B;CACA,OACE,kBAAC,GAAD;EACQ;EACN,UAAU;EACV,UAAS;EACT,OAAM;EACG;EACA;CACV,CAAA;AAEL"}

package/dist/components/Aridhia/AridhiaDarStatusPopover.d.ts

@@ -1,12 +1,16 @@
 import { PopoverProps } from '@mui/material';
 import { RequestListItem } from '@sage-bionetworks/aridhia-client/generated/models';
 export type AridhiaDarStatusPopoverProps = Pick<PopoverProps, 'anchorEl' | 'open' | 'id' | 'onClose'> & {
-    request: RequestListItem;
+    datasetCode: string;
+    /** Every request the user holds for the dataset, in display order. */
+    requests: RequestListItem[];
     /** Base URL of the RDCA-DAP FAIR portal's browsable UI, e.g. `https://fair.dap.c-path.org`. */
     fairPortalUrl?: string;
+    /** When set, offers to start another request (e.g. for different tables, or after a denial). */
+    onNewRequest?: () => void;
 };
 /**
- * Detail popover for a pending or denied DAR.
+ * Detail popover listing the user's DARs for one dataset.
  */
 export default function AridhiaDarStatusPopover(props: AridhiaDarStatusPopoverProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=AridhiaDarStatusPopover.d.ts.map

package/dist/components/Aridhia/AridhiaDarStatusPopover.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AridhiaDarStatusPopover.d.ts","sourceRoot":"","sources":["../../../src/components/Aridhia/AridhiaDarStatusPopover.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,YAAY,EAIb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAA;AAGnF,MAAM,MAAM,4BAA4B,GAAG,IAAI,CAC7C,YAAY,EACZ,UAAU,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CACvC,GAAG;IACF,OAAO,EAAE,eAAe,CAAA;IACxB,+FAA+F;IAC/F,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,KAAK,EAAE,4BAA4B,2CAwCpC"}
+{"version":3,"file":"AridhiaDarStatusPopover.d.ts","sourceRoot":"","sources":["../../../src/components/Aridhia/AridhiaDarStatusPopover.tsx"],"names":[],"mappings":"AACA,OAAO,EAQL,YAAY,EAGb,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAA;AAiBnF,MAAM,MAAM,4BAA4B,GAAG,IAAI,CAC7C,YAAY,EACZ,UAAU,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,CACvC,GAAG;IACF,WAAW,EAAE,MAAM,CAAA;IACnB,sEAAsE;IACtE,QAAQ,EAAE,eAAe,EAAE,CAAA;IAC3B,+FAA+F;IAC/F,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,gGAAgG;IAChG,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;CAC1B,CAAA;AAED;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,uBAAuB,CAC7C,KAAK,EAAE,4BAA4B,2CA8DpC"}

package/dist/components/Aridhia/AridhiaDarStatusPopover.js

@@ -1,14 +1,33 @@
-import { getAridhiaFairPortalRequestUrl as e } from "./aridhiaFairPortalUrls.js";
-import { Link as t, Popover as n, Stack as r, Typography as i } from "@mui/material";
-import { jsx as a, jsxs as o } from "react/jsx-runtime";
+import { getAridhiaFairPortalDatasetUrl as e, getAridhiaFairPortalRequestUrl as t } from "./aridhiaFairPortalUrls.js";
+import { useId as n } from "react";
+import { Button as r, Chip as i, Link as a, List as o, ListItem as s, Popover as c, Stack as l, Typography as u } from "@mui/material";
+import { Fragment as d, jsx as f, jsxs as p } from "react/jsx-runtime";
 //#region src/components/Aridhia/AridhiaDarStatusPopover.tsx
-function s(s) {
-	let { anchorEl: c, open: l, id: u, onClose: d, request: f, fairPortalUrl: p } = s;
-	return /* @__PURE__ */ a(n, {
-		id: u,
-		open: l,
-		anchorEl: c,
-		onClose: d,
+var m = {
+	approved: {
+		label: "Approved",
+		color: "success"
+	},
+	pending: {
+		label: "Pending",
+		color: "warning"
+	},
+	denied: {
+		label: "Denied",
+		color: "error"
+	},
+	error: {
+		label: "Error",
+		color: "default"
+	}
+};
+function h(t) {
+	let { anchorEl: i, open: a, id: s, onClose: m, datasetCode: h, requests: _, fairPortalUrl: v, onNewRequest: y } = t, b = n(), x = _.some((e) => e.status === "approved");
+	return /* @__PURE__ */ f(c, {
+		id: s,
+		open: a,
+		anchorEl: i,
+		onClose: m,
 		anchorOrigin: {
 			vertical: "bottom",
 			horizontal: "center"
@@ -17,40 +36,91 @@ function s(s) {
 			vertical: "top",
 			horizontal: "center"
 		},
-		children: /* @__PURE__ */ o(r, {
-			spacing: 1,
+		children: /* @__PURE__ */ p(l, {
+			spacing: 1.5,
 			sx: {
 				p: 2,
-				maxWidth: 320
+				width: 360,
+				maxWidth: "100%"
 			},
 			children: [
-				/* @__PURE__ */ a(i, {
-					variant: "subtitle2",
-					children: f.name ?? f.code
+				/* @__PURE__ */ f(u, {
+					id: b,
+					variant: "subtitle1",
+					component: "h2",
+					children: "Your data access requests"
 				}),
-				/* @__PURE__ */ o(i, {
-					variant: "body2",
-					children: ["Status: ", f.status]
+				/* @__PURE__ */ f(o, {
+					"aria-labelledby": b,
+					disablePadding: !0,
+					children: _.map((e, t) => /* @__PURE__ */ f(g, {
+						request: e,
+						fairPortalUrl: v,
+						divider: t < _.length - 1
+					}, e.code ?? `uncoded-${t}`))
 				}),
-				f.created_at && /* @__PURE__ */ o(i, {
-					variant: "body2",
-					children: ["Created: ", new Date(f.created_at).toLocaleDateString()]
+				x && v && /* @__PURE__ */ f(r, {
+					variant: "outlined",
+					href: e(v, h),
+					target: "_blank",
+					rel: "noopener noreferrer",
+					children: "Open dataset on RDCA-DAP"
 				}),
-				f.updated_at && /* @__PURE__ */ o(i, {
+				y && /* @__PURE__ */ p(d, { children: [/* @__PURE__ */ f(u, {
 					variant: "body2",
-					children: ["Updated: ", new Date(f.updated_at).toLocaleDateString()]
-				}),
-				p && f.code && /* @__PURE__ */ a(t, {
-					href: e(p, f.code),
+					color: "text.secondary",
+					children: "Need different tables, or was a request denied? You can submit another request."
+				}), /* @__PURE__ */ f(r, {
+					variant: "contained",
+					onClick: y,
+					children: "Submit a new request"
+				})] })
+			]
+		})
+	});
+}
+function g(e) {
+	let { request: n, fairPortalUrl: r, divider: o } = e, c = n.name || n.code, d = n.status ? m[n.status] : void 0;
+	return /* @__PURE__ */ p(s, {
+		divider: o,
+		disableGutters: !0,
+		sx: {
+			display: "block",
+			py: 1
+		},
+		children: [/* @__PURE__ */ p(l, {
+			direction: "row",
+			spacing: 1,
+			sx: {
+				alignItems: "center",
+				justifyContent: "space-between"
+			},
+			children: [/* @__PURE__ */ f(u, {
+				variant: "subtitle2",
+				sx: { wordBreak: "break-word" },
+				children: r && n.code ? /* @__PURE__ */ f(a, {
+					href: t(r, n.code),
 					target: "_blank",
 					rel: "noopener noreferrer",
-					children: "View on RDCA-DAP"
-				})
+					children: c
+				}) : c
+			}), d && /* @__PURE__ */ f(i, {
+				size: "small",
+				label: d.label,
+				color: d.color
+			})]
+		}), (n.created_at || n.updated_at) && /* @__PURE__ */ p(u, {
+			variant: "body2",
+			color: "text.secondary",
+			children: [
+				n.created_at && `Created ${new Date(n.created_at).toLocaleDateString()}`,
+				n.created_at && n.updated_at && " · ",
+				n.updated_at && `Updated ${new Date(n.updated_at).toLocaleDateString()}`
 			]
-		})
+		})]
 	});
 }
 //#endregion
-export { s as default };
+export { h as default };
 
 //# sourceMappingURL=AridhiaDarStatusPopover.js.map

package/dist/components/Aridhia/AridhiaDarStatusPopover.js.map

@@ -1 +1 @@
-{"version":3,"file":"AridhiaDarStatusPopover.js","names":[],"sources":["../../../src/components/Aridhia/AridhiaDarStatusPopover.tsx"],"sourcesContent":["import {\n  Popover,\n  PopoverProps,\n  Stack,\n  Typography,\n  Link as MuiLink,\n} from '@mui/material'\nimport { RequestListItem } from '@sage-bionetworks/aridhia-client/generated/models'\nimport { getAridhiaFairPortalRequestUrl } from './aridhiaFairPortalUrls'\n\nexport type AridhiaDarStatusPopoverProps = Pick<\n  PopoverProps,\n  'anchorEl' | 'open' | 'id' | 'onClose'\n> & {\n  request: RequestListItem\n  /** Base URL of the RDCA-DAP FAIR portal's browsable UI, e.g. `https://fair.dap.c-path.org`. */\n  fairPortalUrl?: string\n}\n\n/**\n * Detail popover for a pending or denied DAR.\n */\nexport default function AridhiaDarStatusPopover(\n  props: AridhiaDarStatusPopoverProps,\n) {\n  const { anchorEl, open, id, onClose, request, fairPortalUrl } = props\n\n  return (\n    <Popover\n      id={id}\n      open={open}\n      anchorEl={anchorEl}\n      onClose={onClose}\n      anchorOrigin={{ vertical: 'bottom', horizontal: 'center' }}\n      transformOrigin={{ vertical: 'top', horizontal: 'center' }}\n    >\n      <Stack spacing={1} sx={{ p: 2, maxWidth: 320 }}>\n        <Typography variant=\"subtitle2\">\n          {request.name ?? request.code}\n        </Typography>\n        <Typography variant=\"body2\">Status: {request.status}</Typography>\n        {request.created_at && (\n          <Typography variant=\"body2\">\n            Created: {new Date(request.created_at).toLocaleDateString()}\n          </Typography>\n        )}\n        {request.updated_at && (\n          <Typography variant=\"body2\">\n            Updated: {new Date(request.updated_at).toLocaleDateString()}\n          </Typography>\n        )}\n        {fairPortalUrl && request.code && (\n          <MuiLink\n            href={getAridhiaFairPortalRequestUrl(fairPortalUrl, request.code)}\n            target=\"_blank\"\n            rel=\"noopener noreferrer\"\n          >\n            View on RDCA-DAP\n          </MuiLink>\n        )}\n      </Stack>\n    </Popover>\n  )\n}\n"],"mappings":";;;;AAsBA,SAAwB,EACtB,GACA;CACA,IAAM,EAAE,aAAU,SAAM,OAAI,YAAS,YAAS,qBAAkB;CAEhE,OACE,kBAAC,GAAD;EACM;EACE;EACI;EACD;EACT,cAAc;GAAE,UAAU;GAAU,YAAY;EAAS;EACzD,iBAAiB;GAAE,UAAU;GAAO,YAAY;EAAS;YAEzD,kBAAC,GAAD;GAAO,SAAS;GAAG,IAAI;IAAE,GAAG;IAAG,UAAU;GAAI;aAA7C;IACE,kBAAC,GAAD;KAAY,SAAQ;eACjB,EAAQ,QAAQ,EAAQ;IACf,CAAA;IACZ,kBAAC,GAAD;KAAY,SAAQ;eAApB,CAA4B,YAAS,EAAQ,MAAmB;;IAC/D,EAAQ,cACP,kBAAC,GAAD;KAAY,SAAQ;eAApB,CAA4B,aAChB,IAAI,KAAK,EAAQ,UAAU,EAAE,mBAAmB,CAChD;;IAEb,EAAQ,cACP,kBAAC,GAAD;KAAY,SAAQ;eAApB,CAA4B,aAChB,IAAI,KAAK,EAAQ,UAAU,EAAE,mBAAmB,CAChD;;IAEb,KAAiB,EAAQ,QACxB,kBAAC,GAAD;KACE,MAAM,EAA+B,GAAe,EAAQ,IAAI;KAChE,QAAO;KACP,KAAI;eACL;IAEQ,CAAA;GAEN;;CACA,CAAA;AAEb"}
+{"version":3,"file":"AridhiaDarStatusPopover.js","names":[],"sources":["../../../src/components/Aridhia/AridhiaDarStatusPopover.tsx"],"sourcesContent":["import { useId } from 'react'\nimport {\n  Button,\n  Chip,\n  ChipProps,\n  Link as MuiLink,\n  List,\n  ListItem,\n  Popover,\n  PopoverProps,\n  Stack,\n  Typography,\n} from '@mui/material'\nimport { RequestListItem } from '@sage-bionetworks/aridhia-client/generated/models'\nimport { RequestStatus } from './aridhiaAccessStatusUtils'\nimport {\n  getAridhiaFairPortalDatasetUrl,\n  getAridhiaFairPortalRequestUrl,\n} from './aridhiaFairPortalUrls'\n\nconst STATUS_CHIP: Record<\n  RequestStatus,\n  { label: string; color: ChipProps['color'] }\n> = {\n  approved: { label: 'Approved', color: 'success' },\n  pending: { label: 'Pending', color: 'warning' },\n  denied: { label: 'Denied', color: 'error' },\n  error: { label: 'Error', color: 'default' },\n}\n\nexport type AridhiaDarStatusPopoverProps = Pick<\n  PopoverProps,\n  'anchorEl' | 'open' | 'id' | 'onClose'\n> & {\n  datasetCode: string\n  /** Every request the user holds for the dataset, in display order. */\n  requests: RequestListItem[]\n  /** Base URL of the RDCA-DAP FAIR portal's browsable UI, e.g. `https://fair.dap.c-path.org`. */\n  fairPortalUrl?: string\n  /** When set, offers to start another request (e.g. for different tables, or after a denial). */\n  onNewRequest?: () => void\n}\n\n/**\n * Detail popover listing the user's DARs for one dataset.\n */\nexport default function AridhiaDarStatusPopover(\n  props: AridhiaDarStatusPopoverProps,\n) {\n  const {\n    anchorEl,\n    open,\n    id,\n    onClose,\n    datasetCode,\n    requests,\n    fairPortalUrl,\n    onNewRequest,\n  } = props\n  const headingId = useId()\n  const hasApprovedRequest = requests.some(r => r.status === 'approved')\n\n  return (\n    <Popover\n      id={id}\n      open={open}\n      anchorEl={anchorEl}\n      onClose={onClose}\n      anchorOrigin={{ vertical: 'bottom', horizontal: 'center' }}\n      transformOrigin={{ vertical: 'top', horizontal: 'center' }}\n    >\n      <Stack spacing={1.5} sx={{ p: 2, width: 360, maxWidth: '100%' }}>\n        <Typography id={headingId} variant=\"subtitle1\" component=\"h2\">\n          Your data access requests\n        </Typography>\n        <List aria-labelledby={headingId} disablePadding>\n          {requests.map((request, index) => (\n            <DarListItem\n              key={request.code ?? `uncoded-${index}`}\n              request={request}\n              fairPortalUrl={fairPortalUrl}\n              divider={index < requests.length - 1}\n            />\n          ))}\n        </List>\n        {hasApprovedRequest && fairPortalUrl && (\n          <Button\n            variant=\"outlined\"\n            href={getAridhiaFairPortalDatasetUrl(fairPortalUrl, datasetCode)}\n            target=\"_blank\"\n            rel=\"noopener noreferrer\"\n          >\n            Open dataset on RDCA-DAP\n          </Button>\n        )}\n        {onNewRequest && (\n          <>\n            <Typography variant=\"body2\" color=\"text.secondary\">\n              Need different tables, or was a request denied? You can submit\n              another request.\n            </Typography>\n            <Button variant=\"contained\" onClick={onNewRequest}>\n              Submit a new request\n            </Button>\n          </>\n        )}\n      </Stack>\n    </Popover>\n  )\n}\n\nfunction DarListItem(props: {\n  request: RequestListItem\n  fairPortalUrl?: string\n  divider: boolean\n}) {\n  const { request, fairPortalUrl, divider } = props\n  const title = request.name || request.code\n  const chip = request.status ? STATUS_CHIP[request.status] : undefined\n\n  return (\n    <ListItem divider={divider} disableGutters sx={{ display: 'block', py: 1 }}>\n      <Stack\n        direction=\"row\"\n        spacing={1}\n        sx={{ alignItems: 'center', justifyContent: 'space-between' }}\n      >\n        <Typography variant=\"subtitle2\" sx={{ wordBreak: 'break-word' }}>\n          {fairPortalUrl && request.code ? (\n            <MuiLink\n              href={getAridhiaFairPortalRequestUrl(fairPortalUrl, request.code)}\n              target=\"_blank\"\n              rel=\"noopener noreferrer\"\n            >\n              {title}\n            </MuiLink>\n          ) : (\n            title\n          )}\n        </Typography>\n        {chip && <Chip size=\"small\" label={chip.label} color={chip.color} />}\n      </Stack>\n      {(request.created_at || request.updated_at) && (\n        <Typography variant=\"body2\" color=\"text.secondary\">\n          {request.created_at &&\n            `Created ${new Date(request.created_at).toLocaleDateString()}`}\n          {request.created_at && request.updated_at && ' · '}\n          {request.updated_at &&\n            `Updated ${new Date(request.updated_at).toLocaleDateString()}`}\n        </Typography>\n      )}\n    </ListItem>\n  )\n}\n"],"mappings":";;;;;AAoBA,IAAM,IAGF;CACF,UAAU;EAAE,OAAO;EAAY,OAAO;CAAU;CAChD,SAAS;EAAE,OAAO;EAAW,OAAO;CAAU;CAC9C,QAAQ;EAAE,OAAO;EAAU,OAAO;CAAQ;CAC1C,OAAO;EAAE,OAAO;EAAS,OAAO;CAAU;AAC5C;AAkBA,SAAwB,EACtB,GACA;CACA,IAAM,EACJ,aACA,SACA,OACA,YACA,gBACA,aACA,kBACA,oBACE,GACE,IAAY,EAAM,GAClB,IAAqB,EAAS,MAAK,MAAK,EAAE,WAAW,UAAU;CAErE,OACE,kBAAC,GAAD;EACM;EACE;EACI;EACD;EACT,cAAc;GAAE,UAAU;GAAU,YAAY;EAAS;EACzD,iBAAiB;GAAE,UAAU;GAAO,YAAY;EAAS;YAEzD,kBAAC,GAAD;GAAO,SAAS;GAAK,IAAI;IAAE,GAAG;IAAG,OAAO;IAAK,UAAU;GAAO;aAA9D;IACE,kBAAC,GAAD;KAAY,IAAI;KAAW,SAAQ;KAAY,WAAU;eAAK;IAElD,CAAA;IACZ,kBAAC,GAAD;KAAM,mBAAiB;KAAW,gBAAA;eAC/B,EAAS,KAAK,GAAS,MACtB,kBAAC,GAAD;MAEW;MACM;MACf,SAAS,IAAQ,EAAS,SAAS;KACpC,GAJM,EAAQ,QAAQ,WAAW,GAIjC,CACF;IACG,CAAA;IACL,KAAsB,KACrB,kBAAC,GAAD;KACE,SAAQ;KACR,MAAM,EAA+B,GAAe,CAAW;KAC/D,QAAO;KACP,KAAI;eACL;IAEO,CAAA;IAET,KACC,kBAAA,GAAA,EAAA,UAAA,CACE,kBAAC,GAAD;KAAY,SAAQ;KAAQ,OAAM;eAAiB;IAGvC,CAAA,GACZ,kBAAC,GAAD;KAAQ,SAAQ;KAAY,SAAS;eAAc;IAE3C,CAAA,CACR,EAAA,CAAA;GAEC;;CACA,CAAA;AAEb;AAEA,SAAS,EAAY,GAIlB;CACD,IAAM,EAAE,YAAS,kBAAe,eAAY,GACtC,IAAQ,EAAQ,QAAQ,EAAQ,MAChC,IAAO,EAAQ,SAAS,EAAY,EAAQ,UAAU,KAAA;CAE5D,OACE,kBAAC,GAAD;EAAmB;EAAS,gBAAA;EAAe,IAAI;GAAE,SAAS;GAAS,IAAI;EAAE;YAAzE,CACE,kBAAC,GAAD;GACE,WAAU;GACV,SAAS;GACT,IAAI;IAAE,YAAY;IAAU,gBAAgB;GAAgB;aAH9D,CAKE,kBAAC,GAAD;IAAY,SAAQ;IAAY,IAAI,EAAE,WAAW,aAAa;cAC3D,KAAiB,EAAQ,OACxB,kBAAC,GAAD;KACE,MAAM,EAA+B,GAAe,EAAQ,IAAI;KAChE,QAAO;KACP,KAAI;eAEH;IACM,CAAA,IAET;GAEQ,CAAA,GACX,KAAQ,kBAAC,GAAD;IAAM,MAAK;IAAQ,OAAO,EAAK;IAAO,OAAO,EAAK;GAAQ,CAAA,CAC9D;OACL,EAAQ,cAAc,EAAQ,eAC9B,kBAAC,GAAD;GAAY,SAAQ;GAAQ,OAAM;aAAlC;IACG,EAAQ,cACP,WAAW,IAAI,KAAK,EAAQ,UAAU,EAAE,mBAAmB;IAC5D,EAAQ,cAAc,EAAQ,cAAc;IAC5C,EAAQ,cACP,WAAW,IAAI,KAAK,EAAQ,UAAU,EAAE,mBAAmB;GACnD;IAEN;;AAEd"}

package/dist/components/Aridhia/aridhiaAccessStatusUtils.d.ts

@@ -1,19 +1,21 @@
 import { RestrictionUiType } from '../HasAccess/AccessIcon';
 import { RequestListItem } from '@sage-bionetworks/aridhia-client/generated/models';
+export type RequestStatus = NonNullable<RequestListItem['status']>;
 /**
- * Maps an Aridhia request status to the appropriate RestrictionUiType for display.
+ * Maps a user's Aridhia requests for one dataset to the RestrictionUiType for display.
  *
- * @param request - The Aridhia request object, or undefined if no request exists
- * @returns The appropriate RestrictionUiType based on the request status
+ * @param requests - Every request the user holds for the dataset (may be empty)
+ * @returns The RestrictionUiType of the highest-precedence status present, or
+ *   `AccessBlockedByRestriction` when no request has a recognized status
  */
-export declare function getRestrictionUiTypeFromAridhiaRequest(request: RequestListItem | undefined): RestrictionUiType;
+export declare function getRestrictionUiTypeFromAridhiaRequests(requests: readonly RequestListItem[]): RestrictionUiType;
 /**
- * Finds the Aridhia request for a specific dataset from a list of requests.
- * If multiple requests match, returns the most recently updated one.
+ * Finds every Aridhia request that includes a specific dataset.
  *
  * @param requests - Array of Aridhia requests
- * @param datasetCode - The dataset code to search for
- * @returns The most recently updated request that contains the specified dataset, or undefined if not found
+ * @param datasetCode - The dataset code to search for (case-sensitive)
+ * @returns The matching requests, most recently updated first; requests whose `updated_at` is
+ *   missing or unparseable sort last
  */
-export declare function findRequestForDataset(requests: RequestListItem[], datasetCode: string): RequestListItem | undefined;
+export declare function findRequestsForDataset(requests: readonly RequestListItem[], datasetCode: string): RequestListItem[];
 //# sourceMappingURL=aridhiaAccessStatusUtils.d.ts.map