Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

chore: improve Members settings accessibility (#44484)

Joel41543ac8810d
diff --git a/web/app/components/header/account-setting/__tests__/settings-modal.spec.tsx b/web/app/components/header/account-setting/__tests__/settings-modal.spec.tsx
index 299d47f0ac1..f8a610c9499 100644
--- a/web/app/components/header/account-setting/__tests__/settings-modal.spec.tsx
+++ b/web/app/components/header/account-setting/__tests__/settings-modal.spec.tsx
@@ -125,6 +125,14 @@ const findSettings = async () => {
const expectMembers = () =>
screen.findByRole('columnheader', { name: 'workspaceMembers.members.name' })
+it('exposes the Members content title as a heading', async () => {
+ renderSettings()
+ const dialog = await findSettings()
+ expect(
+ within(dialog).getByRole('heading', { name: 'navigation.settings.members', level: 3 }),
+ ).toBeVisible()
+})
+
beforeEach(() => {
featureFlags.NEXT_PUBLIC_ENABLE_ACCESS_TOKEN = true
})
diff --git a/web/app/components/header/account-setting/__tests__/workspace-role-checkbox-list.spec.tsx b/web/app/components/header/account-setting/__tests__/workspace-role-checkbox-list.spec.tsx
index 844e022d6a7..af460c128e4 100644
--- a/web/app/components/header/account-setting/__tests__/workspace-role-checkbox-list.spec.tsx
+++ b/web/app/components/header/account-setting/__tests__/workspace-role-checkbox-list.spec.tsx
@@ -125,6 +125,33 @@ describe('WorkspaceRoleCheckboxList', () => {
expect(screen.getByRole('checkbox', { name: /Second role/i })).toBeInTheDocument()
})
+ it('should announce role loading and empty search results without moving focus', async () => {
+ const user = userEvent.setup()
+
+ render(<WorkspaceRoleCheckboxList selectedRoleIds={[]} onSelectedRolesChange={vi.fn()} />)
+
+ const status = screen.getByRole('status')
+ expect(status).toHaveTextContent('permission.role.loading')
+ await screen.findByRole('checkbox', { name: /First role/i })
+ expect(status).toBeEmptyDOMElement()
+
+ const searchInput = screen.getByRole('searchbox', {
+ name: 'permission.role.searchPlaceholder',
+ })
+ await user.type(searchInput, 'No such role')
+
+ expect(status).toBeInTheDocument()
+ expect(status).toHaveTextContent('permission.role.noMatchingRoles')
+ expect(searchInput).toHaveFocus()
+ expect(screen.queryByRole('checkbox')).not.toBeInTheDocument()
+
+ await user.clear(searchInput)
+
+ expect(status).toBeEmptyDOMElement()
+ expect(searchInput).toHaveFocus()
+ expect(screen.getByRole('checkbox', { name: /First role/i })).toBeInTheDocument()
+ })
+
it('should expose disabled state on single-role options', async () => {
render(
<WorkspaceRoleCheckboxList
diff --git a/web/app/components/header/account-setting/members-page/index.tsx b/web/app/components/header/account-setting/members-page/index.tsx
index 6ad67ad294f..7d727223eaa 100644
--- a/web/app/components/header/account-setting/members-page/index.tsx
+++ b/web/app/components/header/account-setting/members-page/index.tsx
@@ -109,73 +109,79 @@ const MembersPage = () => {
return (
<>
<div className="flex flex-col">
- <div className="mb-6 flex items-center gap-3 rounded-xl border-t-[0.5px] border-l-[0.5px] border-divider-subtle bg-linear-to-r from-background-gradient-bg-fill-chat-bg-2 to-background-gradient-bg-fill-chat-bg-1 py-2 pr-5 pl-2">
- <WorkspaceAvatar name={currentWorkspace.name} size="2xl" />
- <div className="grow">
- <div className="flex items-center gap-1 system-md-semibold text-text-secondary">
- <span>{currentWorkspace?.name}</span>
- {isCurrentWorkspaceOwner && (
- <span>
- <Tooltip>
- <TooltipTrigger
- render={
- <button
- type="button"
- aria-label={t(($) => $['account.editWorkspaceInfo'], {
- ns: 'accountSettings',
- })}
- className="cursor-pointer rounded-md border-none bg-transparent p-1 hover:bg-black/5"
- onClick={() => {
- setEditWorkspaceModalVisible(true)
- }}
- >
- <span
- aria-hidden="true"
- className="i-ri-pencil-line size-4 text-text-tertiary"
- />
- </button>
- }
- />
- <TooltipContent>
- {t(($) => $['account.editWorkspaceInfo'], { ns: 'accountSettings' })}
- </TooltipContent>
- </Tooltip>
- </span>
- )}
- </div>
- <div className="mt-1 system-xs-medium text-text-tertiary">
- {isNotUnlimitedMemberPlan ? (
- <div className="flex space-x-1">
- <div>
- {t(($) => $['plansCommon.member'], { ns: 'billing' })}
- {locale !== LanguagesSupported[1] && accounts.length > 1 && 's'}
- </div>
- <div className="">{accounts.length}</div>
- <div>/</div>
- <div>
- {features.members.limit === 0
- ? t(($) => $['plansCommon.unlimited'], { ns: 'billing' })
- : features.members.limit}
+ <div className="mb-6 flex flex-wrap items-center gap-3 rounded-xl border-t-[0.5px] border-l-[0.5px] border-divider-subtle bg-linear-to-r from-background-gradient-bg-fill-chat-bg-2 to-background-gradient-bg-fill-chat-bg-1 py-2 pr-5 pl-2">
+ <div className="flex min-w-0 grow basis-48 items-center gap-3">
+ <WorkspaceAvatar name={currentWorkspace.name} size="2xl" className="shrink-0" />
+ <div className="min-w-0 grow">
+ <div className="flex items-center gap-1 system-md-semibold text-text-secondary">
+ <span className="min-w-0 wrap-anywhere">{currentWorkspace?.name}</span>
+ {isCurrentWorkspaceOwner && (
+ <span className="shrink-0">
+ <Tooltip>
+ <TooltipTrigger
+ render={
+ <button
+ type="button"
+ aria-label={t(($) => $['account.editWorkspaceInfo'], {
+ ns: 'accountSettings',
+ })}
+ className="cursor-pointer rounded-md border-none bg-transparent p-1 hover:bg-black/5"
+ onClick={() => {
+ setEditWorkspaceModalVisible(true)
+ }}
+ >
+ <span
+ aria-hidden="true"
+ className="i-ri-pencil-line size-4 text-text-tertiary"
+ />
+ </button>
+ }
+ />
+ <TooltipContent>
+ {t(($) => $['account.editWorkspaceInfo'], { ns: 'accountSettings' })}
+ </TooltipContent>
+ </Tooltip>
+ </span>
+ )}
+ </div>
+ <div className="mt-1 system-xs-medium text-text-tertiary">
+ {isNotUnlimitedMemberPlan ? (
+ <div className="flex flex-wrap gap-x-1">
+ <div>
+ {t(($) => $['plansCommon.member'], { ns: 'billing' })}
+ {locale !== LanguagesSupported[1] && accounts.length > 1 && 's'}
+ </div>
+ <div className="flex gap-x-1">
+ <span>{accounts.length}</span>
+ <span>/</span>
+ <span>
+ {features.members.limit === 0
+ ? t(($) => $['plansCommon.unlimited'], { ns: 'billing' })
+ : features.members.limit}
+ </span>
+ </div>
</div>
- </div>
- ) : (
- <div className="flex space-x-1">
- <div>{accounts.length}</div>
- <div>
- {t(($) => $['plansCommon.memberAfter'], { ns: 'billing' })}
- {locale !== LanguagesSupported[1] && accounts.length > 1 && 's'}
+ ) : (
+ <div className="flex gap-x-1">
+ <div className="shrink-0">{accounts.length}</div>
+ <div>
+ {t(($) => $['plansCommon.memberAfter'], { ns: 'billing' })}
+ {locale !== LanguagesSupported[1] && accounts.length > 1 && 's'}
+ </div>
</div>
- </div>
- )}
+ )}
+ </div>
</div>
</div>
- {isMemberFull && <UpgradeBtn className="mr-2" loc="member-invite" />}
- <div className="shrink-0">
+ <div className="flex flex-wrap items-center gap-3">
+ {isMemberFull && <UpgradeBtn className="shrink-0" loc="member-invite" />}
{canManageMembers && (
- <InviteModal
- isEmailSetup={systemFeatures.is_email_setup}
- onSend={setInvitationResults}
- />
+ <div className="shrink-0">
+ <InviteModal
+ isEmailSetup={systemFeatures.is_email_setup}
+ onSend={setInvitationResults}
+ />
+ </div>
)}
</div>
</div>
diff --git a/web/app/components/header/account-setting/members-page/invited-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/invited-modal/__tests__/index.spec.tsx
index 27991016cb9..1207cd797a8 100644
--- a/web/app/components/header/account-setting/members-page/invited-modal/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/members-page/invited-modal/__tests__/index.spec.tsx
@@ -1,7 +1,8 @@
import type { DeploymentEdition } from '@dify/contracts/api/console/system-features/types.gen'
import type { MemberInviteResponse } from '@dify/contracts/api/console/workspaces/types.gen'
import type { ReactElement } from 'react'
-import { screen } from '@testing-library/react'
+import { screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
import { renderWithConsoleQuery } from '@/test/console/query-data'
import InvitedModal from '../index'
@@ -26,7 +27,7 @@ describe('InvitedModal', () => {
deploymentEdition = 'COMMUNITY'
})
- it('should show success and failed invitation sections', async () => {
+ it('should show invitation results', async () => {
render(<InvitedModal invitationResults={results} onCancel={mockOnCancel} />)
expect(await screen.findByText(/members\.invitationSent$/i)).toBeInTheDocument()
@@ -35,6 +36,86 @@ describe('InvitedModal', () => {
expect(screen.getByText(/members\.alreadyInTeam$/i)).toBeInTheDocument()
expect(screen.getByText('[email protected]')).toBeInTheDocument()
expect(screen.getByText('[email protected]')).toBeInTheDocument()
+ expect(screen.getByRole('button', { name: '[email protected]' })).toBeInTheDocument()
+ })
+
+ it('opens and reopens a failure reason with the keyboard without closing the results dialog', async () => {
+ const user = userEvent.setup()
+ render(
+ <InvitedModal
+ invitationResults={[
+ { email: '[email protected]', status: 'failed', message: 'Quota exceeded' },
+ ]}
+ onCancel={mockOnCancel}
+ />,
+ )
+
+ const closeButton = screen.getByRole('button', { name: /operation\.close/ })
+ await waitFor(() => expect(closeButton).toHaveFocus())
+ expect(screen.queryByRole('dialog', { name: '[email protected]' })).not.toBeInTheDocument()
+
+ await user.tab()
+ const failureTrigger = screen.getByRole('button', { name: '[email protected]' })
+ expect(failureTrigger).toHaveFocus()
+ await user.keyboard('{Enter}')
+ expect(await screen.findByRole('dialog', { name: '[email protected]' })).toHaveTextContent(
+ 'Quota exceeded',
+ )
+
+ await user.keyboard('{Escape}')
+ await waitFor(() =>
+ expect(screen.queryByRole('dialog', { name: '[email protected]' })).not.toBeInTheDocument(),
+ )
+ expect(mockOnCancel).not.toHaveBeenCalled()
+ expect(screen.getByRole('dialog', { name: /members\.invitationSent$/ })).toBeVisible()
+ expect(failureTrigger).toHaveFocus()
+
+ await user.keyboard('{Enter}')
+ expect(await screen.findByRole('dialog', { name: '[email protected]' })).toHaveTextContent(
+ 'Quota exceeded',
+ )
+ })
+
+ it('opens a failure reason by clicking without hovering first', async () => {
+ const user = userEvent.setup({ skipHover: true })
+ render(<InvitedModal invitationResults={results} onCancel={mockOnCancel} />)
+
+ await user.click(screen.getByRole('button', { name: '[email protected]' }))
+
+ expect(await screen.findByRole('dialog', { name: '[email protected]' })).toHaveTextContent(
+ 'Error msg',
+ )
+ expect(mockOnCancel).not.toHaveBeenCalled()
+ })
+
+ it('shows each failure reason when its email is hovered', async () => {
+ const user = userEvent.setup()
+ render(
+ <InvitedModal
+ invitationResults={[
+ { email: '[email protected]', status: 'failed', message: 'Quota exceeded' },
+ { email: '[email protected]', status: 'failed', message: 'Email delivery failed' },
+ ]}
+ onCancel={mockOnCancel}
+ />,
+ )
+
+ const firstTrigger = screen.getByRole('button', { name: '[email protected]' })
+ await user.hover(firstTrigger)
+ expect(await screen.findByRole('dialog', { name: '[email protected]' })).toHaveTextContent(
+ 'Quota exceeded',
+ )
+
+ await user.unhover(firstTrigger)
+ await waitFor(() =>
+ expect(screen.queryByRole('dialog', { name: '[email protected]' })).not.toBeInTheDocument(),
+ )
+
+ const secondTrigger = screen.getByRole('button', { name: '[email protected]' })
+ await user.hover(secondTrigger)
+ expect(await screen.findByRole('dialog', { name: '[email protected]' })).toHaveTextContent(
+ 'Email delivery failed',
+ )
})
it('should hide invitation link section when there are no successes', () => {
diff --git a/web/app/components/header/account-setting/members-page/invited-modal/index.tsx b/web/app/components/header/account-setting/members-page/invited-modal/index.tsx
index 6b6d2e8c0cf..29da4a672ac 100644
--- a/web/app/components/header/account-setting/members-page/invited-modal/index.tsx
+++ b/web/app/components/header/account-setting/members-page/invited-modal/index.tsx
@@ -14,8 +14,9 @@ import {
DialogHeaderCloseButton,
DialogTitle,
} from '@langgenius/dify-ui/dialog'
-import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'
+import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
import { useSuspenseQuery } from '@tanstack/react-query'
+import { useId } from 'react'
import { useTranslation } from 'react-i18next'
import { systemFeaturesQueryOptions } from '@/features/system-features/client'
import InvitationLink from './invitation-link'
@@ -26,6 +27,7 @@ type IInvitedModalProps = {
}
const InvitedModal = ({ invitationResults, onCancel }: IInvitedModalProps) => {
const { t } = useTranslation(['common', 'workspaceMembers'])
+ const failedEmailId = useId()
const { data: deploymentEdition } = useSuspenseQuery({
...systemFeaturesQueryOptions(),
select: ({ deployment_edition }) => deployment_edition,
@@ -115,26 +117,42 @@ const InvitedModal = ({ invitationResults, onCancel }: IInvitedModalProps) => {
<div className="py-2 text-sm font-medium text-text-primary">
{t(($) => $['members.failedInvitationEmails'], { ns: 'workspaceMembers' })}
</div>
- <div className="flex flex-wrap justify-between gap-y-1">
- {failedInvitationResults.map((item) => (
- <div
+ <ul className="flex flex-wrap justify-between gap-x-2 gap-y-1">
+ {failedInvitationResults.map((item, index) => (
+ <li
key={item.email}
- className="flex justify-center rounded-md border border-red-300 bg-orange-50 px-1"
+ className="flex max-w-full min-w-0 rounded-md border border-red-300 bg-orange-50 px-1"
>
- <Tooltip>
- <TooltipTrigger
- render={
- <div className="flex items-center justify-center gap-1 text-sm">
- {item.email}
- <div className="i-ri-question-line size-4 text-red-300" />
- </div>
- }
- />
- <TooltipContent>{item.message}</TooltipContent>
- </Tooltip>
- </div>
+ <Popover>
+ <PopoverTrigger
+ type="button"
+ openOnHover
+ delay={300}
+ closeDelay={200}
+ className="flex min-h-6 min-w-0 cursor-pointer items-center justify-center gap-1 rounded-sm text-start text-sm"
+ >
+ <span
+ id={`${failedEmailId}-${index}`}
+ className="min-w-0 wrap-anywhere"
+ >
+ {item.email}
+ </span>
+ <span
+ aria-hidden="true"
+ className="i-ri-question-line size-4 shrink-0 text-red-300"
+ />
+ </PopoverTrigger>
+ <PopoverContent
+ placement="top"
+ aria-labelledby={`${failedEmailId}-${index}`}
+ className="max-w-75 p-2 system-xs-medium wrap-break-word text-text-secondary"
+ >
+ {item.message}
+ </PopoverContent>
+ </Popover>
+ </li>
))}
- </div>
+ </ul>
</>
)}
</div>
diff --git a/web/app/components/header/account-setting/members-page/member-details-modal/index.tsx b/web/app/components/header/account-setting/members-page/member-details-modal/index.tsx
index e22f7e3543c..84b42b6aabc 100644
--- a/web/app/components/header/account-setting/members-page/member-details-modal/index.tsx
+++ b/web/app/components/header/account-setting/members-page/member-details-modal/index.tsx
@@ -123,141 +123,146 @@ const MemberDetailsModal = ({
}, [allowMultipleRoles, isSaving, onAssignSubmit, onClose, selectedRoles])
return (
- <>
- <Dialog
- open
- onOpenChange={(next) => {
- if (!next && !isSaving) onClose()
- }}
- >
- <DialogContent className="w-110" backdropProps={{ forceRender: true }}>
- <DialogHeader>
- <DialogTitle>
- {t(($) => $['members.memberDetails.title'], {
- ns: 'workspaceMembers',
- defaultValue: 'Member Details',
- })}
- </DialogTitle>
- <DialogHeaderCloseButton
- disabled={isSaving}
- aria-label={t(($) => $['operation.close'], { ns: 'common' })}
- />
- </DialogHeader>
+ <Dialog
+ open
+ onOpenChange={(next) => {
+ if (!next && !isSaving) onClose()
+ }}
+ >
+ <DialogContent className="w-110" backdropProps={{ forceRender: true }}>
+ <DialogHeader>
+ <DialogTitle>
+ {t(($) => $['members.memberDetails.title'], {
+ ns: 'workspaceMembers',
+ defaultValue: 'Member Details',
+ })}
+ </DialogTitle>
+ <DialogHeaderCloseButton
+ disabled={isSaving}
+ aria-label={t(($) => $['operation.close'], { ns: 'common' })}
+ />
+ </DialogHeader>
- <DialogBody className="flex items-center gap-3">
+ <DialogBody>
+ <div className="flex items-center gap-3">
<Avatar size="2xl" aria-hidden="true">
<AvatarFallback>{getAvatarInitial(member.name)}</AvatarFallback>
<AvatarImage src={member.avatar_url || undefined} alt="" />
</Avatar>
<div className="min-w-0 flex-1">
- <div className="truncate system-md-semibold text-text-primary">{member.name}</div>
- <div className="truncate system-xs-regular text-text-tertiary">{member.email}</div>
+ <div className="system-md-semibold wrap-break-word text-text-primary">
+ {member.name}
+ </div>
+ <div className="system-xs-regular wrap-break-word text-text-tertiary">
+ {member.email}
+ </div>
</div>
+ </div>
- <div className="-mx-6 my-3 border-t border-divider-subtle" />
+ <div className="-mx-6 my-3 border-t border-divider-subtle" />
- <div className="flex items-center justify-between">
- <div className="flex items-center gap-1.5 system-sm-semibold text-text-secondary">
- <span>{assignedRolesLabel}</span>
- {!isLoadingRolesOfMember && (
- <span className="system-xs-medium text-text-tertiary">
- {selectedRoleIds.length}
- </span>
- )}
- </div>
- {canAssignRoles && (
- <Button
- variant="ghost"
- size="small"
- disabled={isSaving}
- onClick={() => setAssignOpen(true)}
- >
- <span aria-hidden className={assignActionIconClassName} />
- {assignActionLabel}
- </Button>
+ <div className="flex flex-wrap items-center justify-between gap-2">
+ <div className="flex items-center gap-1.5 system-sm-semibold text-text-secondary">
+ <span>{assignedRolesLabel}</span>
+ {!isLoadingRolesOfMember && (
+ <span className="system-xs-medium text-text-tertiary">
+ {selectedRoleIds.length}
+ </span>
)}
</div>
-
- {isLoadingRolesOfMember ? (
- <div className="mt-4">
- <LoadingPlaceholder />
- </div>
- ) : (
- <>
- {builtinRoles.length > 0 && (
- <div className="mt-4">
- <div className="mb-2 system-2xs-medium-uppercase text-text-tertiary">
- {t(($) => $['members.memberDetails.generalGroup'], {
- ns: 'workspaceMembers',
- })}
- </div>
- <div className="flex flex-wrap gap-1.5">
- {builtinRoles.map((role) => (
- <PermissionRoleChip
- key={role.id}
- roleId={role.id}
- label={role.name}
- isOwner={role.role_tag === 'owner'}
- permissionKeys={role.permission_keys}
- onRemove={canRemoveRoles && !isSaving ? handleRemove : undefined}
- />
- ))}
- </div>
- </div>
- )}
- {customRoles.length > 0 && (
- <div className="mt-4">
- <div className="mb-2 system-2xs-medium-uppercase text-text-tertiary">
- {t(($) => $['members.memberDetails.customGroup'], {
- ns: 'workspaceMembers',
- })}
- </div>
- <div className="flex flex-wrap gap-1.5">
- {customRoles.map((role) => (
- <PermissionRoleChip
- key={role.id}
- roleId={role.id}
- label={role.name}
- isOwner={role.role_tag === 'owner'}
- permissionKeys={role.permission_keys}
- onRemove={canRemoveRoles && !isSaving ? handleRemove : undefined}
- />
- ))}
- </div>
- </div>
- )}
- </>
- )}
- </DialogBody>
-
- {saveFailed && <p role="alert">{t(($) => $['api.actionFailed'], { ns: 'common' })}</p>}
- {canAssignRoles && (
- <DialogFooter>
- <Button variant="secondary" disabled={isSaving} onClick={onClose}>
- {t(($) => $['operation.cancel'], { ns: 'common' })}
- </Button>
+ {canAssignRoles && (
<Button
- variant="primary"
- onClick={handleSave}
- loading={isSaving}
- disabled={!onAssignSubmit}
+ variant="ghost"
+ size="small"
+ className="ms-auto shrink-0"
+ disabled={isSaving}
+ onClick={() => setAssignOpen(true)}
>
- {t(($) => $['operation.save'], { ns: 'common' })}
+ <span aria-hidden className={assignActionIconClassName} />
+ {assignActionLabel}
</Button>
- </DialogFooter>
+ )}
+ </div>
+
+ {isLoadingRolesOfMember ? (
+ <div className="mt-4">
+ <LoadingPlaceholder />
+ </div>
+ ) : (
+ <>
+ {builtinRoles.length > 0 && (
+ <div className="mt-4">
+ <div className="mb-2 system-2xs-medium-uppercase text-text-tertiary">
+ {t(($) => $['members.memberDetails.generalGroup'], {
+ ns: 'workspaceMembers',
+ })}
+ </div>
+ <div className="flex flex-wrap gap-1.5">
+ {builtinRoles.map((role) => (
+ <PermissionRoleChip
+ key={role.id}
+ roleId={role.id}
+ label={role.name}
+ isOwner={role.role_tag === 'owner'}
+ permissionKeys={role.permission_keys}
+ onRemove={canRemoveRoles && !isSaving ? handleRemove : undefined}
+ />
+ ))}
+ </div>
+ </div>
+ )}
+ {customRoles.length > 0 && (
+ <div className="mt-4">
+ <div className="mb-2 system-2xs-medium-uppercase text-text-tertiary">
+ {t(($) => $['members.memberDetails.customGroup'], {
+ ns: 'workspaceMembers',
+ })}
+ </div>
+ <div className="flex flex-wrap gap-1.5">
+ {customRoles.map((role) => (
+ <PermissionRoleChip
+ key={role.id}
+ roleId={role.id}
+ label={role.name}
+ isOwner={role.role_tag === 'owner'}
+ permissionKeys={role.permission_keys}
+ onRemove={canRemoveRoles && !isSaving ? handleRemove : undefined}
+ />
+ ))}
+ </div>
+ </div>
+ )}
+ </>
)}
- </DialogContent>
- </Dialog>
+ </DialogBody>
+
+ {saveFailed && <p role="alert">{t(($) => $['api.actionFailed'], { ns: 'common' })}</p>}
+ {canAssignRoles && (
+ <DialogFooter>
+ <Button variant="secondary" disabled={isSaving} onClick={onClose}>
+ {t(($) => $['operation.cancel'], { ns: 'common' })}
+ </Button>
+ <Button
+ variant="primary"
+ onClick={handleSave}
+ loading={isSaving}
+ disabled={!onAssignSubmit}
+ >
+ {t(($) => $['operation.save'], { ns: 'common' })}
+ </Button>
+ </DialogFooter>
+ )}
- {assignOpen && (
- <AssignRolesModal
- selectedRoles={selectedRoles}
- allowMultipleRoles={allowMultipleRoles}
- onClose={handleClose}
- onSubmit={handleAssignSubmit}
- />
- )}
- </>
+ {assignOpen && (
+ <AssignRolesModal
+ selectedRoles={selectedRoles}
+ allowMultipleRoles={allowMultipleRoles}
+ onClose={handleClose}
+ onSubmit={handleAssignSubmit}
+ />
+ )}
+ </DialogContent>
+ </Dialog>
)
}
diff --git a/web/app/components/header/account-setting/workspace-role-checkbox-list.tsx b/web/app/components/header/account-setting/workspace-role-checkbox-list.tsx
index 83c24488dd0..fe34e72f1f5 100644
--- a/web/app/components/header/account-setting/workspace-role-checkbox-list.tsx
+++ b/web/app/components/header/account-setting/workspace-role-checkbox-list.tsx
@@ -140,6 +140,12 @@ const WorkspaceRoleCheckboxList = ({
)
}, [roles, keyword])
+ const statusMessage = rolesLoading
+ ? t(($) => $['role.loading'], { ns: 'permission' })
+ : filteredRoles.length === 0
+ ? t(($) => $['role.noMatchingRoles'], { ns: 'permission' })
+ : ''
+
const toggleRole = useCallback(
(role: Role) => {
if (disabledRoleIdSet.has(role.id)) return
@@ -215,15 +221,15 @@ const WorkspaceRoleCheckboxList = ({
<ScrollArea className="min-h-0 flex-1">
<ScrollAreaViewport ref={containerRef} className="overscroll-contain px-3">
<ScrollAreaContent>
- {rolesLoading ? (
- <div className="px-3 py-6 text-center system-sm-regular text-text-tertiary">
- {t(($) => $['role.loading'], { ns: 'permission' })}
- </div>
- ) : filteredRoles.length === 0 ? (
- <div className="px-3 py-6 text-center system-sm-regular text-text-tertiary">
- {t(($) => $['role.noMatchingRoles'], { ns: 'permission' })}
- </div>
- ) : (
+ <div
+ role="status"
+ className={cn(
+ statusMessage && 'px-3 py-6 text-center system-sm-regular text-text-tertiary',
+ )}
+ >
+ {statusMessage}
+ </div>
+ {!rolesLoading && filteredRoles.length > 0 && (
<>
{allowMultipleRoles ? (
<ul className="flex flex-col gap-0.5 pb-2">