From 39449b8b01ed655f32059becf7e2630e8fb90130 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 18:49:34 +0000 Subject: [PATCH] feat: localize secret deletion confirmation (#2884) --- .../settings/secrets-delete-dialog.test.tsx | 95 +++++-- .../settings/secrets-delete-dialog.tsx | 95 +++---- .../settings/secrets-list-item-row.test.tsx | 64 ++++- .../settings/secrets-list-item-row.tsx | 262 ++++++++++++++---- .../settings/secrets-settings.test.ts | 144 +++++++++- .../components/settings/secrets-settings.tsx | 21 +- .../settings/mobile-secrets-delete.spec.ts | 78 ++++++ .../e2e/tests/settings/secrets-delete.spec.ts | 89 ++++++ apps/web/src/locales/en/settings.json | 1 + apps/web/src/locales/pseudo/settings.json | 1 + apps/web/src/locales/pt-pt/settings.json | 1 + apps/web/src/locales/zh-cn/settings.json | 1 + apps/web/src/locales/zh-hk/settings.json | 1 + apps/web/src/locales/zh-tw/settings.json | 1 + 14 files changed, 707 insertions(+), 147 deletions(-) create mode 100644 apps/web/e2e/tests/settings/mobile-secrets-delete.spec.ts create mode 100644 apps/web/e2e/tests/settings/secrets-delete.spec.ts diff --git a/apps/web/components/settings/secrets-delete-dialog.test.tsx b/apps/web/components/settings/secrets-delete-dialog.test.tsx index 5104de823d..d79720bfc6 100644 --- a/apps/web/components/settings/secrets-delete-dialog.test.tsx +++ b/apps/web/components/settings/secrets-delete-dialog.test.tsx @@ -1,14 +1,10 @@ -import { cleanup, render, screen } from "@testing-library/react"; +import { useRef, useState } from "react"; +import { cleanup, fireEvent, render, screen, waitFor, within } from "@testing-library/react"; import { afterEach, describe, expect, it, vi } from "vitest"; import { activateLocale } from "@/lib/i18n"; import type { SecretListItem } from "@/lib/types/http-secrets"; -import { DeleteSecretDialog } from "./secrets-delete-dialog"; +import { SecretDeleteConfirmation } from "./secrets-delete-dialog"; -/** - * A secret's name is user data. It reaches the dialog as an interpolated value - * and must never become a catalog key — the pseudo locale is the oracle here: - * the sentence around the name changes, the name itself must not. - */ const secret: SecretListItem = { id: "secret-1", name: "OpenAI Production Key", @@ -17,16 +13,32 @@ const secret: SecretListItem = { updated_at: "", }; -/** - * The name renders inside a ``, so testing-library's text matcher — which - * joins only an element's direct text-node children — never sees the sentence - * whole. Read the description element's own `textContent` instead. - */ +const CONFIRM_POPOVER_TEST_ID = "secret-delete-confirm-popover"; +const CONFIRM_TEST_ID = "secret-delete-confirm"; + +function ConfirmationHarness({ onConfirm = vi.fn() }: { onConfirm?: () => void | Promise }) { + const anchorRef = useRef(null); + const [open, setOpen] = useState(true); + return ( + <> + + setOpen(false)} + onConfirm={onConfirm} + /> + + ); +} + function descriptionText(): string { - const description = screen.getByText(secret.name).closest("p"); - // Fail on the broken query rather than on an empty string comparison, which - // would point every assertion below at the wrong cause. - if (!description) throw new Error("secret name is not inside the

DialogDescription"); + const description = screen.getByText(secret.name).closest('[data-slot="popover-description"]'); + if (!description) throw new Error("secret name is not inside the popover description"); return description.textContent ?? ""; } @@ -35,27 +47,60 @@ afterEach(async () => { await activateLocale("en"); }); -describe("DeleteSecretDialog", () => { - it("renders the confirmation copy around the secret name", () => { - render( - , +describe("SecretDeleteConfirmation", () => { + it("uses a local non-blocking confirmation surface", async () => { + render(); + + expect(screen.queryByRole("alertdialog")).toBeNull(); + expect(screen.getByTestId(CONFIRM_POPOVER_TEST_ID)).not.toBeNull(); + await waitFor(() => + expect(document.activeElement).toBe(screen.getByRole("button", { name: "Cancel" })), ); + }); + + it("renders localized copy around the name without exposing secret material", () => { + render(); expect(descriptionText()).toBe( `This will permanently remove ${secret.name}. This action cannot be undone.`, ); + expect(descriptionText()).not.toContain("secret-value"); }); it("keeps the secret name verbatim when the locale changes", async () => { await activateLocale("pseudo"); - render( - , - ); + render(); - // The surrounding sentence is catalog copy, so pseudo accents it. expect(descriptionText()).toMatch(/[À-ɏ]/); expect(descriptionText()).not.toContain("This will permanently remove"); - // The name is user data — byte-identical under any locale. expect(descriptionText()).toContain(secret.name); }); + + it("closes before invoking confirmation and returns focus on cancel", async () => { + const onConfirm = vi.fn(() => new Promise(() => {})); + render(); + + const cancel = screen.getByRole("button", { name: "Cancel" }); + const anchor = screen.getByRole("button", { name: "Delete secret" }); + fireEvent.click(cancel); + + expect(onConfirm).not.toHaveBeenCalled(); + expect(screen.queryByTestId(CONFIRM_POPOVER_TEST_ID)).toBeNull(); + await waitFor(() => expect(document.activeElement).toBe(anchor)); + }); + + it("invokes confirmation once after the shell closes", async () => { + let shellClosed = false; + const onConfirm = vi.fn(() => { + shellClosed = screen.queryByTestId(CONFIRM_POPOVER_TEST_ID) === null; + }); + render(); + + fireEvent.click( + within(screen.getByTestId(CONFIRM_POPOVER_TEST_ID)).getByTestId(CONFIRM_TEST_ID), + ); + + await waitFor(() => expect(onConfirm).toHaveBeenCalledTimes(1)); + expect(shellClosed).toBe(true); + }); }); diff --git a/apps/web/components/settings/secrets-delete-dialog.tsx b/apps/web/components/settings/secrets-delete-dialog.tsx index 60e006e2dc..da903c5703 100644 --- a/apps/web/components/settings/secrets-delete-dialog.tsx +++ b/apps/web/components/settings/secrets-delete-dialog.tsx @@ -1,68 +1,51 @@ "use client"; +import type { RefObject } from "react"; import { Trans, useTranslation } from "react-i18next"; -import { Button } from "@kandev/ui/button"; -import { - Dialog, - DialogContent, - DialogDescription, - DialogFooter, - DialogHeader, - DialogTitle, -} from "@kandev/ui/dialog"; + +import { ActionConfirmPopover } from "@/components/confirmation/action-confirm-popover"; import type { SecretListItem } from "@/lib/types/http-secrets"; -type DeleteSecretDialogProps = { - target: SecretListItem | null; - onClose: () => void; - onConfirm: () => void; - isBusy: boolean; +type SecretDeleteConfirmationProps = { + secret: SecretListItem; + open: boolean; + anchorRef: RefObject; + onOpenChange: (open: boolean) => void; + onCancel: () => void; + onConfirm: () => void | Promise; }; -/** Renders the confirm-delete dialog for a secret, with cancel and destructive confirm actions. */ -export function DeleteSecretDialog({ - target, - onClose, +/** Anchors secret deletion confirmation to its row action on fine pointers. */ +export function SecretDeleteConfirmation({ + secret, + open, + anchorRef, + onOpenChange, + onCancel, onConfirm, - isBusy, -}: DeleteSecretDialogProps) { +}: SecretDeleteConfirmationProps) { const { t } = useTranslation(); - // The secret's own name is user data: it is interpolated as a value and never - // routed through a catalog key. - const name = target?.name ?? t("settings:thisSecret"); + return ( -

{ - if (!open) onClose(); - }} - > - - - {t("settings:deleteSecret")} - - - This will permanently remove{" "} - {name}. This action cannot be - undone. - - - - - - - - - + + This will permanently remove{" "} + {secret.name}. This action cannot be + undone. + + } + cancelLabel={t("settings:cancel")} + confirmLabel={t("settings:deleteSecret")} + confirmAriaLabel={t("settings:deleteSecretNamed", { name: secret.name })} + confirmTestId="secret-delete-confirm" + testId="secret-delete-confirm-popover" + onOpenChange={onOpenChange} + onCancel={onCancel} + onConfirm={onConfirm} + /> ); } diff --git a/apps/web/components/settings/secrets-list-item-row.test.tsx b/apps/web/components/settings/secrets-list-item-row.test.tsx index bd523128ef..5ed6cae74e 100644 --- a/apps/web/components/settings/secrets-list-item-row.test.tsx +++ b/apps/web/components/settings/secrets-list-item-row.test.tsx @@ -1,6 +1,14 @@ import { cleanup, render, screen } from "@testing-library/react"; +import { fireEvent, waitFor, within } from "@testing-library/react"; import { afterEach, describe, expect, it, vi } from "vitest"; import type { SecretListItem } from "@/lib/types/http-secrets"; + +let finePointer = true; + +vi.mock("@/hooks/use-responsive-breakpoint", () => ({ + useResponsiveBreakpoint: () => ({ isFinePointer: finePointer }), +})); + import { SecretListItemRow } from "./secrets-list-item-row"; const secret: SecretListItem = { @@ -16,25 +24,36 @@ const secret: SecretListItem = { function renderRow(overrides: Partial[0]> = {}) { const onEdit = vi.fn(); const onDelete = vi.fn(); + const onDeleteCancel = vi.fn(); + const onDeleteConfirm = vi.fn(); const onCopyMove = vi.fn(); render( , ); - return { onEdit, onDelete, onCopyMove }; + return { onEdit, onDelete, onDeleteCancel, onDeleteConfirm, onCopyMove }; } -afterEach(() => cleanup()); +afterEach(() => { + finePointer = true; + cleanup(); +}); const COPY_MOVE_BUTTON = "Copy or move API Key"; +const DELETE_BUTTON = "Delete secret API Key"; +const CONFIRM_POPOVER_TEST_ID = "secret-delete-confirm-popover"; +const CONFIRM_TEST_ID = "secret-delete-confirm"; /** Returns whether the copy/move button is currently disabled. */ function copyMoveDisabled(): boolean { @@ -42,6 +61,47 @@ function copyMoveDisabled(): boolean { } describe("SecretListItemRow", () => { + it("keeps delete trigger target-aware and touch-sized", () => { + const { onDelete } = renderRow(); + const deleteButton = screen.getByRole("button", { name: DELETE_BUTTON }); + + expect(deleteButton.className).toContain("min-h-11"); + expect(deleteButton.className).toContain("min-w-11"); + fireEvent.click(deleteButton); + + expect(onDelete).toHaveBeenCalledWith(secret); + }); + + it("anchors fine-pointer confirmation to this row", async () => { + const { onDeleteConfirm } = renderRow({ isDeleteConfirming: true }); + const popover = screen.getByTestId(CONFIRM_POPOVER_TEST_ID); + + expect(screen.queryByRole("alertdialog")).toBeNull(); + expect(within(popover).getByRole("button", { name: DELETE_BUTTON })).not.toBeNull(); + fireEvent.click(within(popover).getByTestId(CONFIRM_TEST_ID)); + + await waitFor(() => expect(onDeleteConfirm).toHaveBeenCalledTimes(1)); + }); + + it("morphs into inline touch confirmation on coarse pointers", async () => { + finePointer = false; + const { onDeleteCancel, onDeleteConfirm } = renderRow({ isDeleteConfirming: true }); + const inline = screen.getByTestId("secret-delete-inline-confirmation"); + + expect(screen.queryByTestId(CONFIRM_POPOVER_TEST_ID)).toBeNull(); + expect(screen.queryByRole("button", { name: COPY_MOVE_BUTTON })).toBeNull(); + expect(screen.queryByRole("button", { name: "Reveal secret API Key" })).toBeNull(); + expect(screen.queryByRole("button", { name: "Edit secret API Key" })).toBeNull(); + expect(inline.getAttribute("aria-label")).toBe(DELETE_BUTTON); + expect(within(inline).getByTestId(CONFIRM_TEST_ID).className).toContain("h-11"); + expect(within(inline).getByTestId(CONFIRM_TEST_ID).className).toContain("min-w-11"); + + fireEvent.click(within(inline).getByRole("button", { name: "Cancel" })); + expect(onDeleteCancel).toHaveBeenCalledTimes(1); + fireEvent.click(within(inline).getByTestId(CONFIRM_TEST_ID)); + await waitFor(() => expect(onDeleteConfirm).toHaveBeenCalledTimes(1)); + }); + it("runs the copy/move action", () => { const { onCopyMove } = renderRow(); screen.getByRole("button", { name: COPY_MOVE_BUTTON }).click(); diff --git a/apps/web/components/settings/secrets-list-item-row.tsx b/apps/web/components/settings/secrets-list-item-row.tsx index eff78b3b5c..436857820a 100644 --- a/apps/web/components/settings/secrets-list-item-row.tsx +++ b/apps/web/components/settings/secrets-list-item-row.tsx @@ -1,39 +1,79 @@ "use client"; -import { useState } from "react"; -import { useTranslation } from "react-i18next"; +import { useRef, useState, type RefObject } from "react"; +import { Trans, useTranslation } from "react-i18next"; import { IconCopy, IconEdit, IconEye, IconEyeOff, IconKey, IconTrash } from "@tabler/icons-react"; import { Button } from "@kandev/ui/button"; import { Badge } from "@kandev/ui/badge"; +import { InlineConfirmActions } from "@/components/confirmation/inline-confirm-actions"; +import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint"; import { revealSecret } from "@/lib/api/domains/secrets-api"; import type { SecretListItem } from "@/lib/types/http-secrets"; +import { SecretDeleteConfirmation } from "./secrets-delete-dialog"; type SecretListItemRowProps = { secret: SecretListItem; workspaceId?: string; onEdit: (secret: SecretListItem) => void; onDelete: (secret: SecretListItem) => void; + onDeleteCancel: () => void; + onDeleteConfirm: () => void | Promise; onCopyMove: (secret: SecretListItem) => void; isBusy: boolean; showCreate: boolean; isEditing: boolean; + isDeleteConfirming: boolean; }; -/** Renders a single secret row: name, scope badge, and copy/move, reveal, edit, and delete actions. */ +type SecretListItemRowActionsProps = { + secret: SecretListItem; + onEdit: (secret: SecretListItem) => void; + onDelete: (secret: SecretListItem) => void; + onDeleteCancel: () => void; + onDeleteConfirm: () => void | Promise; + onCopyMove: (secret: SecretListItem) => void; + onReveal: () => void | Promise; + isBusy: boolean; + showCreate: boolean; + isEditing: boolean; + isDeleteConfirming: boolean; + isFinePointer: boolean; + revealed: boolean; + revealing: boolean; + deleteAnchorRef: RefObject; +}; + +type SecretListItemRowDeleteActionProps = { + secret: SecretListItem; + onDelete: (secret: SecretListItem) => void; + onDeleteCancel: () => void; + onDeleteConfirm: () => void | Promise; + isBusy: boolean; + isDeleteConfirming: boolean; + isFinePointer: boolean; + deleteAnchorRef: RefObject; +}; + +/** Renders a single secret row with local delete confirmation on every pointer type. */ export function SecretListItemRow({ secret, workspaceId, onEdit, onDelete, + onDeleteCancel, + onDeleteConfirm, onCopyMove, isBusy, showCreate, isEditing, + isDeleteConfirming, }: SecretListItemRowProps) { const { t } = useTranslation(); + const { isFinePointer } = useResponsiveBreakpoint(); const [revealed, setRevealed] = useState(false); const [revealedValue, setRevealedValue] = useState(null); const [revealing, setRevealing] = useState(false); + const deleteAnchorRef = useRef(null); /** Fetches and shows the secret value, or hides it when already revealed. */ const handleReveal = async () => { @@ -58,7 +98,10 @@ export function SecretListItemRow({ }; return ( -
+
@@ -69,54 +112,23 @@ export function SecretListItemRow({ : t("settings:globalScope")}
-
- - - - -
+
{revealed && revealedValue !== null && (
@@ -126,3 +138,149 @@ export function SecretListItemRow({
); } + +function SecretListItemRowActions({ + secret, + onEdit, + onDelete, + onDeleteCancel, + onDeleteConfirm, + onCopyMove, + onReveal, + isBusy, + showCreate, + isEditing, + isDeleteConfirming, + isFinePointer, + revealed, + revealing, + deleteAnchorRef, +}: SecretListItemRowActionsProps) { + const { t } = useTranslation(); + return ( + <> +
+ {(!isDeleteConfirming || isFinePointer) && ( + <> + + + + + )} + +
+ + ); +} + +function SecretListItemRowDeleteAction({ + secret, + onDelete, + onDeleteCancel, + onDeleteConfirm, + isBusy, + isDeleteConfirming, + isFinePointer, + deleteAnchorRef, +}: SecretListItemRowDeleteActionProps) { + const { t } = useTranslation(); + + return ( + <> + {!isFinePointer && isDeleteConfirming ? ( + + This will permanently remove{" "} + {secret.name}. This action cannot + be undone. + + } + cancelLabel={t("settings:cancel")} + confirmLabel={t("settings:deleteSecret")} + confirmAriaLabel={t("settings:deleteSecretNamed", { name: secret.name })} + confirmTestId="secret-delete-confirm" + onCancel={onDeleteCancel} + onClose={onDeleteCancel} + onConfirm={onDeleteConfirm} + /> + ) : ( + + )} + {isFinePointer ? ( + { + if (!open) onDeleteCancel(); + }} + onCancel={onDeleteCancel} + onConfirm={onDeleteConfirm} + /> + ) : null} + + ); +} diff --git a/apps/web/components/settings/secrets-settings.test.ts b/apps/web/components/settings/secrets-settings.test.ts index 0177880b69..bfaf2f249c 100644 --- a/apps/web/components/settings/secrets-settings.test.ts +++ b/apps/web/components/settings/secrets-settings.test.ts @@ -1,6 +1,50 @@ -import { describe, expect, it } from "vitest"; +import { cleanup, fireEvent, render, screen, waitFor, within } from "@testing-library/react"; +import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; +import { createElement, type ReactNode } from "react"; import type { SecretListItem } from "@/lib/types/http-secrets"; -import { getSecretDraftMeta } from "./secrets-settings"; + +const mocks = vi.hoisted(() => ({ + deleteSecret: vi.fn(), + addSecret: vi.fn(), + updateSecret: vi.fn(), + removeSecret: vi.fn(), + toast: vi.fn(), + items: [] as SecretListItem[], + responsive: { isFinePointer: true }, +})); + +vi.mock("@/lib/api/domains/secrets-api", () => ({ + createSecret: vi.fn(), + updateSecret: mocks.updateSecret, + deleteSecret: mocks.deleteSecret, +})); +vi.mock("@/hooks/domains/settings/use-secrets", () => ({ + useSecrets: () => ({ + loaded: true, + items: mocks.items, + addSecret: mocks.addSecret, + updateSecret: mocks.updateSecret, + removeSecret: mocks.removeSecret, + }), +})); +vi.mock("@/components/state-provider", () => ({ + useAppStore: (selector: (state: unknown) => unknown) => + selector({ addSecret: mocks.addSecret, workspaces: { items: [] } }), +})); +vi.mock("@/components/toast-provider", () => ({ useToast: () => ({ toast: mocks.toast }) })); +vi.mock("@/hooks/use-responsive-breakpoint", () => ({ + useResponsiveBreakpoint: () => mocks.responsive, +})); +vi.mock("@/components/settings/settings-page-template", () => ({ + SettingsPageTemplate: ({ children }: { children: ReactNode }) => + createElement("div", null, children), +})); +vi.mock("@/components/settings/workspaces/workspace-section-header", () => ({ + WorkspaceSectionHeader: () => null, +})); +vi.mock("./copy-move-secret-dialog", () => ({ CopyMoveSecretDialog: () => null })); + +import { getSecretDraftMeta, SecretsSettings } from "./secrets-settings"; const secret: SecretListItem = { id: "secret-1", @@ -10,6 +54,25 @@ const secret: SecretListItem = { updated_at: "", }; +const DELETE_BUTTON = "Delete secret Saved secret"; +const CONFIRM_POPOVER_TEST_ID = "secret-delete-confirm-popover"; +const CONFIRM_TEST_ID = "secret-delete-confirm"; + +function renderSettings() { + render(createElement(SecretsSettings, { initialItems: mocks.items })); +} + +beforeEach(() => { + mocks.items = [secret]; + mocks.responsive.isFinePointer = true; + mocks.deleteSecret.mockReset(); + mocks.deleteSecret.mockResolvedValue(undefined); + mocks.removeSecret.mockReset(); + mocks.toast.mockReset(); +}); + +afterEach(() => cleanup()); + describe("getSecretDraftMeta", () => { it("treats a newly opened secret form as dirty before persistence", () => { const state = getSecretDraftMeta([], null, true, { name: "", value: "" }); @@ -27,3 +90,80 @@ describe("getSecretDraftMeta", () => { ).toBe(true); }); }); + +describe("SecretsSettings deletion lifecycle", () => { + it("cancels locally without dispatching deletion", () => { + renderSettings(); + + fireEvent.click(screen.getByRole("button", { name: DELETE_BUTTON })); + const popover = screen.getByTestId(CONFIRM_POPOVER_TEST_ID); + fireEvent.click(within(popover).getByRole("button", { name: "Cancel" })); + + expect(mocks.deleteSecret).not.toHaveBeenCalled(); + expect(screen.queryByTestId(CONFIRM_POPOVER_TEST_ID)).toBeNull(); + }); + + it("closes before dispatching exactly one delete and removes on success", async () => { + let confirmationClosed = false; + mocks.deleteSecret.mockImplementation(async () => { + confirmationClosed = screen.queryByTestId(CONFIRM_POPOVER_TEST_ID) === null; + }); + renderSettings(); + + fireEvent.click(screen.getByRole("button", { name: DELETE_BUTTON })); + fireEvent.click( + within(screen.getByTestId(CONFIRM_POPOVER_TEST_ID)).getByTestId(CONFIRM_TEST_ID), + ); + + await waitFor(() => expect(mocks.deleteSecret).toHaveBeenCalledTimes(1)); + expect(confirmationClosed).toBe(true); + await waitFor(() => expect(mocks.removeSecret).toHaveBeenCalledWith(secret.id)); + }); + + it("keeps row actions busy until deletion settles", async () => { + let resolveDelete!: () => void; + mocks.deleteSecret.mockReturnValue( + new Promise((resolve) => { + resolveDelete = resolve; + }), + ); + renderSettings(); + + fireEvent.click(screen.getByRole("button", { name: DELETE_BUTTON })); + fireEvent.click( + within(screen.getByTestId(CONFIRM_POPOVER_TEST_ID)).getByTestId(CONFIRM_TEST_ID), + ); + + await waitFor(() => expect(mocks.deleteSecret).toHaveBeenCalledTimes(1)); + expect( + (screen.getByRole("button", { name: DELETE_BUTTON }) as HTMLButtonElement).disabled, + ).toBe(true); + resolveDelete(); + await waitFor(() => expect(mocks.removeSecret).toHaveBeenCalledWith(secret.id)); + }); + + it("keeps the secret and reports a localized failure when deletion fails", async () => { + mocks.deleteSecret.mockRejectedValue(new Error("server details must stay out of copy")); + renderSettings(); + + fireEvent.click(screen.getByRole("button", { name: DELETE_BUTTON })); + fireEvent.click( + within(screen.getByTestId(CONFIRM_POPOVER_TEST_ID)).getByTestId(CONFIRM_TEST_ID), + ); + + await waitFor(() => + expect(mocks.toast).toHaveBeenCalledWith({ + description: "Couldn't delete secret", + variant: "error", + }), + ); + expect(screen.getByText(secret.name)).not.toBeNull(); + expect( + (screen.getByRole("button", { name: DELETE_BUTTON }) as HTMLButtonElement).disabled, + ).toBe(false); + expect(mocks.removeSecret).not.toHaveBeenCalled(); + expect(JSON.stringify(mocks.toast.mock.calls)).not.toContain( + "server details must stay out of copy", + ); + }); +}); diff --git a/apps/web/components/settings/secrets-settings.tsx b/apps/web/components/settings/secrets-settings.tsx index 87c9635b3f..307e5a8bd1 100644 --- a/apps/web/components/settings/secrets-settings.tsx +++ b/apps/web/components/settings/secrets-settings.tsx @@ -7,6 +7,7 @@ import { Button } from "@kandev/ui/button"; import { SettingsPageTemplate } from "@/components/settings/settings-page-template"; import { WorkspaceSectionHeader } from "@/components/settings/workspaces/workspace-section-header"; import { useAppStore } from "@/components/state-provider"; +import { useToast } from "@/components/toast-provider"; import { useSecrets } from "@/hooks/domains/settings/use-secrets"; import type { ApiRequestOptions } from "@/lib/api/client"; import { createSecret, updateSecret, deleteSecret } from "@/lib/api/domains/secrets-api"; @@ -14,7 +15,6 @@ import { useRequest } from "@/lib/http/use-request"; import type { SecretListItem, SecretScope, UpdateSecretRequest } from "@/lib/types/http-secrets"; import { SecretForm, defaultFormState, type SecretFormState } from "./secret-form"; import { SecretListItemRow } from "./secrets-list-item-row"; -import { DeleteSecretDialog } from "./secrets-delete-dialog"; import { CopyMoveSecretDialog, type CopyMoveMode } from "./copy-move-secret-dialog"; /* ------------------------------------------------------------------ */ @@ -136,6 +136,8 @@ function useSecretRequests( /** Composes request runners and UI actions (create, edit, delete, transfer) from the secrets state. */ function useSecretsActions(state: ReturnType) { + const { t } = useTranslation(); + const { toast } = useToast(); const { rememberTransferTrigger, restoreTransferTrigger } = useTransferFocusRestore(); const { addSecret: addToStore, @@ -211,8 +213,11 @@ function useSecretsActions(state: ReturnType) { closeDelete: () => setDeleteTarget(null), confirmDelete: () => { if (!deleteTarget) return; - deleteRequest.run(deleteTarget.id).catch(() => undefined); + const id = deleteTarget.id; setDeleteTarget(null); + return deleteRequest.run(id).catch(() => { + toast({ description: t("settings:secretDeleteFailed"), variant: "error" }); + }); }, openTransfer: (secret: SecretListItem) => { // Remember the focused Copy/Move button; close restores it because @@ -296,7 +301,7 @@ export type SecretsSettingsActions = { startCreate: () => void; openDelete: (secret: SecretListItem) => void; closeDelete: () => void; - confirmDelete: () => void; + confirmDelete: () => void | Promise; openTransfer: (secret: SecretListItem) => void; closeTransfer: () => void; items: SecretListItem[]; @@ -419,21 +424,17 @@ function SecretsSettingsBody({ workspaceId={workspaceId} onEdit={actions.startEditing} onDelete={actions.openDelete} + onDeleteCancel={actions.closeDelete} + onDeleteConfirm={actions.confirmDelete} onCopyMove={actions.openTransfer} isBusy={isBusy} showCreate={showCreate} isEditing={editingId === secret.id} + isDeleteConfirming={deleteTarget?.id === secret.id} /> ))}
- - ); } diff --git a/apps/web/e2e/tests/settings/mobile-secrets-delete.spec.ts b/apps/web/e2e/tests/settings/mobile-secrets-delete.spec.ts new file mode 100644 index 0000000000..25408ddaad --- /dev/null +++ b/apps/web/e2e/tests/settings/mobile-secrets-delete.spec.ts @@ -0,0 +1,78 @@ +import { randomUUID } from "node:crypto"; + +import { test, expect } from "../../fixtures/test-base"; +import { assertNoDocumentHorizontalOverflow } from "../../helpers/layout-assertions"; + +const SECRET_VALUE = "e2e-mobile-secret-delete-redaction-value"; + +function runToken() { + return `${Date.now()}-${randomUUID().slice(0, 8)}`; +} + +test.describe("mobile-secrets-delete", () => { + test("confirms inline at the target row without exposing the value", async ({ + testPage, + apiClient, + prCapture, + }) => { + await testPage.setViewportSize({ width: 390, height: 844 }); + const name = `E2E Mobile Delete Secret ${runToken()}`; + const secret = await apiClient.createSecret(name, SECRET_VALUE); + + try { + await expect + .poll(async () => (await apiClient.listSecrets()).some((item) => item.id === secret.id), { + timeout: 30_000, + }) + .toBe(true); + await testPage.goto("/settings/general/secrets"); + const row = testPage.getByTestId(`secret-row-${secret.id}`); + const trigger = row.getByRole("button", { name: `Delete secret ${name}` }); + await trigger.tap(); + + const inline = row.getByTestId("secret-delete-inline-confirmation"); + await expect(inline).toBeVisible(); + await expect(inline).toContainText( + `This will permanently remove ${name}. This action cannot be undone.`, + ); + const warningBox = await inline.locator("p").boundingBox(); + expect(warningBox).not.toBeNull(); + expect(warningBox!.x).toBeGreaterThanOrEqual(0); + expect(warningBox!.x + warningBox!.width).toBeLessThanOrEqual(testPage.viewportSize()!.width); + await expect(testPage.getByTestId("secret-delete-confirm-popover")).toHaveCount(0); + await expect(testPage.getByRole("alertdialog")).toHaveCount(0); + await expect(inline).not.toContainText(SECRET_VALUE); + await expect(testPage.locator("body")).not.toContainText(SECRET_VALUE); + + for (const control of [ + inline.getByRole("button", { name: "Cancel" }), + inline.getByTestId("secret-delete-confirm"), + ]) { + const box = await control.boundingBox(); + expect(box).not.toBeNull(); + expect(box!.height).toBeGreaterThanOrEqual(44); + } + await assertNoDocumentHorizontalOverflow(testPage, "mobile secret deletion confirmation"); + await prCapture.screenshot("mobile-secrets-delete-confirmation", { + caption: "Mobile secret row inline confirmation", + }); + + await inline.getByRole("button", { name: "Cancel" }).tap(); + await expect(inline).toHaveCount(0); + expect((await apiClient.listSecrets()).some((item) => item.id === secret.id)).toBe(true); + + await row.getByRole("button", { name: `Delete secret ${name}` }).tap(); + await row + .getByTestId("secret-delete-inline-confirmation") + .getByTestId("secret-delete-confirm") + .tap(); + await expect(row).toHaveCount(0); + await expect + .poll(async () => (await apiClient.listSecrets()).some((item) => item.id === secret.id)) + .toBe(false); + await expect(testPage.locator("body")).not.toContainText(SECRET_VALUE); + } finally { + await apiClient.deleteSecretIfPresent(secret.id).catch(() => undefined); + } + }); +}); diff --git a/apps/web/e2e/tests/settings/secrets-delete.spec.ts b/apps/web/e2e/tests/settings/secrets-delete.spec.ts new file mode 100644 index 0000000000..33ce78a538 --- /dev/null +++ b/apps/web/e2e/tests/settings/secrets-delete.spec.ts @@ -0,0 +1,89 @@ +import { randomUUID } from "node:crypto"; + +import { test, expect } from "../../fixtures/test-base"; + +const SECRET_VALUE = "e2e-secret-delete-redaction-value"; + +function runToken() { + return `${Date.now()}-${randomUUID().slice(0, 8)}`; +} + +test.describe("Secret deletion", () => { + test("confirms at the target row, supports cancel, and removes the secret", async ({ + testPage, + apiClient, + prCapture, + }) => { + const name = `E2E Delete Secret ${runToken()}`; + const secret = await apiClient.createSecret(name, SECRET_VALUE); + + try { + await expect + .poll(async () => (await apiClient.listSecrets()).some((item) => item.id === secret.id), { + timeout: 30_000, + }) + .toBe(true); + await testPage.goto("/settings/general/secrets"); + const row = testPage.getByTestId(`secret-row-${secret.id}`); + const trigger = row.getByRole("button", { name: `Delete secret ${name}` }); + await expect(trigger).toBeVisible(); + await expect(testPage.locator("body")).not.toContainText(SECRET_VALUE); + + await trigger.click(); + const confirmation = testPage.getByTestId("secret-delete-confirm-popover"); + await expect(confirmation).toBeVisible(); + await expect(testPage.getByRole("alertdialog")).toHaveCount(0); + await expect(confirmation).not.toContainText(SECRET_VALUE); + await prCapture.screenshot("desktop-secrets-delete-confirmation", { + caption: "Desktop secret row confirmation", + }); + + await confirmation.getByRole("button", { name: "Cancel" }).click(); + await expect(confirmation).toBeHidden(); + await expect(trigger).toBeFocused(); + expect((await apiClient.listSecrets()).some((item) => item.id === secret.id)).toBe(true); + + await trigger.click(); + await testPage.getByTestId("secret-delete-confirm").click(); + await expect(row).toHaveCount(0); + await expect + .poll(async () => (await apiClient.listSecrets()).some((item) => item.id === secret.id)) + .toBe(false); + await expect(testPage.locator("body")).not.toContainText(SECRET_VALUE); + } finally { + await apiClient.deleteSecretIfPresent(secret.id); + } + }); + + test("keeps the target row and reports localized failure", async ({ testPage, apiClient }) => { + const name = `E2E Failed Delete Secret ${runToken()}`; + const secret = await apiClient.createSecret(name, SECRET_VALUE); + + try { + await expect + .poll(async () => (await apiClient.listSecrets()).some((item) => item.id === secret.id), { + timeout: 30_000, + }) + .toBe(true); + await testPage.goto("/settings/general/secrets"); + const row = testPage.getByTestId(`secret-row-${secret.id}`); + await testPage.route(`**/api/v1/secrets/${secret.id}`, async (route) => { + await route.fulfill({ + status: 500, + contentType: "application/json", + body: JSON.stringify({ error: "synthetic delete failure" }), + }); + }); + await row.getByRole("button", { name: `Delete secret ${name}` }).click(); + await testPage.getByTestId("secret-delete-confirm").click(); + + await expect(testPage.getByTestId("toast-message")).toContainText("Couldn't delete secret"); + await expect(row).toBeVisible(); + await expect(testPage.locator("body")).not.toContainText(SECRET_VALUE); + await expect(testPage.locator("body")).not.toContainText("synthetic delete failure"); + } finally { + await testPage.unroute(`**/api/v1/secrets/${secret.id}`); + await apiClient.deleteSecretIfPresent(secret.id); + } + }); +}); diff --git a/apps/web/src/locales/en/settings.json b/apps/web/src/locales/en/settings.json index 04608c60f1..a5d877e3e1 100644 --- a/apps/web/src/locales/en/settings.json +++ b/apps/web/src/locales/en/settings.json @@ -127,6 +127,7 @@ "deleteLayoutProfile": "Delete layout profile", "deleteLayoutProfileNamed": "Delete {{name}}?", "deleteSecret": "Delete secret", + "secretDeleteFailed": "Couldn't delete secret", "deleteThisCustomLayoutAfterConfirmation": "Delete this custom layout after confirmation.", "desktopNotifications": "Desktop Notifications", "desktopNotificationsDescription": "Notify this device when a selected agent turn, question, or Office event occurs.", diff --git a/apps/web/src/locales/pseudo/settings.json b/apps/web/src/locales/pseudo/settings.json index bf945560f1..41836e0d85 100644 --- a/apps/web/src/locales/pseudo/settings.json +++ b/apps/web/src/locales/pseudo/settings.json @@ -127,6 +127,7 @@ "deleteLayoutProfile": "Ďēĺēţē ĺàŷōũţ ƥŕōƒĩĺē", "deleteLayoutProfileNamed": "Ďēĺēţē {{name}}?", "deleteSecret": "Ďēĺēţē śēćŕēţ", + "secretDeleteFailed": "Ćōũĺďń'ţ ďēĺēţē śēćŕēţ", "deleteThisCustomLayoutAfterConfirmation": "Ďēĺēţē ţĥĩś ćũśţōḿ ĺàŷōũţ àƒţēŕ ćōńƒĩŕḿàţĩōń.", "desktopNotifications": "Ďēśķţōƥ Ńōţĩƒĩćàţĩōńś", "desktopNotificationsDescription": "Ńōţĩƒŷ ţĥĩś ďēvĩćē ŵĥēń à śēĺēćţēď àĝēńţ ţũŕń, qũēśţĩōń, ōŕ Ōƒƒĩćē ēvēńţ ōććũŕś.", diff --git a/apps/web/src/locales/pt-pt/settings.json b/apps/web/src/locales/pt-pt/settings.json index 3f2983c03b..86895f1297 100644 --- a/apps/web/src/locales/pt-pt/settings.json +++ b/apps/web/src/locales/pt-pt/settings.json @@ -124,6 +124,7 @@ "deleteLayoutProfile": "Eliminar o perfil de esquema", "deleteLayoutProfileNamed": "Eliminar {{name}}?", "deleteSecret": "Eliminar segredo", + "secretDeleteFailed": "Não foi possível eliminar o segredo", "deleteThisCustomLayoutAfterConfirmation": "Eliminar este esquema personalizado após confirmação.", "desktopNotifications": "Notificações no computador", "desktopNotificationsDescription": "Notificar este dispositivo quando ocorrer um turno de agente, uma pergunta ou um evento do Office selecionados.", diff --git a/apps/web/src/locales/zh-cn/settings.json b/apps/web/src/locales/zh-cn/settings.json index 5ee622e59c..cc5de49b46 100644 --- a/apps/web/src/locales/zh-cn/settings.json +++ b/apps/web/src/locales/zh-cn/settings.json @@ -127,6 +127,7 @@ "deleteLayoutProfile": "删除布局配置", "deleteLayoutProfileNamed": "删除 {{name}}?", "deleteSecret": "删除密钥", + "secretDeleteFailed": "无法删除密钥", "deleteThisCustomLayoutAfterConfirmation": "确认后删除此自定义布局。", "desktopNotifications": "桌面通知", "desktopNotificationsDescription": "当选定的智能体回合、问题或办公室事件发生时通知此设备。", diff --git a/apps/web/src/locales/zh-hk/settings.json b/apps/web/src/locales/zh-hk/settings.json index a5b32443c2..1b19fd9604 100644 --- a/apps/web/src/locales/zh-hk/settings.json +++ b/apps/web/src/locales/zh-hk/settings.json @@ -127,6 +127,7 @@ "deleteLayoutProfile": "刪除佈局設定", "deleteLayoutProfileNamed": "刪除 {{name}}?", "deleteSecret": "刪除密鑰", + "secretDeleteFailed": "無法刪除密鑰", "deleteThisCustomLayoutAfterConfirmation": "確認後刪除此自訂佈局。", "desktopNotifications": "桌面通知", "desktopNotificationsDescription": "當選定的代理程式回合、問題或辦公室事件發生時通知此設備。", diff --git a/apps/web/src/locales/zh-tw/settings.json b/apps/web/src/locales/zh-tw/settings.json index 8e9b1631e5..3fb389d2de 100644 --- a/apps/web/src/locales/zh-tw/settings.json +++ b/apps/web/src/locales/zh-tw/settings.json @@ -127,6 +127,7 @@ "deleteLayoutProfile": "刪除佈局設定", "deleteLayoutProfileNamed": "刪除 {{name}}?", "deleteSecret": "刪除金鑰", + "secretDeleteFailed": "無法刪除金鑰", "deleteThisCustomLayoutAfterConfirmation": "確認後刪除此自訂佈局。", "desktopNotifications": "桌面通知", "desktopNotificationsDescription": "當選定的代理程式回合、問題或辦公室事件發生時通知此裝置。",