Skip to content

armgit / dify

Public Imported from GitHub
0

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

test(web): exercise export, resume and access owners (#44749)

Stephen Zhouf64b57d6565a
diff --git a/web/app/components/app/access-point/__tests__/environment-access-point-cards.spec.tsx b/web/app/components/app/access-point/__tests__/environment-access-point-cards.spec.tsx
index 3e3da8bd452..b88d31948d2 100644
--- a/web/app/components/app/access-point/__tests__/environment-access-point-cards.spec.tsx
+++ b/web/app/components/app/access-point/__tests__/environment-access-point-cards.spec.tsx
@@ -14,8 +14,9 @@ import { EnvironmentServiceApiCard } from '../deployed-environment-access-points
import { EnvironmentWebAppCard } from '../deployed-environment-access-points/environment-web-app-card'
const mocks = vi.hoisted(() => ({
+ getApp: vi.fn(),
getApi: vi.fn(),
- saveSiteConfig: vi.fn(),
+ updateAppSite: vi.fn(),
getSite: vi.fn(),
getSubjects: vi.fn(),
resetSite: vi.fn(),
@@ -23,6 +24,7 @@ const mocks = vi.hoisted(() => ({
updateSite: vi.fn(),
environmentAccessControlProps: vi.fn(),
apiKeyButtonProps: vi.fn(),
+ toast: vi.fn(),
}))
let mockAppMode: AppMode = 'workflow'
@@ -35,12 +37,7 @@ vi.mock('@/app/components/base/app-icon', () => ({
default: () => <div aria-label="app-icon" />,
}))
-vi.mock('@/app/components/app/access-point/shared/use-access-point-actions', () => ({
- useAccessPointActions: () => ({
- saveSiteConfig: mocks.saveSiteConfig,
- }),
-}))
-
+// These independently tested children do not own the Settings form or its save/query lifecycle.
vi.mock('../deployed-environment-access-points/environment-access-control', () => ({
EnvironmentAccessControl: (props: {
appId: string
@@ -73,12 +70,12 @@ vi.mock(
}),
)
-vi.mock('@/app/notifications', () => ({
- toast: {
- error: vi.fn(),
- success: vi.fn(),
- },
-}))
+vi.mock('@/app/notifications', () => {
+ const toast = (...args: unknown[]) => mocks.toast(...args)
+ toast.error = vi.fn()
+ toast.success = vi.fn()
+ return { toast }
+})
const environmentParams = {
app_id: 'app-1',
@@ -98,18 +95,23 @@ const api = {
enabled: true,
}
+function createEnvironmentApp(siteOverrides: Parameters<typeof createAppSiteFixture>[0] = {}) {
+ return createAppDetailFixture({
+ mode: mockAppMode,
+ site: createAppSiteFixture({
+ access_token: 'built-in-code',
+ app_base_url: 'https://built-in.example.test',
+ ...siteOverrides,
+ }),
+ })
+}
+
function renderCard(ui: ReactElement, queryClient = createTestQueryClient()) {
- seedFeatures(queryClient)
+ seedFeatures(queryClient, { webapp_copyright_enabled: true })
seedSystemFeatures(queryClient, { webapp_auth: { enabled: true } })
queryClient.setQueryData(
consoleQuery.apps.byAppId.get.queryKey({ input: { params: { app_id: 'app-1' } } }),
- createAppDetailFixture({
- mode: mockAppMode,
- site: createAppSiteFixture({
- access_token: 'built-in-code',
- app_base_url: 'https://built-in.example.test',
- }),
- }),
+ createEnvironmentApp(),
)
return render(
@@ -135,12 +137,33 @@ afterAll(() => vi.unstubAllGlobals())
describe('environment access point cards', () => {
beforeEach(() => {
- vi.clearAllMocks()
- mocks.saveSiteConfig.mockResolvedValue(true)
mockAppMode = 'workflow'
+ mocks.toast.mockReset()
+ mocks.getApp.mockReset().mockResolvedValue(createEnvironmentApp())
+ mocks.updateAppSite.mockReset().mockImplementation(({ params, body }) =>
+ Promise.resolve({
+ app_id: params.app_id,
+ customize_token_strategy: 'not_allow',
+ default_language: body.default_language ?? 'en-US',
+ prompt_public: body.prompt_public ?? false,
+ show_workflow_steps: body.show_workflow_steps ?? false,
+ title: body.title ?? 'App',
+ use_icon_as_answer_icon: body.use_icon_as_answer_icon ?? false,
+ }),
+ )
vi.stubGlobal('fetch', async (input: RequestInfo | URL, init?: RequestInit) => {
const request = new Request(input, init)
const path = new URL(request.url).pathname
+ const appMatch = /^\/console\/api\/apps\/([^/]+)(?:\/(site))?$/.exec(path)
+ if (appMatch && request.method === 'GET' && !appMatch[2])
+ return Response.json(await mocks.getApp({ params: { app_id: appMatch[1] } }))
+ if (appMatch?.[2] === 'site' && request.method === 'POST')
+ return Response.json(
+ await mocks.updateAppSite({
+ params: { app_id: appMatch[1] },
+ body: await request.json(),
+ }),
+ )
const match = /\/enterprise\/app-deploy\/apps\/([^/]+)\/environments\/([^/]+)\/(.+)$/.exec(
path,
)
@@ -382,7 +405,23 @@ describe('environment access point cards', () => {
it('opens Customize and Settings with environment endpoint data', async () => {
const user = userEvent.setup()
- renderCard(<EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint />)
+ const queryClient = createTestQueryClient()
+ mocks.updateAppSite.mockImplementation(async ({ params, body }) => {
+ mocks.getApp.mockResolvedValue(createEnvironmentApp({ title: body.title }))
+ return {
+ app_id: params.app_id,
+ customize_token_strategy: 'not_allow',
+ default_language: body.default_language,
+ prompt_public: body.prompt_public,
+ show_workflow_steps: body.show_workflow_steps,
+ title: body.title,
+ use_icon_as_answer_icon: body.use_icon_as_answer_icon,
+ }
+ })
+ renderCard(
+ <EnvironmentWebAppCard appId="app-1" environmentId="staging" canManageAccessPoint />,
+ queryClient,
+ )
await screen.findByText(/environment\/workflow\/site-code/)
await waitFor(() =>
@@ -400,16 +439,53 @@ describe('environment access point cards', () => {
const settings = await screen.findByRole('dialog', {
name: 'appOverview.overview.appInfo.settings.title',
})
- await user.clear(within(settings).getByPlaceholderText('app.appNamePlaceholder'))
- await user.type(
- within(settings).getByPlaceholderText('app.appNamePlaceholder'),
- 'Environment portal',
- )
+ const title = within(settings).getByRole('textbox', {
+ name: 'appOverview.overview.appInfo.settings.webName',
+ })
+ await user.clear(title)
+ await user.type(title, 'Environment portal')
await user.click(within(settings).getByRole('button', { name: 'common.operation.save' }))
- expect(mocks.saveSiteConfig).toHaveBeenCalledWith(
- expect.objectContaining({ title: 'Environment portal' }),
+ await waitFor(() =>
+ expect(mocks.updateAppSite).toHaveBeenCalledExactlyOnceWith({
+ params: { app_id: 'app-1' },
+ body: {
+ chat_color_theme: '',
+ chat_color_theme_inverted: false,
+ copyright: '',
+ custom_disclaimer: '',
+ default_language: 'en-US',
+ description: '',
+ icon: null,
+ icon_background: null,
+ icon_type: null,
+ input_placeholder: '',
+ privacy_policy: '',
+ prompt_public: false,
+ show_workflow_steps: false,
+ title: 'Environment portal',
+ use_icon_as_answer_icon: false,
+ },
+ }),
)
await waitFor(() => expect(screen.queryByRole('dialog')).not.toBeInTheDocument())
+ const appKey = consoleQuery.apps.byAppId.get.queryKey({
+ input: { params: { app_id: 'app-1' } },
+ })
+ await waitFor(() =>
+ expect(
+ queryClient.getQueryData<ReturnType<typeof createEnvironmentApp>>(appKey)?.site?.title,
+ ).toBe('Environment portal'),
+ )
+
+ await user.click(screen.getByRole('button', { name: /settings\.settings/ }))
+ const reopenedSettings = await screen.findByRole('dialog', {
+ name: 'appOverview.overview.appInfo.settings.title',
+ })
+ expect(
+ within(reopenedSettings).getByRole('textbox', {
+ name: 'appOverview.overview.appInfo.settings.webName',
+ }),
+ ).toHaveValue('Environment portal')
})
it('keeps view actions available while disabling deployed Web App management', async () => {
diff --git a/web/app/components/workflow/operator/__tests__/export-image.spec.tsx b/web/app/components/workflow/operator/__tests__/export-image.spec.tsx
index 454b405f5bd..f5e5f61b2de 100644
--- a/web/app/components/workflow/operator/__tests__/export-image.spec.tsx
+++ b/web/app/components/workflow/operator/__tests__/export-image.spec.tsx
@@ -1,7 +1,9 @@
-import { cleanup, screen, waitFor, within } from '@testing-library/react'
+import { screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
-import { act } from 'react'
-import { renderWorkflowComponent as render } from '@/app/components/workflow/__tests__/workflow-test-env'
+import { act, useEffect } from 'react'
+import { useReactFlow } from 'reactflow'
+import { createNode } from '@/app/components/workflow/__tests__/fixtures'
+import { renderWorkflowFlowComponent as render } from '@/app/components/workflow/__tests__/workflow-test-env'
import { createConsoleQueryClient, seedAppDetail } from '@/test/console/query-data'
import { createAppDetailFixture } from '@/test/fixtures/app'
import { ExportImage } from '../export-image'
@@ -10,7 +12,6 @@ const mockToPng = vi.fn()
const mockToJpeg = vi.fn()
const mockToSvg = vi.fn()
const mockDownloadUrl = vi.fn()
-const mockSetViewport = vi.fn()
const { mockWorkflowState } = vi.hoisted(() => ({
mockWorkflowState: {
appName: 'Demo App',
@@ -23,16 +24,6 @@ vi.mock('html-to-image', () => ({
toSvg: (...args: unknown[]) => mockToSvg(...args),
}))
-vi.mock('reactflow', async (importOriginal) => ({
- ...(await importOriginal<typeof import('reactflow')>()),
- getNodesBounds: () => ({ x: 0, y: 0, width: 240, height: 120 }),
- useReactFlow: () => ({
- getNodes: () => [{ id: 'node-1' }],
- getViewport: () => ({ x: 0, y: 0, zoom: 1 }),
- setViewport: mockSetViewport,
- }),
-}))
-
vi.mock('@/utils/download', () => ({
downloadUrl: (...args: unknown[]) => mockDownloadUrl(...args),
}))
@@ -46,23 +37,57 @@ function createExportQueryClient() {
return queryClient
}
+const originalViewport = { x: 137, y: -83, zoom: 0.65 }
+const fittedViewport = { x: -40, y: 68, zoom: 0.8 }
+
+const nodes = [
+ createNode({ id: 'left', position: { x: 100, y: 80 }, width: 400, height: 200 }),
+ createNode({ id: 'right', position: { x: 900, y: 500 }, width: 300, height: 150 }),
+]
+
+type Flow = ReturnType<typeof useReactFlow>
+
+function ReactFlowProbe({ onReady }: { onReady: (flow: Flow) => void }) {
+ const flow = useReactFlow()
+ useEffect(() => onReady(flow), [flow, onReady])
+ return null
+}
+
+function renderExport(options: Parameters<typeof render>[1] = {}) {
+ let flow: Flow | undefined
+ const onReady = (instance: Flow) => {
+ flow = instance
+ }
+ const rendered = render(
+ <>
+ <ExportImage />
+ <ReactFlowProbe onReady={onReady} />
+ </>,
+ {
+ nodes,
+ reactFlowProps: { fitView: false, defaultViewport: originalViewport },
+ resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
+ queryClient: createExportQueryClient(),
+ ...options,
+ },
+ )
+
+ if (!flow) throw new Error('ReactFlow probe did not mount')
+ return { ...rendered, flow }
+}
+
describe('ExportImage', () => {
beforeEach(() => {
- vi.clearAllMocks()
- vi.useRealTimers()
- mockToPng.mockResolvedValue('data:image/png;base64,current')
- mockToJpeg.mockResolvedValue('data:image/jpeg;base64,current')
- mockToSvg.mockResolvedValue('data:image/svg+xml;base64,current')
+ mockToPng.mockReset().mockResolvedValue('data:image/png;base64,current')
+ mockToJpeg.mockReset().mockResolvedValue('data:image/jpeg;base64,current')
+ mockToSvg.mockReset().mockResolvedValue('data:image/svg+xml;base64,current')
+ mockDownloadUrl.mockReset()
mockWorkflowState.appName = 'Demo App'
-
- const viewport = document.createElement('div')
- viewport.className = 'react-flow__viewport'
- document.body.appendChild(viewport)
+ vi.spyOn(window, 'innerWidth', 'get').mockReturnValue(960)
+ vi.spyOn(window, 'innerHeight', 'get').mockReturnValue(720)
})
afterEach(() => {
- cleanup()
- document.querySelector('.react-flow__viewport')?.remove()
vi.restoreAllMocks()
vi.useRealTimers()
})
@@ -70,10 +95,7 @@ describe('ExportImage', () => {
it('opens the menu and exports the current view as png', async () => {
const user = userEvent.setup()
- render(<ExportImage />, {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- queryClient: createExportQueryClient(),
- })
+ renderExport()
await user.click(screen.getByRole('button', { name: 'workflow.common.exportImage' }))
const menu = screen.getByRole('menu', { name: 'workflow.common.exportImage' })
@@ -92,28 +114,24 @@ describe('ExportImage', () => {
),
)
- await waitFor(() => {
- expect(mockToPng).toHaveBeenCalledTimes(1)
- })
- expect(mockDownloadUrl).toHaveBeenCalledWith({
- url: 'data:image/png;base64,current',
- fileName: 'Demo App.png',
- })
- await waitFor(() => expect(screen.queryByRole('menu')).not.toBeInTheDocument())
+ await waitFor(() =>
+ expect(mockDownloadUrl).toHaveBeenCalledWith({
+ url: 'data:image/png;base64,current',
+ fileName: 'Demo App.png',
+ }),
+ )
+ expect(mockToPng).toHaveBeenCalledTimes(1)
+ expect(screen.queryByRole('menu')).not.toBeInTheDocument()
})
it('does not open the menu when the workflow is read only', async () => {
const user = userEvent.setup()
- render(<ExportImage />, {
- initialStoreState: { canvasReadOnly: true },
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- queryClient: createExportQueryClient(),
- })
+ renderExport({ initialStoreState: { canvasReadOnly: true } })
const trigger = screen.getByRole('button', { name: 'workflow.common.exportImage' })
expect(trigger).toHaveAttribute('aria-disabled', 'true')
- await user.tab()
+ trigger.focus()
expect(trigger).toHaveFocus()
await user.keyboard('{Enter}')
@@ -124,9 +142,11 @@ describe('ExportImage', () => {
vi.useFakeTimers({ shouldAdvanceTime: true })
const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime })
- render(<ExportImage />, {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- queryClient: createExportQueryClient(),
+ const { flow } = renderExport()
+ let captureViewport: ReturnType<Flow['getViewport']> | undefined
+ mockToPng.mockImplementationOnce(async () => {
+ captureViewport = flow.getViewport()
+ return 'data:image/png;base64,current'
})
await user.click(screen.getByRole('button', { name: 'workflow.common.exportImage' }))
@@ -140,11 +160,23 @@ describe('ExportImage', () => {
await vi.advanceTimersByTimeAsync(300)
})
+ expect(captureViewport).toEqual(fittedViewport)
+ expect(mockToPng).toHaveBeenCalledWith(
+ expect.any(HTMLElement),
+ expect.objectContaining({
+ backgroundColor: '#1a1a1a',
+ height: 670,
+ pixelRatio: 2,
+ style: expect.objectContaining({
+ height: '670px',
+ transform: 'translate(-50px, -30px)',
+ width: '1200px',
+ }),
+ width: 1200,
+ }),
+ )
+ expect(flow.getViewport()).toEqual(originalViewport)
expect(screen.getByRole('dialog', { name: 'Demo App-whole-workflow.png' })).toBeInTheDocument()
- await act(async () => {
- await vi.runAllTimersAsync()
- })
- expect(mockSetViewport).toHaveBeenLastCalledWith({ x: 0, y: 0, zoom: 1 })
expect(mockDownloadUrl).toHaveBeenCalledWith({
url: 'data:image/png;base64,current',
fileName: 'Demo App-whole-workflow.png',
@@ -157,30 +189,34 @@ describe('ExportImage', () => {
])('exports the current view with %s', async (label, exporter, fileName) => {
const user = userEvent.setup()
- render(<ExportImage />, {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- queryClient: createExportQueryClient(),
- })
+ renderExport()
await user.click(screen.getByRole('button', { name: 'workflow.common.exportImage' }))
- await user.click(screen.getAllByText(label)[0]!)
+ await user.click(
+ within(screen.getByRole('group', { name: 'workflow.common.currentView' })).getByRole(
+ 'menuitem',
+ { name: label },
+ ),
+ )
- await waitFor(() => {
- expect(exporter).toHaveBeenCalledTimes(1)
- })
- expect(mockDownloadUrl).toHaveBeenCalledWith({
- url: expect.any(String),
- fileName,
- })
+ await waitFor(() =>
+ expect(mockDownloadUrl).toHaveBeenCalledWith({
+ url: expect.any(String),
+ fileName,
+ }),
+ )
+ expect(exporter).toHaveBeenCalledTimes(1)
})
it('exports the whole workflow as svg', async () => {
vi.useFakeTimers({ shouldAdvanceTime: true })
const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime })
- render(<ExportImage />, {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- queryClient: createExportQueryClient(),
+ const { flow } = renderExport()
+ let captureViewport: ReturnType<Flow['getViewport']> | undefined
+ mockToSvg.mockImplementationOnce(async () => {
+ captureViewport = flow.getViewport()
+ return 'data:image/svg+xml;base64,current'
})
await user.click(screen.getByRole('button', { name: 'workflow.common.exportImage' }))
@@ -195,20 +231,15 @@ describe('ExportImage', () => {
})
expect(mockToSvg).toHaveBeenCalledTimes(1)
- await act(async () => {
- await vi.runAllTimersAsync()
- })
- expect(mockSetViewport).toHaveBeenLastCalledWith({ x: 0, y: 0, zoom: 1 })
+ expect(captureViewport).toEqual(fittedViewport)
+ expect(flow.getViewport()).toEqual(originalViewport)
expect(screen.getByRole('dialog', { name: 'Demo App-whole-workflow.svg' })).toBeInTheDocument()
})
it('uses the refreshed App name when exporting without restarting the editor', async () => {
const user = userEvent.setup()
const queryClient = createExportQueryClient()
- render(<ExportImage />, {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- queryClient,
- })
+ renderExport({ queryClient })
await act(async () => {
seedAppDetail(
queryClient,
@@ -230,58 +261,29 @@ describe('ExportImage', () => {
const user = userEvent.setup()
mockWorkflowState.appName = ''
- render(<ExportImage />, {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- queryClient: createExportQueryClient(),
- })
-
- await user.click(screen.getByRole('button', { name: 'workflow.common.exportImage' }))
- await user.click(screen.getAllByText('workflow.common.exportPNG')[0]!)
-
- expect(mockToPng).not.toHaveBeenCalled()
- expect(mockDownloadUrl).not.toHaveBeenCalled()
- })
-
- it('returns early when the viewport element is missing', async () => {
- const user = userEvent.setup()
- document.querySelector('.react-flow__viewport')?.remove()
-
- render(<ExportImage />, {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- queryClient: createExportQueryClient(),
- })
+ renderExport()
await user.click(screen.getByRole('button', { name: 'workflow.common.exportImage' }))
- await user.click(screen.getAllByText('workflow.common.exportPNG')[0]!)
+ await user.click(
+ within(screen.getByRole('group', { name: 'workflow.common.currentView' })).getByRole(
+ 'menuitem',
+ { name: 'workflow.common.exportPNG' },
+ ),
+ )
expect(mockToPng).not.toHaveBeenCalled()
expect(mockDownloadUrl).not.toHaveBeenCalled()
})
- it('returns early when the workflow becomes read only before exporting', async () => {
- const user = userEvent.setup()
-
- const { store } = render(<ExportImage />, {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- queryClient: createExportQueryClient(),
- })
-
- await user.click(screen.getByRole('button', { name: 'workflow.common.exportImage' }))
- act(() => store.setState({ canvasReadOnly: true }))
- await user.click(screen.getAllByText('workflow.common.exportJPEG')[0]!)
-
- expect(mockToJpeg).not.toHaveBeenCalled()
- expect(mockDownloadUrl).not.toHaveBeenCalled()
- })
-
it('restores the viewport when rendering the whole workflow fails', async () => {
vi.useFakeTimers({ shouldAdvanceTime: true })
const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime })
vi.spyOn(console, 'error').mockImplementation(() => {})
- mockToPng.mockRejectedValueOnce(new Error('capture failed'))
- render(<ExportImage />, {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- queryClient: createExportQueryClient(),
+ const { flow } = renderExport()
+ let captureViewport: ReturnType<Flow['getViewport']> | undefined
+ mockToPng.mockImplementationOnce(async () => {
+ captureViewport = flow.getViewport()
+ throw new Error('capture failed')
})
await user.click(screen.getByRole('button', { name: 'workflow.common.exportImage' }))
await user.click(
@@ -295,27 +297,32 @@ describe('ExportImage', () => {
})
expect(mockToPng).toHaveBeenCalledTimes(1)
- expect(mockSetViewport).toHaveBeenLastCalledWith({ x: 0, y: 0, zoom: 1 })
+ expect(captureViewport).toEqual(fittedViewport)
+ expect(flow.getViewport()).toEqual(originalViewport)
expect(mockDownloadUrl).not.toHaveBeenCalled()
expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
})
it('logs export failures and lets the preview close', async () => {
- const user = userEvent.setup()
+ vi.useFakeTimers({ shouldAdvanceTime: true })
+ const user = userEvent.setup({ advanceTimers: vi.advanceTimersByTime })
const consoleErrorSpy = vi.spyOn(console, 'error').mockImplementation(() => {})
mockToJpeg.mockRejectedValueOnce(new Error('boom'))
- render(<ExportImage />, {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- queryClient: createExportQueryClient(),
- })
+ renderExport()
await user.click(screen.getByRole('button', { name: 'workflow.common.exportImage' }))
- await user.click(screen.getAllByText('workflow.common.exportJPEG')[0]!)
+ await user.click(
+ within(screen.getByRole('group', { name: 'workflow.common.currentView' })).getByRole(
+ 'menuitem',
+ { name: 'workflow.common.exportJPEG' },
+ ),
+ )
- await waitFor(() => {
- expect(consoleErrorSpy).toHaveBeenCalledWith('Export image failed:', expect.any(Error))
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(0)
})
+ expect(consoleErrorSpy).toHaveBeenCalledWith('Export image failed:', expect.any(Error))
expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
mockToPng.mockResolvedValueOnce('data:image/png;base64,current')
@@ -326,11 +333,10 @@ describe('ExportImage', () => {
{ name: 'workflow.common.exportPNG' },
),
)
- await waitFor(() => {
- expect(
- screen.getByRole('dialog', { name: 'Demo App-whole-workflow.png' }),
- ).toBeInTheDocument()
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(300)
})
+ expect(screen.getByRole('dialog', { name: 'Demo App-whole-workflow.png' })).toBeInTheDocument()
await user.click(screen.getByRole('button', { name: 'common.operation.cancel' }))
expect(screen.queryByRole('dialog')).not.toBeInTheDocument()
diff --git a/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-resume.spec.ts b/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-resume.spec.ts
index 4060703fa0b..058d20a7cce 100644
--- a/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-resume.spec.ts
+++ b/web/app/components/workflow/panel/debug-and-preview/__tests__/hooks/handle-resume.spec.ts
@@ -1,28 +1,57 @@
-// oxlint-disable-next-line no-restricted-imports -- The SSE boundary fixture uses the transport callback contract; it does not issue HTTP requests.
-import type { IOtherOptions } from '@/service/base'
-import { act } from '@testing-library/react'
+import type { useWorkflowRun } from '../../../../hooks/use-workflow-run'
+import type { Shape as WorkflowStoreShape } from '@/app/components/workflow/store/workflow'
+import type { NodeWithVar, VarInInspect } from '@/types/workflow'
+import { useQuery } from '@tanstack/react-query'
+import { act, waitFor } from '@testing-library/react'
+import { useLayoutEffect } from 'react'
+import { createNode } from '@/app/components/workflow/__tests__/fixtures'
import {
baseRunningData,
renderWorkflowFlowHook as renderHook,
} from '@/app/components/workflow/__tests__/workflow-test-env'
-import { WorkflowRunningStatus } from '@/app/components/workflow/types'
+import { useSetWorkflowVarsWithValue as useFetchWorkflowInspectVars } from '@/app/components/workflow/hooks/use-fetch-workflow-inspect-vars'
+import {
+ BlockEnum,
+ NodeRunningStatus,
+ VarType,
+ WorkflowRunningStatus,
+} from '@/app/components/workflow/types'
+import { consoleQuery } from '@/service/console'
+import { createConsoleQueryWrapper } from '@/test/console/query-data'
+import { seedToolProviders } from '@/test/console/tool-providers'
import { useChat } from '../../hooks'
-const mockHandleRun = vi.fn()
+type HandleRun = ReturnType<typeof useWorkflowRun>['handleRun']
+type RunCallbacks = NonNullable<Parameters<HandleRun>[1]>
+type ResumeCallbacks = Parameters<ReturnType<typeof useChat>['handleResume']>[2]
+
+const { fetchAllInspectVars, fetchLastRun, mockSubmitHumanInputForm } = vi.hoisted(() => ({
+ fetchAllInspectVars: vi.fn(),
+ fetchLastRun: vi.fn(),
+ mockSubmitHumanInputForm: vi.fn(),
+}))
+const mockHandleRun = vi.fn<HandleRun>()
const mockNotify = vi.fn()
-const mockFetchInspectVars = vi.fn()
-const mockInvalidAllLastRun = vi.fn()
-const mockSubmitHumanInputForm = vi.fn()
const mockSseGet = vi.fn()
vi.mock('@/service/base', () => ({
sseGet: (...args: unknown[]) => mockSseGet(...args),
}))
-vi.mock('@/service/use-workflow', () => ({
- useInvalidateAllLastRun: () => mockInvalidAllLastRun,
-}))
+vi.mock('@/service/console', async (importOriginal) => {
+ const actual = await importOriginal<typeof import('@/service/console')>()
+ const { withConsoleResponses } = await import('@/test/console/service-responses')
+ return {
+ ...actual,
+ consoleQuery: withConsoleResponses(actual.consoleQuery, {
+ 'apps.byAppId.workflows.draft.nodes.byNodeId.lastRun.get': (...args: unknown[]) =>
+ fetchLastRun(...args),
+ }),
+ }
+})
-vi.mock('@/service/workflow', () => ({
+vi.mock('@/service/workflow', async (importOriginal) => ({
+ ...(await importOriginal<typeof import('@/service/workflow')>()),
+ fetchAllInspectVars: (...args: unknown[]) => fetchAllInspectVars(...args),
submitHumanInputForm: (...args: unknown[]) => mockSubmitHumanInputForm(...args),
}))
@@ -35,43 +64,138 @@ vi.mock('@/app/notifications', () => ({
},
}))
-vi.mock('../../../../hooks/use-workflow-run', () => ({
- useWorkflowRun: () => ({ handleRun: mockHandleRun }),
-}))
-
-vi.mock('../../../../hooks/use-set-workflow-vars-with-value', () => ({
- useSetWorkflowVarsWithValue: () => ({ fetchInspectVars: mockFetchInspectVars }),
-}))
-
// Protocol fixtures supply the fields relevant to each stream transition.
type EventFixture<T> = T extends object ? { [K in keyof T]?: EventFixture<T[K]> } : T
type SSECallbacks = {
- [K in keyof IOtherOptions]-?: NonNullable<IOtherOptions[K]> extends (...args: infer A) => infer R
+ [K in keyof RunCallbacks]-?: NonNullable<RunCallbacks[K]> extends (...args: infer A) => infer R
? (...args: { [I in keyof A]: EventFixture<A[I]> }) => R
: never
}
+const inspectNode = createNode({
+ id: 'node-1',
+ data: {
+ type: BlockEnum.Code,
+ title: 'Code',
+ outputs: { answer: { type: VarType.string } },
+ _runningStatus: NodeRunningStatus.Succeeded,
+ },
+})
+
+const inspectVar: VarInInspect = {
+ id: 'var-1',
+ type: 'node',
+ name: 'answer',
+ description: 'Answer',
+ selector: ['node-1', 'answer'],
+ value_type: VarType.string,
+ value: 'after-resume',
+ edited: false,
+ visible: true,
+ is_truncated: false,
+ full_content: null,
+}
+
+const previousInspectVar: VarInInspect = { ...inspectVar, value: 'before-resume' }
+const previousInspectorState: NodeWithVar[] = [
+ {
+ nodeId: 'node-1',
+ nodePayload: inspectNode.data,
+ nodeType: inspectNode.data.type,
+ title: inspectNode.data.title,
+ vars: [previousInspectVar],
+ isSingRunRunning: false,
+ isValueFetched: true,
+ },
+]
+
+type FetchInspectVars = ReturnType<typeof useFetchWorkflowInspectVars>['fetchInspectVars']
+
+function useChatWithRealInspector(
+ config: Parameters<typeof useChat>[0],
+ registerFetchInspectVars: (fetchInspectVars: FetchInspectVars) => void,
+) {
+ const { fetchInspectVars } = useFetchWorkflowInspectVars()
+ useQuery({
+ ...consoleQuery.apps.byAppId.workflows.draft.nodes.byNodeId.lastRun.get.queryOptions({
+ input: { params: { app_id: 'app-1', node_id: 'node-1' } },
+ }),
+ staleTime: Infinity,
+ })
+ useLayoutEffect(() => {
+ registerFetchInspectVars(fetchInspectVars)
+ }, [fetchInspectVars, registerFetchInspectVars])
+ return useChat(config)
+}
+
describe('useChat – handleResume', () => {
let capturedResumeOptions: SSECallbacks
beforeEach(() => {
- vi.clearAllMocks()
mockHandleRun.mockReset()
mockSseGet.mockReset()
+ mockNotify.mockReset()
+ mockSubmitHumanInputForm.mockReset()
+ fetchAllInspectVars
+ .mockReset()
+ .mockResolvedValueOnce([previousInspectVar])
+ .mockResolvedValue([inspectVar])
+ fetchLastRun
+ .mockReset()
+ .mockResolvedValueOnce({ id: 'last-run-before', status: 'succeeded' })
+ .mockResolvedValue({ id: 'last-run-after', status: 'succeeded' })
})
- async function setupResumeWithTree() {
+ function renderChat(
+ config: Parameters<typeof useChat>[0] = {},
+ initialStoreState: Partial<WorkflowStoreShape> = {},
+ ) {
+ let realFetchInspectVars: FetchInspectVars = async () => undefined
+ const fetchInspectVars: FetchInspectVars = (params) => realFetchInspectVars(params)
+ const registerFetchInspectVars = (nextFetchInspectVars: FetchInspectVars) => {
+ realFetchInspectVars = nextFetchInspectVars
+ }
+ const { queryClient } = createConsoleQueryWrapper()
+ seedToolProviders(queryClient, {
+ builtInTools: [],
+ customTools: [],
+ workflowTools: [],
+ mcpTools: [],
+ })
+ queryClient.setQueryData(consoleQuery.spec.schemaDefinitions.get.queryKey(), [])
+ const lastRunKey =
+ consoleQuery.apps.byAppId.workflows.draft.nodes.byNodeId.lastRun.get.queryKey({
+ input: { params: { app_id: 'app-1', node_id: 'node-1' } },
+ })
+ queryClient.setQueryData(lastRunKey, { id: 'last-run-initial', status: 'succeeded' })
+
+ return {
+ ...renderHook(() => useChatWithRealInspector(config, registerFetchInspectVars), {
+ resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
+ nodes: [inspectNode],
+ queryClient,
+ initialStoreState: { nodesWithInspectVars: previousInspectorState, ...initialStoreState },
+ hooksStoreProps: { handleRun: mockHandleRun, fetchInspectVars },
+ }),
+ lastRunKey,
+ queryClient,
+ }
+ }
+
+ async function setupResumeWithTree(
+ config: Parameters<typeof useChat>[0] = {},
+ initialStoreState: Partial<WorkflowStoreShape> = {},
+ resumeCallbacks: ResumeCallbacks = {},
+ ) {
let sendCallbacks: SSECallbacks
mockHandleRun.mockImplementation((_params: unknown, callbacks: unknown) => {
sendCallbacks = callbacks as SSECallbacks
})
- mockSseGet.mockImplementation((_url: unknown, _opts: unknown, options: IOtherOptions) => {
+ mockSseGet.mockImplementation((_url: unknown, _opts: unknown, options: RunCallbacks) => {
capturedResumeOptions = options as SSECallbacks
})
- const hook = renderHook(() => useChat({}), {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- })
+ const hook = renderChat(config, initialStoreState)
act(() => {
hook.result.current.handleSend({ query: 'test' }, {})
@@ -90,17 +214,25 @@ describe('useChat – handleResume', () => {
await sendCallbacks.onCompleted(false)
})
+ if (initialStoreState.workflowRunningData?.result.status !== WorkflowRunningStatus.Paused) {
+ await waitFor(() => expect(fetchAllInspectVars).toHaveBeenCalledTimes(1))
+ await waitFor(() =>
+ expect(hook.queryClient.getQueryData(hook.lastRunKey)).toEqual({
+ id: 'last-run-before',
+ status: 'succeeded',
+ }),
+ )
+ }
+
act(() => {
- hook.result.current.handleResume('msg-resume', 'wfr-1', {})
+ hook.result.current.handleResume('msg-resume', 'wfr-1', resumeCallbacks)
})
return hook
}
it('should call sseGet with the correct URL', () => {
- const { result } = renderHook(() => useChat({}), {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- })
+ const { result } = renderChat()
act(() => {
result.current.handleResume('msg-1', 'wfr-1', {})
@@ -115,19 +247,17 @@ describe('useChat – handleResume', () => {
it('should abort previous SSE connection when handleResume is called again', () => {
const mockAbortCtrl = new AbortController()
- mockSseGet.mockImplementation((_url: unknown, _opts: unknown, options: IOtherOptions) => {
+ mockSseGet.mockImplementation((_url: unknown, _opts: unknown, options: RunCallbacks) => {
options.getAbortController!(mockAbortCtrl)
})
- const { result } = renderHook(() => useChat({}), {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- })
+ const { result } = renderChat()
act(() => {
result.current.handleResume('msg-1', 'wfr-1', {})
})
- mockSseGet.mockImplementation((_url: unknown, _opts: unknown, options: IOtherOptions) => {
+ mockSseGet.mockImplementation((_url: unknown, _opts: unknown, options: RunCallbacks) => {
options.getAbortController!(new AbortController())
})
@@ -145,9 +275,7 @@ describe('useChat – handleResume', () => {
sendCallbacks = callbacks as SSECallbacks
})
- const { result } = renderHook(() => useChat({}), {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- })
+ const { result } = renderChat()
act(() => {
result.current.handleSend({ query: 'test' }, {})
@@ -172,13 +300,11 @@ describe('useChat – handleResume', () => {
mockHandleRun.mockImplementation((_params: unknown, callbacks: unknown) => {
sendCallbacks = callbacks as SSECallbacks
})
- mockSseGet.mockImplementation((_url: unknown, _opts: unknown, options: IOtherOptions) => {
+ mockSseGet.mockImplementation((_url: unknown, _opts: unknown, options: RunCallbacks) => {
capturedResumeOptions = options as SSECallbacks
})
- const hook = renderHook(() => useChat({}), {
- resource: { kind: 'app', appId: 'app-1', mode: 'workflow' },
- })
+ const hook = renderChat()
act(() => {
hook.result.current.handleSend({ query: 'test' }, {})
@@ -331,77 +457,78 @@ describe('useChat – handleResume', () => {
})
describe('onCompleted', () => {
- it('should set isResponding to false', async () => {
- const { result } = await setupResumeWithTree()
+ it('refreshes inspector and last-run data after a successful resumed workflow', async () => {
+ const { lastRunKey, queryClient, result, store } = await setupResumeWithTree()
act(() =>
capturedResumeOptions.onWorkflowStarted({ workflow_run_id: 'wfr-1', task_id: 'task-1' }),
)
expect(result.current.isResponding).toBe(true)
- mockFetchInspectVars.mockClear()
- mockInvalidAllLastRun.mockClear()
+ expect(store.getState().nodesWithInspectVars[0]?.vars[0]?.value).toBe('before-resume')
+ expect(queryClient.getQueryData(lastRunKey)).toEqual({
+ id: 'last-run-before',
+ status: 'succeeded',
+ })
+
await act(async () => {
await capturedResumeOptions.onCompleted(false)
})
+
expect(result.current.isResponding).toBe(false)
- expect(mockFetchInspectVars).toHaveBeenCalledExactlyOnceWith({})
- expect(mockInvalidAllLastRun).toHaveBeenCalledTimes(1)
+ await waitFor(() =>
+ expect(store.getState().nodesWithInspectVars[0]?.vars[0]?.value).toBe('after-resume'),
+ )
+ await waitFor(() =>
+ expect(queryClient.getQueryData(lastRunKey)).toEqual({
+ id: 'last-run-after',
+ status: 'succeeded',
+ }),
+ )
})
- it('should not call fetchInspectVars when paused', async () => {
- const { store } = await setupResumeWithTree()
- store.setState({
- workflowRunningData: baseRunningData({ result: { status: WorkflowRunningStatus.Paused } }),
- })
- mockFetchInspectVars.mockClear()
+ it('preserves inspector and last-run data when the workflow remains paused', async () => {
+ const { lastRunKey, queryClient, store } = await setupResumeWithTree(
+ {},
+ {
+ workflowRunningData: baseRunningData({
+ result: { status: WorkflowRunningStatus.Paused },
+ }),
+ },
+ )
+
await act(async () => {
await capturedResumeOptions.onCompleted(false)
})
- expect(mockFetchInspectVars).not.toHaveBeenCalled()
- })
- it('should still call fetchInspectVars on error but skip suggested questions', async () => {
- const mockGetSuggested = vi.fn().mockResolvedValue({ data: ['s1'] })
- let sendCallbacks: SSECallbacks
- mockHandleRun.mockImplementation((_params: unknown, callbacks: unknown) => {
- sendCallbacks = callbacks as SSECallbacks
- })
- mockSseGet.mockImplementation((_url: unknown, _opts: unknown, options: IOtherOptions) => {
- capturedResumeOptions = options as SSECallbacks
+ expect(store.getState().nodesWithInspectVars).toEqual(previousInspectorState)
+ expect(queryClient.getQueryData(lastRunKey)).toEqual({
+ id: 'last-run-initial',
+ status: 'succeeded',
})
+ expect(fetchAllInspectVars).not.toHaveBeenCalled()
+ expect(fetchLastRun).not.toHaveBeenCalled()
+ })
- const hook = renderHook(
- () => useChat({ suggested_questions_after_answer: { enabled: true } }),
- { resource: { kind: 'app', appId: 'app-1', mode: 'workflow' } },
+ it('refreshes inspector and last-run data on error but skips suggested questions', async () => {
+ const mockGetSuggested = vi.fn().mockResolvedValue({ data: ['s1'] })
+ const { lastRunKey, queryClient, store } = await setupResumeWithTree(
+ { suggested_questions_after_answer: { enabled: true } },
+ {},
+ { onGetSuggestedQuestions: mockGetSuggested },
)
- act(() => {
- hook.result.current.handleSend({ query: 'test' }, {})
- })
- act(() => {
- sendCallbacks.onWorkflowStarted({
- workflow_run_id: 'wfr-1',
- task_id: 'task-1',
- conversation_id: undefined,
- message_id: 'msg-resume',
- })
- })
- await act(async () => {
- await sendCallbacks.onCompleted(false)
- })
- mockFetchInspectVars.mockClear()
- mockInvalidAllLastRun.mockClear()
-
- act(() => {
- hook.result.current.handleResume('msg-resume', 'wfr-1', {
- onGetSuggestedQuestions: mockGetSuggested,
- })
- })
await act(async () => {
await capturedResumeOptions.onCompleted(true)
})
- expect(mockFetchInspectVars).toHaveBeenCalledWith({})
- expect(mockInvalidAllLastRun).toHaveBeenCalled()
+ await waitFor(() =>
+ expect(store.getState().nodesWithInspectVars[0]?.vars[0]?.value).toBe('after-resume'),
+ )
+ await waitFor(() =>
+ expect(queryClient.getQueryData(lastRunKey)).toEqual({
+ id: 'last-run-after',
+ status: 'succeeded',
+ }),
+ )
expect(mockGetSuggested).not.toHaveBeenCalled()
})
@@ -412,42 +539,12 @@ describe('useChat – handleResume', () => {
onCancel(vi.fn())
return Promise.resolve({ data: ['s1'] })
})
- let sendCallbacks: SSECallbacks
- mockHandleRun.mockImplementation((_params: unknown, callbacks: unknown) => {
- sendCallbacks = callbacks as SSECallbacks
- })
- mockSseGet.mockImplementation((_url: unknown, _opts: unknown, options: IOtherOptions) => {
- capturedResumeOptions = options as SSECallbacks
- })
-
- const hook = renderHook(
- () => useChat({ suggested_questions_after_answer: { enabled: true } }),
- { resource: { kind: 'app', appId: 'app-1', mode: 'workflow' } },
+ const hook = await setupResumeWithTree(
+ { suggested_questions_after_answer: { enabled: true } },
+ {},
+ { onGetSuggestedQuestions: mockGetSuggested },
)
- act(() => {
- hook.result.current.handleSend({ query: 'test' }, {})
- })
-
- act(() => {
- sendCallbacks.onWorkflowStarted({
- workflow_run_id: 'wfr-1',
- task_id: 'task-1',
- conversation_id: undefined,
- message_id: 'msg-resume',
- })
- })
-
- await act(async () => {
- await sendCallbacks.onCompleted(false)
- })
-
- act(() => {
- hook.result.current.handleResume('msg-resume', 'wfr-1', {
- onGetSuggestedQuestions: mockGetSuggested,
- })
- })
-
await act(async () => {
await capturedResumeOptions.onCompleted(false)
})
@@ -458,42 +555,12 @@ describe('useChat – handleResume', () => {
it('should set suggestedQuestions to empty on fetch error', async () => {
const mockGetSuggested = vi.fn().mockRejectedValue(new Error('fail'))
- let sendCallbacks: SSECallbacks
- mockHandleRun.mockImplementation((_params: unknown, callbacks: unknown) => {
- sendCallbacks = callbacks as SSECallbacks
- })
- mockSseGet.mockImplementation((_url: unknown, _opts: unknown, options: IOtherOptions) => {
- capturedResumeOptions = options as SSECallbacks
- })
-
- const hook = renderHook(
- () => useChat({ suggested_questions_after_answer: { enabled: true } }),
- { resource: { kind: 'app', appId: 'app-1', mode: 'workflow' } },
+ const hook = await setupResumeWithTree(
+ { suggested_questions_after_answer: { enabled: true } },
+ {},
+ { onGetSuggestedQuestions: mockGetSuggested },
)
- act(() => {
- hook.result.current.handleSend({ query: 'test' }, {})
- })
-
- act(() => {
- sendCallbacks.onWorkflowStarted({
- workflow_run_id: 'wfr-1',
- task_id: 'task-1',
- conversation_id: undefined,
- message_id: 'msg-resume',
- })
- })
-
- await act(async () => {
- await sendCallbacks.onCompleted(false)
- })
-
- act(() => {
- hook.result.current.handleResume('msg-resume', 'wfr-1', {
- onGetSuggestedQuestions: mockGetSuggested,
- })
- })
-
await act(async () => {
await capturedResumeOptions.onCompleted(false)
})
diff --git a/web/features/network-access/app-binding/__tests__/index.spec.tsx b/web/features/network-access/app-binding/__tests__/index.spec.tsx
index c19c7d3c318..510832a6470 100644
--- a/web/features/network-access/app-binding/__tests__/index.spec.tsx
+++ b/web/features/network-access/app-binding/__tests__/index.spec.tsx
@@ -7,6 +7,7 @@ import type {
GetWorkspacesCurrentSummaryResponse,
NetworkAccessGroupResponse,
} from '@dify/contracts/api/console/workspaces/types.gen'
+import type { ReactNode } from 'react'
import { act, screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { createInstance } from 'i18next'
@@ -24,23 +25,13 @@ import {
seedNetworkAccessGroups,
} from '@/test/console/network-access'
import { createConsoleQueryClient, renderWithConsoleQuery } from '@/test/console/query-data'
+import { createNuqsTestWrapper } from '@/test/nuqs-testing'
import { AccessControlEntry } from '..'
-const mockSetPricing = vi.fn()
vi.mock('@/app/components/base/amplitude', () => ({ trackEvent: vi.fn() }))
-const mockSetSettingsDestination = vi.fn()
vi.unmock('react-i18next')
-vi.mock('nuqs', async (importOriginal) => {
- const actual = await importOriginal<typeof import('nuqs')>()
- return {
- ...actual,
- useQueryState: (name: string) => {
- if (name === 'pricing') return [null, mockSetPricing]
- return [null, mockSetSettingsDestination]
- },
- }
-})
+const initialSearchParams = 'source=network-access'
const renderEntry = ({
plan,
@@ -69,14 +60,21 @@ const renderEntry = ({
binding,
available_access_points: availableAccessPoints,
})
- return renderWithConsoleQuery(
- <AccessControlEntry
- appMode="chat"
- appId="app-1"
- appIcon={null}
- isPublished={isPublished}
- canEditBinding={canEditBinding}
- />,
+ // Keep nuqs' real parsers and assert the complete resulting query, including retained params.
+ const { wrapper: UrlState, onUrlUpdate } = createNuqsTestWrapper({
+ searchParams: initialSearchParams,
+ hasMemory: true,
+ })
+ const rendered = renderWithConsoleQuery(
+ <UrlState>
+ <AccessControlEntry
+ appMode="chat"
+ appId="app-1"
+ appIcon={null}
+ isPublished={isPublished}
+ canEditBinding={canEditBinding}
+ />
+ </UrlState>,
{
queryClient,
currentWorkspace: { role },
@@ -90,6 +88,14 @@ const renderEntry = ({
: undefined,
},
)
+ const getSearchParams = () =>
+ onUrlUpdate.mock.lastCall?.[0].searchParams ?? new URLSearchParams(initialSearchParams)
+ return {
+ ...rendered,
+ getSearchParams,
+ onUrlUpdate,
+ rerender: (ui: ReactNode) => rendered.rerender(<UrlState>{ui}</UrlState>),
+ }
}
const metadataResponse = (request: Request) => {
@@ -141,10 +147,6 @@ const createBinding = (
})
describe('AccessControlEntry', () => {
- beforeEach(() => {
- vi.clearAllMocks()
- })
-
it.each([
{ entryStatus: 'off', plan: 'professional', binding: null },
{ entryStatus: 'paused', plan: 'professional', binding: createBinding({ enabled: false }) },
@@ -312,7 +314,7 @@ describe('AccessControlEntry', () => {
'shows PRO and the saved resume configuration on Cloud sandbox (%j)',
async ({ enabled, accessPoints, coverage }) => {
const user = userEvent.setup()
- renderEntry({
+ const { getSearchParams } = renderEntry({
plan: 'sandbox',
groups: [createNetworkAccessGroupFixture()],
binding: {
@@ -349,7 +351,7 @@ describe('AccessControlEntry', () => {
).not.toBeInTheDocument()
await user.click(screen.getByRole('button', { name: 'Turn on Access Control' }))
- expect(mockSetPricing).toHaveBeenCalledWith('open')
+ expect(getSearchParams().toString()).toBe('source=network-access&pricing=open')
},
)
@@ -403,7 +405,7 @@ describe('AccessControlEntry', () => {
it('opens the paywall popover from the chip and sends the user to pricing', async () => {
const user = userEvent.setup()
- renderEntry({ plan: 'sandbox' })
+ const { getSearchParams } = renderEntry({ plan: 'sandbox' })
await user.click(getChip())
@@ -421,7 +423,7 @@ describe('AccessControlEntry', () => {
expect(turnOn).not.toHaveTextContent('PRO')
await user.click(turnOn)
- expect(mockSetPricing).toHaveBeenCalledWith('open')
+ expect(getSearchParams().toString()).toBe('source=network-access&pricing=open')
expect(trackEvent).toHaveBeenLastCalledWith('access_control_upgrade_click', {
app_id: 'app-1',
app_mode: 'chat',
@@ -432,7 +434,7 @@ describe('AccessControlEntry', () => {
it('closes the paywall on Escape without side effects', async () => {
const user = userEvent.setup()
- renderEntry({ plan: 'sandbox' })
+ const { getSearchParams } = renderEntry({ plan: 'sandbox' })
await user.click(getChip())
expect(screen.getByText('Restrict this app to IP addresses you trust')).toBeInTheDocument()
@@ -444,7 +446,7 @@ describe('AccessControlEntry', () => {
screen.queryByText('Restrict this app to IP addresses you trust'),
).not.toBeInTheDocument()
})
- expect(mockSetPricing).not.toHaveBeenCalled()
+ expect(getSearchParams().toString()).toBe(initialSearchParams)
})
it('opens the first-time config popover for paid workspaces without a back control', async () => {
@@ -472,18 +474,18 @@ describe('AccessControlEntry', () => {
it('opens the new policy dialog from the empty-state create action', async () => {
const user = userEvent.setup()
- renderEntry({ plan: 'professional' })
+ const { getSearchParams } = renderEntry({ plan: 'professional' })
await user.click(getChip())
await user.click(screen.getByRole('button', { name: 'Create an IP policy' }))
expect(screen.getByRole('heading', { name: 'New IP Policy' })).toBeInTheDocument()
- expect(mockSetSettingsDestination).not.toHaveBeenCalled()
+ expect(getSearchParams().toString()).toBe(initialSearchParams)
})
it('returns to the empty-state config after canceling the new policy dialog', async () => {
const user = userEvent.setup()
- renderEntry({ plan: 'professional' })
+ const { getSearchParams } = renderEntry({ plan: 'professional' })
await user.click(getChip())
await user.click(screen.getByRole('button', { name: 'Create an IP policy' }))
@@ -493,7 +495,7 @@ describe('AccessControlEntry', () => {
expect(screen.queryByRole('heading', { name: 'New IP Policy' })).not.toBeInTheDocument()
})
expect(screen.getByText('No IP policies in this workspace yet')).toBeInTheDocument()
- expect(mockSetSettingsDestination).not.toHaveBeenCalled()
+ expect(getSearchParams().toString()).toBe(initialSearchParams)
})
it('posts a new policy from the empty-state dialog without opening Settings', async () => {
@@ -529,7 +531,7 @@ describe('AccessControlEntry', () => {
}
return Response.json({ group: created }, { status: 201 })
})
- renderEntry({ plan: 'professional' })
+ const { getSearchParams } = renderEntry({ plan: 'professional' })
await user.click(getChip())
await user.click(screen.getByRole('button', { name: 'Create an IP policy' }))
@@ -552,12 +554,12 @@ describe('AccessControlEntry', () => {
expect(screen.getByRole('button', { name: 'Save' })).toBeDisabled()
expect(screen.getByRole('switch', { name: 'Web App' })).toHaveAttribute('aria-disabled', 'true')
expect(posted.filter((request) => request.method === 'PUT')).toHaveLength(0)
- expect(mockSetSettingsDestination).not.toHaveBeenCalled()
+ expect(getSearchParams().toString()).toBe(initialSearchParams)
})
it('sends paid users to Settings IP Policies from manage', async () => {
const user = userEvent.setup()
- renderEntry({
+ const { getSearchParams } = renderEntry({
plan: 'professional',
groups: [createNetworkAccessGroupFixture()],
})
@@ -565,12 +567,12 @@ describe('AccessControlEntry', () => {
await user.click(getChip())
await user.click(screen.getByRole('button', { name: 'Manage IP policies' }))
- expect(mockSetSettingsDestination).toHaveBeenCalledWith('ip-policies')
+ expect(getSearchParams().toString()).toBe('source=network-access&settings=ip-policies')
})
it('closes the first-time config on Cancel without opening settings', async () => {
const user = userEvent.setup()
- renderEntry({ plan: 'professional' })
+ const { getSearchParams } = renderEntry({ plan: 'professional' })
await user.click(getChip())
await user.click(screen.getByRole('button', { name: 'Cancel' }))
@@ -578,8 +580,7 @@ describe('AccessControlEntry', () => {
await waitFor(() => {
expect(screen.queryByText('No IP policies in this workspace yet')).not.toBeInTheDocument()
})
- expect(mockSetSettingsDestination).not.toHaveBeenCalled()
- expect(mockSetPricing).not.toHaveBeenCalled()
+ expect(getSearchParams().toString()).toBe(initialSearchParams)
})
it.each([
@@ -875,8 +876,6 @@ const capabilityCases = [
}[]
describe('supported access points and binding permission', () => {
- beforeEach(() => vi.clearAllMocks())
-
it.each(capabilityCases)(
'shows and saves exactly the $name capabilities',
async ({ points, labels }) => {
@@ -990,7 +989,7 @@ describe('supported access points and binding permission', () => {
}),
)
try {
- renderEntry({
+ const { getSearchParams } = renderEntry({
plan: 'professional',
role: 'editor',
groups: [createNetworkAccessGroupFixture()],
@@ -998,7 +997,7 @@ describe('supported access points and binding permission', () => {
await user.click(getChip())
expect(screen.queryByRole('button', { name: 'Create an IP policy' })).not.toBeInTheDocument()
await user.click(screen.getByRole('button', { name: 'View IP policies' }))
- expect(mockSetSettingsDestination).toHaveBeenCalledWith('ip-policies')
+ expect(getSearchParams().toString()).toBe('source=network-access&settings=ip-policies')
await user.click(getChip())
await user.click(screen.getByRole('button', { name: /Internal Network/ }))
await user.click(screen.getByRole('button', { name: 'Save' }))
@@ -1313,14 +1312,19 @@ describe('supported access points and binding permission', () => {
seedNetworkAccessGroups(queryClient, { entitled: true })
const fetchSpy = vi.spyOn(globalThis, 'fetch').mockImplementation(async () => response())
try {
+ const { wrapper: UrlState } = createNuqsTestWrapper({
+ searchParams: initialSearchParams,
+ })
renderWithConsoleQuery(
- <AccessControlEntry
- appMode="chat"
- appId="app-1"
- appIcon={null}
- isPublished={false}
- canEditBinding
- />,
+ <UrlState>
+ <AccessControlEntry
+ appMode="chat"
+ appId="app-1"
+ appIcon={null}
+ isPublished={false}
+ canEditBinding
+ />
+ </UrlState>,
{
queryClient,
systemFeatures: { deployment_edition: 'CLOUD' },