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): improve member role selection and pending saves (#44646)
yyh691b7929b134
diff --git a/web/app/components/header/account-setting/__tests__/workspace-role-checkbox-list.spec.tsx b/web/app/components/header/account-setting/__tests__/workspace-role-checkbox-list.spec.tsxdeleted file mode 100644index af460c128e4..00000000000--- a/web/app/components/header/account-setting/__tests__/workspace-role-checkbox-list.spec.tsx+++ /dev/null@@ -1,196 +0,0 @@-import type { Role } from '@/models/access-control'-import { screen } from '@testing-library/react'-import userEvent from '@testing-library/user-event'-import { renderWithConsoleQuery as render } from '@/test/console/query-data'-import WorkspaceRoleCheckboxList from '../workspace-role-checkbox-list'--const { mockWorkspaceRoleListHook } = vi.hoisted(() => ({- mockWorkspaceRoleListHook: vi.fn(),-}))--vi.mock('@/service/console', async (importOriginal) => {- const actual = await importOriginal<typeof import('@/service/console')>()- const { withConsoleResponses } = await import('@/test/console/service-responses')- return {- ...actual,- consoleQuery: withConsoleResponses(actual.consoleQuery, {- 'workspaces.current.rbac.roles.get': () => mockWorkspaceRoleListHook(),- }),- }-})--const createRole = (overrides: Partial<Role>): Role => ({- id: 'role-1',- tenant_id: 'tenant-1',- type: 'workspace',- category: 'global_custom',- name: 'Role',- description: '',- is_builtin: false,- permission_keys: [],- role_tag: '',- ...overrides,-})--const mockRoles = [- createRole({ id: 'role-1', name: 'First role' }),- createRole({ id: 'role-2', name: 'Second role' }),-]--describe('WorkspaceRoleCheckboxList', () => {- beforeEach(() => {- vi.clearAllMocks()- mockWorkspaceRoleListHook.mockResolvedValue({- data: mockRoles,- pagination: { total_count: 2, per_page: 20, current_page: 1, total_pages: 1 },- })- })-- it('should provide one named keyboard stop per role and toggle from its label', async () => {- const user = userEvent.setup()- const onSelectedRolesChange = vi.fn()- render(- <WorkspaceRoleCheckboxList- selectedRoleIds={[]}- onSelectedRolesChange={onSelectedRolesChange}- />,- )-- const firstRole = await screen.findByRole('checkbox', { name: /First role/i })- const secondRole = screen.getByRole('checkbox', { name: /Second role/i })- await user.click(await screen.findByText('First role'))- expect(onSelectedRolesChange).toHaveBeenLastCalledWith([mockRoles[0]])-- firstRole.focus()- await user.tab()- expect(secondRole).toHaveFocus()- await user.keyboard(' ')- expect(onSelectedRolesChange).toHaveBeenLastCalledWith([mockRoles[1]])- })-- it('should prevent changing disabled roles through their labels', async () => {- const user = userEvent.setup()- const onSelectedRolesChange = vi.fn()- render(- <WorkspaceRoleCheckboxList- selectedRoleIds={[]}- disabledRoleIds={['role-1']}- onSelectedRolesChange={onSelectedRolesChange}- />,- )-- await user.click(await screen.findByText('First role'))- expect(onSelectedRolesChange).not.toHaveBeenCalled()- expect(screen.getByRole('checkbox', { name: /First role/i })).toHaveAttribute('data-disabled')- })-- it('should render radios when only one role is allowed', async () => {- render(- <WorkspaceRoleCheckboxList- selectedRoleIds={['role-1']}- selectedRoles={[mockRoles[0]!]}- allowMultipleRoles={false}- onSelectedRolesChange={vi.fn()}- />,- )-- const selectedRole = await screen.findByRole('radio', { name: /First role/i })- const unselectedRole = screen.getByRole('radio', { name: /Second role/i })- expect(selectedRole).toHaveAttribute('data-checked', '')- expect(unselectedRole).not.toHaveAttribute('data-checked')- expect(screen.queryByRole('checkbox', { name: /First role/i })).not.toBeInTheDocument()- })-- it('should clear the role search and return focus to the search input', async () => {- const user = userEvent.setup()-- render(- <WorkspaceRoleCheckboxList- selectedRoleIds={[]}- selectedRoles={[]}- onSelectedRolesChange={vi.fn()}- />,- )-- const searchInput = screen.getByRole('searchbox', {- name: 'permission.role.searchPlaceholder',- })- await screen.findByRole('checkbox', { name: /Second role/i })- await user.type(searchInput, 'First')- expect(screen.queryByRole('checkbox', { name: /Second role/i })).not.toBeInTheDocument()- await user.click(screen.getByRole('button', { name: 'common.operation.clear' }))-- expect(searchInput).toHaveValue('')- expect(searchInput).toHaveFocus()- expect(screen.getByRole('checkbox', { name: /Second role/i })).toBeInTheDocument()- })-- it('should announce role loading and empty search results without moving focus', async () => {- const user = userEvent.setup()-- render(<WorkspaceRoleCheckboxList selectedRoleIds={[]} onSelectedRolesChange={vi.fn()} />)-- const status = screen.getByRole('status')- expect(status).toHaveTextContent('permission.role.loading')- await screen.findByRole('checkbox', { name: /First role/i })- expect(status).toBeEmptyDOMElement()-- const searchInput = screen.getByRole('searchbox', {- name: 'permission.role.searchPlaceholder',- })- await user.type(searchInput, 'No such role')-- expect(status).toBeInTheDocument()- expect(status).toHaveTextContent('permission.role.noMatchingRoles')- expect(searchInput).toHaveFocus()- expect(screen.queryByRole('checkbox')).not.toBeInTheDocument()-- await user.clear(searchInput)-- expect(status).toBeEmptyDOMElement()- expect(searchInput).toHaveFocus()- expect(screen.getByRole('checkbox', { name: /First role/i })).toBeInTheDocument()- })-- it('should expose disabled state on single-role options', async () => {- render(- <WorkspaceRoleCheckboxList- selectedRoleIds={['role-1']}- selectedRoles={[mockRoles[0]!]}- allowMultipleRoles={false}- disabledRoleIds={['role-1']}- onSelectedRolesChange={vi.fn()}- />,- )-- expect(await screen.findByRole('radio', { name: /First role/i })).toHaveAttribute(- 'data-disabled',- '',- )- expect(screen.getByRole('radio', { name: /Second role/i })).not.toHaveAttribute('data-disabled')- })-- it('should show legacy role descriptions when only one role is allowed', async () => {- mockWorkspaceRoleListHook.mockResolvedValue({- data: ['admin', 'editor', 'normal', 'dataset_operator'].map((name) =>- createRole({ id: name, name }),- ),- pagination: { total_count: 4, per_page: 20, current_page: 1, total_pages: 1 },- })-- render(- <WorkspaceRoleCheckboxList- selectedRoleIds={['editor']}- selectedRoles={[createRole({ id: 'editor', name: 'editor' })]}- allowMultipleRoles={false}- onSelectedRolesChange={vi.fn()}- />,- )-- expect(await screen.findByText('workspaceMembers.members.adminTip')).toBeInTheDocument()- expect(screen.getByText('workspaceMembers.members.editorTip')).toBeInTheDocument()- expect(screen.getByText('workspaceMembers.members.normalTip')).toBeInTheDocument()- expect(screen.getByText('workspaceMembers.members.datasetOperatorTip')).toBeInTheDocument()- expect(screen.queryByText('permission.role.noDescription')).not.toBeInTheDocument()- })-})diff --git a/web/app/components/header/account-setting/__tests__/workspace-role-picker.spec.tsx b/web/app/components/header/account-setting/__tests__/workspace-role-picker.spec.tsxnew file mode 100644index 00000000000..d019614fa78--- /dev/null+++ b/web/app/components/header/account-setting/__tests__/workspace-role-picker.spec.tsx@@ -0,0 +1,287 @@+import type { Role } from '@/models/access-control'+import { screen, waitFor } from '@testing-library/react'+import userEvent from '@testing-library/user-event'+import { useState } from 'react'+import { renderWithConsoleQuery as render } from '@/test/console/query-data'+import WorkspaceRolePicker from '../workspace-role-picker'++const { mockWorkspaceRoleListHook } = vi.hoisted(() => ({+ mockWorkspaceRoleListHook: vi.fn(),+}))++vi.mock('@/service/console', async (importOriginal) => {+ const actual = await importOriginal<typeof import('@/service/console')>()+ const { withConsoleResponses } = await import('@/test/console/service-responses')+ return {+ ...actual,+ consoleQuery: withConsoleResponses(actual.consoleQuery, {+ 'workspaces.current.rbac.roles.get': () => mockWorkspaceRoleListHook(),+ }),+ }+})++const createRole = (overrides: Partial<Role>): Role => ({+ id: 'role-1',+ tenant_id: 'tenant-1',+ type: 'workspace',+ category: 'global_custom',+ name: 'Role',+ description: '',+ is_builtin: false,+ permission_keys: [],+ role_tag: '',+ ...overrides,+})++const mockRoles = [+ createRole({ id: 'role-1', name: 'First role' }),+ createRole({ id: 'role-2', name: 'Second role' }),+]++describe('WorkspaceRolePicker', () => {+ beforeEach(() => {+ vi.clearAllMocks()+ mockWorkspaceRoleListHook.mockResolvedValue({+ data: mockRoles,+ pagination: { total_count: 2, per_page: 20, current_page: 1, total_pages: 1 },+ })+ })++ it.each([false, true])(+ 'keeps keyboard focus in the input and selects a role without submitting (multiple=%s)',+ async (multiple) => {+ const user = userEvent.setup()+ const submit = vi.fn()+ function Picker() {+ const [selected, setSelected] = useState<Role[]>([])+ return (+ <form+ onSubmit={(event) => {+ event.preventDefault()+ submit(selected)+ }}+ >+ <WorkspaceRolePicker+ selectedRoleIds={selected.map((role) => role.id)}+ selectedRoles={selected}+ allowMultipleRoles={multiple}+ onSelectedRolesChange={setSelected}+ />+ <button type="submit">Confirm</button>+ </form>+ )+ }+ render(<Picker />)+ const input = screen.getByRole('combobox')+ const first = await screen.findByRole('option', { name: /First role/i })+ const second = screen.getByRole('option', { name: /Second role/i })+ await user.click(input)+ await user.keyboard('{ArrowDown}')+ await waitFor(() => expect(input).toHaveAttribute('aria-activedescendant', first.id))+ expect(first).toHaveAttribute('aria-selected', 'false')+ await user.keyboard('{ArrowDown}')+ await waitFor(() => expect(input).toHaveAttribute('aria-activedescendant', second.id))+ await user.keyboard('{Enter}')+ expect(second).toHaveAttribute('aria-selected', 'true')+ expect(input).toHaveFocus()+ expect(submit).not.toHaveBeenCalled()+ await user.tab()+ expect(screen.getByRole('button', { name: 'Confirm' })).toHaveFocus()+ await user.keyboard('{Enter}')+ expect(submit).toHaveBeenCalledExactlyOnceWith([mockRoles[1]])+ },+ )++ it('preserves the query and off-page selections when toggling filtered roles, and clears only the query', async () => {+ const user = userEvent.setup()+ const offPageRole = createRole({ id: 'off-page', name: 'Off-page role' })+ const change = vi.fn()+ function Picker() {+ const [selected, setSelected] = useState([offPageRole])+ return (+ <WorkspaceRolePicker+ selectedRoleIds={selected.map((role) => role.id)}+ selectedRoles={selected}+ onSelectedRolesChange={(roles) => {+ setSelected(roles)+ change(roles)+ }}+ />+ )+ }+ render(<Picker />)+ const input = screen.getByRole('combobox')+ await screen.findByRole('option', { name: /Second role/ })+ await user.type(input, 'Second')+ await user.keyboard('{ArrowDown}')+ await waitFor(() =>+ expect(input).toHaveAttribute(+ 'aria-activedescendant',+ screen.getByRole('option', { name: /Second role/ }).id,+ ),+ )+ await user.keyboard('{Enter}')+ expect(change).toHaveBeenLastCalledWith([offPageRole, mockRoles[1]])+ expect(input).toHaveValue('Second')+ expect(input).toHaveFocus()+ expect(screen.getByRole('option', { name: /Second role/ })).toHaveAttribute(+ 'aria-selected',+ 'true',+ )+ await user.keyboard('{Enter}')+ expect(change).toHaveBeenLastCalledWith([offPageRole])+ expect(input).toHaveValue('Second')+ await user.keyboard('{Enter}')+ change.mockClear()+ await user.clear(input)+ expect(input).toHaveValue('')+ expect(input).toHaveFocus()+ expect(screen.getByRole('option', { name: /Second role/ })).toHaveAttribute(+ 'aria-selected',+ 'true',+ )+ expect(change).not.toHaveBeenCalled()+ })++ it('compares selected roles by ID instead of object identity', async () => {+ render(+ <WorkspaceRolePicker+ selectedRoleIds={['role-1']}+ selectedRoles={[{ ...mockRoles[0]! }]}+ onSelectedRolesChange={vi.fn()}+ />,+ )+ expect(await screen.findByRole('option', { name: /First role/ })).toHaveAttribute(+ 'aria-selected',+ 'true',+ )+ })++ it('should prevent changing disabled roles through their labels', async () => {+ const user = userEvent.setup()+ const onSelectedRolesChange = vi.fn()+ render(+ <WorkspaceRolePicker+ selectedRoleIds={[]}+ disabledRoleIds={['role-1']}+ onSelectedRolesChange={onSelectedRolesChange}+ />,+ )++ await user.click(await screen.findByText('First role'))+ expect(onSelectedRolesChange).not.toHaveBeenCalled()+ expect(screen.getByRole('option', { name: /First role/i })).toHaveAttribute('data-disabled')+ })++ it('exposes a single-select listbox when only one role is allowed', async () => {+ render(+ <WorkspaceRolePicker+ selectedRoleIds={['role-1']}+ selectedRoles={[mockRoles[0]!]}+ allowMultipleRoles={false}+ onSelectedRolesChange={vi.fn()}+ />,+ )++ const selectedRole = await screen.findByRole('option', { name: /First role/i })+ const unselectedRole = screen.getByRole('option', { name: /Second role/i })+ expect(selectedRole).toHaveAttribute('aria-selected', 'true')+ expect(unselectedRole).toHaveAttribute('aria-selected', 'false')+ expect(screen.getByRole('listbox')).not.toHaveAttribute('aria-multiselectable')+ })++ it('keeps selections independent from native search text editing', async () => {+ const user = userEvent.setup()++ render(+ <WorkspaceRolePicker+ selectedRoleIds={[]}+ selectedRoles={[]}+ onSelectedRolesChange={vi.fn()}+ />,+ )++ const searchInput = screen.getByRole('combobox', {+ name: 'permission.role.searchPlaceholder',+ })+ await screen.findByRole('option', { name: /Second role/i })+ await user.type(searchInput, 'First')+ expect(screen.queryByRole('option', { name: /Second role/i })).not.toBeInTheDocument()+ await user.clear(searchInput)++ expect(searchInput).toHaveValue('')+ expect(searchInput).toHaveFocus()+ expect(screen.getByRole('option', { name: /Second role/i })).toBeInTheDocument()+ })++ it('should announce role loading and empty search results without moving focus', async () => {+ const user = userEvent.setup()++ render(<WorkspaceRolePicker selectedRoleIds={[]} onSelectedRolesChange={vi.fn()} />)++ const status = screen.getByRole('status')+ expect(status).toHaveTextContent('permission.role.loading')+ await screen.findByRole('option', { name: /First role/i })+ expect(status).toBeEmptyDOMElement()++ const searchInput = screen.getByRole('combobox', {+ name: 'permission.role.searchPlaceholder',+ })+ await user.type(searchInput, 'No such role')++ expect(status).toBeInTheDocument()+ expect(status).toHaveTextContent('permission.role.noMatchingRoles')+ expect(searchInput).toHaveFocus()+ expect(screen.queryByRole('option')).not.toBeInTheDocument()++ await user.clear(searchInput)++ expect(status).toBeEmptyDOMElement()+ expect(searchInput).toHaveFocus()+ expect(screen.getByRole('option', { name: /First role/i })).toBeInTheDocument()+ })++ it('should expose disabled state on single-role options', async () => {+ render(+ <WorkspaceRolePicker+ selectedRoleIds={['role-1']}+ selectedRoles={[mockRoles[0]!]}+ allowMultipleRoles={false}+ disabledRoleIds={['role-1']}+ onSelectedRolesChange={vi.fn()}+ />,+ )++ expect(await screen.findByRole('option', { name: /First role/i })).toHaveAttribute(+ 'data-disabled',+ '',+ )+ expect(screen.getByRole('option', { name: /Second role/i })).not.toHaveAttribute(+ 'data-disabled',+ )+ })++ it('should show legacy role descriptions when only one role is allowed', async () => {+ mockWorkspaceRoleListHook.mockResolvedValue({+ data: ['admin', 'editor', 'normal', 'dataset_operator'].map((name) =>+ createRole({ id: name, name }),+ ),+ pagination: { total_count: 4, per_page: 20, current_page: 1, total_pages: 1 },+ })++ render(+ <WorkspaceRolePicker+ selectedRoleIds={['editor']}+ selectedRoles={[createRole({ id: 'editor', name: 'editor' })]}+ allowMultipleRoles={false}+ onSelectedRolesChange={vi.fn()}+ />,+ )++ expect(await screen.findByText('workspaceMembers.members.adminTip')).toBeInTheDocument()+ expect(screen.getByText('workspaceMembers.members.editorTip')).toBeInTheDocument()+ expect(screen.getByText('workspaceMembers.members.normalTip')).toBeInTheDocument()+ expect(screen.getByText('workspaceMembers.members.datasetOperatorTip')).toBeInTheDocument()+ expect(screen.queryByText('permission.role.noDescription')).not.toBeInTheDocument()+ })+})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 ef0f558c960..1357fee6a92 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@@ -112,8 +112,8 @@ async function chooseRoles(user: ReturnType<typeof userEvent.setup>, multiple: bname: multiple ? /memberDetails\.assign(?=$|:)/ : 'common.operation.edit',}),)- await user.click(await screen.findByRole(multiple ? 'checkbox' : 'radio', { name: /Next role/ }))- if (multiple) await user.click(screen.getByRole('checkbox', { name: /Extra role/ }))+ await user.click(await screen.findByRole('option', { name: /Next role/ }))+ if (multiple) await user.click(screen.getByRole('option', { name: /Extra role/ }))await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))return details}@@ -307,18 +307,18 @@ describe('MembersPage', () => {const openRoles = async () => {await user.click(more)await user.click(screen.getByRole('menuitem', { name: /members\.editRole(?=$|:)/ }))- const search = await screen.findByRole('searchbox')+ const search = await screen.findByRole('combobox')await waitFor(() => expect(search).toHaveFocus())return search}const search = await openRoles()- await user.click(await screen.findByRole('radio', { name: /Next role/ }))+ await user.click(await screen.findByRole('option', { 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',+ expect(await screen.findByRole('option', { name: /Next role/ })).toHaveAttribute(+ 'aria-selected','false',)expect(updateRoles).not.toHaveBeenCalled()diff --git a/web/app/components/header/account-setting/members-page/__tests__/member-menu.spec.tsx b/web/app/components/header/account-setting/members-page/__tests__/member-menu.spec.tsxindex c86afc94774..4021242aa90 100644--- a/web/app/components/header/account-setting/members-page/__tests__/member-menu.spec.tsx+++ b/web/app/components/header/account-setting/members-page/__tests__/member-menu.spec.tsx@@ -1,7 +1,7 @@import type { AccountWithRoleResponse } from '@dify/contracts/api/console/workspaces/types.gen'import type { Role } from '@/models/access-control'import { QueryClient } from '@tanstack/react-query'-import { screen, waitFor, within } from '@testing-library/react'+import { act, screen, waitFor, within } from '@testing-library/react'import userEvent from '@testing-library/user-event'import { consoleClient, consoleQuery } from '@/service/console'import { renderWithConsoleQuery } from '@/test/console/query-data'@@ -24,11 +24,6 @@ vi.mock('@/service/console', async (importOriginal) => {}),}})-vi.mock('@/app/notifications', () => ({- toast: {- success: vi.fn(),- },-}))const createRole = (overrides: Partial<Role>): Role => ({id: 'role-1',@@ -103,7 +98,7 @@ describe('MemberMenu', () => {await user.click(screen.getByRole('button', { name: /members\.memberActions/i }))await user.click(screen.getByRole('menuitem', { name: /members\.editRole/i }))- await user.click(await screen.findByRole('radio', { name: /Second role/i }))+ await user.click(await screen.findByRole('option', { name: /Second role/i }))await user.click(screen.getByRole('button', { name: /common\.operation\.confirm/i }))expect(mockUpdateRolesOfMember).toHaveBeenCalledWith({@@ -112,6 +107,107 @@ describe('MemberMenu', () => {})})+ it('keeps the role draft and loading state until the request succeeds, with retryable inline errors', async () => {+ const user = userEvent.setup()+ let rejectSave!: (error: Error) => void+ mockUpdateRolesOfMember.mockImplementationOnce(+ () =>+ new Promise((_resolve, reject) => {+ rejectSave = reject+ }),+ )+ renderWithConsoleQuery(+ <MemberMenu member={member} isCurrentUser={false} allowMultipleRoles={false} />,+ )+ await user.click(screen.getByRole('button', { name: /members\.memberActions/ }))+ await user.click(screen.getByRole('menuitem', { name: /members\.editRole/ }))+ const second = await screen.findByRole('option', { name: /Second role/ })+ await user.click(second)+ const confirm = screen.getByRole('button', { name: 'common.operation.confirm' })+ await user.click(confirm)+ await waitFor(() => expect(confirm).toHaveAttribute('aria-disabled', 'true'))+ expect(confirm).toHaveFocus()+ expect(screen.getByRole('combobox')).toHaveAttribute('readonly')+ await user.click(confirm)+ await user.click(screen.getByRole('option', { name: /First role/ }))+ expect(screen.getByRole('dialog')).toBeInTheDocument()+ expect(second).toHaveAttribute('aria-selected', 'true')+ expect(mockUpdateRolesOfMember).toHaveBeenCalledOnce()+ expect(screen.getByRole('button', { name: 'common.operation.cancel' })).toBeEnabled()+ await act(async () => rejectSave(new Error('Save failed')))+ expect(await screen.findByRole('alert')).toHaveTextContent('common.api.actionFailed')+ expect(confirm).not.toHaveAttribute('aria-disabled', 'true')+ expect(second).toHaveAttribute('aria-selected', 'true')+ await user.click(confirm)+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ expect(mockUpdateRolesOfMember).toHaveBeenLastCalledWith({+ params: { member_id: member.id },+ body: { role_ids: ['role-2'] },+ })+ })++ it('allows dismissal while saving without permitting another edit until the request settles', async () => {+ const user = userEvent.setup()+ let rejectSave!: (error: Error) => void+ mockUpdateRolesOfMember.mockImplementationOnce(+ () =>+ new Promise((_resolve, reject) => {+ rejectSave = reject+ }),+ )+ renderWithConsoleQuery(+ <MemberMenu member={member} isCurrentUser={false} allowMultipleRoles={false} />,+ )+ const more = screen.getByRole('button', { name: /members\.memberActions/ })+ await user.click(more)+ await user.click(screen.getByRole('menuitem', { name: /members\.editRole/ }))+ await user.click(await screen.findByRole('option', { name: /Second role/ }))+ await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))+ await waitFor(() => expect(mockUpdateRolesOfMember).toHaveBeenCalledOnce())+ await user.keyboard('{Escape}')+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ await user.click(more)+ const edit = screen.getByRole('menuitem', { name: /members\.editRole/ })+ expect(edit).toHaveAttribute('aria-disabled', 'true')+ await user.click(edit)+ expect(screen.queryByRole('dialog')).not.toBeInTheDocument()+ await act(async () => rejectSave(new Error('Save failed')))+ expect(await screen.findByRole('alert')).toHaveTextContent('common.api.actionFailed')+ await waitFor(() => expect(edit).not.toHaveAttribute('aria-disabled', 'true'))+ await user.click(edit)+ expect(screen.queryByRole('alert')).not.toBeInTheDocument()+ expect(await screen.findByRole('option', { name: /First role/ })).toHaveAttribute(+ 'aria-selected',+ 'true',+ )+ expect(mockUpdateRolesOfMember).toHaveBeenCalledOnce()+ })++ it('resets a failed mutation when the dialog closes and starts a fresh session on reopen', async () => {+ const user = userEvent.setup()+ mockUpdateRolesOfMember.mockRejectedValueOnce(new Error('Save failed'))+ renderWithConsoleQuery(+ <MemberMenu member={member} isCurrentUser={false} allowMultipleRoles={false} />,+ )+ const open = async () => {+ await user.click(screen.getByRole('button', { name: /members\.memberActions/ }))+ await user.click(screen.getByRole('menuitem', { name: /members\.editRole/ }))+ await screen.findByRole('option', { name: /First role/ })+ }+ await open()+ await user.click(screen.getByRole('option', { name: /Second role/ }))+ await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))+ expect(await screen.findByRole('alert')).toBeInTheDocument()+ await user.click(screen.getByRole('button', { name: 'common.operation.cancel' }))+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())+ await open()+ expect(screen.queryByRole('alert')).not.toBeInTheDocument()+ expect(screen.getByRole('option', { name: /First role/ })).toHaveAttribute(+ 'aria-selected',+ 'true',+ )+ })+it('should require confirmation before removing a member', async () => {const user = userEvent.setup()const queryClient = createQueryClient()diff --git a/web/app/components/header/account-setting/members-page/assign-roles-content/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/assign-roles-content/__tests__/index.spec.tsxindex 48d81084526..721d520b60c 100644--- a/web/app/components/header/account-setting/members-page/assign-roles-content/__tests__/index.spec.tsx+++ b/web/app/components/header/account-setting/members-page/assign-roles-content/__tests__/index.spec.tsx@@ -86,13 +86,14 @@ describe('AssignRolesContent', () => {/>,)await user.click(- await screen.findByRole(allowMultipleRoles ? 'checkbox' : 'radio', {+ await screen.findByRole('option', {name: /Second role/,}),)- expect(- screen.getByRole(allowMultipleRoles ? 'checkbox' : 'radio', { name: /First role/ }),- ).toHaveAttribute('aria-checked', String(allowMultipleRoles))+ expect(screen.getByRole('option', { name: /First role/ })).toHaveAttribute(+ 'aria-selected',+ String(allowMultipleRoles),+ )await user.click(screen.getByRole('button', { name: /common\.operation\.confirm/ }))expect(onSubmit).toHaveBeenCalledExactlyOnceWith(allowMultipleRoles ? roles : [roles[1]])},@@ -107,7 +108,7 @@ describe('AssignRolesContent', () => {expect(confirmButton).toBeEnabled()- await user.click(await screen.findByRole('checkbox', { name: /First role/i }))+ await user.click(await screen.findByRole('option', { name: /First role/i }))expect(confirmButton).toBeDisabled()})diff --git a/web/app/components/header/account-setting/members-page/assign-roles-content/index.tsx b/web/app/components/header/account-setting/members-page/assign-roles-content/index.tsxindex 9707abeb7ac..13d46b812c2 100644--- a/web/app/components/header/account-setting/members-page/assign-roles-content/index.tsx+++ b/web/app/components/header/account-setting/members-page/assign-roles-content/index.tsx@@ -12,11 +12,13 @@ import {} from '@langgenius/dify-ui/dialog'import { useState } from 'react'import { useTranslation } from 'react-i18next'-import WorkspaceRoleCheckboxList from '../../workspace-role-checkbox-list'+import WorkspaceRolePicker from '../../workspace-role-picker'type AssignRolesContentProps = {selectedRoles: Role[]allowMultipleRoles?: boolean+ isSubmitting?: boolean+ hasSubmitError?: booleansearchInputRef: Ref<HTMLInputElement>onSubmit: (roles: Role[]) => void}@@ -25,6 +27,8 @@ const AssignRolesContent = ({selectedRoles,allowMultipleRoles = true,searchInputRef,+ isSubmitting = false,+ hasSubmitError = false,onSubmit,}: AssignRolesContentProps) => {const { t } = useTranslation(['common', 'workspaceMembers'])@@ -49,7 +53,7 @@ const AssignRolesContent = ({})const handleConfirm = () => {- if (isConfirmDisabled) return+ if (isConfirmDisabled || isSubmitting) returnonSubmit(selected)}@@ -68,14 +72,20 @@ const AssignRolesContent = ({<DialogHeaderCloseButton aria-label={t(($) => $['operation.close'], { ns: 'common' })} /></DialogHeader>- <WorkspaceRoleCheckboxList+ <WorkspaceRolePickersearchInputRef={searchInputRef}+ readOnly={isSubmitting}selectedRoleIds={selectedRoleIds}selectedRoles={selected}allowMultipleRoles={allowMultipleRoles}onSelectedRolesChange={setSelected}/>+ {hasSubmitError && (+ <p role="alert" className="px-6 pt-2 system-sm-regular text-text-destructive">+ {t(($) => $['api.actionFailed'], { ns: 'common' })}+ </p>+ )}<DialogFooter>{allowMultipleRoles && (<div className="me-auto system-xs-regular text-text-tertiary">@@ -88,7 +98,7 @@ const AssignRolesContent = ({<DialogClose render={<Button variant="secondary" />}>{t(($) => $['operation.cancel'], { ns: 'common' })}</DialogClose>- <Button variant="primary" disabled={isConfirmDisabled} type="submit">+ <Button variant="primary" loading={isSubmitting} disabled={isConfirmDisabled} type="submit">{t(($) => $['operation.confirm'], { ns: 'common' })}</Button></DialogFooter>diff --git a/web/app/components/header/account-setting/members-page/index.tsx b/web/app/components/header/account-setting/members-page/index.tsxindex 45c7610b188..4d898fa8eec 100644--- a/web/app/components/header/account-setting/members-page/index.tsx+++ b/web/app/components/header/account-setting/members-page/index.tsx@@ -19,7 +19,6 @@ import { useTranslation } from 'react-i18next'import { useLocale } from '#i18n'import { WorkspaceAvatar } from '@/app/components/base/workspace-avatar'import UpgradeBtn from '@/app/components/billing/upgrade-btn'-import { toast } from '@/app/notifications'import { workspacePermissionKeysAtom } from '@/context/permission-state'import { currentWorkspaceAtom, isCurrentWorkspaceOwnerAtom } from '@/context/workspace-state'import { userProfileQueryOptions } from '@/features/account-profile/client'@@ -51,7 +50,7 @@ const MembersPage = () => {const currentWorkspace = useAtomValue(currentWorkspaceAtom)const isCurrentWorkspaceOwner = useAtomValue(isCurrentWorkspaceOwnerAtom)const workspacePermissionKeys = useAtomValue(workspacePermissionKeysAtom)- const { data, refetch } = useQuery(+ const { data } = useQuery(consoleQuery.workspaces.current.members.get.queryOptions({ input: { query: { language } } }),)const { data: systemFeatures } = useSuspenseQuery(systemFeaturesQueryOptions())@@ -86,7 +85,9 @@ const MembersPage = () => {: t(($) => $['members.role'], { ns: 'workspaceMembers' })const { mutateAsync: updateRolesOfMember, isPending: isSavingMember } = useMutation(- consoleQuery.workspaces.current.rbac.members.byMemberId.rbacRoles.put.mutationOptions(),+ consoleQuery.workspaces.current.rbac.members.byMemberId.rbacRoles.put.mutationOptions({+ context: { silent: true },+ }),)const handleAssignRolesSubmit = (member: AccountWithRoleResponse, roles: Role[]) => {@@ -94,15 +95,10 @@ const MembersPage = () => {? roles.map((role) => role.id): roles.slice(0, 1).map((role) => role.id)- return updateRolesOfMember(- { params: { member_id: member.id }, body: { role_ids: roleIds } },- {- onSuccess: async () => {- toast.success(t(($) => $['actionMsg.modifiedSuccessfully'], { ns: 'common' }))- await refetch()- },- },- )+ return updateRolesOfMember({+ params: { member_id: member.id },+ body: { role_ids: roleIds },+ })}return (diff --git a/web/app/components/header/account-setting/members-page/member-details-content/__tests__/index.spec.tsx b/web/app/components/header/account-setting/members-page/member-details-content/__tests__/index.spec.tsxindex c7b5bca3c76..56f125c5c3b 100644--- a/web/app/components/header/account-setting/members-page/member-details-content/__tests__/index.spec.tsx+++ b/web/app/components/header/account-setting/members-page/member-details-content/__tests__/index.spec.tsx@@ -258,7 +258,7 @@ describe('MemberDetailsContent', () => {)await user.click(screen.getByRole('button', { name: /members\.memberDetails\.assign/i }))- await user.click(await screen.findByRole('checkbox', { name: /Second role/i }))+ await user.click(await screen.findByRole('option', { name: /Second role/i }))await user.click(screen.getByRole('button', { name: /common\.operation\.confirm/i }))expect(handleAssignSubmit).not.toHaveBeenCalled()@@ -286,7 +286,7 @@ describe('MemberDetailsContent', () => {)await user.click(screen.getByRole('button', { name: /common\.operation\.edit/i }))- await user.click(await screen.findByRole('radio', { name: /Second role/i }))+ await user.click(await screen.findByRole('option', { name: /Second role/i }))await user.click(screen.getByRole('button', { name: /common\.operation\.confirm/i }))await user.click(screen.getByRole('button', { name: /common\.operation\.save/i }))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 e4b9dd47cda..3515d0e0700 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@@ -23,7 +23,6 @@ import { IconButton } from '@langgenius/dify-ui/icon-button'import { useMutation, useQueryClient } from '@tanstack/react-query'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 AssignRolesContent from './assign-roles-content'@@ -64,32 +63,33 @@ const MemberMenu = ({? t(($) => $['members.assignRoles'], { ns: 'workspaceMembers', defaultValue: 'Assign Roles' }): t(($) => $['members.editRole'], { ns: 'workspaceMembers', defaultValue: 'Edit Role' })- const handleOpenAssignRoles = useCallback(() => {- setAssignModalOpen(true)- }, [])-- const { mutateAsync: updateRolesOfMember } = useMutation(- consoleQuery.workspaces.current.rbac.members.byMemberId.rbacRoles.put.mutationOptions(),+ const {+ mutate: updateRolesOfMember,+ isPending: isSavingRoles,+ isError: roleSaveFailed,+ reset: resetRoleSave,+ } = useMutation(+ consoleQuery.workspaces.current.rbac.members.byMemberId.rbacRoles.put.mutationOptions({+ context: { silent: true },+ }),)- const handleAssignRolesSubmit = useCallback(- (roles: Role[]) => {- const roleIds = allowMultipleRoles- ? roles.map((role) => role.id)- : roles.slice(0, 1).map((role) => role.id)+ const handleOpenAssignRoles = () => {+ resetRoleSave()+ setAssignModalOpen(true)+ }- setAssignModalOpen(false)- updateRolesOfMember(- { params: { member_id: member.id }, body: { role_ids: roleIds } },- {- onSuccess: () => {- toast.success(t(($) => $['actionMsg.modifiedSuccessfully'], { ns: 'common' }))- },- },- )- },- [allowMultipleRoles, member.id, t, updateRolesOfMember],- )+ const handleAssignRolesSubmit = (roles: Role[]) => {+ if (isSavingRoles) return+ const roleIds = allowMultipleRoles+ ? roles.map((role) => role.id)+ : roles.slice(0, 1).map((role) => role.id)++ updateRolesOfMember(+ { params: { member_id: member.id }, body: { role_ids: roleIds } },+ { onSuccess: () => setAssignModalOpen(false) },+ )+ }const handleOpenRemoveConfirm = useCallback(() => {setRemoveConfirmOpen(true)@@ -131,6 +131,7 @@ const MemberMenu = ({{canAssignRoles && (<DropdownMenuItemclassName="system-sm-medium text-text-secondary"+ disabled={isSavingRoles}onClick={handleOpenAssignRoles}>{assignRolesLabel}@@ -156,6 +157,11 @@ const MemberMenu = ({)}</DropdownMenuContent></DropdownMenu>+ {roleSaveFailed && !assignModalOpen && (+ <p role="alert" className="mt-1 system-xs-regular text-text-destructive">+ {t(($) => $['api.actionFailed'], { ns: 'common' })}+ </p>+ )}<AlertDialogopen={removeConfirmOpen}onOpenChange={(open) => !open && setRemoveConfirmOpen(false)}@@ -192,6 +198,8 @@ const MemberMenu = ({searchInputRef={searchInputRef}selectedRoles={selectedRoles}allowMultipleRoles={allowMultipleRoles}+ isSubmitting={isSavingRoles}+ hasSubmitError={roleSaveFailed}onSubmit={handleAssignRolesSubmit}/></DialogContent>diff --git a/web/app/components/header/account-setting/workspace-role-checkbox-list.tsx b/web/app/components/header/account-setting/workspace-role-checkbox-list.tsxdeleted file mode 100644index d62989631bb..00000000000--- a/web/app/components/header/account-setting/workspace-role-checkbox-list.tsx+++ /dev/null@@ -1,311 +0,0 @@-'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'-import { RadioControl, RadioGroup, RadioItem } from '@langgenius/dify-ui/radio-group'-import {- ScrollArea,- ScrollAreaContent,- ScrollAreaScrollbar,- ScrollAreaThumb,- ScrollAreaViewport,-} from '@langgenius/dify-ui/scroll-area'-import { useInfiniteQuery } from '@tanstack/react-query'-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'-import { useTranslation } from 'react-i18next'-import { useLocale } from '#i18n'-import { SearchInput } from '@/app/components/base/search-input'-import { getAccessControlTemplateLanguage } from '@/i18n/language'-import {- createSelectedRolePlaceholder,- workspaceRoleListInfiniteOptions,-} from './workspace-role-list-query'--type WorkspaceRoleCheckboxListProps = {- searchInputRef?: Ref<HTMLInputElement>- selectedRoleIds: string[]- selectedRoles?: Role[]- allowMultipleRoles?: boolean- disabledRoleIds?: string[]- onSelectedRolesChange: (selectedRoles: Role[]) => void- includeOwner?: boolean-}--const PAGE_SIZE = 20-const EMPTY_DISABLED_ROLE_IDS: string[] = []-const LEGACY_ROLE_DESCRIPTION_KEY_MAP = {- admin: 'members.adminTip',- editor: 'members.editorTip',- normal: 'members.normalTip',- dataset_operator: 'members.datasetOperatorTip',-} as const--type LegacyRoleKey = keyof typeof LEGACY_ROLE_DESCRIPTION_KEY_MAP--const normalizeLegacyRoleKey = (value: string) => value.trim().toLowerCase()--const isLegacyRoleKey = (value: string): value is LegacyRoleKey =>- Object.prototype.hasOwnProperty.call(LEGACY_ROLE_DESCRIPTION_KEY_MAP, value)--const getLegacyRoleDescriptionKey = (role: Role) => {- const candidateKeys = [normalizeLegacyRoleKey(role.name), normalizeLegacyRoleKey(role.id)]-- return candidateKeys.find(isLegacyRoleKey)-}--const WorkspaceRoleCheckboxList = ({- searchInputRef,- selectedRoleIds,- selectedRoles,- allowMultipleRoles = true,- disabledRoleIds = EMPTY_DISABLED_ROLE_IDS,- onSelectedRolesChange,- includeOwner = false,-}: WorkspaceRoleCheckboxListProps) => {- const { t } = useTranslation(['permission', 'workspaceMembers'])- const locale = useLocale()- const [keyword, setKeyword] = useState('')- const containerRef = useRef<HTMLDivElement>(null)- const anchorRef = useRef<HTMLDivElement>(null)- const language = useMemo(() => getAccessControlTemplateLanguage(locale), [locale])-- const {- data: rolesData,- isLoading: rolesLoading,- error,- hasNextPage,- isFetchingNextPage,- fetchNextPage,- } = useInfiniteQuery(- workspaceRoleListInfiniteOptions({- page: 1,- limit: PAGE_SIZE,- include_owner: includeOwner ? 1 : 0,- language,- }),- )-- useEffect(() => {- const hasMore = hasNextPage ?? true- let observer: IntersectionObserver | undefined-- if (error) return-- if (anchorRef.current && containerRef.current) {- const containerHeight = containerRef.current.clientHeight- const dynamicMargin = Math.max(100, Math.min(containerHeight * 0.2, 200))-- observer = new IntersectionObserver(- (entries) => {- if (- entries[0]!.isIntersecting &&- !rolesLoading &&- !isFetchingNextPage &&- !error &&- hasMore- )- fetchNextPage()- },- {- root: containerRef.current,- rootMargin: `${dynamicMargin}px`,- },- )- observer.observe(anchorRef.current)- }- return () => observer?.disconnect()- }, [rolesLoading, isFetchingNextPage, fetchNextPage, error, hasNextPage])-- const roles = useMemo(() => rolesData?.pages.flatMap((page) => page.data) ?? [], [rolesData])- const roleById = useMemo(() => {- return new Map(roles.map((role) => [role.id, role]))- }, [roles])- const selectedRoleIdSet = useMemo(() => new Set(selectedRoleIds), [selectedRoleIds])- const disabledRoleIdSet = useMemo(() => new Set(disabledRoleIds), [disabledRoleIds])- const selectedRoleObjects = useMemo(() => {- if (selectedRoles) return selectedRoles-- return selectedRoleIds.map(- (roleId) => roleById.get(roleId) ?? createSelectedRolePlaceholder({ id: roleId }),- )- }, [roleById, selectedRoleIds, selectedRoles])-- const filteredRoles = useMemo(() => {- const trimmed = keyword.trim().toLowerCase()- if (!trimmed) return roles-- return roles.filter(- (role) =>- role.name.toLowerCase().includes(trimmed) ||- role.description?.toLowerCase().includes(trimmed),- )- }, [roles, keyword])-- const statusMessage = rolesLoading- ? t(($) => $['role.loading'], { ns: 'permission' })- : filteredRoles.length === 0- ? t(($) => $['role.noMatchingRoles'], { ns: 'permission' })- : ''-- const toggleRole = useCallback(- (role: Role) => {- if (disabledRoleIdSet.has(role.id)) return-- if (!allowMultipleRoles) {- onSelectedRolesChange(selectedRoleIdSet.has(role.id) ? selectedRoleObjects : [role])- return- }-- onSelectedRolesChange(- selectedRoleIdSet.has(role.id)- ? selectedRoleObjects.filter((selectedRole) => selectedRole.id !== role.id)- : [...selectedRoleObjects, role],- )- },- [- allowMultipleRoles,- disabledRoleIdSet,- onSelectedRolesChange,- selectedRoleIdSet,- selectedRoleObjects,- ],- )-- const handleRadioValueChange = useCallback(- (roleId: string) => {- const role = roleById.get(roleId)- if (!role || disabledRoleIdSet.has(role.id)) return-- onSelectedRolesChange([role])- },- [disabledRoleIdSet, onSelectedRolesChange, roleById],- )-- const getRoleDescription = (role: Role) => {- if (role.description) return role.description-- const legacyRoleDescriptionKey = allowMultipleRoles- ? undefined- : getLegacyRoleDescriptionKey(role)-- if (legacyRoleDescriptionKey)- return t(($) => $[LEGACY_ROLE_DESCRIPTION_KEY_MAP[legacyRoleDescriptionKey]], {- ns: 'workspaceMembers',- })-- return t(($) => $['role.noDescription'], { ns: 'permission' })- }-- const renderRoleText = (role: Role) => {- const description = getRoleDescription(role)-- return (- <span className="min-w-0 flex-1">- <span className="block system-sm-semibold text-text-secondary">{role.name}</span>- <span className="mt-0.5 block system-xs-regular text-text-tertiary">{description}</span>- </span>- )- }-- return (- <>- <div className="shrink-0 px-6 pt-3 pb-2">- <SearchInput- ref={searchInputRef}- name="workspace-role-query"- value={keyword}- onValueChange={setKeyword}- placeholder={t(($) => $['role.searchPlaceholder'], { ns: 'permission' })}- aria-label={t(($) => $['role.searchPlaceholder'], { ns: 'permission' })}- />- </div>-- <ScrollArea className="min-h-0 flex-1">- <ScrollAreaViewport ref={containerRef} className="overscroll-contain px-6">- <ScrollAreaContent>- <div- role="status"- className={cn(- statusMessage && 'px-3 py-6 text-center system-sm-regular text-text-tertiary',- )}- >- {statusMessage}- </div>- {!rolesLoading && filteredRoles.length > 0 && (- <>- {allowMultipleRoles ? (- <ul className="flex flex-col gap-0.5 pb-2">- {filteredRoles.map((role) => {- const checked = selectedRoleIdSet.has(role.id)- const disabled = disabledRoleIdSet.has(role.id)- const handleToggle = () => toggleRole(role)-- return (- <li key={role.id}>- <label- className={cn(- 'flex cursor-pointer items-start gap-3 rounded-lg px-3 py-2.5 hover:bg-state-base-hover',- checked && 'bg-state-accent-hover hover:bg-state-accent-hover',- disabled && 'cursor-not-allowed opacity-50 hover:bg-transparent',- )}- >- <Checkbox- checked={checked}- disabled={disabled}- onCheckedChange={handleToggle}- className="mt-0.5"- />- {renderRoleText(role)}- </label>- </li>- )- })}- </ul>- ) : (- <RadioGroup- aria-label={t(($) => $['role.workspaceRoles.title'], { ns: 'permission' })}- value={selectedRoleIds[0] ?? ''}- onValueChange={handleRadioValueChange}- className="flex-col items-stretch gap-0.5 pb-2"- render={<ul />}- >- {filteredRoles.map((role) => {- const disabled = disabledRoleIdSet.has(role.id)-- return (- <li key={role.id} role="presentation">- <RadioItem- value={role.id}- disabled={disabled}- nativeButton- 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)}- </RadioItem>- </li>- )- })}- </RadioGroup>- )}- <div ref={anchorRef} className="h-0" />- </>- )}- </ScrollAreaContent>- </ScrollAreaViewport>- <ScrollAreaScrollbar>- <ScrollAreaThumb />- </ScrollAreaScrollbar>- </ScrollArea>- </>- )-}--export default WorkspaceRoleCheckboxListdiff --git a/web/app/components/header/account-setting/workspace-role-picker.tsx b/web/app/components/header/account-setting/workspace-role-picker.tsxnew file mode 100644index 00000000000..94616fc4d19--- /dev/null+++ b/web/app/components/header/account-setting/workspace-role-picker.tsx@@ -0,0 +1,273 @@+'use client'++import type { ComboboxProps } from '@langgenius/dify-ui/combobox'+import type { Ref } from 'react'+import type { Role } from '@/models/access-control'+import { cn } from '@langgenius/dify-ui/cn'+import {+ Combobox,+ ComboboxInput,+ ComboboxItem,+ ComboboxList,+ ComboboxStatus,+} from '@langgenius/dify-ui/combobox'+import { DialogBody } from '@langgenius/dify-ui/dialog'+import { InputGroup, InputGroupAddon } from '@langgenius/dify-ui/input-group'+import { useInfiniteQuery } from '@tanstack/react-query'+import { useEffect, useMemo, useRef, useState } from 'react'+import { useTranslation } from 'react-i18next'+import { useLocale } from '#i18n'+import { getAccessControlTemplateLanguage } from '@/i18n/language'+import {+ createSelectedRolePlaceholder,+ workspaceRoleListInfiniteOptions,+} from './workspace-role-list-query'++type WorkspaceRolePickerProps = {+ searchInputRef?: Ref<HTMLInputElement>+ readOnly?: boolean+ selectedRoleIds: string[]+ selectedRoles?: Role[]+ allowMultipleRoles?: boolean+ disabledRoleIds?: string[]+ onSelectedRolesChange: (selectedRoles: Role[]) => void+ includeOwner?: boolean+}++const PAGE_SIZE = 20+const EMPTY_DISABLED_ROLE_IDS: string[] = []+const LEGACY_ROLE_DESCRIPTION_KEY_MAP = {+ admin: 'members.adminTip',+ editor: 'members.editorTip',+ normal: 'members.normalTip',+ dataset_operator: 'members.datasetOperatorTip',+} as const++type LegacyRoleKey = keyof typeof LEGACY_ROLE_DESCRIPTION_KEY_MAP++const normalizeLegacyRoleKey = (value: string) => value.trim().toLowerCase()++const isLegacyRoleKey = (value: string): value is LegacyRoleKey =>+ Object.prototype.hasOwnProperty.call(LEGACY_ROLE_DESCRIPTION_KEY_MAP, value)++const getLegacyRoleDescriptionKey = (role: Role) => {+ const candidateKeys = [normalizeLegacyRoleKey(role.name), normalizeLegacyRoleKey(role.id)]++ return candidateKeys.find(isLegacyRoleKey)+}++const WorkspaceRolePicker = ({+ searchInputRef,+ readOnly = false,+ selectedRoleIds,+ selectedRoles,+ allowMultipleRoles = true,+ disabledRoleIds = EMPTY_DISABLED_ROLE_IDS,+ onSelectedRolesChange,+ includeOwner = false,+}: WorkspaceRolePickerProps) => {+ const { t } = useTranslation(['permission', 'workspaceMembers'])+ const locale = useLocale()+ const [keyword, setKeyword] = useState('')+ const containerRef = useRef<HTMLDivElement>(null)+ const anchorRef = useRef<HTMLDivElement>(null)+ const language = useMemo(() => getAccessControlTemplateLanguage(locale), [locale])++ const {+ data: rolesData,+ isLoading: rolesLoading,+ error,+ hasNextPage,+ isFetchingNextPage,+ fetchNextPage,+ } = useInfiniteQuery(+ workspaceRoleListInfiniteOptions({+ page: 1,+ limit: PAGE_SIZE,+ include_owner: includeOwner ? 1 : 0,+ language,+ }),+ )++ useEffect(() => {+ const hasMore = hasNextPage ?? true+ let observer: IntersectionObserver | undefined++ if (error) return++ if (anchorRef.current && containerRef.current) {+ const containerHeight = containerRef.current.clientHeight+ const dynamicMargin = Math.max(100, Math.min(containerHeight * 0.2, 200))++ observer = new IntersectionObserver(+ (entries) => {+ if (+ entries[0]!.isIntersecting &&+ !rolesLoading &&+ !isFetchingNextPage &&+ !error &&+ hasMore+ )+ fetchNextPage()+ },+ {+ root: containerRef.current,+ rootMargin: `${dynamicMargin}px`,+ },+ )+ observer.observe(anchorRef.current)+ }+ return () => observer?.disconnect()+ }, [rolesLoading, isFetchingNextPage, fetchNextPage, error, hasNextPage])++ const roles = useMemo(() => rolesData?.pages.flatMap((page) => page.data) ?? [], [rolesData])+ const roleById = useMemo(() => {+ return new Map(roles.map((role) => [role.id, role]))+ }, [roles])+ const disabledRoleIdSet = useMemo(() => new Set(disabledRoleIds), [disabledRoleIds])+ const selectedRoleObjects = useMemo(() => {+ if (selectedRoles) return selectedRoles++ return selectedRoleIds.map(+ (roleId) => roleById.get(roleId) ?? createSelectedRolePlaceholder({ id: roleId }),+ )+ }, [roleById, selectedRoleIds, selectedRoles])++ const filteredRoles = useMemo(() => {+ const trimmed = keyword.trim().toLowerCase()+ if (!trimmed) return roles++ return roles.filter(+ (role) =>+ role.name.toLowerCase().includes(trimmed) ||+ role.description?.toLowerCase().includes(trimmed),+ )+ }, [roles, keyword])++ const statusMessage = rolesLoading+ ? t(($) => $['role.loading'], { ns: 'permission' })+ : filteredRoles.length === 0+ ? t(($) => $['role.noMatchingRoles'], { ns: 'permission' })+ : ''++ const getRoleDescription = (role: Role) => {+ if (role.description) return role.description++ const legacyRoleDescriptionKey = allowMultipleRoles+ ? undefined+ : getLegacyRoleDescriptionKey(role)++ if (legacyRoleDescriptionKey)+ return t(($) => $[LEGACY_ROLE_DESCRIPTION_KEY_MAP[legacyRoleDescriptionKey]], {+ ns: 'workspaceMembers',+ })++ return t(($) => $['role.noDescription'], { ns: 'permission' })+ }++ const renderRoleText = (role: Role) => {+ const description = getRoleDescription(role)++ return (+ <span className="min-w-0 flex-1">+ <span className="block system-sm-semibold text-text-secondary">{role.name}</span>+ <span className="mt-0.5 block system-xs-regular text-text-tertiary">{description}</span>+ </span>+ )+ }++ const comboboxProps = {+ inline: true,+ readOnly,+ open: true,+ items: roles,+ filteredItems: filteredRoles,+ filter: null,+ inputValue: keyword,+ itemToStringLabel: (role) => role.name,+ isItemEqualToValue: (item, value) => item.id === value.id,+ onInputValueChange: (value, details) => {+ // This input filters a persistent list; selecting a role must keep the query.+ if (!details.isItemPress) setKeyword(value)+ },+ } satisfies ComboboxProps<Role>++ const content = (+ <>+ <div className="shrink-0 px-6 pt-3">+ <InputGroup>+ <ComboboxInput+ ref={searchInputRef}+ className="rounded-none px-3"+ placeholder={t(($) => $['role.searchPlaceholder'], { ns: 'permission' })}+ aria-label={t(($) => $['role.searchPlaceholder'], { ns: 'permission' })}+ />+ <InputGroupAddon className="ps-1.75 pe-1.25">+ <span+ className="i-ri-search-line size-4 text-components-input-text-placeholder"+ aria-hidden+ />+ </InputGroupAddon>+ </InputGroup>+ </div>++ <DialogBody ref={containerRef} className="overscroll-contain">+ <ComboboxStatus className={cn('p-0', statusMessage && 'px-3 py-6 text-center')}>+ {statusMessage}+ </ComboboxStatus>+ <ComboboxList<Role>+ aria-label={t(($) => $['role.workspaceRoles.title'], { ns: 'permission' })}+ className="flex max-h-none flex-col gap-0.5 overflow-visible p-0"+ >+ {(role) => (+ <ComboboxItem<Role>+ key={role.id}+ value={role}+ disabled={disabledRoleIdSet.has(role.id)}+ className="group/role flex min-h-0 w-full cursor-pointer items-start gap-3 border-0 bg-transparent px-3 py-2.5 text-start hover:bg-state-base-hover data-disabled:opacity-50 data-disabled:hover:bg-transparent data-selected:bg-state-accent-hover data-selected:hover:bg-state-accent-hover data-disabled:data-selected:hover:bg-transparent data-highlighted:data-selected:bg-state-accent-hover"+ >+ <span+ aria-hidden+ className={cn(+ 'pointer-events-none mt-0.5 inline-flex size-4 shrink-0 items-center justify-center border shadow-xs shadow-shadow-shadow-3',+ allowMultipleRoles+ ? 'rounded-sm border-components-checkbox-border bg-components-checkbox-bg-unchecked text-components-checkbox-icon group-data-disabled/role:border-components-checkbox-border-disabled group-data-disabled/role:bg-components-checkbox-bg-disabled group-data-selected/role:border-transparent group-data-selected/role:bg-components-checkbox-bg group-data-disabled/role:group-data-selected/role:border-transparent group-data-disabled/role:group-data-selected/role:bg-components-checkbox-bg-disabled-checked group-data-disabled/role:group-data-selected/role:text-components-checkbox-icon-disabled'+ : 'rounded-full border-components-radio-border bg-components-radio-bg group-data-disabled/role:border-components-radio-border-disabled group-data-disabled/role:bg-components-radio-bg-disabled group-data-selected/role:border-[5px] group-data-selected/role:border-components-radio-border-checked group-data-disabled/role:group-data-selected/role:border-components-radio-border-checked-disabled',+ )}+ >+ {allowMultipleRoles && (+ <span className="i-ri-check-line hidden size-3 group-data-selected/role:block" />+ )}+ </span>+ {renderRoleText(role)}+ </ComboboxItem>+ )}+ </ComboboxList>+ <div ref={anchorRef} className="h-0" />+ </DialogBody>+ </>+ )++ return allowMultipleRoles ? (+ <Combobox<Role, true>+ {...comboboxProps}+ multiple+ value={selectedRoleObjects}+ onValueChange={onSelectedRolesChange}+ >+ {content}+ </Combobox>+ ) : (+ <Combobox<Role>+ {...comboboxProps}+ value={selectedRoleObjects[0] ?? null}+ onValueChange={(role) => {+ if (role) onSelectedRolesChange([role])+ }}+ >+ {content}+ </Combobox>+ )+}++export default WorkspaceRolePicker