From 4edc52818dac2b14c8a2f946a1c6ddf325f368d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Almeida?= <57680069+zeval@users.noreply.github.com> Date: Sat, 22 Aug 2026 22:46:41 +0000 Subject: [PATCH] feat(web): add local layout deletion confirmations (#2890) --- .../confirmation/action-confirm-popover.tsx | 6 + .../layout-profile-delete-confirmation.tsx | 107 ++++ .../settings/layouts/layout-settings.test.tsx | 162 ++++++ .../settings/layouts/layout-settings.tsx | 126 ++--- .../task/layout-preset-selector.test.tsx | 287 +++++++++++ .../task/layout-preset-selector.tsx | 487 +++++++++++------- .../task/mobile/session-mobile-top-bar.tsx | 2 + .../task/saved-layout-delete-confirmation.tsx | 51 ++ .../task/use-saved-layout-mutations.ts | 47 ++ .../mobile-saved-layout-confirmation.spec.ts | 109 ++++ .../saved-layout-session-isolation.spec.ts | 49 +- .../tests/settings/layout-profiles.spec.ts | 47 +- .../settings/mobile-layout-profiles.spec.ts | 65 +++ 13 files changed, 1272 insertions(+), 273 deletions(-) create mode 100644 apps/web/components/settings/layouts/layout-profile-delete-confirmation.tsx create mode 100644 apps/web/components/settings/layouts/layout-settings.test.tsx create mode 100644 apps/web/components/task/layout-preset-selector.test.tsx create mode 100644 apps/web/components/task/saved-layout-delete-confirmation.tsx create mode 100644 apps/web/components/task/use-saved-layout-mutations.ts create mode 100644 apps/web/e2e/tests/layout/mobile-saved-layout-confirmation.spec.ts diff --git a/apps/web/components/confirmation/action-confirm-popover.tsx b/apps/web/components/confirmation/action-confirm-popover.tsx index f176866e54..8b4c1e2522 100644 --- a/apps/web/components/confirmation/action-confirm-popover.tsx +++ b/apps/web/components/confirmation/action-confirm-popover.tsx @@ -24,6 +24,7 @@ export type ActionConfirmPopoverProps = { confirmTestId?: string; confirmDisabled?: boolean; testId?: string; + confirmationBoundary?: boolean; onOpenChange: (open: boolean) => void; onCancel?: () => void; onConfirm: () => void | Promise; @@ -49,6 +50,7 @@ export function ActionConfirmPopover({ confirmTestId, confirmDisabled = false, testId = "action-confirm-popover", + confirmationBoundary = false, onOpenChange, onCancel, onConfirm, @@ -111,6 +113,7 @@ export function ActionConfirmPopover({ confirmTestId={confirmTestId} confirmDisabled={confirmIsDisabled} testId={testId} + confirmationBoundary={confirmationBoundary} disabled={disabled} cancelRef={cancelRef} focusBoundaryRef={focusBoundaryRef} @@ -134,6 +137,7 @@ type ActionConfirmPopoverContentProps = { confirmTestId?: string; confirmDisabled: boolean; testId: string; + confirmationBoundary: boolean; disabled: boolean; cancelRef: RefObject; focusBoundaryRef?: RefObject; @@ -154,6 +158,7 @@ function ActionConfirmPopoverContent({ confirmTestId, confirmDisabled, testId, + confirmationBoundary, disabled, cancelRef, focusBoundaryRef, @@ -168,6 +173,7 @@ function ActionConfirmPopoverContent({ aria-labelledby={titleId} aria-describedby={description ? descriptionId : undefined} data-testid={testId} + data-confirmation-boundary={confirmationBoundary ? "" : undefined} side="bottom" align="end" sideOffset={8} diff --git a/apps/web/components/settings/layouts/layout-profile-delete-confirmation.tsx b/apps/web/components/settings/layouts/layout-profile-delete-confirmation.tsx new file mode 100644 index 0000000000..37f9936880 --- /dev/null +++ b/apps/web/components/settings/layouts/layout-profile-delete-confirmation.tsx @@ -0,0 +1,107 @@ +"use client"; + +import type { RefObject } from "react"; +import { IconTrash } from "@tabler/icons-react"; +import { Button } from "@kandev/ui/button"; +import { Tooltip, TooltipContent, TooltipTrigger } from "@kandev/ui/tooltip"; +import { useTranslation } from "react-i18next"; + +import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover"; +import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions"; +import type { SavedLayout } from "@/lib/types/http"; + +type LayoutProfileDeleteConfirmationProps = { + profile: SavedLayout; + isFinePointer: boolean; + open: boolean; + anchorRef: RefObject; + onOpenChange: (open: boolean) => void; + onConfirm: () => void | Promise; +}; + +export function LayoutProfileDeleteConfirmation({ + profile, + isFinePointer, + open, + anchorRef, + onOpenChange, + onConfirm, +}: LayoutProfileDeleteConfirmationProps) { + const { t } = useTranslation(); + const title = t("settings:deleteLayoutProfileNamed", { name: profile.name }); + const description = profile.is_default + ? t("settings:theBuiltInDefaultLayoutWill") + : t("settings:thisProfileWillBeRemovedWhen"); + const cancelInlineDelete = () => { + onOpenChange(false); + queueMicrotask(() => anchorRef.current?.focus()); + }; + + if (!isFinePointer) { + if (!open) + return onOpenChange(true)} />; + return ( + onOpenChange(false)} + onConfirm={onConfirm} + /> + ); + } + + return ( + <> + onOpenChange(true)} /> + + + ); +} + +function DeleteProfileButton({ + anchorRef, + onClick, +}: { + anchorRef: RefObject; + onClick: () => void; +}) { + const { t } = useTranslation(); + return ( + + + + + {t("settings:deleteThisCustomLayoutAfterConfirmation")} + + ); +} diff --git a/apps/web/components/settings/layouts/layout-settings.test.tsx b/apps/web/components/settings/layouts/layout-settings.test.tsx new file mode 100644 index 0000000000..68ede42309 --- /dev/null +++ b/apps/web/components/settings/layouts/layout-settings.test.tsx @@ -0,0 +1,162 @@ +import { cleanup, fireEvent, render, screen, waitFor, within } from "@testing-library/react"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; + +const mocks = vi.hoisted(() => ({ + finePointer: true, + useLayoutSettings: vi.fn(), + deleteSelected: vi.fn(), +})); + +vi.mock("react-i18next", () => ({ + useTranslation: () => ({ + t: (key: string, values?: { name?: string }) => (values?.name ? `${key}:${values.name}` : key), + }), +})); + +vi.mock("@/hooks/use-responsive-breakpoint", () => ({ + useResponsiveBreakpoint: () => ({ isFinePointer: mocks.finePointer }), +})); + +vi.mock("@/components/settings/settings-save-provider", () => ({ + useSettingsSaveContributor: vi.fn(), +})); + +vi.mock("@/components/settings/settings-target", () => ({ + SettingsTarget: ({ children, ...props }: { children: React.ReactNode }) => ( +
{children}
+ ), +})); + +vi.mock("./layout-editor", () => ({ + LayoutEditor: () =>
, +})); + +vi.mock("./layout-profile-list", () => ({ + LayoutProfileList: () =>
, +})); + +vi.mock("@kandev/ui/tooltip", () => ({ + Tooltip: ({ children }: { children: React.ReactNode }) => <>{children}, + TooltipTrigger: ({ children }: { children: React.ReactNode }) => <>{children}, + TooltipContent: ({ children }: { children: React.ReactNode }) => <>{children}, +})); + +vi.mock("./use-layout-settings", () => ({ + useLayoutSettings: () => mocks.useLayoutSettings(), +})); + +import { LayoutSettings } from "./layout-settings"; + +const DELETE_PROFILE_TEST_ID = "layout-profile-delete"; + +function controller() { + const selectedCustom = { + id: "custom-layout", + name: "Custom layout", + is_default: false, + layout: {}, + created_at: "2026-08-20T00:00:00.000Z", + }; + return { + profiles: [selectedCustom], + selection: { kind: "custom" as const, id: selectedCustom.id }, + selectedCustom, + selectedBuiltIn: null, + selectedBuiltInOverride: null, + compatibility: { status: "editable" as const, profile: selectedCustom, layout: {}, issues: [] }, + editorLayout: {}, + selectedName: selectedCustom.name, + selectedIsDefault: false, + selectedSavedDefault: false, + defaultActionDisabled: false, + defaultActionLabel: "Use as default", + editorReset: 0, + isDirty: false, + profilesKey: "profiles", + error: null, + save: vi.fn(), + cancel: vi.fn(), + create: vi.fn(), + duplicate: vi.fn(), + setSelection: vi.fn(), + updateSelected: vi.fn(), + updateLayout: vi.fn(), + setDefault: vi.fn(), + resetBuiltIn: vi.fn(), + deleteSelected: mocks.deleteSelected, + }; +} + +beforeEach(() => { + mocks.finePointer = true; + mocks.deleteSelected.mockReset(); + mocks.useLayoutSettings.mockReturnValue(controller()); +}); + +afterEach(cleanup); + +describe("LayoutSettings deletion confirmation", () => { + it("anchors confirmation to the selected profile action on fine pointers", async () => { + render(); + + const trigger = screen.getByTestId(DELETE_PROFILE_TEST_ID); + fireEvent.click(trigger); + + const popover = screen.getByTestId("layout-profile-delete-confirm-popover"); + expect(screen.queryByRole("alertdialog")).toBeNull(); + + fireEvent.click(within(popover).getByRole("button", { name: "settings:cancel" })); + expect(mocks.deleteSelected).not.toHaveBeenCalled(); + await waitFor(() => expect(document.activeElement).toBe(trigger)); + + fireEvent.click(trigger); + fireEvent.click( + within(screen.getByTestId("layout-profile-delete-confirm-popover")).getByTestId( + "layout-profile-delete-confirm", + ), + ); + await waitFor(() => expect(mocks.deleteSelected).toHaveBeenCalledTimes(1)); + }); + + it("morphs into touch-sized inline actions on coarse pointers", async () => { + mocks.finePointer = false; + render(); + + fireEvent.click(screen.getByTestId(DELETE_PROFILE_TEST_ID)); + + const inline = screen.getByTestId("layout-profile-delete-inline-confirmation"); + expect(screen.queryByTestId("layout-profile-delete-confirm-popover")).toBeNull(); + expect(within(inline).getByRole("button", { name: "settings:cancel" })).toBeTruthy(); + expect(within(inline).getByTestId("layout-profile-delete-confirm").className).toContain( + "min-w-11", + ); + + fireEvent.click(within(inline).getByRole("button", { name: "settings:cancel" })); + expect(mocks.deleteSelected).not.toHaveBeenCalled(); + await waitFor(() => + expect(document.activeElement).toBe(screen.getByTestId(DELETE_PROFILE_TEST_ID)), + ); + + fireEvent.click(screen.getByTestId(DELETE_PROFILE_TEST_ID)); + fireEvent.click( + within(screen.getByTestId("layout-profile-delete-inline-confirmation")).getByTestId( + "layout-profile-delete-confirm", + ), + ); + await waitFor(() => expect(mocks.deleteSelected).toHaveBeenCalledTimes(1)); + }); + + it("does not expose deletion for built-in profiles", () => { + mocks.useLayoutSettings.mockReturnValue({ + ...controller(), + selectedCustom: null, + selection: { kind: "built-in", id: "default" }, + selectedName: "Default", + }); + + render(); + + expect(screen.queryByTestId(DELETE_PROFILE_TEST_ID)).toBeNull(); + expect(screen.queryByRole("alertdialog")).toBeNull(); + }); +}); diff --git a/apps/web/components/settings/layouts/layout-settings.tsx b/apps/web/components/settings/layouts/layout-settings.tsx index 5e8974394d..0bda03cd6e 100644 --- a/apps/web/components/settings/layouts/layout-settings.tsx +++ b/apps/web/components/settings/layouts/layout-settings.tsx @@ -1,31 +1,18 @@ "use client"; -import { useState } from "react"; -import { - IconAlertTriangle, - IconLayoutDashboard, - IconRestore, - IconTrash, -} from "@tabler/icons-react"; +import { useEffect, useRef, useState, type ReactNode } from "react"; +import { IconAlertTriangle, IconLayoutDashboard, IconRestore } from "@tabler/icons-react"; import { Alert, AlertDescription, AlertTitle } from "@kandev/ui/alert"; -import { - AlertDialog, - AlertDialogAction, - AlertDialogCancel, - AlertDialogContent, - AlertDialogDescription, - AlertDialogFooter, - AlertDialogHeader, - AlertDialogTitle, -} from "@kandev/ui/alert-dialog"; import { Button } from "@kandev/ui/button"; import { Badge } from "@kandev/ui/badge"; import { Input } from "@kandev/ui/input"; import { Separator } from "@kandev/ui/separator"; import { Tooltip, TooltipContent, TooltipTrigger } from "@kandev/ui/tooltip"; import { useSettingsSaveContributor } from "@/components/settings/settings-save-provider"; +import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint"; import { LayoutEditor } from "./layout-editor"; import { LayoutProfileList } from "./layout-profile-list"; +import { LayoutProfileDeleteConfirmation } from "./layout-profile-delete-confirmation"; import { useLayoutSettings } from "./use-layout-settings"; import { useTranslation } from "react-i18next"; import { SettingsTarget } from "@/components/settings/settings-target"; @@ -79,33 +66,12 @@ function ResetBuiltInButton({ onClick }: { onClick: () => void }) { ); } -function DeleteProfileButton({ onClick }: { onClick: () => void }) { - const { t } = useTranslation(); - return ( - - - - - {t("settings:deleteThisCustomLayoutAfterConfirmation")} - - ); -} - function SelectedLayoutHeader({ controller, - onDelete, + deleteAction, }: { controller: Controller; - onDelete: () => void; + deleteAction: ReactNode; }) { const { t } = useTranslation(); return ( @@ -151,7 +117,7 @@ function SelectedLayoutHeader({ {controller.selectedBuiltInOverride && ( )} - {controller.selectedCustom && } + {deleteAction}
); @@ -181,51 +147,28 @@ function SelectedLayoutEditor({ controller }: { controller: Controller }) { ); } -function DeleteProfileDialog({ - controller, - open, - onOpenChange, -}: { - controller: Controller; - open: boolean; - onOpenChange: (open: boolean) => void; -}) { - const { t } = useTranslation(); - const confirm = () => { - controller.deleteSelected(); - onOpenChange(false); - }; - return ( - - - - {/* The profile name is user data — interpolated, never translated. */} - - {t("settings:deleteLayoutProfileNamed", { - name: controller.selectedCustom?.name ?? t("settings:layoutProfile"), - })} - - - {controller.selectedCustom?.is_default - ? t("settings:theBuiltInDefaultLayoutWill") - : t("settings:thisProfileWillBeRemovedWhen")} - - - - {t("settings:cancel")} - - {t("settings:delete")} - - - - - ); -} - export function LayoutSettings() { const { t } = useTranslation(); const controller = useLayoutSettings(); - const [deleteOpen, setDeleteOpen] = useState(false); + const { isFinePointer } = useResponsiveBreakpoint(); + const deleteAnchorRef = useRef(null); + const [deleteProfileId, setDeleteProfileId] = useState(null); + const selectedCustomId = controller.selectedCustom?.id ?? null; + const deleteOpen = deleteProfileId !== null && deleteProfileId === selectedCustomId; + + useEffect(() => { + if (deleteProfileId && deleteProfileId !== selectedCustomId) setDeleteProfileId(null); + }, [deleteProfileId, selectedCustomId]); + + const requestDelete = () => { + if (selectedCustomId) setDeleteProfileId(selectedCustomId); + }; + const closeDelete = () => setDeleteProfileId(null); + const confirmDelete = () => { + if (!deleteOpen) return; + closeDelete(); + controller.deleteSelected(); + }; const invalidName = controller.profiles.some((profile) => !profile.name.trim()); useSettingsSaveContributor({ id: "layout-profiles", @@ -262,11 +205,24 @@ export function LayoutSettings() { className="min-w-0 space-y-3" aria-label={t("settings:layoutEditorForProfile", { name: controller.selectedName })} > - setDeleteOpen(true)} /> + (open ? requestDelete() : closeDelete())} + onConfirm={confirmDelete} + /> + ) : null + } + /> - ); } diff --git a/apps/web/components/task/layout-preset-selector.test.tsx b/apps/web/components/task/layout-preset-selector.test.tsx new file mode 100644 index 0000000000..6aeaa73b1e --- /dev/null +++ b/apps/web/components/task/layout-preset-selector.test.tsx @@ -0,0 +1,287 @@ +import { act, cleanup, fireEvent, render, screen, waitFor, within } from "@testing-library/react"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; + +import { getBuiltInLayoutProfile } from "@/lib/layout/layout-profiles"; + +const mocks = vi.hoisted(() => ({ + finePointer: true, + savedLayouts: [] as Array>, + updateUserSettings: vi.fn(), + setUserSettings: vi.fn(), + toastError: vi.fn(), + applyCustomLayout: vi.fn(), + applyBuiltInPreset: vi.fn(), + resetLayout: vi.fn(), + tooltipOpen: false, + requestTooltipOpen: null as ((open: boolean) => void) | null, +})); + +vi.mock("react-i18next", () => ({ + useTranslation: () => ({ + t: (key: string, values?: { name?: string }) => { + if (key === "task:delete2") return `Delete ${values?.name ?? "saved layout"}`; + if (key === "task:deleteLayoutConfirm") return `Delete ${values?.name ?? "saved layout"}?`; + return key; + }, + }), +})); + +vi.mock("@/lib/i18n", () => ({ + t: (key: string) => key, +})); + +vi.mock("@/hooks/use-responsive-breakpoint", () => ({ + useResponsiveBreakpoint: () => ({ isFinePointer: mocks.finePointer }), +})); + +vi.mock("@/lib/toast/sonner", () => ({ + toast: { error: (...args: unknown[]) => mocks.toastError(...args) }, +})); + +vi.mock("@/lib/api/domains/settings-api", () => ({ + updateUserSettings: (...args: unknown[]) => mocks.updateUserSettings(...args), +})); + +vi.mock("@/lib/ssr/user-settings", () => ({ + mapUserSettingsResponse: (response: { settings: { saved_layouts: unknown[] } }) => ({ + savedLayouts: response.settings.saved_layouts, + }), +})); + +vi.mock("@/components/state-provider", () => ({ + useAppStore: (selector: (state: unknown) => unknown) => + selector({ + userSettings: { savedLayouts: mocks.savedLayouts }, + tasks: { activeTaskId: "task-1", activeSessionId: "session-1" }, + setUserSettings: mocks.setUserSettings, + }), + useAppStoreApi: () => ({ + getState: () => ({ + userSettings: { savedLayouts: mocks.savedLayouts }, + setUserSettings: mocks.setUserSettings, + taskSessionsByTask: { itemsByTaskId: { "task-1": [] } }, + }), + }), +})); + +vi.mock("@/lib/state/dockview-store", () => ({ + useDockviewStore: (selector: (state: unknown) => unknown) => + selector({ + applyCustomLayout: mocks.applyCustomLayout, + applyBuiltInPreset: mocks.applyBuiltInPreset, + resetLayout: mocks.resetLayout, + captureCurrentLayout: vi.fn(() => getBuiltInLayoutProfile("default").layout), + }), +})); + +vi.mock("@/hooks/use-task-sessions", () => ({ + useTaskSessions: () => ({ isLoaded: true, loadSessions: vi.fn() }), +})); + +vi.mock("@kandev/ui/tooltip", () => ({ + Tooltip: ({ + children, + open, + onOpenChange, + }: { + children: React.ReactNode; + open?: boolean; + onOpenChange?: (open: boolean) => void; + }) => { + mocks.tooltipOpen = open ?? false; + mocks.requestTooltipOpen = onOpenChange ?? null; + return <>{children}; + }, + TooltipTrigger: ({ children }: { children: React.ReactNode }) => <>{children}, + TooltipContent: ({ children }: { children: React.ReactNode }) => <>{children}, +})); + +import { LayoutPresetSelector } from "./layout-preset-selector"; + +const SAVED_DELETE_TEST_ID = "layout-saved-delete"; +const SAVED_DELETE_POPOVER_TEST_ID = "layout-saved-delete-confirm-popover"; +const SAVED_DELETE_CONFIRM_TEST_ID = "layout-saved-delete-confirm"; + +function savedLayout(overrides: Record = {}) { + return { + id: "saved-layout", + name: "Saved layout", + is_default: false, + layout: getBuiltInLayoutProfile("default").layout, + created_at: "2026-08-20T00:00:00.000Z", + ...overrides, + }; +} + +function openSavedLayouts() { + const trigger = screen.getByTestId("layout-preset-trigger"); + fireEvent.pointerDown(trigger, { button: 0, ctrlKey: false, pointerType: "mouse" }); + fireEvent.pointerUp(trigger, { button: 0, ctrlKey: false, pointerType: "mouse" }); + fireEvent.click(trigger); + return waitFor(() => + expect(screen.getAllByTestId(SAVED_DELETE_TEST_ID).length).toBeGreaterThan(0), + ); +} + +function deleteAction(layoutId: string) { + const action = screen + .getAllByTestId(SAVED_DELETE_TEST_ID) + .find((candidate) => candidate.getAttribute("data-layout-id") === layoutId); + expect(action).toBeTruthy(); + return action!; +} + +function deferred() { + let resolve!: (value: T) => void; + let reject!: (reason?: unknown) => void; + const promise = new Promise((resolvePromise, rejectPromise) => { + resolve = resolvePromise; + reject = rejectPromise; + }); + return { promise, resolve, reject }; +} + +beforeEach(() => { + mocks.finePointer = true; + mocks.savedLayouts = [savedLayout()]; + mocks.updateUserSettings.mockReset(); + mocks.setUserSettings.mockReset(); + mocks.toastError.mockReset(); + mocks.applyCustomLayout.mockReset(); + mocks.applyBuiltInPreset.mockReset(); + mocks.resetLayout.mockReset(); + mocks.tooltipOpen = false; + mocks.requestTooltipOpen = null; + mocks.setUserSettings.mockImplementation( + (settings: { savedLayouts?: Array> }) => { + if (settings.savedLayouts) mocks.savedLayouts = settings.savedLayouts; + }, + ); + mocks.updateUserSettings.mockResolvedValue({ settings: { saved_layouts: [] } }); +}); + +afterEach(() => { + cleanup(); + vi.restoreAllMocks(); +}); + +describe("LayoutPresetSelector saved-layout deletion", () => { + it("anchors desktop confirmation to the menu action and keeps cancel local", async () => { + render(); + await openSavedLayouts(); + + fireEvent.click(screen.getByTestId(SAVED_DELETE_TEST_ID)); + + const popover = screen.getByTestId(SAVED_DELETE_POPOVER_TEST_ID); + expect(popover).toBeTruthy(); + expect(popover.hasAttribute("data-confirmation-boundary")).toBe(true); + expect(screen.queryByRole("alertdialog")).toBeNull(); + + fireEvent.click( + within(screen.getByTestId(SAVED_DELETE_POPOVER_TEST_ID)).getByRole("button", { + name: "common:cancel", + }), + ); + expect(mocks.updateUserSettings).not.toHaveBeenCalled(); + }); + it("morphs the menu row into touch-sized actions without stacking an overlay", async () => { + mocks.finePointer = false; + render(); + await openSavedLayouts(); + + fireEvent.click(screen.getByTestId(SAVED_DELETE_TEST_ID)); + + const inline = screen.getByTestId("layout-saved-delete-inline-confirmation"); + expect(screen.queryByTestId(SAVED_DELETE_POPOVER_TEST_ID)).toBeNull(); + expect(screen.queryByRole("alertdialog")).toBeNull(); + expect(within(inline).getByTestId("layout-saved-delete-confirm").className).toContain( + "min-w-11", + ); + + fireEvent.click(within(inline).getByTestId(SAVED_DELETE_CONFIRM_TEST_ID)); + await waitFor(() => + expect(mocks.updateUserSettings).toHaveBeenCalledWith({ saved_layouts: [] }), + ); + }); + + it("limits the mobile menu to saved-layout management", async () => { + mocks.finePointer = false; + render(); + await openSavedLayouts(); + + expect(screen.getByTestId(SAVED_DELETE_TEST_ID)).toBeTruthy(); + expect(screen.queryByTestId("layout-reset-item")).toBeNull(); + expect(screen.queryAllByTestId("layout-preset-item")).toHaveLength(0); + expect(screen.queryByText("task:saveCurrentLayout2")).toBeNull(); + }); +}); + +describe("LayoutPresetSelector saved-layout persistence", () => { + it("serializes deletions and derives each payload from the latest saved layouts", async () => { + const first = savedLayout({ id: "first-layout", name: "First layout" }); + const second = savedLayout({ id: "second-layout", name: "Second layout" }); + const retained = savedLayout({ id: "retained-layout", name: "Retained layout" }); + mocks.savedLayouts = [first, second, retained]; + const firstResponse = deferred<{ + settings: { saved_layouts: Array> }; + }>(); + const secondResponse = deferred<{ + settings: { saved_layouts: Array> }; + }>(); + mocks.updateUserSettings + .mockReturnValueOnce(firstResponse.promise) + .mockReturnValueOnce(secondResponse.promise); + + render(); + await openSavedLayouts(); + fireEvent.click(deleteAction("first-layout")); + fireEvent.click(screen.getByTestId(SAVED_DELETE_CONFIRM_TEST_ID)); + await waitFor(() => expect(mocks.updateUserSettings).toHaveBeenCalledTimes(1)); + + await openSavedLayouts(); + fireEvent.click(deleteAction("second-layout")); + fireEvent.click(screen.getByTestId(SAVED_DELETE_CONFIRM_TEST_ID)); + expect(mocks.updateUserSettings).toHaveBeenCalledTimes(1); + + firstResponse.resolve({ settings: { saved_layouts: [second, retained] } }); + await waitFor(() => expect(mocks.updateUserSettings).toHaveBeenCalledTimes(2)); + expect(mocks.updateUserSettings).toHaveBeenLastCalledWith({ saved_layouts: [retained] }); + secondResponse.resolve({ settings: { saved_layouts: [retained] } }); + }); + + it("suppresses tooltip reopening after confirmation and clears the close timer on unmount", async () => { + const setTimeoutSpy = vi.spyOn(globalThis, "setTimeout"); + const clearTimeoutSpy = vi.spyOn(globalThis, "clearTimeout"); + const { unmount } = render(); + await openSavedLayouts(); + fireEvent.click(screen.getByTestId(SAVED_DELETE_TEST_ID)); + fireEvent.click(screen.getByTestId(SAVED_DELETE_CONFIRM_TEST_ID)); + await waitFor(() => expect(mocks.updateUserSettings).toHaveBeenCalledTimes(1)); + + const timerCallIndex = setTimeoutSpy.mock.calls.findIndex(([, delay]) => delay === 200); + expect(timerCallIndex).toBeGreaterThanOrEqual(0); + const timerId = setTimeoutSpy.mock.results[timerCallIndex]?.value; + act(() => mocks.requestTooltipOpen?.(true)); + expect(mocks.tooltipOpen).toBe(false); + + unmount(); + expect(clearTimeoutSpy).toHaveBeenCalledWith(timerId); + }); + + it("keeps the existing localized error toast when deletion fails", async () => { + mocks.updateUserSettings.mockRejectedValueOnce(new Error("delete failed")); + render(); + await openSavedLayouts(); + fireEvent.click(screen.getByTestId(SAVED_DELETE_TEST_ID)); + fireEvent.click( + within(screen.getByTestId(SAVED_DELETE_POPOVER_TEST_ID)).getByTestId( + SAVED_DELETE_CONFIRM_TEST_ID, + ), + ); + + await waitFor(() => expect(mocks.toastError).toHaveBeenCalledTimes(1)); + expect(mocks.toastError).toHaveBeenCalledWith("task:failedToDeleteLayout", { + description: "delete failed", + }); + }); +}); diff --git a/apps/web/components/task/layout-preset-selector.tsx b/apps/web/components/task/layout-preset-selector.tsx index b2c4f90c73..e70b453dbf 100644 --- a/apps/web/components/task/layout-preset-selector.tsx +++ b/apps/web/components/task/layout-preset-selector.tsx @@ -1,6 +1,6 @@ "use client"; -import { useCallback, useRef, useState } from "react"; +import { useCallback, useEffect, useRef, useState, type RefObject } from "react"; import { toast } from "@/lib/toast/sonner"; import { IconLayout, @@ -17,16 +17,6 @@ import { Button } from "@kandev/ui/button"; import { Input } from "@kandev/ui/input"; import { Label } from "@kandev/ui/label"; import { Checkbox } from "@kandev/ui/checkbox"; -import { - AlertDialog, - AlertDialogAction, - AlertDialogCancel, - AlertDialogContent, - AlertDialogDescription, - AlertDialogFooter, - AlertDialogHeader, - AlertDialogTitle, -} from "@kandev/ui/alert-dialog"; import { Dialog, DialogContent, @@ -49,20 +39,21 @@ import { Badge } from "@kandev/ui/badge"; import { useDockviewStore } from "@/lib/state/dockview-store"; import { BUILT_IN_LAYOUT_PROFILES, - createLayoutProfile, createLayoutProfileId, - deleteLayoutProfile, getBuiltInLayoutOverride, getLayoutProfileCompatibility, isBuiltInLayoutOverride, type BuiltInLayoutProfileId, + type CreateLayoutProfileInput, } from "@/lib/layout/layout-profiles"; import { useAppStore, useAppStoreApi } from "@/components/state-provider"; -import { updateUserSettings } from "@/lib/api/domains/settings-api"; -import { mapUserSettingsResponse } from "@/lib/ssr/user-settings"; import type { SavedLayout } from "@/lib/types/http"; import { useTaskSessions } from "@/hooks/use-task-sessions"; +import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint"; +import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions"; import { resolveLayoutApplySessionIds } from "./layout-preset-selector-session-ids"; +import { SavedLayoutDeleteConfirmation } from "./saved-layout-delete-confirmation"; +import { useSavedLayoutMutations } from "./use-saved-layout-mutations"; import { useTranslation } from "react-i18next"; import { t } from "@/lib/i18n"; @@ -91,20 +82,24 @@ function mutationError(error: unknown): string { return error instanceof Error ? error.message : t("task:pleaseTryAgain"); } +function isSavedLayoutConfirmationTarget(target: EventTarget | null): boolean { + return target instanceof Element && target.closest("[data-confirmation-boundary]") !== null; +} + function SaveLayoutDialog({ open, onOpenChange, + onSave, }: { open: boolean; onOpenChange: (open: boolean) => void; + onSave: (input: CreateLayoutProfileInput) => Promise; }) { const { t } = useTranslation(); const [name, setName] = useState(""); const [isDefault, setIsDefault] = useState(false); const [saving, setSaving] = useState(false); const captureCurrentLayout = useDockviewStore((s) => s.captureCurrentLayout); - const savedLayouts = useAppStore((s) => s.userSettings.savedLayouts); - const setUserSettings = useAppStore((s) => s.setUserSettings); const handleSave = useCallback(async () => { const trimmed = name.trim(); @@ -112,16 +107,13 @@ function SaveLayoutDialog({ setSaving(true); try { const layout = captureCurrentLayout(); - const response = await updateUserSettings({ - saved_layouts: createLayoutProfile(savedLayouts, { - id: createLayoutProfileId(), - name: trimmed, - isDefault, - layout, - createdAt: new Date().toISOString(), - }), + await onSave({ + id: createLayoutProfileId(), + name: trimmed, + isDefault, + layout, + createdAt: new Date().toISOString(), }); - setUserSettings(mapUserSettingsResponse(response)); setName(""); setIsDefault(false); onOpenChange(false); @@ -130,7 +122,7 @@ function SaveLayoutDialog({ } finally { setSaving(false); } - }, [name, isDefault, captureCurrentLayout, savedLayouts, setUserSettings, onOpenChange]); + }, [name, isDefault, captureCurrentLayout, onOpenChange, onSave, t]); return ( @@ -187,11 +179,23 @@ function SaveLayoutDialog({ function SavedLayoutItems({ layouts, onApply, + isFinePointer, + confirmingDeleteId, onDelete, + onCancelDelete, + onCloseDelete, + onConfirmDelete, + canApply, }: { layouts: SavedLayout[]; onApply: (layout: SavedLayout) => void | Promise; - onDelete: (layout: SavedLayout) => void; + isFinePointer: boolean; + confirmingDeleteId: string | null; + onDelete: (layout: SavedLayout, anchor: HTMLElement) => void; + onCancelDelete: () => void; + onCloseDelete: () => void; + onConfirmDelete: (layoutId: string) => void | Promise; + canApply: boolean; }) { const { t } = useTranslation(); if (layouts.length === 0) { @@ -199,31 +203,76 @@ function SavedLayoutItems({
{t("task:noSavedLayouts")}
); } - return layouts.map((layout) => ( -
- void onApply(layout)} - > - - {layout.name} - {layout.is_default && ( - - {t("common:default")} - + return layouts.map((layout) => { + const isConfirming = !isFinePointer && confirmingDeleteId === layout.id; + if (isConfirming) { + const title = t("task:deleteLayoutConfirm", { name: layout.name }); + const description = layout.is_default + ? t("task:theBuiltInDefaultLayoutWill") + : t("task:thisSavedLayoutWillBePermanently"); + return ( +
+ onConfirmDelete(layout.id)} + /> +
+ ); + } + + return ( +
+ {canApply ? ( + void onApply(layout)} + > + + + ) : ( +
+ +
)} - - onDelete(layout)} - > - - -
- )); + { + event.preventDefault(); + onDelete(layout, event.currentTarget as HTMLElement); + }} + > + + +
+ ); + }); +} + +function SavedLayoutLabel({ layout }: { layout: SavedLayout }) { + const { t } = useTranslation(); + return ( + <> + + {layout.name} + {layout.is_default && ( + + {t("common:default")} + + )} + + ); } /** Built-in preset menu items. Code-defined presets reset widths; customized @@ -299,95 +348,153 @@ function useApplyBuiltInLayout( ); } -function DeleteLayoutDialog({ - layout, - onClose, +type PresetDropdownProps = { + mobile: boolean; + open: boolean; + onOpenChange: (open: boolean) => void; + deleteMenuRef: RefObject; + tooltipOpen: boolean; + onTooltipOpenChange: (open: boolean) => void; + resetLayout: () => void; + savedLayouts: SavedLayout[]; + isFinePointer: boolean; + onApplyCustom: (layout: SavedLayout) => void | Promise; + onApplyBuiltIn: (presetId: BuiltInLayoutProfileId) => void; + confirmingDeleteId: string | null; + onDelete: (layout: SavedLayout, anchor: HTMLElement) => void; + onCancelDelete: () => void; + onCloseDelete: () => void; + onConfirmDelete: (layoutId: string) => void | Promise; + onSaveLayout: () => void; +}; + +function PresetDropdown({ + mobile, + open, + onOpenChange, + deleteMenuRef, + tooltipOpen, + onTooltipOpenChange, + resetLayout, + savedLayouts, + isFinePointer, + onApplyCustom, + onApplyBuiltIn, + confirmingDeleteId, onDelete, -}: { - layout: SavedLayout | null; - onClose: () => void; - onDelete: (layoutId: string) => Promise; -}) { + onCancelDelete, + onCloseDelete, + onConfirmDelete, + onSaveLayout, +}: PresetDropdownProps) { const { t } = useTranslation(); - const [deleting, setDeleting] = useState(false); - const handleDelete = async () => { - if (!layout) return; - setDeleting(true); - try { - await onDelete(layout.id); - onClose(); - } catch (error) { - toast.error(t("task:failedToDeleteLayout"), { description: mutationError(error) }); - } finally { - setDeleting(false); - } - }; return ( - !open && !deleting && onClose()}> - - - - {t("task:deleteLayoutConfirm", { name: layout?.name ?? t("task:savedLayout") })} - - - {layout?.is_default - ? t("task:theBuiltInDefaultLayoutWill") - : t("task:thisSavedLayoutWillBePermanently")} - - - - - {t("common:cancel")} - - { - event.preventDefault(); - void handleDelete(); - }} - > - {deleting ? t("task:deleting") : t("task:delete")} - - - - + + + + + + + + {t("task:layoutPresets")} + + { + if (confirmingDeleteId && isSavedLayoutConfirmationTarget(event.target)) { + event.preventDefault(); + } + }} + onInteractOutside={(event) => { + if (confirmingDeleteId && isSavedLayoutConfirmationTarget(event.target)) { + event.preventDefault(); + } + }} + > + {!mobile && ( + <> + + {t("task:presets")} + + + + + + {t("task:resetLayout")} + + + + )} + + {t("task:savedLayouts")} + !isBuiltInLayoutOverride(layout))} + onApply={onApplyCustom} + isFinePointer={isFinePointer} + confirmingDeleteId={confirmingDeleteId} + onDelete={onDelete} + onCancelDelete={onCancelDelete} + onCloseDelete={onCloseDelete} + onConfirmDelete={onConfirmDelete} + canApply={!mobile} + /> + + {!mobile && ( + <> + + + + {t("task:saveCurrentLayout2")} + + + )} + + ); } -export function LayoutPresetSelector() { - const { t } = useTranslation(); - const [saveDialogOpen, setSaveDialogOpen] = useState(false); +function usePresetDropdownVisibility(onClose: () => void) { const [dropdownOpen, setDropdownOpen] = useState(false); const [tooltipOpen, setTooltipOpen] = useState(false); - const [deleteCandidate, setDeleteCandidate] = useState(null); const recentlyClosedRef = useRef(false); - const resetLayout = useDockviewStore((s) => s.resetLayout); - const savedLayouts = useAppStore((s) => s.userSettings.savedLayouts); - const setUserSettings = useAppStore((s) => s.setUserSettings); - const handleApplyCustom = useApplySavedLayout(); - const handleApplyBuiltIn = useApplyBuiltInLayout(savedLayouts, handleApplyCustom); - - const handleDeleteLayout = useCallback( - async (layoutId: string) => { - const response = await updateUserSettings({ - saved_layouts: deleteLayoutProfile(savedLayouts, layoutId), - }); - setUserSettings(mapUserSettingsResponse(response)); + const recentlyClosedTimerRef = useRef | null>(null); + const handleDropdownOpenChange = useCallback( + (open: boolean) => { + setDropdownOpen(open); + if (!open) { + onClose(); + recentlyClosedRef.current = true; + setTooltipOpen(false); + if (recentlyClosedTimerRef.current !== null) clearTimeout(recentlyClosedTimerRef.current); + recentlyClosedTimerRef.current = setTimeout(() => { + recentlyClosedRef.current = false; + recentlyClosedTimerRef.current = null; + }, 200); + } }, - [savedLayouts, setUserSettings], + [onClose], ); - const handleDropdownOpenChange = useCallback((open: boolean) => { - setDropdownOpen(open); - if (!open) { - recentlyClosedRef.current = true; - setTooltipOpen(false); - setTimeout(() => { - recentlyClosedRef.current = false; - }, 200); - } - }, []); + useEffect( + () => () => { + if (recentlyClosedTimerRef.current !== null) clearTimeout(recentlyClosedTimerRef.current); + }, + [], + ); const handleTooltipOpenChange = useCallback( (open: boolean) => { @@ -397,59 +504,81 @@ export function LayoutPresetSelector() { [dropdownOpen], ); + return { dropdownOpen, tooltipOpen, handleDropdownOpenChange, handleTooltipOpenChange }; +} + +export function LayoutPresetSelector({ mobile = false }: { mobile?: boolean } = {}) { + const { t } = useTranslation(); + const { isFinePointer } = useResponsiveBreakpoint(); + const [saveDialogOpen, setSaveDialogOpen] = useState(false); + const [deleteCandidate, setDeleteCandidate] = useState(null); + const cancelDelete = useCallback(() => setDeleteCandidate(null), []); + const deleteAnchorRef = useRef(null); + const deleteMenuRef = useRef(null); + const resetLayout = useDockviewStore((s) => s.resetLayout); + const savedLayouts = useAppStore((s) => s.userSettings.savedLayouts); + const handleApplyCustom = useApplySavedLayout(); + const handleApplyBuiltIn = useApplyBuiltInLayout(savedLayouts, handleApplyCustom); + const { saveLayout, deleteLayout } = useSavedLayoutMutations(); + const { dropdownOpen, tooltipOpen, handleDropdownOpenChange, handleTooltipOpenChange } = + usePresetDropdownVisibility(cancelDelete); + const beginDelete = useCallback((layout: SavedLayout, anchor: HTMLElement) => { + deleteAnchorRef.current = anchor; + setDeleteCandidate(layout); + }, []); + + const closeDelete = useCallback(() => { + setDeleteCandidate(null); + handleDropdownOpenChange(false); + }, [handleDropdownOpenChange]); + + const confirmDeleteLayout = useCallback( + async (layoutId: string) => { + handleDropdownOpenChange(false); + try { + await deleteLayout(layoutId); + } catch (error) { + toast.error(t("task:failedToDeleteLayout"), { description: mutationError(error) }); + } + }, + [deleteLayout, handleDropdownOpenChange, t], + ); + return ( <> - - - - - - - - {t("task:layoutPresets")} - - - - {t("task:presets")} - - - - - - {t("task:resetLayout")} - - - - {t("task:savedLayouts")} - !isBuiltInLayoutOverride(layout))} - onApply={handleApplyCustom} - onDelete={setDeleteCandidate} - /> - - - setSaveDialogOpen(true)} className="cursor-pointer"> - - {t("task:saveCurrentLayout2")} - - - - - setSaveDialogOpen(true)} + /> + + setDeleteCandidate(null)} - onDelete={handleDeleteLayout} + open={isFinePointer && deleteCandidate !== null} + anchorRef={deleteAnchorRef} + focusBoundaryRef={deleteMenuRef} + onOpenChange={(open) => { + if (!open) cancelDelete(); + }} + onConfirm={confirmDeleteLayout} /> ); diff --git a/apps/web/components/task/mobile/session-mobile-top-bar.tsx b/apps/web/components/task/mobile/session-mobile-top-bar.tsx index 477c05d530..976e7ddacb 100644 --- a/apps/web/components/task/mobile/session-mobile-top-bar.tsx +++ b/apps/web/components/task/mobile/session-mobile-top-bar.tsx @@ -21,6 +21,7 @@ import { useMobileGitActions, } from "./session-mobile-top-bar-git-controls"; import { TaskTopBarPluginActions } from "@/components/task/task-top-bar-plugin-actions"; +import { LayoutPresetSelector } from "@/components/task/layout-preset-selector"; import { MRTopbarButton } from "@/components/gitlab/mr-topbar-button"; import { PortForwardButton } from "@/components/task/port-forward-dialog"; import { linkToTaskOverview } from "@/lib/links"; @@ -424,6 +425,7 @@ function MobileTopBarActions({
{!isArchived && } + {!isArchived && } {!isArchived && ( ; + focusBoundaryRef?: RefObject; + onOpenChange: (open: boolean) => void; + onConfirm: (layoutId: string) => void | Promise; +}; + +export function SavedLayoutDeleteConfirmation({ + layout, + open, + anchorRef, + focusBoundaryRef, + onOpenChange, + onConfirm, +}: SavedLayoutDeleteConfirmationProps) { + const { t } = useTranslation(); + if (!layout) return null; + + const title = t("task:deleteLayoutConfirm", { name: layout.name }); + const description = layout.is_default + ? t("task:theBuiltInDefaultLayoutWill") + : t("task:thisSavedLayoutWillBePermanently"); + + return ( + onConfirm(layout.id)} + /> + ); +} diff --git a/apps/web/components/task/use-saved-layout-mutations.ts b/apps/web/components/task/use-saved-layout-mutations.ts new file mode 100644 index 0000000000..cca23b9441 --- /dev/null +++ b/apps/web/components/task/use-saved-layout-mutations.ts @@ -0,0 +1,47 @@ +"use client"; + +import { useCallback, useRef } from "react"; + +import { useAppStoreApi } from "@/components/state-provider"; +import { updateUserSettings } from "@/lib/api/domains/settings-api"; +import { + createLayoutProfile, + deleteLayoutProfile, + type CreateLayoutProfileInput, +} from "@/lib/layout/layout-profiles"; +import { mapUserSettingsResponse } from "@/lib/ssr/user-settings"; +import type { SavedLayout } from "@/lib/types/http"; + +type SavedLayoutMutation = (layouts: SavedLayout[]) => SavedLayout[]; + +export function useSavedLayoutMutations() { + const appStore = useAppStoreApi(); + const queueRef = useRef>(Promise.resolve()); + + const mutate = useCallback( + (mutation: SavedLayoutMutation) => { + const queued = queueRef.current + .catch(() => undefined) + .then(async () => { + const currentLayouts = appStore.getState().userSettings.savedLayouts; + const response = await updateUserSettings({ saved_layouts: mutation(currentLayouts) }); + const currentSettings = appStore.getState().userSettings; + appStore.getState().setUserSettings(mapUserSettingsResponse(response, currentSettings)); + }); + queueRef.current = queued; + return queued; + }, + [appStore], + ); + + const saveLayout = useCallback( + (input: CreateLayoutProfileInput) => mutate((layouts) => createLayoutProfile(layouts, input)), + [mutate], + ); + const deleteLayout = useCallback( + (layoutId: string) => mutate((layouts) => deleteLayoutProfile(layouts, layoutId)), + [mutate], + ); + + return { saveLayout, deleteLayout }; +} diff --git a/apps/web/e2e/tests/layout/mobile-saved-layout-confirmation.spec.ts b/apps/web/e2e/tests/layout/mobile-saved-layout-confirmation.spec.ts new file mode 100644 index 0000000000..fc3f647faf --- /dev/null +++ b/apps/web/e2e/tests/layout/mobile-saved-layout-confirmation.spec.ts @@ -0,0 +1,109 @@ +import { expect } from "@playwright/test"; +import { test, type SeedData } from "../../fixtures/test-base"; +import type { ApiClient } from "../../helpers/api-client"; +import { assertNoDocumentHorizontalOverflow } from "../../helpers/layout-assertions"; +import { SessionPage } from "../../pages/session-page"; + +async function createActiveTask(apiClient: ApiClient, seedData: SeedData) { + return apiClient.createTask(seedData.workspaceId, "Mobile saved-layout confirmation task", { + description: "Mobile saved-layout confirmation", + workflow_id: seedData.workflowId, + workflow_step_id: seedData.startStepId, + repository_ids: [seedData.repositoryId], + }); +} + +function minimalLayout() { + return { + columns: [ + { + id: "center", + groups: [ + { + id: "group-center", + panels: [ + { + id: "chat", + component: "chat", + title: "Agent", + }, + ], + activePanel: "chat", + }, + ], + }, + ], + }; +} + +test.describe("Mobile saved-layout confirmation", () => { + test("morphs the saved-layout menu row into touch-sized actions", async ({ + testPage, + apiClient, + seedData, + }) => { + test.setTimeout(120_000); + const task = await createActiveTask(apiClient, seedData); + await apiClient.saveUserSettings({ + saved_layouts: [ + { + id: "mobile-layout-default", + name: "Mobile default", + is_default: true, + layout: minimalLayout(), + created_at: new Date().toISOString(), + }, + { + id: "mobile-layout-to-delete", + name: "Mobile layout to delete", + is_default: false, + layout: minimalLayout(), + created_at: new Date().toISOString(), + }, + ], + }); + + await testPage.goto(`/t/${task.id}`); + const session = new SessionPage(testPage); + await session.waitForLoad(); + const presetTrigger = testPage.getByTestId("layout-preset-trigger"); + await expect(presetTrigger).toBeVisible({ timeout: 30_000 }); + await expect(presetTrigger).toHaveAccessibleName("Saved Layouts"); + await presetTrigger.tap(); + await expect(testPage.getByTestId("layout-reset-item")).toHaveCount(0); + await expect(testPage.getByTestId("layout-preset-item")).toHaveCount(0); + await expect(testPage.getByText("Save current layout...", { exact: true })).toHaveCount(0); + + const deleteAction = testPage.locator( + '[data-testid="layout-saved-delete"][data-layout-id="mobile-layout-to-delete"]', + ); + await expect(deleteAction).toBeVisible({ timeout: 15_000 }); + await deleteAction.tap(); + + const inline = testPage.getByTestId("layout-saved-delete-inline-confirmation"); + await expect(inline).toBeVisible(); + await expect(testPage.getByTestId("layout-saved-delete-confirm-popover")).toHaveCount(0); + await expect(testPage.getByRole("alertdialog")).toHaveCount(0); + for (const action of await inline.getByRole("button").all()) { + const box = await action.boundingBox(); + expect(box?.height).toBeGreaterThanOrEqual(44); + } + + await inline.getByRole("button", { name: "Cancel" }).tap(); + expect((await apiClient.getUserSettings()).settings.saved_layouts).toHaveLength(2); + + if ((await presetTrigger.getAttribute("aria-expanded")) !== "true") { + await presetTrigger.tap(); + } + await expect(deleteAction).toBeVisible({ timeout: 15_000 }); + await deleteAction.tap(); + await testPage + .getByTestId("layout-saved-delete-inline-confirmation") + .getByTestId("layout-saved-delete-confirm") + .tap(); + await expect + .poll(async () => (await apiClient.getUserSettings()).settings.saved_layouts) + .toHaveLength(1); + await assertNoDocumentHorizontalOverflow(testPage, "mobile saved-layout confirmation"); + }); +}); diff --git a/apps/web/e2e/tests/layout/saved-layout-session-isolation.spec.ts b/apps/web/e2e/tests/layout/saved-layout-session-isolation.spec.ts index dbab8d8be7..a595a989cd 100644 --- a/apps/web/e2e/tests/layout/saved-layout-session-isolation.spec.ts +++ b/apps/web/e2e/tests/layout/saved-layout-session-isolation.spec.ts @@ -44,14 +44,14 @@ async function createFinishedTaskWithSession( return { task, sessionId: task.session_id }; } -function simpleLayoutForSession(sessionId: string) { +function simpleLayoutForSession(sessionId: string, groupId = "group-center") { return { columns: [ { id: "center", groups: [ { - id: "group-center", + id: groupId, panels: [ { id: `session:${sessionId}`, @@ -370,6 +370,7 @@ test.describe("saved Dockview layouts", () => { '/e2e:message("target task current")', ); + const savedLayoutGroupId = "group-saved-simple"; await apiClient.saveUserSettings({ workspace_id: seedData.workspaceId, workflow_filter_id: seedData.workflowId, @@ -385,7 +386,7 @@ test.describe("saved Dockview layouts", () => { id: "layout-simple-stale-session", name: "Simple", is_default: false, - layout: simpleLayoutForSession(taskA.sessionId), + layout: simpleLayoutForSession(taskA.sessionId, savedLayoutGroupId), created_at: new Date().toISOString(), }, ], @@ -403,21 +404,55 @@ test.describe("saved Dockview layouts", () => { .toContain(`session:${taskB.sessionId}`); expect(await dockviewPanelIds(testPage)).not.toContain(`session:${taskA.sessionId}`); - await testPage.getByTestId("layout-preset-trigger").click(); + const presetTrigger = testPage.getByTestId("layout-preset-trigger"); + if ((await presetTrigger.getAttribute("aria-expanded")) !== "true") { + await presetTrigger.click(); + } await testPage.getByRole("menuitem", { name: "Simple", exact: true }).click(); await expect - .poll(() => dockviewPanelIds(testPage), { + .poll(async () => (await dockviewDefaultTree(testPage, taskB.sessionId)).centerGroupId, { timeout: 10_000, - message: "Waiting for saved layout to settle on current session", + message: "Waiting for saved layout to finish applying", }) - .toContain(`session:${taskB.sessionId}`); + .toBe(savedLayoutGroupId); + await expect(testPage.getByRole("menu")).toHaveCount(0); const panelIds = await dockviewPanelIds(testPage); expect(panelIds).not.toContain(`session:${taskA.sessionId}`); await expect(testPage).toHaveURL((url) => url.pathname.includes(taskB.task.id)); await expect(testPage.getByText("target task current")).toBeVisible(); await expect(testPage.getByText("source task only")).not.toBeVisible(); + + if ((await presetTrigger.getAttribute("aria-expanded")) !== "true") { + await presetTrigger.click(); + } + await testPage + .locator('[data-testid="layout-saved-delete"][data-layout-id="layout-simple-stale-session"]') + .click(); + const confirmation = testPage.getByTestId("layout-saved-delete-confirm-popover"); + await expect(confirmation).toBeVisible(); + await expect(testPage.getByRole("alertdialog")).toHaveCount(0); + await confirmation.getByRole("button", { name: "Cancel" }).click(); + expect((await apiClient.getUserSettings()).settings.saved_layouts).toHaveLength(2); + + if ((await presetTrigger.getAttribute("aria-expanded")) !== "true") { + await presetTrigger.click(); + } + await testPage + .locator('[data-testid="layout-saved-delete"][data-layout-id="layout-simple-stale-session"]') + .click(); + const secondConfirmation = testPage.getByTestId("layout-saved-delete-confirm-popover"); + await expect(secondConfirmation).toBeVisible(); + await testPage + .locator('[data-testid="layout-saved-delete-confirm-popover"]') + .getByTestId("layout-saved-delete-confirm") + .click(); + await expect + .poll(async () => (await apiClient.getUserSettings()).settings.saved_layouts) + .toHaveLength(1); + expect(await dockviewPanelIds(testPage)).toContain(`session:${taskB.sessionId}`); + expect(await dockviewPanelIds(testPage)).not.toContain(`session:${taskA.sessionId}`); }); test("preserves Agent selection while Files owns global focus", async ({ diff --git a/apps/web/e2e/tests/settings/layout-profiles.spec.ts b/apps/web/e2e/tests/settings/layout-profiles.spec.ts index 3f64208941..43999984e4 100644 --- a/apps/web/e2e/tests/settings/layout-profiles.spec.ts +++ b/apps/web/e2e/tests/settings/layout-profiles.spec.ts @@ -392,13 +392,56 @@ test.describe("Task layout profile defaults", () => { await testPage .locator('[data-testid="layout-saved-delete"][data-layout-id="focused-default"]') .click({ force: true }); - await expect(testPage.getByRole("alertdialog")).toContainText( + const confirmation = testPage.getByTestId("layout-saved-delete-confirm-popover"); + await expect(confirmation).toContainText( "The built-in Default layout will become the default.", ); - await testPage.getByRole("button", { name: "Cancel" }).click(); + await expect(testPage.getByRole("alertdialog")).toHaveCount(0); + await confirmation.getByRole("button", { name: "Cancel" }).click(); expect((await apiClient.getUserSettings()).settings.saved_layouts).toHaveLength(1); }); + test("confirms custom layout-profile deletion at the selected profile action", async ({ + testPage, + apiClient, + }) => { + await apiClient.saveUserSettings({ + saved_layouts: [ + { + id: "custom-layout-to-delete", + name: "Custom layout to delete", + is_default: true, + layout: noTerminalLayout(), + created_at: new Date().toISOString(), + }, + ], + }); + + const layouts = new LayoutSettingsPage(testPage); + await layouts.open(); + const deleteButton = testPage.getByTestId("layout-profile-delete"); + await expect(deleteButton).toBeVisible(); + await deleteButton.click(); + + const confirmation = testPage.getByTestId("layout-profile-delete-confirm-popover"); + await expect(confirmation).toBeVisible(); + await expect(testPage.getByRole("alertdialog")).toHaveCount(0); + await confirmation.getByRole("button", { name: "Cancel" }).click(); + expect((await apiClient.getUserSettings()).settings.saved_layouts).toHaveLength(1); + + await deleteButton.click(); + await testPage + .getByTestId("layout-profile-delete-confirm-popover") + .getByTestId("layout-profile-delete-confirm") + .click(); + await expect(deleteButton).toHaveCount(0); + + await layouts.save(); + await expect + .poll(async () => (await apiClient.getUserSettings()).settings.saved_layouts) + .toEqual([]); + }); + test("adds Prompt History through the layout editor and restores it into a task", async ({ testPage, apiClient, diff --git a/apps/web/e2e/tests/settings/mobile-layout-profiles.spec.ts b/apps/web/e2e/tests/settings/mobile-layout-profiles.spec.ts index bdafcdcabe..c25e582423 100644 --- a/apps/web/e2e/tests/settings/mobile-layout-profiles.spec.ts +++ b/apps/web/e2e/tests/settings/mobile-layout-profiles.spec.ts @@ -16,6 +16,23 @@ type SavedProfile = { }; }; +function minimalLayout() { + return { + columns: [ + { + id: "center", + groups: [ + { + id: "group-center", + panels: [{ id: "chat", component: "chat", title: "Agent" }], + activePanel: "chat", + }, + ], + }, + ], + }; +} + test.describe("Mobile layout profiles", () => { test("opens the Add panel menu via touch without auto-adding the first missing panel", async ({ testPage, @@ -105,6 +122,54 @@ test.describe("Mobile layout profiles", () => { await assertNoDescendantOverflowsRight(layouts.root, "edited layouts settings"); }); + test("morphs custom profile deletion into touch-sized inline actions", async ({ + testPage, + apiClient, + }) => { + await apiClient.saveUserSettings({ + saved_layouts: [ + { + id: "mobile-layout-to-delete", + name: "Mobile layout to delete", + is_default: true, + layout: minimalLayout(), + created_at: new Date().toISOString(), + }, + ], + }); + + const layouts = new LayoutSettingsPage(testPage); + await layouts.openFromSettingsIndex(); + const deleteButton = testPage.getByTestId("layout-profile-delete"); + await expect(deleteButton).toBeVisible(); + await deleteButton.tap(); + + const inline = testPage.getByTestId("layout-profile-delete-inline-confirmation"); + await expect(inline).toBeVisible(); + await expect(testPage.getByRole("alertdialog")).toHaveCount(0); + for (const action of await inline.getByRole("button").all()) { + const box = await action.boundingBox(); + expect(box?.height).toBeGreaterThanOrEqual(44); + } + + await inline.getByRole("button", { name: "Cancel" }).tap(); + expect((await apiClient.getUserSettings()).settings.saved_layouts).toHaveLength(1); + + await deleteButton.tap(); + await testPage + .getByTestId("layout-profile-delete-inline-confirmation") + .getByTestId("layout-profile-delete-confirm") + .tap(); + await expect(deleteButton).toHaveCount(0); + await layouts.save(); + await expect + .poll(async () => (await apiClient.getUserSettings()).settings.saved_layouts) + .toEqual([]); + + await assertNoDocumentHorizontalOverflow(testPage, "mobile layout profile deletion"); + await assertNoDescendantOverflowsRight(layouts.root, "mobile layout profile confirmation"); + }); + test("adds Prompt History through the touch layout editor", async ({ testPage }) => { const layouts = new LayoutSettingsPage(testPage); await layouts.openFromSettingsIndex();