onSelectedChange?.(accountId, checked)}
/>
-
- {setting.account.account_name}
-
+ {accountName}
{isMaintainer && (
{t(($) => $['accessRule.maintainer'], { ns: 'permission' })}
@@ -117,7 +116,7 @@ function UserAccessPolicyRow({
$['accessRule.exceptionPermissionFor'], {
ns: 'permission',
- name: setting.account.account_name,
+ name: accountName,
})}
size="small"
disabled={isPolicySelectDisabled}
@@ -126,7 +125,7 @@ function UserAccessPolicyRow({
{selectedPolicyId === DEFAULT_ACCESS_POLICY_ID
? defaultAccessPolicyName
- : setting.access_policies[0]?.name}
+ : selectedPolicy?.name}
diff --git a/web/app/components/app/create-app-dropdown.tsx b/web/app/components/app/create-app-dropdown.tsx
index 9d7290674bc..ee8d6301e30 100644
--- a/web/app/components/app/create-app-dropdown.tsx
+++ b/web/app/components/app/create-app-dropdown.tsx
@@ -15,9 +15,9 @@ import {
} from '@/app/components/step-by-step-tour/dropdown-menu'
type CreateAppDropdownProps = {
- onCreateBlank: () => void
+ onCreateBlank?: () => void
onCreateTemplate?: () => void
- onImportDSL: () => void
+ onImportDSL?: () => void
stepByStepTourControlledOpen?: boolean
stepByStepTourTarget?: string
stepByStepTourHighlightPart?: string
@@ -62,56 +62,64 @@ export function CreateAppDropdown({
className: 'w-70 p-0',
})}
>
-
-
-
-
- {t(($) => $['newApp.startFromBlank'], { ns: 'app' })}
-
-
- {onCreateTemplate && (
+ {(onCreateBlank || onCreateTemplate) && (
+
+ {onCreateBlank && (
+
+
+
+ {t(($) => $['newApp.startFromBlank'], { ns: 'app' })}
+
+
+ )}
+ {onCreateTemplate && (
+
+
+
+ {t(($) => $['newApp.startFromTemplate'], { ns: 'app' })}
+
+
+ )}
+
+ )}
+ {onImportDSL && (onCreateBlank || onCreateTemplate) && (
+
+ )}
+ {onImportDSL && (
+
-
-
- {t(($) => $['newApp.startFromTemplate'], { ns: 'app' })}
+
+
+
+
+
+ {t(($) => $.importDSL, { ns: 'app' })}
+
+
+ {t(($) => $['newApp.dropDSLToCreateApp'], { ns: 'app' })}
+
- )}
-
-
-
-
-
-
-
-
-
- {t(($) => $.importDSL, { ns: 'app' })}
-
-
- {t(($) => $['newApp.dropDSLToCreateApp'], { ns: 'app' })}
-
-
-
-
+
+ )}
)
diff --git a/web/app/components/goto-anything/__tests__/index.spec.tsx b/web/app/components/goto-anything/__tests__/index.spec.tsx
index 4cc4b3a0751..1cc2c2582e9 100644
--- a/web/app/components/goto-anything/__tests__/index.spec.tsx
+++ b/web/app/components/goto-anything/__tests__/index.spec.tsx
@@ -130,7 +130,6 @@ vi.mock('../actions/agent', () => ({
const visibilityState = vi.hoisted(() => ({
agentEnabled: true,
- canManageAgents: true,
datasetOperator: false,
enableSkill: true,
}))
@@ -147,10 +146,6 @@ vi.mock('@/features/agent-v2/feature-flag', () => ({
isAgentV2Enabled: () => visibilityState.agentEnabled,
}))
-vi.mock('@/features/agent-v2/permissions', () => ({
- useCanManageAgents: () => visibilityState.canManageAgents,
-}))
-
vi.mock(
'@/app/components/plugins/install-plugin/hooks/use-workspace-plugin-install-permission',
() => ({
@@ -273,7 +268,6 @@ describe('GotoAnything', () => {
previousRemoteData = {}
matchActionMock.mockReset()
visibilityState.agentEnabled = true
- visibilityState.canManageAgents = true
visibilityState.datasetOperator = false
visibilityState.enableSkill = true
mockFindCommand = null
@@ -419,26 +413,10 @@ describe('GotoAnything', () => {
describe('search functionality', () => {
it.each([
- [
- { agentEnabled: true, canManageAgents: true, datasetOperator: false, enableSkill: true },
- true,
- true,
- ],
- [
- { agentEnabled: false, canManageAgents: true, datasetOperator: false, enableSkill: true },
- false,
- true,
- ],
- [
- { agentEnabled: true, canManageAgents: false, datasetOperator: true, enableSkill: true },
- false,
- false,
- ],
- [
- { agentEnabled: true, canManageAgents: true, datasetOperator: false, enableSkill: false },
- true,
- false,
- ],
+ [{ agentEnabled: true, datasetOperator: false, enableSkill: true }, true, true],
+ [{ agentEnabled: false, datasetOperator: false, enableSkill: true }, false, true],
+ [{ agentEnabled: true, datasetOperator: true, enableSkill: true }, true, false],
+ [{ agentEnabled: true, datasetOperator: false, enableSkill: false }, true, false],
] as const)(
'matches scope visibility to workspace capabilities',
(visibility, agents, skills) => {
diff --git a/web/app/components/goto-anything/actions/__tests__/agent.spec.tsx b/web/app/components/goto-anything/actions/__tests__/agent.spec.tsx
index 5a11cce8ae1..6949e886050 100644
--- a/web/app/components/goto-anything/actions/__tests__/agent.spec.tsx
+++ b/web/app/components/goto-anything/actions/__tests__/agent.spec.tsx
@@ -24,6 +24,7 @@ function agent(overrides: Partial = {}): AgentAppPartial {
description: 'Investigates a topic',
mode: 'agent-chat',
icon_url: null,
+ permission_keys: [],
...overrides,
}
}
diff --git a/web/app/components/goto-anything/actions/commands/__tests__/slash.spec.tsx b/web/app/components/goto-anything/actions/commands/__tests__/slash.spec.tsx
index 09467e3ef40..79eba4cbde2 100644
--- a/web/app/components/goto-anything/actions/commands/__tests__/slash.spec.tsx
+++ b/web/app/components/goto-anything/actions/commands/__tests__/slash.spec.tsx
@@ -49,9 +49,6 @@ vi.mock('@/i18n-config', () => ({
vi.mock('@/features/agent-v2/feature-flag', () => ({
isAgentV2Enabled: () => true,
}))
-vi.mock('@/features/agent-v2/permissions', () => ({
- useCanManageAgents: () => true,
-}))
vi.mock('../command-bus', () => ({
executeCommand: (...args: unknown[]) => mockExecuteCommand(...args),
diff --git a/web/app/components/goto-anything/actions/commands/slash-provider.tsx b/web/app/components/goto-anything/actions/commands/slash-provider.tsx
index 0c1ce0c3c32..60f74003288 100644
--- a/web/app/components/goto-anything/actions/commands/slash-provider.tsx
+++ b/web/app/components/goto-anything/actions/commands/slash-provider.tsx
@@ -6,7 +6,6 @@ import { ENABLE_FEATURE_PREVIEW } from '@/config'
import { useDocLink } from '@/context/i18n'
import { isCurrentWorkspaceDatasetOperatorAtom } from '@/context/workspace-state'
import { isAgentV2Enabled } from '@/features/agent-v2/feature-flag'
-import { useCanManageAgents } from '@/features/agent-v2/permissions'
import { setLocaleOnClient } from '@/i18n-config'
import { accountCommand } from './account'
import { createCommand } from './create'
@@ -61,9 +60,8 @@ const unregisterSlashCommands = () => {
export const SlashCommandProvider = () => {
const theme = useTheme()
const getDocsHomeUrl = useDocLink()
- const canManageAgents = useCanManageAgents()
const isCurrentWorkspaceDatasetOperator = useAtomValue(isCurrentWorkspaceDatasetOperatorAtom)
- const agentsAvailable = isAgentV2Enabled() && canManageAgents
+ const agentsAvailable = isAgentV2Enabled()
const skillsAvailable = !isCurrentWorkspaceDatasetOperator
useEffect(() => {
registerSlashCommands({
diff --git a/web/app/components/goto-anything/index.tsx b/web/app/components/goto-anything/index.tsx
index b0a23c860e2..052eaaefd2b 100644
--- a/web/app/components/goto-anything/index.tsx
+++ b/web/app/components/goto-anything/index.tsx
@@ -42,7 +42,6 @@ import { selectWorkflowNode } from '@/app/components/workflow/utils/node-navigat
import { useGetLanguage } from '@/context/i18n'
import { isCurrentWorkspaceDatasetOperatorAtom } from '@/context/workspace-state'
import { isAgentV2Enabled } from '@/features/agent-v2/feature-flag'
-import { useCanManageAgents } from '@/features/agent-v2/permissions'
import { usePathname, useRouter } from '@/next/navigation'
import { consoleQuery } from '@/service/console'
import { PluginInstallPermissionProvider } from '../plugins/install-plugin/components/plugin-install-permission-provider'
@@ -231,14 +230,13 @@ export function GotoAnything() {
const pathname = usePathname()
const router = useRouter()
const defaultLocale = useGetLanguage()
- const canManageAgents = useCanManageAgents()
const isCurrentWorkspaceDatasetOperator = useAtomValue(isCurrentWorkspaceDatasetOperatorAtom)
const { data: enableSkill } = useQuery(
consoleQuery.features.get.queryOptions({
select: (features) => features.enable_skill,
}),
)
- const agentsAvailable = isAgentV2Enabled() && canManageAgents
+ const agentsAvailable = isAgentV2Enabled()
const skillsAvailable = enableSkill === true && !isCurrentWorkspaceDatasetOperator
const isWorkflowPage =
appWorkflowPathPattern.test(pathname) || sharedWorkflowPathPattern.test(pathname)
diff --git a/web/app/components/header/account-setting/__tests__/permission-group-list.spec.tsx b/web/app/components/header/account-setting/__tests__/permission-group-list.spec.tsx
index 062fa3cc61a..6e84c8e014b 100644
--- a/web/app/components/header/account-setting/__tests__/permission-group-list.spec.tsx
+++ b/web/app/components/header/account-setting/__tests__/permission-group-list.spec.tsx
@@ -37,11 +37,8 @@ const permissionGroups = [
}),
]
-const getPermissionRow = (permissionName: string) =>
- screen.getByText(permissionName).closest('div')!
-
const getPermissionCheckbox = (permissionName: string) =>
- within(getPermissionRow(permissionName)).getByRole('checkbox')
+ screen.getByRole('checkbox', { name: permissionName })
describe('PermissionGroupList', () => {
beforeEach(() => {
diff --git a/web/app/components/header/account-setting/access-rules-page/__tests__/access-rule-section.spec.tsx b/web/app/components/header/account-setting/access-rules-page/__tests__/access-rule-section.spec.tsx
index 5eed388f2fa..40d97383f55 100644
--- a/web/app/components/header/account-setting/access-rules-page/__tests__/access-rule-section.spec.tsx
+++ b/web/app/components/header/account-setting/access-rules-page/__tests__/access-rule-section.spec.tsx
@@ -1,5 +1,5 @@
import type { ReactNode } from 'react'
-import type { AccessPolicyWithBindings } from '@/models/access-control'
+import type { AccessRule } from '../types'
import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
import { screen } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
@@ -17,7 +17,7 @@ vi.mock('@/context/permission-state', async () => {
}))
})
-const rule: AccessPolicyWithBindings = {
+const rule: AccessRule = {
policy: {
id: 'app-rule-1',
tenant_id: 'tenant-1',
@@ -28,8 +28,8 @@ const rule: AccessPolicyWithBindings = {
permission_keys: ['app.edit'],
is_builtin: true,
category: 'global_system_default',
- created_at: '2026-01-01',
- updated_at: '2026-01-01',
+ created_at: 1767225600,
+ updated_at: 1767225600,
},
roles: [
{
@@ -44,6 +44,8 @@ const rule: AccessPolicyWithBindings = {
{
account_id: 'account-1',
account_name: 'Levi',
+ avatar: '',
+ email: 'levi@example.com',
binding_id: 'account-binding-1',
is_locked: false,
},
diff --git a/web/app/components/header/account-setting/access-rules-page/__tests__/index.spec.tsx b/web/app/components/header/account-setting/access-rules-page/__tests__/index.spec.tsx
index 6d498d4fe85..e4799d12ea1 100644
--- a/web/app/components/header/account-setting/access-rules-page/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/access-rules-page/__tests__/index.spec.tsx
@@ -1,274 +1,204 @@
-import type { AccessPolicyWithBindings } from '@/models/access-control'
-import { toast } from '@langgenius/dify-ui/toast'
-import { render, screen } from '@testing-library/react'
+import { act, render, screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
-import {
- useCreateAccessRule,
- useInfiniteWorkspaceAppAccessRules,
- useInfiniteWorkspaceDatasetAccessRules,
- useUpdateAccessRule,
-} from '@/service/access-control/use-workspace-access-rules'
+import { consoleQuery } from '@/service/console'
+import { createConsoleQueryWrapper } from '@/test/console/query-data'
+import { seedWorkspacePermissionsQuery } from '@/test/console/workspace-permissions'
+import { createAccessPolicyFixture } from '@/test/fixtures/access-policy'
import AccessRulesPage from '../index'
-const mocks = vi.hoisted(() => ({
- createAccessRule: vi.fn(),
- updateAccessRule: vi.fn(),
+const request = vi.hoisted(() => vi.fn())
+vi.mock('@/service/base', async (importOriginal) => ({
+ ...(await importOriginal()),
+ request,
}))
-vi.mock('@langgenius/dify-ui/toast', () => ({
- toast: {
- success: vi.fn(),
- },
-}))
-
-vi.mock('@/service/access-control/use-workspace-access-rules', () => ({
- workspaceAccessRulesQueryKeys: {
- app: () => ['workspace-access-rules', 'app'],
- dataset: () => ['workspace-access-rules', 'dataset'],
- },
- useCreateAccessRule: vi.fn(),
- useInfiniteWorkspaceAppAccessRules: vi.fn(),
- useInfiniteWorkspaceDatasetAccessRules: vi.fn(),
- useUpdateAccessRule: vi.fn(),
-}))
-
-vi.mock('../access-rule-section', () => ({
- default: ({
- title,
- rules,
- onCreate,
- onEditRule,
- }: {
- title: string
- rules: AccessPolicyWithBindings[]
- onCreate: () => void
- onEditRule: (rule: AccessPolicyWithBindings) => void
- }) => (
-
- {title}
-
-
-
- ),
-}))
-
-vi.mock('../permission-set-modal', () => ({
- default: ({
- mode,
- resourceType,
- initialValues,
- onSubmit,
- }: {
- mode: string
- resourceType: string
- initialValues?: { name: string; description: string; permissionKeys: string[] }
- onSubmit: (values: { name: string; description: string; permissionKeys: string[] }) => void
- }) => (
-
- {initialValues?.name}
-
-
- ),
-}))
-
-const appRule: AccessPolicyWithBindings = {
- policy: {
- id: 'app-rule-1',
- tenant_id: 'tenant-1',
- resource_type: 'app',
- policy_key: 'app-rule',
- name: 'App rule',
- description: 'App rule description',
- permission_keys: ['app.acl.edit'],
- is_builtin: false,
- category: 'global_custom',
- created_at: '2026-01-01',
- updated_at: '2026-01-01',
- },
- roles: [
- {
- role_id: 'role-1',
- role_name: 'Role 1',
- binding_id: 'role-binding-1',
- is_locked: false,
- role_tag: '',
- },
- ],
- accounts: [
- {
- account_id: 'member-1',
- account_name: 'Member 1',
- binding_id: 'member-binding-1',
- is_locked: false,
- },
- ],
+const pagination = { total_count: 1, per_page: 20, current_page: 1, total_pages: 1 }
+const providers = {
+ app: consoleQuery.workspaces.current.rbac.workspace.apps.accessPolicy.get,
+ dataset: consoleQuery.workspaces.current.rbac.workspace.datasets.accessPolicy.get,
+ agent: consoleQuery.workspaces.current.rbac.workspace.agents.accessPolicy.get,
}
+const resourceTypes = ['app', 'dataset', 'agent'] as const
+const sent: Request[] = []
-const datasetRule: AccessPolicyWithBindings = {
- policy: {
- ...appRule.policy,
- id: 'dataset-rule-1',
- resource_type: 'dataset',
- policy_key: 'dataset-rule',
- name: 'Dataset rule',
- permission_keys: ['dataset.acl.edit'],
- },
- roles: [
- {
- role_id: 'dataset-role-1',
- role_name: 'Dataset Role 1',
- binding_id: 'dataset-role-binding-1',
- is_locked: false,
- role_tag: '',
- },
- ],
- accounts: [
- {
- account_id: 'dataset-member-1',
- account_name: 'Dataset Member 1',
- binding_id: 'dataset-member-binding-1',
- is_locked: false,
- },
- ],
-}
-
-const mockMutation = (mock: ReturnType) => {
- mock.mockImplementation((_payload, options) => {
- options?.onSuccess?.()
- return Promise.resolve()
+function setup({ canManage = true, builtin = false } = {}) {
+ const { wrapper, queryClient } = createConsoleQueryWrapper({
+ workspacePermissionKeys: canManage ? ['workspace.role.manage'] : [],
})
-
- return {
- mutate: mock,
- mutateAsync: mock,
+ for (const resourceType of resourceTypes) {
+ const rule = createAccessPolicyFixture({
+ id: `${resourceType}-rule`,
+ resource_type: resourceType,
+ name: `${resourceType} rule`,
+ permission_keys: [`${resourceType}.acl.edit`],
+ is_builtin: builtin,
+ })
+ queryClient.setQueryData(
+ providers[resourceType].infiniteOptions({
+ input: (page) => ({ query: { language: 'en', page, limit: 20 } }),
+ initialPageParam: 1,
+ getNextPageParam: () => undefined,
+ }).queryKey,
+ {
+ pages: [{ items: [{ policy: rule, accounts: [], roles: [] }], pagination }],
+ pageParams: [1],
+ },
+ )
+ queryClient.setQueryData(
+ consoleQuery.workspaces.current.rbac.rolePermissions.catalog[resourceType].get.queryKey({
+ input: {},
+ }),
+ {
+ groups: [
+ {
+ group_key: `${resourceType}_acl`,
+ group_name: resourceType,
+ description: '',
+ permissions: [
+ { key: `${resourceType}.acl.edit`, name: 'Edit configuration', description: '' },
+ ],
+ },
+ ],
+ },
+ )
}
+ request.mockImplementation(
+ async (_url: string, _init: RequestInit, options: { request: Request }) => {
+ const req = options.request
+ sent.push(req.clone())
+ if (req.method === 'GET') {
+ const resourceType = new URL(req.url).pathname.includes('/datasets/')
+ ? 'dataset'
+ : new URL(req.url).pathname.includes('/apps/')
+ ? 'app'
+ : 'agent'
+ return Response.json({
+ items: [
+ {
+ policy: createAccessPolicyFixture({ resource_type: resourceType }),
+ accounts: [],
+ roles: [],
+ },
+ ],
+ pagination,
+ })
+ }
+ return Response.json(createAccessPolicyFixture())
+ },
+ )
+ return { ...render(, { wrapper }), queryClient }
}
-const pagination = {
- total_count: 1,
- per_page: 20,
- current_page: 1,
- total_pages: 1,
-}
-
-const setupHooks = () => {
- vi.mocked(useInfiniteWorkspaceAppAccessRules).mockReturnValue({
- data: { pages: [{ items: [appRule], pagination }], pageParams: [1] },
- isLoading: false,
- isFetchingNextPage: false,
- fetchNextPage: vi.fn(),
- hasNextPage: false,
- error: null,
- } as unknown as ReturnType)
- vi.mocked(useInfiniteWorkspaceDatasetAccessRules).mockReturnValue({
- data: { pages: [{ items: [datasetRule], pagination }], pageParams: [1] },
- isLoading: false,
- isFetchingNextPage: false,
- fetchNextPage: vi.fn(),
- hasNextPage: false,
- error: null,
- } as unknown as ReturnType)
- vi.mocked(useCreateAccessRule).mockReturnValue(
- mockMutation(mocks.createAccessRule) as unknown as ReturnType,
- )
- vi.mocked(useUpdateAccessRule).mockReturnValue(
- mockMutation(mocks.updateAccessRule) as unknown as ReturnType,
- )
+async function openSection(resourceType: (typeof resourceTypes)[number]) {
+ const trigger = screen.getByRole('button', {
+ name: new RegExp(`^permission.accessRule.${resourceType}Title`),
+ })
+ if (trigger.getAttribute('aria-expanded') !== 'true') await userEvent.click(trigger)
+ return trigger.closest('section')!
}
describe('AccessRulesPage', () => {
beforeEach(() => {
vi.clearAllMocks()
- setupHooks()
+ sent.length = 0
})
- it('renders app and dataset access rule sections', () => {
- render()
+ it('renders App, Dataset, and Agent permission sets', () => {
+ setup()
+ for (const type of resourceTypes)
+ expect(
+ screen.getByRole('button', { name: new RegExp(`^permission.accessRule.${type}Title`) }),
+ ).toBeInTheDocument()
+ })
+ it.each(resourceTypes)(
+ 'creates a %s permission set through the generated endpoint',
+ async (type) => {
+ setup()
+ const section = await openSection(type)
+ await userEvent.click(
+ within(section).getByRole('button', { name: 'permission.accessRule.newPermissionSet' }),
+ )
+ const dialog = screen.getByRole('dialog')
+ await userEvent.type(
+ within(dialog).getByRole('textbox', { name: /permissionSet.nameLabel/ }),
+ 'Custom policy',
+ )
+ await userEvent.click(
+ within(dialog).getByRole('checkbox', { name: new RegExp(`${type}.acl.edit`) }),
+ )
+ await userEvent.click(
+ within(dialog).getByRole('button', { name: 'common.operation.confirm' }),
+ )
+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
+ const mutation = sent.find((req) => req.method === 'POST')!
+ expect(new URL(mutation.url).pathname).toMatch(/\/rbac\/access-policies$/)
+ expect(await mutation.json()).toEqual({
+ name: 'Custom policy',
+ description: '',
+ permission_keys: [`${type}.acl.edit`],
+ resource_type: type,
+ })
+ },
+ )
+
+ it.each(resourceTypes)(
+ 'updates a %s permission set with the generated request body',
+ async (type) => {
+ setup()
+ const section = await openSection(type)
+ await userEvent.click(
+ within(section).getByRole('button', { name: 'common.operation.moreActions' }),
+ )
+ await userEvent.click(screen.getByRole('menuitem', { name: 'common.operation.edit' }))
+ await userEvent.type(
+ screen.getByRole('textbox', { name: 'permission.permissionSet.descriptionLabel' }),
+ ' updated',
+ )
+ await userEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
+ const mutation = sent.find((req) => req.method === 'PUT')!
+ expect(new URL(mutation.url).pathname).toMatch(new RegExp(`/access-policies/${type}-rule$`))
+ expect(await mutation.json()).toMatchObject({
+ name: `${type} rule`,
+ description: 'Edit Agent configuration updated',
+ permission_keys: [`${type}.acl.edit`],
+ })
+ },
+ )
+
+ it('keeps built-in Agent policies read-only and offers duplication', async () => {
+ setup({ builtin: true })
+ const section = await openSection('agent')
+ await userEvent.click(
+ within(section).getByRole('button', { name: 'common.operation.moreActions' }),
+ )
expect(
- screen.getByRole('heading', { name: 'permission.accessRule.appTitle' }),
- ).toBeInTheDocument()
+ screen.queryByRole('menuitem', { name: 'common.operation.delete' }),
+ ).not.toBeInTheDocument()
expect(
- screen.getByRole('heading', { name: 'permission.accessRule.datasetTitle' }),
+ screen.getByRole('menuitem', { name: 'permission.common.duplicateAction' }),
).toBeInTheDocument()
+ await userEvent.click(screen.getByRole('menuitem', { name: 'common.operation.view' }))
+ expect(screen.getByRole('textbox', { name: /permissionSet.nameLabel/ })).toBeDisabled()
+ expect(
+ screen.queryByRole('button', { name: 'common.operation.confirm' }),
+ ).not.toBeInTheDocument()
})
- it('creates app permission sets with app resource type', async () => {
- render()
-
+ it('closes a mutation dialog when role management is revoked', async () => {
+ const { queryClient } = setup()
+ const section = await openSection('agent')
await userEvent.click(
- screen.getByRole('button', { name: 'create permission.accessRule.appTitle' }),
+ within(section).getByRole('button', { name: 'permission.accessRule.newPermissionSet' }),
)
- await userEvent.click(screen.getByRole('button', { name: 'submit permission set' }))
-
- expect(mocks.createAccessRule).toHaveBeenCalledWith(
- {
- name: 'app permission',
- description: 'app description',
- permission_keys: ['app.acl.edit'],
- resourceType: 'app',
- },
- expect.any(Object),
- )
- expect(toast.success).toHaveBeenCalledWith('permission.accessRule.created')
- })
-
- it('creates dataset permission sets with dataset resource type', async () => {
- render()
-
- await userEvent.click(
- screen.getByRole('button', { name: 'create permission.accessRule.datasetTitle' }),
- )
- await userEvent.click(screen.getByRole('button', { name: 'submit permission set' }))
-
- expect(mocks.createAccessRule).toHaveBeenCalledWith(
- {
- name: 'dataset permission',
- description: 'dataset description',
- permission_keys: ['dataset.acl.edit'],
- resourceType: 'dataset',
- },
- expect.any(Object),
- )
- expect(toast.success).toHaveBeenCalledWith('permission.accessRule.created')
- })
-
- it('updates dataset permission sets with dataset resource type', async () => {
- render()
-
- await userEvent.click(
- screen.getByRole('button', { name: 'edit permission.accessRule.datasetTitle' }),
- )
- expect(screen.getByText('Dataset rule')).toBeInTheDocument()
- await userEvent.click(screen.getByRole('button', { name: 'submit permission set' }))
-
- expect(mocks.updateAccessRule).toHaveBeenCalledWith(
- {
- id: 'dataset-rule-1',
- name: 'dataset permission',
- description: 'dataset description',
- permission_keys: ['dataset.acl.edit'],
- resourceType: 'dataset',
- },
- expect.any(Object),
- )
- expect(toast.success).toHaveBeenCalledWith('permission.accessRule.updated')
+ act(() => {
+ seedWorkspacePermissionsQuery(queryClient, [])
+ })
+ await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
+ expect(
+ screen.queryByRole('button', { name: 'permission.accessRule.newPermissionSet' }),
+ ).not.toBeInTheDocument()
+ expect(sent.filter((req) => req.method !== 'GET')).toHaveLength(0)
})
})
diff --git a/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx b/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx
index 0c3b879227b..6e2a4bbae28 100644
--- a/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx
+++ b/web/app/components/header/account-setting/access-rules-page/access-rule-row-menu.tsx
@@ -1,6 +1,6 @@
'use client'
-import type { AccessPolicy } from '@/models/access-control'
+import type { AccessPolicy } from '@dify/contracts/api/console/workspaces/types.gen'
import {
AlertDialog,
AlertDialogActions,
@@ -19,12 +19,10 @@ import {
} from '@langgenius/dify-ui/dropdown-menu'
import { IconButton } from '@langgenius/dify-ui/icon-button'
import { toast } from '@langgenius/dify-ui/toast'
+import { useMutation } from '@tanstack/react-query'
import { useCallback, useState } from 'react'
import { useTranslation } from 'react-i18next'
-import {
- useCopyAccessRule,
- useDeleteAccessRule,
-} from '@/service/access-control/use-workspace-access-rules'
+import { consoleQuery } from '@/service/console'
type AccessRuleRowMenuProps = {
rule: AccessPolicy
@@ -37,9 +35,11 @@ const AccessRuleRowMenu = ({ rule, onView, onEdit }: AccessRuleRowMenuProps) =>
const [open, setOpen] = useState(false)
const [showDeleteConfirm, setShowDeleteConfirm] = useState(false)
- const { mutateAsync: copyAccessRule } = useCopyAccessRule(rule.resource_type)
- const { mutateAsync: deleteAccessRule, isPending: isDeletingAccessRule } = useDeleteAccessRule(
- rule.resource_type,
+ const { mutate: copyAccessRule } = useMutation(
+ consoleQuery.workspaces.current.rbac.accessPolicies.byPolicyId.copy.post.mutationOptions(),
+ )
+ const { mutate: deleteAccessRule, isPending: isDeletingAccessRule } = useMutation(
+ consoleQuery.workspaces.current.rbac.accessPolicies.byPolicyId.delete.mutationOptions(),
)
const handleView = useCallback(() => {
@@ -47,12 +47,15 @@ const AccessRuleRowMenu = ({ rule, onView, onEdit }: AccessRuleRowMenuProps) =>
}, [onView])
const handleCopyRules = useCallback(() => {
- copyAccessRule(rule.id, {
- onSuccess: () => {
- toast.success(t(($) => $['accessRule.copied'], { ns: 'permission' }))
- setOpen(false)
+ copyAccessRule(
+ { params: { policy_id: rule.id } },
+ {
+ onSuccess: () => {
+ toast.success(t(($) => $['accessRule.copied'], { ns: 'permission' }))
+ setOpen(false)
+ },
},
- })
+ )
}, [copyAccessRule, rule.id, t])
const openDeleteConfirm = useCallback(() => {
@@ -61,12 +64,15 @@ const AccessRuleRowMenu = ({ rule, onView, onEdit }: AccessRuleRowMenuProps) =>
}, [])
const handleDelete = useCallback(() => {
- deleteAccessRule(rule.id, {
- onSuccess: () => {
- toast.success(t(($) => $['accessRule.deleted'], { ns: 'permission' }))
- setShowDeleteConfirm(false)
+ deleteAccessRule(
+ { params: { policy_id: rule.id } },
+ {
+ onSuccess: () => {
+ toast.success(t(($) => $['accessRule.deleted'], { ns: 'permission' }))
+ setShowDeleteConfirm(false)
+ },
},
- })
+ )
}, [deleteAccessRule, rule.id, t])
const isBuiltIn = rule.is_builtin
diff --git a/web/app/components/header/account-setting/access-rules-page/access-rule-row.tsx b/web/app/components/header/account-setting/access-rules-page/access-rule-row.tsx
index b5a8e7df5a5..cc206d860d5 100644
--- a/web/app/components/header/account-setting/access-rules-page/access-rule-row.tsx
+++ b/web/app/components/header/account-setting/access-rules-page/access-rule-row.tsx
@@ -1,18 +1,18 @@
'use client'
-import type { AccessPolicyWithBindings } from '@/models/access-control'
+import type { AccessRule } from './types'
import { cn } from '@langgenius/dify-ui/cn'
import { memo, useCallback } from 'react'
import { useTranslation } from 'react-i18next'
import AccessRuleRowMenu from './access-rule-row-menu'
type AccessRuleRowProps = {
- rule: AccessPolicyWithBindings
+ rule: AccessRule
canManage: boolean
className?: string
showMenu?: boolean
- onView?: (rule: AccessPolicyWithBindings) => void
- onEdit?: (rule: AccessPolicyWithBindings) => void
+ onView?: (rule: AccessRule) => void
+ onEdit?: (rule: AccessRule) => void
}
const AccessRuleRow = ({
@@ -26,7 +26,7 @@ const AccessRuleRow = ({
const { t } = useTranslation()
const { policy } = rule
const description =
- policy.description.trim() || t(($) => $['accessRule.noDescription'], { ns: 'permission' })
+ policy.description?.trim() || t(($) => $['accessRule.noDescription'], { ns: 'permission' })
const handleView = useCallback(() => onView?.(rule), [onView, rule])
const handleEdit = useCallback(() => onEdit?.(rule), [onEdit, rule])
diff --git a/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx b/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx
index 67cd0a4cb11..bb9250f9a4b 100644
--- a/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx
+++ b/web/app/components/header/account-setting/access-rules-page/access-rule-section.tsx
@@ -1,6 +1,6 @@
'use client'
-import type { AccessPolicyWithBindings } from '@/models/access-control'
+import type { AccessRule } from './types'
import { Button } from '@langgenius/dify-ui/button'
import { cn } from '@langgenius/dify-ui/cn'
import { Collapsible, CollapsiblePanel, CollapsibleTrigger } from '@langgenius/dify-ui/collapsible'
@@ -15,7 +15,7 @@ import AccessRuleRow from './access-rule-row'
type AccessRuleSectionProps = {
title: string
- rules: AccessPolicyWithBindings[]
+ rules: AccessRule[]
totalCount?: number
isLoadingRules: boolean
isFetchingNextPage?: boolean
@@ -24,8 +24,9 @@ type AccessRuleSectionProps = {
error?: unknown
defaultExpanded?: boolean
onCreate?: () => void
- onViewRule?: (rule: AccessPolicyWithBindings) => void
- onEditRule?: (rule: AccessPolicyWithBindings) => void
+ onViewRule?: (rule: AccessRule) => void
+ onEditRule?: (rule: AccessRule) => void
+ onRetry?: () => void
className?: string
}
@@ -42,6 +43,7 @@ const AccessRuleSection = ({
onCreate,
onViewRule,
onEditRule,
+ onRetry,
className,
}: AccessRuleSectionProps) => {
const { t } = useTranslation()
@@ -144,7 +146,12 @@ const AccessRuleSection = ({
/>
}
>
- {isLoadingRules ? (
+ {error ? (
+
+ {t(($) => $['api.actionFailed'], { ns: 'common' })}
+
+
+ ) : isLoadingRules ? (
diff --git a/web/app/components/header/account-setting/access-rules-page/app-access-rule-section.tsx b/web/app/components/header/account-setting/access-rules-page/app-access-rule-section.tsx
deleted file mode 100644
index 93620bbc74a..00000000000
--- a/web/app/components/header/account-setting/access-rules-page/app-access-rule-section.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import type { PermissionSetFormValues, PermissionSetModalMode } from './permission-set-modal'
-import type { AccessPolicyWithBindings } from '@/models/access-control'
-import { toast } from '@langgenius/dify-ui/toast'
-import { useCallback, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { useLocale } from '@/context/i18n'
-import { getAccessControlTemplateLanguage } from '@/i18n-config/language'
-import {
- useCreateAccessRule,
- useInfiniteWorkspaceAppAccessRules,
- useUpdateAccessRule,
-} from '@/service/access-control/use-workspace-access-rules'
-import AccessRuleSection from './access-rule-section'
-import PermissionSetModal from './permission-set-modal'
-
-type AppAccessRuleSectionProps = {
- className?: string
-}
-
-type PermissionSetModalState = {
- mode: PermissionSetModalMode
- ruleId?: string
- initialValues?: PermissionSetFormValues
-}
-
-const RULES_PER_PAGE = 20
-
-const AppAccessRuleSection = ({ className }: AppAccessRuleSectionProps) => {
- const { t } = useTranslation()
- const locale = useLocale()
- const [permissionSetModalState, setPermissionSetModalState] =
- useState(null)
- const language = useMemo(() => getAccessControlTemplateLanguage(locale), [locale])
-
- const {
- data: appAccessRulesResponse,
- isLoading,
- isFetchingNextPage,
- fetchNextPage,
- hasNextPage,
- error,
- } = useInfiniteWorkspaceAppAccessRules({
- page: 1,
- limit: RULES_PER_PAGE,
- language,
- })
- const { mutateAsync: createAccessRule } = useCreateAccessRule()
- const { mutateAsync: updateAccessRule } = useUpdateAccessRule()
-
- const appAccessRules = useMemo(
- () => appAccessRulesResponse?.pages.flatMap((page) => page.items) || [],
- [appAccessRulesResponse?.pages],
- )
- const totalCount = appAccessRulesResponse?.pages[0]?.pagination.total_count || 0
-
- const closePermissionSetModal = useCallback(() => {
- setPermissionSetModalState(null)
- }, [])
-
- const handleCreate = useCallback(() => {
- setPermissionSetModalState({ mode: 'create' })
- }, [])
-
- const handleView = useCallback((rule: AccessPolicyWithBindings) => {
- const { policy } = rule
- setPermissionSetModalState({
- mode: 'view',
- initialValues: {
- name: policy.name,
- description: policy.description,
- permissionKeys: policy.permission_keys,
- },
- })
- }, [])
-
- const handleEdit = useCallback((rule: AccessPolicyWithBindings) => {
- const { policy } = rule
- setPermissionSetModalState({
- mode: 'edit',
- ruleId: policy.id,
- initialValues: {
- name: policy.name,
- description: policy.description,
- permissionKeys: policy.permission_keys,
- },
- })
- }, [])
-
- const handlePermissionSetSubmit = useCallback(
- (values: PermissionSetFormValues) => {
- if (!permissionSetModalState) return
-
- const { name, description, permissionKeys } = values
- if (permissionSetModalState.mode === 'create') {
- createAccessRule(
- {
- name,
- description,
- permission_keys: permissionKeys,
- resourceType: 'app',
- },
- {
- onSuccess: () => {
- toast.success(t(($) => $['accessRule.created'], { ns: 'permission' }))
- closePermissionSetModal()
- },
- },
- )
- } else if (permissionSetModalState.mode === 'edit') {
- updateAccessRule(
- {
- id: permissionSetModalState.ruleId!,
- name,
- description,
- permission_keys: permissionKeys,
- resourceType: 'app',
- },
- {
- onSuccess: () => {
- toast.success(t(($) => $['accessRule.updated'], { ns: 'permission' }))
- closePermissionSetModal()
- },
- },
- )
- }
- },
- [closePermissionSetModal, createAccessRule, permissionSetModalState, t, updateAccessRule],
- )
-
- return (
- <>
- $['accessRule.appTitle'], { ns: 'permission' })}
- rules={appAccessRules}
- totalCount={totalCount}
- isLoadingRules={isLoading}
- isFetchingNextPage={isFetchingNextPage}
- hasNextPage={hasNextPage}
- fetchNextPage={fetchNextPage}
- error={error}
- defaultExpanded
- onCreate={handleCreate}
- onViewRule={handleView}
- onEditRule={handleEdit}
- className={className}
- />
- {permissionSetModalState && (
-
- )}
- >
- )
-}
-
-export default AppAccessRuleSection
diff --git a/web/app/components/header/account-setting/access-rules-page/dataset-access-rule-section.tsx b/web/app/components/header/account-setting/access-rules-page/dataset-access-rule-section.tsx
deleted file mode 100644
index a0f825f1a95..00000000000
--- a/web/app/components/header/account-setting/access-rules-page/dataset-access-rule-section.tsx
+++ /dev/null
@@ -1,160 +0,0 @@
-import type { PermissionSetFormValues, PermissionSetModalMode } from './permission-set-modal'
-import type { AccessPolicyWithBindings } from '@/models/access-control'
-import { toast } from '@langgenius/dify-ui/toast'
-import { useCallback, useMemo, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { useLocale } from '@/context/i18n'
-import { getAccessControlTemplateLanguage } from '@/i18n-config/language'
-import {
- useCreateAccessRule,
- useInfiniteWorkspaceDatasetAccessRules,
- useUpdateAccessRule,
-} from '@/service/access-control/use-workspace-access-rules'
-import AccessRuleSection from './access-rule-section'
-import PermissionSetModal from './permission-set-modal'
-
-type DatasetAccessRuleSectionProps = {
- className?: string
-}
-
-type PermissionSetModalState = {
- mode: PermissionSetModalMode
- ruleId?: string
- initialValues?: PermissionSetFormValues
-}
-
-const RULES_PER_PAGE = 20
-
-const DatasetAccessRuleSection = ({ className }: DatasetAccessRuleSectionProps) => {
- const { t } = useTranslation()
- const locale = useLocale()
- const [permissionSetModalState, setPermissionSetModalState] =
- useState(null)
- const language = useMemo(() => getAccessControlTemplateLanguage(locale), [locale])
-
- const {
- data: datasetAccessRulesResponse,
- isLoading,
- isFetchingNextPage,
- fetchNextPage,
- hasNextPage,
- error,
- } = useInfiniteWorkspaceDatasetAccessRules({
- page: 1,
- limit: RULES_PER_PAGE,
- language,
- })
- const { mutateAsync: createAccessRule } = useCreateAccessRule()
- const { mutateAsync: updateAccessRule } = useUpdateAccessRule()
-
- const datasetAccessRules = useMemo(
- () => datasetAccessRulesResponse?.pages.flatMap((page) => page.items) || [],
- [datasetAccessRulesResponse?.pages],
- )
- const totalCount = datasetAccessRulesResponse?.pages[0]?.pagination.total_count || 0
-
- const closePermissionSetModal = useCallback(() => {
- setPermissionSetModalState(null)
- }, [])
-
- const handleCreate = useCallback(() => {
- setPermissionSetModalState({ mode: 'create' })
- }, [])
-
- const handleView = useCallback((rule: AccessPolicyWithBindings) => {
- const { policy } = rule
- setPermissionSetModalState({
- mode: 'view',
- initialValues: {
- name: policy.name,
- description: policy.description,
- permissionKeys: policy.permission_keys,
- },
- })
- }, [])
-
- const handleEdit = useCallback((rule: AccessPolicyWithBindings) => {
- const { policy } = rule
- setPermissionSetModalState({
- mode: 'edit',
- ruleId: policy.id,
- initialValues: {
- name: policy.name,
- description: policy.description,
- permissionKeys: policy.permission_keys,
- },
- })
- }, [])
-
- const handlePermissionSetSubmit = useCallback(
- (values: PermissionSetFormValues) => {
- if (!permissionSetModalState) return
-
- const { name, description, permissionKeys } = values
- if (permissionSetModalState.mode === 'create') {
- createAccessRule(
- {
- name,
- description,
- permission_keys: permissionKeys,
- resourceType: 'dataset',
- },
- {
- onSuccess: () => {
- toast.success(t(($) => $['accessRule.created'], { ns: 'permission' }))
- closePermissionSetModal()
- },
- },
- )
- } else if (permissionSetModalState.mode === 'edit') {
- updateAccessRule(
- {
- id: permissionSetModalState.ruleId!,
- name,
- description,
- permission_keys: permissionKeys,
- resourceType: 'dataset',
- },
- {
- onSuccess: () => {
- toast.success(t(($) => $['accessRule.updated'], { ns: 'permission' }))
- closePermissionSetModal()
- },
- },
- )
- }
- },
- [closePermissionSetModal, createAccessRule, permissionSetModalState, t, updateAccessRule],
- )
-
- return (
- <>
- $['accessRule.datasetTitle'], { ns: 'permission' })}
- rules={datasetAccessRules}
- totalCount={totalCount}
- isLoadingRules={isLoading}
- isFetchingNextPage={isFetchingNextPage}
- hasNextPage={hasNextPage}
- fetchNextPage={fetchNextPage}
- error={error}
- onCreate={handleCreate}
- onViewRule={handleView}
- onEditRule={handleEdit}
- className={className}
- />
- {permissionSetModalState && (
-
- )}
- >
- )
-}
-
-export default DatasetAccessRuleSection
diff --git a/web/app/components/header/account-setting/access-rules-page/index.tsx b/web/app/components/header/account-setting/access-rules-page/index.tsx
index bd8569adc20..ff8e0c5badb 100644
--- a/web/app/components/header/account-setting/access-rules-page/index.tsx
+++ b/web/app/components/header/account-setting/access-rules-page/index.tsx
@@ -1,13 +1,13 @@
'use client'
-import AppAccessRuleSection from './app-access-rule-section'
-import DatasetAccessRuleSection from './dataset-access-rule-section'
+import { ResourceAccessRuleSection } from './resource-access-rule-section'
const AccessRulesPage = () => {
return (
)
}
diff --git a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/__tests__/index.spec.tsx
index 8ecc52563de..7ac31c1e9ce 100644
--- a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/__tests__/index.spec.tsx
@@ -1,8 +1,9 @@
import type { PermissionCatalogResponse } from '@dify/contracts/api/console/workspaces/types.gen'
import type { ReactNode } from 'react'
import { QueryClientProvider } from '@tanstack/react-query'
-import { render, screen } from '@testing-library/react'
+import { render, screen, waitFor } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
+import { AgentPermission } from '@/features/agent-v2/acl'
import { consoleQuery } from '@/service/console'
import { createTestQueryClient } from '@/test/query-client'
import PermissionSetModal from '../index'
@@ -77,6 +78,22 @@ const renderModal = (modal: ReactNode) => {
datasetPermissionCatalog,
)
+ queryClient.setQueryData(
+ consoleQuery.workspaces.current.rbac.rolePermissions.catalog.agent.get.queryKey({ input: {} }),
+ {
+ groups: [
+ {
+ group_key: 'agent_acl',
+ group_name: 'Agent',
+ description: '',
+ permissions: Object.values(AgentPermission)
+ .filter((key) => key !== AgentPermission.Create)
+ .map((key) => ({ key, name: key, description: '' })),
+ },
+ ],
+ },
+ )
+
return render({modal})
}
@@ -244,4 +261,49 @@ describe('PermissionSetModal', () => {
).not.toBeInTheDocument()
})
})
+ it('renders all eleven Agent ACL permissions without the workspace create permission', () => {
+ renderModal(
+ ,
+ )
+ for (const permission of Object.values(AgentPermission).filter(
+ (key) => key !== AgentPermission.Create,
+ )) {
+ expect(
+ screen.getByRole('checkbox', { name: getPermissionKeyMatcher(permission) }),
+ ).toBeInTheDocument()
+ }
+ expect(screen.queryByRole('checkbox', { name: /agent.create/ })).not.toBeInTheDocument()
+ })
+
+ it('keeps the form open and preserves input after a failed save', async () => {
+ const close = vi.fn()
+ const submit = vi.fn().mockRejectedValue(new Error('Unavailable'))
+ renderModal(
+ ,
+ )
+ await userEvent.type(
+ screen.getByRole('textbox', { name: /permissionSet.nameLabel/ }),
+ 'Agent reviewers',
+ )
+ await userEvent.click(screen.getByRole('button', { name: 'common.operation.confirm' }))
+ await waitFor(() =>
+ expect(screen.getByRole('alert')).toHaveTextContent('common.api.actionFailed'),
+ )
+ expect(screen.getByRole('textbox', { name: /permissionSet.nameLabel/ })).toHaveValue(
+ 'Agent reviewers',
+ )
+ expect(close).not.toHaveBeenCalled()
+ })
})
diff --git a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/hooks.ts b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/hooks.ts
index 70d4de11fab..37385f954dd 100644
--- a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/hooks.ts
+++ b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/hooks.ts
@@ -8,13 +8,9 @@ import { consoleQuery } from '@/service/console'
export const usePermissionsGroups = (resourceType: AccessPolicyResourceType) => {
const { t } = useTranslation()
const permissionCatalogQueryOptions =
- resourceType === 'app'
- ? consoleQuery.workspaces.current.rbac.rolePermissions.catalog.app.get.queryOptions({
- input: {},
- })
- : consoleQuery.workspaces.current.rbac.rolePermissions.catalog.dataset.get.queryOptions({
- input: {},
- })
+ consoleQuery.workspaces.current.rbac.rolePermissions.catalog[resourceType].get.queryOptions({
+ input: {},
+ })
const { data: permissionCatalog } = useQuery(permissionCatalogQueryOptions)
const groups = useMemo(() => {
diff --git a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/index.tsx b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/index.tsx
index 049c8eb131a..958b6b71493 100644
--- a/web/app/components/header/account-setting/access-rules-page/permission-set-modal/index.tsx
+++ b/web/app/components/header/account-setting/access-rules-page/permission-set-modal/index.tsx
@@ -31,7 +31,7 @@ type PermissionSetModalProps = {
resourceType: AccessPolicyResourceType
initialValues?: Partial
onClose: () => void
- onSubmit: (values: PermissionSetFormValues) => void
+ onSubmit: (values: PermissionSetFormValues) => void | Promise
}
type PermissionSetModalBodyProps = Omit
@@ -51,19 +51,29 @@ const PermissionSetModalBody = ({
const [permissionKeys, setPermissionKeys] = useState(
initialValues?.permissionKeys ?? [],
)
+ const [isSubmitting, setIsSubmitting] = useState(false)
+ const [submitFailed, setSubmitFailed] = useState(false)
const trimmedName = name.trim()
const readonly = mode === 'view'
const canSubmit = trimmedName.length > 0
- const handleConfirm = () => {
- if (readonly || !canSubmit) return
- onSubmit({
- name: trimmedName,
- description: description.trim(),
- permissionKeys,
- })
- onClose()
+ const handleConfirm = async () => {
+ if (readonly || !canSubmit || isSubmitting) return
+ setIsSubmitting(true)
+ setSubmitFailed(false)
+ try {
+ await onSubmit({
+ name: trimmedName,
+ description: description.trim(),
+ permissionKeys,
+ })
+ onClose()
+ } catch {
+ setSubmitFailed(true)
+ } finally {
+ setIsSubmitting(false)
+ }
}
return (
@@ -71,102 +81,120 @@ const PermissionSetModalBody = ({
className="flex h-[85vh] w-140 flex-col overflow-hidden p-0"
backdropProps={{ forceRender: true }}
>
-
- $['operation.close'], { ns: 'common' })}
- size="lg"
- className="absolute inset-e-6 top-6"
- >
-
-
- }
- />
-
-
- {t(($) => $[`permissionSet.modal.${mode}.${resourceType}.title`], { ns: 'permission' })}
-
-
- {t(($) => $[`permissionSet.modal.${mode}.${resourceType}.description`], {
- ns: 'permission',
- })}
-
-
-
-
-
-
-
-
-
- setName(e.target.value)}
- placeholder={t(($) => $['permissionSet.namePlaceholder'], { ns: 'permission' })}
- disabled={readonly}
+ |