From e4d98dddd975bc02b3b8e5d542eee5c5050f7cac Mon Sep 17 00:00:00 2001 From: CodingOnStar Date: Thu, 17 Sep 2026 10:30:32 +0800 Subject: [PATCH] fix(web): align IP access controls with app capabilities and Agent access --- .../__tests__/chip-status.spec.ts | 23 +- .../__tests__/config-panel.spec.tsx | 8 +- .../access-control/__tests__/draft.spec.ts | 69 ++- .../access-control/__tests__/index.spec.tsx | 500 ++++++++++++++++-- .../__tests__/network-access.spec.ts | 62 ++- .../access-control/chip-status.ts | 19 +- .../access-control/config-panel.tsx | 37 +- .../access-control/downgrade-panel.tsx | 17 +- .../app/access-point/access-control/draft.ts | 38 +- .../app/access-point/access-control/index.tsx | 100 ++-- .../access-control/network-access.ts | 26 +- .../access-control/policy-field.tsx | 23 +- .../access-control/scope-list.tsx | 24 +- .../access-control/status-panel.tsx | 34 +- web/app/components/app/access-point/index.tsx | 12 +- .../access/__tests__/page.spec.tsx | 192 +++++++ .../agent-v2/agent-detail/access/page.tsx | 19 +- 17 files changed, 1010 insertions(+), 193 deletions(-) create mode 100644 web/features/agent-v2/agent-detail/access/__tests__/page.spec.tsx diff --git a/web/app/components/app/access-point/access-control/__tests__/chip-status.spec.ts b/web/app/components/app/access-point/access-control/__tests__/chip-status.spec.ts index d9d35ac7d01..c2353c2216a 100644 --- a/web/app/components/app/access-point/access-control/__tests__/chip-status.spec.ts +++ b/web/app/components/app/access-point/access-control/__tests__/chip-status.spec.ts @@ -1,3 +1,4 @@ +import { ACCESS_POINT_ORDER } from '@/app/components/app/deploy/utils/access-point' import { getAccessControlChipState, getInServiceCoverage } from '../chip-status' const assignment = { @@ -15,7 +16,10 @@ const assignment = { describe('getInServiceCoverage', () => { it('counts selected access points against every configured access point', () => { expect( - getInServiceCoverage({ webApp: true, serviceApi: true, mcp: false, trigger: true }), + getInServiceCoverage( + { webApp: true, serviceApi: true, mcp: false, trigger: true }, + ACCESS_POINT_ORDER, + ), ).toEqual({ coveredCount: 3, inServiceCount: 4 }) }) }) @@ -24,6 +28,7 @@ describe('getAccessControlChipState', () => { it('returns pro when the workspace is not entitled and has no assignment', () => { expect( getAccessControlChipState({ + availableAccessPoints: ACCESS_POINT_ORDER, entitled: false, assignment: null, }).kind, @@ -33,6 +38,7 @@ describe('getAccessControlChipState', () => { it('keeps the saved assignment visible when the workspace is not entitled', () => { expect( getAccessControlChipState({ + availableAccessPoints: ACCESS_POINT_ORDER, entitled: false, assignment, }).kind, @@ -42,6 +48,7 @@ describe('getAccessControlChipState', () => { it('returns off when the app has never been configured', () => { expect( getAccessControlChipState({ + availableAccessPoints: ACCESS_POINT_ORDER, entitled: true, assignment: null, }), @@ -51,6 +58,7 @@ describe('getAccessControlChipState', () => { it('returns paused when a saved policy is not enforcing', () => { expect( getAccessControlChipState({ + availableAccessPoints: ACCESS_POINT_ORDER, entitled: true, assignment: { ...assignment, enabled: false }, }), @@ -65,6 +73,7 @@ describe('getAccessControlChipState', () => { it('returns on when every access point is covered', () => { expect( getAccessControlChipState({ + availableAccessPoints: ACCESS_POINT_ORDER, entitled: true, assignment, }), @@ -79,6 +88,7 @@ describe('getAccessControlChipState', () => { it('returns partial when some access points are excluded', () => { expect( getAccessControlChipState({ + availableAccessPoints: ACCESS_POINT_ORDER, entitled: true, assignment: { ...assignment, @@ -93,3 +103,14 @@ describe('getAccessControlChipState', () => { }) }) }) + +describe('app capability coverage', () => { + it.each([ + { available: ['webApp', 'serviceApi', 'mcp'] as const, count: 3 }, + { available: ['webApp', 'serviceApi'] as const, count: 2 }, + ])('counts full coverage as $count of $count', ({ available, count }) => { + expect( + getAccessControlChipState({ assignment, entitled: true, availableAccessPoints: available }), + ).toMatchObject({ kind: 'on', coveredCount: count, inServiceCount: count }) + }) +}) diff --git a/web/app/components/app/access-point/access-control/__tests__/config-panel.spec.tsx b/web/app/components/app/access-point/access-control/__tests__/config-panel.spec.tsx index 30195b987e4..b6782ac2a97 100644 --- a/web/app/components/app/access-point/access-control/__tests__/config-panel.spec.tsx +++ b/web/app/components/app/access-point/access-control/__tests__/config-panel.spec.tsx @@ -3,6 +3,7 @@ import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/pop import { screen } from '@testing-library/react' import userEvent from '@testing-library/user-event' import { useState } from 'react' +import { ACCESS_POINT_ORDER } from '@/app/components/app/deploy/utils/access-point' import { render } from '@/test/console/render' import { AccessControlConfigPanel } from '../config-panel' import { createDefaultAccessControlDraft } from '../draft' @@ -50,7 +51,7 @@ vi.mock('react-i18next', async () => { function PanelHarness({ currentIp, - initialDraft = createDefaultAccessControlDraft(), + initialDraft = createDefaultAccessControlDraft(ACCESS_POINT_ORDER), onSave = vi.fn(), }: { currentIp?: string @@ -68,6 +69,9 @@ function PanelHarness({ { render( { it('disables save when no policy is selected', () => { - expect(canSaveAccessControl({ draft: createDefaultAccessControlDraft() })).toBe(false) + expect( + canSaveAccessControl({ + availableAccessPoints: ACCESS_POINT_ORDER, + draft: createDefaultAccessControlDraft(ACCESS_POINT_ORDER), + }), + ).toBe(false) }) it('disables save when every access point is off', () => { expect( canSaveAccessControl({ + availableAccessPoints: ACCESS_POINT_ORDER, draft: { selectedPolicyId: 'policy-1', enabled: true, @@ -32,12 +43,15 @@ describe('canSaveAccessControl', () => { }) it('enables save when a policy is selected and at least one access point is on', () => { - expect(canSaveAccessControl({ draft: selectedDraft })).toBe(true) + expect( + canSaveAccessControl({ availableAccessPoints: ACCESS_POINT_ORDER, draft: selectedDraft }), + ).toBe(true) }) it('counts trigger as a selectable access point', () => { expect( canSaveAccessControl({ + availableAccessPoints: ACCESS_POINT_ORDER, draft: { selectedPolicyId: 'policy-1', enabled: true, @@ -58,14 +72,9 @@ describe('canSaveAccessControl', () => { draft: { selectedPolicyId: 'policy-1', enabled: true, - scopes: { - webApp: false, - serviceApi: false, - mcp: false, - trigger: true, - }, + scopes: { webApp: false, serviceApi: false, mcp: false, trigger: true }, }, - persistableAccessPoints: [], + availableAccessPoints: [], }), ).toBe(false) }) @@ -73,6 +82,7 @@ describe('canSaveAccessControl', () => { it('disables save when the draft matches the saved baseline', () => { expect( canSaveAccessControl({ + availableAccessPoints: ACCESS_POINT_ORDER, draft: selectedDraft, baseline: selectedDraft, }), @@ -82,6 +92,7 @@ describe('canSaveAccessControl', () => { it('allows saving a pause when a policy is already selected', () => { expect( canSaveAccessControl({ + availableAccessPoints: ACCESS_POINT_ORDER, draft: { ...selectedDraft, enabled: false }, baseline: selectedDraft, }), @@ -121,3 +132,39 @@ describe('policyIncludesIp', () => { expect(policyIncludesIp(['198.51.100.0/24'], '203.0.113.42')).toBe(false) }) }) + +describe('available access points', () => { + it.each([ + { available: ['webApp', 'serviceApi', 'mcp', 'trigger'] as const, selected: 4 }, + { available: ['webApp', 'serviceApi', 'mcp'] as const, selected: 3 }, + { available: ['webApp', 'serviceApi'] as const, selected: 2 }, + ])('defaults to $selected supported scopes', ({ available, selected }) => { + const draft = createDefaultAccessControlDraft(available) + expect(Object.values(draft.scopes).filter(Boolean)).toHaveLength(selected) + available.forEach((scope) => expect(draft.scopes[scope]).toBe(true)) + }) + + it('ignores unsupported scope differences when checking for edits', () => { + const baseline = createDefaultAccessControlDraft(['webApp', 'serviceApi']) + expect( + isAccessControlDraftEqual( + baseline, + { + ...baseline, + scopes: { ...baseline.scopes, mcp: true, trigger: true }, + }, + ['webApp', 'serviceApi'], + ), + ).toBe(true) + }) + + it('does not count an unsupported trigger selection toward a valid binding', () => { + const draft = { + ...selectedDraft, + scopes: { webApp: false, serviceApi: false, mcp: false, trigger: true }, + } + expect( + canSaveAccessControl({ draft, availableAccessPoints: ['webApp', 'serviceApi', 'mcp'] }), + ).toBe(false) + }) +}) diff --git a/web/app/components/app/access-point/access-control/__tests__/index.spec.tsx b/web/app/components/app/access-point/access-control/__tests__/index.spec.tsx index 8b1436c1d8d..433b3dc6185 100644 --- a/web/app/components/app/access-point/access-control/__tests__/index.spec.tsx +++ b/web/app/components/app/access-point/access-control/__tests__/index.spec.tsx @@ -1,8 +1,15 @@ -import type { AppNetworkAccessGroupBindingResponse } from '@dify/contracts/api/console/apps/types.gen' +import type { + AppNetworkAccessGroupBindingResponse, + AppNetworkAccessGroupResponse, +} from '@dify/contracts/api/console/apps/types.gen' import type { CloudPlan } from '@dify/contracts/api/console/features/types.gen' -import type { NetworkAccessGroupResponse } from '@dify/contracts/api/console/workspaces/types.gen' +import type { + GetWorkspacesCurrentSummaryResponse, + NetworkAccessGroupResponse, +} from '@dify/contracts/api/console/workspaces/types.gen' import { screen, waitFor, within } from '@testing-library/react' import userEvent from '@testing-library/user-event' +import { consoleQuery } from '@/service/console' import { createNetworkAccessGroupFixture, seedAppNetworkAccessGroup, @@ -74,16 +81,6 @@ const accessControlTranslations = vi.hoisted(() => ({ 'studio.accessControl.turnOffConfirm': 'Turn off', })) -vi.mock('@/app/components/app/store', () => ({ - useStore: (selector: (state: { appDetail: { id: string; mode: string } }) => unknown) => - selector({ - appDetail: { - id: 'app-1', - mode: 'chat', - }, - }), -})) - vi.mock('nuqs', async (importOriginal) => { const actual = await importOriginal() return { @@ -105,28 +102,42 @@ const renderEntry = ({ deploymentEdition = 'CLOUD', groups = [], binding = null, + availableAccessPoints = ['webapp', 'service_api', 'mcp'], + role = 'owner', + canEditBinding = true, }: { plan?: CloudPlan deploymentEdition?: 'CLOUD' | 'COMMUNITY' | 'ENTERPRISE' groups?: NetworkAccessGroupResponse[] binding?: AppNetworkAccessGroupBindingResponse | null + availableAccessPoints?: AppNetworkAccessGroupResponse['available_access_points'] + role?: GetWorkspacesCurrentSummaryResponse['role'] + canEditBinding?: boolean } = {}) => { const queryClient = createConsoleQueryClient() const entitled = plan === 'professional' || plan === 'team' seedNetworkAccessGroups(queryClient, { entitled, groups }) - seedAppNetworkAccessGroup(queryClient, 'app-1', { entitled, binding }) - - return renderWithConsoleQuery(, { - queryClient, - systemFeatures: { deployment_edition: deploymentEdition }, - features: plan - ? { - billing: { - subscription: { interval: 'month', plan }, - }, - } - : undefined, + seedAppNetworkAccessGroup(queryClient, 'app-1', { + entitled, + binding, + available_access_points: availableAccessPoints, }) + + return renderWithConsoleQuery( + , + { + queryClient, + currentWorkspace: { role }, + systemFeatures: { deployment_edition: deploymentEdition }, + features: plan + ? { + billing: { + subscription: { interval: 'month', plan }, + }, + } + : undefined, + }, + ) } const getChip = () => screen.getByRole('button', { name: /Access Control/ }) @@ -166,13 +177,13 @@ describe('AccessControlEntry', () => { }, }) - expect(within(getChip()).getByText('3 of 4')).toBeInTheDocument() + expect(within(getChip()).getByText('ON')).toBeInTheDocument() await user.click(getChip()) expect(screen.getByText('This app is no longer protected')).toBeInTheDocument() expect(screen.getByText('Access control needs the Pro plan.')).toBeInTheDocument() expect(screen.getByText('Ready to resume')).toBeInTheDocument() expect(screen.getByText('Internal Network')).toBeInTheDocument() - expect(screen.getByText('Protects 3 of 4 access points')).toBeInTheDocument() + expect(screen.getByText('Protects 3 of 3 access points')).toBeInTheDocument() expect(screen.queryByText('Restricted to Internal Network')).not.toBeInTheDocument() expect(screen.queryByRole('button', { name: 'Edit' })).not.toBeInTheDocument() expect(screen.queryByRole('switch', { name: 'Restrict by IP address' })).not.toBeInTheDocument() @@ -264,10 +275,7 @@ describe('AccessControlEntry', () => { 'aria-disabled', 'true', ) - expect(screen.getByRole('switch', { name: 'Trigger' })).not.toHaveAttribute( - 'aria-disabled', - 'true', - ) + expect(screen.queryByRole('switch', { name: 'Trigger' })).not.toBeInTheDocument() expect(screen.queryByText('Not enabled')).not.toBeInTheDocument() }) @@ -386,7 +394,7 @@ describe('AccessControlEntry', () => { }, }) - expect(within(getChip()).getByText('3 of 4')).toBeInTheDocument() + expect(within(getChip()).getByText('ON')).toBeInTheDocument() await user.click(getChip()) expect(screen.getByText('Restricted to Internal Network')).toBeInTheDocument() expect(screen.getByRole('switch', { name: 'Restrict by IP address' })).toBeChecked() @@ -415,7 +423,7 @@ describe('AccessControlEntry', () => { await user.click(screen.getByRole('button', { name: 'Turn off' })) expect(screen.getByRole('button', { name: 'Save' })).toBeEnabled() - expect(within(getChip()).getByText('3 of 4')).toBeInTheDocument() + expect(within(getChip()).getByText('ON')).toBeInTheDocument() }) it('discards an unsaved first-time draft on Cancel', async () => { @@ -423,7 +431,7 @@ describe('AccessControlEntry', () => { renderEntry({ plan: 'professional' }) await user.click(getChip()) - await user.click(screen.getByRole('switch', { name: 'Trigger' })) + await user.click(screen.getByRole('switch', { name: 'Web App' })) await user.click(screen.getByRole('button', { name: 'Cancel' })) await waitFor(() => { @@ -431,7 +439,7 @@ describe('AccessControlEntry', () => { }) await user.click(getChip()) - expect(screen.getByRole('switch', { name: 'Trigger' })).toBeChecked() + expect(screen.getByRole('switch', { name: 'Web App' })).toBeChecked() expect(screen.getByRole('button', { name: 'Save' })).toBeDisabled() }) @@ -440,8 +448,8 @@ describe('AccessControlEntry', () => { renderEntry({ plan: 'professional' }) await user.click(getChip()) - await user.click(screen.getByRole('switch', { name: 'Trigger' })) - expect(screen.getByRole('switch', { name: 'Trigger' })).not.toBeChecked() + await user.click(screen.getByRole('switch', { name: 'Web App' })) + expect(screen.getByRole('switch', { name: 'Web App' })).not.toBeChecked() await user.keyboard('{Escape}') await waitFor(() => { @@ -450,7 +458,7 @@ describe('AccessControlEntry', () => { await user.click(getChip()) expect(screen.getByText('No IP policies in this workspace yet')).toBeInTheDocument() - expect(screen.getByRole('switch', { name: 'Trigger' })).not.toBeChecked() + expect(screen.getByRole('switch', { name: 'Web App' })).not.toBeChecked() expect(screen.queryByRole('button', { name: 'Back' })).not.toBeInTheDocument() expect(screen.getByRole('button', { name: 'Save' })).toBeDisabled() }) @@ -482,15 +490,15 @@ describe('AccessControlEntry', () => { await waitFor(() => { expect(screen.queryByRole('button', { name: 'Save' })).not.toBeInTheDocument() }) - expect(within(getChip()).getByText('3 of 4')).toBeInTheDocument() + expect(within(getChip()).getByText('ON')).toBeInTheDocument() await user.click(getChip()) expect(screen.queryByText('Restricted to Internal Network')).not.toBeInTheDocument() expect(screen.getByRole('switch', { name: 'MCP Server' })).not.toBeChecked() - expect(screen.getByRole('switch', { name: 'Trigger' })).not.toBeChecked() + expect(screen.queryByRole('switch', { name: 'Trigger' })).not.toBeInTheDocument() expect(screen.getByRole('button', { name: 'Back' })).toBeInTheDocument() expect(screen.getByRole('button', { name: 'Save' })).toBeEnabled() - expect(within(getChip()).getByText('3 of 4')).toBeInTheDocument() + expect(within(getChip()).getByText('ON')).toBeInTheDocument() }) it('discards an unsaved edit on Cancel', async () => { @@ -626,12 +634,420 @@ describe('AccessControlEntry', () => { await waitFor(() => { expect(screen.queryByRole('button', { name: 'Save' })).not.toBeInTheDocument() }) - expect(within(getChip()).getByText('3 of 4')).toBeInTheDocument() + expect(within(getChip()).getByText('ON')).toBeInTheDocument() await user.click(getChip()) expect(screen.queryByText('Restricted to Internal Network')).not.toBeInTheDocument() expect(screen.getByRole('button', { name: 'Back' })).toBeInTheDocument() expect(screen.getByRole('button', { name: 'Save' })).toBeEnabled() - expect(within(getChip()).getByText('3 of 4')).toBeInTheDocument() + expect(within(getChip()).getByText('ON')).toBeInTheDocument() + }) +}) + +const capabilityCases = [ + { + name: 'workflow', + points: ['webapp', 'service_api', 'mcp', 'trigger'], + labels: ['Web App', 'Backend Service API', 'MCP Server', 'Trigger'], + }, + { + name: 'legacy and chatflow', + points: ['webapp', 'service_api', 'mcp'], + labels: ['Web App', 'Backend Service API', 'MCP Server'], + }, + { name: 'agent', points: ['webapp', 'service_api'], labels: ['Web App', 'Backend Service API'] }, +] satisfies { + name: string + points: AppNetworkAccessGroupResponse['available_access_points'] + labels: string[] +}[] + +const createBinding = ( + overrides: Partial = {}, +): AppNetworkAccessGroupBindingResponse => ({ + id: 'binding-1', + tenant_id: 'workspace-1', + app_id: 'app-1', + enabled: true, + group_id: 'group-1', + access_points: ['webapp', 'service_api', 'mcp'], + version: 2, + created_at: '2026-01-01T00:00:00Z', + updated_at: '2026-01-01T00:00:00Z', + ...overrides, +}) + +describe('supported access points and binding permission', () => { + beforeEach(() => vi.clearAllMocks()) + + it.each(capabilityCases)( + 'shows and saves exactly the $name capabilities', + async ({ points, labels }) => { + const user = userEvent.setup() + const requests: Record[] = [] + const fetchSpy = vi.spyOn(globalThis, 'fetch').mockImplementation(async (input, init) => { + const request = new Request(input, init) + if (request.method === 'PUT') { + const payload = await request.json() + requests.push(payload) + return Response.json({ + binding: createBinding({ ...payload, version: 1 }), + available_access_points: points, + effective_enabled: true, + }) + } + return Response.json({ + tenant_id: 'workspace-1', + app_id: 'app-1', + entitled: true, + binding: createBinding({ access_points: points }), + available_access_points: points, + effective_enabled: true, + }) + }) + try { + renderEntry({ + plan: 'professional', + availableAccessPoints: points, + groups: [createNetworkAccessGroupFixture()], + }) + await user.click(getChip()) + expect(screen.getAllByRole('switch')).toHaveLength(labels.length) + labels.forEach((label) => expect(screen.getByRole('switch', { name: label })).toBeChecked()) + await user.click(screen.getByRole('option', { name: /Internal Network/ })) + await user.click(screen.getByRole('button', { name: 'Save' })) + await waitFor(() => + expect(requests).toEqual([ + { enabled: true, group_id: 'group-1', access_points: points, expected_version: 0 }, + ]), + ) + } finally { + fetchSpy.mockRestore() + } + }, + ) + + it.each(capabilityCases)( + 'shows full $name coverage in saved status', + async ({ points, labels }) => { + const user = userEvent.setup() + renderEntry({ + plan: 'professional', + availableAccessPoints: points, + groups: [createNetworkAccessGroupFixture()], + binding: createBinding({ access_points: points }), + }) + expect(within(getChip()).getByText('ON')).toBeInTheDocument() + await user.click(getChip()) + expect( + screen.getByText(`Protecting all ${points.length} access points in service.`), + ).toBeInTheDocument() + labels.forEach((label) => expect(screen.getByText(label)).toBeInTheDocument()) + if (!points.includes('trigger')) expect(screen.queryByText('Trigger')).not.toBeInTheDocument() + if (!points.includes('mcp')) expect(screen.queryByText('MCP Server')).not.toBeInTheDocument() + }, + ) + + it.each(capabilityCases)( + 'uses $name capabilities in the downgrade summary', + async ({ points }) => { + const user = userEvent.setup() + renderEntry({ + plan: 'sandbox', + availableAccessPoints: points, + groups: [createNetworkAccessGroupFixture()], + binding: createBinding({ access_points: points }), + }) + await user.click(getChip()) + expect( + screen.getByText(`Protects ${points.length} of ${points.length} access points`), + ).toBeInTheDocument() + }, + ) + + it('lets editors select and save an existing policy without allowing policy creation', async () => { + const user = userEvent.setup() + const { unmount } = renderEntry({ plan: 'professional', role: 'editor' }) + await user.click(getChip()) + expect(screen.queryByRole('button', { name: 'Create an IP policy' })).not.toBeInTheDocument() + await user.click(screen.getByRole('button', { name: 'Manage IP policies' })) + expect(mockSetSettingsDestination).toHaveBeenCalledWith('ip-policies') + unmount() + const fetchSpy = vi.spyOn(globalThis, 'fetch').mockResolvedValue( + Response.json({ + binding: createBinding(), + available_access_points: ['webapp', 'service_api', 'mcp'], + effective_enabled: true, + }), + ) + try { + renderEntry({ + plan: 'professional', + role: 'editor', + groups: [createNetworkAccessGroupFixture()], + }) + await user.click(getChip()) + await user.click(screen.getByRole('option', { name: /Internal Network/ })) + await user.click(screen.getByRole('button', { name: 'Save' })) + await waitFor(() => expect(fetchSpy).toHaveBeenCalled()) + const [input, init] = fetchSpy.mock.calls[0]! + expect(new Request(input, init).method).toBe('PUT') + } finally { + fetchSpy.mockRestore() + } + }) + + it('preserves selected scopes and versions when pausing and resuming a binding', async () => { + const user = userEvent.setup() + const availableAccessPoints = ['webapp', 'service_api', 'mcp'] as const + let binding = createBinding({ access_points: ['webapp', 'mcp'] }) + const payloads: unknown[] = [] + const fetchSpy = vi.spyOn(globalThis, 'fetch').mockImplementation(async (input, init) => { + const request = new Request(input, init) + if (request.url.endsWith('/workspaces/current/network-access-groups')) + return Response.json({ + tenant_id: 'workspace-1', + entitled: true, + groups: [createNetworkAccessGroupFixture()], + }) + if (request.method === 'PUT') { + const payload = await request.json() + payloads.push(payload) + binding = createBinding({ ...payload, version: binding.version + 1 }) + return Response.json({ + binding, + available_access_points: availableAccessPoints, + effective_enabled: binding.enabled, + }) + } + return Response.json({ + tenant_id: 'workspace-1', + app_id: 'app-1', + entitled: true, + binding, + available_access_points: availableAccessPoints, + effective_enabled: binding.enabled, + }) + }) + try { + renderEntry({ plan: 'professional', groups: [createNetworkAccessGroupFixture()], binding }) + await user.click(getChip()) + await user.click(screen.getByRole('switch', { name: 'Restrict by IP address' })) + expect(screen.getByRole('alertdialog')).toHaveTextContent( + 'Web App, MCP Server will be reachable from any IP.', + ) + await user.click(screen.getByRole('button', { name: 'Turn off' })) + await user.click(screen.getByRole('button', { name: 'Save' })) + await waitFor(() => + expect(payloads).toEqual([ + { + enabled: false, + group_id: 'group-1', + access_points: ['webapp', 'mcp'], + expected_version: 2, + }, + ]), + ) + await waitFor(() => + expect(screen.queryByRole('button', { name: 'Save' })).not.toBeInTheDocument(), + ) + expect(screen.getByRole('switch', { name: 'Restrict by IP address' })).not.toBeChecked() + await user.click(screen.getByRole('switch', { name: 'Restrict by IP address' })) + await user.click(screen.getByRole('button', { name: 'Save' })) + await waitFor(() => expect(payloads).toHaveLength(2)) + expect(payloads[1]).toEqual({ + enabled: true, + group_id: 'group-1', + access_points: ['webapp', 'mcp'], + expected_version: 3, + }) + await waitFor(() => + expect(screen.queryByRole('button', { name: 'Save' })).not.toBeInTheDocument(), + ) + } finally { + fetchSpy.mockRestore() + } + }) + + it('shows a paid read-only binding without a downgrade or editing controls', async () => { + const user = userEvent.setup() + const fetchSpy = vi.spyOn(globalThis, 'fetch') + try { + renderEntry({ + plan: 'professional', + canEditBinding: false, + groups: [createNetworkAccessGroupFixture()], + binding: createBinding(), + }) + await user.click(getChip()) + expect(screen.getByText('Restricted to Internal Network')).toBeInTheDocument() + expect(screen.getByRole('switch', { name: 'Restrict by IP address' })).toHaveAttribute( + 'aria-disabled', + 'true', + ) + expect(screen.queryByRole('button', { name: 'Edit' })).not.toBeInTheDocument() + expect(screen.queryByRole('button', { name: 'Save' })).not.toBeInTheDocument() + expect(screen.queryByText('This app is no longer protected')).not.toBeInTheDocument() + expect( + screen.queryByRole('button', { name: 'Turn on Access Control' }), + ).not.toBeInTheDocument() + await user.click(screen.getByRole('switch', { name: 'Restrict by IP address' })) + expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument() + expect(fetchSpy).not.toHaveBeenCalled() + } finally { + fetchSpy.mockRestore() + } + }) + + it('discards unsaved policy and scope edits when binding permission is revoked', async () => { + const user = userEvent.setup() + const rendered = renderEntry({ + plan: 'professional', + groups: [ + createNetworkAccessGroupFixture(), + createNetworkAccessGroupFixture({ id: 'group-2', name: 'Office' }), + ], + binding: createBinding(), + }) + await user.click(getChip()) + await user.click(screen.getByRole('button', { name: 'Edit' })) + await user.click(screen.getByRole('combobox', { name: 'IP Policy' })) + await user.click(screen.getByRole('option', { name: /Office/ })) + await user.click(screen.getByRole('switch', { name: 'MCP Server' })) + expect(screen.getByRole('button', { name: 'Save' })).toBeEnabled() + + rendered.rerender() + await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument()) + await user.click(getChip()) + expect(screen.getByText('Restricted to Internal Network')).toBeInTheDocument() + expect(screen.getByText('Protecting all 3 access points in service.')).toBeInTheDocument() + expect(screen.queryByText('Office')).not.toBeInTheDocument() + expect(screen.queryByRole('button', { name: 'Edit' })).not.toBeInTheDocument() + expect(screen.getByRole('switch', { name: 'Restrict by IP address' })).toHaveAttribute( + 'aria-disabled', + 'true', + ) + + rendered.rerender() + await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument()) + await user.click(getChip()) + expect(screen.getByText('Restricted to Internal Network')).toBeInTheDocument() + await user.click(screen.getByRole('button', { name: 'Edit' })) + expect(screen.getByRole('combobox', { name: 'IP Policy' })).toHaveTextContent( + 'Internal Network', + ) + expect(screen.getByRole('switch', { name: 'MCP Server' })).toBeChecked() + expect(screen.getByRole('button', { name: 'Save' })).toBeDisabled() + }) + + it('closes an outstanding pause confirmation when binding permission is revoked', async () => { + const user = userEvent.setup() + const rendered = renderEntry({ + plan: 'professional', + groups: [createNetworkAccessGroupFixture()], + binding: createBinding(), + }) + await user.click(getChip()) + await user.click(screen.getByRole('switch', { name: 'Restrict by IP address' })) + expect(screen.getByRole('alertdialog')).toBeInTheDocument() + + rendered.rerender() + await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument()) + await user.click(getChip()) + expect(screen.getByRole('switch', { name: 'Restrict by IP address' })).toBeChecked() + expect(screen.queryByRole('button', { name: 'Save' })).not.toBeInTheDocument() + + rendered.rerender() + await user.click(getChip()) + expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument() + expect(screen.getByRole('switch', { name: 'Restrict by IP address' })).toBeChecked() + expect(screen.queryByRole('button', { name: 'Save' })).not.toBeInTheDocument() + }) + + it('keeps first-time binding controls read-only when app edits are forbidden', async () => { + const user = userEvent.setup() + renderEntry({ + plan: 'professional', + canEditBinding: false, + groups: [createNetworkAccessGroupFixture()], + }) + await user.click(getChip()) + expect(screen.getByRole('option', { name: /Internal Network/ })).toBeDisabled() + expect(screen.getByRole('switch', { name: 'Web App' })).toHaveAttribute('aria-disabled', 'true') + expect(screen.queryByRole('button', { name: 'Save' })).not.toBeInTheDocument() + }) + + it.each(['normal', 'dataset_operator'] as const)('hides the entry from workspace %s', (role) => { + renderEntry({ plan: 'professional', role }) + expect(screen.queryByRole('button', { name: /Access Control/ })).not.toBeInTheDocument() + }) + + it('does not create an editable fallback when available access points are empty', () => { + renderEntry({ plan: 'professional', availableAccessPoints: [] }) + expect(screen.queryByRole('button', { name: /Access Control/ })).not.toBeInTheDocument() + }) + + it('discards the previous app draft when the App ID changes', async () => { + const user = userEvent.setup() + const rendered = renderEntry({ + plan: 'professional', + groups: [createNetworkAccessGroupFixture()], + }) + seedAppNetworkAccessGroup(rendered.queryClient, 'app-2', { + available_access_points: ['webapp', 'service_api'], + }) + await user.click(getChip()) + await user.click(screen.getByRole('option', { name: /Internal Network/ })) + await user.click(screen.getByRole('switch', { name: 'Web App' })) + expect(screen.getByRole('button', { name: 'Save' })).toBeEnabled() + rendered.rerender() + expect(screen.queryByRole('dialog')).not.toBeInTheDocument() + await user.click(getChip()) + expect(screen.getByRole('switch', { name: 'Web App' })).toBeChecked() + expect(screen.getByRole('button', { name: 'Save' })).toBeDisabled() + expect(screen.queryByRole('switch', { name: 'MCP Server' })).not.toBeInTheDocument() + }) + + it.each([ + { + name: 'failed binding query', + response: () => Response.json({ message: 'Service unavailable' }, { status: 503 }), + status: 'error', + }, + { + name: 'missing capability field', + response: () => + Response.json({ + tenant_id: 'workspace-1', + app_id: 'app-1', + entitled: true, + binding: null, + effective_enabled: false, + }), + status: 'success', + }, + ])('does not enable editing after $name', async ({ response, status }) => { + const queryClient = createConsoleQueryClient() + seedNetworkAccessGroups(queryClient, { entitled: true }) + const fetchSpy = vi.spyOn(globalThis, 'fetch').mockImplementation(async () => response()) + try { + renderWithConsoleQuery(, { + queryClient, + systemFeatures: { deployment_edition: 'CLOUD' }, + }) + await waitFor(() => + expect( + queryClient.getQueryState( + consoleQuery.apps.byAppId.networkAccessGroup.get.queryKey({ + input: { params: { app_id: 'app-1' } }, + }), + )?.status, + ).toBe(status), + ) + expect(screen.queryByRole('button', { name: /Access Control/ })).not.toBeInTheDocument() + expect(fetchSpy).toHaveBeenCalledTimes(1) + } finally { + fetchSpy.mockRestore() + } }) }) diff --git a/web/app/components/app/access-point/access-control/__tests__/network-access.spec.ts b/web/app/components/app/access-point/access-control/__tests__/network-access.spec.ts index 63c51d27717..0681bfe7e3e 100644 --- a/web/app/components/app/access-point/access-control/__tests__/network-access.spec.ts +++ b/web/app/components/app/access-point/access-control/__tests__/network-access.spec.ts @@ -1,6 +1,8 @@ +import { ACCESS_POINT_ORDER } from '@/app/components/app/deploy/utils/access-point' import { accessPointsFromScopes, draftFromBinding, + getAvailableAccessPoints, getNetworkAccessErrorStatus, scopesFromAccessPoints, toApiAccessPoint, @@ -31,12 +33,15 @@ describe('network access mappers', () => { it('includes every selected access point in the PUT payload', () => { expect( - accessPointsFromScopes({ - webApp: true, - serviceApi: true, - mcp: true, - trigger: true, - }), + accessPointsFromScopes( + { + webApp: true, + serviceApi: true, + mcp: true, + trigger: true, + }, + ACCESS_POINT_ORDER, + ), ).toEqual(['webapp', 'service_api', 'mcp', 'trigger']) }) @@ -49,13 +54,13 @@ describe('network access mappers', () => { mcp: true, trigger: true, }, - ['webapp', 'service_api', 'mcp'], + ['webApp', 'serviceApi', 'mcp'], ), ).toEqual(['webapp', 'service_api', 'mcp']) }) it('creates an empty draft when the app has no binding', () => { - expect(draftFromBinding(null)).toEqual({ + expect(draftFromBinding(null, ACCESS_POINT_ORDER)).toEqual({ selectedPolicyId: null, enabled: true, scopes: { @@ -69,17 +74,20 @@ describe('network access mappers', () => { it('hydrates a draft from a bound group', () => { expect( - draftFromBinding({ - id: 'binding-1', - tenant_id: 'workspace-1', - app_id: 'app-1', - enabled: true, - group_id: 'group-1', - access_points: ['webapp', 'service_api'], - version: 3, - created_at: '2026-01-01T00:00:00Z', - updated_at: '2026-01-01T00:00:00Z', - }), + draftFromBinding( + { + id: 'binding-1', + tenant_id: 'workspace-1', + app_id: 'app-1', + enabled: true, + group_id: 'group-1', + access_points: ['webapp', 'service_api'], + version: 3, + created_at: '2026-01-01T00:00:00Z', + updated_at: '2026-01-01T00:00:00Z', + }, + ['webApp', 'serviceApi'], + ), ).toEqual({ selectedPolicyId: 'group-1', enabled: true, @@ -92,3 +100,19 @@ describe('network access mappers', () => { }) }) }) + +describe('available scope mapping', () => { + it('orders supported access points independently of response order', () => { + expect(getAvailableAccessPoints(['mcp', 'webapp', 'service_api'])).toEqual([ + 'webApp', + 'serviceApi', + 'mcp', + ]) + }) + it('keeps an explicit empty capability list empty', () => { + expect(getAvailableAccessPoints([])).toEqual([]) + expect( + accessPointsFromScopes({ webApp: true, serviceApi: true, mcp: true, trigger: true }, []), + ).toEqual([]) + }) +}) diff --git a/web/app/components/app/access-point/access-control/chip-status.ts b/web/app/components/app/access-point/access-control/chip-status.ts index 8833d78767e..66084fba011 100644 --- a/web/app/components/app/access-point/access-control/chip-status.ts +++ b/web/app/components/app/access-point/access-control/chip-status.ts @@ -1,6 +1,5 @@ import type { AccessControlDraft } from './draft' import type { AccessPoint } from '@/app/components/app/deploy/utils/access-point' -import { ACCESS_POINT_ORDER } from '@/app/components/app/deploy/utils/access-point' export type AccessControlAssignment = { policyId: string @@ -18,28 +17,33 @@ export type AccessControlChipState = { policyName?: string } -export function getInServiceCoverage(scopes: Record) { - const covered = ACCESS_POINT_ORDER.filter((scope) => scopes[scope]) +export function getInServiceCoverage( + scopes: Record, + availableAccessPoints: readonly AccessPoint[], +) { + const covered = availableAccessPoints.filter((scope) => scopes[scope]) return { coveredCount: covered.length, - inServiceCount: ACCESS_POINT_ORDER.length, + inServiceCount: availableAccessPoints.length, } } export function getAccessControlChipState({ entitled, assignment, + availableAccessPoints, }: { entitled?: boolean assignment: AccessControlAssignment | null + availableAccessPoints: readonly AccessPoint[] }): AccessControlChipState { if (!assignment) { if (entitled === false) return { kind: 'pro', coveredCount: 0, inServiceCount: 0 } return { kind: 'off', coveredCount: 0, inServiceCount: 0 } } - const coverage = getInServiceCoverage(assignment.scopes) + const coverage = getInServiceCoverage(assignment.scopes, availableAccessPoints) if (!assignment.enabled) { return { @@ -50,7 +54,10 @@ export function getAccessControlChipState({ } return { - kind: coverage.coveredCount === coverage.inServiceCount ? 'on' : 'partial', + kind: + coverage.inServiceCount > 0 && coverage.coveredCount === coverage.inServiceCount + ? 'on' + : 'partial', policyName: assignment.policyName, ...coverage, } diff --git a/web/app/components/app/access-point/access-control/config-panel.tsx b/web/app/components/app/access-point/access-control/config-panel.tsx index b4c00ee2bcd..716cb7008b6 100644 --- a/web/app/components/app/access-point/access-control/config-panel.tsx +++ b/web/app/components/app/access-point/access-control/config-panel.tsx @@ -2,6 +2,8 @@ import type { FormEvent } from 'react' import type { AccessControlDraft, AccessControlPolicy } from './draft' +import type { AccessControlAppIcon } from './index' +import type { AccessPoint } from '@/app/components/app/deploy/utils/access-point' import { Button } from '@langgenius/dify-ui/button' import { cn } from '@langgenius/dify-ui/cn' import { Fieldset, FieldsetLegend } from '@langgenius/dify-ui/fieldset' @@ -16,7 +18,10 @@ type AccessControlConfigPanelProps = { draft: AccessControlDraft policies: readonly AccessControlPolicy[] currentIp?: string - persistableAccessPoints?: readonly string[] + availableAccessPoints: readonly AccessPoint[] + appIcon: AccessControlAppIcon + readOnly?: boolean + canManagePolicies: boolean baseline?: AccessControlDraft showBack?: boolean saving?: boolean @@ -32,7 +37,10 @@ export function AccessControlConfigPanel({ draft, policies, currentIp, - persistableAccessPoints, + availableAccessPoints, + appIcon, + readOnly = false, + canManagePolicies, baseline, showBack = false, saving = false, @@ -46,10 +54,8 @@ export function AccessControlConfigPanel({ const { t } = useTranslation() const title = t(($) => $['studio.accessControl.entryLabel'], { ns: 'deployments' }) const hasSelectedPolicy = Boolean(draft.selectedPolicyId) - const hasPersistableSelection = persistableAccessPoints - ? persistableAccessPoints.length > 0 - : hasSelectedAccessPoint(draft) - const canSave = canSaveAccessControl({ draft, baseline, persistableAccessPoints }) + const hasPersistableSelection = hasSelectedAccessPoint(draft, availableAccessPoints) + const canSave = !readOnly && canSaveAccessControl({ draft, baseline, availableAccessPoints }) const handleSubmit = (event: FormEvent) => { event.preventDefault() @@ -90,9 +96,12 @@ export function AccessControlConfigPanel({ policies={policies} selectedPolicyId={draft.selectedPolicyId} currentIp={currentIp} + readOnly={readOnly} + canManagePolicies={canManagePolicies} onCreatePolicy={onCreatePolicy} onManagePolicies={onManagePolicies} onSelectPolicy={(policyId) => { + if (readOnly) return onDraftChange({ ...draft, selectedPolicyId: policyId }) }} /> @@ -107,7 +116,13 @@ export function AccessControlConfigPanel({ ? t(($) => $['studio.accessControl.applyToHelpSelected'], { ns: 'deployments' }) : t(($) => $['studio.accessControl.applyToHelp'], { ns: 'deployments' })}

- + {hasSelectedPolicy && draft.enabled && !hasPersistableSelection && (

{t(($) => $['studio.accessControl.selectAccessPoint'], { ns: 'deployments' })} @@ -119,9 +134,11 @@ export function AccessControlConfigPanel({ - + {!readOnly && ( + + )} diff --git a/web/app/components/app/access-point/access-control/downgrade-panel.tsx b/web/app/components/app/access-point/access-control/downgrade-panel.tsx index b948f976660..8506f865491 100644 --- a/web/app/components/app/access-point/access-control/downgrade-panel.tsx +++ b/web/app/components/app/access-point/access-control/downgrade-panel.tsx @@ -1,13 +1,12 @@ 'use client' import type { AccessControlAssignment } from './chip-status' +import type { AccessControlAppIcon } from './index' import type { AccessPoint } from '@/app/components/app/deploy/utils/access-point' import { Button } from '@langgenius/dify-ui/button' import { cn } from '@langgenius/dify-ui/cn' import { PopoverDescription, PopoverTitle } from '@langgenius/dify-ui/popover' import { useTranslation } from 'react-i18next' -import { ACCESS_POINT_ORDER } from '@/app/components/app/deploy/utils/access-point' -import { useStore as useAppStore } from '@/app/components/app/store' import AppIcon from '@/app/components/base/app-icon' import { getInServiceCoverage } from './chip-status' @@ -19,17 +18,20 @@ const SCOPE_ICONS: Record, string> = { type AccessControlDowngradePanelProps = { assignment: AccessControlAssignment + appIcon: AccessControlAppIcon + availableAccessPoints: readonly AccessPoint[] onTurnOn: () => void } export function AccessControlDowngradePanel({ assignment, + appIcon, + availableAccessPoints, onTurnOn, }: AccessControlDowngradePanelProps) { const { t } = useTranslation() - const appInfo = useAppStore((state) => state.appDetail) - const coverage = getInServiceCoverage(assignment.scopes) - const protectedScopes = ACCESS_POINT_ORDER.filter((scope) => assignment.scopes[scope]) + const coverage = getInServiceCoverage(assignment.scopes, availableAccessPoints) + const protectedScopes = availableAccessPoints.filter((scope) => assignment.scopes[scope]) const title = t(($) => $['studio.accessControl.entryLabel'], { ns: 'deployments' }) const turnOn = t(($) => $['studio.accessControl.turnOn'], { ns: 'deployments' }) const pro = t(($) => $['studio.accessControl.proBadge'], { ns: 'deployments' }) @@ -64,10 +66,7 @@ export function AccessControlDowngradePanel({ key={scope} size="tiny" decorative - iconType={appInfo?.icon_type} - icon={appInfo?.icon} - background={appInfo?.icon_background ?? undefined} - imageUrl={appInfo?.icon_url} + {...appIcon} className="rounded-sm bg-util-colors-orange-orange-100" /> ) : ( diff --git a/web/app/components/app/access-point/access-control/draft.ts b/web/app/components/app/access-point/access-control/draft.ts index a9bde917d5d..49d6ebb61be 100644 --- a/web/app/components/app/access-point/access-control/draft.ts +++ b/web/app/components/app/access-point/access-control/draft.ts @@ -1,6 +1,5 @@ import type { NetworkAccessGroupResponse } from '@dify/contracts/api/console/workspaces/types.gen' import type { AccessPoint } from '@/app/components/app/deploy/utils/access-point' -import { ACCESS_POINT_ORDER } from '@/app/components/app/deploy/utils/access-point' export type AccessControlPolicy = Pick @@ -10,40 +9,49 @@ export type AccessControlDraft = { enabled: boolean } -export const createDefaultAccessControlDraft = (): AccessControlDraft => ({ +export const createDefaultAccessControlDraft = ( + availableAccessPoints: readonly AccessPoint[], +): AccessControlDraft => ({ selectedPolicyId: null, enabled: true, scopes: { - webApp: true, - serviceApi: true, - mcp: true, - trigger: true, + webApp: availableAccessPoints.includes('webApp'), + serviceApi: availableAccessPoints.includes('serviceApi'), + mcp: availableAccessPoints.includes('mcp'), + trigger: availableAccessPoints.includes('trigger'), }, }) -export function isAccessControlDraftEqual(left: AccessControlDraft, right: AccessControlDraft) { +export function isAccessControlDraftEqual( + left: AccessControlDraft, + right: AccessControlDraft, + availableAccessPoints: readonly AccessPoint[], +) { if (left.selectedPolicyId !== right.selectedPolicyId) return false if (left.enabled !== right.enabled) return false - return ACCESS_POINT_ORDER.every((scope) => left.scopes[scope] === right.scopes[scope]) + return availableAccessPoints.every((scope) => left.scopes[scope] === right.scopes[scope]) } -export function hasSelectedAccessPoint(draft: AccessControlDraft) { - return ACCESS_POINT_ORDER.some((scope) => draft.scopes[scope]) +export function hasSelectedAccessPoint( + draft: AccessControlDraft, + availableAccessPoints: readonly AccessPoint[], +) { + return availableAccessPoints.some((scope) => draft.scopes[scope]) } export function canSaveAccessControl({ draft, baseline, - persistableAccessPoints, + availableAccessPoints, }: { draft: AccessControlDraft baseline?: AccessControlDraft - persistableAccessPoints?: readonly string[] + availableAccessPoints: readonly AccessPoint[] }) { - if (baseline && isAccessControlDraftEqual(draft, baseline)) return false + if (!availableAccessPoints.length) return false + if (baseline && isAccessControlDraftEqual(draft, baseline, availableAccessPoints)) return false if (!draft.enabled) return Boolean(draft.selectedPolicyId) if (!draft.selectedPolicyId) return false - if (persistableAccessPoints) return persistableAccessPoints.length > 0 - return hasSelectedAccessPoint(draft) + return hasSelectedAccessPoint(draft, availableAccessPoints) } diff --git a/web/app/components/app/access-point/access-control/index.tsx b/web/app/components/app/access-point/access-control/index.tsx index a4ed26725ba..fc5bba54ddc 100644 --- a/web/app/components/app/access-point/access-control/index.tsx +++ b/web/app/components/app/access-point/access-control/index.tsx @@ -1,15 +1,16 @@ 'use client' +import type { ComponentProps } from 'react' import type { AccessControlAssignment } from './chip-status' import type { AccessControlDraft } from './draft' +import type AppIcon from '@/app/components/base/app-icon' import { Popover, PopoverContent, PopoverTrigger } from '@langgenius/dify-ui/popover' import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip' -import { skipToken, useMutation, useQuery, useQueryClient } from '@tanstack/react-query' +import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { useAtomValue } from 'jotai' import { useQueryState } from 'nuqs' import { useState } from 'react' import { useTranslation } from 'react-i18next' -import { useStore as useAppStore } from '@/app/components/app/store' import { pricingQueryParamName, pricingQueryParser, @@ -19,8 +20,10 @@ import { settingsQueryParamName, settingsQueryParser, } from '@/app/components/header/account-setting/query-params' -import { isCurrentWorkspaceManagerAtom } from '@/context/workspace-state' -import { deploymentEditionAtom } from '@/features/system-features/state' +import { + canManageNetworkAccessPoliciesAtom, + canReadNetworkAccessAtom, +} from '@/features/network-access/permissions' import { consoleQuery } from '@/service/console' import { AccessControlChipAffix } from './chip-affix' import { getAccessControlChipState } from './chip-status' @@ -31,26 +34,39 @@ import { AccessControlFreePaywall } from './free-paywall' import { accessPointsFromScopes, draftFromBinding, + getAvailableAccessPoints, getNetworkAccessErrorStatus, - scopesFromAccessPoints, } from './network-access' import { AccessControlStatusPanel } from './status-panel' +export type AccessControlAppIcon = Pick< + ComponentProps, + 'iconType' | 'icon' | 'background' | 'imageUrl' +> + +type AccessControlEntryProps = { + appId: string + appIcon: AccessControlAppIcon + canEditBinding: boolean +} + type GtagHandler = (command: 'event', action: 'click_upgrade_btn', payload: { loc: string }) => void -export function AccessControlEntry() { +export function AccessControlEntry(props: AccessControlEntryProps) { + return +} + +function AccessControlSession({ appId, appIcon, canEditBinding }: AccessControlEntryProps) { const { t } = useTranslation() const queryClient = useQueryClient() - const deploymentEdition = useAtomValue(deploymentEditionAtom) - const isManager = useAtomValue(isCurrentWorkspaceManagerAtom) + const canRead = useAtomValue(canReadNetworkAccessAtom) + const canManagePolicies = useAtomValue(canManageNetworkAccessPoliciesAtom) const [_pricing, setPricing] = useQueryState(pricingQueryParamName, pricingQueryParser) const [_settingsDestination, setSettingsDestination] = useQueryState( settingsQueryParamName, settingsQueryParser, ) - const appInfo = useAppStore((state) => state.appDetail) - const appId = appInfo?.id - const canFetchNetworkAccess = deploymentEdition === 'CLOUD' && isManager + const canFetchNetworkAccess = canRead && Boolean(appId) const groupsQuery = useQuery( consoleQuery.workspaces.current.networkAccessGroups.get.queryOptions({ enabled: canFetchNetworkAccess, @@ -59,7 +75,7 @@ export function AccessControlEntry() { ) const bindingQuery = useQuery( consoleQuery.apps.byAppId.networkAccessGroup.get.queryOptions({ - input: appId ? { params: { app_id: appId } } : skipToken, + input: { params: { app_id: appId } }, context: { silent: true }, retry: false, enabled: canFetchNetworkAccess && Boolean(appId), @@ -83,44 +99,49 @@ export function AccessControlEntry() { Boolean(appId) && (bindingErrorStatus === 400 || bindingErrorStatus === 403 || bindingErrorStatus === 404) - if (deploymentEdition !== 'CLOUD' || !isManager) return null + if (!canFetchNetworkAccess) return null if (hideForUnsupportedApp) return null - if (groupsQuery.isPending || (appId && bindingQuery.isPending)) return null + if (groupsQuery.isPending || bindingQuery.isPending) return null + if (groupsQuery.isError || bindingQuery.isError || !groupsQuery.data || !bindingQuery.data) + return null + if (!Array.isArray(bindingQuery.data.available_access_points)) return null + const availableAccessPoints = getAvailableAccessPoints(bindingQuery.data.available_access_points) + if (!availableAccessPoints.length) return null const label = t(($) => $['studio.accessControl.entryLabel'], { ns: 'deployments' }) - const groups = groupsQuery.data?.groups ?? [] - const binding = bindingQuery.data?.binding + const groups = groupsQuery.data.groups + const binding = bindingQuery.data.binding const policies = groups.map((group) => ({ id: group.id, name: group.name, allowed_cidrs: group.allowed_cidrs, })) - const baseline = draftFromBinding(binding) - const resolvedDraft = draft ?? baseline + const baseline = draftFromBinding(binding, availableAccessPoints) + const entitled = bindingQuery.data.entitled + const canMutate = canRead && canEditBinding && entitled + const resolvedDraft = canMutate ? (draft ?? baseline) : baseline const assignment: AccessControlAssignment | null = binding?.group_id ? { policyId: binding.group_id, policyName: groups.find((group) => group.id === binding.group_id)?.name ?? binding.group_id, - scopes: scopesFromAccessPoints(binding.access_points), + scopes: baseline.scopes, enabled: binding.enabled, } : null - const entitled = bindingQuery.data?.entitled ?? groupsQuery.data?.entitled - const canMutate = entitled === true - const dirty = !isAccessControlDraftEqual(resolvedDraft, baseline) + const dirty = !isAccessControlDraftEqual(resolvedDraft, baseline, availableAccessPoints) const persistableAccessPoints = accessPointsFromScopes( resolvedDraft.scopes, - bindingQuery.data?.available_access_points, + availableAccessPoints, ) const canSave = canSaveAccessControl({ draft: resolvedDraft, baseline, - persistableAccessPoints, + availableAccessPoints, }) - const chip = getAccessControlChipState({ entitled, assignment }) + const chip = getAccessControlChipState({ entitled, assignment, availableAccessPoints }) const showPaywall = chip.kind === 'pro' - const showDowngrade = Boolean(assignment) && !canMutate - const showStatus = Boolean(assignment) && canMutate && view === 'status' + const showDowngrade = Boolean(assignment) && !entitled + const showStatus = Boolean(assignment) && entitled && (!canMutate || view === 'status') const tooltip = chip.kind === 'pro' @@ -170,6 +191,7 @@ export function AccessControlEntry() { } const handleCreatePolicy = () => { + if (!canMutate || !canManagePolicies) return setOpen(false) setCreatePolicyOpen(true) } @@ -197,7 +219,7 @@ export function AccessControlEntry() { }, onSuccess?: () => void, ) => { - if (!appId) return + if (!canMutate) return updateBinding.mutate( { @@ -287,17 +309,23 @@ export function AccessControlEntry() { {showPaywall ? ( ) : showDowngrade && assignment ? ( - + ) : showStatus && assignment ? ( { + if (canMutate) setDraft(nextDraft) + }} onSave={handleSave} /> )} @@ -328,13 +361,14 @@ export function AccessControlEntry() { {tooltip} - {createPolicyOpen && ( + {createPolicyOpen && canMutate && canManagePolicies && ( { + if (!canMutate || !canManagePolicies) return createGroup.mutate( { body: { diff --git a/web/app/components/app/access-point/access-control/network-access.ts b/web/app/components/app/access-point/access-control/network-access.ts index ceb7d6f9f09..b370ef5077c 100644 --- a/web/app/components/app/access-point/access-control/network-access.ts +++ b/web/app/components/app/access-point/access-control/network-access.ts @@ -65,27 +65,31 @@ export function scopesFromAccessPoints( } } +export function getAvailableAccessPoints( + accessPoints: readonly NetworkAccessPoint[], +): AccessPoint[] { + const available = new Set(accessPoints) + return ACCESS_POINT_ORDER.filter((accessPoint) => available.has(toApiAccessPoint(accessPoint))) +} + export function accessPointsFromScopes( scopes: AccessControlDraft['scopes'], - availableAccessPoints?: readonly string[], + availableAccessPoints: readonly AccessPoint[], ): NetworkAccessPoint[] { - const allowed = availableAccessPoints ? new Set(availableAccessPoints) : null - - return ACCESS_POINT_ORDER.filter((accessPoint) => { - if (!scopes[accessPoint]) return false - if (!allowed) return true - return allowed.has(toApiAccessPoint(accessPoint)) - }).map(toApiAccessPoint) + return availableAccessPoints.filter((accessPoint) => scopes[accessPoint]).map(toApiAccessPoint) } export function draftFromBinding( - binding: AppNetworkAccessGroupBindingResponse | null | undefined, + binding: AppNetworkAccessGroupBindingResponse | null, + availableAccessPoints: readonly AccessPoint[], ): AccessControlDraft { - if (!binding?.group_id) return createDefaultAccessControlDraft() + if (!binding?.group_id) return createDefaultAccessControlDraft(availableAccessPoints) return { selectedPolicyId: binding.group_id, enabled: binding.enabled, - scopes: scopesFromAccessPoints(binding.access_points), + scopes: scopesFromAccessPoints( + accessPointsFromScopes(scopesFromAccessPoints(binding.access_points), availableAccessPoints), + ), } } diff --git a/web/app/components/app/access-point/access-control/policy-field.tsx b/web/app/components/app/access-point/access-control/policy-field.tsx index e423382fe80..56223105522 100644 --- a/web/app/components/app/access-point/access-control/policy-field.tsx +++ b/web/app/components/app/access-point/access-control/policy-field.tsx @@ -26,6 +26,8 @@ type AccessControlPolicyFieldProps = { policies: readonly AccessControlPolicy[] selectedPolicyId: string | null currentIp?: string + readOnly?: boolean + canManagePolicies: boolean onCreatePolicy: () => void onManagePolicies: () => void onSelectPolicy: (policyId: string) => void @@ -35,6 +37,8 @@ export function AccessControlPolicyField({ policies, selectedPolicyId, currentIp, + readOnly = false, + canManagePolicies, onCreatePolicy, onManagePolicies, onSelectPolicy, @@ -56,9 +60,15 @@ export function AccessControlPolicyField({

{t(($) => $['studio.accessControl.emptyPoliciesTitle'], { ns: 'deployments' })}

- + {canManagePolicies && !readOnly ? ( + + ) : ( + + )} ) } @@ -123,8 +133,11 @@ export function AccessControlPolicyField({ type="button" role="option" aria-selected={false} + disabled={readOnly} className="flex h-8 w-full cursor-pointer items-center rounded-lg px-2 text-left system-sm-medium text-text-secondary outline-hidden hover:bg-state-base-hover focus-visible:ring-2 focus-visible:ring-state-accent-solid" - onClick={() => onSelectPolicy(policy.id)} + onClick={() => { + if (!readOnly) onSelectPolicy(policy.id) + }} > {policy.name} @@ -155,7 +168,9 @@ export function AccessControlPolicyField({