Skip to content

armgit / dify

Public Imported from GitHub
0

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

refactor(web): move the search menus to the filterable DropdownMenu (#43776)

yyh0f4d20e534b3
diff --git a/web/app/components/access-rules-editor/__tests__/index.spec.tsx b/web/app/components/access-rules-editor/__tests__/index.spec.tsx
index dc146652176..a77fcafa207 100644
--- a/web/app/components/access-rules-editor/__tests__/index.spec.tsx
+++ b/web/app/components/access-rules-editor/__tests__/index.spec.tsx
@@ -366,14 +366,10 @@ describe('AccessRulesEditor', () => {
name: 'permission.accessRule.addMembersTitle',
})
expect(within(addDialog).getByText('Workspace Owner')).toBeInTheDocument()
- expect(
- within(addDialog).getByRole('button', { name: 'common.operation.added' }),
- ).toBeDisabled()
- expect(
- within(addDialog).queryByRole('button', {
- name: 'permission.accessRule.addMemberAria:{"name":"Workspace Owner"}',
- }),
- ).not.toBeInTheDocument()
+ const ownerItem = within(addDialog).getByRole('menuitem', { name: /Workspace Owner/ })
+ expect(ownerItem).toHaveAttribute('aria-disabled', 'true')
+ expect(ownerItem).toHaveTextContent('common.operation.added')
+ expect(ownerItem).not.toHaveTextContent('+ common.operation.add')
expect(onAddAccessSubject).not.toHaveBeenCalled()
},
)
@@ -526,24 +522,94 @@ describe('AccessRulesEditor', () => {
name: 'permission.accessRule.addMembersTitle',
})
expect(within(dialog).getByText('Evan')).toBeInTheDocument()
- expect(within(dialog).getByRole('button', { name: 'common.operation.added' })).toBeDisabled()
- expect(
- within(dialog).queryByRole('button', {
- name: 'permission.accessRule.addMemberAria:{"name":"Evan"}',
- }),
- ).not.toBeInTheDocument()
+ const evanItem = within(dialog).getByRole('menuitem', { name: /Evan/ })
+ expect(evanItem).toHaveAttribute('aria-disabled', 'true')
+ expect(evanItem).toHaveTextContent('common.operation.added')
+ expect(evanItem).not.toHaveTextContent('+ common.operation.add')
expect(within(dialog).getByText('Mia')).toBeInTheDocument()
expect(within(dialog).queryByRole('tablist')).not.toBeInTheDocument()
- await user.click(
- within(dialog).getByRole('button', {
- name: 'permission.accessRule.addMemberAria:{"name":"Mia"}',
- }),
- )
+ const miaItem = within(dialog).getByRole('menuitem', { name: /Mia/ })
+ expect(miaItem).toHaveTextContent('+ common.operation.add')
+ await user.click(miaItem)
expect(onAddAccessSubject).toHaveBeenCalledWith('account-2', ['default'])
})
+ it('should filter add-member candidates by name and email, not by the row action text', async () => {
+ const user = userEvent.setup()
+ mockMembers.accounts = [
+ createMember({ id: 'account-3', name: 'Evan', email: '[email protected]' }),
+ createMember(),
+ ]
+
+ render(
+ <AccessRulesEditor
+ rules={[]}
+ userAccessSettings={[]}
+ isLoadingRules={false}
+ isLoadingUserAccessSettings={false}
+ automaticIncludeWorkspaceMembers={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
+ existingAccountIds={[]}
+ updatingAccountId={null}
+ onAddAccessSubject={vi.fn()}
+ />,
+ )
+
+ await user.click(screen.getByRole('button', { name: 'common.operation.add' }))
+ const dialog = await screen.findByRole('dialog', {
+ name: 'permission.accessRule.addMembersTitle',
+ })
+ const search = within(dialog).getByRole('searchbox', { name: 'common.operation.search' })
+
+ await user.type(search, 'mia@')
+ expect(within(dialog).getByRole('menuitem', { name: /Mia/ })).toBeInTheDocument()
+ expect(within(dialog).queryByRole('menuitem', { name: /Evan/ })).not.toBeInTheDocument()
+
+ // Every row shows the add action, so a query for its text must not match them all.
+ await user.clear(search)
+ await user.type(search, 'operation.add')
+ expect(within(dialog).queryByRole('menuitem')).not.toBeInTheDocument()
+ expect(
+ await within(dialog).findByText('permission.accessRule.noAvailableMembers'),
+ ).toHaveAttribute('role', 'status')
+ })
+
+ it('should announce a failed member load without offering candidates', async () => {
+ const user = userEvent.setup()
+ mockMembersQuery.mockImplementation(() => ({
+ data: undefined,
+ isPending: false,
+ error: new Error('Request failed'),
+ }))
+
+ render(
+ <AccessRulesEditor
+ rules={[]}
+ userAccessSettings={[]}
+ isLoadingRules={false}
+ isLoadingUserAccessSettings={false}
+ automaticIncludeWorkspaceMembers={false}
+ isUpdatingAutomaticIncludeWorkspaceMembers={false}
+ existingAccountIds={[]}
+ updatingAccountId={null}
+ onAddAccessSubject={vi.fn()}
+ />,
+ )
+
+ await user.click(screen.getByRole('button', { name: 'common.operation.add' }))
+ const dialog = await screen.findByRole('dialog', {
+ name: 'permission.accessRule.addMembersTitle',
+ })
+
+ expect(within(dialog).getByRole('alert')).toHaveTextContent('common.api.actionFailed')
+ expect(within(dialog).queryByRole('menuitem')).not.toBeInTheDocument()
+ expect(
+ within(dialog).queryByText('permission.accessRule.noAvailableMembers'),
+ ).not.toBeInTheDocument()
+ })
+
it('should select individual rows and all selectable rows on the current page', async () => {
const user = userEvent.setup()
const firstSetting = createUserAccessSetting()
diff --git a/web/app/components/access-rules-editor/add-access-subject-menu.tsx b/web/app/components/access-rules-editor/add-access-subject-menu.tsx
new file mode 100644
index 00000000000..e78419fc033
--- /dev/null
+++ b/web/app/components/access-rules-editor/add-access-subject-menu.tsx
@@ -0,0 +1,176 @@
+'use client'
+
+import { Avatar } from '@langgenius/dify-ui/avatar'
+import { Button } from '@langgenius/dify-ui/button'
+import { cn } from '@langgenius/dify-ui/cn'
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuEmpty,
+ DropdownMenuFilterProvider,
+ DropdownMenuInput,
+ DropdownMenuInputGroup,
+ DropdownMenuItem,
+ DropdownMenuList,
+ DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
+import { useQuery } from '@tanstack/react-query'
+import { memo } from 'react'
+import { useTranslation } from 'react-i18next'
+import { LoadingPlaceholder } from '@/app/components/base/loading-placeholder'
+import { consoleQuery } from '@/service/console'
+import { DEFAULT_ACCESS_POLICY_ID } from './constants'
+
+type AddAccessSubjectMenuProps = {
+ disabled?: boolean
+ existingAccountIds?: string[]
+ updatingAccountId: string | null
+ onAddAccessSubject: (accountId: string, accessPolicyIds: string[]) => void
+}
+
+type AddAccessSubjectMenuContentProps = {
+ existingAccountIds: string[]
+ updatingAccountId: string | null
+ onAddAccessSubject: (accountId: string, accessPolicyIds: string[]) => void
+}
+
+// Mounted only while the menu is open, so the member list loads on demand. A failed load has no
+// retry item: closing and reopening the menu mounts this again, which loads again.
+function AddAccessSubjectMenuContent({
+ existingAccountIds,
+ updatingAccountId,
+ onAddAccessSubject,
+}: AddAccessSubjectMenuContentProps) {
+ const { t } = useTranslation(['common', 'permission'])
+ const {
+ data: membersData,
+ isPending: isLoading,
+ error,
+ } = useQuery(consoleQuery.workspaces.current.members.get.queryOptions())
+ const existingAccountIdSet = new Set(existingAccountIds)
+ const members = membersData?.accounts ?? []
+
+ const addLabel = t(($) => $['operation.add'], { ns: 'common' })
+ const addedLabel = t(($) => $['operation.added'], { ns: 'common' })
+
+ return (
+ <>
+ <DropdownMenuInputGroup>
+ <span
+ aria-hidden="true"
+ className="i-ri-search-line size-4 shrink-0 text-components-input-text-placeholder"
+ />
+ <DropdownMenuInput
+ aria-label={t(($) => $['operation.search'], { ns: 'common' })}
+ placeholder={t(($) => $['placeholder.search'], { ns: 'common' })}
+ />
+ </DropdownMenuInputGroup>
+ {error && (
+ <div role="alert" className="px-3 py-2 system-sm-regular text-text-tertiary">
+ {t(($) => $['api.actionFailed'], { ns: 'common' })}
+ </div>
+ )}
+ {isLoading && <LoadingPlaceholder className="h-20 p-1" />}
+ {!isLoading && !error && (
+ <DropdownMenuEmpty>
+ {t(($) => $['accessRule.noAvailableMembers'], { ns: 'permission' })}
+ </DropdownMenuEmpty>
+ )}
+ {/* ARIA requires a `menu` that has no items yet because they are loading to be marked busy. */}
+ <DropdownMenuList aria-busy={isLoading || undefined}>
+ {members.map((member) => {
+ const isAdded = existingAccountIdSet.has(member.id)
+ const isUpdating = updatingAccountId === member.id
+ const memberName = member.name || member.email
+
+ return (
+ <DropdownMenuItem
+ key={member.id}
+ // The query matches the name and email, not the row's action text.
+ label={`${member.name || ''} ${member.email || ''}`}
+ disabled={isAdded || updatingAccountId !== null}
+ closeOnClick={false}
+ // Only an added member reads as spent; a pending add blocks the others without dimming them.
+ className={cn(
+ 'h-auto min-h-10 gap-2 py-1 pr-3 pl-2',
+ isAdded ? 'data-disabled:opacity-50' : 'data-disabled:opacity-100',
+ )}
+ onClick={() => onAddAccessSubject(member.id, [DEFAULT_ACCESS_POLICY_ID])}
+ >
+ <span aria-hidden="true" className="shrink-0">
+ <Avatar
+ avatar={member.avatar_url ?? member.avatar ?? null}
+ name={memberName}
+ size="sm"
+ className="bg-components-icon-bg-blue-solid"
+ />
+ </span>
+ <span className="min-w-0 flex-1">
+ <span className="block truncate system-sm-medium text-text-secondary">
+ {memberName}
+ </span>
+ <span className="block truncate system-xs-regular text-text-tertiary">
+ {member.email}
+ </span>
+ </span>
+ {isAdded ? (
+ <span className="shrink-0 system-xs-regular text-text-tertiary">{addedLabel}</span>
+ ) : isUpdating ? (
+ <span className="i-ri-loader-2-line size-3.5 shrink-0 animate-spin" aria-hidden />
+ ) : (
+ <span className="shrink-0 system-xs-medium text-text-accent">{`+ ${addLabel}`}</span>
+ )}
+ </DropdownMenuItem>
+ )
+ })}
+ </DropdownMenuList>
+ </>
+ )
+}
+
+function AddAccessSubjectMenu({
+ disabled = false,
+ existingAccountIds,
+ updatingAccountId,
+ onAddAccessSubject,
+}: AddAccessSubjectMenuProps) {
+ const { t } = useTranslation(['common', 'permission'])
+ const isLoadingExisting = existingAccountIds === undefined
+
+ return (
+ <DropdownMenuFilterProvider>
+ <DropdownMenu>
+ <DropdownMenuTrigger
+ disabled={disabled}
+ render={
+ <Button
+ variant="primary"
+ size="medium"
+ disabled={disabled}
+ loading={!disabled && isLoadingExisting}
+ />
+ }
+ >
+ <span className="i-ri-add-line size-3.5" aria-hidden />
+ <span>{t(($) => $['operation.add'], { ns: 'common' })}</span>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent
+ placement="bottom-end"
+ sideOffset={8}
+ aria-label={t(($) => $['accessRule.addMembersTitle'], { ns: 'permission' })}
+ className="w-86 max-w-[calc(100vw-32px)]"
+ >
+ {existingAccountIds !== undefined && (
+ <AddAccessSubjectMenuContent
+ existingAccountIds={existingAccountIds}
+ updatingAccountId={updatingAccountId}
+ onAddAccessSubject={onAddAccessSubject}
+ />
+ )}
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </DropdownMenuFilterProvider>
+ )
+}
+
+export default memo(AddAccessSubjectMenu)
diff --git a/web/app/components/access-rules-editor/add-access-subject-popover.tsx b/web/app/components/access-rules-editor/add-access-subject-popover.tsx
deleted file mode 100644
index d46b2df354f..00000000000
--- a/web/app/components/access-rules-editor/add-access-subject-popover.tsx
+++ /dev/null
@@ -1,212 +0,0 @@
-'use client'
-
-import { Avatar } from '@langgenius/dify-ui/avatar'
-import { Button } from '@langgenius/dify-ui/button'
-import { cn } from '@langgenius/dify-ui/cn'
-import { InputGroup, InputGroupAddon, InputGroupInput } from '@langgenius/dify-ui/input-group'
-import { Popover, PopoverContent, PopoverTitle, PopoverTrigger } from '@langgenius/dify-ui/popover'
-import { useQuery } from '@tanstack/react-query'
-import { memo, useCallback, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { LoadingPlaceholder } from '@/app/components/base/loading-placeholder'
-import { consoleQuery } from '@/service/console'
-import { DEFAULT_ACCESS_POLICY_ID } from './constants'
-
-type AddAccessSubjectPopoverProps = {
- disabled?: boolean
- existingAccountIds?: string[]
- updatingAccountId: string | null
- onAddAccessSubject: (accountId: string, accessPolicyIds: string[]) => void
-}
-
-type AddAccessSubjectPopoverContentProps = {
- existingAccountIds: string[]
- updatingAccountId: string | null
- onAddAccessSubject: (accountId: string, accessPolicyIds: string[]) => void
-}
-
-function AddAccessSubjectPopoverContent({
- existingAccountIds,
- updatingAccountId,
- onAddAccessSubject,
-}: AddAccessSubjectPopoverContentProps) {
- const { t } = useTranslation(['common', 'permission'])
- const [searchValue, setSearchValue] = useState('')
- const {
- data: membersData,
- isPending: isLoading,
- error,
- refetch,
- } = useQuery(consoleQuery.workspaces.current.members.get.queryOptions())
- const existingAccountIdSet = useMemo(() => new Set(existingAccountIds), [existingAccountIds])
- const availableMembers = useMemo(() => {
- const normalizedSearchValue = searchValue.trim().toLowerCase()
-
- return (membersData?.accounts ?? []).filter((member) => {
- if (!normalizedSearchValue) return true
-
- const name = member.name || ''
- const email = member.email || ''
- return (
- name.toLowerCase().includes(normalizedSearchValue) ||
- email.toLowerCase().includes(normalizedSearchValue)
- )
- })
- }, [membersData?.accounts, searchValue])
-
- const addLabel = t(($) => $['operation.add'], { ns: 'common' })
- const addMembersTitle = t(($) => $['accessRule.addMembersTitle'], { ns: 'permission' })
- const addedLabel = t(($) => $['operation.added'], { ns: 'common' })
-
- return (
- <PopoverContent
- placement="bottom-end"
- sideOffset={8}
- className="w-86 max-w-[calc(100vw-32px)] overflow-hidden bg-components-panel-bg-blur p-0 shadow-lg backdrop-blur-[5px]"
- >
- <PopoverTitle className="sr-only">{addMembersTitle}</PopoverTitle>
- <div className="p-2 pb-1">
- <InputGroup>
- <InputGroupInput
- type="search"
- aria-label={t(($) => $['operation.search'], { ns: 'common' })}
- value={searchValue}
- placeholder={t(($) => $['placeholder.search'], { ns: 'common' })}
- className="[&::-webkit-search-cancel-button]:appearance-none [&::-webkit-search-decoration]:appearance-none"
- onValueChange={setSearchValue}
- autoComplete="off"
- enterKeyHint="search"
- />
- <InputGroupAddon className="ps-1.75 pe-1.25">
- <span
- className="i-ri-search-line size-4 text-components-input-text-placeholder"
- aria-hidden="true"
- />
- </InputGroupAddon>
- </InputGroup>
- </div>
- {error ? (
- <div role="alert" className="flex items-center justify-center gap-2 p-3">
- <span>{t(($) => $['api.actionFailed'], { ns: 'common' })}</span>
- <Button onClick={() => void refetch()}>
- {t(($) => $['operation.retry'], { ns: 'common' })}
- </Button>
- </div>
- ) : isLoading ? (
- <LoadingPlaceholder className="h-20 p-1" />
- ) : availableMembers.length === 0 ? (
- <div className="px-3 py-6 text-center system-xs-regular text-text-tertiary">
- {t(($) => $['accessRule.noAvailableMembers'], { ns: 'permission' })}
- </div>
- ) : (
- <ul className="max-h-80 overflow-y-auto p-1">
- {availableMembers.map((member) => {
- const isAdded = existingAccountIdSet.has(member.id)
- const isUpdating = updatingAccountId === member.id
- const memberName = member.name || member.email
-
- return (
- <li
- key={member.id}
- className={cn(
- 'flex min-h-10 items-center gap-2 rounded-lg py-1 pr-3 pl-2',
- !isAdded && 'hover:bg-state-base-hover',
- )}
- >
- <Avatar
- avatar={member.avatar_url ?? member.avatar ?? null}
- name={memberName}
- size="sm"
- className={cn('bg-components-icon-bg-blue-solid', isAdded && 'opacity-50')}
- />
- <div className={cn('min-w-0 flex-1', isAdded && 'opacity-50')}>
- <div className="truncate system-sm-medium text-text-secondary">{memberName}</div>
- <div className="truncate system-xs-regular text-text-tertiary">
- {member.email}
- </div>
- </div>
- {isAdded ? (
- <button
- type="button"
- disabled
- className="shrink-0 cursor-not-allowed border-0 bg-transparent p-0 system-xs-regular text-text-tertiary disabled:opacity-100"
- >
- {addedLabel}
- </button>
- ) : (
- <button
- type="button"
- disabled={updatingAccountId !== null}
- aria-label={t(($) => $['accessRule.addMemberAria'], {
- ns: 'permission',
- name: memberName,
- })}
- className={cn(
- 'flex h-6 shrink-0 items-center rounded-md px-1 system-xs-medium text-text-accent outline-hidden',
- 'hover:bg-state-accent-hover focus-visible:bg-state-accent-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid',
- 'disabled:cursor-not-allowed disabled:text-text-disabled disabled:hover:bg-transparent',
- )}
- onClick={() => onAddAccessSubject(member.id, [DEFAULT_ACCESS_POLICY_ID])}
- >
- {isUpdating ? (
- <span className="i-ri-loader-2-line size-3.5 animate-spin" aria-hidden />
- ) : (
- `+ ${addLabel}`
- )}
- </button>
- )}
- </li>
- )
- })}
- </ul>
- )}
- </PopoverContent>
- )
-}
-
-function AddAccessSubjectPopover({
- disabled = false,
- existingAccountIds,
- updatingAccountId,
- onAddAccessSubject,
-}: AddAccessSubjectPopoverProps) {
- const { t } = useTranslation(['common'])
- const [open, setOpen] = useState(false)
- const isOpen = !disabled && open
-
- const handleOpenChange = useCallback(
- (nextOpen: boolean) => {
- if (disabled && nextOpen) return
-
- setOpen(nextOpen)
- },
- [disabled],
- )
-
- return (
- <Popover open={isOpen} onOpenChange={handleOpenChange}>
- <PopoverTrigger
- render={
- <Button
- variant="primary"
- size="medium"
- disabled={disabled}
- loading={!disabled && existingAccountIds === undefined}
- >
- <span className="i-ri-add-line size-3.5" aria-hidden />
- <span>{t(($) => $['operation.add'], { ns: 'common' })}</span>
- </Button>
- }
- />
- {isOpen && existingAccountIds !== undefined && (
- <AddAccessSubjectPopoverContent
- existingAccountIds={existingAccountIds}
- updatingAccountId={updatingAccountId}
- onAddAccessSubject={onAddAccessSubject}
- />
- )}
- </Popover>
- )
-}
-
-export default memo(AddAccessSubjectPopover)
diff --git a/web/app/components/access-rules-editor/index.tsx b/web/app/components/access-rules-editor/index.tsx
index 2daccd8ffc9..24c7e2f323a 100644
--- a/web/app/components/access-rules-editor/index.tsx
+++ b/web/app/components/access-rules-editor/index.tsx
@@ -12,7 +12,7 @@ import { memo, useCallback, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { LoadingPlaceholder } from '@/app/components/base/loading-placeholder'
import { RESOURCE_ACCESS_SETTINGS_PAGE_SIZE_OPTIONS } from '@/service/access-control/constants'
-import AddAccessSubjectPopover from './add-access-subject-popover'
+import AddAccessSubjectMenu from './add-access-subject-menu'
import AutomaticIncludeWorkspaceMembersSection from './automatic-include-workspace-members-section'
import AccessRulesBatchAction from './batch-action'
import { ACCESS_RULE_TABLE_GRID, DEFAULT_ACCESS_POLICY_ID } from './constants'
@@ -231,7 +231,7 @@ function AccessRulesEditor({
</span>
</div>
{onAddAccessSubject ? (
- <AddAccessSubjectPopover
+ <AddAccessSubjectMenu
disabled={areMembershipChangesDisabled}
existingAccountIds={existingOrProtectedAccountIds}
updatingAccountId={updatingAccountId}
diff --git a/web/app/components/workflow/block-selector/__tests__/agent-selector.spec.tsx b/web/app/components/workflow/block-selector/__tests__/agent-selector.spec.tsx
index db91d7e67e1..3c07530f1c3 100644
--- a/web/app/components/workflow/block-selector/__tests__/agent-selector.spec.tsx
+++ b/web/app/components/workflow/block-selector/__tests__/agent-selector.spec.tsx
@@ -1,127 +1,187 @@
+import type { AgentRosterNodeData } from '../types'
+import { Button } from '@langgenius/dify-ui/button'
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
-import { render, screen } from '@testing-library/react'
+import { render, screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
-import { AgentSelectorContent } from '../agent-selector'
+import {
+ AgentSelectorMenu,
+ AgentSelectorMenuContent,
+ AgentSelectorMenuTrigger,
+} from '../agent-selector'
const mocks = vi.hoisted(() => ({
- agents: [] as Array<{ id: string; name: string }>,
+ agents: [] as Array<Record<string, unknown>>,
+ queryOptions: vi.fn(),
+ toastError: vi.fn(),
}))
vi.mock('@/app/components/workflow/hooks-store', () => ({
useHooksStore: () => undefined,
}))
+vi.mock('@/app/components/base/app-icon', () => ({
+ default: () => null,
+}))
+
+vi.mock('@/app/notifications', () => ({
+ toast: { error: mocks.toastError },
+}))
+
vi.mock('@/service/console', () => ({
consoleQuery: {
agent: {
inviteOptions: {
get: {
- queryOptions: () => ({
- queryKey: ['agent-invite-options'],
- queryFn: async () => ({ data: mocks.agents }),
- }),
+ queryOptions: (args: unknown) => {
+ mocks.queryOptions(args)
+ return {
+ queryKey: ['agent-invite-options', args],
+ queryFn: async () => ({ data: mocks.agents }),
+ }
+ },
},
},
},
},
}))
-const manageInConsoleLabel = /manageInAgentConsole/
-const startFromScratchLabel = /startFromScratch/
+const createAgent = (overrides: Record<string, unknown> = {}) => ({
+ id: 'agent-1',
+ name: 'Zoe',
+ description: 'Research assistant',
+ role: 'Researcher',
+ icon_type: 'emoji',
+ icon: '🤖',
+ icon_background: '#FFFFFF',
+ active_config_snapshot_id: 'snapshot-1',
+ ...overrides,
+})
-const renderSelector = async ({
- onOpenChange = vi.fn(),
+const renderMenu = async ({
+ onSelect = vi.fn<(agent: AgentRosterNodeData) => void>(),
onStartFromScratch,
}: {
- onOpenChange?: (open: boolean) => void
+ onSelect?: ReturnType<typeof vi.fn<(agent: AgentRosterNodeData) => void>>
onStartFromScratch?: () => void
} = {}) => {
+ const user = userEvent.setup()
const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
render(
<QueryClientProvider client={queryClient}>
- <AgentSelectorContent
- open
- onOpenChange={onOpenChange}
- onSelect={vi.fn()}
- onStartFromScratch={onStartFromScratch}
- />
+ <AgentSelectorMenu>
+ <AgentSelectorMenuTrigger>Open agents</AgentSelectorMenuTrigger>
+ <AgentSelectorMenuContent onSelect={onSelect} onStartFromScratch={onStartFromScratch} />
+ </AgentSelectorMenu>
</QueryClientProvider>,
)
- await screen.findByRole('listbox')
+ await user.click(screen.getByRole('button', { name: 'Open agents' }))
+ const menu = await screen.findByRole('menu')
+
+ return { user, menu, onSelect }
}
-describe('AgentSelectorContent', () => {
+describe('AgentSelectorMenu', () => {
beforeEach(() => {
mocks.agents = []
+ mocks.queryOptions.mockClear()
+ mocks.toastError.mockClear()
})
- it('offers the Agent Console link without a workspace preview gate', async () => {
- await renderSelector({ onStartFromScratch: vi.fn() })
-
- const listbox = screen.getByRole('listbox')
- const startButton = screen.getByRole('button', { name: startFromScratchLabel })
- const manageLink = screen.getByRole('link', { name: manageInConsoleLabel })
-
- expect(manageLink).toHaveAttribute('href', '/agents')
- expect(listbox).not.toContainElement(manageLink)
- expect(startButton).toHaveClass(
- 'h-7',
- 'rounded-md',
- 'px-2',
- 'py-1.5',
- 'system-sm-regular',
- 'text-text-secondary',
- )
- expect(manageLink).toHaveClass(
- 'h-7',
- 'rounded-md',
- 'px-2',
- 'py-1.5',
- 'system-sm-regular',
- 'text-text-secondary',
+ it('lists agents and keeps the footer actions inside the menu', async () => {
+ mocks.agents = [createAgent(), createAgent({ id: 'agent-2', name: 'Bob' })]
+ const { menu } = await renderMenu({ onStartFromScratch: vi.fn() })
+
+ expect(await within(menu).findByRole('menuitem', { name: /Zoe/ })).toBeInTheDocument()
+ expect(within(menu).getByRole('menuitem', { name: /Bob/ })).toBeInTheDocument()
+ expect(within(menu).getByRole('menuitem', { name: /startFromScratch/ })).toBeInTheDocument()
+ expect(within(menu).getByRole('menuitem', { name: /manageInAgentConsole/ })).toHaveAttribute(
+ 'href',
+ '/agents',
)
})
- it('should keep the listbox as the only scroll owner for agent options', async () => {
- await renderSelector()
+ it('sends the typed keyword to the agent search', async () => {
+ const { user } = await renderMenu()
- const listbox = screen.getByRole('listbox')
+ await user.type(screen.getByRole('searchbox'), 'zo')
- expect(listbox).toHaveClass('max-h-54', 'overflow-y-auto', 'outline-hidden')
- expect(listbox.querySelector('.overflow-y-auto')).not.toBeInTheDocument()
+ await waitFor(() => {
+ expect(mocks.queryOptions).toHaveBeenCalledWith(
+ expect.objectContaining({
+ input: { query: expect.objectContaining({ keyword: 'zo' }) },
+ }),
+ )
+ })
})
- it('should move focus from the combobox to actions outside the listbox', async () => {
- const user = userEvent.setup()
- await renderSelector({ onStartFromScratch: vi.fn() })
+ it('reports the chosen agent as roster node data and closes', async () => {
+ mocks.agents = [createAgent()]
+ const { user, menu, onSelect } = await renderMenu()
+
+ await user.click(await within(menu).findByRole('menuitem', { name: /Zoe/ }))
+
+ expect(onSelect).toHaveBeenCalledWith({
+ description: 'Research assistant',
+ icon: '🤖',
+ icon_background: '#FFFFFF',
+ icon_type: 'emoji',
+ id: 'agent-1',
+ name: 'Zoe',
+ role: 'Researcher',
+ })
+ await waitFor(() => {
+ expect(screen.queryByRole('menu')).not.toBeInTheDocument()
+ })
+ })
- const input = screen.getByRole('combobox')
- const startButton = screen.getByRole('button', { name: startFromScratchLabel })
- const listbox = screen.getByRole('listbox')
+ it('keeps the menu open and reports an agent without an active configuration', async () => {
+ mocks.agents = [createAgent({ active_config_snapshot_id: null })]
+ const { user, menu, onSelect } = await renderMenu()
- expect(listbox).not.toContainElement(startButton)
- input.focus()
- await user.tab()
+ await user.click(await within(menu).findByRole('menuitem', { name: /Zoe/ }))
- expect(startButton).toHaveFocus()
+ expect(mocks.toastError).toHaveBeenCalledOnce()
+ expect(onSelect).not.toHaveBeenCalled()
+ expect(screen.getByRole('menu')).toBeInTheDocument()
})
- it('does not dismiss the combobox when pressing a footer action', async () => {
+ it('keeps a loading trigger focusable without opening the menu', async () => {
const user = userEvent.setup()
- const onOpenChange = vi.fn()
- const onStartFromScratch = vi.fn()
- await renderSelector({ onOpenChange, onStartFromScratch })
+ const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })
+
+ render(
+ <QueryClientProvider client={queryClient}>
+ <AgentSelectorMenu>
+ <AgentSelectorMenuContent onSelect={vi.fn()} />
+ <AgentSelectorMenuTrigger render={<Button loading />}>
+ Open agents
+ </AgentSelectorMenuTrigger>
+ </AgentSelectorMenu>
+ </QueryClientProvider>,
+ )
- const startButton = screen.getByRole('button', { name: startFromScratchLabel })
+ const trigger = screen.getByRole('button', { name: 'Open agents' })
+ expect(trigger).toHaveAttribute('aria-disabled', 'true')
+ expect(trigger).not.toHaveAttribute('disabled')
- await user.pointer({ keys: '[MouseLeft>]', target: startButton })
+ await user.tab()
+ expect(trigger).toHaveFocus()
+ await user.click(trigger)
+ await user.keyboard('{Enter}')
+ expect(screen.queryByRole('menu')).not.toBeInTheDocument()
+ })
- expect(onOpenChange).not.toHaveBeenCalled()
+ it('reaches the footer actions with the arrow keys', async () => {
+ mocks.agents = [createAgent()]
+ const { user, menu } = await renderMenu({ onStartFromScratch: vi.fn() })
+ await within(menu).findByRole('menuitem', { name: /Zoe/ })
- await user.pointer({ keys: '[/MouseLeft]', target: startButton })
+ await user.keyboard('{ArrowDown}{ArrowDown}')
- expect(onStartFromScratch).toHaveBeenCalledOnce()
+ expect(within(menu).getByRole('menuitem', { name: /startFromScratch/ })).toHaveAttribute(
+ 'data-highlighted',
+ )
})
})
diff --git a/web/app/components/workflow/block-selector/__tests__/blocks.spec.tsx b/web/app/components/workflow/block-selector/__tests__/blocks.spec.tsx
index 2465ad4e4c9..96fedff4a32 100644
--- a/web/app/components/workflow/block-selector/__tests__/blocks.spec.tsx
+++ b/web/app/components/workflow/block-selector/__tests__/blocks.spec.tsx
@@ -266,12 +266,12 @@ describe('Blocks', () => {
await screen.findByRole('dialog', { name: 'agentRoster.roster.nodeSelector.dialogLabel' }),
).toBeInTheDocument()
expect(
- screen.getByRole('combobox', { name: 'agentRoster.roster.searchLabel' }),
+ screen.getByRole('searchbox', { name: 'agentRoster.roster.searchLabel' }),
).toBeInTheDocument()
expect(await screen.findByText('Nadia')).toBeInTheDocument()
expect(screen.getByText('Researcher')).toBeInTheDocument()
- await user.click(screen.getByRole('option', { name: 'Nadia Researcher' }))
+ await user.click(screen.getByRole('menuitem', { name: 'Nadia Researcher' }))
expect(onSelect).toHaveBeenCalledWith(BlockEnum.AgentV2, {
agent_binding: {
@@ -347,7 +347,7 @@ describe('Blocks', () => {
await user.click(screen.getByRole('button', { name: /Agent/ }))
expect(await screen.findByText('Nadia')).toBeInTheDocument()
- await user.click(screen.getByRole('combobox', { name: 'agentRoster.roster.searchLabel' }))
+ await user.click(screen.getByRole('searchbox', { name: 'agentRoster.roster.searchLabel' }))
await user.keyboard('{Escape}')
await waitFor(() => {
expect(
@@ -405,7 +405,7 @@ describe('Blocks', () => {
await user.click(screen.getByRole('button', { name: /Agent/ }))
expect(await screen.findByText('Nadia')).toBeInTheDocument()
- await user.click(screen.getByRole('option', { name: 'Nadia Researcher' }))
+ await user.click(screen.getByRole('menuitem', { name: 'Nadia Researcher' }))
await waitFor(() =>
expect(queryMocks.toastError).toHaveBeenCalledWith('workflow.nodes.agent.modelNotSelected'),
@@ -446,14 +446,14 @@ describe('Blocks', () => {
)
await user.click(screen.getByRole('button', { name: /Agent/ }))
- const consoleLink = await screen.findByRole('link', {
+ const consoleLink = await screen.findByRole('menuitem', {
name: 'agentRoster.roster.nodeSelector.manageInAgentConsole',
})
expect(consoleLink).toHaveAttribute('href', '/agents')
expect(consoleLink).toHaveAttribute('target', '_blank')
expect(consoleLink).toHaveAttribute('rel', 'noopener noreferrer')
await user.click(
- await screen.findByRole('button', {
+ await screen.findByRole('menuitem', {
name: 'agentRoster.roster.nodeSelector.startFromScratch',
}),
)
@@ -467,7 +467,7 @@ describe('Blocks', () => {
})
})
- it('closes the agent selector when Escape closes the combobox', async () => {
+ it('closes the agent selector when Escape closes the menu', async () => {
const user = userEvent.setup()
mockInviteOptionsResponse([])
const queryClient = new QueryClient({
@@ -504,7 +504,7 @@ describe('Blocks', () => {
await screen.findByRole('dialog', { name: 'agentRoster.roster.nodeSelector.dialogLabel' }),
).toBeInTheDocument()
- await user.click(screen.getByRole('combobox', { name: 'agentRoster.roster.searchLabel' }))
+ await user.click(screen.getByRole('searchbox', { name: 'agentRoster.roster.searchLabel' }))
await user.keyboard('{Escape}')
await waitFor(() => {
diff --git a/web/app/components/workflow/block-selector/agent-selector.tsx b/web/app/components/workflow/block-selector/agent-selector.tsx
index 308ad3e4ca9..a1c16b83941 100644
--- a/web/app/components/workflow/block-selector/agent-selector.tsx
+++ b/web/app/components/workflow/block-selector/agent-selector.tsx
@@ -1,22 +1,25 @@
import type { AgentInviteOptionResponse } from '@dify/contracts/api/console/agent/types.gen'
-import type { ComboboxChangeEventDetails } from '@langgenius/dify-ui/combobox'
+import type { DropdownMenuContentProps } from '@langgenius/dify-ui/dropdown-menu'
+import type { ReactNode } from 'react'
import type { NodeDefault } from '../types'
import type { AgentRosterNodeData } from './types'
-import { Button, buttonVariants } from '@langgenius/dify-ui/button'
+import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import {
- Combobox,
- ComboboxInput,
- ComboboxInputGroup,
- ComboboxItem,
- ComboboxItemText,
- ComboboxList,
- ComboboxStatus,
-} from '@langgenius/dify-ui/combobox'
-import { Popover, PopoverContent, PopoverTitle, PopoverTrigger } from '@langgenius/dify-ui/popover'
-import { useQuery } from '@tanstack/react-query'
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuFilterProvider,
+ DropdownMenuInput,
+ DropdownMenuInputGroup,
+ DropdownMenuItem,
+ DropdownMenuLinkItem,
+ DropdownMenuList,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
+import { keepPreviousData, useQuery } from '@tanstack/react-query'
import { useDebounce } from 'ahooks'
-import { useState } from 'react'
+import { createContext, use, useState } from 'react'
import { useTranslation } from 'react-i18next'
import AppIcon from '@/app/components/base/app-icon'
import Badge from '@/app/components/base/badge'
@@ -28,21 +31,61 @@ import BlockIcon from '../block-icon'
const AGENT_SELECTOR_PAGE_SIZE = 8
-export function AgentSelectorContent({
- open,
- onOpenChange,
- onSelect,
- onStartFromScratch,
-}: {
- open: boolean
- onOpenChange: (open: boolean) => void
+// The filter query doubles as the server search keyword, so the root keeps it controlled and the
+// content reads it from here.
+const SearchTextContext = createContext('')
+
+// A menu of roster agents. Choosing one is an action for the host, inserting a node or switching a
+// node's binding; the menu holds no selection of its own. Compose `AgentSelectorMenuTrigger` and
+// `AgentSelectorMenuContent` inside it.
+export function AgentSelectorMenu({ children }: { children: ReactNode }) {
+ const [searchText, setSearchText] = useState('')
+
+ return (
+ <DropdownMenuFilterProvider filter={null} value={searchText} onValueChange={setSearchText}>
+ <DropdownMenu>
+ <SearchTextContext value={searchText}>{children}</SearchTextContext>
+ </DropdownMenu>
+ </DropdownMenuFilterProvider>
+ )
+}
+
+export const AgentSelectorMenuTrigger = DropdownMenuTrigger
+
+type AgentSelectorMenuContentProps = {
+ placement?: DropdownMenuContentProps['placement']
onSelect: (agent: AgentRosterNodeData) => void
onStartFromScratch?: () => void
-}) {
+}
+
+export function AgentSelectorMenuContent({
+ placement = 'bottom-end',
+ onSelect,
+ onStartFromScratch,
+}: AgentSelectorMenuContentProps) {
+ const { t } = useTranslation(['agentRoster'])
+
+ return (
+ <DropdownMenuContent
+ placement={placement}
+ sideOffset={4}
+ aria-label={t(($) => $['roster.nodeSelector.dialogLabel'], { ns: 'agentRoster' })}
+ className="w-60"
+ >
+ <AgentSelectorList onSelect={onSelect} onStartFromScratch={onStartFromScratch} />
+ </DropdownMenuContent>
+ )
+}
+
+// Mounted only while the menu is open, so the search runs on demand.
+function AgentSelectorList({
+ onSelect,
+ onStartFromScratch,
+}: Pick<AgentSelectorMenuContentProps, 'onSelect' | 'onStartFromScratch'>) {
const { t } = useTranslation(['workflow', 'common', 'agentRoster'])
const appId = useHooksStore((s) => s.configsMap?.flowId)
- const [searchText, setSearchText] = useState('')
- const debouncedSearchText = useDebounce(searchText.trim(), { wait: 300 })
+ const searchText = use(SearchTextContext)
+ const keyword = useDebounce(searchText.trim(), { wait: 300 })
const agentsQuery = useQuery({
...consoleQuery.agent.inviteOptions.get.queryOptions({
input: {
@@ -50,114 +93,122 @@ export function AgentSelectorContent({
limit: AGENT_SELECTOR_PAGE_SIZE,
page: 1,
...(appId ? { app_id: appId } : {}),
- ...(debouncedSearchText ? { keyword: debouncedSearchText } : {}),
+ ...(keyword ? { keyword } : {}),
},
},
}),
staleTime: 0,
+ // A new keyword keeps the previous results on screen instead of flashing the skeleton.
+ placeholderData: keepPreviousData,
})
const agents = agentsQuery.data?.data ?? []
- const handleInputValueChange = (nextSearchText: string, details: ComboboxChangeEventDetails) => {
- if (details.reason !== 'item-press') setSearchText(nextSearchText)
- }
- const handleValueChange = (agent: AgentInviteOptionResponse | null) => {
- if (!agent) return
- if (!agent.active_config_snapshot_id) {
- toast.error(t(($) => $['nodes.agent.modelNotSelected'], { ns: 'workflow' }))
- return
- }
-
- onSelect(toAgentRosterNodeData(agent))
- }
- const handleOpenChange = (nextOpen: boolean) => {
- if (!nextOpen) onOpenChange(false)
- }
const isLoading = agentsQuery.isPending
const statusText = isLoading
? t(($) => $.loading, { ns: 'common' })
: agentsQuery.isError
? t(($) => $['roster.loadingError'], { ns: 'agentRoster' })
: agents.length === 0
- ? debouncedSearchText
+ ? keyword
? t(($) => $['roster.emptySearch'], { ns: 'agentRoster' })
: t(($) => $['roster.empty'], { ns: 'agentRoster' })
: null
+
+ const handleSelect = (agent: AgentInviteOptionResponse) => {
+ if (!agent.active_config_snapshot_id) {
+ toast.error(t(($) => $['nodes.agent.modelNotSelected'], { ns: 'workflow' }))
+ return
+ }
+ onSelect(toAgentRosterNodeData(agent))
+ }
+
return (
- <div className="w-60 overflow-hidden rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg backdrop-blur-sm">
- <Combobox<AgentInviteOptionResponse>
- filter={null}
- inline
- inputValue={searchText}
- items={agents}
- itemToStringLabel={(agent) => agent.name}
- itemToStringValue={(agent) => agent.id}
- open={open}
- value={null}
- onInputValueChange={handleInputValueChange}
- onOpenChange={handleOpenChange}
- onValueChange={handleValueChange}
+ <>
+ <DropdownMenuInputGroup>
+ <span
+ aria-hidden
+ className="i-ri-search-line size-4 shrink-0 text-components-input-text-placeholder"
+ />
+ <DropdownMenuInput
+ aria-label={t(($) => $['roster.searchLabel'], { ns: 'agentRoster' })}
+ placeholder={t(($) => $['roster.nodeSelector.searchPlaceholder'], { ns: 'agentRoster' })}
+ />
+ </DropdownMenuInputGroup>
+ {/* A persistent live region announces reliably. The skeleton already shows loading, so that
+ status is announced but not displayed. */}
+ <div
+ role="status"
+ className={cn(
+ 'px-3 py-2 system-sm-regular text-text-tertiary empty:p-0',
+ isLoading && 'sr-only',
+ )}
>
- <div className="bg-components-panel-bg-blur p-2 pb-1">
- <ComboboxInputGroup className="h-8 min-h-8 px-2">
- <span
- aria-hidden
- className="mr-0.5 i-ri-search-line size-4 shrink-0 text-components-input-text-placeholder"
- />
- <ComboboxInput
- aria-label={t(($) => $['roster.searchLabel'], { ns: 'agentRoster' })}
- placeholder={t(($) => $['roster.nodeSelector.searchPlaceholder'], {
- ns: 'agentRoster',
- })}
- className="block h-4.5 grow px-1 py-0 system-sm-regular text-components-input-text-filled"
- />
- </ComboboxInputGroup>
- </div>
- <ComboboxStatus className="system-xs-regular">{statusText}</ComboboxStatus>
- {isLoading ? (
- <div className="max-h-54 overflow-hidden p-1">
+ {statusText}
+ </div>
+ {/* The agents scroll inside the list so the footer actions stay in view. The scroller is kept
+ out of the tab order: the menu owns focus and Tab closes it. */}
+ <DropdownMenuList className="flex max-h-none flex-col overflow-visible">
+ <div
+ tabIndex={-1}
+ className={cn(
+ 'max-h-54 min-h-0 overflow-y-auto overscroll-contain outline-hidden',
+ agentsQuery.isPlaceholderData && 'opacity-60',
+ )}
+ >
+ {isLoading ? (
<AgentSelectorLoadingSkeleton />
- </div>
- ) : (
- <ComboboxList className="max-h-54 p-1 focus-visible:outline-2 focus-visible:-outline-offset-1 focus-visible:outline-state-accent-solid focus-visible:outline-solid">
- {!agentsQuery.isError &&
- agents.map((agent) => <AgentSelectorItem key={agent.id} agent={agent} />)}
- </ComboboxList>
- )}
- <div className="border-t border-divider-subtle p-1">
- {onStartFromScratch && (
- <Button
- variant="ghost"
- size="medium"
- className="h-7 w-full justify-start gap-2 rounded-md px-2 py-1.5 text-left system-sm-regular text-text-secondary"
- onClick={onStartFromScratch}
- >
- <span aria-hidden className="i-ri-add-line size-4 shrink-0 text-text-tertiary" />
- <span className="min-w-0 flex-1 truncate">
- {t(($) => $['roster.nodeSelector.startFromScratch'], { ns: 'agentRoster' })}
- </span>
- </Button>
+ ) : (
+ !agentsQuery.isError &&
+ agents.map((agent) => (
+ <DropdownMenuItem
+ key={agent.id}
+ closeOnClick={Boolean(agent.active_config_snapshot_id)}
+ className="h-auto gap-2 py-1.5 pr-3 pl-2"
+ onClick={() => handleSelect(agent)}
+ >
+ <span aria-hidden className="shrink-0">
+ <AppIcon
+ size="small"
+ iconType={agent.icon_type}
+ icon={agent.icon ?? undefined}
+ background={agent.icon_background}
+ imageUrl={agent.icon ?? undefined}
+ />
+ </span>
+ <span className="flex min-w-0 flex-1 flex-col gap-0.5">
+ <span className="truncate system-sm-medium text-text-secondary">
+ {agent.name}
+ </span>
+ <span className="truncate system-xs-regular text-text-tertiary">
+ {agent.role || agent.description}
+ </span>
+ </span>
+ </DropdownMenuItem>
+ ))
)}
- <Link
- href="/agents"
- target="_blank"
- rel="noopener noreferrer"
- className={cn(
- buttonVariants({ variant: 'ghost', size: 'medium' }),
- 'h-7 w-full justify-start gap-2 rounded-md px-2 py-1.5 text-left system-sm-regular text-text-secondary',
- )}
- onClick={() => onOpenChange(false)}
- >
- <span
- aria-hidden
- className="i-ri-arrow-right-up-line size-4 shrink-0 text-text-tertiary"
- />
+ </div>
+ <DropdownMenuSeparator className="shrink-0" />
+ {onStartFromScratch && (
+ <DropdownMenuItem className="shrink-0" onClick={onStartFromScratch}>
+ <span aria-hidden className="i-ri-add-line size-4 shrink-0 text-text-tertiary" />
<span className="min-w-0 flex-1 truncate">
- {t(($) => $['roster.nodeSelector.manageInAgentConsole'], { ns: 'agentRoster' })}
+ {t(($) => $['roster.nodeSelector.startFromScratch'], { ns: 'agentRoster' })}
</span>
- </Link>
- </div>
- </Combobox>
- </div>
+ </DropdownMenuItem>
+ )}
+ <DropdownMenuLinkItem
+ className="shrink-0"
+ render={<Link href="/agents" target="_blank" rel="noopener noreferrer" />}
+ >
+ <span
+ aria-hidden
+ className="i-ri-arrow-right-up-line size-4 shrink-0 text-text-tertiary"
+ />
+ <span className="min-w-0 flex-1 truncate">
+ {t(($) => $['roster.nodeSelector.manageInAgentConsole'], { ns: 'agentRoster' })}
+ </span>
+ </DropdownMenuLinkItem>
+ </DropdownMenuList>
+ </>
)
}
@@ -198,36 +249,6 @@ function toAgentRosterNodeData(agent: AgentInviteOptionResponse): AgentRosterNod
}
}
-function AgentSelectorAvatar({ agent }: { agent: AgentInviteOptionResponse }) {
- return (
- <AppIcon
- size="small"
- iconType={agent.icon_type}
- icon={agent.icon ?? undefined}
- background={agent.icon_background}
- imageUrl={agent.icon ?? undefined}
- />
- )
-}
-
-function AgentSelectorItem({ agent }: { agent: AgentInviteOptionResponse }) {
- return (
- <ComboboxItem value={agent} className="grid-cols-[1fr] gap-0 py-1.5 pr-3 pl-2">
- <ComboboxItemText className="flex items-center gap-2 px-0">
- <span aria-hidden className="shrink-0">
- <AgentSelectorAvatar agent={agent} />
- </span>
- <span className="flex min-w-0 flex-1 flex-col gap-0.5">
- <span className="truncate system-sm-medium text-text-secondary">{agent.name}</span>
- <span className="truncate system-xs-regular text-text-tertiary">
- {agent.role || agent.description}
- </span>
- </span>
- </ComboboxItemText>
- </ComboboxItem>
- )
-}
-
export function AgentBlockItem({
block,
onSelect,
@@ -237,58 +258,40 @@ export function AgentBlockItem({
onSelect: (agent: AgentRosterNodeData) => void
onStartFromScratch: () => void
}) {
- const { t } = useTranslation(['workflow', 'navigation', 'agentRoster'])
- const [open, setOpen] = useState(false)
- const handleSelect = (agent: AgentRosterNodeData) => {
- setOpen(false)
- onSelect(agent)
- }
+ const { t } = useTranslation(['navigation'])
return (
- <Popover open={open} onOpenChange={setOpen}>
- <PopoverTrigger
+ <AgentSelectorMenu>
+ <AgentSelectorMenuTrigger
openOnHover
render={
<Button
variant="ghost"
size="medium"
className="w-full justify-start gap-0 px-3 text-left data-popup-open:bg-state-base-hover"
- >
- <BlockIcon className="mr-2 shrink-0" type={block.metaData.type} />
- <span className="min-w-0 grow truncate system-sm-medium text-text-secondary">
- {block.metaData.title}
- </span>
- <Badge
- size="xs"
- variant="dimm"
- text={t(($) => $['menus.status'], { ns: 'navigation' })}
- className="ml-2 shrink-0"
- />
- <span
- aria-hidden
- className="i-custom-vender-solid-general-arrow-down-round-fill size-4 shrink-0 -rotate-90 text-text-tertiary"
- />
- </Button>
+ />
}
- />
- <PopoverContent
- placement="right-start"
- sideOffset={4}
- className="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
>
- <PopoverTitle className="sr-only">
- {t(($) => $['roster.nodeSelector.dialogLabel'], { ns: 'agentRoster' })}
- </PopoverTitle>
- <AgentSelectorContent
- open={open}
- onOpenChange={setOpen}
- onSelect={handleSelect}
- onStartFromScratch={() => {
- setOpen(false)
- onStartFromScratch()
- }}
+ <BlockIcon className="mr-2 shrink-0" type={block.metaData.type} />
+ <span className="min-w-0 grow truncate system-sm-medium text-text-secondary">
+ {block.metaData.title}
+ </span>
+ <Badge
+ size="xs"
+ variant="dimm"
+ text={t(($) => $['menus.status'], { ns: 'navigation' })}
+ className="ml-2 shrink-0"
+ />
+ <span
+ aria-hidden
+ className="i-custom-vender-solid-general-arrow-down-round-fill size-4 shrink-0 -rotate-90 text-text-tertiary"
/>
- </PopoverContent>
- </Popover>
+ </AgentSelectorMenuTrigger>
+ <AgentSelectorMenuContent
+ placement="right-start"
+ onSelect={onSelect}
+ onStartFromScratch={onStartFromScratch}
+ />
+ </AgentSelectorMenu>
)
}
diff --git a/web/app/components/workflow/nodes/agent-v2/__tests__/panel.spec.tsx b/web/app/components/workflow/nodes/agent-v2/__tests__/panel.spec.tsx
index e42f89ce8da..fcf2e7e0776 100644
--- a/web/app/components/workflow/nodes/agent-v2/__tests__/panel.spec.tsx
+++ b/web/app/components/workflow/nodes/agent-v2/__tests__/panel.spec.tsx
@@ -1,10 +1,12 @@
+import type { AgentInviteOptionsResponse } from '@dify/contracts/api/console/agent/types.gen'
import type { ReactNode } from 'react'
import type { AgentV2NodeType } from '../types'
import type { PromptEditorProps } from '@/app/components/base/prompt-editor'
import type { NodePanelProps } from '@/app/components/workflow/types'
-import { act, fireEvent, render, screen, within } from '@testing-library/react'
+import { act, fireEvent, screen, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { BlockEnum } from '@/app/components/workflow/types'
+import { renderWithConsoleQuery as render } from '@/test/console/query-data'
import { FlowType } from '@/types/common'
import { AgentV2Panel } from '../panel'
@@ -159,48 +161,6 @@ vi.mock('@/features/agent-v2/permissions', () => ({
useCanCreateAgents: () => true,
}))
-vi.mock('@/app/components/workflow/block-selector/agent-selector', () => ({
- AgentSelectorContent: ({
- onSelect,
- onStartFromScratch,
- }: {
- onSelect: (agent: {
- description: string
- icon: string
- icon_background: string
- icon_type: 'emoji'
- id: string
- name: string
- role: string
- }) => void
- onStartFromScratch?: () => void
- }) => (
- <>
- <button
- type="button"
- onClick={() =>
- onSelect({
- id: 'agent-2',
- name: 'Mara',
- description: 'Tender Analyst',
- icon: 'M',
- icon_background: '#D1E9FF',
- icon_type: 'emoji',
- role: 'Analyst',
- })
- }
- >
- Select Mara
- </button>
- {onStartFromScratch && (
- <button type="button" onClick={onStartFromScratch}>
- Start from Scratch
- </button>
- )}
- </>
- ),
-}))
-
vi.mock('../hooks', () => ({
useAgentRosterDetail: (agentId?: string) => mockUseAgentRosterDetail(agentId),
useCreateInlineAgentBinding: () => ({
@@ -346,6 +306,34 @@ const panelProps = {} as NodePanelProps<AgentV2NodeType>['panelProps']
describe('agent/panel', () => {
beforeEach(() => {
vi.clearAllMocks()
+ vi.spyOn(globalThis, 'fetch').mockImplementation(async (input) => {
+ const url = input instanceof Request ? input.url : String(input)
+ if (new URL(url).pathname !== '/console/api/agent/invite-options')
+ throw new Error(`Unexpected request: ${url}`)
+
+ return Response.json({
+ data: [
+ {
+ id: 'agent-2',
+ name: 'Mara',
+ description: 'Tender Analyst',
+ icon: 'M',
+ icon_background: '#D1E9FF',
+ icon_type: 'emoji',
+ role: 'Analyst',
+ agent_kind: 'dify_agent',
+ scope: 'roster',
+ source: 'roster',
+ status: 'active',
+ active_config_snapshot_id: 'snapshot-2',
+ },
+ ],
+ has_more: false,
+ limit: 8,
+ page: 1,
+ total: 1,
+ } satisfies AgentInviteOptionsResponse)
+ })
mockPromptEditorProps.length = 0
mockOrchestratePanelContentProps.length = 0
mockOutputVarsProps.length = 0
@@ -598,7 +586,7 @@ describe('agent/panel', () => {
expect(container.querySelector('[aria-busy="true"]')).toBeInTheDocument()
expect(
screen.getByRole('button', { name: 'workflowAgent.nodes.agent.roster.change', hidden: true }),
- ).toBeDisabled()
+ ).toHaveAttribute('aria-disabled', 'true')
expect(
screen.getByRole('dialog', { name: 'workflowAgent.nodes.agent.roster.inlineSetup.name' }),
).toBeInTheDocument()
@@ -993,7 +981,8 @@ describe('agent/panel', () => {
expect(mockStoreState.setOpenInlineAgentPanelNodeId).not.toHaveBeenCalledWith(undefined)
})
- it('does not show start from scratch for an existing inline agent binding', () => {
+ it('does not show start from scratch for an existing inline agent binding', async () => {
+ const user = userEvent.setup()
render(
<AgentV2Panel
id="agent-node"
@@ -1008,9 +997,14 @@ describe('agent/panel', () => {
/>,
)
- fireEvent.click(screen.getByRole('button', { name: 'workflowAgent.nodes.agent.roster.change' }))
+ await user.click(
+ screen.getByRole('button', { name: 'workflowAgent.nodes.agent.roster.change' }),
+ )
- expect(screen.queryByRole('button', { name: 'Start from Scratch' })).not.toBeInTheDocument()
+ const menu = await screen.findByRole('menu')
+ expect(
+ within(menu).queryByRole('menuitem', { name: /startFromScratch/ }),
+ ).not.toBeInTheDocument()
})
it('keeps the inline panel closed while workflow composer state is still loading', () => {
@@ -1106,11 +1100,14 @@ describe('agent/panel', () => {
})
})
- it('updates roster agent binding from the selector', () => {
+ it('updates roster agent binding from the selector', async () => {
+ const user = userEvent.setup()
render(<AgentV2Panel id="agent-node" data={createData()} panelProps={panelProps} />)
- fireEvent.click(screen.getByRole('button', { name: 'workflowAgent.nodes.agent.roster.change' }))
- fireEvent.click(screen.getByRole('button', { name: 'Select Mara' }))
+ await user.click(
+ screen.getByRole('button', { name: 'workflowAgent.nodes.agent.roster.change' }),
+ )
+ await user.click(await screen.findByRole('menuitem', { name: /Mara/ }))
expect(mockHandleNodeDataUpdateWithSyncDraft).toHaveBeenCalledWith(
{
@@ -1129,7 +1126,8 @@ describe('agent/panel', () => {
)
})
- it('switches a roster agent to a workflow-only inline agent from the selector', () => {
+ it('switches a roster agent to a workflow-only inline agent from the selector', async () => {
+ const user = userEvent.setup()
mockCreateInlineAgentBinding.mockImplementation(
(
_nodeId: string,
@@ -1165,8 +1163,10 @@ describe('agent/panel', () => {
/>,
)
- fireEvent.click(screen.getByRole('button', { name: 'workflowAgent.nodes.agent.roster.change' }))
- fireEvent.click(screen.getByRole('button', { name: 'Start from Scratch' }))
+ await user.click(
+ screen.getByRole('button', { name: 'workflowAgent.nodes.agent.roster.change' }),
+ )
+ await user.click(await screen.findByRole('menuitem', { name: /startFromScratch/ }))
expect(mockStoreState.setOpenInlineAgentPanelNodeId).toHaveBeenCalledWith('agent-node')
expect(mockCreateInlineAgentBinding).toHaveBeenCalledWith(
diff --git a/web/app/components/workflow/nodes/agent-v2/components/__tests__/agent-roster-field.spec.tsx b/web/app/components/workflow/nodes/agent-v2/components/__tests__/agent-roster-field.spec.tsx
index 018c6ac0472..5fb9936b267 100644
--- a/web/app/components/workflow/nodes/agent-v2/components/__tests__/agent-roster-field.spec.tsx
+++ b/web/app/components/workflow/nodes/agent-v2/components/__tests__/agent-roster-field.spec.tsx
@@ -9,7 +9,9 @@ vi.mock('@/features/agent-v2/permissions', () => ({
}))
vi.mock('@/app/components/workflow/block-selector/agent-selector', () => ({
- AgentSelectorContent: () => null,
+ AgentSelectorMenu: () => null,
+ AgentSelectorMenuContent: () => null,
+ AgentSelectorMenuTrigger: () => null,
}))
function renderDetailRosterField(permissionKeys = ['agent.acl.edit']) {
diff --git a/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx b/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx
index 59a9000edfd..1e9a7e5c86c 100644
--- a/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx
+++ b/web/app/components/workflow/nodes/agent-v2/components/agent-roster-field.tsx
@@ -27,11 +27,14 @@ import {
} from '@langgenius/dify-ui/dropdown-menu'
import { Field, FieldLabel } from '@langgenius/dify-ui/field'
import { IconButton } from '@langgenius/dify-ui/icon-button'
-import { Popover, PopoverContent, PopoverTitle, PopoverTrigger } from '@langgenius/dify-ui/popover'
import { Suspense, useState } from 'react'
import { useTranslation } from 'react-i18next'
import AppIcon from '@/app/components/base/app-icon'
-import { AgentSelectorContent } from '@/app/components/workflow/block-selector/agent-selector'
+import {
+ AgentSelectorMenu,
+ AgentSelectorMenuContent,
+ AgentSelectorMenuTrigger,
+} from '@/app/components/workflow/block-selector/agent-selector'
import { getAgentACLCapabilities } from '@/features/agent-v2/acl'
import { useCanCreateAgents } from '@/features/agent-v2/permissions'
import { EditInConsoleLink } from './edit-in-console-link'
@@ -376,7 +379,6 @@ export function AgentRosterField({
}) {
const { t } = useTranslation(['common', 'workflow', 'workflowAgent', 'agentRoster'])
const [localPanelOpen, setLocalPanelOpen] = useState(false)
- const [isSelectorOpen, setIsSelectorOpen] = useState(false)
const panelOpen = isPanelOpen ?? localPanelOpen
const setPanelOpen = onPanelOpenChange ?? setLocalPanelOpen
const inlineSetupName = t(($) => $[`${i18nPrefix}.roster.inlineSetup.name`], {
@@ -432,53 +434,25 @@ export function AgentRosterField({
<FieldLabel className="min-w-0 flex-1 py-1 system-sm-semibold-uppercase! text-text-secondary">
{t(($) => $['nodes.agent.roster.label'], { ns: 'workflow' })}
</FieldLabel>
- <Popover
- open={isPending ? false : isSelectorOpen}
- onOpenChange={(open) => {
- if (!isPending) setIsSelectorOpen(open)
- }}
- >
- <PopoverTrigger
+ <AgentSelectorMenu>
+ <AgentSelectorMenuTrigger
render={
- <button
- type="button"
- disabled={isPending}
- className={cn(
- 'flex h-6 shrink-0 cursor-pointer items-center justify-center rounded-md px-1.5 py-1 system-xs-medium text-text-tertiary hover:bg-state-base-hover hover:text-text-secondary',
- isPending &&
- 'cursor-not-allowed opacity-50 hover:bg-transparent hover:text-text-tertiary',
- )}
- >
- {t(($) => $[`${i18nPrefix}.roster.change`], { ns: 'workflowAgent' })}
- </button>
+ <Button
+ variant="ghost"
+ size="small"
+ loading={isPending}
+ className="shrink-0 text-text-tertiary data-popup-open:bg-state-base-hover data-popup-open:text-text-secondary"
+ />
}
- />
- <PopoverContent
- placement="bottom-end"
- sideOffset={4}
- className="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
>
- <PopoverTitle className="sr-only">
- {t(($) => $['roster.nodeSelector.dialogLabel'], { ns: 'agentRoster' })}
- </PopoverTitle>
- <AgentSelectorContent
- open={isSelectorOpen}
- onOpenChange={setIsSelectorOpen}
- onSelect={(nextAgent) => {
- setIsSelectorOpen(false)
- onChange(nextAgent)
- }}
- onStartFromScratch={
- onStartFromScratch
- ? () => {
- setIsSelectorOpen(false)
- onStartFromScratch()
- }
- : undefined
- }
- />
- </PopoverContent>
- </Popover>
+ {t(($) => $[`${i18nPrefix}.roster.change`], { ns: 'workflowAgent' })}
+ </AgentSelectorMenuTrigger>
+ <AgentSelectorMenuContent
+ placement="bottom-end"
+ onSelect={onChange}
+ onStartFromScratch={onStartFromScratch}
+ />
+ </AgentSelectorMenu>
</div>
{errorMessage ? (
<div
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/integration.spec.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/integration.spec.tsx
index 033eab299ee..20831bd761f 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/integration.spec.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/__tests__/integration.spec.tsx
@@ -575,7 +575,7 @@ describe('knowledge-retrieval path', () => {
expect(screen.getByText('metadata-panel')).toBeInTheDocument()
})
- it('should call handleAddCondition with the correct metadata item when clicking any part of the row', async () => {
+ it('should call handleAddCondition with the chosen metadata item', async () => {
const user = userEvent.setup()
const handleAddCondition = vi.fn()
const permissionMetadata = createMetadata({
@@ -601,7 +601,7 @@ describe('knowledge-retrieval path', () => {
name: /workflowModels.nodes.knowledgeRetrieval.metadata.panel.add/i,
}),
)
- await user.click(screen.getAllByText('string', { selector: 'div.shrink-0' })[0]!)
+ await user.click(await screen.findByRole('menuitem', { name: /^permission/ }))
expect(handleAddCondition).toHaveBeenCalledTimes(1)
expect(handleAddCondition).toHaveBeenCalledWith(
diff --git a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx
index 46550512efa..da6ffb917c4 100644
--- a/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx
+++ b/web/app/components/workflow/nodes/knowledge-retrieval/components/metadata/add-condition.tsx
@@ -1,10 +1,16 @@
import type { MetadataShape } from '@/app/components/workflow/nodes/knowledge-retrieval/types'
-import type { MetadataInDoc } from '@/models/datasets'
import { Button } from '@langgenius/dify-ui/button'
-import { InputGroup, InputGroupAddon, InputGroupInput } from '@langgenius/dify-ui/input-group'
-import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover'
-import { RiAddLine } from '@remixicon/react'
-import { useCallback, useMemo, useState } from 'react'
+import {
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuEmpty,
+ DropdownMenuFilterProvider,
+ DropdownMenuInput,
+ DropdownMenuInputGroup,
+ DropdownMenuItem,
+ DropdownMenuList,
+ DropdownMenuTrigger,
+} from '@langgenius/dify-ui/dropdown-menu'
import { useTranslation } from 'react-i18next'
import MetadataIcon from './metadata-icon'
@@ -12,81 +18,47 @@ const AddCondition = ({
metadataList,
handleAddCondition,
}: Pick<MetadataShape, 'handleAddCondition' | 'metadataList'>) => {
- const { t } = useTranslation(['workflowModels'])
- const [open, setOpen] = useState(false)
- const [searchText, setSearchText] = useState('')
+ const { t } = useTranslation(['common', 'workflowModels'])
const searchLabel = t(($) => $['nodes.knowledgeRetrieval.metadata.panel.search'], {
ns: 'workflowModels',
})
- const filteredMetadataList = useMemo(() => {
- return metadataList?.filter((metadata) => metadata.name.includes(searchText))
- }, [metadataList, searchText])
-
- const handleAddConditionWrapped = useCallback(
- (item: MetadataInDoc) => {
- handleAddCondition?.(item)
- setOpen(false)
- },
- [handleAddCondition],
- )
-
return (
- <Popover open={open} onOpenChange={setOpen}>
- <PopoverTrigger
- render={
- <Button size="small" variant="secondary">
- <RiAddLine className="size-3.5" />
- {t(($) => $['nodes.knowledgeRetrieval.metadata.panel.add'], { ns: 'workflowModels' })}
- </Button>
- }
- />
- <PopoverContent
- placement="bottom-start"
- sideOffset={12}
- className="border-none bg-transparent p-0 shadow-none backdrop-blur-none"
- >
- <div className="w-[320px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur shadow-lg">
- <div className="p-2 pb-1">
- <InputGroup>
- <InputGroupInput
- type="search"
- aria-label={searchLabel}
- autoComplete="off"
- className="[&::-webkit-search-cancel-button]:appearance-none [&::-webkit-search-decoration]:appearance-none"
- placeholder={searchLabel}
- value={searchText}
- onValueChange={setSearchText}
- />
- <InputGroupAddon className="ps-2 pe-0.5">
- <span
- aria-hidden="true"
- className="i-ri-search-line size-4 text-components-input-text-placeholder"
- />
- </InputGroupAddon>
- </InputGroup>
- </div>
- <div className="p-1">
- {filteredMetadataList?.map((metadata) => (
- <button
- type="button"
+ <DropdownMenuFilterProvider>
+ <DropdownMenu>
+ <DropdownMenuTrigger render={<Button size="small" variant="secondary" />}>
+ <span aria-hidden="true" className="i-ri-add-line size-3.5" />
+ {t(($) => $['nodes.knowledgeRetrieval.metadata.panel.add'], { ns: 'workflowModels' })}
+ </DropdownMenuTrigger>
+ <DropdownMenuContent placement="bottom-start" sideOffset={12} className="w-80">
+ <DropdownMenuInputGroup>
+ <span
+ aria-hidden="true"
+ className="i-ri-search-line size-4 shrink-0 text-components-input-text-placeholder"
+ />
+ <DropdownMenuInput aria-label={searchLabel} placeholder={searchLabel} />
+ </DropdownMenuInputGroup>
+ <DropdownMenuEmpty>{t(($) => $.noData, { ns: 'common' })}</DropdownMenuEmpty>
+ <DropdownMenuList>
+ {metadataList?.map((metadata) => (
+ <DropdownMenuItem
key={metadata.name}
- className="flex h-6 w-full cursor-pointer appearance-none items-center rounded-md border-none bg-transparent px-3 text-start system-sm-medium text-text-secondary outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid"
- onClick={() => handleAddConditionWrapped(metadata)}
+ label={metadata.name}
+ onClick={() => handleAddCondition?.(metadata)}
>
- <div className="mr-1 p-px">
- <MetadataIcon type={metadata.type} />
- </div>
- <div className="grow truncate" title={metadata.name}>
+ <MetadataIcon type={metadata.type} />
+ <span className="grow truncate" title={metadata.name}>
{metadata.name}
- </div>
- <div className="shrink-0 system-xs-regular text-text-tertiary">{metadata.type}</div>
- </button>
+ </span>
+ <span className="shrink-0 system-xs-regular text-text-tertiary">
+ {metadata.type}
+ </span>
+ </DropdownMenuItem>
))}
- </div>
- </div>
- </PopoverContent>
- </Popover>
+ </DropdownMenuList>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </DropdownMenuFilterProvider>
)
}
diff --git a/web/features/agent-v2/agent-detail/access-config/__tests__/page.spec.tsx b/web/features/agent-v2/agent-detail/access-config/__tests__/page.spec.tsx
index f7504e6a27e..ceecbd94be1 100644
--- a/web/features/agent-v2/agent-detail/access-config/__tests__/page.spec.tsx
+++ b/web/features/agent-v2/agent-detail/access-config/__tests__/page.spec.tsx
@@ -162,11 +162,7 @@ describe('AgentAccessConfigPage', () => {
it('adds a workspace member with the default permission set', async () => {
setup()
await userEvent.click(screen.getByRole('button', { name: 'common.operation.add' }))
- await userEvent.click(
- await screen.findByRole('button', {
- name: 'permission.accessRule.addMemberAria:{"name":"Mia"}',
- }),
- )
+ await userEvent.click(await screen.findByRole('menuitem', { name: /Mia/ }))
await waitFor(() => expect(screen.getByRole('row', { name: /Mia/ })).toBeInTheDocument())
const mutation = sent.find((req) => req.method === 'PUT')!
expect(new URL(mutation.url).pathname).toMatch(/\/users\/mia\/access-policies$/)
diff --git a/web/i18n/locales/ar-TN/permission.json b/web/i18n/locales/ar-TN/permission.json
index 2b135ed385b..1556d830fce 100644
--- a/web/i18n/locales/ar-TN/permission.json
+++ b/web/i18n/locales/ar-TN/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "إذن الوصول",
"accessRule.actions": "الإجراءات",
- "accessRule.addMemberAria": "إضافة {{name}}",
"accessRule.addMembersTitle": "إضافة أعضاء",
"accessRule.agentDescription": "إدارة من يمكنه الوصول إلى هذا الوكيل وأذوناتهم.",
"accessRule.agentTitle": "مجموعة أذونات الوكيل",
diff --git a/web/i18n/locales/az-AZ/permission.json b/web/i18n/locales/az-AZ/permission.json
index 3fa5e3d161c..a7edf446bf0 100644
--- a/web/i18n/locales/az-AZ/permission.json
+++ b/web/i18n/locales/az-AZ/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Giriş icazəsi",
"accessRule.actions": "Əməliyyatlar",
- "accessRule.addMemberAria": "{{name}} adlı üzvü əlavə et",
"accessRule.addMembersTitle": "Üzvlərin əlavə edilməsi",
"accessRule.agentDescription": "Bu agentə kimin daxil ola biləcəyini və onların icazələrini idarə edin.",
"accessRule.agentTitle": "Agentin icazə dəsti",
diff --git a/web/i18n/locales/de-DE/permission.json b/web/i18n/locales/de-DE/permission.json
index 6cd358b3bc2..07bc86038eb 100644
--- a/web/i18n/locales/de-DE/permission.json
+++ b/web/i18n/locales/de-DE/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Zugriffsberechtigung",
"accessRule.actions": "Aktionen",
- "accessRule.addMemberAria": "{{name}} hinzufügen",
"accessRule.addMembersTitle": "Mitglieder hinzufügen",
"accessRule.agentDescription": "Verwalte, wer auf diesen Agenten zugreifen kann und welche Berechtigungen diese Personen haben.",
"accessRule.agentTitle": "Agent-Berechtigungssatz",
diff --git a/web/i18n/locales/en-US/permission.json b/web/i18n/locales/en-US/permission.json
index ee3ba4f0794..07f8bc423b3 100644
--- a/web/i18n/locales/en-US/permission.json
+++ b/web/i18n/locales/en-US/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Access permission",
"accessRule.actions": "Actions",
- "accessRule.addMemberAria": "Add {{name}}",
"accessRule.addMembersTitle": "Add members",
"accessRule.agentDescription": "Manage who can access this agent and their permissions.",
"accessRule.agentTitle": "Agent Permission Set",
diff --git a/web/i18n/locales/es-ES/permission.json b/web/i18n/locales/es-ES/permission.json
index 99883594287..c79f8c1c03d 100644
--- a/web/i18n/locales/es-ES/permission.json
+++ b/web/i18n/locales/es-ES/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Permiso de acceso",
"accessRule.actions": "Acciones",
- "accessRule.addMemberAria": "Añadir {{name}}",
"accessRule.addMembersTitle": "Añadir miembros",
"accessRule.agentDescription": "Gestiona quién puede acceder a este agente y sus permisos.",
"accessRule.agentTitle": "Conjunto de permisos de agente",
diff --git a/web/i18n/locales/fa-IR/permission.json b/web/i18n/locales/fa-IR/permission.json
index 8a1d3f6569d..8302e4037e2 100644
--- a/web/i18n/locales/fa-IR/permission.json
+++ b/web/i18n/locales/fa-IR/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "مجوز دسترسی",
"accessRule.actions": "اقدامات",
- "accessRule.addMemberAria": "افزودن {{name}}",
"accessRule.addMembersTitle": "افزودن اعضا",
"accessRule.agentDescription": "دسترسی کاربران به این عامل و مجوزهای آن‌ها را مدیریت کنید.",
"accessRule.agentTitle": "مجموعه مجوز عامل",
diff --git a/web/i18n/locales/fr-FR/permission.json b/web/i18n/locales/fr-FR/permission.json
index 36836bce1d9..ccbe941acfb 100644
--- a/web/i18n/locales/fr-FR/permission.json
+++ b/web/i18n/locales/fr-FR/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Autorisation d’accès",
"accessRule.actions": "Actions",
- "accessRule.addMemberAria": "Ajouter {{name}}",
"accessRule.addMembersTitle": "Ajouter des membres",
"accessRule.agentDescription": "Gérez les personnes pouvant accéder à cet agent et leurs autorisations.",
"accessRule.agentTitle": "Ensemble d'autorisations d’agent",
diff --git a/web/i18n/locales/hi-IN/permission.json b/web/i18n/locales/hi-IN/permission.json
index 49d68981997..e9c30c2f77a 100644
--- a/web/i18n/locales/hi-IN/permission.json
+++ b/web/i18n/locales/hi-IN/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "पहुँच अनुमति",
"accessRule.actions": "क्रियाएं",
- "accessRule.addMemberAria": "{{name}} जोड़ें",
"accessRule.addMembersTitle": "सदस्य जोड़ें",
"accessRule.agentDescription": "इस एजेंट तक किसकी पहुँच है और उनकी अनुमतियाँ प्रबंधित करें।",
"accessRule.agentTitle": "एजेंट अनुमति सेट",
diff --git a/web/i18n/locales/id-ID/permission.json b/web/i18n/locales/id-ID/permission.json
index 8f6b6f982eb..2a755dd277b 100644
--- a/web/i18n/locales/id-ID/permission.json
+++ b/web/i18n/locales/id-ID/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Izin akses",
"accessRule.actions": "Tindakan",
- "accessRule.addMemberAria": "Tambahkan {{name}}",
"accessRule.addMembersTitle": "Tambahkan anggota",
"accessRule.agentDescription": "Kelola siapa yang dapat mengakses agen ini beserta izinnya.",
"accessRule.agentTitle": "Set izin Agen",
diff --git a/web/i18n/locales/it-IT/permission.json b/web/i18n/locales/it-IT/permission.json
index 32f78abc1fd..e11803072c0 100644
--- a/web/i18n/locales/it-IT/permission.json
+++ b/web/i18n/locales/it-IT/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Autorizzazione di accesso",
"accessRule.actions": "Azioni",
- "accessRule.addMemberAria": "Aggiungi {{name}}",
"accessRule.addMembersTitle": "Aggiungi membri",
"accessRule.agentDescription": "Gestisci chi può accedere a questo agente e i relativi permessi.",
"accessRule.agentTitle": "Set di permessi per agente",
diff --git a/web/i18n/locales/ja-JP/permission.json b/web/i18n/locales/ja-JP/permission.json
index 73f4594704b..d97faf1d69a 100644
--- a/web/i18n/locales/ja-JP/permission.json
+++ b/web/i18n/locales/ja-JP/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "アクセス権限",
"accessRule.actions": "アクション",
- "accessRule.addMemberAria": "{{name}} を追加",
"accessRule.addMembersTitle": "メンバーを追加",
"accessRule.agentDescription": "このエージェントにアクセスできるメンバーと権限を管理します。",
"accessRule.agentTitle": "エージェント権限セット",
diff --git a/web/i18n/locales/ko-KR/permission.json b/web/i18n/locales/ko-KR/permission.json
index 6dac8ad8006..9423f41f9e8 100644
--- a/web/i18n/locales/ko-KR/permission.json
+++ b/web/i18n/locales/ko-KR/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "액세스 권한",
"accessRule.actions": "작업",
- "accessRule.addMemberAria": "{{name}} 추가",
"accessRule.addMembersTitle": "멤버 추가",
"accessRule.agentDescription": "이 에이전트에 접근할 수 있는 멤버와 권한을 관리합니다.",
"accessRule.agentTitle": "에이전트 권한 집합",
diff --git a/web/i18n/locales/lo-LA/permission.json b/web/i18n/locales/lo-LA/permission.json
index 47e90d0c7a5..2574682762a 100644
--- a/web/i18n/locales/lo-LA/permission.json
+++ b/web/i18n/locales/lo-LA/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "ສິດໃນການເຂົ້າເຖິງ",
"accessRule.actions": "ການຈັດການ",
- "accessRule.addMemberAria": "ເພີ່ມ {{name}}",
"accessRule.addMembersTitle": "ເພີ່ມສະມາຊິກ",
"accessRule.agentDescription": "ຈັດການຜູ້ທີ່ສາມາດເຂົ້າເຖິງຕົວແທນນີ້ ແລະ ສິດຂອງພວກເຂົາ.",
"accessRule.agentTitle": "ຊຸດການກຳນົດສິດຕົວແທນ",
diff --git a/web/i18n/locales/nl-NL/permission.json b/web/i18n/locales/nl-NL/permission.json
index fb04cad12e5..774f12a5687 100644
--- a/web/i18n/locales/nl-NL/permission.json
+++ b/web/i18n/locales/nl-NL/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Toegangsrecht",
"accessRule.actions": "Acties",
- "accessRule.addMemberAria": "{{name}} toevoegen",
"accessRule.addMembersTitle": "Leden toevoegen",
"accessRule.agentDescription": "Beheer wie toegang heeft tot deze agent en welke rechten zij hebben.",
"accessRule.agentTitle": "Agent-rechtenset",
diff --git a/web/i18n/locales/pl-PL/permission.json b/web/i18n/locales/pl-PL/permission.json
index 99bf1ffbd29..8ebcdbe9870 100644
--- a/web/i18n/locales/pl-PL/permission.json
+++ b/web/i18n/locales/pl-PL/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Uprawnienie dostępu",
"accessRule.actions": "Akcje",
- "accessRule.addMemberAria": "Dodaj {{name}}",
"accessRule.addMembersTitle": "Dodaj członków",
"accessRule.agentDescription": "Zarządzaj dostępem do tego agenta i uprawnieniami użytkowników.",
"accessRule.agentTitle": "Zestaw uprawnień agenta",
diff --git a/web/i18n/locales/pt-BR/permission.json b/web/i18n/locales/pt-BR/permission.json
index a50009259b9..d48e93d009a 100644
--- a/web/i18n/locales/pt-BR/permission.json
+++ b/web/i18n/locales/pt-BR/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Permissão de acesso",
"accessRule.actions": "Ações",
- "accessRule.addMemberAria": "Adicionar {{name}}",
"accessRule.addMembersTitle": "Adicionar membros",
"accessRule.agentDescription": "Gerencie quem pode acessar este agente e suas permissões.",
"accessRule.agentTitle": "Conjunto de permissões de Agente",
diff --git a/web/i18n/locales/ro-RO/permission.json b/web/i18n/locales/ro-RO/permission.json
index 7df20eeb5b1..71f0e6531dc 100644
--- a/web/i18n/locales/ro-RO/permission.json
+++ b/web/i18n/locales/ro-RO/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Permisiune de acces",
"accessRule.actions": "Acțiuni",
- "accessRule.addMemberAria": "Adaugă {{name}}",
"accessRule.addMembersTitle": "Adaugă membri",
"accessRule.agentDescription": "Gestionează cine poate accesa acest agent și permisiunile acestora.",
"accessRule.agentTitle": "Set de permisiuni pentru agent",
diff --git a/web/i18n/locales/ru-RU/permission.json b/web/i18n/locales/ru-RU/permission.json
index 4cd3f6570d0..76c553c9f5e 100644
--- a/web/i18n/locales/ru-RU/permission.json
+++ b/web/i18n/locales/ru-RU/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Разрешение на доступ",
"accessRule.actions": "Действия",
- "accessRule.addMemberAria": "Добавить {{name}}",
"accessRule.addMembersTitle": "Добавить участников",
"accessRule.agentDescription": "Управляйте доступом к этому агенту и правами пользователей.",
"accessRule.agentTitle": "Набор прав агента",
diff --git a/web/i18n/locales/sl-SI/permission.json b/web/i18n/locales/sl-SI/permission.json
index 8970da91f75..c764d146b56 100644
--- a/web/i18n/locales/sl-SI/permission.json
+++ b/web/i18n/locales/sl-SI/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Dovoljenje za dostop",
"accessRule.actions": "Dejanja",
- "accessRule.addMemberAria": "Dodaj {{name}}",
"accessRule.addMembersTitle": "Dodaj člane",
"accessRule.agentDescription": "Upravljajte dostop do tega agenta in dovoljenja uporabnikov.",
"accessRule.agentTitle": "Nabor dovoljenj za agenta",
diff --git a/web/i18n/locales/th-TH/permission.json b/web/i18n/locales/th-TH/permission.json
index fd272df312e..be7231afe1e 100644
--- a/web/i18n/locales/th-TH/permission.json
+++ b/web/i18n/locales/th-TH/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "สิทธิ์การเข้าถึง",
"accessRule.actions": "การดําเนินการ",
- "accessRule.addMemberAria": "เพิ่ม {{name}}",
"accessRule.addMembersTitle": "เพิ่มสมาชิก",
"accessRule.agentDescription": "จัดการผู้ที่เข้าถึงตัวแทนนี้ได้และสิทธิ์ของผู้ใช้",
"accessRule.agentTitle": "ชุดสิทธิ์ตัวแทน",
diff --git a/web/i18n/locales/tr-TR/permission.json b/web/i18n/locales/tr-TR/permission.json
index 7ae76b90305..428e565cdb1 100644
--- a/web/i18n/locales/tr-TR/permission.json
+++ b/web/i18n/locales/tr-TR/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Erişim izni",
"accessRule.actions": "Eylemler",
- "accessRule.addMemberAria": "{{name}} ekle",
"accessRule.addMembersTitle": "Üye ekle",
"accessRule.agentDescription": "Bu ajana kimlerin erişebileceğini ve izinlerini yönetin.",
"accessRule.agentTitle": "Ajan izin kümesi",
diff --git a/web/i18n/locales/uk-UA/permission.json b/web/i18n/locales/uk-UA/permission.json
index 87d332cd98e..be4d6f3917a 100644
--- a/web/i18n/locales/uk-UA/permission.json
+++ b/web/i18n/locales/uk-UA/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Дозвіл на доступ",
"accessRule.actions": "Дії",
- "accessRule.addMemberAria": "Додати {{name}}",
"accessRule.addMembersTitle": "Додати учасників",
"accessRule.agentDescription": "Керуйте доступом до цього агента та дозволами користувачів.",
"accessRule.agentTitle": "Набір дозволів агента",
diff --git a/web/i18n/locales/vi-VN/permission.json b/web/i18n/locales/vi-VN/permission.json
index cdc48c0ea38..943e2391e22 100644
--- a/web/i18n/locales/vi-VN/permission.json
+++ b/web/i18n/locales/vi-VN/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "Quyền truy cập",
"accessRule.actions": "Hành động",
- "accessRule.addMemberAria": "Thêm {{name}}",
"accessRule.addMembersTitle": "Thêm thành viên",
"accessRule.agentDescription": "Quản lý những ai có thể truy cập tác nhân này và quyền của họ.",
"accessRule.agentTitle": "Bộ quyền tác nhân",
diff --git a/web/i18n/locales/zh-Hans/permission.json b/web/i18n/locales/zh-Hans/permission.json
index 9370a107903..5c0e689c153 100644
--- a/web/i18n/locales/zh-Hans/permission.json
+++ b/web/i18n/locales/zh-Hans/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "访问权限",
"accessRule.actions": "操作",
- "accessRule.addMemberAria": "添加 {{name}}",
"accessRule.addMembersTitle": "添加成员",
"accessRule.agentDescription": "管理可访问此 Agent 的成员及其权限。",
"accessRule.agentTitle": "Agent 权限集",
diff --git a/web/i18n/locales/zh-Hant/permission.json b/web/i18n/locales/zh-Hant/permission.json
index f983708357b..1a1c149d520 100644
--- a/web/i18n/locales/zh-Hant/permission.json
+++ b/web/i18n/locales/zh-Hant/permission.json
@@ -1,7 +1,6 @@
{
"accessRule.accessPermission": "存取權限",
"accessRule.actions": "操作",
- "accessRule.addMemberAria": "新增 {{name}}",
"accessRule.addMembersTitle": "新增成員",
"accessRule.agentDescription": "管理可存取此 Agent 的成員及其權限。",
"accessRule.agentTitle": "Agent 權限集",
diff --git a/web/i18n/resources.generated.d.ts b/web/i18n/resources.generated.d.ts
index 7829f211584..ee0782a666b 100644
--- a/web/i18n/resources.generated.d.ts
+++ b/web/i18n/resources.generated.d.ts
@@ -3628,7 +3628,6 @@ export default interface Resources {
permission: {
'accessRule.accessPermission': 'Access permission'
'accessRule.actions': 'Actions'
- 'accessRule.addMemberAria': 'Add {{name}}'
'accessRule.addMembersTitle': 'Add members'
'accessRule.agentDescription': 'Manage who can access this agent and their permissions.'
'accessRule.agentTitle': 'Agent Permission Set'