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
refactor(web): keep invitation requests in the dialog owner (#43515)
yyh725b8e36a447
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 7109277d06a..f9e14b93d39 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@@ -1,13 +1,13 @@-import type { ReactElement } from 'react'import type { Role } from '@/models/access-control'import type { Member } from '@/models/common'import type { ConsoleQueryTestOptions } from '@/test/console/query-data'import type { ConsoleStateFixture } from '@/test/console/state-fixture'-import { screen, within } from '@testing-library/react'+import { screen, waitFor, within } from '@testing-library/react'import userEvent from '@testing-library/user-event'import { vi } from 'vite-plus/test'import { useFormatTimeFromNow } from '@/hooks/use-format-time-from-now'import { useUpdateRolesOfMember } from '@/service/access-control/use-member-roles'+import { useWorkspaceRoleList } from '@/service/access-control/use-workspace-roles'import { useMembers } from '@/service/use-common'import { renderWithConsoleQuery } from '@/test/console/query-data'import MembersPage from '../index'@@ -32,6 +32,35 @@ vi.mock('@/context/permission-state', async () => {vi.mock('@/hooks/use-format-time-from-now')vi.mock('@/service/access-control/use-member-roles')vi.mock('@/service/use-common')+vi.mock('@/service/access-control/use-workspace-roles')+const { inviteMember } = vi.hoisted(() => ({ inviteMember: vi.fn() }))+vi.mock('@/service/console', async (importOriginal) => {+ const actual = await importOriginal<typeof import('@/service/console')>()+ return {+ ...actual,+ consoleQuery: new Proxy(actual.consoleQuery, {+ get(target, key) {+ if (key !== 'workspaces') return Reflect.get(target, key)+ return {+ current: {+ summary: target.workspaces.current.summary,+ members: {+ inviteEmail: {+ post: {+ mutationOptions: (+ options: Parameters<+ typeof actual.consoleQuery.workspaces.current.members.inviteEmail.post.mutationOptions+ >[0],+ ) => ({ ...options, mutationFn: inviteMember }),+ },+ },+ },+ },+ }+ },+ }),+ }+})const renderMembersPage = () =>renderWithConsoleQuery(<MembersPage />, {@@ -71,47 +100,6 @@ vi.mock('../edit-workspace-modal', () => ({</div>),}))-vi.mock('../invite-modal', () => ({- InviteModal: ({- open,- trigger,- onOpenChange,- onSend,- }: {- open: boolean- trigger: ReactElement<{ disabled?: boolean }>- onOpenChange: (open: boolean) => void- onSend: (results: Array<{ email: string; status: 'success'; url: string }>) => void- }) => (- <div>- <button disabled={trigger.props.disabled} onClick={() => onOpenChange(true)}>- Invite- </button>- {open && (- <div>- <div>Invite Modal</div>- <button onClick={() => onOpenChange(false)}>Close Invite Modal</button>- <button- onClick={() => {- onOpenChange(false)- onSend([{ email: '[email protected]', status: 'success', url: 'http://invite/link' }])- }}- >- Send Invite Results- </button>- </div>- )}- </div>- ),-}))-vi.mock('../invited-modal', () => ({- default: ({ onCancel }: { onCancel: () => void }) => (- <div>- <div>Invited Modal</div>- <button onClick={onCancel}>Close Invited Modal</button>- </div>- ),-}))vi.mock('../role-badges', () => ({default: ({ roleNames }: { roleNames: string[] }) => (<div data-testid="role-badges">{roleNames.join(',')}</div>@@ -243,6 +231,21 @@ describe('MembersPage', () => {mutateAsync: mockUpdateRolesOfMember,} as unknown as ReturnType<typeof useUpdateRolesOfMember>)+ inviteMember.mockResolvedValue({+ result: 'success',+ tenant_id: 'tenant-id',+ invitation_results: [+ { email: '[email protected]', status: 'success', url: 'http://invite/link' },+ ],+ })+ vi.mocked(useWorkspaceRoleList).mockReturnValue({+ data: { pages: [{ data: [createRole({ id: 'admin', name: 'Admin' })] }] },+ isLoading: false,+ error: null,+ hasNextPage: false,+ isFetchingNextPage: false,+ fetchNextPage: vi.fn(),+ } as unknown as ReturnType<typeof useWorkspaceRoleList>)deploymentEdition = 'COMMUNITY'memberFeatures = { ...memberFeatures, is_allow_transfer_workspace: true }@@ -306,24 +309,33 @@ describe('MembersPage', () => {renderMembersPage()await user.click(screen.getByRole('button', { name: /invite/i }))- expect(screen.getByText('Invite Modal'))!.toBeInTheDocument()+ expect(screen.getByRole('dialog', { name: /members\.inviteTeamMember$/ })).toBeInTheDocument()- await user.click(screen.getByRole('button', { name: 'Close Invite Modal' }))- expect(screen.queryByText('Invite Modal')).not.toBeInTheDocument()+ await user.click(screen.getByRole('button', { name: /operation\.close$/ }))+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())})it('should open invited modal after invite results are sent', async () => {const user = userEvent.setup()- renderMembersPage()-- await user.click(screen.getByRole('button', { name: /invite/i }))- await user.click(screen.getByRole('button', { name: 'Send Invite Results' }))+ const { queryClient } = renderMembersPage()+ vi.spyOn(queryClient, 'invalidateQueries').mockResolvedValue()- expect(screen.getByText('Invited Modal'))!.toBeInTheDocument()+ await user.click(screen.getByRole('button', { name: /members\.invite$/ }))+ await user.type(+ screen.getByRole('textbox', { name: /members\.emailRecipients/ }),+ '[email protected]',+ )+ await user.click(screen.getByRole('combobox', { name: /members\.role/ }))+ await user.click(screen.getByRole('option', { name: /Admin/ }))+ await user.click(screen.getByRole('button', { name: /members\.sendInvite/ }))- await user.click(screen.getByRole('button', { name: 'Close Invited Modal' }))- expect(screen.queryByText('Invited Modal')).not.toBeInTheDocument()+ expect(+ await screen.findByRole('dialog', { name: /members\.invitationSent$/ }),+ ).toBeInTheDocument()+ expect(screen.getByRole('button', { name: 'http://invite/link' })).toBeInTheDocument()+ await user.click(screen.getByRole('button', { name: /members\.ok$/ }))+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())})it('should open transfer ownership modal when transfer action is used', async () => {@@ -702,7 +714,7 @@ describe('MembersPage', () => {renderMembersPage()expect(screen.getByText('Upgrade Button'))!.toBeInTheDocument()- await user.click(screen.getByRole('button', { name: 'Invite' }))- expect(screen.getByText('Invite Modal')).toBeInTheDocument()+ await user.click(screen.getByRole('button', { name: /members\.invite$/ }))+ expect(screen.getByRole('dialog', { name: /members\.inviteTeamMember$/ })).toBeInTheDocument()})})diff --git a/web/app/components/header/account-setting/members-page/__tests__/invite-button.spec.tsx b/web/app/components/header/account-setting/members-page/__tests__/invite-button.spec.tsxindex 8143eda2b8f..880b820d3d3 100644--- a/web/app/components/header/account-setting/members-page/__tests__/invite-button.spec.tsx+++ b/web/app/components/header/account-setting/members-page/__tests__/invite-button.spec.tsx@@ -3,7 +3,7 @@ import { screen } from '@testing-library/react'import { vi } from 'vite-plus/test'import { useWorkspacePermissions } from '@/service/use-workspace'import { renderWithConsoleQuery } from '@/test/console/query-data'-import InviteButton from '../invite-button'+import { InviteButton } from '../invite-button'const mockConsoleStateReader = vi.hoisted(() => vi.fn())diff --git a/web/app/components/header/account-setting/members-page/index.tsx b/web/app/components/header/account-setting/members-page/index.tsxindex 5b9d9a7fa33..7741dd73d74 100644--- a/web/app/components/header/account-setting/members-page/index.tsx+++ b/web/app/components/header/account-setting/members-page/index.tsx@@ -21,7 +21,6 @@ import { consoleQuery } from '@/service/console'import { useMembers } from '@/service/use-common'import { hasPermission } from '@/utils/permission'import EditWorkspaceModal from './edit-workspace-modal'-import InviteButton from './invite-button'import { InviteModal } from './invite-modal'import InvitedModal from './invited-modal'import MemberDetailsModal from './member-details-modal'@@ -42,7 +41,6 @@ const MembersPage = () => {const workspacePermissionKeys = useAtomValue(workspacePermissionKeysAtom)const { data, refetch } = useMembers(language)const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())- const [inviteModalVisible, setInviteModalVisible] = useState(false)const [invitationResults, setInvitationResults] = useState<MemberInviteResponse['invitation_results'] | null>(null)@@ -174,10 +172,7 @@ const MembersPage = () => {<div className="shrink-0">{canManageMembers && (<InviteModal- open={inviteModalVisible}- trigger={<InviteButton />}isEmailSetup={systemFeatures.is_email_setup}- onOpenChange={setInviteModalVisible}onSend={setInvitationResults}/>)}diff --git a/web/app/components/header/account-setting/members-page/invite-button.tsx b/web/app/components/header/account-setting/members-page/invite-button.tsxindex dfe39b7446e..55f8d3b5c7d 100644--- a/web/app/components/header/account-setting/members-page/invite-button.tsx+++ b/web/app/components/header/account-setting/members-page/invite-button.tsx@@ -10,7 +10,7 @@ import { useWorkspacePermissions } from '@/service/use-workspace'type InviteButtonProps = Omit<ButtonProps, 'children' | 'variant'>-const InviteButton = (props: InviteButtonProps) => {+export function InviteButton(props: InviteButtonProps) {const { t } = useTranslation(['workspaceMembers'])const currentWorkspaceId = useAtomValue(currentWorkspaceIdAtom)const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())@@ -31,4 +31,3 @@ const InviteButton = (props: InviteButtonProps) => {</Button>)}-export default InviteButtondiff --git a/web/app/components/header/account-setting/members-page/invite-modal/README.md b/web/app/components/header/account-setting/members-page/invite-modal/README.mddeleted file mode 100644index d1cf1294cc6..00000000000--- a/web/app/components/header/account-setting/members-page/invite-modal/README.md+++ /dev/null@@ -1,7 +0,0 @@-# Member Invitations--This module owns the workspace member invitation form: recipient composition, role selection, field and form errors, request state, and the successful invitation result.--Base UI Form owns registration, validation, external field errors, and invalid-field focus. TanStack Query owns feature and role queries, the invitation mutation, and cache invalidation. Seat availability comes from `consoleQuery.features.get`; the feature does not mirror it in local or provider state.--`InviteForm` owns the email draft, parsed recipients, and current submission error. Colocated presentation components may own their transient interaction state; dialog visibility remains caller-owned.diff --git a/web/app/components/header/account-setting/members-page/invite-modal/__tests__/focus.browser.spec.tsx b/web/app/components/header/account-setting/members-page/invite-modal/__tests__/focus.browser.spec.tsxnew file mode 100644index 00000000000..490068242b2--- /dev/null+++ b/web/app/components/header/account-setting/members-page/invite-modal/__tests__/focus.browser.spec.tsx@@ -0,0 +1,109 @@+import type { MemberInviteResponse } from '@dify/contracts/api/console/workspaces/types.gen'+import type { QueryClient } from '@tanstack/react-query'+import { userEvent } from 'vite-plus/test/browser'+import { render } from 'vitest-browser-react'+import { consoleQuery } from '@/service/console'+import { commonQueryKeys } from '@/service/use-common'+import { createConsoleQueryWrapper } from '@/test/console/query-data'+import { QueryClientTestProvider } from '@/test/console/query-provider'+import MembersPage from '../../index'++const { inviteMember } = vi.hoisted(() => ({ inviteMember: vi.fn() }))+vi.mock('#i18n', () => ({ useLocale: () => 'en-US' }))+vi.mock('@/service/access-control/use-workspace-roles', () => ({+ useWorkspaceRoleList: () => ({+ data: { pages: [{ data: [{ id: 'admin', name: 'Admin', description: 'Manage members' }] }] },+ isLoading: false,+ error: null,+ hasNextPage: false,+ isFetchingNextPage: false,+ fetchNextPage: vi.fn(),+ }),+}))++let queryClient: QueryClient++beforeEach(() => {+ vi.stubGlobal('BASE_UI_ANIMATIONS_DISABLED', false)+ inviteMember.mockReset()+ queryClient = createConsoleQueryWrapper({+ systemFeatures: { deployment_edition: 'CLOUD', is_email_setup: true },+ workspacePermissionKeys: ['workspace.member.manage'],+ features: { workspace_members: { enabled: true, size: 1, limit: 10 } },+ }).queryClient+ queryClient.setQueryData([...commonQueryKeys.members, 'en'], { accounts: [] })+ vi.stubGlobal(+ 'fetch',+ vi.fn(async (input: RequestInfo | URL) => {+ const { pathname } = new URL(input instanceof Request ? input.url : String(input))+ if (pathname.endsWith('/workspaces/current/members/invite-email'))+ return Response.json(await inviteMember())+ // A successful invitation refreshes seats and members in the background.+ if (pathname.endsWith('/features'))+ return Response.json(queryClient.getQueryData(consoleQuery.features.get.queryKey()))+ if (pathname.endsWith('/workspaces/current/members')) return Response.json({ accounts: [] })+ throw new Error(`Unexpected request: ${pathname}`)+ }),+ )+})++afterEach(() => vi.unstubAllGlobals())++it.each(['click', 'Enter'] as const)(+ 'holds focus through %s submission, hands it to the results dialog and returns it to Invite',+ async (submission) => {+ let resolveInvite!: (value: MemberInviteResponse) => void+ inviteMember.mockReturnValue(+ new Promise<MemberInviteResponse>((resolve) => {+ resolveInvite = resolve+ }),+ )+ const screen = await render(+ <QueryClientTestProvider queryClient={queryClient}>+ <MembersPage />+ </QueryClientTestProvider>,+ )+ const trigger = screen.getByRole('button', { name: /members\.invite$/ })+ await trigger.click()+ const inviteDialog = screen.getByRole('dialog', { name: /members\.inviteTeamMember$/ })+ const input = screen.getByRole('textbox', { name: /members\.emailRecipients/ })+ await expect.element(input).toHaveFocus()+ await input.fill('[email protected]')+ if (submission === 'Enter') {+ await userEvent.keyboard('{Enter}')+ await expect.element(input).toHaveValue('')+ }+ await screen.getByRole('combobox', { name: /members\.role/ }).click()+ await screen.getByRole('option', { name: /Admin/ }).click()+ const submit = screen.getByRole('button', { name: /members\.sendInvite/ })+ if (submission === 'Enter') {+ await input.click()+ await userEvent.keyboard('{Enter}')+ } else {+ await submit.click()+ }++ await expect.element(submit).toHaveFocus()+ await userEvent.keyboard('{Escape}')+ const outside = document.elementFromPoint(4, 4)!+ await userEvent.click(outside, { position: { x: 4, y: 4 } })+ await userEvent.tab()+ await expect.element(submit).toHaveFocus()+ await expect.element(inviteDialog).toBeVisible()+ await expect+ .element(inviteDialog.getByRole('button', { name: /operation\.close/ }))+ .toBeDisabled()++ resolveInvite({ result: 'success', tenant_id: 'tenant-id', invitation_results: [] })+ const result = screen.getByRole('dialog', { name: /members\.invitationSent$/ })+ await expect.element(result).toBeVisible()+ await expect.element(result.getByRole('button', { name: /operation\.close/ })).toHaveFocus()+ // The closing invitation dialog must not take focus back while it exits.+ await expect.element(inviteDialog).not.toBeInTheDocument()+ expect(result.element().contains(document.activeElement)).toBe(true)++ await result.getByRole('button', { name: /members\.ok$/ }).click()+ await expect.element(result).not.toBeInTheDocument()+ await expect.element(trigger).toHaveFocus()+ },+)diff --git a/web/app/components/header/account-setting/members-page/invite-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/invite-modal/__tests__/index.spec.tsxindex 149a1d89a8d..16a5c0eab78 100644--- a/web/app/components/header/account-setting/members-page/invite-modal/__tests__/index.spec.tsx+++ b/web/app/components/header/account-setting/members-page/invite-modal/__tests__/index.spec.tsx@@ -3,9 +3,9 @@ import type { MemberInviteResponse } from '@dify/contracts/api/console/workspaceimport { QueryClient } from '@tanstack/react-query'import { act, render, screen, waitFor, within } from '@testing-library/react'import userEvent from '@testing-library/user-event'-import { useState } from 'react'import { vi } from 'vite-plus/test'import { useWorkspaceRoleList } from '@/service/access-control/use-workspace-roles'+import { seedCurrentWorkspaceQuery } from '@/test/console/current-workspace'import { seedFeatures, seedSystemFeatures } from '@/test/console/query-data'import { QueryClientTestProvider } from '@/test/console/query-provider'import { InviteModal } from '../index'@@ -30,11 +30,19 @@ vi.mock('@/service/console', async (importOriginal) => {},},workspaces: {+ ...actual.consoleQuery.workspaces,current: {+ ...actual.consoleQuery.workspaces.current,+ summary: actual.consoleQuery.workspaces.current.summary,members: {+ ...actual.consoleQuery.workspaces.current.members,inviteEmail: {post: {- mutationOptions: () => ({ mutationFn: inviteMember }),+ mutationOptions: (+ options: Parameters<+ typeof actual.consoleQuery.workspaces.current.members.inviteEmail.post.mutationOptions+ >[0],+ ) => ({ ...options, mutationFn: inviteMember }),},},},@@ -45,7 +53,6 @@ vi.mock('@/service/console', async (importOriginal) => {})describe('InviteModal', () => {- const onOpenChange = vi.fn()const onSend = vi.fn()const createQueryClient = () =>@@ -104,7 +111,7 @@ describe('InviteModal', () => {} as unknown as ReturnType<typeof useWorkspaceRoleList>)})- const renderModal = ({+ const renderModal = async ({open = true,isEmailSetup = true,queryClient = createQueryClient(),@@ -115,21 +122,18 @@ describe('InviteModal', () => {queryClient?: QueryClientworkspaceMembers?: GetFeaturesResponse['workspace_members']} = {}) => {+ seedCurrentWorkspaceQuery(queryClient)seedSystemFeatures(queryClient, { deployment_edition: 'CLOUD' })const features = seedFeatures(queryClient, { workspace_members: workspaceMembers })fetchFeatures.mockResolvedValue(features)- return render(+ const result = render(<QueryClientTestProvider queryClient={queryClient}>- <InviteModal- open={open}- trigger={<button type="button">members.invite</button>}- isEmailSetup={isEmailSetup}- onOpenChange={onOpenChange}- onSend={onSend}- />+ <InviteModal isEmailSetup={isEmailSetup} onSend={onSend} /></QueryClientTestProvider>,)+ if (open) await userEvent.click(screen.getByRole('button', { name: /members\.invite$/i }))+ return result}const selectAdminRole = async (user: ReturnType<typeof userEvent.setup>) => {@@ -143,8 +147,8 @@ describe('InviteModal', () => {await user.paste(value)}- it('renders a labeled form inside a controlled dialog', () => {- renderModal()+ it('renders a labeled form inside a business dialog', async () => {+ await renderModal()const dialog = screen.getByRole('dialog', { name: /members\.inviteTeamMember$/i })expect(within(dialog).getByText(/members\.inviteTeamMemberTip/i)).toBeInTheDocument()@@ -155,7 +159,7 @@ describe('InviteModal', () => {})it('should place initial focus in the email composer', async () => {- renderModal()+ await renderModal()await waitFor(() => {expect(screen.getByRole('textbox', { name: /members\.emailRecipients/i })).toHaveFocus()@@ -164,7 +168,7 @@ describe('InviteModal', () => {it('should focus the email field first when the untouched form is submitted with Enter', async () => {const user = userEvent.setup()- renderModal()+ await renderModal()const input = screen.getByRole('textbox', { name: /members\.emailRecipients/i })await waitFor(() => expect(input).toHaveFocus())@@ -176,14 +180,14 @@ describe('InviteModal', () => {expect(inviteMember).not.toHaveBeenCalled()})- it('does not render dialog content while controlled closed', () => {- renderModal({ open: false })+ it('does not render dialog content until the invitation trigger is activated', async () => {+ await renderModal({ open: false })expect(screen.queryByRole('dialog')).not.toBeInTheDocument()})- it('shows the email service warning in the form', () => {- renderModal({ isEmailSetup: false })+ it('shows the email service warning in the form', async () => {+ await renderModal({ isEmailSetup: false })expect(screen.getByText(/members\.emailNotSetup/i)).toBeInTheDocument()})@@ -195,9 +199,7 @@ describe('InviteModal', () => {invitation_results: [],tenant_id: 'tenant-id',} satisfies MemberInviteResponse)- const queryClient = createQueryClient()- const invalidateQueries = vi.spyOn(queryClient, 'invalidateQueries')- renderModal({ queryClient })+ await renderModal()await selectAdminRole(user)@@ -212,8 +214,7 @@ describe('InviteModal', () => {},})})- expect(invalidateQueries).toHaveBeenCalledWith({ queryKey: ['features'] })- expect(onOpenChange).toHaveBeenCalledWith(false)+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())expect(onSend).toHaveBeenCalledWith([])})@@ -224,7 +225,7 @@ describe('InviteModal', () => {invitation_results: [],tenant_id: 'tenant-id',} satisfies MemberInviteResponse)- renderModal()+ await renderModal()await selectAdminRole(user)const input = screen.getByRole('textbox', { name: /members\.emailRecipients/i })@@ -250,7 +251,7 @@ describe('InviteModal', () => {invitation_results: [],tenant_id: 'tenant-id',} satisfies MemberInviteResponse)- renderModal()+ await renderModal()await selectAdminRole(user)const input = screen.getByRole('textbox', { name: /members\.emailRecipients/i })@@ -277,7 +278,7 @@ describe('InviteModal', () => {resolveInvite = resolve}),)- renderModal()+ await renderModal()await selectAdminRole(user)const input = screen.getByRole('textbox', { name: /members\.emailRecipients/i })@@ -306,7 +307,7 @@ describe('InviteModal', () => {invitation_results: [],tenant_id: 'tenant-id',} satisfies MemberInviteResponse)- renderModal()+ await renderModal()await selectAdminRole(user)const input = screen.getByRole('textbox', { name: /members\.emailRecipients/i })@@ -338,7 +339,7 @@ describe('InviteModal', () => {invitation_results: [],tenant_id: 'tenant-id',} satisfies MemberInviteResponse)- renderModal()+ await renderModal()const input = screen.getByRole('textbox', { name: /members\.emailRecipients/i })await user.type(input, 'person@example{Enter}')@@ -350,7 +351,7 @@ describe('InviteModal', () => {it('keeps invalid recipients visible and blocks the whole submission', async () => {const user = userEvent.setup()- renderModal()+ await renderModal()await addRecipients(user, '[email protected], invalid-email')await selectAdminRole(user)@@ -368,7 +369,7 @@ describe('InviteModal', () => {invitation_results: [],tenant_id: 'tenant-id',} satisfies MemberInviteResponse)- renderModal()+ await renderModal()await selectAdminRole(user)const input = screen.getByRole('textbox', { name: /members\.emailRecipients/i })@@ -399,7 +400,7 @@ describe('InviteModal', () => {it('shows the required error and focuses the email field after an empty submission', async () => {const user = userEvent.setup()- renderModal()+ await renderModal()await selectAdminRole(user)await user.click(screen.getByRole('button', { name: /members\.sendInvite/i }))@@ -416,7 +417,7 @@ describe('InviteModal', () => {invitation_results: [],tenant_id: 'tenant-id',} satisfies MemberInviteResponse)- renderModal()+ await renderModal()const input = screen.getByRole('textbox', { name: /members\.emailRecipients/i })await user.type(input, '[email protected]')@@ -452,7 +453,7 @@ describe('InviteModal', () => {resolveInvite = resolve}),)- renderModal()+ await renderModal()await addRecipients(user, '[email protected], [email protected]')await selectAdminRole(user)@@ -470,6 +471,11 @@ describe('InviteModal', () => {)})expect(inviteMember).toHaveBeenCalledOnce()+ expect(screen.getByRole('button', { name: /operation\.close/ })).toBeDisabled()+ await user.keyboard('{Escape}')+ expect(screen.getByRole('dialog')).toBeInTheDocument()+ await user.click(screen.getByRole('button', { name: /members\.sendInvite/ }))+ expect(inviteMember).toHaveBeenCalledOnce()await act(async () => {resolveInvite({@@ -480,6 +486,25 @@ describe('InviteModal', () => {})})+ it('closes once the invitation succeeds without waiting for the seat refresh', async () => {+ const user = userEvent.setup()+ inviteMember.mockResolvedValue({+ result: 'success',+ invitation_results: [],+ tenant_id: 'tenant-id',+ })+ await renderModal()+ // The refresh started by a successful invitation never settles.+ fetchFeatures.mockReturnValue(new Promise(() => {}))+ await addRecipients(user, '[email protected]')+ await selectAdminRole(user)+ await user.click(screen.getByRole('button', { name: /members\.sendInvite/ }))++ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ expect(onSend).toHaveBeenCalledExactlyOnceWith([])+ await waitFor(() => expect(fetchFeatures).toHaveBeenCalled())+ })+it('warns but lets the backend decide whether recipients consume remaining seats', async () => {const user = userEvent.setup()inviteMember.mockResolvedValue({@@ -487,7 +512,7 @@ describe('InviteModal', () => {invitation_results: [],tenant_id: 'tenant-id',} satisfies MemberInviteResponse)- renderModal({ workspaceMembers: { enabled: true, size: 9, limit: 10 } })+ await renderModal({ workspaceMembers: { enabled: true, size: 9, limit: 10 } })await addRecipients(user, '[email protected], [email protected]')await selectAdminRole(user)@@ -501,7 +526,7 @@ describe('InviteModal', () => {it('counts a manually typed recipient list before it is committed', async () => {const user = userEvent.setup()- renderModal({ workspaceMembers: { enabled: true, size: 9, limit: 10 } })+ await renderModal({ workspaceMembers: { enabled: true, size: 9, limit: 10 } })const input = screen.getByRole('textbox', { name: /members\.emailRecipients/i })await user.type(input, '[email protected],[email protected]')@@ -525,7 +550,7 @@ describe('InviteModal', () => {code: 'BAD_REQUEST',data: { body: { code, message: 'Backend message' } },})- renderModal()+ await renderModal()await addRecipients(user, '[email protected], [email protected]')await selectAdminRole(user)@@ -538,7 +563,7 @@ describe('InviteModal', () => {name: fieldName === 'emails' ? /members\.emailRecipients/i : /members\.role/i,}),).toHaveFocus()- expect(onOpenChange).not.toHaveBeenCalled()+ expect(screen.getByRole('dialog')).toBeInTheDocument()})it('keeps a role server error visible when the user only opens the selector', async () => {@@ -547,7 +572,7 @@ describe('InviteModal', () => {code: 'BAD_REQUEST',data: { body: { code: 'invalid_role', message: 'Backend message' } },})- renderModal()+ await renderModal()await addRecipients(user, '[email protected]')await selectAdminRole(user)@@ -564,6 +589,33 @@ describe('InviteModal', () => {expect(screen.queryByText(/members\.invalidRole/i)).not.toBeInTheDocument()})+ it('moves focus to the recipients when the server rejects them after the form was frozen', async () => {+ const user = userEvent.setup()+ let rejectInvite!: (error: unknown) => void+ inviteMember.mockReturnValue(+ new Promise((_resolve, reject) => {+ rejectInvite = reject+ }),+ )+ await renderModal()+ await addRecipients(user, '[email protected]')+ await selectAdminRole(user)+ await user.click(screen.getByRole('button', { name: /members\.sendInvite/i }))+ const input = screen.getByRole('textbox', { name: /members\.emailRecipients/i })+ await waitFor(() => expect(input).toBeDisabled())++ await act(async () =>+ rejectInvite({+ code: 'BAD_REQUEST',+ data: { body: { code: 'limit_exceeded', message: 'Backend message' } },+ }),+ )++ expect(await screen.findByText(/members\.inviteLimitExceeded/i)).toBeInTheDocument()+ expect(input).toBeEnabled()+ await waitFor(() => expect(input).toHaveFocus())+ })+it('should clear an email server error when the user edits and successfully retries', async () => {const user = userEvent.setup()inviteMember@@ -576,7 +628,7 @@ describe('InviteModal', () => {invitation_results: [],tenant_id: 'tenant-id',} satisfies MemberInviteResponse)- renderModal()+ await renderModal()await addRecipients(user, '[email protected], [email protected]')await selectAdminRole(user)@@ -614,7 +666,7 @@ describe('InviteModal', () => {invitation_results: [],tenant_id: 'tenant-id',} satisfies MemberInviteResponse)- renderModal()+ await renderModal()await addRecipients(user, '[email protected], [email protected]')await selectAdminRole(user)@@ -641,50 +693,41 @@ describe('InviteModal', () => {})})- it('keeps unknown request failures as a persistent form error', async () => {+ it('keeps request failures visible until the user closes, then starts a fresh draft', async () => {const user = userEvent.setup()inviteMember.mockRejectedValue(new Error('Network failed'))- renderModal()+ await renderModal()await addRecipients(user, '[email protected], [email protected]')await selectAdminRole(user)await user.click(screen.getByRole('button', { name: /members\.sendInvite/i }))expect((await screen.findByRole('alert')).textContent).toMatch(/members\.inviteFailed/i)- expect(onOpenChange).not.toHaveBeenCalled()+ expect(screen.getByRole('dialog')).toBeInTheDocument()+ await user.click(screen.getByRole('button', { name: /operation\.close/ }))+ const trigger = screen.getByRole('button', { name: /members\.invite$/ })+ await waitFor(() => expect(trigger).toHaveFocus())+ await user.click(trigger)+ expect(screen.queryByRole('alert')).not.toBeInTheDocument()+ expect(screen.queryByText('[email protected]')).not.toBeInTheDocument()+ expect(screen.getByRole('textbox', { name: /members\.emailRecipients/ })).toHaveValue('')+ expect(screen.getByRole('combobox', { name: /members\.role/ }).textContent).toMatch(+ /members\.selectRole/,+ )})- it('routes close actions through the controlled state owner', async () => {+ it('closes through its own close button', async () => {const user = userEvent.setup()- renderModal()+ await renderModal()await user.click(screen.getByRole('button', { name: /operation\.close/i }))- expect(onOpenChange).toHaveBeenCalledWith(false)+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())})- it('resets the form after a controlled close', async () => {+ it('resets the popup draft after closing and reopening', async () => {const user = userEvent.setup()- const queryClient = createQueryClient()- seedSystemFeatures(queryClient, { deployment_edition: 'CLOUD' })- const features = seedFeatures(queryClient)- fetchFeatures.mockResolvedValue(features)- const ControlledInviteModal = () => {- const [open, setOpen] = useState(false)-- return (- <QueryClientTestProvider queryClient={queryClient}>- <InviteModal- open={open}- trigger={<button type="button">members.invite</button>}- isEmailSetup- onOpenChange={setOpen}- onSend={onSend}- />- </QueryClientTestProvider>- )- }- render(<ControlledInviteModal />)+ await renderModal({ open: false })const trigger = screen.getByRole('button', { name: /members\.invite$/i })await user.click(trigger)diff --git a/web/app/components/header/account-setting/members-page/invite-modal/index.tsx b/web/app/components/header/account-setting/members-page/invite-modal/index.tsxindex 5437a3ffa0d..745214d2cb5 100644--- a/web/app/components/header/account-setting/members-page/invite-modal/index.tsx+++ b/web/app/components/header/account-setting/members-page/invite-modal/index.tsx@@ -1,6 +1,6 @@'use client'import type { MemberInviteResponse } from '@dify/contracts/api/console/workspaces/types.gen'-import type { ReactElement } from 'react'+import type { DialogActions } from '@langgenius/dify-ui/dialog'import type { EmailRecipient } from './email-recipients'import { Button } from '@langgenius/dify-ui/button'import {@@ -15,22 +15,20 @@ import { Form } from '@langgenius/dify-ui/form'import { IconButton } from '@langgenius/dify-ui/icon-button'import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'import { useAtomValue } from 'jotai'-import { useState } from 'react'+import { useRef, useState } from 'react'import { useTranslation } from 'react-i18next'import { useLocale } from '#i18n'import { deploymentEditionAtom } from '@/features/system-features/state'import { consoleQuery } from '@/service/console'import { commonQueryKeys } from '@/service/use-common'+import { InviteButton } from '../invite-button'import { mergeEmailRecipients } from './email-recipients'import { EmailRecipientsField } from './email-recipients-field'import { getInviteErrorCode } from './invite-error'import { RoleSelector } from './role-selector'type InviteModalProps = {- open: boolean- trigger: ReactElementisEmailSetup: boolean- onOpenChange: (open: boolean) => voidonSend: (invitationResults: MemberInviteResponse['invitation_results']) => void}@@ -39,23 +37,31 @@ type InviteFormValues = {emails: stringrole: string}-type SubmissionError =- | { kind: 'fields'; errors: Partial<Record<InviteFieldName, string>> }- | { kind: 'form'; message: string }- | null--type InviteFormProps = Omit<InviteModalProps, 'open' | 'trigger'>+type InviteFormProps = {+ isEmailSetup: boolean+ isPending: boolean+ error: unknown+ onSubmit: (emails: string[], role: string) => void+ onDismissError: () => void+}-function InviteForm({ isEmailSetup, onOpenChange, onSend }: InviteFormProps) {+function InviteForm({ isEmailSetup, isPending, error, onSubmit, onDismissError }: InviteFormProps) {const { t } = useTranslation(['workspaceMembers'])- const locale = useLocale()- const queryClient = useQueryClient()const deploymentEdition = useAtomValue(deploymentEditionAtom)const { data: features } = useQuery(consoleQuery.features.get.queryOptions())+ const submitButtonRef = useRef<HTMLButtonElement>(null)const [recipients, setRecipients] = useState<EmailRecipient[]>([])const [draft, setDraft] = useState('')- const [submissionError, setSubmissionError] = useState<SubmissionError>(null)- const fieldErrors = submissionError?.kind === 'fields' ? submissionError.errors : undefined+ // The request owns its failure; the form only decides where to present it.+ const errorCode = error ? getInviteErrorCode(error) : null+ const fieldErrors: Partial<Record<InviteFieldName, string>> | undefined =+ errorCode === 'limit_exceeded'+ ? { emails: t(($) => $['members.inviteLimitExceeded'], { ns: 'workspaceMembers' }) }+ : errorCode === 'invalid_role'+ ? { role: t(($) => $['members.invalidRole'], { ns: 'workspaceMembers' }) }+ : undefined+ const formError =+ error && !fieldErrors ? t(($) => $['members.inviteFailed'], { ns: 'workspaceMembers' }) : null// A limit of 0 means unlimited.const memberLimit = features?.workspace_members.enabled? features.workspace_members@@ -68,61 +74,20 @@ function InviteForm({ isEmailSetup, onOpenChange, onSend }: InviteFormProps) {const validRecipientCount = effectiveRecipients.filter(({ isValid }) => isValid).lengthconst exceedsRemainingSeats = remainingSeats !== null && validRecipientCount > remainingSeats- const { mutate, isPending } = useMutation(- consoleQuery.workspaces.current.members.inviteEmail.post.mutationOptions({- context: { silent: true },- }),- )-- const clearEmailSubmissionError = () => {- setSubmissionError((error) => (error?.kind === 'fields' && error.errors.emails ? null : error))+ const dismissEmailError = () => {+ if (fieldErrors?.emails) onDismissError()}const handleSubmit = ({ role }: InviteFormValues) => {if (isPending) return+ // Keep keyboard submission focused before pending disables the email composer.+ submitButtonRef.current?.focus()setRecipients(effectiveRecipients)setDraft('')- setSubmissionError(null)- mutate(- {- body: {- emails: effectiveRecipients.map(({ value }) => value),- role,- language: locale,- },- },- {- onSuccess: (response) => {- void queryClient.invalidateQueries({ queryKey: consoleQuery.features.get.queryKey() })- void queryClient.invalidateQueries({ queryKey: commonQueryKeys.members })- onOpenChange(false)- onSend(response.invitation_results)- },- onError: (error) => {- switch (getInviteErrorCode(error)) {- case 'limit_exceeded':- setSubmissionError({- kind: 'fields',- errors: {- emails: t(($) => $['members.inviteLimitExceeded'], { ns: 'workspaceMembers' }),- },- })- break- case 'invalid_role':- setSubmissionError({- kind: 'fields',- errors: { role: t(($) => $['members.invalidRole'], { ns: 'workspaceMembers' }) },- })- break- default:- setSubmissionError({- kind: 'form',- message: t(($) => $['members.inviteFailed'], { ns: 'workspaceMembers' }),- })- }- },- },+ onSubmit(+ effectiveRecipients.map(({ value }) => value),+ role,)}@@ -146,7 +111,7 @@ function InviteForm({ isEmailSetup, onOpenChange, onSend }: InviteFormProps) {draft={draft}onRecipientsChange={setRecipients}onDraftChange={setDraft}- onChange={clearEmailSubmissionError}+ onChange={dismissEmailError}disabled={isPending}/><RoleSelector hasServerError={Boolean(fieldErrors?.role)} disabled={isPending} />@@ -166,12 +131,18 @@ function InviteForm({ isEmailSetup, onOpenChange, onSend }: InviteFormProps) {</span></div>)}- {submissionError?.kind === 'form' && (+ {formError && (<div role="alert" className="body-xs-regular text-text-destructive">- {submissionError.message}+ {formError}</div>)}- <Button type="submit" variant="primary" className="w-full" loading={isPending}>+ <Button+ ref={submitButtonRef}+ type="submit"+ variant="primary"+ className="w-full"+ loading={isPending}+ >{validRecipientCount > 0? t(($) => $['members.sendInviteCount'], {ns: 'workspaceMembers',@@ -183,18 +154,36 @@ function InviteForm({ isEmailSetup, onOpenChange, onSend }: InviteFormProps) {)}-export function InviteModal({- open,- trigger,- isEmailSetup,- onOpenChange,- onSend,-}: InviteModalProps) {+export function InviteModal({ isEmailSetup, onSend }: InviteModalProps) {const { t } = useTranslation(['common', 'workspaceMembers'])+ const locale = useLocale()+ const queryClient = useQueryClient()+ const actionsRef = useRef<DialogActions>(null)+ const { mutate, reset, isPending, error } = useMutation(+ consoleQuery.workspaces.current.members.inviteEmail.post.mutationOptions({+ context: { silent: true },+ onSuccess: (response) => {+ // The request alone decides success; seat and member refreshes run in the background.+ void queryClient.invalidateQueries({ queryKey: consoleQuery.features.get.queryKey() })+ void queryClient.invalidateQueries({ queryKey: commonQueryKeys.members })+ onSend(response.invitation_results)+ actionsRef.current?.close()+ },+ }),+ )return (- <Dialog open={open} onOpenChange={(nextOpen) => onOpenChange(nextOpen)}>- <DialogTrigger render={trigger} />+ <Dialog+ actionsRef={actionsRef}+ onOpenChange={(nextOpen, details) => {+ if (!nextOpen && isPending && details.reason !== 'imperative-action') details.cancel()+ }}+ onOpenChangeComplete={(open) => {+ // A failure stays visible through the exit transition and ends with the session.+ if (!open) reset()+ }}+ >+ <DialogTrigger render={<InviteButton />} /><DialogContent backdropProps={{ forceRender: true }}><div className="grid gap-1 pr-8"><DialogTitle className="text-xl font-semibold text-text-primary">@@ -204,8 +193,15 @@ export function InviteModal({{t(($) => $['members.inviteTeamMemberTip'], { ns: 'workspaceMembers' })}</DialogDescription></div>- <InviteForm isEmailSetup={isEmailSetup} onOpenChange={onOpenChange} onSend={onSend} />+ <InviteForm+ isEmailSetup={isEmailSetup}+ isPending={isPending}+ error={error}+ onSubmit={(emails, role) => mutate({ body: { emails, role, language: locale } })}+ onDismissError={reset}+ /><DialogClose+ disabled={isPending}render={<IconButtonaria-label={t(($) => $['operation.close'], { ns: 'common' })}