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.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(web): preserve member row focus and dialog sessions (#44643)
yyhda59612d4afb
diff --git a/oxlint-suppressions.json b/oxlint-suppressions.jsonindex 6f6fd5b33dc..f3e2642633b 100644--- a/oxlint-suppressions.json+++ b/oxlint-suppressions.json@@ -3545,11 +3545,6 @@"count": 1}},- "web/app/components/header/account-setting/workspace-role-checkbox-list.tsx": {- "better-tailwindcss/enforce-logical-properties": {- "count": 1- }- },"web/app/components/header/env-nav/index.tsx": {"better-tailwindcss/enforce-logical-properties": {"count": 3diff --git a/web/app/components/header/account-setting/__tests__/settings-loading.spec.tsx b/web/app/components/header/account-setting/__tests__/settings-loading.spec.tsxindex 219a7fa97d5..a584bc5961e 100644--- a/web/app/components/header/account-setting/__tests__/settings-loading.spec.tsx+++ b/web/app/components/header/account-setting/__tests__/settings-loading.spec.tsx@@ -1,6 +1,6 @@import type { Resource } from 'i18next'import type { AccountSettingTab } from '../constants'-import { act, screen, waitFor } from '@testing-library/react'+import { act, screen, waitFor, within } from '@testing-library/react'import userEvent from '@testing-library/user-event'import { NuqsTestingAdapter } from 'nuqs/adapters/testing'import { Suspense, useState } from 'react'@@ -34,7 +34,23 @@ vi.mock('@/service/console', async (importOriginal) => {return {...actual,consoleQuery: withConsoleResponses(actual.consoleQuery, {- 'workspaces.current.members.get': async () => ({ accounts: [] }),+ 'workspaces.current.members.get': async () => ({+ accounts: [+ {+ id: 'member-1',+ name: 'Ada',+ email: '[email protected]',+ role: 'admin',+ status: 'active',+ created_at: 1731000000,+ last_active_at: 1731000000,+ roles: [{ id: 'admin', name: 'Admin' }],+ },+ ],+ }),+ 'workspaces.current.rbac.members.byMemberId.rbacRoles.get': async () => ({+ roles: [{ id: 'admin', name: 'Admin', is_builtin: true, permission_keys: ['app.create'] }],+ }),'workspaces.current.rbac.roles.get': async () => ({data: [],pagination: { current_page: 1, total_pages: 1, total_count: 0, per_page: 20 },@@ -70,6 +86,11 @@ const resources: Resource = {'settings.members': 'Members',},workspaceMembers: {+ 'members.memberDetails.rolePermissionSummary':+ '{{role}}: <permissionList>{{permissions}}</permissionList>',+ 'members.memberDetails.title': 'Member details',+ 'members.memberActions': 'Member actions',+ 'members.editRole': 'Edit Role','members.invite': 'Invite members','members.inviteTeamMember': 'Invite team member',},@@ -91,7 +112,7 @@ function renderSettings() {const queryClient = createConsoleQueryClient()seedNetworkAccessGroups(queryClient, { entitled: true, groups: [] })return renderWithConsoleQuery(- <I18nClientProvider locale="en-US" resource={resources}>+ <I18nClientProvider locale="en-US" resource={structuredClone(resources)}><NuqsTestingAdapter><Suspense fallback={<span>Loading settings</span>}><Settings />@@ -145,19 +166,40 @@ describe('Settings content loading', () => {expect(await screen.findByRole('heading', { name: 'No IP policies yet' })).toBeVisible()})- it('keeps the Settings shell visible while opening a nested dialog for the first time', async () => {+ it('loads shared form translations before exposing member actions', async () => {const user = userEvent.setup()const finishLoading = deferNamespace('permission')renderSettings()- await user.click(await screen.findByRole('button', { name: 'Invite members' }))-- await waitFor(() => {- expect(mocks.loadResource).toHaveBeenCalledWith('en-US', 'permission')- })- expect(screen.getByText('Settings', { selector: 'div' })).toBeVisible()+ await waitFor(() => expect(mocks.loadResource).toHaveBeenCalledWith('en-US', 'permission'))+ expect(screen.getByRole('dialog', { name: 'Settings' })).toBeVisible()+ expect(screen.queryByRole('button', { name: 'Invite members' })).not.toBeInTheDocument()+ await finishLoading()+ await user.click(await screen.findByRole('button', { name: 'Member actions: Ada' }))+ await user.click(screen.getByRole('menuitem', { name: 'Edit Role' }))+ expect(await screen.findByRole('dialog', { name: 'Edit Role' })).toBeVisible()+ expect(screen.getByRole('table', { hidden: true })).toBeInTheDocument()+ await user.keyboard('{Escape}')+ await user.click(screen.getByRole('button', { name: 'Invite members' }))+ expect(await screen.findByRole('dialog', { name: 'Invite team member' })).toBeVisible()expect(screen.queryByText('Loading settings')).not.toBeInTheDocument()+ })+ it('keeps member details mounted while the permission summary loads its translations', async () => {+ const user = userEvent.setup()+ const finishLoading = deferNamespace('permissionKeys')+ renderSettings()+ await user.click(await screen.findByRole('button', { name: 'Ada' }))+ const details = await screen.findByRole('dialog', { name: 'Member details' })+ const role = await within(details).findByRole('button', { name: 'Admin' })+ expect(mocks.loadResource).not.toHaveBeenCalledWith('en-US', 'permissionKeys')+ await user.click(role)+ await waitFor(() => expect(mocks.loadResource).toHaveBeenCalledWith('en-US', 'permissionKeys'))+ expect(details).toBeVisible()+ expect(within(details).getByRole('button', { name: 'Close', hidden: true })).toBeInTheDocument()+ expect(screen.queryByText('Loading settings')).not.toBeInTheDocument()await finishLoading()- expect(await screen.findByRole('dialog', { name: 'Invite team member' })).toBeVisible()+ expect(await screen.findByText('app.create')).toBeVisible()+ await user.keyboard('{Escape}')+ expect(details).toBeVisible()})})diff --git a/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsxindex e5cb29ea7f2..ef0f558c960 100644--- a/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsx+++ b/web/app/components/header/account-setting/members-page/__tests__/index.spec.tsx@@ -236,6 +236,23 @@ describe('MembersPage', () => {},)+ it('discards canceled role edits when reopening the shared details dialog', async () => {+ const user = userEvent.setup()+ await renderMembersPage()+ const dialog = await chooseRoles(user, false)+ expect(within(dialog).getByText('Next role')).toBeInTheDocument()+ await user.click(within(dialog).getByRole('button', { name: 'common.operation.cancel' }))+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ await user.click(screen.getByRole('button', { name: 'Owner User' }))+ expect(within(detailsDialog()).getByText('[email protected]')).toBeInTheDocument()+ await user.keyboard('{Escape}')+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ await user.click(screen.getByRole('button', { name: 'Admin User' }))+ expect(within(detailsDialog()).getByText('[email protected]')).toBeInTheDocument()+ expect(within(detailsDialog()).queryByText('Next role')).not.toBeInTheDocument()+ expect(updateRoles).not.toHaveBeenCalled()+ })+it('keeps role edits while saving and after failure, then closes only after a successful retry', async () => {const user = userEvent.setup()let rejectSave!: (error: Error) => void@@ -280,6 +297,33 @@ describe('MembersPage', () => {).not.toBeInTheDocument()})+ it('discards canceled role selection and search before reopening from the member menu', async () => {+ const user = userEvent.setup()+ await renderMembersPage({ systemFeatures: { rbac_enabled: false } })+ const more = within(screen.getByRole('row', { name: /[email protected]/ })).getByRole(+ 'button',+ { name: /members\.memberActions/ },+ )+ const openRoles = async () => {+ await user.click(more)+ await user.click(screen.getByRole('menuitem', { name: /members\.editRole(?=$|:)/ }))+ const search = await screen.findByRole('searchbox')+ await waitFor(() => expect(search).toHaveFocus())+ return search+ }+ const search = await openRoles()+ await user.click(await screen.findByRole('radio', { name: /Next role/ }))+ await user.type(search, 'Next')+ await user.click(screen.getByRole('button', { name: 'common.operation.cancel' }))+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ expect(await openRoles()).toHaveValue('')+ expect(await screen.findByRole('radio', { name: /Next role/ })).toHaveAttribute(+ 'aria-checked',+ 'false',+ )+ expect(updateRoles).not.toHaveBeenCalled()+ })+it('disables ownership transfer when the feature is unavailable', async () => {await renderMembersPage({ features: { is_allow_transfer_workspace: false } })expect(@@ -295,6 +339,7 @@ describe('MembersPage', () => {const edit = screen.getByRole('button', { name: /account\.editWorkspaceInfo/ })await user.click(edit)const input = screen.getByRole('textbox', { name: /account\.workspaceName$/ })+ await waitFor(() => expect(input).toHaveFocus())await user.clear(input)await user.type(input, 'Unsaved name')await user.click(screen.getByRole('button', { name: 'common.operation.cancel' }))@@ -317,6 +362,31 @@ describe('MembersPage', () => {expect(screen.getByText(new RegExp(label))).toBeInTheDocument()})+ it('hands invitation results to a persistent dialog and closes them normally', async () => {+ const user = userEvent.setup()+ await renderMembersPage()+ const invite = screen.getByRole('button', { name: /members\.invite$/ })+ await user.click(invite)+ await user.type(+ screen.getByRole('textbox', { name: /members\.emailRecipients/ }),+ '[email protected]',+ )+ await user.click(screen.getByRole('combobox', { name: /members\.role$/ }))+ await user.click(await screen.findByRole('option', { name: /Admin/ }))+ await user.click(screen.getByRole('button', { name: /members\.sendInviteCount/ }))+ const results = await screen.findByRole('dialog', { name: /members\.invitationSent$/ })+ expect(results).toHaveTextContent('http://invite/link')+ await waitFor(() =>+ expect(+ screen.queryByRole('dialog', { name: /members\.inviteTeamMember$/ }),+ ).not.toBeInTheDocument(),+ )+ await user.click(within(results).getByRole('button', { name: /members\.ok$/ }))+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ await user.click(invite)+ expect(screen.getByRole('textbox', { name: /members\.emailRecipients/ })).toHaveValue('')+ })+it('keeps invitation available at the displayed plan limit', async () => {const user = userEvent.setup()await renderMembersPage({diff --git a/web/app/components/header/account-setting/members-page/__tests__/member-row.spec.tsx b/web/app/components/header/account-setting/members-page/__tests__/member-row.spec.tsxindex b29267922bd..50efabc92a3 100644--- a/web/app/components/header/account-setting/members-page/__tests__/member-row.spec.tsx+++ b/web/app/components/header/account-setting/members-page/__tests__/member-row.spec.tsx@@ -1,5 +1,6 @@import type { AccountWithRoleResponse } from '@dify/contracts/api/console/workspaces/types.gen'-import { screen, within } from '@testing-library/react'+import { Dialog, DialogClose, DialogContent, DialogTitle } from '@langgenius/dify-ui/dialog'+import { screen, waitFor, within } from '@testing-library/react'import userEvent from '@testing-library/user-event'import { renderWithConsoleQuery } from '@/test/console/query-data'import MemberRow from '../member-row'@@ -18,59 +19,87 @@ const member: AccountWithRoleResponse = {status: 'active',}-const renderMemberRow = (onOpenDetails = vi.fn()) => {+const renderMemberRow = () => {renderWithConsoleQuery(- <table>- <tbody>- <MemberRow- member={member}- roles={[{ id: 'role-1', name: 'Editor' }]}- isCurrentUser={false}- canManage- canTransferOwnership={false}- allowMultipleRoles={false}- onOpenDetails={onOpenDetails}- onTransferOwnership={vi.fn()}- />- </tbody>- </table>,+ <Dialog<AccountWithRoleResponse>>+ {({ payload }) => (+ <>+ <table>+ <tbody>+ <MemberRow+ member={member}+ roles={[{ id: 'role-1', name: 'Editor' }]}+ isCurrentUser={false}+ canManage+ canTransferOwnership={false}+ allowMultipleRoles={false}+ />+ </tbody>+ </table>+ <DialogContent>+ <DialogTitle>{payload?.name}</DialogTitle>+ <DialogClose>Close details</DialogClose>+ </DialogContent>+ </>+ )}+ </Dialog>,)- return onOpenDetails}describe('MemberRow details entry points', () => {- it.each(['name button', 'email'])('opens details once from the %s', async (target) => {+ it.each(['name button', 'email'])('opens the member details from the %s', async (target) => {const user = userEvent.setup()- const onOpenDetails = renderMemberRow()+ renderMemberRow()+ const trigger = screen.getByRole('button', { name: 'Member User' })await user.click(target === 'name button'- ? screen.getByRole('button', { name: 'Member User' })+ ? trigger: within(screen.getByRole('row')).getByText('[email protected]'),)- expect(onOpenDetails).toHaveBeenCalledExactlyOnceWith(member)+ expect(screen.getByRole('dialog', { name: member.name })).toBeInTheDocument()+ expect(trigger).toHaveAttribute('aria-expanded', 'true')+ await user.click(screen.getByRole('button', { name: 'Close details' }))+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ await waitFor(() => expect(trigger).toHaveFocus())})- it('should keep member menu and its portaled confirmation separate from details', async () => {+ it('keeps details and member actions as separate keyboard stops', async () => {const user = userEvent.setup()- const onOpenDetails = renderMemberRow()+ renderMemberRow()+ await user.tab()+ expect(screen.getByRole('button', { name: 'Member User' })).toHaveFocus()+ await user.keyboard('{Enter}')+ expect(screen.getByRole('dialog', { name: member.name })).toBeInTheDocument()+ await user.keyboard('{Escape}')+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ await waitFor(() => expect(screen.getByRole('button', { name: 'Member User' })).toHaveFocus())+ await user.tab()+ expect(+ screen.getByRole('button', { name: 'workspaceMembers.members.memberActions: Member User' }),+ ).toHaveFocus()+ await user.keyboard('{Enter}')+ expect(screen.getByRole('menu')).toBeInTheDocument()+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()+ })+ it('keeps member menu and its portaled confirmation separate from details', async () => {+ const user = userEvent.setup()+ renderMemberRow()await user.click(screen.getByRole('button', { name: /workspaceMembers\.members\.memberActions/ }),)expect(screen.getByRole('menu')).toBeInTheDocument()- expect(onOpenDetails).not.toHaveBeenCalled()-+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()await user.click(screen.getByRole('menuitem', { name: 'workspaceMembers.members.removeFromTeam' }),)const confirmation = screen.getByRole('alertdialog')- expect(onOpenDetails).not.toHaveBeenCalled()-+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()await user.click(within(confirmation).getByText('workspaceMembers.members.removeFromTeamConfirmDescription'),)await user.click(within(confirmation).getByRole('button', { name: 'common.operation.cancel' }))expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument()- expect(onOpenDetails).not.toHaveBeenCalled()+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()})})diff --git a/web/app/components/header/account-setting/members-page/assign-roles-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/assign-roles-content/__tests__/index.spec.tsxsimilarity index 71%rename from web/app/components/header/account-setting/members-page/assign-roles-modal/__tests__/index.spec.tsxrename to web/app/components/header/account-setting/members-page/assign-roles-content/__tests__/index.spec.tsxindex 976f6b4586f..48d81084526 100644--- a/web/app/components/header/account-setting/members-page/assign-roles-modal/__tests__/index.spec.tsx+++ b/web/app/components/header/account-setting/members-page/assign-roles-content/__tests__/index.spec.tsx@@ -1,8 +1,41 @@import type { Role } from '@/models/access-control'+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'import { screen } from '@testing-library/react'import userEvent from '@testing-library/user-event'+import { useRef } from 'react'import { renderWithConsoleQuery as render } from '@/test/console/query-data'-import AssignRolesModal from '../index'+import AssignRolesContent from '../index'++function TestDialog({+ onClose,+ onSubmit,+ selectedRoles,+ allowMultipleRoles,+}: {+ onClose: () => void+ onSubmit: (roles: Role[]) => void+ selectedRoles: Role[]+ allowMultipleRoles?: boolean+}) {+ const inputRef = useRef<HTMLInputElement>(null)+ return (+ <Dialog+ defaultOpen+ onOpenChange={(open) => {+ if (!open) onClose()+ }}+ >+ <DialogContent initialFocus={inputRef}>+ <AssignRolesContent+ searchInputRef={inputRef}+ selectedRoles={selectedRoles}+ allowMultipleRoles={allowMultipleRoles}+ onSubmit={onSubmit}+ />+ </DialogContent>+ </Dialog>+ )+}const createRole = (overrides: Partial<Role>): Role => ({id: 'role-1',@@ -36,16 +69,16 @@ vi.mock('@/service/console', async (importOriginal) => {}})-describe('AssignRolesModal', () => {+describe('AssignRolesContent', () => {describe('Role selection', () => {it.each([false, true])(- 'submits the selected roles with multiple=%s and closes',+ 'submits the selected roles with multiple=%s',async (allowMultipleRoles) => {const user = userEvent.setup()const onSubmit = vi.fn()const onClose = vi.fn()render(- <AssignRolesModal+ <TestDialogselectedRoles={[roles[0]!]}allowMultipleRoles={allowMultipleRoles}onClose={onClose}@@ -62,14 +95,13 @@ describe('AssignRolesModal', () => {).toHaveAttribute('aria-checked', String(allowMultipleRoles))await user.click(screen.getByRole('button', { name: /common\.operation\.confirm/ }))expect(onSubmit).toHaveBeenCalledExactlyOnceWith(allowMultipleRoles ? roles : [roles[1]])- expect(onClose).toHaveBeenCalledTimes(1)},)it('should disable confirm when the last selected role is unchecked', async () => {const user = userEvent.setup()- render(<AssignRolesModal selectedRoles={[roles[0]!]} onClose={vi.fn()} onSubmit={vi.fn()} />)+ render(<TestDialog selectedRoles={[roles[0]!]} onClose={vi.fn()} onSubmit={vi.fn()} />)const confirmButton = screen.getByRole('button', { name: /common\.operation\.confirm/i })diff --git a/web/app/components/header/account-setting/members-page/assign-roles-modal/index.tsx b/web/app/components/header/account-setting/members-page/assign-roles-content/index.tsxsimilarity index 74%rename from web/app/components/header/account-setting/members-page/assign-roles-modal/index.tsxrename to web/app/components/header/account-setting/members-page/assign-roles-content/index.tsxindex ae91383d53d..9707abeb7ac 100644--- a/web/app/components/header/account-setting/members-page/assign-roles-modal/index.tsx+++ b/web/app/components/header/account-setting/members-page/assign-roles-content/index.tsx@@ -1,9 +1,9 @@'use client'+import type { Ref } from 'react'import type { Role } from '@/models/access-control'import { Button } from '@langgenius/dify-ui/button'import {- Dialog,- DialogContent,+ DialogClose,DialogDescription,DialogFooter,DialogHeader,@@ -14,19 +14,19 @@ import { useState } from 'react'import { useTranslation } from 'react-i18next'import WorkspaceRoleCheckboxList from '../../workspace-role-checkbox-list'-type AssignRolesModalProps = {+type AssignRolesContentProps = {selectedRoles: Role[]allowMultipleRoles?: boolean- onClose: () => void+ searchInputRef: Ref<HTMLInputElement>onSubmit: (roles: Role[]) => void}-const AssignRolesModalBody = ({+const AssignRolesContent = ({selectedRoles,allowMultipleRoles = true,- onClose,+ searchInputRef,onSubmit,-}: AssignRolesModalProps) => {+}: AssignRolesContentProps) => {const { t } = useTranslation(['common', 'workspaceMembers'])const [selected, setSelected] = useState(selectedRoles)const selectedRoleIds = selected.map((role) => role.id)@@ -52,11 +52,16 @@ const AssignRolesModalBody = ({if (isConfirmDisabled) returnonSubmit(selected)- onClose()}return (- <DialogContent className="h-121" backdropProps={{ forceRender: true }}>+ <form+ className="contents"+ onSubmit={(event) => {+ event.preventDefault()+ handleConfirm()+ }}+ ><DialogHeader><DialogTitle>{title}</DialogTitle><DialogDescription>{description}</DialogDescription>@@ -64,6 +69,7 @@ const AssignRolesModalBody = ({</DialogHeader><WorkspaceRoleCheckboxList+ searchInputRef={searchInputRef}selectedRoleIds={selectedRoleIds}selectedRoles={selected}allowMultipleRoles={allowMultipleRoles}@@ -79,38 +85,15 @@ const AssignRolesModalBody = ({})}</div>)}- <Button variant="secondary" onClick={onClose}>+ <DialogClose render={<Button variant="secondary" />}>{t(($) => $['operation.cancel'], { ns: 'common' })}- </Button>- <Button variant="primary" disabled={isConfirmDisabled} onClick={handleConfirm}>+ </DialogClose>+ <Button variant="primary" disabled={isConfirmDisabled} type="submit">{t(($) => $['operation.confirm'], { ns: 'common' })}</Button></DialogFooter>- </DialogContent>- )-}--const AssignRolesModal = ({- selectedRoles,- allowMultipleRoles = true,- onClose,- onSubmit,-}: AssignRolesModalProps) => {- return (- <Dialog- open- onOpenChange={(nextOpen) => {- if (!nextOpen) onClose()- }}- >- <AssignRolesModalBody- selectedRoles={selectedRoles}- allowMultipleRoles={allowMultipleRoles}- onClose={onClose}- onSubmit={onSubmit}- />- </Dialog>+ </form>)}-export default AssignRolesModal+export default AssignRolesContentdiff --git a/web/app/components/header/account-setting/members-page/edit-workspace-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/edit-workspace-content/__tests__/index.spec.tsxsimilarity index 93%rename from web/app/components/header/account-setting/members-page/edit-workspace-modal/__tests__/index.spec.tsxrename to web/app/components/header/account-setting/members-page/edit-workspace-content/__tests__/index.spec.tsxindex f61c90d7199..76a8a9bcede 100644--- a/web/app/components/header/account-setting/members-page/edit-workspace-modal/__tests__/index.spec.tsx+++ b/web/app/components/header/account-setting/members-page/edit-workspace-content/__tests__/index.spec.tsx@@ -1,9 +1,11 @@+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'import { fireEvent, screen, waitFor } from '@testing-library/react'import userEvent from '@testing-library/user-event'+import { createRef } from 'react'import { vi } from 'vite-plus/test'import { consoleClient } from '@/service/console'import { renderWithConsoleQuery as render } from '@/test/console/query-data'-import EditWorkspaceModal from '../index'+import EditWorkspaceContent from '../index'const toastMocks = vi.hoisted(() => ({mockNotify: vi.fn(),@@ -31,7 +33,7 @@ vi.mock('@/app/notifications', () => ({},}))-describe('EditWorkspaceModal', () => {+describe('EditWorkspaceContent', () => {const mockOnCancel = vi.fn()const { mockNotify } = toastMocks@@ -47,9 +49,16 @@ describe('EditWorkspaceModal', () => {const renderModal = () =>render(- <>- <EditWorkspaceModal onCancel={mockOnCancel} />- </>,+ <Dialog+ defaultOpen+ onOpenChange={(open) => {+ if (!open) mockOnCancel()+ }}+ >+ <DialogContent>+ <EditWorkspaceContent inputRef={createRef<HTMLInputElement>()} />+ </DialogContent>+ </Dialog>,{ currentWorkspace: { name: 'Test Workspace', role: isOwner ? 'owner' : 'normal' } },)diff --git a/web/app/components/header/account-setting/members-page/edit-workspace-content/index.tsx b/web/app/components/header/account-setting/members-page/edit-workspace-content/index.tsxnew file mode 100644index 00000000000..fde91caa4de--- /dev/null+++ b/web/app/components/header/account-setting/members-page/edit-workspace-content/index.tsx@@ -0,0 +1,127 @@+'use client'+import type { Ref } from 'react'+import { Button } from '@langgenius/dify-ui/button'+import { cn } from '@langgenius/dify-ui/cn'+import {+ DialogBody,+ DialogClose,+ DialogFooter,+ DialogHeader,+ DialogHeaderCloseButton,+ DialogTitle,+} from '@langgenius/dify-ui/dialog'+import { Input } from '@langgenius/dify-ui/input'+import { useAtomValue } from 'jotai'+import { useId, useMemo, useState } from 'react'+import { useTranslation } from 'react-i18next'+import { toast } from '@/app/notifications'+import { currentWorkspaceAtom, isCurrentWorkspaceOwnerAtom } from '@/context/workspace-state'+import { consoleClient } from '@/service/console'++type IEditWorkspaceContentProps = {+ inputRef: Ref<HTMLInputElement>+}+const EditWorkspaceContent = ({ inputRef }: IEditWorkspaceContentProps) => {+ const { t } = useTranslation(['common', 'accountSettings'])+ const currentWorkspace = useAtomValue(currentWorkspaceAtom)+ const isCurrentWorkspaceOwner = useAtomValue(isCurrentWorkspaceOwnerAtom)+ const [name, setName] = useState<string>(currentWorkspace.name)+ const [isSubmitting, setIsSubmitting] = useState(false)+ const inputId = useId()+ const errorId = useId()+ const saveButtonLabelId = useId()+ const normalizedName = name.trim()+ const hasChanges = normalizedName !== currentWorkspace.name+ const hasError = normalizedName.length === 0+ const isSaveUnavailable = !isCurrentWorkspaceOwner || !hasChanges || hasError+ const nameErrorMessage = useMemo(() => {+ if (!hasError) return ''+ return t(($) => $['errorMsg.fieldRequired'], {+ ns: 'common',+ field: t(($) => $['account.workspaceName'], { ns: 'accountSettings' }),+ })+ }, [hasError, t])+ const changeWorkspaceInfo = async () => {+ if (isSubmitting || isSaveUnavailable) return+ setIsSubmitting(true)+ try {+ await consoleClient.workspaces.info.post({+ body: {+ name: normalizedName,+ },+ })+ location.assign(`${location.origin}`)+ } catch {+ toast.error(t(($) => $['actionMsg.modifiedUnsuccessfully'], { ns: 'common' }))+ } finally {+ setIsSubmitting(false)+ }+ }+ return (+ <form+ className="contents"+ onSubmit={(e) => {+ e.preventDefault()+ void changeWorkspaceInfo()+ }}+ >+ <DialogHeader>+ <DialogTitle>+ {t(($) => $['account.editWorkspaceInfo'], { ns: 'accountSettings' })}+ </DialogTitle>+ <DialogHeaderCloseButton aria-label={t(($) => $['operation.close'], { ns: 'common' })} />+ </DialogHeader>++ <DialogBody className="space-y-2">+ <label htmlFor={inputId} className="block text-sm font-medium text-text-primary">+ {t(($) => $['account.workspaceName'], { ns: 'accountSettings' })}+ </label>+ <Input+ ref={inputRef}+ id={inputId}+ value={name}+ placeholder={t(($) => $['account.workspaceNamePlaceholder'], {+ ns: 'accountSettings',+ })}+ onChange={(e) => {+ setName(e.target.value)+ }}+ aria-invalid={hasError}+ aria-describedby={hasError ? errorId : undefined}+ className={cn(+ hasError &&+ 'border-components-input-border-destructive bg-components-input-bg-destructive hover:border-components-input-border-destructive hover:bg-components-input-bg-destructive focus:border-components-input-border-destructive focus:bg-components-input-bg-destructive',+ )}+ />+ <div className="min-h-6">+ {hasError && (+ <p id={errorId} className="system-xs-regular text-text-destructive" role="alert">+ {nameErrorMessage}+ </p>+ )}+ </div>+ </DialogBody>++ <DialogFooter>+ <DialogClose render={<Button size="large" type="button" />}>+ {t(($) => $['operation.cancel'], { ns: 'common' })}+ </DialogClose>+ <Button+ size="large"+ type="submit"+ variant="primary"+ disabled={isSaveUnavailable}+ loading={isSubmitting}+ aria-labelledby={saveButtonLabelId}+ >+ <span id={saveButtonLabelId}>+ {t(($) => $[isSubmitting ? 'operation.saving' : 'operation.save'], {+ ns: 'common',+ })}+ </span>+ </Button>+ </DialogFooter>+ </form>+ )+}+export default EditWorkspaceContentdiff --git a/web/app/components/header/account-setting/members-page/edit-workspace-modal/index.tsx b/web/app/components/header/account-setting/members-page/edit-workspace-modal/index.tsxdeleted file mode 100644index 91e3585aa0d..00000000000--- a/web/app/components/header/account-setting/members-page/edit-workspace-modal/index.tsx+++ /dev/null@@ -1,137 +0,0 @@-'use client'-import { Button } from '@langgenius/dify-ui/button'-import { cn } from '@langgenius/dify-ui/cn'-import {- Dialog,- DialogBody,- DialogContent,- DialogFooter,- DialogHeader,- DialogHeaderCloseButton,- DialogTitle,-} from '@langgenius/dify-ui/dialog'-import { Input } from '@langgenius/dify-ui/input'-import { useAtomValue } from 'jotai'-import { useId, useMemo, useState } from 'react'-import { useTranslation } from 'react-i18next'-import { toast } from '@/app/notifications'-import { currentWorkspaceAtom, isCurrentWorkspaceOwnerAtom } from '@/context/workspace-state'-import { consoleClient } from '@/service/console'--type IEditWorkspaceModalProps = {- onCancel: () => void-}-const EditWorkspaceModal = ({ onCancel }: IEditWorkspaceModalProps) => {- const { t } = useTranslation(['common', 'accountSettings'])- const currentWorkspace = useAtomValue(currentWorkspaceAtom)- const isCurrentWorkspaceOwner = useAtomValue(isCurrentWorkspaceOwnerAtom)- const [name, setName] = useState<string>(currentWorkspace.name)- const [isSubmitting, setIsSubmitting] = useState(false)- const inputId = useId()- const errorId = useId()- const saveButtonLabelId = useId()- const normalizedName = name.trim()- const hasChanges = normalizedName !== currentWorkspace.name- const hasError = normalizedName.length === 0- const isSaveUnavailable = !isCurrentWorkspaceOwner || !hasChanges || hasError- const nameErrorMessage = useMemo(() => {- if (!hasError) return ''- return t(($) => $['errorMsg.fieldRequired'], {- ns: 'common',- field: t(($) => $['account.workspaceName'], { ns: 'accountSettings' }),- })- }, [hasError, t])- const changeWorkspaceInfo = async () => {- if (isSubmitting || isSaveUnavailable) return- setIsSubmitting(true)- try {- await consoleClient.workspaces.info.post({- body: {- name: normalizedName,- },- })- location.assign(`${location.origin}`)- } catch {- toast.error(t(($) => $['actionMsg.modifiedUnsuccessfully'], { ns: 'common' }))- } finally {- setIsSubmitting(false)- }- }- return (- <Dialog- open- onOpenChange={(open) => {- if (!open) onCancel()- }}- >- <DialogContent backdropProps={{ forceRender: true }}>- <form- className="contents"- onSubmit={(e) => {- e.preventDefault()- void changeWorkspaceInfo()- }}- >- <DialogHeader>- <DialogTitle>- {t(($) => $['account.editWorkspaceInfo'], { ns: 'accountSettings' })}- </DialogTitle>- <DialogHeaderCloseButton- aria-label={t(($) => $['operation.close'], { ns: 'common' })}- />- </DialogHeader>-- <DialogBody className="space-y-2">- <label htmlFor={inputId} className="block text-sm font-medium text-text-primary">- {t(($) => $['account.workspaceName'], { ns: 'accountSettings' })}- </label>- <Input- id={inputId}- value={name}- placeholder={t(($) => $['account.workspaceNamePlaceholder'], {- ns: 'accountSettings',- })}- onChange={(e) => {- setName(e.target.value)- }}- aria-invalid={hasError}- aria-describedby={hasError ? errorId : undefined}- className={cn(- hasError &&- 'border-components-input-border-destructive bg-components-input-bg-destructive hover:border-components-input-border-destructive hover:bg-components-input-bg-destructive focus:border-components-input-border-destructive focus:bg-components-input-bg-destructive',- )}- />- <div className="min-h-6">- {hasError && (- <p id={errorId} className="system-xs-regular text-text-destructive" role="alert">- {nameErrorMessage}- </p>- )}- </div>- </DialogBody>-- <DialogFooter>- <Button size="large" type="button" onClick={onCancel}>- {t(($) => $['operation.cancel'], { ns: 'common' })}- </Button>- <Button- size="large"- type="submit"- variant="primary"- disabled={isSaveUnavailable}- loading={isSubmitting}- aria-labelledby={saveButtonLabelId}- >- <span id={saveButtonLabelId}>- {t(($) => $[isSubmitting ? 'operation.saving' : 'operation.save'], {- ns: 'common',- })}- </span>- </Button>- </DialogFooter>- </form>- </DialogContent>- </Dialog>- )-}-export default EditWorkspaceModaldiff --git a/web/app/components/header/account-setting/members-page/index.tsx b/web/app/components/header/account-setting/members-page/index.tsxindex ce372b1ca75..45c7610b188 100644--- a/web/app/components/header/account-setting/members-page/index.tsx+++ b/web/app/components/header/account-setting/members-page/index.tsx@@ -4,10 +4,17 @@ import type {MemberInviteResponse,} from '@dify/contracts/api/console/workspaces/types.gen'import type { Role } from '@/models/access-control'+import {+ createDialogHandle,+ Dialog,+ DialogContent,+ DialogTrigger,+} from '@langgenius/dify-ui/dialog'+import { IconButton } from '@langgenius/dify-ui/icon-button'import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'import { useMutation, useQuery, useSuspenseQuery } from '@tanstack/react-query'import { useAtomValue } from 'jotai'-import { useCallback, useState } from 'react'+import { useRef, useState } from 'react'import { useTranslation } from 'react-i18next'import { useLocale } from '#i18n'import { WorkspaceAvatar } from '@/app/components/base/workspace-avatar'@@ -20,15 +27,20 @@ import { systemFeaturesQueryOptions } from '@/features/system-features/client'import { getAccessControlTemplateLanguage, LanguagesSupported } from '@/i18n/language'import { consoleQuery } from '@/service/console'import { hasPermission } from '@/utils/permission'-import EditWorkspaceModal from './edit-workspace-modal'+import EditWorkspaceContent from './edit-workspace-content'+import InvitationResultsContent from './invitation-results-content'import { InviteModal } from './invite-modal'-import InvitedModal from './invited-modal'-import MemberDetailsModal from './member-details-modal'+import MemberDetailsContent from './member-details-content'import MemberRow from './member-row'-import TransferOwnershipModal from './transfer-ownership-modal'const MembersPage = () => {- const { t } = useTranslation(['billing', 'common', 'workspaceMembers', 'accountSettings'])+ const { t } = useTranslation([+ 'billing',+ 'common',+ 'workspaceMembers',+ 'accountSettings',+ 'permission',+ ])const locale = useLocale()const language = getAccessControlTemplateLanguage(locale)@@ -43,9 +55,10 @@ const MembersPage = () => {consoleQuery.workspaces.current.members.get.queryOptions({ input: { query: { language } } }),)const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())- const [invitationResults, setInvitationResults] = useState<- MemberInviteResponse['invitation_results'] | null- >(null)+ const [invitationDialogHandle] = useState(() =>+ createDialogHandle<MemberInviteResponse['invitation_results']>(),+ )+ const workspaceNameInputRef = useRef<HTMLInputElement>(null)const accounts = data?.accounts || []const deploymentEdition = systemFeatures.deployment_editionconst { data: features } = useQuery(@@ -65,34 +78,24 @@ const MembersPage = () => {isNotUnlimitedMemberPlan &&features.members.limit > 0 &&accounts.length >= features.members.limit- const [editWorkspaceModalVisible, setEditWorkspaceModalVisible] = useState(false)- const [showTransferOwnershipModal, setShowTransferOwnershipModal] = useState(false)- const [detailsMember, setDetailsMember] = useState<AccountWithRoleResponse | null>(null)+ const [detailsDialogHandle] = useState(() => createDialogHandle<AccountWithRoleResponse>())const canManageMembers = hasPermission(workspacePermissionKeys, 'workspace.member.manage')const roleColumnLabel = systemFeatures.rbac_enabled? t(($) => $['members.roles'], { ns: 'workspaceMembers' }): t(($) => $['members.role'], { ns: 'workspaceMembers' })- const handleOpenDetails = useCallback((member: AccountWithRoleResponse) => {- setDetailsMember(member)- }, [])-- const handleCloseDetails = useCallback(() => {- setDetailsMember(null)- }, [])-- const { mutateAsync: updateRolesOfMember } = useMutation(+ const { mutateAsync: updateRolesOfMember, isPending: isSavingMember } = useMutation(consoleQuery.workspaces.current.rbac.members.byMemberId.rbacRoles.put.mutationOptions(),)- const handleAssignRolesSubmit = (roles: Role[]) => {+ const handleAssignRolesSubmit = (member: AccountWithRoleResponse, roles: Role[]) => {const roleIds = systemFeatures.rbac_enabled? roles.map((role) => role.id): roles.slice(0, 1).map((role) => role.id)return updateRolesOfMember(- { params: { member_id: detailsMember!.id }, body: { role_ids: roleIds } },+ { params: { member_id: member.id }, body: { role_ids: roleIds } },{onSuccess: async () => {toast.success(t(($) => $['actionMsg.modifiedSuccessfully'], { ns: 'common' }))@@ -102,160 +105,163 @@ const MembersPage = () => {)}- const handleTransferOwnership = useCallback(() => {- setShowTransferOwnershipModal(true)- }, [])-return (- <>- <div className="flex flex-col">- <div className="mb-6 flex flex-wrap items-center gap-3 rounded-xl border-s-[0.5px] border-t-[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 ps-2 pe-5 rtl:bg-linear-to-l">- <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"+ <Dialog+ handle={detailsDialogHandle}+ onOpenChange={(open, details) => {+ if (!open && isSavingMember) details.cancel()+ }}+ >+ {({ payload: member }) => (+ <>+ <div className="flex flex-col">+ <div className="mb-6 flex flex-wrap items-center gap-3 rounded-xl border-s-[0.5px] border-t-[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 ps-2 pe-5 rtl:bg-linear-to-l">+ <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">+ <Dialog>+ <Tooltip>+ <TooltipTrigger+ render={+ <DialogTrigger+ render={+ <IconButton+ aria-label={t(($) => $['account.editWorkspaceInfo'], {+ ns: 'accountSettings',+ })}+ >+ <span+ aria-hidden+ className="i-ri-pencil-line size-4 text-text-tertiary"+ />+ </IconButton>+ }+ />+ }/>- </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}+ <TooltipContent>+ {t(($) => $['account.editWorkspaceInfo'], { ns: 'accountSettings' })}+ </TooltipContent>+ </Tooltip>+ <DialogContent+ initialFocus={workspaceNameInputRef}+ backdropProps={{ forceRender: true }}+ >+ <EditWorkspaceContent inputRef={workspaceNameInputRef} />+ </DialogContent>+ </Dialog></span>- </div>+ )}</div>- ) : (- <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 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 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 className="flex flex-wrap items-center gap-3">+ {isMemberFull && <UpgradeBtn className="shrink-0" loc="member-invite" />}+ {canManageMembers && (+ <div className="shrink-0">+ <InviteModal+ isEmailSetup={systemFeatures.is_email_setup}+ onSend={(results) => invitationDialogHandle.openWithPayload(results)}+ /></div>)}</div></div>+ <div className="overflow-x-auto">+ <table className="w-full min-w-150 table-fixed text-start">+ <colgroup>+ <col className="w-65" />+ <col className="w-30" />+ <col />+ {canManageMembers && <col className="w-12" />}+ </colgroup>+ <thead>+ <tr className="border-b border-divider-regular">+ <th className="px-3 py-1.75 text-start system-xs-medium-uppercase text-text-tertiary">+ {t(($) => $['members.name'], { ns: 'workspaceMembers' })}+ </th>+ <th className="py-1.75 text-start system-xs-medium-uppercase text-text-tertiary">+ {t(($) => $['members.lastActive'], { ns: 'workspaceMembers' })}+ </th>+ <th className="px-3 py-1.75 text-start system-xs-medium-uppercase text-text-tertiary">+ {roleColumnLabel}+ </th>+ {canManageMembers && <td />}+ </tr>+ </thead>+ <tbody>+ {accounts.map((account) => (+ <MemberRow+ key={account.id}+ member={account}+ roles={account.roles ?? []}+ isCurrentUser={userProfileEmail === account.email}+ canManage={canManageMembers}+ canTransferOwnership={+ isCurrentWorkspaceOwner && features?.is_allow_transfer_workspace === true+ }+ allowMultipleRoles={systemFeatures.rbac_enabled}+ />+ ))}+ </tbody>+ </table>+ </div></div>- <div className="flex flex-wrap items-center gap-3">- {isMemberFull && <UpgradeBtn className="shrink-0" loc="member-invite" />}- {canManageMembers && (- <div className="shrink-0">- <InviteModal- isEmailSetup={systemFeatures.is_email_setup}- onSend={setInvitationResults}- />- </div>+ <Dialog handle={invitationDialogHandle}>+ {({ payload: results }) => (+ <DialogContent backdropProps={{ forceRender: true }}>+ {results && <InvitationResultsContent invitationResults={results} />}+ </DialogContent>)}- </div>- </div>- <div className="overflow-x-auto">- <table className="w-full min-w-150 table-fixed text-start">- <colgroup>- <col className="w-65" />- <col className="w-30" />- <col />- {canManageMembers && <col className="w-12" />}- </colgroup>- <thead>- <tr className="border-b border-divider-regular">- <th className="px-3 py-1.75 text-start system-xs-medium-uppercase text-text-tertiary">- {t(($) => $['members.name'], { ns: 'workspaceMembers' })}- </th>- <th className="py-1.75 text-start system-xs-medium-uppercase text-text-tertiary">- {t(($) => $['members.lastActive'], { ns: 'workspaceMembers' })}- </th>- <th className="px-3 py-1.75 text-start system-xs-medium-uppercase text-text-tertiary">- {roleColumnLabel}- </th>- {canManageMembers && <td />}- </tr>- </thead>- <tbody>- {accounts.map((account) => (- <MemberRow- key={account.id}- member={account}- roles={account.roles ?? []}- isCurrentUser={userProfileEmail === account.email}- canManage={canManageMembers}- canTransferOwnership={- isCurrentWorkspaceOwner && features?.is_allow_transfer_workspace === true- }- allowMultipleRoles={systemFeatures.rbac_enabled}- onOpenDetails={handleOpenDetails}- onTransferOwnership={handleTransferOwnership}- />- ))}- </tbody>- </table>- </div>- </div>- {invitationResults && (- <InvitedModal- invitationResults={invitationResults}- onCancel={() => setInvitationResults(null)}- />- )}- {editWorkspaceModalVisible && (- <EditWorkspaceModal onCancel={() => setEditWorkspaceModalVisible(false)} />- )}- {showTransferOwnershipModal && (- <TransferOwnershipModal- show={showTransferOwnershipModal}- onClose={() => setShowTransferOwnershipModal(false)}- />- )}- {detailsMember && (- <MemberDetailsModal- member={detailsMember}- canAssignRoles={- canManageMembers &&- detailsMember.role !== 'owner' &&- userProfileEmail !== detailsMember.email- }- allowMultipleRoles={systemFeatures.rbac_enabled}- onClose={handleCloseDetails}- onAssignSubmit={handleAssignRolesSubmit}- />+ </Dialog>+ <DialogContent className="w-110" backdropProps={{ forceRender: true }}>+ {member && (+ <MemberDetailsContent+ key={member.id}+ member={member}+ canAssignRoles={+ canManageMembers && member.role !== 'owner' && userProfileEmail !== member.email+ }+ allowMultipleRoles={systemFeatures.rbac_enabled}+ onClose={() => detailsDialogHandle.close()}+ onAssignSubmit={(roles) => handleAssignRolesSubmit(member, roles)}+ />+ )}+ </DialogContent>+ </>)}- </>+ </Dialog>)}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/invitation-results-content/__tests__/index.spec.tsxsimilarity index 86%rename from web/app/components/header/account-setting/members-page/invited-modal/__tests__/index.spec.tsxrename to web/app/components/header/account-setting/members-page/invitation-results-content/__tests__/index.spec.tsxindex 1207cd797a8..fe24ad728bc 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/invitation-results-content/__tests__/index.spec.tsx@@ -1,17 +1,28 @@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 { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'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'+import InvitationResultsContent from '../index'+const mockOnCancel = vi.fn()let deploymentEdition: DeploymentEdition = 'COMMUNITY'const render = (ui: ReactElement) =>- renderWithConsoleQuery(ui, { systemFeatures: { deployment_edition: deploymentEdition } })+ renderWithConsoleQuery(+ <Dialog+ defaultOpen+ onOpenChange={(open) => {+ if (!open) mockOnCancel()+ }}+ >+ <DialogContent>{ui}</DialogContent>+ </Dialog>,+ { systemFeatures: { deployment_edition: deploymentEdition } },+ )-describe('InvitedModal', () => {- const mockOnCancel = vi.fn()+describe('InvitationResultsContent', () => {const results: MemberInviteResponse['invitation_results'] = [{ email: '[email protected]', status: 'success', url: 'http://invite.com/1' },{@@ -28,7 +39,7 @@ describe('InvitedModal', () => {})it('should show invitation results', async () => {- render(<InvitedModal invitationResults={results} onCancel={mockOnCancel} />)+ render(<InvitationResultsContent invitationResults={results} />)expect(await screen.findByText(/members\.invitationSent$/i)).toBeInTheDocument()expect(await screen.findByText(/members\.invitationLink/i)).toBeInTheDocument()@@ -42,11 +53,10 @@ describe('InvitedModal', () => {it('opens and reopens a failure reason with the keyboard without closing the results dialog', async () => {const user = userEvent.setup()render(- <InvitedModal+ <InvitationResultsContentinvitationResults={[{ email: '[email protected]', status: 'failed', message: 'Quota exceeded' },]}- onCancel={mockOnCancel}/>,)@@ -78,7 +88,7 @@ describe('InvitedModal', () => {it('opens a failure reason by clicking without hovering first', async () => {const user = userEvent.setup({ skipHover: true })- render(<InvitedModal invitationResults={results} onCancel={mockOnCancel} />)+ render(<InvitationResultsContent invitationResults={results} />)await user.click(screen.getByRole('button', { name: '[email protected]' }))@@ -91,12 +101,11 @@ describe('InvitedModal', () => {it('shows each failure reason when its email is hovered', async () => {const user = userEvent.setup()render(- <InvitedModal+ <InvitationResultsContentinvitationResults={[{ email: '[email protected]', status: 'failed', message: 'Quota exceeded' },{ email: '[email protected]', status: 'failed', message: 'Email delivery failed' },]}- onCancel={mockOnCancel}/>,)@@ -123,7 +132,7 @@ describe('InvitedModal', () => {{ email: '[email protected]', status: 'failed', message: 'Quota exceeded' },]- render(<InvitedModal invitationResults={failedOnly} onCancel={mockOnCancel} />)+ render(<InvitationResultsContent invitationResults={failedOnly} />)expect(screen.queryByText(/members\.invitationLink/i)).not.toBeInTheDocument()expect(screen.getByText(/members\.failedInvitationEmails/i)).toBeInTheDocument()@@ -134,7 +143,7 @@ describe('InvitedModal', () => {{ email: '[email protected]', status: 'success', url: 'http://invite.com/2' },]- render(<InvitedModal invitationResults={successOnly} onCancel={mockOnCancel} />)+ render(<InvitationResultsContent invitationResults={successOnly} />)expect(screen.getByText(/members\.invitationLink/i)).toBeInTheDocument()expect(screen.queryByText(/members\.failedInvitationEmails/i)).not.toBeInTheDocument()@@ -152,7 +161,7 @@ describe('InvitedModal', () => {},]- render(<InvitedModal invitationResults={alreadyMembers} onCancel={mockOnCancel} />)+ render(<InvitationResultsContent invitationResults={alreadyMembers} />)expect(screen.getByText(/members\.noNewInvitationsSent/i)).toBeInTheDocument()expect(screen.getByText(/members\.alreadyInTeamTip/i)).toBeInTheDocument()@@ -162,9 +171,7 @@ describe('InvitedModal', () => {)})-describe('InvitedModal (Cloud edition)', () => {- const mockOnCancel = vi.fn()-+describe('InvitationResultsContent (Cloud edition)', () => {beforeEach(() => {vi.clearAllMocks()deploymentEdition = 'CLOUD'@@ -175,7 +182,7 @@ describe('InvitedModal (Cloud edition)', () => {{ email: '[email protected]', status: 'success', url: 'http://invite.com/1' },]- render(<InvitedModal invitationResults={results} onCancel={mockOnCancel} />)+ render(<InvitationResultsContent invitationResults={results} />)expect(await screen.findByText(/members\.invitationSentTip/i)).toBeInTheDocument()expect(screen.queryByText(/members\.invitationLink/i)).not.toBeInTheDocument()diff --git a/web/app/components/header/account-setting/members-page/invited-modal/__tests__/invitation-link.spec.tsx b/web/app/components/header/account-setting/members-page/invitation-results-content/__tests__/invitation-link.spec.tsxsimilarity index 100%rename from web/app/components/header/account-setting/members-page/invited-modal/__tests__/invitation-link.spec.tsxrename to web/app/components/header/account-setting/members-page/invitation-results-content/__tests__/invitation-link.spec.tsxdiff --git a/web/app/components/header/account-setting/members-page/invited-modal/assets/copied.svg b/web/app/components/header/account-setting/members-page/invitation-results-content/assets/copied.svgsimilarity index 100%rename from web/app/components/header/account-setting/members-page/invited-modal/assets/copied.svgrename to web/app/components/header/account-setting/members-page/invitation-results-content/assets/copied.svgdiff --git a/web/app/components/header/account-setting/members-page/invited-modal/assets/copy-hover.svg b/web/app/components/header/account-setting/members-page/invitation-results-content/assets/copy-hover.svgsimilarity index 100%rename from web/app/components/header/account-setting/members-page/invited-modal/assets/copy-hover.svgrename to web/app/components/header/account-setting/members-page/invitation-results-content/assets/copy-hover.svgdiff --git a/web/app/components/header/account-setting/members-page/invited-modal/assets/copy.svg b/web/app/components/header/account-setting/members-page/invitation-results-content/assets/copy.svgsimilarity index 100%rename from web/app/components/header/account-setting/members-page/invited-modal/assets/copy.svgrename to web/app/components/header/account-setting/members-page/invitation-results-content/assets/copy.svgdiff --git a/web/app/components/header/account-setting/members-page/invited-modal/index.module.css b/web/app/components/header/account-setting/members-page/invitation-results-content/index.module.csssimilarity index 100%rename from web/app/components/header/account-setting/members-page/invited-modal/index.module.cssrename to web/app/components/header/account-setting/members-page/invitation-results-content/index.module.cssdiff --git a/web/app/components/header/account-setting/members-page/invitation-results-content/index.tsx b/web/app/components/header/account-setting/members-page/invitation-results-content/index.tsxnew file mode 100644index 00000000000..811cc77a534--- /dev/null+++ b/web/app/components/header/account-setting/members-page/invitation-results-content/index.tsx@@ -0,0 +1,163 @@+import type {+ MemberInviteAlreadyMemberResponse,+ MemberInviteFailedResponse,+ MemberInviteResponse,+ MemberInviteSuccessResponse,+} from '@dify/contracts/api/console/workspaces/types.gen'+import { Button } from '@langgenius/dify-ui/button'+import {+ DialogBody,+ DialogClose,+ DialogFooter,+ DialogHeader,+ DialogHeaderCloseButton,+ DialogTitle,+} from '@langgenius/dify-ui/dialog'+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'++type IInvitationResultsContentProps = {+ invitationResults: MemberInviteResponse['invitation_results']+}+const InvitationResultsContent = ({ invitationResults }: IInvitationResultsContentProps) => {+ const { t } = useTranslation(['common', 'workspaceMembers'])+ const failedEmailId = useId()+ const { data: deploymentEdition } = useSuspenseQuery({+ ...systemFeaturesQueryOptions(),+ select: ({ deployment_edition }) => deployment_edition,+ })+ const isCloudEdition = deploymentEdition === 'CLOUD'+ const isNonCloudEdition = deploymentEdition === 'COMMUNITY' || deploymentEdition === 'ENTERPRISE'++ const successInvitationResults = invitationResults.filter(+ (item): item is MemberInviteSuccessResponse => item.status === 'success',+ )+ const alreadyMemberInvitationResults = invitationResults.filter(+ (item): item is MemberInviteAlreadyMemberResponse => item.status === 'already_member',+ )+ const failedInvitationResults = invitationResults.filter(+ (item): item is MemberInviteFailedResponse => item.status === 'failed',+ )+ const onlyAlreadyMembers =+ alreadyMemberInvitationResults.length > 0 &&+ successInvitationResults.length === 0 &&+ failedInvitationResults.length === 0+ const description = t(+ ($) => $[onlyAlreadyMembers ? 'members.alreadyInTeamTip' : 'members.invitationSentTip'],+ { ns: 'workspaceMembers' },+ )++ return (+ <>+ <DialogHeader>+ <div className="mb-2 flex h-12 w-12 items-center justify-center rounded-xl border-[0.5px] border-components-panel-border bg-background-section-burn shadow-xl">+ <div className="i-heroicons-check-circle-solid h-5.5 w-5.5 text-[#039855]" />+ </div>+ <DialogTitle>+ {t(+ ($) =>+ $[onlyAlreadyMembers ? 'members.noNewInvitationsSent' : 'members.invitationSent'],+ { ns: 'workspaceMembers' },+ )}+ </DialogTitle>+ <DialogHeaderCloseButton aria-label={t(($) => $['operation.close'], { ns: 'common' })} />+ </DialogHeader>+ <DialogBody className="space-y-5">+ {isCloudEdition && <div className="text-sm text-text-tertiary">{description}</div>}+ {(isNonCloudEdition || !!alreadyMemberInvitationResults.length) && (+ <>+ {isNonCloudEdition && <div className="text-sm text-text-tertiary">{description}</div>}+ <div className="flex flex-col gap-2">+ {isNonCloudEdition && !!successInvitationResults.length && (+ <>+ <div className="py-2 text-sm font-medium text-text-primary">+ {t(($) => $['members.invitationLink'], { ns: 'workspaceMembers' })}+ </div>+ {successInvitationResults.map((item) => (+ <InvitationLink key={item.email} value={item} />+ ))}+ </>+ )}+ {!!alreadyMemberInvitationResults.length && (+ <>+ <div className="py-2 text-sm font-medium text-text-primary">+ {t(($) => $['members.alreadyInTeam'], { ns: 'workspaceMembers' })}+ </div>+ {!onlyAlreadyMembers && (+ <div className="text-sm text-text-tertiary">+ {t(($) => $['members.alreadyInTeamTip'], { ns: 'workspaceMembers' })}+ </div>+ )}+ <div className="flex flex-wrap justify-between gap-y-1">+ {alreadyMemberInvitationResults.map((item) => (+ <div+ key={item.email}+ className="flex justify-center rounded-md border border-components-panel-border bg-background-section-burn px-1 text-sm text-text-secondary"+ >+ <span dir="ltr">{item.email}</span>+ </div>+ ))}+ </div>+ </>+ )}+ {isNonCloudEdition && !!failedInvitationResults.length && (+ <>+ <div className="py-2 text-sm font-medium text-text-primary">+ {t(($) => $['members.failedInvitationEmails'], { ns: 'workspaceMembers' })}+ </div>+ <ul className="flex flex-wrap justify-between gap-x-2 gap-y-1">+ {failedInvitationResults.map((item, index) => (+ <li+ key={item.email}+ className="flex max-w-full min-w-0 rounded-md border border-red-300 bg-orange-50 px-1"+ >+ <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"+ >+ <span dir="ltr">{item.email}</span>+ </span>+ <span+ aria-hidden="true"+ className="i-ri-question-line size-4 shrink-0 text-red-300"+ />+ </PopoverTrigger>+ <PopoverContent+ side="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>+ ))}+ </ul>+ </>+ )}+ </div>+ </>+ )}+ </DialogBody>+ <DialogFooter>+ <DialogClose render={<Button className="w-24" variant="primary" />}>+ {t(($) => $['members.ok'], { ns: 'workspaceMembers' })}+ </DialogClose>+ </DialogFooter>+ </>+ )+}++export default InvitationResultsContentdiff --git a/web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsx b/web/app/components/header/account-setting/members-page/invitation-results-content/invitation-link.tsxsimilarity index 100%rename from web/app/components/header/account-setting/members-page/invited-modal/invitation-link.tsxrename to web/app/components/header/account-setting/members-page/invitation-results-content/invitation-link.tsxdiff --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.tsxdeleted file mode 100644index 941fb7151f3..00000000000--- a/web/app/components/header/account-setting/members-page/invited-modal/index.tsx+++ /dev/null@@ -1,172 +0,0 @@-import type {- MemberInviteAlreadyMemberResponse,- MemberInviteFailedResponse,- MemberInviteResponse,- MemberInviteSuccessResponse,-} from '@dify/contracts/api/console/workspaces/types.gen'-import { Button } from '@langgenius/dify-ui/button'-import {- Dialog,- DialogBody,- DialogContent,- DialogFooter,- DialogHeader,- DialogHeaderCloseButton,- DialogTitle,-} from '@langgenius/dify-ui/dialog'-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'--type IInvitedModalProps = {- invitationResults: MemberInviteResponse['invitation_results']- onCancel: () => void-}-const InvitedModal = ({ invitationResults, onCancel }: IInvitedModalProps) => {- const { t } = useTranslation(['common', 'workspaceMembers'])- const failedEmailId = useId()- const { data: deploymentEdition } = useSuspenseQuery({- ...systemFeaturesQueryOptions(),- select: ({ deployment_edition }) => deployment_edition,- })- const isCloudEdition = deploymentEdition === 'CLOUD'- const isNonCloudEdition = deploymentEdition === 'COMMUNITY' || deploymentEdition === 'ENTERPRISE'-- const successInvitationResults = invitationResults.filter(- (item): item is MemberInviteSuccessResponse => item.status === 'success',- )- const alreadyMemberInvitationResults = invitationResults.filter(- (item): item is MemberInviteAlreadyMemberResponse => item.status === 'already_member',- )- const failedInvitationResults = invitationResults.filter(- (item): item is MemberInviteFailedResponse => item.status === 'failed',- )- const onlyAlreadyMembers =- alreadyMemberInvitationResults.length > 0 &&- successInvitationResults.length === 0 &&- failedInvitationResults.length === 0- const description = t(- ($) => $[onlyAlreadyMembers ? 'members.alreadyInTeamTip' : 'members.invitationSentTip'],- { ns: 'workspaceMembers' },- )-- return (- <Dialog- open- onOpenChange={(open) => {- if (!open) onCancel()- }}- >- <DialogContent backdropProps={{ forceRender: true }}>- <DialogHeader>- <div className="mb-2 flex h-12 w-12 items-center justify-center rounded-xl border-[0.5px] border-components-panel-border bg-background-section-burn shadow-xl">- <div className="i-heroicons-check-circle-solid h-5.5 w-5.5 text-[#039855]" />- </div>- <DialogTitle>- {t(- ($) =>- $[onlyAlreadyMembers ? 'members.noNewInvitationsSent' : 'members.invitationSent'],- { ns: 'workspaceMembers' },- )}- </DialogTitle>- <DialogHeaderCloseButton aria-label={t(($) => $['operation.close'], { ns: 'common' })} />- </DialogHeader>- <DialogBody className="space-y-5">- {isCloudEdition && <div className="text-sm text-text-tertiary">{description}</div>}- {(isNonCloudEdition || !!alreadyMemberInvitationResults.length) && (- <>- {isNonCloudEdition && <div className="text-sm text-text-tertiary">{description}</div>}- <div className="flex flex-col gap-2">- {isNonCloudEdition && !!successInvitationResults.length && (- <>- <div className="py-2 text-sm font-medium text-text-primary">- {t(($) => $['members.invitationLink'], { ns: 'workspaceMembers' })}- </div>- {successInvitationResults.map((item) => (- <InvitationLink key={item.email} value={item} />- ))}- </>- )}- {!!alreadyMemberInvitationResults.length && (- <>- <div className="py-2 text-sm font-medium text-text-primary">- {t(($) => $['members.alreadyInTeam'], { ns: 'workspaceMembers' })}- </div>- {!onlyAlreadyMembers && (- <div className="text-sm text-text-tertiary">- {t(($) => $['members.alreadyInTeamTip'], { ns: 'workspaceMembers' })}- </div>- )}- <div className="flex flex-wrap justify-between gap-y-1">- {alreadyMemberInvitationResults.map((item) => (- <div- key={item.email}- className="flex justify-center rounded-md border border-components-panel-border bg-background-section-burn px-1 text-sm text-text-secondary"- >- <span dir="ltr">{item.email}</span>- </div>- ))}- </div>- </>- )}- {isNonCloudEdition && !!failedInvitationResults.length && (- <>- <div className="py-2 text-sm font-medium text-text-primary">- {t(($) => $['members.failedInvitationEmails'], { ns: 'workspaceMembers' })}- </div>- <ul className="flex flex-wrap justify-between gap-x-2 gap-y-1">- {failedInvitationResults.map((item, index) => (- <li- key={item.email}- className="flex max-w-full min-w-0 rounded-md border border-red-300 bg-orange-50 px-1"- >- <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"- >- <span dir="ltr">{item.email}</span>- </span>- <span- aria-hidden="true"- className="i-ri-question-line size-4 shrink-0 text-red-300"- />- </PopoverTrigger>- <PopoverContent- side="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>- ))}- </ul>- </>- )}- </div>- </>- )}- </DialogBody>- <DialogFooter>- <Button className="w-24" onClick={onCancel} variant="primary">- {t(($) => $['members.ok'], { ns: 'workspaceMembers' })}- </Button>- </DialogFooter>- </DialogContent>- </Dialog>- )-}--export default InvitedModaldiff --git a/web/app/components/header/account-setting/members-page/member-details-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/member-details-content/__tests__/index.spec.tsxsimilarity index 94%rename from web/app/components/header/account-setting/members-page/member-details-modal/__tests__/index.spec.tsxrename to web/app/components/header/account-setting/members-page/member-details-content/__tests__/index.spec.tsxindex c14d52bac2d..c7b5bca3c76 100644--- a/web/app/components/header/account-setting/members-page/member-details-modal/__tests__/index.spec.tsx+++ b/web/app/components/header/account-setting/members-page/member-details-content/__tests__/index.spec.tsx@@ -1,12 +1,13 @@import type { AccountWithRoleResponse } from '@dify/contracts/api/console/workspaces/types.gen'import type { ReactElement } from 'react'import type { Role } from '@/models/access-control'+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'import { screen } from '@testing-library/react'import userEvent from '@testing-library/user-event'import { vi } from 'vite-plus/test'import { consoleQuery } from '@/service/console'import { createConsoleQueryWrapper, renderWithConsoleQuery } from '@/test/console/query-data'-import MemberDetailsModal from '../index'+import MemberDetailsContent from '../index'const { mockWorkspaceRoleListHook, mockRolesOfMemberHook } = vi.hoisted(() => ({mockWorkspaceRoleListHook: vi.fn(),@@ -60,10 +61,15 @@ const render = (ui: ReactElement) => {}),response,)- return renderWithConsoleQuery(ui, { queryClient })+ return renderWithConsoleQuery(+ <Dialog open>+ <DialogContent>{ui}</DialogContent>+ </Dialog>,+ { queryClient },+ )}-describe('MemberDetailsModal', () => {+describe('MemberDetailsContent', () => {beforeEach(() => {vi.clearAllMocks()vi.mocked(mockRolesOfMemberHook).mockReturnValue({@@ -102,7 +108,7 @@ describe('MemberDetailsModal', () => {describe('Rendering', () => {it('should render edit role action when multiple roles are disabled', () => {render(- <MemberDetailsModal+ <MemberDetailsContentmember={member}canAssignRolesallowMultipleRoles={false}@@ -121,7 +127,7 @@ describe('MemberDetailsModal', () => {it('should render singular assigned role label when there is one role', () => {render(- <MemberDetailsModal+ <MemberDetailsContentmember={member}canAssignRolesonClose={vi.fn()}@@ -144,7 +150,7 @@ describe('MemberDetailsModal', () => {})render(- <MemberDetailsModal+ <MemberDetailsContentmember={member}canAssignRolesonClose={vi.fn()}@@ -166,7 +172,7 @@ describe('MemberDetailsModal', () => {const user = userEvent.setup()render(- <MemberDetailsModal+ <MemberDetailsContentmember={member}canAssignRolesallowMultipleRoles={false}@@ -186,7 +192,7 @@ describe('MemberDetailsModal', () => {it('should not show role removal controls when role assignment is not allowed', () => {render(- <MemberDetailsModal+ <MemberDetailsContentmember={member}canAssignRoles={false}onClose={vi.fn()}@@ -217,7 +223,7 @@ describe('MemberDetailsModal', () => {})render(- <MemberDetailsModal+ <MemberDetailsContentmember={member}canAssignRolesonClose={vi.fn()}@@ -243,7 +249,7 @@ describe('MemberDetailsModal', () => {const handleAssignSubmit = vi.fn()render(- <MemberDetailsModal+ <MemberDetailsContentmember={member}canAssignRolesonClose={vi.fn()}@@ -270,7 +276,7 @@ describe('MemberDetailsModal', () => {const handleAssignSubmit = vi.fn()render(- <MemberDetailsModal+ <MemberDetailsContentmember={member}canAssignRolesallowMultipleRoles={false}diff --git a/web/app/components/header/account-setting/members-page/member-details-content/index.tsx b/web/app/components/header/account-setting/members-page/member-details-content/index.tsxnew file mode 100644index 00000000000..899513b0023--- /dev/null+++ b/web/app/components/header/account-setting/members-page/member-details-content/index.tsx@@ -0,0 +1,262 @@+'use client'+import type { AccountWithRoleResponse } from '@dify/contracts/api/console/workspaces/types.gen'+import type { Role } from '@/models/access-control'+import { Avatar, AvatarFallback, AvatarImage } from '@langgenius/dify-ui/avatar'+import { Button } from '@langgenius/dify-ui/button'+import {+ Dialog,+ DialogBody,+ DialogContent,+ DialogFooter,+ DialogHeader,+ DialogHeaderCloseButton,+ DialogTitle,+ DialogTrigger,+} from '@langgenius/dify-ui/dialog'+import { useQuery } from '@tanstack/react-query'+import { memo, useCallback, useMemo, useRef, useState } from 'react'+import { useTranslation } from 'react-i18next'+import { useLocale } from '#i18n'+import { LoadingPlaceholder } from '@/app/components/base/loading-placeholder'+import { getAccessControlTemplateLanguage } from '@/i18n/language'+import { consoleQuery } from '@/service/console'+import { getAvatarInitial } from '@/utils/avatar'+import { toRole } from '../../workspace-role-list-query'+import AssignRolesContent from '../assign-roles-content'+import PermissionRoleChip from './permission-role-chip'++type MemberDetailsContentProps = {+ member: AccountWithRoleResponse+ canAssignRoles?: boolean+ allowMultipleRoles?: boolean+ onClose: () => void+ onAssignSubmit?: (roles: Role[]) => void | Promise<unknown>+}++const MemberDetailsContent = ({+ member,+ canAssignRoles = false,+ allowMultipleRoles = true,+ onClose,+ onAssignSubmit,+}: MemberDetailsContentProps) => {+ const { t } = useTranslation(['common', 'workspaceMembers'])+ const locale = useLocale()+ const searchInputRef = useRef<HTMLInputElement>(null)+ const [assignOpen, setAssignOpen] = useState(false)+ const [isSaving, setIsSaving] = useState(false)+ const [saveFailed, setSaveFailed] = useState(false)+ const language = useMemo(() => getAccessControlTemplateLanguage(locale), [locale])++ const { data: rolesOfMember, isLoading: isLoadingRolesOfMember } = useQuery(+ consoleQuery.workspaces.current.rbac.members.byMemberId.rbacRoles.get.queryOptions({+ input: { params: { member_id: member.id }, query: { language } },+ select: (data) => ({ ...data, roles: (data.roles ?? []).map(toRole) }),+ }),+ )+ const [pendingRoles, setPendingRoles] = useState<Role[]>()++ const roles = useMemo(() => rolesOfMember?.roles ?? [], [rolesOfMember?.roles])+ const selectedRoles = pendingRoles ?? roles+ const selectedRoleIds = useMemo(() => selectedRoles.map((role) => role.id), [selectedRoles])+ const canRemoveRoles = canAssignRoles && allowMultipleRoles+ const assignedRolesLabel =+ selectedRoleIds.length === 1+ ? t(($) => $['members.memberDetails.assignedRole'], {+ ns: 'workspaceMembers',+ defaultValue: 'Assigned Role',+ })+ : t(($) => $['members.memberDetails.assignedRoles'], {+ ns: 'workspaceMembers',+ defaultValue: 'Assigned Roles',+ })+ const assignActionIconClassName = allowMultipleRoles+ ? 'i-ri-add-line h-3.5 w-3.5'+ : 'i-ri-edit-line h-3.5 w-3.5'+ const assignActionLabel = allowMultipleRoles+ ? t(($) => $['members.memberDetails.assign'], {+ ns: 'workspaceMembers',+ defaultValue: 'Assign',+ })+ : t(($) => $['operation.edit'], { ns: 'common' })++ const builtinRoles = useMemo(+ () => selectedRoles.filter((role) => role.is_builtin),+ [selectedRoles],+ )+ const customRoles = useMemo(+ () => selectedRoles.filter((role) => !role.is_builtin),+ [selectedRoles],+ )++ const handleAssignSubmit = useCallback(+ (roles: Role[]) => {+ setPendingRoles(allowMultipleRoles ? roles : roles.slice(0, 1))+ setAssignOpen(false)+ },+ [allowMultipleRoles],+ )++ const handleRemove = useCallback(+ (roleId: string) => {+ if (!allowMultipleRoles && selectedRoles.length <= 1) return++ setPendingRoles(selectedRoles.filter((selectedRole) => selectedRole.id !== roleId))+ },+ [allowMultipleRoles, selectedRoles],+ )++ const handleSave = useCallback(async () => {+ if (isSaving || !onAssignSubmit) return+ setIsSaving(true)+ setSaveFailed(false)+ try {+ await onAssignSubmit(allowMultipleRoles ? selectedRoles : selectedRoles.slice(0, 1))+ onClose()+ } catch {+ setSaveFailed(true)+ } finally {+ setIsSaving(false)+ }+ }, [allowMultipleRoles, isSaving, onAssignSubmit, onClose, selectedRoles])++ return (+ <>+ <DialogHeader>+ <DialogTitle>+ {t(($) => $['members.memberDetails.title'], {+ ns: 'workspaceMembers',+ defaultValue: 'Member Details',+ })}+ </DialogTitle>+ <DialogHeaderCloseButton+ disabled={isSaving}+ aria-label={t(($) => $['operation.close'], { ns: 'common' })}+ />+ </DialogHeader>++ <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="system-md-semibold wrap-break-word text-text-primary">+ {member.name}+ </div>+ <div className="system-xs-regular wrap-break-word text-text-tertiary">+ <span dir="ltr">{member.email}</span>+ </div>+ </div>+ </div>++ <div className="-mx-6 my-3 border-t border-divider-subtle" />++ <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>+ {canAssignRoles && (+ <Dialog open={assignOpen} onOpenChange={setAssignOpen}>+ <DialogTrigger+ render={+ <Button+ variant="ghost"+ size="small"+ className="ms-auto shrink-0"+ disabled={isSaving || isLoadingRolesOfMember}+ />+ }+ >+ <span aria-hidden className={assignActionIconClassName} />+ {assignActionLabel}+ </DialogTrigger>+ <DialogContent className="h-121" initialFocus={searchInputRef}>+ <AssignRolesContent+ searchInputRef={searchInputRef}+ selectedRoles={selectedRoles}+ allowMultipleRoles={allowMultipleRoles}+ onSubmit={handleAssignSubmit}+ />+ </DialogContent>+ </Dialog>+ )}+ </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>+ <Button+ variant="primary"+ onClick={handleSave}+ loading={isSaving}+ disabled={!onAssignSubmit}+ >+ {t(($) => $['operation.save'], { ns: 'common' })}+ </Button>+ </DialogFooter>+ )}+ </>+ )+}++export default memo(MemberDetailsContent)diff --git a/web/app/components/header/account-setting/members-page/member-details-modal/permission-role-chip.tsx b/web/app/components/header/account-setting/members-page/member-details-content/permission-role-chip.tsxsimilarity index 84%rename from web/app/components/header/account-setting/members-page/member-details-modal/permission-role-chip.tsxrename to web/app/components/header/account-setting/members-page/member-details-content/permission-role-chip.tsxindex 89efdf8fb3c..d9d82bcca6e 100644--- a/web/app/components/header/account-setting/members-page/member-details-modal/permission-role-chip.tsx+++ b/web/app/components/header/account-setting/members-page/member-details-content/permission-role-chip.tsx@@ -4,8 +4,9 @@ import type { SelectorKey } from 'i18next'import { cn } from '@langgenius/dify-ui/cn'import { IconButton } from '@langgenius/dify-ui/icon-button'import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'-import { memo } from 'react'+import { memo, Suspense } from 'react'import { Trans, useTranslation } from 'react-i18next'+import { LoadingPlaceholder } from '@/app/components/base/loading-placeholder'type PermissionRoleChipProps = {roleId: string@@ -24,17 +25,8 @@ const PermissionRoleChip = ({onRemove,className,}: PermissionRoleChipProps) => {- const { t } = useTranslation(['common', 'permissionKeys', 'workspaceMembers'])- const permissions = permissionKeys+ const { t } = useTranslation(['common'])const canRemoveRole = !isOwner && !!onRemove- // Permission keys come from the catalog API, so this is a reviewed open-key boundary with a server-provided fallback.- const translatePermissionName = (key: string) =>- t(key as SelectorKey, {- ns: 'permissionKeys',- defaultValue: key,- })- const permissionLabels = permissions.map(translatePermissionName).join(', ')- const hasPermissionLabels = permissionLabels.length > 0const chipRootClassName = cn('inline-flex h-6 max-w-full min-w-0 items-center gap-1 rounded-full border-[0.5px] border-components-panel-border-subtle bg-background-body px-1.5 py-0.5 system-xs-medium text-text-primary shadow-xs transition-colors',@@ -72,7 +64,36 @@ const PermissionRoleChip = ({</span>)- const permissionSummary = (+ return (+ <Popover>+ {chip}+ <PopoverContent+ align="start"+ className="overflow-hidden border-components-panel-border bg-components-tooltip-bg p-0 shadow-lg backdrop-blur-[5px]"+ >+ <Suspense fallback={<LoadingPlaceholder className="p-4" />}>+ <PermissionSummary label={label} permissionKeys={permissionKeys} />+ </Suspense>+ </PopoverContent>+ </Popover>+ )+}++function PermissionSummary({+ label,+ permissionKeys,+}: Pick<PermissionRoleChipProps, 'label' | 'permissionKeys'>) {+ const { t } = useTranslation(['permissionKeys', 'workspaceMembers'])+ // Permission keys come from the catalog API, so this is a reviewed open-key boundary with a server-provided fallback.+ const translatePermissionName = (key: string) =>+ t(key as SelectorKey, {+ ns: 'permissionKeys',+ defaultValue: key,+ })+ const permissionLabels = permissionKeys.map(translatePermissionName).join(', ')+ const hasPermissionLabels = permissionLabels.length > 0++ return (<div className="flex w-58 flex-col gap-1 px-4 py-3.5"><div className="title-xs-semi-bold leading-4 whitespace-nowrap text-text-primary">{label}@@ -99,18 +120,6 @@ const PermissionRoleChip = ({</div></div>)-- return (- <Popover>- {chip}- <PopoverContent- align="start"- className="overflow-hidden border-components-panel-border bg-components-tooltip-bg p-0 shadow-lg backdrop-blur-[5px]"- >- {permissionSummary}- </PopoverContent>- </Popover>- )}export default memo(PermissionRoleChip)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.tsxdeleted file mode 100644index b5490c3fbdc..00000000000--- a/web/app/components/header/account-setting/members-page/member-details-modal/index.tsx+++ /dev/null@@ -1,269 +0,0 @@-'use client'-import type { AccountWithRoleResponse } from '@dify/contracts/api/console/workspaces/types.gen'-import type { Role } from '@/models/access-control'-import { Avatar, AvatarFallback, AvatarImage } from '@langgenius/dify-ui/avatar'-import { Button } from '@langgenius/dify-ui/button'-import {- Dialog,- DialogBody,- DialogContent,- DialogFooter,- DialogHeader,- DialogHeaderCloseButton,- DialogTitle,-} from '@langgenius/dify-ui/dialog'-import { useQuery } from '@tanstack/react-query'-import { memo, useCallback, useMemo, useState } from 'react'-import { useTranslation } from 'react-i18next'-import { useLocale } from '#i18n'-import { LoadingPlaceholder } from '@/app/components/base/loading-placeholder'-import { getAccessControlTemplateLanguage } from '@/i18n/language'-import { consoleQuery } from '@/service/console'-import { getAvatarInitial } from '@/utils/avatar'-import { toRole } from '../../workspace-role-list-query'-import AssignRolesModal from '../assign-roles-modal'-import PermissionRoleChip from './permission-role-chip'--type MemberDetailsModalProps = {- member: AccountWithRoleResponse- canAssignRoles?: boolean- allowMultipleRoles?: boolean- onClose: () => void- onAssignSubmit?: (roles: Role[]) => void | Promise<unknown>-}--const MemberDetailsModal = ({- member,- canAssignRoles = false,- allowMultipleRoles = true,- onClose,- onAssignSubmit,-}: MemberDetailsModalProps) => {- const { t } = useTranslation(['common', 'workspaceMembers'])- const locale = useLocale()- const [assignOpen, setAssignOpen] = useState(false)- const [isSaving, setIsSaving] = useState(false)- const [saveFailed, setSaveFailed] = useState(false)- const language = useMemo(() => getAccessControlTemplateLanguage(locale), [locale])-- const { data: rolesOfMember, isLoading: isLoadingRolesOfMember } = useQuery(- consoleQuery.workspaces.current.rbac.members.byMemberId.rbacRoles.get.queryOptions({- input: { params: { member_id: member.id }, query: { language } },- select: (data) => ({ ...data, roles: (data.roles ?? []).map(toRole) }),- }),- )- const [pendingRoles, setPendingRoles] = useState<Role[]>()-- const roles = useMemo(() => rolesOfMember?.roles ?? [], [rolesOfMember?.roles])- const selectedRoles = pendingRoles ?? roles- const selectedRoleIds = useMemo(() => selectedRoles.map((role) => role.id), [selectedRoles])- const canRemoveRoles = canAssignRoles && allowMultipleRoles- const assignedRolesLabel =- selectedRoleIds.length === 1- ? t(($) => $['members.memberDetails.assignedRole'], {- ns: 'workspaceMembers',- defaultValue: 'Assigned Role',- })- : t(($) => $['members.memberDetails.assignedRoles'], {- ns: 'workspaceMembers',- defaultValue: 'Assigned Roles',- })- const assignActionIconClassName = allowMultipleRoles- ? 'i-ri-add-line h-3.5 w-3.5'- : 'i-ri-edit-line h-3.5 w-3.5'- const assignActionLabel = allowMultipleRoles- ? t(($) => $['members.memberDetails.assign'], {- ns: 'workspaceMembers',- defaultValue: 'Assign',- })- : t(($) => $['operation.edit'], { ns: 'common' })-- const builtinRoles = useMemo(- () => selectedRoles.filter((role) => role.is_builtin),- [selectedRoles],- )- const customRoles = useMemo(- () => selectedRoles.filter((role) => !role.is_builtin),- [selectedRoles],- )-- const handleClose = useCallback(() => {- setAssignOpen(false)- }, [])-- const handleAssignSubmit = useCallback(- (roles: Role[]) => {- setPendingRoles(allowMultipleRoles ? roles : roles.slice(0, 1))- setAssignOpen(false)- },- [allowMultipleRoles],- )-- const handleRemove = useCallback(- (roleId: string) => {- if (!allowMultipleRoles && selectedRoles.length <= 1) return-- setPendingRoles(selectedRoles.filter((selectedRole) => selectedRole.id !== roleId))- },- [allowMultipleRoles, selectedRoles],- )-- const handleSave = useCallback(async () => {- if (isSaving || !onAssignSubmit) return- setIsSaving(true)- setSaveFailed(false)- try {- await onAssignSubmit(allowMultipleRoles ? selectedRoles : selectedRoles.slice(0, 1))- onClose()- } catch {- setSaveFailed(true)- } finally {- setIsSaving(false)- }- }, [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>-- <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="system-md-semibold wrap-break-word text-text-primary">- {member.name}- </div>- <div className="system-xs-regular wrap-break-word text-text-tertiary">- <span dir="ltr">{member.email}</span>- </div>- </div>- </div>-- <div className="-mx-6 my-3 border-t border-divider-subtle" />-- <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>- {canAssignRoles && (- <Button- variant="ghost"- size="small"- className="ms-auto shrink-0"- disabled={isSaving}- onClick={() => setAssignOpen(true)}- >- <span aria-hidden className={assignActionIconClassName} />- {assignActionLabel}- </Button>- )}- </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>- <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}- />- )}- </DialogContent>- </Dialog>- )-}--export default memo(MemberDetailsModal)diff --git a/web/app/components/header/account-setting/members-page/member-menu.tsx b/web/app/components/header/account-setting/members-page/member-menu.tsxindex c9b0a37ea3a..e4b9dd47cda 100644--- a/web/app/components/header/account-setting/members-page/member-menu.tsx+++ b/web/app/components/header/account-setting/members-page/member-menu.tsx@@ -11,6 +11,7 @@ import {AlertDialogHeader,AlertDialogTitle,} from '@langgenius/dify-ui/alert-dialog'+import { Dialog, DialogContent } from '@langgenius/dify-ui/dialog'import {DropdownMenu,DropdownMenuContent,@@ -20,19 +21,19 @@ import {} from '@langgenius/dify-ui/dropdown-menu'import { IconButton } from '@langgenius/dify-ui/icon-button'import { useMutation, useQueryClient } from '@tanstack/react-query'-import { memo, useCallback, useMemo, useState } from 'react'+import { memo, useCallback, useMemo, useRef, useState } from 'react'import { useTranslation } from 'react-i18next'import { toast } from '@/app/notifications'import { consoleClient, consoleQuery } from '@/service/console'import { createSelectedRolePlaceholder } from '../workspace-role-list-query'-import AssignRolesModal from './assign-roles-modal'+import AssignRolesContent from './assign-roles-content'+import TransferOwnershipContent from './transfer-ownership-content'type MemberMenuProps = {member: AccountWithRoleResponseisCurrentUser: booleancanTransferOwnership?: booleanallowMultipleRoles?: boolean- onTransferOwnership?: () => void}const MemberMenu = ({@@ -40,10 +41,11 @@ const MemberMenu = ({isCurrentUser,canTransferOwnership = false,allowMultipleRoles = true,- onTransferOwnership,}: MemberMenuProps) => {const { t } = useTranslation(['common', 'workspaceMembers'])const queryClient = useQueryClient()+ const searchInputRef = useRef<HTMLInputElement>(null)+ const [transferOpen, setTransferOpen] = useState(false)const [assignModalOpen, setAssignModalOpen] = useState(false)const [removeConfirmOpen, setRemoveConfirmOpen] = useState(false)const [removing, setRemoving] = useState(false)@@ -76,6 +78,7 @@ const MemberMenu = ({? roles.map((role) => role.id): roles.slice(0, 1).map((role) => role.id)+ setAssignModalOpen(false)updateRolesOfMember({ params: { member_id: member.id }, body: { role_ids: roleIds } },{@@ -108,10 +111,6 @@ const MemberMenu = ({}}, [member.id, queryClient])- const handleTransferOwnership = useCallback(() => {- onTransferOwnership?.()- }, [onTransferOwnership])-if (!canAssignRoles && !canRemove && !showTransferOwnership) return nullreturn (@@ -121,13 +120,10 @@ const MemberMenu = ({render={<IconButtonsize="lg"- aria-label={t(($) => $['members.memberActions'], {- ns: 'workspaceMembers',- defaultValue: 'Member actions',- })}+ aria-label={`${t(($) => $['members.memberActions'], { ns: 'workspaceMembers' })}: ${memberName}`}className="data-popup-open:bg-state-base-hover">- <span aria-hidden className="i-ri-more-fill h-4 w-4 text-text-tertiary" />+ <span aria-hidden className="i-ri-more-fill size-4 text-text-tertiary" /></IconButton>}/>@@ -143,7 +139,7 @@ const MemberMenu = ({{showTransferOwnership && (<DropdownMenuItemclassName="system-sm-medium text-text-secondary"- onClick={handleTransferOwnership}+ onClick={() => setTransferOpen(true)}>{t(($) => $['members.transferOwnership'], { ns: 'workspaceMembers' })}</DropdownMenuItem>@@ -186,14 +182,25 @@ const MemberMenu = ({</AlertDialogFooter></AlertDialogContent></AlertDialog>- {assignModalOpen && (- <AssignRolesModal- selectedRoles={selectedRoles}- allowMultipleRoles={allowMultipleRoles}- onClose={() => setAssignModalOpen(false)}- onSubmit={handleAssignRolesSubmit}- />- )}+ <Dialog open={assignModalOpen} onOpenChange={setAssignModalOpen}>+ <DialogContent+ className="h-121"+ initialFocus={searchInputRef}+ backdropProps={{ forceRender: true }}+ >+ <AssignRolesContent+ searchInputRef={searchInputRef}+ selectedRoles={selectedRoles}+ allowMultipleRoles={allowMultipleRoles}+ onSubmit={handleAssignRolesSubmit}+ />+ </DialogContent>+ </Dialog>+ <Dialog open={transferOpen} onOpenChange={setTransferOpen} disablePointerDismissal>+ <DialogContent className="w-105" backdropProps={{ forceRender: true }}>+ <TransferOwnershipContent />+ </DialogContent>+ </Dialog></div>)}diff --git a/web/app/components/header/account-setting/members-page/member-row.tsx b/web/app/components/header/account-setting/members-page/member-row.tsxindex 38c682c7fc1..c4bddf6e439 100644--- a/web/app/components/header/account-setting/members-page/member-row.tsx+++ b/web/app/components/header/account-setting/members-page/member-row.tsx@@ -2,7 +2,8 @@import type { AccountWithRoleResponse } from '@dify/contracts/api/console/workspaces/types.gen'import type { MouseEvent } from 'react'import { Avatar, AvatarFallback, AvatarImage } from '@langgenius/dify-ui/avatar'-import { memo, useCallback } from 'react'+import { DialogTrigger } from '@langgenius/dify-ui/dialog'+import { memo, useCallback, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useFormatTimeFromNow } from '@/hooks/use-format-time-from-now'import { getAvatarInitial } from '@/utils/avatar'@@ -19,8 +20,6 @@ type MemberRowProps = {canManage: booleancanTransferOwnership: booleanallowMultipleRoles: boolean- onOpenDetails: (member: AccountWithRoleResponse) => void- onTransferOwnership: () => void}const MemberRow = ({@@ -30,36 +29,31 @@ const MemberRow = ({canManage,canTransferOwnership,allowMultipleRoles,- onOpenDetails,- onTransferOwnership,}: MemberRowProps) => {const { t } = useTranslation(['workspaceMembers'])+ const detailsTriggerRef = useRef<HTMLButtonElement>(null)const { formatTimeFromNow } = useFormatTimeFromNow()const roleNames = roles.map((role) => role.name)- const openDetails = useCallback(() => {- onOpenDetails(member)- }, [member, onOpenDetails])-- const handleRowClick = useCallback(- (event: MouseEvent<HTMLTableRowElement>) => {- const target = event.target- if (- !(target instanceof Element) ||- !event.currentTarget.contains(target) ||- target.closest('button, a')- )- return- openDetails()- },- [openDetails],- )+ const handleRowClick = useCallback((event: MouseEvent<HTMLTableRowElement>) => {+ const target = event.target+ if (+ !(target instanceof Element) ||+ !event.currentTarget.contains(target) ||+ target.closest('button, a')+ )+ return+ const selection = event.currentTarget.ownerDocument.getSelection()+ if (selection && !selection.isCollapsed && selection.containsNode(event.currentTarget, true))+ return+ detailsTriggerRef.current?.click()+ }, [])return (<trdata-testid={`member-row-${member.id}`}- className="cursor-pointer border-b border-divider-subtle hover:bg-state-base-hover"+ className="cursor-pointer border-b border-divider-subtle hover:bg-state-base-hover has-[[aria-haspopup=dialog]:focus-visible]:bg-state-base-hover has-[[aria-haspopup=dialog]:focus-visible]:inset-ring-2 has-[[aria-haspopup=dialog]:focus-visible]:inset-ring-state-accent-solid has-[[aria-haspopup=dialog]:focus-visible]:outline-hidden has-[[aria-haspopup=menu]:hover]:bg-transparent"onClick={handleRowClick}><td className="px-3 py-2">@@ -70,13 +64,13 @@ const MemberRow = ({</Avatar><div className="min-w-0"><div className="system-sm-medium text-text-secondary">- <button- type="button"- className="max-w-full cursor-pointer rounded-sm text-start wrap-break-word hover:bg-state-base-hover focus-visible:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-components-input-border-active focus-visible:outline-hidden"- onClick={openDetails}+ <DialogTrigger+ ref={detailsTriggerRef}+ payload={member}+ className="max-w-full cursor-pointer text-start wrap-break-word focus-visible:ring-0">{member.name}- </button>+ </DialogTrigger>{member.status === 'pending' && (<span className="ms-1 system-xs-medium text-text-warning">{t(($) => $['members.pending'], { ns: 'workspaceMembers' })}@@ -107,7 +101,6 @@ const MemberRow = ({isCurrentUser={isCurrentUser}canTransferOwnership={canTransferOwnership}allowMultipleRoles={allowMultipleRoles}- onTransferOwnership={onTransferOwnership}/></td>)}diff --git a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/transfer-ownership-content/__tests__/index.spec.tsxsimilarity index 88%rename from web/app/components/header/account-setting/members-page/transfer-ownership-modal/__tests__/index.spec.tsxrename to web/app/components/header/account-setting/members-page/transfer-ownership-content/__tests__/index.spec.tsxindex 9c8fb494cae..0c94d9f19eb 100644--- a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/__tests__/index.spec.tsx+++ b/web/app/components/header/account-setting/members-page/transfer-ownership-content/__tests__/index.spec.tsx@@ -1,11 +1,12 @@import type { ConsoleStateFixture } from '@/test/console/state-fixture'+import { Dialog, DialogContent, DialogTrigger } from '@langgenius/dify-ui/dialog'import { act, screen, waitFor } from '@testing-library/react'import userEvent from '@testing-library/user-event'import { vi } from 'vite-plus/test'import { consoleClient, consoleQuery } from '@/service/console'import { createConsoleQueryWrapper } from '@/test/console/query-data'import { render } from '@/test/console/render'-import TransferOwnershipModal from '../index'+import TransferOwnershipContent from '../index'const toastMocks = vi.hoisted(() => ({mockNotify: vi.fn(),@@ -43,7 +44,7 @@ vi.mock('@/app/notifications', () => ({},}))-describe('TransferOwnershipModal', () => {+describe('TransferOwnershipContent', () => {const mockOnClose = vi.fn()const { mockNotify } = toastMocks@@ -95,7 +96,20 @@ describe('TransferOwnershipModal', () => {},],})- return render(<TransferOwnershipModal show onClose={mockOnClose} />, { wrapper })+ return render(+ <Dialog+ defaultOpen+ onOpenChange={(open) => {+ if (!open) mockOnClose()+ }}+ >+ <DialogTrigger>Transfer ownership</DialogTrigger>+ <DialogContent>+ <TransferOwnershipContent />+ </DialogContent>+ </Dialog>,+ { wrapper },+ )}const mockEmailVerification = ({@@ -287,6 +301,22 @@ describe('TransferOwnershipModal', () => {})})+ it('starts a new verification session after closing and reopening', async () => {+ const user = userEvent.setup()+ mockEmailVerification()+ renderModal()+ await user.click(screen.getByRole('button', { name: /members\.transferModal\.sendVerifyCode/ }))+ const code = await screen.findByRole('textbox', { name: /members\.transferModal\.codeLabel/ })+ await user.type(code, '123')+ await user.click(screen.getByRole('button', { name: /operation\.cancel/ }))+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ await user.click(screen.getByRole('button', { name: 'Transfer ownership' }))+ expect(+ await screen.findByRole('button', { name: /members\.transferModal\.sendVerifyCode/ }),+ ).toBeVisible()+ expect(screen.queryByRole('textbox')).not.toBeInTheDocument()+ })+it('should close when close button is clicked', async () => {const user = userEvent.setup()renderModal()diff --git a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/__tests__/member-selector.spec.tsx b/web/app/components/header/account-setting/members-page/transfer-ownership-content/__tests__/member-selector.spec.tsxsimilarity index 100%rename from web/app/components/header/account-setting/members-page/transfer-ownership-modal/__tests__/member-selector.spec.tsxrename to web/app/components/header/account-setting/members-page/transfer-ownership-content/__tests__/member-selector.spec.tsxdiff --git a/web/app/components/header/account-setting/members-page/transfer-ownership-content/index.tsx b/web/app/components/header/account-setting/members-page/transfer-ownership-content/index.tsxnew file mode 100644index 00000000000..6c2de70cb7b--- /dev/null+++ b/web/app/components/header/account-setting/members-page/transfer-ownership-content/index.tsx@@ -0,0 +1,289 @@+import { Button } from '@langgenius/dify-ui/button'+import {+ DialogBody,+ DialogClose,+ DialogFooter,+ DialogHeader,+ DialogHeaderCloseButton,+ DialogTitle,+} from '@langgenius/dify-ui/dialog'+import { Input } from '@langgenius/dify-ui/input'+import { useMutation, useSuspenseQuery } from '@tanstack/react-query'+import { useAtomValue } from 'jotai'+import * as React from 'react'+import { useCallback, useState } from 'react'+import { Trans, useTranslation } from 'react-i18next'+import { toast } from '@/app/notifications'+import { currentWorkspaceAtom } from '@/context/workspace-state'+import { userProfileQueryOptions } from '@/features/account-profile/client'+import { consoleClient } from '@/service/console'+import { getErrorMessage } from '@/utils/error-message'+import MemberSelector from './member-selector'++const STEP = {+ start: 'start',+ verify: 'verify',+ transfer: 'transfer',+}+type Step = (typeof STEP)[keyof typeof STEP]++const TransferOwnershipContent = () => {+ const { t } = useTranslation(['common', 'workspaceMembers'])+ const verificationCodeInputId = React.useId()+ const currentWorkspace = useAtomValue(currentWorkspaceAtom)+ const { data: userProfile } = useSuspenseQuery({+ ...userProfileQueryOptions(),+ select: (data) => data.profile,+ })+ const [step, setStep] = useState<Step>(STEP.start)+ const [code, setCode] = useState<string>('')+ const [time, setTime] = useState<number>(0)+ const [stepToken, setStepToken] = useState<string>('')+ const [newOwner, setNewOwner] = useState<string>('')+ const [isTransfer, setIsTransfer] = useState<boolean>(false)+ const timerIdRef = React.useRef<number | undefined>(undefined)+ const retimeCountdown = useCallback((timerId?: number) => {+ if (timerIdRef.current !== undefined) window.clearInterval(timerIdRef.current)+ timerIdRef.current = timerId+ }, [])+ React.useEffect(() => {+ return retimeCountdown+ }, [retimeCountdown])+ const startCount = () => {+ setTime(60)+ retimeCountdown(+ window.setInterval(() => {+ setTime((prev) => {+ if (prev <= 1) {+ retimeCountdown()+ return 0+ }+ return prev - 1+ })+ }, 1000),+ )+ }+ const { mutate: sendEmail, isPending: isSendingCode } = useMutation({+ mutationFn: () =>+ consoleClient.workspaces.current.members.sendOwnerTransferConfirmEmail.post({ body: {} }),+ })+ const verifyEmailAddress = async (code: string, token: string, callback?: () => void) => {+ try {+ const res = await consoleClient.workspaces.current.members.ownerTransferCheck.post({+ body: { code, token },+ })+ if (res.is_valid) {+ setStepToken(res.token)+ callback?.()+ } else {+ toast.error('Verifying email failed')+ }+ } catch (error) {+ toast.error(`Error verifying email: ${getErrorMessage(error) ?? ''}`)+ }+ }+ const sendCodeToOriginEmail = () => {+ sendEmail(undefined, {+ onSuccess: (res) => {+ startCount()+ if (res.data) setStepToken(res.data)+ setStep(STEP.verify)+ },+ })+ }+ const handleVerifyOriginEmail = async () => {+ await verifyEmailAddress(code, stepToken, () => setStep(STEP.transfer))+ setCode('')+ }+ const handleTransfer = async () => {+ setIsTransfer(true)+ try {+ await consoleClient.workspaces.current.members.byMemberId.ownerTransfer.post({+ params: { member_id: newOwner },+ body: { token: stepToken },+ })+ globalThis.location.reload()+ } catch (error) {+ toast.error(`Error ownership transfer: ${getErrorMessage(error) ?? ''}`)+ } finally {+ setIsTransfer(false)+ }+ }+ return (+ <>+ {step === STEP.start && (+ <>+ <DialogHeader>+ <DialogTitle>+ {t(($) => $['members.transferModal.title'], { ns: 'workspaceMembers' })}+ </DialogTitle>+ <DialogHeaderCloseButton+ aria-label={t(($) => $['operation.close'], { ns: 'common' })}+ />+ </DialogHeader>+ <DialogBody>+ <div className="space-y-1 pt-1 pb-2">+ <div className="body-md-medium text-text-destructive">+ {t(($) => $['members.transferModal.warning'], {+ ns: 'workspaceMembers',+ workspace: currentWorkspace.name.replace(/'/g, '’'),+ })}+ </div>+ <div className="body-md-regular text-text-secondary">+ {t(($) => $['members.transferModal.warningTip'], { ns: 'workspaceMembers' })}+ </div>+ <div className="body-md-regular text-text-secondary">+ <Trans+ i18nKey={($) => $['members.transferModal.sendTip']}+ ns="workspaceMembers"+ components={{+ email: <span className="body-md-medium text-text-primary"></span>,+ }}+ values={{ email: userProfile.email }}+ />+ </div>+ </div>+ </DialogBody>+ <DialogFooter className="flex-col items-stretch">+ <Button variant="primary" loading={isSendingCode} onClick={sendCodeToOriginEmail}>+ {t(($) => $['members.transferModal.sendVerifyCode'], { ns: 'workspaceMembers' })}+ </Button>+ <DialogClose render={<Button />}>+ {t(($) => $['operation.cancel'], { ns: 'common' })}+ </DialogClose>+ </DialogFooter>+ </>+ )}+ {step === STEP.verify && (+ <>+ <DialogHeader>+ <DialogTitle>+ {t(($) => $['members.transferModal.verifyEmail'], { ns: 'workspaceMembers' })}+ </DialogTitle>+ <DialogHeaderCloseButton+ aria-label={t(($) => $['operation.close'], { ns: 'common' })}+ />+ </DialogHeader>+ <DialogBody>+ <div className="pt-1 pb-2">+ <div className="body-md-regular text-text-secondary">+ <Trans+ i18nKey={($) => $['members.transferModal.verifyContent']}+ ns="workspaceMembers"+ components={{+ email: <span className="body-md-medium text-text-primary"></span>,+ }}+ values={{ email: userProfile.email }}+ />+ </div>+ <div className="body-md-regular text-text-secondary">+ {t(($) => $['members.transferModal.verifyContent2'], { ns: 'workspaceMembers' })}+ </div>+ </div>+ <div className="pt-3">+ <label+ htmlFor={verificationCodeInputId}+ className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary"+ >+ {t(($) => $['members.transferModal.codeLabel'], { ns: 'workspaceMembers' })}+ </label>+ <Input+ id={verificationCodeInputId}+ name="verification-code"+ inputMode="numeric"+ autoComplete="one-time-code"+ className="w-full!"+ placeholder={t(($) => $['members.transferModal.codePlaceholder'], {+ ns: 'workspaceMembers',+ })}+ value={code}+ onChange={(e) => setCode(e.target.value)}+ maxLength={6}+ />+ </div>+ </DialogBody>+ <DialogFooter className="flex-col items-stretch">+ <Button+ disabled={code.length !== 6}+ variant="primary"+ onClick={handleVerifyOriginEmail}+ >+ {t(($) => $['members.transferModal.continue'], { ns: 'workspaceMembers' })}+ </Button>+ <DialogClose render={<Button />}>+ {t(($) => $['operation.cancel'], { ns: 'common' })}+ </DialogClose>+ <div className="flex items-center gap-1 system-xs-regular text-text-tertiary">+ <span>+ {t(($) => $['members.transferModal.resendTip'], { ns: 'workspaceMembers' })}+ </span>+ {time > 0 && (+ <span>+ {t(($) => $['members.transferModal.resendCount'], {+ ns: 'workspaceMembers',+ count: time,+ })}+ </span>+ )}+ {!time && (+ <button+ type="button"+ onClick={sendCodeToOriginEmail}+ disabled={isSendingCode}+ className="cursor-pointer border-none bg-transparent p-0 text-start system-xs-medium text-text-accent-secondary"+ >+ {t(($) => $['members.transferModal.resend'], { ns: 'workspaceMembers' })}+ </button>+ )}+ </div>+ </DialogFooter>+ </>+ )}+ {step === STEP.transfer && (+ <>+ <DialogHeader>+ <DialogTitle>+ {t(($) => $['members.transferModal.title'], { ns: 'workspaceMembers' })}+ </DialogTitle>+ <DialogHeaderCloseButton+ aria-label={t(($) => $['operation.close'], { ns: 'common' })}+ />+ </DialogHeader>+ <DialogBody>+ <div className="space-y-1 pt-1 pb-2">+ <div className="body-md-medium text-text-destructive">+ {t(($) => $['members.transferModal.warning'], {+ ns: 'workspaceMembers',+ workspace: currentWorkspace.name.replace(/'/g, '’'),+ })}+ </div>+ <div className="body-md-regular text-text-secondary">+ {t(($) => $['members.transferModal.warningTip'], { ns: 'workspaceMembers' })}+ </div>+ </div>+ <div className="pt-3">+ <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">+ {t(($) => $['members.transferModal.transferLabel'], { ns: 'workspaceMembers' })}+ </div>+ <MemberSelector exclude={[userProfile.id]} value={newOwner} onSelect={setNewOwner} />+ </div>+ </DialogBody>+ <DialogFooter className="flex-col items-stretch">+ <Button+ disabled={!newOwner || isTransfer}+ variant="primary"+ tone="destructive"+ onClick={handleTransfer}+ >+ {t(($) => $['members.transferModal.transfer'], { ns: 'workspaceMembers' })}+ </Button>+ <DialogClose render={<Button />}>+ {t(($) => $['operation.cancel'], { ns: 'common' })}+ </DialogClose>+ </DialogFooter>+ </>+ )}+ </>+ )+}+export default TransferOwnershipContentdiff --git a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsx b/web/app/components/header/account-setting/members-page/transfer-ownership-content/member-selector.tsxsimilarity index 100%rename from web/app/components/header/account-setting/members-page/transfer-ownership-modal/member-selector.tsxrename to web/app/components/header/account-setting/members-page/transfer-ownership-content/member-selector.tsxdiff --git a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx b/web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsxdeleted file mode 100644index a3721d9515d..00000000000--- a/web/app/components/header/account-setting/members-page/transfer-ownership-modal/index.tsx+++ /dev/null@@ -1,302 +0,0 @@-import { Button } from '@langgenius/dify-ui/button'-import {- Dialog,- DialogBody,- DialogContent,- DialogFooter,- DialogHeader,- DialogHeaderCloseButton,- DialogTitle,-} from '@langgenius/dify-ui/dialog'-import { Input } from '@langgenius/dify-ui/input'-import { useSuspenseQuery } from '@tanstack/react-query'-import { useAtomValue } from 'jotai'-import * as React from 'react'-import { useCallback, useState } from 'react'-import { Trans, useTranslation } from 'react-i18next'-import { toast } from '@/app/notifications'-import { currentWorkspaceAtom } from '@/context/workspace-state'-import { userProfileQueryOptions } from '@/features/account-profile/client'-import { consoleClient } from '@/service/console'-import { getErrorMessage } from '@/utils/error-message'-import MemberSelector from './member-selector'--type Props = Readonly<{- show: boolean- onClose: () => void-}>-const STEP = {- start: 'start',- verify: 'verify',- transfer: 'transfer',-}-type Step = (typeof STEP)[keyof typeof STEP]--const TransferOwnershipModal = ({ onClose, show }: Props) => {- const { t } = useTranslation(['common', 'workspaceMembers'])- const verificationCodeInputId = React.useId()- const currentWorkspace = useAtomValue(currentWorkspaceAtom)- const { data: userProfile } = useSuspenseQuery({- ...userProfileQueryOptions(),- select: (data) => data.profile,- })- const [step, setStep] = useState<Step>(STEP.start)- const [code, setCode] = useState<string>('')- const [time, setTime] = useState<number>(0)- const [stepToken, setStepToken] = useState<string>('')- const [newOwner, setNewOwner] = useState<string>('')- const [isTransfer, setIsTransfer] = useState<boolean>(false)- const timerIdRef = React.useRef<number | undefined>(undefined)- const retimeCountdown = useCallback((timerId?: number) => {- if (timerIdRef.current !== undefined) window.clearInterval(timerIdRef.current)- timerIdRef.current = timerId- }, [])- React.useEffect(() => {- if (!show) retimeCountdown()- return retimeCountdown- }, [retimeCountdown, show])- const startCount = () => {- setTime(60)- retimeCountdown(- window.setInterval(() => {- setTime((prev) => {- if (prev <= 1) {- retimeCountdown()- return 0- }- return prev - 1- })- }, 1000),- )- }- const sendEmail = async () => {- const res = await consoleClient.workspaces.current.members.sendOwnerTransferConfirmEmail.post({- body: {},- })- startCount()- if (res.data) setStepToken(res.data)- }- const verifyEmailAddress = async (code: string, token: string, callback?: () => void) => {- try {- const res = await consoleClient.workspaces.current.members.ownerTransferCheck.post({- body: { code, token },- })- if (res.is_valid) {- setStepToken(res.token)- callback?.()- } else {- toast.error('Verifying email failed')- }- } catch (error) {- toast.error(`Error verifying email: ${getErrorMessage(error) ?? ''}`)- }- }- const sendCodeToOriginEmail = async () => {- try {- await sendEmail()- setStep(STEP.verify)- } catch {- // The base service layer already surfaces the backend error (e.g. rate-limit) as a toast.- }- }- const handleVerifyOriginEmail = async () => {- await verifyEmailAddress(code, stepToken, () => setStep(STEP.transfer))- setCode('')- }- const handleTransfer = async () => {- setIsTransfer(true)- try {- await consoleClient.workspaces.current.members.byMemberId.ownerTransfer.post({- params: { member_id: newOwner },- body: { token: stepToken },- })- globalThis.location.reload()- } catch (error) {- toast.error(`Error ownership transfer: ${getErrorMessage(error) ?? ''}`)- } finally {- setIsTransfer(false)- }- }- return (- <Dialog- open={show}- onOpenChange={(open) => {- if (!open) onClose()- }}- disablePointerDismissal- >- <DialogContent className="w-105">- {step === STEP.start && (- <>- <DialogHeader>- <DialogTitle>- {t(($) => $['members.transferModal.title'], { ns: 'workspaceMembers' })}- </DialogTitle>- <DialogHeaderCloseButton- aria-label={t(($) => $['operation.close'], { ns: 'common' })}- />- </DialogHeader>- <DialogBody>- <div className="space-y-1 pt-1 pb-2">- <div className="body-md-medium text-text-destructive">- {t(($) => $['members.transferModal.warning'], {- ns: 'workspaceMembers',- workspace: currentWorkspace.name.replace(/'/g, '’'),- })}- </div>- <div className="body-md-regular text-text-secondary">- {t(($) => $['members.transferModal.warningTip'], { ns: 'workspaceMembers' })}- </div>- <div className="body-md-regular text-text-secondary">- <Trans- i18nKey={($) => $['members.transferModal.sendTip']}- ns="workspaceMembers"- components={{- email: <span className="body-md-medium text-text-primary"></span>,- }}- values={{ email: userProfile.email }}- />- </div>- </div>- </DialogBody>- <DialogFooter className="flex-col items-stretch">- <Button variant="primary" onClick={sendCodeToOriginEmail}>- {t(($) => $['members.transferModal.sendVerifyCode'], { ns: 'workspaceMembers' })}- </Button>- <Button onClick={onClose}>{t(($) => $['operation.cancel'], { ns: 'common' })}</Button>- </DialogFooter>- </>- )}- {step === STEP.verify && (- <>- <DialogHeader>- <DialogTitle>- {t(($) => $['members.transferModal.verifyEmail'], { ns: 'workspaceMembers' })}- </DialogTitle>- <DialogHeaderCloseButton- aria-label={t(($) => $['operation.close'], { ns: 'common' })}- />- </DialogHeader>- <DialogBody>- <div className="pt-1 pb-2">- <div className="body-md-regular text-text-secondary">- <Trans- i18nKey={($) => $['members.transferModal.verifyContent']}- ns="workspaceMembers"- components={{- email: <span className="body-md-medium text-text-primary"></span>,- }}- values={{ email: userProfile.email }}- />- </div>- <div className="body-md-regular text-text-secondary">- {t(($) => $['members.transferModal.verifyContent2'], { ns: 'workspaceMembers' })}- </div>- </div>- <div className="pt-3">- <label- htmlFor={verificationCodeInputId}- className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary"- >- {t(($) => $['members.transferModal.codeLabel'], { ns: 'workspaceMembers' })}- </label>- <Input- id={verificationCodeInputId}- name="verification-code"- inputMode="numeric"- autoComplete="one-time-code"- className="w-full!"- placeholder={t(($) => $['members.transferModal.codePlaceholder'], {- ns: 'workspaceMembers',- })}- value={code}- onChange={(e) => setCode(e.target.value)}- maxLength={6}- />- </div>- </DialogBody>- <DialogFooter className="flex-col items-stretch">- <Button- disabled={code.length !== 6}- variant="primary"- onClick={handleVerifyOriginEmail}- >- {t(($) => $['members.transferModal.continue'], { ns: 'workspaceMembers' })}- </Button>- <Button onClick={onClose}>{t(($) => $['operation.cancel'], { ns: 'common' })}</Button>- <div className="flex items-center gap-1 system-xs-regular text-text-tertiary">- <span>- {t(($) => $['members.transferModal.resendTip'], { ns: 'workspaceMembers' })}- </span>- {time > 0 && (- <span>- {t(($) => $['members.transferModal.resendCount'], {- ns: 'workspaceMembers',- count: time,- })}- </span>- )}- {!time && (- <button- type="button"- onClick={sendCodeToOriginEmail}- className="cursor-pointer border-none bg-transparent p-0 text-start system-xs-medium text-text-accent-secondary"- >- {t(($) => $['members.transferModal.resend'], { ns: 'workspaceMembers' })}- </button>- )}- </div>- </DialogFooter>- </>- )}- {step === STEP.transfer && (- <>- <DialogHeader>- <DialogTitle>- {t(($) => $['members.transferModal.title'], { ns: 'workspaceMembers' })}- </DialogTitle>- <DialogHeaderCloseButton- aria-label={t(($) => $['operation.close'], { ns: 'common' })}- />- </DialogHeader>- <DialogBody>- <div className="space-y-1 pt-1 pb-2">- <div className="body-md-medium text-text-destructive">- {t(($) => $['members.transferModal.warning'], {- ns: 'workspaceMembers',- workspace: currentWorkspace.name.replace(/'/g, '’'),- })}- </div>- <div className="body-md-regular text-text-secondary">- {t(($) => $['members.transferModal.warningTip'], { ns: 'workspaceMembers' })}- </div>- </div>- <div className="pt-3">- <div className="mb-1 flex h-6 items-center system-sm-medium text-text-secondary">- {t(($) => $['members.transferModal.transferLabel'], { ns: 'workspaceMembers' })}- </div>- <MemberSelector- exclude={[userProfile.id]}- value={newOwner}- onSelect={setNewOwner}- />- </div>- </DialogBody>- <DialogFooter className="flex-col items-stretch">- <Button- disabled={!newOwner || isTransfer}- variant="primary"- tone="destructive"- onClick={handleTransfer}- >- {t(($) => $['members.transferModal.transfer'], { ns: 'workspaceMembers' })}- </Button>- <Button onClick={onClose}>{t(($) => $['operation.cancel'], { ns: 'common' })}</Button>- </DialogFooter>- </>- )}- </DialogContent>- </Dialog>- )-}-export default TransferOwnershipModaldiff --git a/web/app/components/header/account-setting/workspace-role-checkbox-list.tsx b/web/app/components/header/account-setting/workspace-role-checkbox-list.tsxindex fe34e72f1f5..d62989631bb 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@@ -1,5 +1,6 @@'use client'+import type { Ref } from 'react'import type { Role } from '@/models/access-control'import { Checkbox } from '@langgenius/dify-ui/checkbox'import { cn } from '@langgenius/dify-ui/cn'@@ -23,6 +24,7 @@ import {} from './workspace-role-list-query'type WorkspaceRoleCheckboxListProps = {+ searchInputRef?: Ref<HTMLInputElement>selectedRoleIds: string[]selectedRoles?: Role[]allowMultipleRoles?: boolean@@ -54,6 +56,7 @@ const getLegacyRoleDescriptionKey = (role: Role) => {}const WorkspaceRoleCheckboxList = ({+ searchInputRef,selectedRoleIds,selectedRoles,allowMultipleRoles = true,@@ -210,6 +213,7 @@ const WorkspaceRoleCheckboxList = ({<><div className="shrink-0 px-6 pt-3 pb-2"><SearchInput+ ref={searchInputRef}name="workspace-role-query"value={keyword}onValueChange={setKeyword}@@ -219,7 +223,7 @@ const WorkspaceRoleCheckboxList = ({</div><ScrollArea className="min-h-0 flex-1">- <ScrollAreaViewport ref={containerRef} className="overscroll-contain px-3">+ <ScrollAreaViewport ref={containerRef} className="overscroll-contain px-6"><ScrollAreaContent><divrole="status"@@ -276,16 +280,12 @@ const WorkspaceRoleCheckboxList = ({value={role.id}disabled={disabled}nativeButton- render={- <button- type="button"- className={cn(- 'flex w-full cursor-pointer items-start gap-3 rounded-lg border-0 bg-transparent px-3 py-2.5 text-left hover:bg-state-base-hover focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-components-input-border-active',- 'data-checked:bg-state-accent-hover data-checked:hover:bg-state-accent-hover',- 'data-disabled:cursor-not-allowed data-disabled:opacity-50 data-disabled:hover:bg-transparent data-checked:data-disabled:hover:bg-transparent',- )}- />- }+ className={cn(+ 'flex w-full cursor-pointer items-start gap-3 rounded-lg border-0 bg-transparent px-3 py-2.5 text-start hover:bg-state-base-hover focus-visible:inset-ring-2 focus-visible:inset-ring-state-accent-solid focus-visible:outline-hidden',+ 'data-checked:bg-state-accent-hover data-checked:hover:bg-state-accent-hover',+ 'data-disabled:cursor-not-allowed data-disabled:opacity-50 data-disabled:hover:bg-transparent data-checked:data-disabled:hover:bg-transparent',+ )}+ render={<button type="button" />}><RadioControl className="pointer-events-none mt-0.5" />{renderRoleText(role)}