Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.
Python agentagentic-aiagentic-frameworkagentic-workflowaiautomationclaudedeepseekgenaigptllmlow-codemcpnextjsno-codeopenaipythonskillsworkflow
fix(web): restore list focus after app and agent deletion (#44736)
yyh5c510d073748
diff --git a/web/app/components/app-sidebar/app-detail-top.tsx b/web/app/components/app-sidebar/app-detail-top.tsxindex c78818f21f3..f91de0a757b 100644--- a/web/app/components/app-sidebar/app-detail-top.tsx+++ b/web/app/components/app-sidebar/app-detail-top.tsx@@ -12,10 +12,10 @@ import { Kbd, KbdGroup } from '@langgenius/dify-ui/kbd'import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'import { formatForDisplay } from '@tanstack/react-hotkeys'import { useTranslation } from 'react-i18next'+import { useStudioListHref } from '@/app/components/apps/list-navigation-state'import { DetailSidebarToggleButton } from '@/app/components/detail-sidebar/toggle-button'import { gotoAnythingDialogHandle } from '@/app/components/goto-anything/dialog-handle'import { GOTO_ANYTHING_HOTKEY } from '@/app/components/goto-anything/hotkeys'-import { useStudioListHref } from '@/features/studio-list-navigation'import Link from '@/next/link'type AppDetailTopProps = {diff --git a/web/app/components/apps/__tests__/app-card.spec.tsx b/web/app/components/apps/__tests__/app-card.spec.tsxindex 6144ee18f28..ba0ef40eeb9 100644--- a/web/app/components/apps/__tests__/app-card.spec.tsx+++ b/web/app/components/apps/__tests__/app-card.spec.tsx@@ -3,7 +3,7 @@ import type {EnvironmentVariableItemResponse,} from '@dify/contracts/api/console/apps/types.gen'import type { InstalledAppListResponse } from '@dify/contracts/api/console/installed-apps/types.gen'-import type { ReactElement } from 'react'+import type { ComponentProps, ReactElement } from 'react'import { act, screen, waitFor, within } from '@testing-library/react'import userEvent from '@testing-library/user-event'import { STEP_BY_STEP_TOUR_TARGETS } from '@/app/components/step-by-step-tour/target-registry'@@ -21,7 +21,6 @@ import { StarredAppCard } from '../starred-app-card'const api = vi.hoisted(() => ({copy: vi.fn<typeof import('@/service/console').consoleClient.apps.byAppId.copy.post>(),update: vi.fn<typeof import('@/service/console').consoleClient.apps.byAppId.put>(),- delete: vi.fn<typeof import('@/service/console').consoleClient.apps.byAppId.delete>(),star: vi.fn<typeof import('@/service/console').consoleClient.apps.byAppId.star.post>(),unstar: vi.fn<typeof import('@/service/console').consoleClient.apps.byAppId.star.delete>(),convert:@@ -45,7 +44,6 @@ vi.mock('@/service/console', async (importOriginal) => {consoleQuery: withConsoleResponses(actual.consoleQuery, {'apps.byAppId.copy.post': api.copy,'apps.byAppId.put': api.update,- 'apps.byAppId.delete': api.delete,'apps.byAppId.star.post': api.star,'apps.byAppId.star.delete': api.unstar,'apps.byAppId.convertToWorkflow.post': api.convert,@@ -66,6 +64,7 @@ vi.mock('@/service/share', async (importOriginal) => ({...(await importOriginal<typeof import('@/service/share')>()),getUserCanAccess: api.access,}))+const onDelete = vi.fn<ComponentProps<typeof AppCard>['onDelete']>()const mockPush = vi.fn()vi.mock('@/next/navigation', () => ({ useRouter: () => ({ push: mockPush }) }))@@ -171,7 +170,7 @@ describe('AppCard', () => {.mockReset().mockResolvedValue(createAppDetailFixture({ id: 'new-app-id', maintainer: 'user-1' }))api.update.mockReset().mockResolvedValue(createAppDetailFixture())- api.delete.mockReset().mockResolvedValue(undefined)+ onDelete.mockReset()api.star.mockReset().mockResolvedValue({ result: 'success' })api.unstar.mockReset().mockResolvedValue({ result: 'success' })api.convert@@ -203,7 +202,7 @@ describe('AppCard', () => {permission_keys: [AppACLPermission.Preview],})- render(<AppCard app={previewOnlyApp} />)+ render(<AppCard onDelete={onDelete} app={previewOnlyApp} />)const card = screen.getByRole('button', { name: 'Preview Only App' })expect(screen.getByRole('listitem')).toContainElement(card)@@ -241,7 +240,7 @@ describe('AppCard', () => {permission_keys: [AppACLPermission.Preview],})- render(<StarredAppCard app={previewOnlyApp} />)+ render(<StarredAppCard onDelete={onDelete} app={previewOnlyApp} />)const card = screen.getByRole('button', { name: 'Preview Only Starred App' })expect(card).not.toHaveAttribute('aria-disabled')@@ -260,7 +259,7 @@ describe('AppCard', () => {})it('should render card navigation as a link', () => {- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)const cardLink = screen.getByRole('link', { name: 'Test App' })expect(cardLink).toHaveAttribute('href', '/app/test-app-id/configuration')@@ -273,7 +272,7 @@ describe('AppCard', () => {it('should star the app from the card action', async () => {const user = userEvent.setup()- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)const starToggle = screen.getByRole('button', { name: 'app.studio.starApp: Test App' })expect(starToggle).toHaveAttribute('aria-pressed', 'false')@@ -291,7 +290,7 @@ describe('AppCard', () => {it('should unstar the app from the filled star action', async () => {const user = userEvent.setup()const starredApp = createMockApp({ is_starred: true })- render(<AppCard app={starredApp} />)+ render(<AppCard onDelete={onDelete} app={starredApp} />)const starToggle = screen.getByRole('button', { name: 'app.studio.starApp: Test App' })expect(starToggle).toHaveAttribute('aria-pressed', 'true')@@ -311,7 +310,7 @@ describe('AppCard', () => {it('should expose the same operations from the card context menu', async () => {const user = userEvent.setup()- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await user.pointer({target: screen.getByRole('link', { name: 'Test App' }),@@ -325,7 +324,7 @@ describe('AppCard', () => {it('should keep card actions outside the card context menu trigger', async () => {const user = userEvent.setup()- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await user.pointer({target: screen.getByRole('button', { name: 'app.studio.starApp: Test App' }),@@ -342,7 +341,7 @@ describe('AppCard', () => {maintainer: 'another-user',permission_keys: [AppACLPermission.ViewLayout],})- render(<AppCard app={appWithoutImportExportPermission} />)+ render(<AppCard onDelete={onDelete} app={appWithoutImportExportPermission} />)await user.click(getOperationsTrigger())@@ -359,7 +358,7 @@ describe('AppCard', () => {maintainer: 'another-user',permission_keys: [AppACLPermission.ViewLayout],})- render(<StarredAppCard app={appWithoutImportExportPermission} />)+ render(<StarredAppCard onDelete={onDelete} app={appWithoutImportExportPermission} />)await user.click(getOperationsTrigger())@@ -378,7 +377,7 @@ describe('AppCard', () => {mode: 'chat',permission_keys: [AppACLPermission.Edit],})- render(<AppCard app={editableChatApp} />)+ render(<AppCard onDelete={onDelete} app={editableChatApp} />)await user.click(getOperationsTrigger())@@ -391,7 +390,7 @@ describe('AppCard', () => {it('should not show switch option for workflow mode apps', async () => {const user = userEvent.setup()const workflowApp = { ...mockApp, mode: 'workflow' as const }- render(<AppCard app={workflowApp} />)+ render(<AppCard onDelete={onDelete} app={workflowApp} />)await user.click(getOperationsTrigger())@@ -400,77 +399,13 @@ describe('AppCard', () => {})})- it('should clear delete confirmation input after closing the dialog', async () => {- const user = userEvent.setup()- render(<AppCard app={mockApp} />)-- await chooseAction(user, 'common.operation.delete')-- const deleteInput = await screen.findByRole('textbox')- await user.type(deleteInput, 'partial name')- await user.click(screen.getByRole('button', { name: 'common.operation.cancel' }))-- await waitFor(() => {- expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument()- })-- await chooseAction(user, 'common.operation.delete')-- await waitFor(() => {- expect(screen.getByRole('textbox')).toHaveValue('')- })- })-- it('should handle delete failure', async () => {- const user = userEvent.setup()- api.delete.mockRejectedValueOnce(new Error('Delete failed'))-- render(<AppCard app={mockApp} />)-- await chooseAction(user, 'common.operation.delete')- expect(await screen.findByRole('alertdialog')).toBeInTheDocument()-- const deleteInput = screen.getByRole('textbox')- await user.type(deleteInput, mockApp.name)-- await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))-- await waitFor(() => {- expect(api.delete).toHaveBeenCalledWith({ params: { app_id: mockApp.id } })- expect(screen.getByRole('alert')).toHaveTextContent('Delete failed')- })- expect(screen.getByRole('textbox')).toHaveValue(mockApp.name)- await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))- await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument())- expect(api.delete).toHaveBeenCalledTimes(2)- })-- it('locks the name and autofill while deletion is pending and preserves the confirmation session name', async () => {- const user = userEvent.setup()- const pending = createDeferred<void>()- api.delete.mockReturnValueOnce(pending.promise)- const view = render(<AppCard app={mockApp} />)- await chooseAction(user, 'common.operation.delete')- await user.click(screen.getByRole('button', { name: 'common.operation.fill' }))- view.rerender(<AppCard app={{ ...mockApp, name: 'Renamed elsewhere' }} />)- expect(screen.getByRole('textbox')).toHaveValue(mockApp.name)- await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))- await waitFor(() => expect(api.delete).toHaveBeenCalledOnce())- expect(screen.getByRole('textbox')).toHaveAttribute('readonly')- expect(screen.getByRole('button', { name: 'common.operation.fill' })).toBeDisabled()- await user.keyboard('{Escape}')- expect(screen.getByRole('alertdialog')).toBeInTheDocument()- await act(async () => pending.resolve())- await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument())- })-it('should hide open in explore for SSO-restricted apps', async () => {mockWebappAuthEnabled = truemockWebappAuthEnabled = trueconst user = userEvent.setup()const ssoApp = createMockApp({ access_mode: AccessMode.EXTERNAL_MEMBERS })- render(<AppCard app={ssoApp} />)+ render(<AppCard onDelete={onDelete} app={ssoApp} />)await user.click(getOperationsTrigger())const menu = await screen.findByRole('menu')@@ -487,7 +422,7 @@ describe('AppCard', () => {resolveResponse = resolve})api.installedRequest.mockReturnValueOnce(response)- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await chooseAction(user, 'app.openInExplore')expect(openWindow).toHaveBeenCalledOnce()@@ -507,7 +442,7 @@ describe('AppCard', () => {it('reports a blocked popup without making a request', async () => {const user = userEvent.setup()openWindow.mockReturnValueOnce(null)- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await chooseAction(user, 'app.openInExplore')expect(api.installedRequest).not.toHaveBeenCalled()expect(toast.error).toHaveBeenCalledWith('Failed to open new window')@@ -516,6 +451,7 @@ describe('AppCard', () => {it('should render the tour-controlled operations menu as presentation only', async () => {render(<AppCard+ onDelete={onDelete}app={mockApp}stepByStepTourActionMenuHighlightPart={STEP_BY_STEP_TOUR_TARGETS.studioWithAppsFirstAppCardActionsMenu@@ -535,7 +471,7 @@ describe('AppCard', () => {mode: 'workflow' as const,workflow: undefined,})- render(<AppCard app={workflowApp} />)+ render(<AppCard onDelete={onDelete} app={workflowApp} />)await user.click(getOperationsTrigger())await waitFor(() => {@@ -554,7 +490,7 @@ describe('AppCard', () => {api.installedRequest.mockResolvedValueOnce(Response.json({ has_more: false, installed_apps: [], next_cursor: null }),)- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await chooseAction(user, 'app.openInExplore')await waitFor(() => expect(popup.close).toHaveBeenCalledOnce())expect(popup.location.href).toBe('')@@ -564,7 +500,7 @@ describe('AppCard', () => {it('closes the popup and reports a failed lookup without retrying', async () => {const user = userEvent.setup()api.installedRequest.mockRejectedValueOnce(new Error('Network error'))- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await chooseAction(user, 'app.openInExplore')await waitFor(() => expect(popup.close).toHaveBeenCalledOnce())expect(api.installedRequest).toHaveBeenCalledOnce()@@ -575,7 +511,7 @@ describe('AppCard', () => {it('should not show open in explore option for apps with has_draft_trigger', async () => {const user = userEvent.setup()const draftTriggerApp = createMockApp({ has_draft_trigger: true })- render(<AppCard app={draftTriggerApp} />)+ render(<AppCard onDelete={onDelete} app={draftTriggerApp} />)await user.click(getOperationsTrigger())await waitFor(() => {@@ -593,7 +529,7 @@ describe('AppCard', () => {maintainer: 'another-user',permission_keys: [AppACLPermission.AccessConfig, AppACLPermission.Delete],})- render(<AppCard app={appWithAccessConfigPermission} />)+ render(<AppCard onDelete={onDelete} app={appWithAccessConfigPermission} />)await user.click(getOperationsTrigger())@@ -613,7 +549,7 @@ describe('AppCard', () => {maintainer: 'another-user',permission_keys: [AppACLPermission.AccessConfig, AppACLPermission.Delete],})- render(<AppCard app={appWithAccessConfigPermission} />)+ render(<AppCard onDelete={onDelete} app={appWithAccessConfigPermission} />)await user.click(getOperationsTrigger())@@ -631,7 +567,7 @@ describe('AppCard', () => {maintainer: 'another-user',permission_keys: [AppACLPermission.AccessConfig],})- render(<AppCard app={appWithAccessConfigPermission} />)+ render(<AppCard onDelete={onDelete} app={appWithAccessConfigPermission} />)await user.click(getOperationsTrigger())await user.click(await screen.findByText('navigation.settings.resourceAccess'))@@ -650,6 +586,7 @@ describe('AppCard', () => {mockConsoleState.workspacePermissionKeys = workspacerender(<AppCard+ onDelete={onDelete}app={createMockApp({ maintainer: 'another-user', permission_keys: permissions })}/>,)@@ -675,7 +612,7 @@ describe('AppCard', () => {it('refreshes selected tag names from the shared tag query', async () => {const app = createMockApp({ tags: [{ id: 'tag1', name: 'Tag 1', type: 'app' }] })- const { queryClient } = render(<AppCard app={app} />)+ const { queryClient } = render(<AppCard onDelete={onDelete} app={app} />)expect(await screen.findByRole('combobox', { name: 'Tag 1: Test App' })).toBeInTheDocument()act(() =>queryClient.setQueryData(@@ -688,27 +625,10 @@ describe('AppCard', () => {).toBeInTheDocument()})- it('requires an exact app name and supports filling it before delete', async () => {- const user = userEvent.setup()- render(<AppCard app={mockApp} />)- await chooseAction(user, 'common.operation.delete')- const input = await screen.findByRole('textbox')- await user.type(input, 'Test')- expect(screen.getByRole('button', { name: 'common.operation.confirm' })).toBeDisabled()- await user.keyboard('{Enter}')- expect(api.delete).not.toHaveBeenCalled()- await user.click(screen.getByRole('button', { name: 'common.operation.fill' }))- expect(input).toHaveValue(mockApp.name)- await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))- await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument())- expect(api.delete).toHaveBeenCalledOnce()- expect(api.delete).toHaveBeenCalledWith({ params: { app_id: mockApp.id } })- })-it('keeps the failed edit draft and retries without reopening the card dialog', async () => {const user = userEvent.setup()api.update.mockRejectedValueOnce(new Error('Edit failed'))- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await chooseAction(user, 'app.editApp')const dialog = await screen.findByRole('dialog', { name: 'app.editAppTitle' })const name = within(dialog).getByRole('textbox', { name: 'app.newApp.name' })@@ -756,7 +676,7 @@ describe('AppCard', () => {'discards unsubmitted name changes when reopening $action',async ({ action, title, initial }) => {const user = userEvent.setup()- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await chooseAction(user, action)const dialog = await screen.findByRole('dialog', { name: title })const input = within(dialog).getByRole('textbox', { name: 'app.newApp.name' })@@ -773,7 +693,7 @@ describe('AppCard', () => {it('duplicates the chosen name and source icon, then navigates to the new app', async () => {const user = userEvent.setup()- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await chooseAction(user, 'app.duplicate')const dialog = await screen.findByRole('dialog', { name: 'app.duplicateTitle' })const name = within(dialog).getByRole('textbox', { name: 'app.newApp.name' })@@ -791,7 +711,7 @@ describe('AppCard', () => {it('reports failed duplication without navigating to a new app', async () => {const user = userEvent.setup()api.copy.mockRejectedValueOnce(new Error('Copy failed'))- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await chooseAction(user, 'app.duplicate')const dialog = await screen.findByRole('dialog', { name: 'app.duplicateTitle' })await user.click(within(dialog).getByRole('button', { name: 'app.duplicate' }))@@ -803,7 +723,7 @@ describe('AppCard', () => {'converts a %s app from the card and opens its workflow',async (mode) => {const user = userEvent.setup()- render(<AppCard app={createMockApp({ mode })} />)+ render(<AppCard onDelete={onDelete} app={createMockApp({ mode })} />)await chooseAction(user, 'app.switch')const dialog = await screen.findByRole('dialog', { name: 'app.switch' })const name = within(dialog).getByRole('textbox', { name: 'app.newApp.name' })@@ -815,7 +735,7 @@ describe('AppCard', () => {params: { app_id: mockApp.id },body: { name: 'Converted App', icon_type: 'emoji', icon: '🤖', icon_background: '#FFEAD5' },})- expect(api.delete).not.toHaveBeenCalled()+ expect(onDelete).not.toHaveBeenCalled()expect(dialog).not.toBeInTheDocument()},)@@ -825,7 +745,7 @@ describe('AppCard', () => {async (mode) => {const user = userEvent.setup()const downloads = captureDownloads()- render(<AppCard app={createMockApp({ mode })} />)+ render(<AppCard onDelete={onDelete} app={createMockApp({ mode })} />)await chooseAction(user, 'app.exportApp')await waitFor(() => expect(downloads).toHaveLength(1))expect(downloads[0]!.filename).toBe('Test App.yml')@@ -844,7 +764,7 @@ describe('AppCard', () => {const pending = createDeferred<{ data: string }>()api.export.mockReturnValueOnce(pending.promise)const downloads = captureDownloads()- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await chooseAction(user, 'app.exportApp')await waitFor(() => expect(api.export).toHaveBeenCalledOnce())await user.click(getOperationsTrigger())@@ -869,7 +789,7 @@ describe('AppCard', () => {items: [secret],})const downloads = captureDownloads()- render(<AppCard app={createMockApp({ mode: 'workflow' })} />)+ render(<AppCard onDelete={onDelete} app={createMockApp({ mode: 'workflow' })} />)await chooseAction(user, 'app.exportApp')const dialog = await screen.findByRole('alertdialog', { name: 'app.exportSecret.title' })expect(within(dialog).getByText('API_KEY')).toBeInTheDocument()@@ -898,7 +818,7 @@ describe('AppCard', () => {api.env.mockResolvedValue({items: [secret],})- render(<AppCard app={createMockApp({ mode: 'workflow' })} />)+ render(<AppCard onDelete={onDelete} app={createMockApp({ mode: 'workflow' })} />)await chooseAction(user, 'app.exportApp')const dialog = await screen.findByRole('alertdialog')await user.click(within(dialog).getByRole('checkbox'))@@ -914,7 +834,7 @@ describe('AppCard', () => {const pending = createDeferred<{ result: boolean }>()mockWebappAuthEnabled = trueapi.access.mockReturnValue(pending.promise)- render(<AppCard app={mockApp} />)+ render(<AppCard onDelete={onDelete} app={mockApp} />)await user.click(getOperationsTrigger())await screen.findByRole('menu')expect(screen.queryByRole('menuitem', { name: 'app.openInExplore' })).not.toBeInTheDocument()@@ -930,7 +850,7 @@ describe('AppCard', () => {const user = userEvent.setup()mockWebappAuthEnabled = trueapi.access.mockImplementation(() => new Promise(() => {}))- render(<AppCard app={createMockApp({ mode: 'workflow' })} />)+ render(<AppCard onDelete={onDelete} app={createMockApp({ mode: 'workflow' })} />)await chooseAction(user, 'app.openInExplore')expect(toast.error).toHaveBeenCalledWith('app.notPublishedYet')expect(openWindow).not.toHaveBeenCalled()diff --git a/web/app/components/apps/__tests__/delete-app.browser.spec.tsx b/web/app/components/apps/__tests__/delete-app.browser.spec.tsxnew file mode 100644index 00000000000..df60592d13b--- /dev/null+++ b/web/app/components/apps/__tests__/delete-app.browser.spec.tsx@@ -0,0 +1,339 @@+import type { AppPartial } from '@dify/contracts/api/console/apps/types.gen'+import type { consoleClient } from '@/service/console'+import { zAppPagination } from '@dify/contracts/api/console/apps/zod.gen'+import { zGetFeaturesResponse } from '@dify/contracts/api/console/features/zod.gen'+import { createInstance } from 'i18next'+import { NuqsTestingAdapter } from 'nuqs/adapters/testing'+import { I18nextProvider } from 'react-i18next'+import { page, userEvent } from 'vite-plus/test/browser'+import { render } from 'vitest-browser-react'+import appMessages from '@/i18n/locales/en-US/app.json'+import common from '@/i18n/locales/en-US/common.json'+import navigation from '@/i18n/locales/en-US/navigation.json'+import time from '@/i18n/locales/en-US/time.json'+import { createConsoleQueryWrapper } from '@/test/console/query-data'+import { QueryClientTestProvider } from '@/test/console/query-provider'+import { createDeferred } from '@/test/deferred'+import { createAppDetailFixture } from '@/test/fixtures/app'+import { AppACLPermission } from '@/utils/permission'+import { List } from '../list'++const api = vi.hoisted(() => ({+ apps: vi.fn<typeof consoleClient.apps.get>(),+ starred: vi.fn<typeof consoleClient.apps.starred.get>(),+ delete: vi.fn<typeof consoleClient.apps.byAppId.delete>(),+}))+vi.mock('react-i18next', async (importOriginal) => importOriginal())+vi.mock('@/next/navigation', async (importOriginal) => ({+ ...(await importOriginal<typeof import('@/next/navigation')>()),+ useRouter: () => ({ push: vi.fn(), replace: vi.fn() }),+ usePathname: () => '/apps',+ useSearchParams: () => new URLSearchParams(),+}))+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.get': api.apps,+ 'apps.starred.get': api.starred,+ 'apps.byAppId.delete': api.delete,+ 'features.get': async () => zGetFeaturesResponse.parse({}),+ 'tags.get': async () => [],+ 'workspaces.current.members.get': async () => ({ accounts: [] }),+ }),+ }+})++const app = (id: string, name: string): AppPartial => ({+ ...createAppDetailFixture({ id, name, maintainer: 'user-1' }),+ permission_keys: [AppACLPermission.Delete],+})+const appPage = (data: AppPartial[]) =>+ zAppPagination.parse({ data, page: 1, limit: 30, has_more: false, total: data.length })+const animationSettings = globalThis as typeof globalThis & { BASE_UI_ANIMATIONS_DISABLED: boolean }+let previousAnimationSetting: boolean+beforeEach(() => {+ previousAnimationSetting = animationSettings.BASE_UI_ANIMATIONS_DISABLED+ animationSettings.BASE_UI_ANIMATIONS_DISABLED = false+})+afterEach(() => {+ animationSettings.BASE_UI_ANIMATIONS_DISABLED = previousAnimationSetting+})++async function setup(initialApps: AppPartial[], initialStarredApps: AppPartial[] = []) {+ await page.viewport(1024, 768)+ let apps = initialApps+ let starredApps = initialStarredApps+ api.apps.mockReset().mockImplementation(async () => appPage(apps))+ api.starred.mockReset().mockImplementation(async () => appPage(starredApps))+ api.delete.mockReset().mockImplementation(async ({ params }) => {+ apps = apps.filter(({ id }) => id !== params.app_id)+ starredApps = starredApps.filter(({ id }) => id !== params.app_id)+ })+ const i18n = createInstance()+ await i18n.init({+ lng: 'en-US',+ resources: { 'en-US': { app: appMessages, common, navigation, time } },+ keySeparator: false,+ interpolation: { escapeValue: false },+ })+ const { queryClient } = createConsoleQueryWrapper({+ accountProfile: { id: 'user-1' },+ workspacePermissionKeys: [],+ features: {},+ systemFeatures: {+ rbac_enabled: true,+ enable_learn_app: false,+ enable_collaboration_mode: false,+ },+ })+ const screen = await render(+ <QueryClientTestProvider queryClient={queryClient}>+ <NuqsTestingAdapter>+ <I18nextProvider i18n={i18n}>+ <div className="flex h-screen flex-col">+ <List />+ </div>+ </I18nextProvider>+ </NuqsTestingAdapter>+ </QueryClientTestProvider>,+ )+ await expect.element(screen.getByRole('list', { name: 'All Apps' })).toBeVisible()+ const actions = (listName: string, name: string) =>+ screen+ .getByRole('list', { name: listName })+ .getByRole('button', { name: `More actions for ${name}` })+ const openDelete = async (listName: string, name: string) => {+ await screen.getByRole('list', { name: listName }).getByRole('link', { name }).hover()+ await actions(listName, name).click()+ await expect.element(screen.getByRole('menu')).toBeVisible()+ const menu = screen.getByRole('menu').element()+ await screen.getByRole('menuitem', { name: 'Delete', exact: true }).click()+ await expect.element(screen.getByRole('alertdialog')).toBeVisible()+ await expect.poll(() => menu.isConnected).toBe(false)+ }+ return { screen, queryClient, openDelete, actions }+}++it('keeps the delete dialog pending after its starred source unmounts until both app lists finish refreshing', async () => {+ const target = app('target', 'Shared App')+ const next = app('next', 'Next Starred App')+ const { screen, queryClient, openDelete, actions } = await setup([target, next], [target, next])+ const refresh = createDeferred<Awaited<ReturnType<typeof consoleClient.apps.get>>>()+ try {+ const starredLink = screen+ .getByRole('list', { name: 'Starred' })+ .getByRole('link', { name: target.name })+ .element()+ const catalogLink = screen+ .getByRole('list', { name: 'All Apps' })+ .getByRole('link', { name: target.name })+ .element()+ api.apps.mockReturnValueOnce(refresh.promise)+ await openDelete('Starred', target.name)+ const dialog = screen.getByRole('alertdialog').element()+ await screen.getByRole('button', { name: 'Autofill' }).click()+ await screen.getByRole('button', { name: 'Confirm', exact: true }).click()+ await expect.poll(() => starredLink.isConnected).toBe(false)+ expect(catalogLink.isConnected).toBe(true)+ await expect.element(screen.getByRole('alertdialog')).toBeVisible()+ await expect.element(screen.getByRole('button', { name: 'Cancel', exact: true })).toBeDisabled()+ await userEvent.keyboard('{Escape}')+ await expect.element(screen.getByRole('alertdialog')).toBeVisible()+ refresh.resolve(appPage([next]))+ await expect.poll(() => dialog.isConnected).toBe(false)+ await expect.poll(() => catalogLink.isConnected).toBe(false)+ await expect+ .element(screen.getByRole('list', { name: 'Starred' }).getByRole('link', { name: next.name }))+ .toHaveFocus()+ expect(api.delete).toHaveBeenCalledExactlyOnceWith({ params: { app_id: target.id } })+ await openDelete('Starred', next.name)+ const nextDialog = screen.getByRole('alertdialog').element()+ await screen.getByRole('button', { name: 'Cancel', exact: true }).click()+ await expect.poll(() => nextDialog.isConnected).toBe(false)+ await expect.element(actions('Starred', next.name)).toHaveFocus()+ } finally {+ refresh.resolve(appPage([next]))+ queryClient.clear()+ }+})++it.each(['pointer', 'keyboard'] as const)(+ 'restores the %s card action after cancellation and keeps it keyboard-operable',+ async (interaction) => {+ const target = app('target', 'Research App')+ const { screen, queryClient, actions } = await setup([target])+ try {+ const trigger = actions('All Apps', target.name)+ await expect.element(trigger).toBeInTheDocument()+ if (interaction === 'pointer') {+ await screen.getByRole('link', { name: target.name }).hover()+ await trigger.click()+ } else {+ trigger.element().focus()+ await userEvent.keyboard('{Enter}')+ await expect.element(screen.getByRole('menu')).toBeVisible()+ await userEvent.keyboard('{End}')+ await expect+ .element(screen.getByRole('menuitem', { name: 'Delete', exact: true }))+ .toHaveFocus()+ }+ await expect.element(screen.getByRole('menu')).toBeVisible()+ const menu = screen.getByRole('menu').element()+ if (interaction === 'pointer')+ await screen.getByRole('menuitem', { name: 'Delete', exact: true }).click()+ else await userEvent.keyboard('{Enter}')+ await expect.element(screen.getByRole('alertdialog')).toBeVisible()+ await expect.poll(() => menu.isConnected).toBe(false)+ await expect.element(screen.getByRole('textbox')).toHaveFocus()+ const dialog = screen.getByRole('alertdialog').element()+ await screen.getByRole('button', { name: 'Cancel', exact: true }).click()+ await expect.poll(() => dialog.isConnected).toBe(false)+ await expect.element(trigger).toHaveFocus()+ await expect.element(trigger).toBeVisible()+ await userEvent.keyboard('{Enter}')+ await expect.element(screen.getByRole('menu')).toBeVisible()+ expect(api.delete).not.toHaveBeenCalled()+ } finally {+ queryClient.clear()+ }+ },+)++it('hands focus from the card context menu to deletion and restores the card link on cancel', async () => {+ const target = app('target', 'Research App')+ const { screen, queryClient } = await setup([target])+ try {+ const link = screen.getByRole('link', { name: target.name })+ await link.click({ button: 'right' })+ await expect.element(screen.getByRole('menu')).toBeVisible()+ const menu = screen.getByRole('menu').element()+ await screen.getByRole('menuitem', { name: 'Delete', exact: true }).click()+ await expect.element(screen.getByRole('alertdialog')).toBeVisible()+ await expect.poll(() => menu.isConnected).toBe(false)+ await expect.element(screen.getByRole('textbox')).toHaveFocus()+ const dialog = screen.getByRole('alertdialog').element()+ await screen.getByRole('button', { name: 'Cancel', exact: true }).click()+ await expect.poll(() => dialog.isConnected).toBe(false)+ await expect.element(link).toHaveFocus()+ expect(api.delete).not.toHaveBeenCalled()+ } finally {+ queryClient.clear()+ }+})++it('focuses the next card after deletion without moving the catalog scroll position', async () => {+ const apps = Array.from({ length: 30 }, (_, index) => app(`app-${index}`, `App ${index}`))+ const target = apps[15]!+ const { screen, queryClient, openDelete } = await setup(apps)+ try {+ const viewport = screen.getByRole('region', { name: 'Studio', exact: true })+ const element = viewport.element()+ await expect.poll(() => element.scrollHeight).toBeGreaterThan(element.clientHeight)+ element.scrollTo({ top: 600 })+ await expect.poll(() => element.scrollTop).toBeGreaterThan(0)+ await openDelete('All Apps', target.name)+ const scrollTopBefore = element.scrollTop+ const dialog = screen.getByRole('alertdialog').element()+ await screen.getByRole('button', { name: 'Autofill' }).click()+ await screen.getByRole('button', { name: 'Confirm', exact: true }).click()+ await expect.poll(() => dialog.isConnected).toBe(false)+ await expect+ .element(screen.getByRole('link', { name: target.name, exact: true }))+ .not.toBeInTheDocument()+ await expect+ .element(screen.getByRole('link', { name: apps[16]!.name, exact: true }))+ .toHaveFocus()+ expect(element.scrollTop).toBe(scrollTopBefore)+ expect(element.scrollTop).toBeGreaterThan(0)+ } finally {+ queryClient.clear()+ }+})++it('returns focus to the empty catalog when its last app is deleted without an exit transition', async () => {+ const target = app('last', 'Last App')+ const { screen, queryClient, openDelete } = await setup([target])+ const noMotionStyle = document.createElement('style')+ try {+ noMotionStyle.textContent =+ '[role="alertdialog"] { transition: none !important; animation: none !important; }'+ document.head.append(noMotionStyle)+ await openDelete('All Apps', target.name)+ const dialog = screen.getByRole('alertdialog').element()+ expect(getComputedStyle(dialog).transitionDuration).toBe('0s')+ await screen.getByRole('button', { name: 'Autofill' }).click()+ await screen.getByRole('button', { name: 'Confirm', exact: true }).click()+ await expect.poll(() => dialog.isConnected).toBe(false)+ await expect.element(screen.getByRole('link', { name: target.name })).not.toBeInTheDocument()+ await expect.element(screen.getByRole('region', { name: 'Studio', exact: true })).toHaveFocus()+ } finally {+ noMotionStyle.remove()+ queryClient.clear()+ }+})++it.each([+ { deleted: 1, focused: 2 },+ { deleted: 2, focused: 1 },+])('focuses card $focused after deleting card $deleted', async ({ deleted, focused }) => {+ const apps = [app('a', 'First App'), app('b', 'Middle App'), app('c', 'Last App')]+ const { screen, queryClient, openDelete } = await setup(apps)+ try {+ await openDelete('All Apps', apps[deleted]!.name)+ await screen.getByRole('button', { name: 'Autofill' }).click()+ await screen.getByRole('button', { name: 'Confirm', exact: true }).click()+ await expect.element(screen.getByRole('alertdialog')).not.toBeInTheDocument()+ await expect+ .element(screen.getByRole('link', { name: apps[deleted]!.name }))+ .not.toBeInTheDocument()+ const target = screen.getByRole('link', { name: apps[focused]!.name })+ await expect.element(target).toHaveFocus()+ await expect.element(target).toBeVisible()+ await userEvent.keyboard('{Tab}')+ await expect+ .element(screen.getByRole('button', { name: `Star app: ${apps[focused]!.name}` }))+ .toHaveFocus()+ } finally {+ queryClient.clear()+ }+})++it('falls back to the viewport when the source starred section disappears', async () => {+ const target = app('target', 'Only Starred App')+ const remaining = app('remaining', 'Unstarred App')+ const { screen, queryClient, openDelete } = await setup([target, remaining], [target])+ try {+ await openDelete('Starred', target.name)+ await screen.getByRole('button', { name: 'Autofill' }).click()+ await screen.getByRole('button', { name: 'Confirm', exact: true }).click()+ await expect.element(screen.getByRole('alertdialog')).not.toBeInTheDocument()+ await expect.element(screen.getByRole('list', { name: 'Starred' })).not.toBeInTheDocument()+ await expect.element(screen.getByRole('link', { name: remaining.name })).toBeVisible()+ await expect.element(screen.getByRole('region', { name: 'Studio', exact: true })).toHaveFocus()+ } finally {+ queryClient.clear()+ }+})++it('focuses the next card primary control when that card has no actions', async () => {+ const target = app('target', 'Editable App')+ const remaining = {+ ...app('remaining', 'Preview App'),+ permission_keys: [AppACLPermission.Preview],+ }+ const { screen, queryClient, openDelete } = await setup([target, remaining])+ try {+ await openDelete('All Apps', target.name)+ await screen.getByRole('button', { name: 'Autofill' }).click()+ await screen.getByRole('button', { name: 'Confirm', exact: true }).click()+ await expect.element(screen.getByRole('alertdialog')).not.toBeInTheDocument()+ await expect+ .element(screen.getByRole('button', { name: remaining.name, exact: true }))+ .toHaveFocus()+ } finally {+ queryClient.clear()+ }+})diff --git a/web/features/studio-list-navigation/__tests__/index.spec.tsx b/web/app/components/apps/__tests__/list-navigation.spec.tsxsimilarity index 98%rename from web/features/studio-list-navigation/__tests__/index.spec.tsxrename to web/app/components/apps/__tests__/list-navigation.spec.tsxindex 13dcd8a6452..e2195c5b4f6 100644--- a/web/features/studio-list-navigation/__tests__/index.spec.tsx+++ b/web/app/components/apps/__tests__/list-navigation.spec.tsx@@ -8,7 +8,7 @@ import { SnippetDetailTop } from '@/app/components/snippets/components/snippet-dimport { seedCurrentWorkspaceQuery } from '@/test/console/current-workspace'import { renderWithConsoleQuery } from '@/test/console/query-data'import { createDeferred } from '@/test/deferred'-import { StudioListLink, StudioListNavigation } from '../navigation'+import { StudioListLink, StudioListNavigation } from '../list-navigation'const router = vi.hoisted(() => ({ push: vi.fn(), replace: vi.fn(), back: vi.fn() }))vi.mock('@/next/navigation', () => ({ useRouter: () => router }))diff --git a/web/app/components/apps/__tests__/list.spec.tsx b/web/app/components/apps/__tests__/list.spec.tsxindex d188903a5c4..45c0d4ca0e8 100644--- a/web/app/components/apps/__tests__/list.spec.tsx+++ b/web/app/components/apps/__tests__/list.spec.tsx@@ -22,6 +22,7 @@ import { List } from '../list'const api = vi.hoisted(() => ({apps: vi.fn<typeof consoleClient.apps.get>(),+ delete: vi.fn<typeof consoleClient.apps.byAppId.delete>(),starred: vi.fn<typeof consoleClient.apps.starred.get>(),online: vi.fn<typeof consoleClient.apps.workflows.onlineUsers.post>(),learn: vi.fn<typeof consoleClient.explore.apps.learnDify.get>(),@@ -42,6 +43,7 @@ vi.mock('@/service/console', async (importOriginal) => {...actual,consoleQuery: withConsoleResponses(actual.consoleQuery, {'apps.get': api.apps,+ 'apps.byAppId.delete': api.delete,'apps.starred.get': api.starred,'apps.workflows.onlineUsers.post': api.online,'explore.apps.learnDify.get': api.learn,@@ -171,6 +173,7 @@ async function setup(beforeEach(() => {api.apps.mockReset().mockResolvedValue(page())+ api.delete.mockReset().mockResolvedValue(undefined)api.starred.mockReset().mockResolvedValue(page([]))api.online.mockReset().mockResolvedValue({ data: [] })api.learn.mockReset().mockResolvedValue({ recommended_apps: [learnApp] })@@ -587,3 +590,77 @@ it('opens the create walkthrough after resolving the guide group without activat)expect(screen.queryByRole('dialog')).not.toBeInTheDocument()})++async function openDeleteDialog(user: ReturnType<typeof userEvent.setup>, appName = 'Chat app') {+ const card = screen.getByRole('link', { name: appName }).closest('li')!+ await user.click(within(card).getByRole('button', { name: /common\.operation\.moreActionsFor/ }))+ await user.click(await screen.findByRole('menuitem', { name: 'common.operation.delete' }))+ return screen.findByRole('textbox')+}++it('clears the failed deletion and confirmation name when reopening the catalog dialog', async () => {+ api.apps.mockResolvedValue(page([app({ permission_keys: [AppACLPermission.Delete] })]))+ api.delete.mockRejectedValueOnce(new Error('Delete failed'))+ const { user } = await setup()+ await user.type(await openDeleteDialog(user), 'Chat app')+ await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))+ expect(await screen.findByRole('alert')).toHaveTextContent('Delete failed')+ await user.click(screen.getByRole('button', { name: 'common.operation.cancel' }))+ await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument())+ expect(await openDeleteDialog(user)).toHaveValue('')+ expect(screen.queryByRole('alert')).not.toBeInTheDocument()+ expect(screen.getByRole('button', { name: 'common.operation.confirm' })).toBeDisabled()+})++it('retains a failed catalog deletion for retry and closes after success', async () => {+ api.apps.mockResolvedValue(page([app({ permission_keys: [AppACLPermission.Delete] })]))+ api.delete.mockRejectedValueOnce(new Error('Delete failed'))+ const { user } = await setup()+ await user.type(await openDeleteDialog(user), 'Chat app')+ await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))+ expect(await screen.findByRole('alert')).toHaveTextContent('Delete failed')+ expect(screen.getByRole('textbox')).toHaveValue('Chat app')+ expect(api.delete).toHaveBeenCalledWith({ params: { app_id: 'app-1' } })+ api.apps.mockResolvedValue(page([]))+ await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))+ await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument())+ expect(api.delete).toHaveBeenCalledTimes(2)+})++it('keeps the confirmation name stable and blocks dismissal while catalog deletion is pending', async () => {+ const target = app({ permission_keys: [AppACLPermission.Delete] })+ api.apps.mockResolvedValue(page([target]))+ const pending = createDeferred<void>()+ api.delete.mockReturnValueOnce(pending.promise)+ const { user, queryClient } = await setup()+ await openDeleteDialog(user)+ await user.click(screen.getByRole('button', { name: 'common.operation.fill' }))+ api.apps.mockResolvedValue(page([{ ...target, name: 'Renamed elsewhere' }]))+ await act(async () => queryClient.invalidateQueries({ queryKey: consoleQuery.apps.get.key() }))+ expect(screen.getByRole('textbox')).toHaveValue('Chat app')+ await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))+ await waitFor(() => expect(api.delete).toHaveBeenCalledOnce())+ expect(screen.getByRole('textbox')).toHaveAttribute('readonly')+ expect(screen.getByRole('button', { name: 'common.operation.fill' })).toBeDisabled()+ await user.keyboard('{Escape}')+ expect(screen.getByRole('alertdialog')).toBeInTheDocument()+ api.apps.mockResolvedValue(page([]))+ await act(async () => pending.resolve())+ await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument())+})++it('requires the exact app name and supports autofill before deleting from the catalog', async () => {+ api.apps.mockResolvedValue(page([app({ permission_keys: [AppACLPermission.Delete] })]))+ const { user } = await setup()+ const input = await openDeleteDialog(user)+ await user.type(input, 'Chat')+ expect(screen.getByRole('button', { name: 'common.operation.confirm' })).toBeDisabled()+ await user.keyboard('{Enter}')+ expect(api.delete).not.toHaveBeenCalled()+ await user.click(screen.getByRole('button', { name: 'common.operation.fill' }))+ expect(input).toHaveValue('Chat app')+ api.apps.mockResolvedValue(page([]))+ await user.click(screen.getByRole('button', { name: 'common.operation.confirm' }))+ await waitFor(() => expect(screen.queryByRole('alertdialog')).not.toBeInTheDocument())+ expect(api.delete).toHaveBeenCalledExactlyOnceWith({ params: { app_id: 'app-1' } })+})diff --git a/web/app/components/apps/app-card/index.tsx b/web/app/components/apps/app-card/index.tsxindex 83755519bb9..e2ff431daf2 100644--- a/web/app/components/apps/app-card/index.tsx+++ b/web/app/components/apps/app-card/index.tsx@@ -1,6 +1,7 @@'use client'import type { AppPartial } from '@dify/contracts/api/console/apps/types.gen'+import type { AppCardInteractionsProps } from './interactions'import type { WorkflowOnlineUser } from '@/models/app'import { cn } from '@langgenius/dify-ui/cn'import { useSuspenseQuery } from '@tanstack/react-query'@@ -13,7 +14,6 @@ import { UserAvatarList } from '@/app/components/base/user-avatar-list'import { toast } from '@/app/notifications'import { workspacePermissionKeysAtom } from '@/context/permission-state'import { userProfileQueryOptions } from '@/features/account-profile/client'-import { StudioListLink } from '@/features/studio-list-navigation/navigation'import { systemFeaturesQueryOptions } from '@/features/system-features/client'import { AppCardTags } from '@/features/tag-management/components/app-card-tags'import { getRedirectionPath } from '@/utils/app-redirection'@@ -23,12 +23,14 @@ import {hasPermission,} from '@/utils/permission'import { formatTime } from '@/utils/time'+import { StudioListLink } from '../list-navigation'import { AppCardInteractions } from './interactions'const EMPTY_ONLINE_USERS: WorkflowOnlineUser[] = []type AppCardProps = {app: AppPartial+ onDelete: AppCardInteractionsProps['onDelete']onlineUsers?: WorkflowOnlineUser[]onOpenTagManagement?: () => voidstepByStepTourActionMenuOpen?: boolean@@ -40,6 +42,7 @@ type AppCardProps = {export const AppCard = memo(({app,+ onDelete,onlineUsers = EMPTY_ONLINE_USERS,onOpenTagManagement,stepByStepTourActionMenuOpen = false,@@ -198,6 +201,7 @@ export const AppCard = memo() : (<AppCardInteractionsapp={app}+ onDelete={onDelete}stepByStepTourActionMenuOpen={stepByStepTourActionMenuOpen}stepByStepTourActionMenuHighlightPart={stepByStepTourActionMenuHighlightPart}>diff --git a/web/app/components/apps/app-card/interactions.tsx b/web/app/components/apps/app-card/interactions.tsxindex 0380819ea20..34778744c47 100644--- a/web/app/components/apps/app-card/interactions.tsx+++ b/web/app/components/apps/app-card/interactions.tsx@@ -8,7 +8,6 @@ import type { DialogActions } from '@langgenius/dify-ui/dialog'import type { MouseEvent, ReactElement } from 'react'import type { DuplicateAppModalProps } from '@/app/components/app/duplicate-modal'import { zIconType } from '@dify/contracts/api/console/apps/zod.gen'-import { AlertDialog, AlertDialogContent } from '@langgenius/dify-ui/alert-dialog'import { cn } from '@langgenius/dify-ui/cn'import {ContextMenu,@@ -34,7 +33,6 @@ import dynamic from 'next/dynamic'import { useCallback, useMemo, useRef, useState } from 'react'import { useTranslation } from 'react-i18next'import { AppMetadataForm } from '@/app/components/app/app-metadata'-import { DeleteAppForm } from '@/app/components/app/delete-app-form'import { useExportAppDsl, useExportWorkflowAppDsl } from '@/app/components/app/use-export-app-dsl'import { buildInstalledAppPath } from '@/app/components/explore/installed-app/routes'import {@@ -239,9 +237,10 @@ function AppCardOperationsMenuItems({)}-type AppCardInteractionsProps = {+export type AppCardInteractionsProps = {app: AppPartialchildren: ReactElement+ onDelete: (app: Pick<AppPartial, 'id' | 'name'>, trigger: HTMLButtonElement | null) => voidstepByStepTourActionMenuOpen?: booleanstepByStepTourActionMenuHighlightPart?: string}@@ -249,6 +248,7 @@ type AppCardInteractionsProps = {export function AppCardInteractions({app,children,+ onDelete,stepByStepTourActionMenuOpen = false,stepByStepTourActionMenuHighlightPart,}: AppCardInteractionsProps) {@@ -262,9 +262,6 @@ export function AppCardInteractions({const isRbacEnabled = systemFeatures.rbac_enabledconst { push } = useRouter()const { mutate: copyApp } = useMutation(consoleQuery.apps.byAppId.copy.post.mutationOptions())- const deletion = useMutation(- consoleQuery.apps.byAppId.delete.mutationOptions({ context: { silent: true } }),- )const { mutate: starApp, isPending: isStarring } = useMutation(consoleQuery.apps.byAppId.star.post.mutationOptions(),)@@ -272,20 +269,18 @@ export function AppCardInteractions({consoleQuery.apps.byAppId.star.delete.mutationOptions(),)+ const moreButtonRef = useRef<HTMLButtonElement>(null)const editActionsRef = useRef<DialogActions>(null)const edit = useMutation(consoleQuery.apps.byAppId.put.mutationOptions({ context: { silent: true } }),)const editNameRef = useRef<HTMLInputElement>(null)- const [activeDialog, setActiveDialog] = useState<- 'delete' | 'duplicate' | 'edit' | 'switch' | null- >(null)+ const [activeDialog, setActiveDialog] = useState<'duplicate' | 'edit' | 'switch' | null>(null)const operationsMenu = useStepByStepTourControlledDropdown({allowTriggerCloseWhileControlled: false,controlledOpen: stepByStepTourActionMenuOpen,})const isOperationsMenuOpen = operationsMenu.open- const setIsOperationsMenuOpen = operationsMenu.onOpenChangeconst [secretEnvList, setSecretEnvList] = useState<EnvironmentVariableItemResponse[]>([])const {exportAppDsl,@@ -313,39 +308,6 @@ export function AppCardInteractions({)const canCreateApp = hasPermission(workspacePermissionKeys, 'app.create_and_management')- const handleShowEditModal = useCallback(() => {- setIsOperationsMenuOpen(false)- queueMicrotask(() => {- setActiveDialog('edit')- })- }, [setIsOperationsMenuOpen])-- const handleShowDuplicateModal = useCallback(() => {- setIsOperationsMenuOpen(false)- queueMicrotask(() => {- setActiveDialog('duplicate')- })- }, [setIsOperationsMenuOpen])-- const handleShowSwitchModal = useCallback(() => {- setIsOperationsMenuOpen(false)- queueMicrotask(() => {- setActiveDialog('switch')- })- }, [setIsOperationsMenuOpen])-- const handleShowDeleteConfirm = useCallback(() => {- setIsOperationsMenuOpen(false)- queueMicrotask(() => {- setActiveDialog('delete')- })- }, [setIsOperationsMenuOpen])-- const handleOpenAccessConfig = useCallback(() => {- setIsOperationsMenuOpen(false)- push(`/app/${app.id}/access-config`)- }, [app.id, push, setIsOperationsMenuOpen])-const onCopy: DuplicateAppModalProps['onConfirm'] = ({name,icon_type,@@ -401,7 +363,6 @@ export function AppCardInteractions({if (isExporting) returnresetExport()- setIsOperationsMenuOpen(false)const isWorkflowApp = app.mode === 'workflow' || app.mode === 'advanced-chat'const result = isWorkflowApp? await exportWorkflowAppDsl({ appId: app.id, appName: app.name })@@ -460,12 +421,12 @@ export function AppCardInteractions({shouldShowAccessConfigOption,shouldShowDeleteOption,isExporting,- onEdit: handleShowEditModal,- onDuplicate: handleShowDuplicateModal,+ onEdit: () => setActiveDialog('edit'),+ onDuplicate: () => setActiveDialog('duplicate'),onExport: exportCheck,- onSwitch: handleShowSwitchModal,- onDelete: handleShowDeleteConfirm,- onAccessConfig: handleOpenAccessConfig,+ onSwitch: () => setActiveDialog('switch'),+ onDelete: () => onDelete({ id: app.id, name: app.name }, moreButtonRef.current),+ onAccessConfig: () => push(`/app/${app.id}/access-config`),}return (@@ -524,9 +485,10 @@ export function AppCardInteractions({<DropdownMenumodal={false}open={isOperationsMenuOpen}- onOpenChange={setIsOperationsMenuOpen}+ onOpenChange={operationsMenu.onOpenChange}><DropdownMenuTrigger+ ref={moreButtonRef}render={<IconButtonsize="lg"@@ -607,37 +569,6 @@ export function AppCardInteractions({}}/>)}- <AlertDialog- open={activeDialog === 'delete'}- onOpenChange={(open, details) => {- if (!open && deletion.isPending) details.cancel()- else if (!open) setActiveDialog(null)- }}- onOpenChangeComplete={(open) => {- if (!open) deletion.reset()- }}- >- <AlertDialogContent>- <DeleteAppForm- appName={app.name}- isPending={deletion.isPending}- error={- deletion.isError- ? `${t(($) => $.appDeleteFailed, { ns: 'app' })}: ${deletion.error.message}`- : undefined- }- onSubmit={() => {- if (deletion.isPending) return- deletion.mutate(- { params: { app_id: app.id } },- {- onSuccess: () => setActiveDialog(null),- },- )- }}- />- </AlertDialogContent>- </AlertDialog>{secretEnvList.length > 0 && (<AppExportConfirmModalenvList={secretEnvList}diff --git a/web/app/components/apps/app-list-catalog.tsx b/web/app/components/apps/app-list-catalog.tsxindex f9091753dc5..19712ede02c 100644--- a/web/app/components/apps/app-list-catalog.tsx+++ b/web/app/components/apps/app-list-catalog.tsx@@ -8,11 +8,19 @@ import type {import type { RecommendedAppResponse } from '@dify/contracts/api/console/explore/types.gen'import type { GetSystemFeaturesResponse } from '@dify/contracts/api/console/system-features/types.gen'import type { RefObject } from 'react'+import type { AppCardInteractionsProps } from './app-card/interactions'+import {+ AlertDialog,+ AlertDialogContent,+ createAlertDialogHandle,+} from '@langgenius/dify-ui/alert-dialog'import { Button } from '@langgenius/dify-ui/button'import { cn } from '@langgenius/dify-ui/cn'-import { keepPreviousData, useInfiniteQuery, useQuery } from '@tanstack/react-query'-import { useMemo } from 'react'+import { keepPreviousData, useInfiniteQuery, useMutation, useQuery } from '@tanstack/react-query'+import { useCallback, useMemo, useState } from 'react'import { useTranslation } from 'react-i18next'+import { DeleteAppForm } from '@/app/components/app/delete-app-form'+import { getAdjacentCardFocusTargets } from '@/app/components/base/card-list-focus'import { InfiniteScrollSentinel } from '@/app/components/base/infinite-scroll-sentinel'import { STEP_BY_STEP_TOUR_TARGETS } from '@/app/components/step-by-step-tour/target-registry'import { systemFeaturesQueryOptions } from '@/features/system-features/client'@@ -35,6 +43,11 @@ const getPreloadDistance = (scrollContainer: Element) =>type AppListQuery = NonNullable<GetAppsData['query']>+type DeleteAppDialogPayload = Pick<AppPartial, 'id' | 'name'> & {+ fallbackFocus: RefObject<HTMLElement | null>+ adjacentFocusTargets: HTMLElement[]+}+type AppListCatalogProps = Readonly<{appListQuery: AppListQuerycanCreateApp: boolean@@ -98,6 +111,19 @@ function AppListCatalogContent({systemFeatures,}: AppListCatalogContentProps) {const { t } = useTranslation(['app', 'common'])+ const [deleteDialog] = useState(() => createAlertDialogHandle<DeleteAppDialogPayload>())+ const deletion = useMutation(+ consoleQuery.apps.byAppId.delete.mutationOptions({ context: { silent: true } }),+ )+ const openDeleteDialog = useCallback<AppCardInteractionsProps['onDelete']>(+ (app, trigger) =>+ deleteDialog.openWithPayload({+ ...app,+ adjacentFocusTargets: getAdjacentCardFocusTargets(trigger),+ fallbackFocus: { current: null },+ }),+ [deleteDialog],+ )const apps = useMemo(() => appListPages.flatMap(({ data: pageApps }) => pageApps), [appListPages])const workflowOnlineUserAppIds = useMemo(() => {@@ -151,6 +177,7 @@ function AppListCatalogContent({{starredApps.length > 0 && (<StarredAppListapps={starredApps}+ onDelete={openDeleteDialog}stepByStepTourCardTarget={shouldHighlightStarredAppRow? STEP_BY_STEP_TOUR_TARGETS.studioNoCreateFirstAppCard@@ -193,6 +220,7 @@ function AppListCatalogContent({<AppCardkey={app.id}app={app}+ onDelete={openDeleteDialog}onlineUsers={workflowOnlineUsersMap[app.id]}onOpenTagManagement={onOpenTagManagement}stepByStepTourActionMenuOpen={@@ -276,6 +304,53 @@ function AppListCatalogContent({</span></div>)}+ <AlertDialog+ handle={deleteDialog}+ onOpenChange={(open, details) => {+ if (!open && deletion.isPending && details.reason !== 'imperative-action')+ details.cancel()+ }}+ onOpenChangeComplete={(open) => {+ if (!open) deletion.reset()+ }}+ >+ {({ payload }) => (+ <AlertDialogContent+ finalFocus={() => {+ const fallback = payload?.fallbackFocus.current+ if (!fallback) return true+ const target =+ payload.adjacentFocusTargets.find((element) => element.isConnected) ?? fallback+ target.focus({ preventScroll: true })+ return false+ }}+ >+ {payload && (+ <DeleteAppForm+ appName={payload.name}+ isPending={deletion.isPending}+ error={+ deletion.isError+ ? `${t(($) => $.appDeleteFailed, { ns: 'app' })}: ${deletion.error.message}`+ : undefined+ }+ onSubmit={() => {+ if (deletion.isPending) return+ deletion.mutate(+ { params: { app_id: payload.id } },+ {+ onSuccess: () => {+ payload.fallbackFocus.current = scrollViewportRef.current+ deleteDialog.close()+ },+ },+ )+ }}+ />+ )}+ </AlertDialogContent>+ )}+ </AlertDialog></>)}diff --git a/web/app/components/apps/app-list-header.tsx b/web/app/components/apps/app-list-header.tsxindex 671fd3a93d5..3f66fdd14db 100644--- a/web/app/components/apps/app-list-header.tsx+++ b/web/app/components/apps/app-list-header.tsx@@ -15,12 +15,12 @@ import {getStepByStepTourGuides,STEP_BY_STEP_TOUR_TARGETS,} from '@/app/components/step-by-step-tour/target-registry'-import { useStudioListHref } from '@/features/studio-list-navigation'-import { StudioListLink } from '@/features/studio-list-navigation/navigation'import { TagFilter } from '@/features/tag-management/components/tag-filter'import { AppSortFilter } from './app-sort-filter'import { AppTypeFilter } from './app-type-filter'import CreatorsFilter from './creators-filter'+import { StudioListLink } from './list-navigation'+import { useStudioListHref } from './list-navigation-state'import { StudioListHeader } from './studio-list-header'type AppListQuery = NonNullable<GetAppsData['query']>diff --git a/web/app/components/apps/list-navigation-state.ts b/web/app/components/apps/list-navigation-state.tsnew file mode 100644index 00000000000..705169fbb57--- /dev/null+++ b/web/app/components/apps/list-navigation-state.ts@@ -0,0 +1,35 @@+'use client'++import { atom, useAtomValue, useSetAtom } from 'jotai'+import { useEffect } from 'react'+import { currentWorkspaceIdAtom } from '@/context/workspace-state'++export type StudioListPath = '/apps' | '/snippets'++const listHrefsAtom = atom<Record<string, Partial<Record<StudioListPath, string>>>>({})+const appListHrefAtom = atom(+ (get) => get(listHrefsAtom)[get(currentWorkspaceIdAtom)]?.['/apps'] ?? '/apps',+)+const snippetListHrefAtom = atom(+ (get) => get(listHrefsAtom)[get(currentWorkspaceIdAtom)]?.['/snippets'] ?? '/snippets',+)++export function useStudioListHref(path: StudioListPath) {+ return useAtomValue(path === '/apps' ? appListHrefAtom : snippetListHrefAtom)+}++export function useRememberStudioListHref(path: StudioListPath, href: string) {+ const workspaceId = useAtomValue(currentWorkspaceIdAtom)+ const setListHrefs = useSetAtom(listHrefsAtom)++ // Retain this route's destination after it unmounts; filters are always read from the URL.+ useEffect(() => {+ if (!workspaceId) return++ setListHrefs((previous) => {+ if (previous[workspaceId]?.[path] === href) return previous++ return { ...previous, [workspaceId]: { ...previous[workspaceId], [path]: href } }+ })+ }, [href, path, setListHrefs, workspaceId])+}diff --git a/web/features/studio-list-navigation/navigation.tsx b/web/app/components/apps/list-navigation.tsxsimilarity index 67%rename from web/features/studio-list-navigation/navigation.tsxrename to web/app/components/apps/list-navigation.tsxindex ccfc18b84a5..12923549877 100644--- a/web/features/studio-list-navigation/navigation.tsx+++ b/web/app/components/apps/list-navigation.tsx@@ -1,13 +1,11 @@'use client'import type { ComponentProps, ReactNode } from 'react'-import type { StudioListPath } from '.'-import { useAtomValue, useSetAtom } from 'jotai'-import { createContext, use, useEffect } from 'react'-import { currentWorkspaceIdAtom } from '@/context/workspace-state'+import type { StudioListPath } from './list-navigation-state'+import { createContext, use } from 'react'import Link from '@/next/link'import { useRouter } from '@/next/navigation'-import { listHrefsAtom } from '.'+import { useRememberStudioListHref } from './list-navigation-state'type LinkProps = ComponentProps<typeof Link>type NavigationEvent = Parameters<NonNullable<LinkProps['onNavigate']>>[0]@@ -28,21 +26,9 @@ export function StudioListNavigation({flush: () => Promise<URLSearchParams>children: ReactNode}) {- const workspaceId = useAtomValue(currentWorkspaceIdAtom)- const setListHrefs = useSetAtom(listHrefsAtom)+ useRememberStudioListHref(path, href)const router = useRouter()- // Retain this route's destination after it unmounts; filters are always read from the URL.- useEffect(() => {- if (!workspaceId) return-- setListHrefs((previous) => {- if (previous[workspaceId]?.[path] === href) return previous-- return { ...previous, [workspaceId]: { ...previous[workspaceId], [path]: href } }- })- }, [href, path, setListHrefs, workspaceId])-const navigate = (event: NavigationEvent, destination: string, options: NavigationOptions) => {event.preventDefault()// Finish debounced URL writes before creating the detail page's history entry.diff --git a/web/app/components/apps/list.tsx b/web/app/components/apps/list.tsxindex 24f2f064797..32b052748b4 100644--- a/web/app/components/apps/list.tsx+++ b/web/app/components/apps/list.tsx@@ -16,7 +16,6 @@ import { useAtomValue } from 'jotai'import { throttle, useQueryStates } from 'nuqs'import { useCallback, useId, useMemo, useRef, useState } from 'react'import { workspacePermissionKeysAtom } from '@/context/permission-state'-import { StudioListNavigation } from '@/features/studio-list-navigation/navigation'import { CheckResultToast } from '@/hooks/use-pay'import { hasPermission } from '@/utils/permission'import { AppListCatalog } from './app-list-catalog'@@ -25,6 +24,7 @@ import { AppListHeader } from './app-list-header'import { AppListTagManagementModal } from './app-list-tag-management-modal'import { APP_LIST_SEARCH_DEBOUNCE_MS } from './constants'import { useDSLDragDrop } from './hooks/use-dsl-drag-drop'+import { StudioListNavigation } from './list-navigation'import { appListQueryParsers, serializeAppListQuery } from './query-params'type AppListQuery = NonNullable<GetAppsData['query']>diff --git a/web/app/components/apps/starred-app-card.tsx b/web/app/components/apps/starred-app-card.tsxindex 8b98dcc636b..427f6ebc6e3 100644--- a/web/app/components/apps/starred-app-card.tsx+++ b/web/app/components/apps/starred-app-card.tsx@@ -1,6 +1,7 @@'use client'import type { AppPartial } from '@dify/contracts/api/console/apps/types.gen'+import type { AppCardInteractionsProps } from './app-card/interactions'import { cn } from '@langgenius/dify-ui/cn'import { useSuspenseQuery } from '@tanstack/react-query'import { useAtomValue } from 'jotai'@@ -11,21 +12,27 @@ import AppIcon from '@/app/components/base/app-icon'import { toast } from '@/app/notifications'import { workspacePermissionKeysAtom } from '@/context/permission-state'import { userProfileQueryOptions } from '@/features/account-profile/client'-import { StudioListLink } from '@/features/studio-list-navigation/navigation'import { systemFeaturesQueryOptions } from '@/features/system-features/client'import { getRedirectionPath } from '@/utils/app-redirection'import { hasOnlyAppPreviewPermission } from '@/utils/permission'import { formatTime } from '@/utils/time'import { AppCardInteractions } from './app-card/interactions'+import { StudioListLink } from './list-navigation'type StarredAppCardProps = {app: AppPartial+ onDelete: AppCardInteractionsProps['onDelete']stepByStepTourCardTarget?: stringstepByStepTourCardHighlightPart?: string}export const StarredAppCard = memo(- ({ app, stepByStepTourCardTarget, stepByStepTourCardHighlightPart }: StarredAppCardProps) => {+ ({+ app,+ onDelete,+ stepByStepTourCardTarget,+ stepByStepTourCardHighlightPart,+ }: StarredAppCardProps) => {const { t } = useTranslation(['app', 'common', 'time'])const { data: currentUserId } = useSuspenseQuery({...userProfileQueryOptions(),@@ -103,7 +110,7 @@ export const StarredAppCard = memo({cardContent}</button>) : (- <AppCardInteractions app={app}>+ <AppCardInteractions app={app} onDelete={onDelete}><StudioListLinkhref={href}aria-labelledby={appNameId}diff --git a/web/app/components/apps/starred-app-list.tsx b/web/app/components/apps/starred-app-list.tsxindex e76d5ad67fd..c6e3e20d865 100644--- a/web/app/components/apps/starred-app-list.tsx+++ b/web/app/components/apps/starred-app-list.tsx@@ -1,12 +1,14 @@'use client'import type { AppPartial } from '@dify/contracts/api/console/apps/types.gen'+import type { AppCardInteractionsProps } from './app-card/interactions'import { useTranslation } from 'react-i18next'import { APP_LIST_GRID_CLASS_NAME } from './constants'import { StarredAppCard } from './starred-app-card'type StarredAppListProps = {apps: AppPartial[]+ onDelete: AppCardInteractionsProps['onDelete']stepByStepTourCardTarget?: stringstepByStepTourCardHighlightPart?: stringstepByStepTourHighlightedCardCount?: number@@ -29,6 +31,7 @@ export function AppListSectionHeading({ id, label }: { id: string; label: stringexport function StarredAppList({apps,+ onDelete,stepByStepTourCardTarget,stepByStepTourCardHighlightPart,stepByStepTourHighlightedCardCount = 0,@@ -54,6 +57,7 @@ export function StarredAppList({<StarredAppCardkey={app.id}app={app}+ onDelete={onDelete}stepByStepTourCardTarget={index === 0 ? stepByStepTourCardTarget : undefined}stepByStepTourCardHighlightPart={index < stepByStepTourHighlightedCardCountdiff --git a/web/app/components/base/card-list-focus.ts b/web/app/components/base/card-list-focus.tsnew file mode 100644index 00000000000..edb240f2fee--- /dev/null+++ b/web/app/components/base/card-list-focus.ts@@ -0,0 +1,12 @@+// Capture the source section before deletion can unmount its card or the whole list.+export function getAdjacentCardFocusTargets(source: HTMLElement | null): HTMLElement[] {+ const card = source?.closest('li')+ if (!card?.parentElement) return []++ const cards = Array.from(card.parentElement.children)+ const index = cards.indexOf(card)+ return [...cards.slice(index + 1), ...cards.slice(0, index).reverse()].flatMap((sibling) => {+ const target = sibling.querySelector<HTMLElement>(':scope > a[href], :scope > button')+ return target ? [target] : []+ })+}diff --git a/web/app/components/main-nav/__tests__/nav-link.spec.tsx b/web/app/components/main-nav/__tests__/nav-link.spec.tsxindex e65999ed5f2..662120a8bfc 100644--- a/web/app/components/main-nav/__tests__/nav-link.spec.tsx+++ b/web/app/components/main-nav/__tests__/nav-link.spec.tsx@@ -4,7 +4,7 @@ import userEvent from '@testing-library/user-event'import { RouterContext } from 'next/dist/shared/lib/router-context.shared-runtime'import MainNavLink from '../components/nav-link'-vi.mock('@/features/studio-list-navigation', () => ({+vi.mock('@/app/components/apps/list-navigation-state', () => ({useStudioListHref: () => '/apps',}))diff --git a/web/app/components/main-nav/components/nav-link.tsx b/web/app/components/main-nav/components/nav-link.tsxindex f8abfcdc39d..6e717804d65 100644--- a/web/app/components/main-nav/components/nav-link.tsx+++ b/web/app/components/main-nav/components/nav-link.tsx@@ -3,7 +3,7 @@import type { ReactNode } from 'react'import type { MainNavItem } from '../types'import { cn } from '@langgenius/dify-ui/cn'-import { useStudioListHref } from '@/features/studio-list-navigation'+import { useStudioListHref } from '@/app/components/apps/list-navigation-state'import Link from '@/next/link'const NavIcon = ({ icon, className }: { icon: string; className?: string }) => (diff --git a/web/app/components/snippet-list/components/snippet-card.tsx b/web/app/components/snippet-list/components/snippet-card.tsxindex a4dee0f87c0..5c95aac1455 100644--- a/web/app/components/snippet-list/components/snippet-card.tsx+++ b/web/app/components/snippet-list/components/snippet-card.tsx@@ -21,6 +21,7 @@ import { useQuery } from '@tanstack/react-query'import { useAtomValue } from 'jotai'import { useMemo, useState } from 'react'import { useTranslation } from 'react-i18next'+import { StudioListLink } from '@/app/components/apps/list-navigation'import { CreateSnippetDialog } from '@/app/components/snippets/create-snippet-dialog'import {canCreateAndModifySnippets,@@ -28,7 +29,6 @@ import {} from '@/app/components/snippets/utils/permission'import { toast } from '@/app/notifications'import { workspacePermissionKeysAtom } from '@/context/permission-state'-import { StudioListLink } from '@/features/studio-list-navigation/navigation'import { TagSelector } from '@/features/tag-management/components/tag-selector'import { consoleQuery } from '@/service/console'import {diff --git a/web/app/components/snippet-list/index.tsx b/web/app/components/snippet-list/index.tsxindex 9c078e2e861..08a072ad455 100644--- a/web/app/components/snippet-list/index.tsx+++ b/web/app/components/snippet-list/index.tsx@@ -17,11 +17,11 @@ import { useAtomValue } from 'jotai'import dynamic from 'next/dynamic'import { useEffect, useMemo, useRef, useState } from 'react'import { useTranslation } from 'react-i18next'+import { StudioListLink, StudioListNavigation } from '@/app/components/apps/list-navigation'+import { useStudioListHref } from '@/app/components/apps/list-navigation-state'import { SearchInput } from '@/app/components/base/search-input'import { workspacePermissionKeysAtom } from '@/context/permission-state'import { currentWorkspaceLoadingAtom } from '@/context/workspace-state'-import { useStudioListHref } from '@/features/studio-list-navigation'-import { StudioListLink, StudioListNavigation } from '@/features/studio-list-navigation/navigation'import { TagFilter } from '@/features/tag-management/components/tag-filter'import useDocumentTitle from '@/hooks/use-document-title'import { useInfiniteSnippetList } from '@/service/use-snippets'diff --git a/web/app/components/snippets/components/snippet-detail-top.tsx b/web/app/components/snippets/components/snippet-detail-top.tsxindex eabe2701aa7..e6a61986844 100644--- a/web/app/components/snippets/components/snippet-detail-top.tsx+++ b/web/app/components/snippets/components/snippet-detail-top.tsx@@ -13,10 +13,10 @@ import { Kbd, KbdGroup } from '@langgenius/dify-ui/kbd'import { Tooltip, TooltipContent, TooltipTrigger } from '@langgenius/dify-ui/tooltip'import { formatForDisplay } from '@tanstack/react-hotkeys'import { useTranslation } from 'react-i18next'+import { useStudioListHref } from '@/app/components/apps/list-navigation-state'import { DetailSidebarToggleButton } from '@/app/components/detail-sidebar/toggle-button'import { gotoAnythingDialogHandle } from '@/app/components/goto-anything/dialog-handle'import { GOTO_ANYTHING_HOTKEY } from '@/app/components/goto-anything/hotkeys'-import { useStudioListHref } from '@/features/studio-list-navigation'import Link from '@/next/link'import { useRouter } from '@/next/navigation'diff --git a/web/features/agent-v2/__tests__/delete-agent.browser.spec.tsx b/web/features/agent-v2/__tests__/delete-agent.browser.spec.tsxindex fb2a48f4edf..3d98b7033d6 100644--- a/web/features/agent-v2/__tests__/delete-agent.browser.spec.tsx+++ b/web/features/agent-v2/__tests__/delete-agent.browser.spec.tsx@@ -1,19 +1,30 @@-import { QueryClient, QueryClientProvider, useQuery } from '@tanstack/react-query'+import type { AgentAppPartial } from '@dify/contracts/api/console/agent/types.gen'+import type { consoleClient } from '@/service/console'+import { zAgentAppPagination } from '@dify/contracts/api/console/agent/zod.gen'import { createInstance } from 'i18next'+import { NuqsTestingAdapter } from 'nuqs/adapters/testing'import { I18nextProvider } from 'react-i18next'-import { userEvent } from 'vite-plus/test/browser'+import { page, userEvent } from 'vite-plus/test/browser'import { render } from 'vitest-browser-react'import { AgentPermission } from '@/features/agent-v2/acl'import agentRoster from '@/i18n/locales/en-US/agent-roster.json'import common from '@/i18n/locales/en-US/common.json'-import { consoleQuery } from '@/service/console'+import { createConsoleQueryWrapper } from '@/test/console/query-data'+import { QueryClientTestProvider } from '@/test/console/query-provider'import { createDeferred } from '@/test/deferred'import { createAgentFixture } from '@/test/fixtures/agent'-import { AgentRosterList } from '../roster/components/agent-roster-list'+import RosterPage from '../roster/page'-const deleteAgent = vi.hoisted(() => vi.fn())+const api = vi.hoisted(() => ({+ agents: vi.fn<typeof consoleClient.agent.get>(),+ delete: vi.fn<typeof consoleClient.agent.byAgentId.delete>(),+}))vi.mock('react-i18next', async (importOriginal) => importOriginal())-vi.mock('@/features/agent-v2/permissions', () => ({ useCanCreateAgents: () => false }))+vi.mock('@/features/agent-v2/permissions', () => ({+ useCanCreateAgents: () => false,+ useCanImportAgents: () => false,+}))+vi.mock('@/context/i18n', () => ({ useDocLink: () => (path: string) => path }))vi.mock('@/hooks/use-timestamp', () => ({ default: () => ({ formatTime: () => '' }) }))vi.mock('@/app/components/app/use-export-app-dsl', () => ({useExportAppDsl: () => ({ exportAppDsl: vi.fn(), isExporting: false }),@@ -24,43 +35,48 @@ vi.mock('@/service/console', async (importOriginal) => {return {...actual,consoleQuery: withConsoleResponses(actual.consoleQuery, {- 'agent.byAgentId.delete': deleteAgent,+ 'agent.get': api.agents,+ 'agent.byAgentId.delete': api.delete,}),}})-const agent = {+const agent = (id: string, name: string): AgentAppPartial => ({...createAgentFixture({- id: 'agent-1',- name: 'Research Agent',+ id,+ name,permission_keys: [AgentPermission.Delete, AgentPermission.Edit],}),active_config_is_published: false,is_starred: false,published_reference_count: 0,-}-const listOptions = consoleQuery.agent.get.queryOptions({- input: { query: { page: 1, limit: 30 } },- enabled: false,+})+const agentPage = (data: AgentAppPartial[]) =>+ zAgentAppPagination.parse({+ data,+ publication_counts: { drafts: data.length, published: 0 },+ total: data.length,+ has_more: false,+ page: 1,+ limit: 30,+ })+const animationSettings = globalThis as typeof globalThis & { BASE_UI_ANIMATIONS_DISABLED: boolean }+let previousAnimationSetting: boolean+beforeEach(() => {+ previousAnimationSetting = animationSettings.BASE_UI_ANIMATIONS_DISABLED+ animationSettings.BASE_UI_ANIMATIONS_DISABLED = false+})+afterEach(() => {+ animationSettings.BASE_UI_ANIMATIONS_DISABLED = previousAnimationSetting})-function Roster() {- const { data } = useQuery(listOptions)- return (- <AgentRosterList- label="Agents"- state={{- status: 'ready',- agents: data?.data ?? [],- emptyState: 'roster',- footer: { status: 'none' },- isFetching: false,- }}- />- )-}--it('keeps the card action keyboard-accessible after cancel and preserves input focus while deleting', async () => {+async function setup(initialAgents: AgentAppPartial[]) {+ await page.viewport(1024, 768)+ let agents = initialAgents+ api.agents.mockReset().mockImplementation(async () => agentPage(agents))+ api.delete.mockReset().mockImplementation(async ({ params }) => {+ agents = agents.filter(({ id }) => id !== params.agent_id)+ })const i18n = createInstance()await i18n.init({lng: 'en-US',@@ -68,50 +84,162 @@ it('keeps the card action keyboard-accessible after cancel and preserves input fkeySeparator: false,interpolation: { escapeValue: false },})- const queryClient = new QueryClient({ defaultOptions: { queries: { retry: false } } })- queryClient.setQueryData(listOptions.queryKey, {- data: [agent],- publication_counts: { drafts: 1, published: 0 },- total: 1,- has_more: false,- page: 1,- limit: 30,- })+ const { queryClient } = createConsoleQueryWrapper({ systemFeatures: {} })+ const screen = await render(+ <QueryClientTestProvider queryClient={queryClient}>+ <NuqsTestingAdapter>+ <I18nextProvider i18n={i18n}>+ <div className="flex h-screen flex-col">+ <RosterPage />+ </div>+ </I18nextProvider>+ </NuqsTestingAdapter>+ </QueryClientTestProvider>,+ )+ await expect.element(screen.getByRole('list', { name: 'Agent list', exact: true })).toBeVisible()+ const actions = (name: string) => screen.getByRole('button', { name: `More actions for ${name}` })+ const openDelete = async (name: string) => {+ await screen.getByRole('link', { name, exact: true }).hover()+ await actions(name).click()+ await expect.element(screen.getByRole('menu')).toBeVisible()+ const menu = screen.getByRole('menu').element()+ await screen.getByRole('menuitem', { name: 'Delete', exact: true }).click()+ await expect.element(screen.getByRole('alertdialog')).toBeVisible()+ await expect.poll(() => menu.isConnected).toBe(false)+ }+ return { screen, queryClient, openDelete, actions }+}++it('focuses the next agent after deletion and keeps the next canceled action keyboard-operable', async () => {+ const target = agent('target', 'Research Agent')+ const remaining = agent('remaining', 'Writing Agent')+ const { screen, queryClient, openDelete, actions } = await setup([target, remaining])const pending = createDeferred<void>()- deleteAgent.mockReturnValueOnce(pending.promise)+ const deleteAgent = api.delete.getMockImplementation()!+ api.delete.mockImplementationOnce(async (input) => {+ await pending.promise+ return deleteAgent(input)+ })try {- const screen = await render(- <I18nextProvider i18n={i18n}>- <QueryClientProvider client={queryClient}>- <Roster />- </QueryClientProvider>- </I18nextProvider>,- )- const trigger = screen.getByRole('button', { name: 'More actions for Research Agent' })- const link = screen.getByRole('link', { name: 'Research Agent' })- await link.hover()- await trigger.click()- await screen.getByRole('menuitem', { name: 'Delete' }).click()- await expect- .element(screen.getByRole('textbox', { name: 'Type Research Agent to confirm' }))- .toHaveFocus()- await screen.getByRole('button', { name: 'Cancel' }).click()- await expect.element(screen.getByRole('alertdialog')).not.toBeInTheDocument()- await expect.element(trigger).toHaveFocus()- await expect.element(trigger).toBeVisible()- await userEvent.keyboard('{Enter}')- await expect.element(screen.getByRole('menuitem', { name: 'Delete' })).toBeVisible()- await screen.getByRole('menuitem', { name: 'Delete' }).click()- const input = screen.getByRole('textbox', { name: 'Type Research Agent to confirm' })- await expect.element(input).toHaveFocus()+ const deletedCard = screen.getByRole('link', { name: target.name, exact: true }).element()+ await openDelete(target.name)+ const dialog = screen.getByRole('alertdialog').element()+ const input = screen.getByRole('textbox', { name: `Type ${target.name} to confirm` })await screen.getByRole('button', { name: 'Autofill' }).click()await input.click()await userEvent.keyboard('{Enter}')- await expect.poll(() => deleteAgent.mock.calls.length).toBe(1)+ await expect.poll(() => api.delete.mock.calls.length).toBe(1)await expect.element(input).toHaveFocus()pending.resolve()+ await expect.poll(() => deletedCard.isConnected).toBe(false)+ await expect.poll(() => dialog.isConnected).toBe(false)+ await expect+ .element(screen.getByRole('link', { name: remaining.name, exact: true }))+ .toHaveFocus()++ await openDelete(remaining.name)+ const canceledDialog = screen.getByRole('alertdialog').element()+ await screen.getByRole('button', { name: 'Cancel', exact: true }).click()+ await expect.poll(() => canceledDialog.isConnected).toBe(false)+ await expect.element(actions(remaining.name)).toHaveFocus()+ await expect.element(actions(remaining.name)).toBeVisible()+ await userEvent.keyboard('{Enter}')+ await expect.element(screen.getByRole('menu')).toBeVisible()+ expect(api.delete).toHaveBeenCalledExactlyOnceWith({ params: { agent_id: target.id } })+ } finally {+ pending.resolve()+ queryClient.clear()+ }+})++it('focuses the empty roster when its last agent is deleted without an exit transition', async () => {+ const target = agent('target', 'Last Agent')+ const { screen, queryClient, openDelete } = await setup([target])+ const noMotionStyle = document.createElement('style')+ try {+ noMotionStyle.textContent =+ '[role="alertdialog"] { transition: none !important; animation: none !important; }'+ document.head.append(noMotionStyle)+ const deletedCard = screen.getByRole('link', { name: target.name, exact: true }).element()+ await openDelete(target.name)+ const dialog = screen.getByRole('alertdialog').element()+ expect(getComputedStyle(dialog).transitionDuration).toBe('0s')+ await screen.getByRole('button', { name: 'Autofill' }).click()+ await screen.getByRole('button', { name: 'Confirm', exact: true }).click()+ await expect.poll(() => deletedCard.isConnected).toBe(false)+ await expect.poll(() => dialog.isConnected).toBe(false)+ await expect.element(screen.getByRole('region', { name: 'Agents', exact: true })).toHaveFocus()+ } finally {+ noMotionStyle.remove()+ queryClient.clear()+ }+})++it('focuses the next card without moving the roster scroll position', async () => {+ const agents = Array.from({ length: 30 }, (_, index) => agent(`agent-${index}`, `Agent ${index}`))+ const targetName = 'Agent 15'+ const { screen, queryClient, openDelete } = await setup(agents)+ try {+ const viewport = screen.getByRole('region', { name: 'Agents', exact: true }).element()+ await expect.poll(() => viewport.scrollHeight).toBeGreaterThan(viewport.clientHeight)+ viewport.scrollTo({ top: 600 })+ await expect.poll(() => viewport.scrollTop).toBeGreaterThan(0)+ const deletedCard = screen.getByRole('link', { name: targetName, exact: true }).element()+ await openDelete(targetName)+ const scrollTop = viewport.scrollTop+ const dialog = screen.getByRole('alertdialog').element()+ await screen.getByRole('button', { name: 'Autofill' }).click()+ await screen.getByRole('button', { name: 'Confirm', exact: true }).click()+ await expect.poll(() => deletedCard.isConnected).toBe(false)+ await expect.poll(() => dialog.isConnected).toBe(false)+ await expect.element(screen.getByRole('link', { name: 'Agent 16', exact: true })).toHaveFocus()+ expect(viewport.scrollTop).toBe(scrollTop)+ } finally {+ queryClient.clear()+ }+})++it.each([+ { deleted: 1, focused: 2 },+ { deleted: 2, focused: 1 },+])('focuses agent $focused after deleting agent $deleted', async ({ deleted, focused }) => {+ const agents = [agent('a', 'First Agent'), agent('b', 'Middle Agent'), agent('c', 'Last Agent')]+ const { screen, queryClient, openDelete } = await setup(agents)+ try {+ await openDelete(agents[deleted]!.name)+ await screen.getByRole('button', { name: 'Autofill' }).click()+ await screen.getByRole('button', { name: 'Confirm', exact: true }).click()+ await expect.element(screen.getByRole('alertdialog')).not.toBeInTheDocument()+ await expect+ .element(screen.getByRole('link', { name: agents[deleted]!.name }))+ .not.toBeInTheDocument()+ const target = screen.getByRole('link', { name: agents[focused]!.name })+ await expect.element(target).toHaveFocus()+ await expect.element(target).toBeVisible()+ await userEvent.keyboard('{Tab}')+ await expect+ .element(screen.getByRole('button', { name: `More actions for ${agents[focused]!.name}` }))+ .toHaveFocus()+ } finally {+ queryClient.clear()+ }+})++it('focuses the next card primary control when that card has no actions', async () => {+ const target = agent('target', 'Editable Agent')+ const remaining = {+ ...agent('remaining', 'Preview Agent'),+ permission_keys: [AgentPermission.Preview],+ }+ const { screen, queryClient, openDelete } = await setup([target, remaining])+ try {+ await openDelete(target.name)+ await screen.getByRole('button', { name: 'Autofill' }).click()+ await screen.getByRole('button', { name: 'Confirm', exact: true }).click()await expect.element(screen.getByRole('alertdialog')).not.toBeInTheDocument()- await expect.element(link).not.toBeInTheDocument()+ await expect+ .element(screen.getByRole('button', { name: remaining.name, exact: true }))+ .toHaveFocus()} finally {queryClient.clear()}diff --git a/web/features/agent-v2/__tests__/delete-agent.spec.tsx b/web/features/agent-v2/__tests__/delete-agent.spec.tsxindex 6778fc0d6e4..9e5c0c15a46 100644--- a/web/features/agent-v2/__tests__/delete-agent.spec.tsx+++ b/web/features/agent-v2/__tests__/delete-agent.spec.tsx@@ -46,16 +46,19 @@ describe('roster agent deletion', () => {beforeEach(() => {service.deleteAgent.mockReset().mockResolvedValue(undefined)render(- <AgentRosterList- label="Agents"- state={{- status: 'ready',- agents: [agent],- emptyState: 'roster',- footer: { status: 'none' },- isFetching: false,- }}- />,+ <>+ <h1 id="agent-roster-title">Agents</h1>+ <AgentRosterList+ aria-labelledby="agent-roster-title"+ state={{+ status: 'ready',+ agents: [agent],+ emptyState: 'roster',+ footer: { status: 'none' },+ isFetching: false,+ }}+ />+ </>,)})diff --git a/web/features/agent-v2/roster/components/__tests__/agent-roster-list.spec.tsx b/web/features/agent-v2/roster/components/__tests__/agent-roster-list.spec.tsxindex b7a13da9cc9..b342bc78c59 100644--- a/web/features/agent-v2/roster/components/__tests__/agent-roster-list.spec.tsx+++ b/web/features/agent-v2/roster/components/__tests__/agent-roster-list.spec.tsx@@ -67,7 +67,8 @@ const renderState = (state: AgentRosterListState) => {const result = render(<QueryClientProvider client={queryClient}>- <AgentRosterList label="Agent roster list" state={state} />+ <h1 id="agent-roster-title">Agents</h1>+ <AgentRosterList aria-labelledby="agent-roster-title" state={state} /></QueryClientProvider>,)@@ -113,7 +114,8 @@ describe('AgentRosterList', () => {it('exposes each agent card with its name, draft status, and description', () => {renderList([createAgent()])- const list = screen.getByRole('list')+ const list = screen.getByRole('list', { name: 'agentRoster.roster.listLabel' })+ expect(screen.getByRole('region', { name: 'Agents' })).toContainElement(list)const card = within(list).getByRole('listitem', { name: 'Research Agent' })const cardLink = within(card).getByRole('link', { name: 'Research Agent' })diff --git a/web/features/agent-v2/roster/components/agent-roster-list.tsx b/web/features/agent-v2/roster/components/agent-roster-list.tsxindex 799d25619e1..fcf183d1c49 100644--- a/web/features/agent-v2/roster/components/agent-roster-list.tsx+++ b/web/features/agent-v2/roster/components/agent-roster-list.tsx@@ -1,6 +1,8 @@'use client'import type { AgentAppPartial } from '@dify/contracts/api/console/agent/types.gen'+import type { ScrollAreaViewportProps } from '@langgenius/dify-ui/scroll-area'+import type { RefObject } from 'react'import {AlertDialog,AlertDialogContent,@@ -23,11 +25,19 @@ import {DropdownMenuTrigger,} from '@langgenius/dify-ui/dropdown-menu'import { IconButton } from '@langgenius/dify-ui/icon-button'+import {+ ScrollArea,+ ScrollAreaContent,+ ScrollAreaScrollbar,+ ScrollAreaThumb,+ ScrollAreaViewport,+} from '@langgenius/dify-ui/scroll-area'import { useMutation } from '@tanstack/react-query'-import { useId, useState } from 'react'+import { useId, useRef, useState } from 'react'import { useTranslation } from 'react-i18next'import { useExportAppDsl } from '@/app/components/app/use-export-app-dsl'import AppIcon from '@/app/components/base/app-icon'+import { getAdjacentCardFocusTargets } from '@/app/components/base/card-list-focus'import { SkeletonRectangle } from '@/app/components/base/skeleton'import { MAIN_NAV_APP_CARD_GRID_CLASS_NAME } from '@/app/components/main-nav/app-card-grid'import { toast } from '@/app/notifications'@@ -58,8 +68,12 @@ export type AgentRosterListState =}type AgentRosterListProps = {- label: stringstate: AgentRosterListState+} & Pick<ScrollAreaViewportProps, 'aria-labelledby'>++type DeleteAgentDialogPayload = Pick<AgentAppPartial, 'id' | 'name'> & {+ fallbackFocus: RefObject<HTMLElement | null>+ adjacentFocusTargets: HTMLElement[]}const skeletonCardIds = Array.from(@@ -219,11 +233,12 @@ function AgentRosterItem({onDelete,}: {agent: AgentAppPartial- onDelete: (agent: AgentAppPartial) => void+ onDelete: (agent: AgentAppPartial, trigger: HTMLButtonElement | null) => void}) {const { t } = useTranslation(['agentRoster'])const { t: tApp } = useTranslation(['app'])const { formatTime } = useTimestamp()+ const moreButtonRef = useRef<HTMLButtonElement>(null)const nameId = useId()const descriptionId = useId()const draftStatusId = useId()@@ -365,7 +380,9 @@ function AgentRosterItem({onEdit={capabilities.canEdit ? handleEditOpen : undefined}onDuplicate={canDuplicate ? handleDuplicateOpen : undefined}onExport={capabilities.canImportExportDSL ? handleExport : undefined}- onDelete={capabilities.canDelete ? () => onDelete(agent) : undefined}+ onDelete={+ capabilities.canDelete ? () => onDelete(agent, moreButtonRef.current) : undefined+ }/></ContextMenuContent>)}@@ -375,6 +392,7 @@ function AgentRosterItem({<div className="pointer-events-none flex items-center overflow-hidden rounded-[10px] border-[0.5px] border-components-actionbar-border bg-components-actionbar-bg p-0.5 shadow-lg backdrop-blur-xs group-focus-within:pointer-events-auto group-hover:pointer-events-auto has-data-popup-open:pointer-events-auto [@media(hover:none)]:pointer-events-auto"><DropdownMenu modal={false}><DropdownMenuTrigger+ ref={moreButtonRef}render={<IconButtonaria-label={t(($) => $['roster.moreActions'], {@@ -395,7 +413,11 @@ function AgentRosterItem({onEdit={capabilities.canEdit ? handleEditOpen : undefined}onDuplicate={canDuplicate ? handleDuplicateOpen : undefined}onExport={capabilities.canImportExportDSL ? handleExport : undefined}- onDelete={capabilities.canDelete ? () => onDelete(agent) : undefined}+ onDelete={+ capabilities.canDelete+ ? () => onDelete(agent, moreButtonRef.current)+ : undefined+ }/></DropdownMenuContent></DropdownMenu>@@ -451,72 +473,104 @@ function AgentRosterItem({)}-export function AgentRosterList({ label, state }: AgentRosterListProps) {+export function AgentRosterList({+ state,+ 'aria-labelledby': ariaLabelledBy,+}: AgentRosterListProps) {const { t } = useTranslation(['agentRoster'])const { t: tCommon } = useTranslation(['common'])const isBusy = state.status === 'pending' || (state.status === 'ready' && state.isFetching)- const [deleteDialog] = useState(() =>- createAlertDialogHandle<Pick<AgentAppPartial, 'id' | 'name'>>(),- )+ const [deleteDialog] = useState(() => createAlertDialogHandle<DeleteAgentDialogPayload>())+ const scrollViewportRef = useRef<HTMLDivElement>(null)const deletion = useMutation(consoleQuery.agent.byAgentId.delete.mutationOptions({ context: { silent: true } }),)return (- <section aria-label={label} aria-busy={isBusy}>- {state.status === 'pending' && (- <div className={AGENT_ROSTER_GRID_CLASS_NAME}>- <AgentRosterSkeleton />- </div>- )}- {state.status === 'error' && (- <AgentRosterPlaceholderState- onRetry={state.onRetry}- role="alert"- title={t(($) => $['roster.loadingError'], { ns: 'agentRoster' })}- />- )}- {state.status === 'ready' && state.agents.length === 0 && (- <AgentRosterPlaceholderState- role={state.emptyState === 'filtered' ? 'status' : undefined}- title={- state.emptyState === 'filtered'- ? t(($) => $['roster.emptySearch'], { ns: 'agentRoster' })- : t(($) => $['roster.empty'], { ns: 'agentRoster' })- }- />- )}- {state.status === 'ready' && state.agents.length > 0 && (- // Safari list semantics: https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/list-style#accessibility- // oxlint-disable-next-line jsx-a11y/no-redundant-roles -- Dify's preflight removes list markers.- <ul role="list" className={AGENT_ROSTER_GRID_CLASS_NAME}>- {state.agents.map((agent) => (- <AgentRosterItem- key={agent.id}- agent={agent}- onDelete={(target) => deleteDialog.openWithPayload(target)}- />- ))}- </ul>- )}- {state.status === 'ready' && state.footer.status === 'error' && (- <div- className="flex items-center justify-center gap-3 pt-1 system-xs-regular text-text-destructive"- role="alert"+ <>+ <ScrollArea className="h-full min-h-0 min-w-0 overflow-hidden">+ <ScrollAreaViewport+ ref={scrollViewportRef}+ role="region"+ aria-labelledby={ariaLabelledBy}+ aria-busy={isBusy}+ className="overscroll-contain"+ style={{ overflowX: 'hidden' }}>- <span>{t(($) => $['roster.loadingError'], { ns: 'agentRoster' })}</span>- <Button size="small" variant="secondary" onClick={state.footer.onRetry}>- {tCommon(($) => $['operation.retry'])}- </Button>- </div>- )}- {state.status === 'ready' && state.footer.status === 'load-more' && (- <div className="flex justify-center pt-1">- <Button loading={state.footer.isLoading} onClick={state.footer.onLoadMore}>- {t(($) => $['roster.loadMore'], { ns: 'agentRoster' })}- </Button>- </div>- )}+ <ScrollAreaContent+ className="min-h-full w-full max-w-full px-2 pt-2 pb-8 sm:px-8"+ style={{ minWidth: 0 }}+ >+ {state.status === 'pending' && (+ <div className={AGENT_ROSTER_GRID_CLASS_NAME}>+ <AgentRosterSkeleton />+ </div>+ )}+ {state.status === 'error' && (+ <AgentRosterPlaceholderState+ onRetry={state.onRetry}+ role="alert"+ title={t(($) => $['roster.loadingError'], { ns: 'agentRoster' })}+ />+ )}+ {state.status === 'ready' && state.agents.length === 0 && (+ <AgentRosterPlaceholderState+ role={state.emptyState === 'filtered' ? 'status' : undefined}+ title={+ state.emptyState === 'filtered'+ ? t(($) => $['roster.emptySearch'], { ns: 'agentRoster' })+ : t(($) => $['roster.empty'], { ns: 'agentRoster' })+ }+ />+ )}+ {state.status === 'ready' && state.agents.length > 0 && (+ <ul+ // Safari list semantics: https://developer.mozilla.org/en-US/docs/Web/CSS/Reference/Properties/list-style#accessibility+ // oxlint-disable-next-line jsx-a11y/no-redundant-roles -- Dify's preflight removes list markers.+ role="list"+ aria-label={t(($) => $['roster.listLabel'])}+ className={AGENT_ROSTER_GRID_CLASS_NAME}+ >+ {state.agents.map((agent) => (+ <AgentRosterItem+ key={agent.id}+ agent={agent}+ onDelete={(target, trigger) => {+ deleteDialog.openWithPayload({+ id: target.id,+ name: target.name,+ adjacentFocusTargets: getAdjacentCardFocusTargets(trigger),+ fallbackFocus: { current: null },+ })+ }}+ />+ ))}+ </ul>+ )}+ {state.status === 'ready' && state.footer.status === 'error' && (+ <div+ className="flex items-center justify-center gap-3 pt-1 system-xs-regular text-text-destructive"+ role="alert"+ >+ <span>{t(($) => $['roster.loadingError'], { ns: 'agentRoster' })}</span>+ <Button size="small" variant="secondary" onClick={state.footer.onRetry}>+ {tCommon(($) => $['operation.retry'])}+ </Button>+ </div>+ )}+ {state.status === 'ready' && state.footer.status === 'load-more' && (+ <div className="flex justify-center pt-1">+ <Button loading={state.footer.isLoading} onClick={state.footer.onLoadMore}>+ {t(($) => $['roster.loadMore'], { ns: 'agentRoster' })}+ </Button>+ </div>+ )}+ </ScrollAreaContent>+ </ScrollAreaViewport>+ <ScrollAreaScrollbar>+ <ScrollAreaThumb />+ </ScrollAreaScrollbar>+ </ScrollArea><AlertDialoghandle={deleteDialog}onOpenChange={(open, details) => {@@ -528,7 +582,16 @@ export function AgentRosterList({ label, state }: AgentRosterListProps) {}}>{({ payload }) => (- <AlertDialogContent>+ <AlertDialogContent+ finalFocus={() => {+ const fallback = payload?.fallbackFocus.current+ if (!fallback) return true+ const target =+ payload.adjacentFocusTargets.find((element) => element.isConnected) ?? fallback+ target.focus({ preventScroll: true })+ return false+ }}+ >{payload && (<DeleteAgentFormagentName={payload.name}@@ -538,7 +601,12 @@ export function AgentRosterList({ label, state }: AgentRosterListProps) {if (deletion.isPending) returndeletion.mutate({ params: { agent_id: payload.id } },- { onSuccess: () => deleteDialog.close() },+ {+ onSuccess: () => {+ payload.fallbackFocus.current = scrollViewportRef.current+ deleteDialog.close()+ },+ },)}}/>@@ -546,6 +614,6 @@ export function AgentRosterList({ label, state }: AgentRosterListProps) {</AlertDialogContent>)}</AlertDialog>- </section>+ </>)}diff --git a/web/features/agent-v2/roster/page.tsx b/web/features/agent-v2/roster/page.tsxindex 1f446c55700..3e8382f25cf 100644--- a/web/features/agent-v2/roster/page.tsx+++ b/web/features/agent-v2/roster/page.tsx@@ -2,13 +2,6 @@import type { AgentPublicationCountsResponse } from '@dify/contracts/api/console/agent/types.gen'import type { AgentRosterListState } from './components/agent-roster-list'-import {- ScrollArea,- ScrollAreaContent,- ScrollAreaScrollbar,- ScrollAreaThumb,- ScrollAreaViewport,-} from '@langgenius/dify-ui/scroll-area'import { keepPreviousData, useInfiniteQuery } from '@tanstack/react-query'import { useDebounce } from 'ahooks'import { useQueryState } from 'nuqs'@@ -138,27 +131,7 @@ export default function RosterPage() {</div><div className="min-h-0 flex-1 max-md:min-h-64">- <ScrollArea className="h-full min-h-0 min-w-0 overflow-hidden">- <ScrollAreaViewport- role="region"- aria-labelledby={pageTitleId}- className="overscroll-contain"- style={{ overflowX: 'hidden' }}- >- <ScrollAreaContent- className="min-h-full w-full max-w-full px-2 pt-2 pb-8 sm:px-8"- style={{ minWidth: 0 }}- >- <AgentRosterList- label={t(($) => $['roster.listLabel'], { ns: 'agentRoster' })}- state={listState}- />- </ScrollAreaContent>- </ScrollAreaViewport>- <ScrollAreaScrollbar>- <ScrollAreaThumb />- </ScrollAreaScrollbar>- </ScrollArea>+ <AgentRosterList aria-labelledby={pageTitleId} state={listState} /></div></div>)diff --git a/web/features/studio-list-navigation/index.ts b/web/features/studio-list-navigation/index.tsdeleted file mode 100644index a1d0a41c255..00000000000--- a/web/features/studio-list-navigation/index.ts+++ /dev/null@@ -1,18 +0,0 @@-'use client'--import { atom, useAtomValue } from 'jotai'-import { currentWorkspaceIdAtom } from '@/context/workspace-state'--export type StudioListPath = '/apps' | '/snippets'--export const listHrefsAtom = atom<Record<string, Partial<Record<StudioListPath, string>>>>({})-const appListHrefAtom = atom(- (get) => get(listHrefsAtom)[get(currentWorkspaceIdAtom)]?.['/apps'] ?? '/apps',-)-const snippetListHrefAtom = atom(- (get) => get(listHrefsAtom)[get(currentWorkspaceIdAtom)]?.['/snippets'] ?? '/snippets',-)--export function useStudioListHref(path: StudioListPath) {- return useAtomValue(path === '/apps' ? appListHrefAtom : snippetListHrefAtom)-}