feat(console): add in-app destructive-action confirmation

Deleting a route or a group used `window.confirm`, which blocks the page
and ignores the console theme. A promise-based `useConfirm()` now drives
one <ConfirmDialog /> built on the reka-ui AlertDialog that
@elysola/ui ships; reka-ui is pre-bundled so dev keeps a single copy and
the dialog stacks with the Rc dialogs.

A request never outlives its asker: one made after the asking component
unmounted resolves false, and one still open when it unmounts is
cancelled.
This commit is contained in:
翅膀 committed 2026-10-17 00:12:36 +08:00
1 parent d57e5c29c4
commit 24f5d0477c
8 files changed
+239 -7

No files matched your search

+5 -3
View File
@@ -9,7 +9,7 @@ Core pipeline: GitHub Webhook → Worker (verify + filter + format) → Discord
## Key Decisions
- Runtime: Cloudflare Workers via the Nitro `cloudflare_module` preset (`_worker.js`), H3 event handlers in `server/routes/`
- UI: Vue 3 + Tailwind CSS v4 (`@tailwindcss/vite`) + `@elysola/ui` (Nuxt module, `Rc` prefix); admin console is a client-side SPA (`routeRules: "/admin/**": { ssr: false }`), home/legal pages render server-side
- UI: Vue 3 + Tailwind CSS v4 (`@tailwindcss/vite`) + `@elysola/ui` (Nuxt module, `Rc` prefix); admin console is a client-side SPA (`routeRules: "/admin/**": { ssr: false }`), home/legal pages render server-side; app-level composites (`ConfirmDialog`) are built on the reka-ui primitives that `@elysola/ui` ships (same copy, pre-bundled via `vite.optimizeDeps.include` so dev keeps a single instance and dialogs/popovers stack correctly) and styled like their Rc counterparts
- Styling: Elysola UI supplies semantic components and blue theme tokens; `app/assets/css/main.css` retains `--wh-*` RGB-triplet aliases for app-specific Tailwind utilities and bespoke layouts (avoiding collision with Elysola's `--surface`/`--text`/`--border` hex tokens); theme switching supports auto/light/dark via `useTheme` / `ThemeToggle`, toggling `<html>.dark` with inline anti-flash head script
- Discord interactions: HTTPS Interactions Endpoint (`POST /discord/interactions`, Ed25519-signed) — no Discord Gateway / Durable Object; bot stays offline, messages always sent via REST
- Storage: D1 is the source of truth for config (routes/groups via `d1_routes`/`d1_groups`, see `server/lib/storage/config-store.ts`; each route's per-group order lives in `d1_routes.position` — migration 0012 — and routes load ordered by `group_id, position, id`, falling back to id order on an unmigrated database), send/audit logs, dedup (`dedup_keys`), delivery state (`delivery_state`) and message tracking (`message_tracking` via `server/lib/storage/d1.ts` `canUseD1` gate). KV keeps only cache + short-lived/ephemeral state (tokens, OAuth state, admin sessions, `msg:*`-adjacent locks, per-group secrets `tenant:*`, invites, i18n overrides) with explicit TTLs. R2 parks oversized queue payloads (`webhooks/YYYY/MM/DD/*.json`, `server/lib/storage/payload.ts`) instead of KV. A `storage-prune` scheduled task cleans up expired dedup/delivery/message-tracking rows
@@ -39,8 +39,10 @@ app/ # Vue 3 UI (Nuxt app dir)
├── components/ # ConsolePage (sidebar shell + topbar), AdminHome (overview dashboard),
│ # RouteCard/Editor (RouteEditor has FilterNodeEditor AST builder + TagInput chips),
│ # GroupEditor, MembersPanel, WebhookPanel,
│ # SendLogs, AuditLog, MetricsPanel, AppToasts, LegalLayout
├── composables/ # useI18n, useToasts, useGroups, useGroupRoutes, useFilterNode (AST helpers), useFragments, useLogs, useAudit, useInvites, useWebhook
│ # ConfirmDialog (app-wide destructive-action confirm), SendLogs, AuditLog, MetricsPanel,
│ # AppToasts, LegalLayout
├── composables/ # useI18n, useToasts, useConfirm (promise-based confirm), useGroups, useGroupRoutes, useFilterNode (AST helpers), useFragments, useLogs,
│ # useAudit, useInvites, useWebhook
├── types.ts # shared client types (Route, Group, Filter, ...)
└── utils/legal.ts # terms/privacy HTML bodies (zh/en)
server/ # Nitro server
+148
View File
@@ -0,0 +1,148 @@
<template>
<AlertDialogRoot :open="!!request" @update:open="onOpenChange">
<AlertDialogPortal>
<AlertDialogOverlay class="confirm-overlay" />
<AlertDialogContent class="confirm-dialog">
<div class="confirm-body">
<span class="confirm-icon" aria-hidden="true"><Trash2 :size="18" /></span>
<div class="min-w-0 space-y-1.5">
<AlertDialogTitle class="confirm-title">{{ shown?.title }}</AlertDialogTitle>
<AlertDialogDescription v-if="shown?.description" class="confirm-description">
{{ shown.description }}
</AlertDialogDescription>
</div>
</div>
<div class="confirm-actions">
<AlertDialogCancel as-child>
<RcButton variant="outline" color="neutral">{{ t("confirm.cancel") }}</RcButton>
</AlertDialogCancel>
<RcButton color="error" @click="settle(true)">
{{ shown?.confirmText || t("confirm.delete") }}
</RcButton>
</div>
</AlertDialogContent>
</AlertDialogPortal>
</AlertDialogRoot>
</template>
<script setup lang="ts">
import { Trash2 } from "lucide-vue-next";
import {
AlertDialogCancel,
AlertDialogContent,
AlertDialogDescription,
AlertDialogOverlay,
AlertDialogPortal,
AlertDialogRoot,
AlertDialogTitle,
} from "reka-ui";
import type { ConfirmOptions } from "~/composables/useConfirm";
const { t } = useI18n();
const { pending: request, settle, attachHost } = useConfirm();
// Keep the last request on screen while the close animation plays.
const shown = ref<ConfirmOptions | null>(null);
watch(
request,
(next) => {
if (next) shown.value = next;
},
{ immediate: true },
);
// A request must never outlive the console that asked for it: resolving it
// later would resume a destructive action of an unmounted component.
let detach: (() => void) | undefined;
onMounted(() => (detach = attachHost()));
onBeforeUnmount(() => detach?.());
function onOpenChange(open: boolean): void {
if (!open) settle(false);
}
</script>
<style scoped>
.confirm-overlay {
position: fixed;
inset: 0;
z-index: 60;
background: var(--wh-scrim);
backdrop-filter: blur(4px);
}
.confirm-dialog {
position: fixed;
top: 50%;
left: 50%;
z-index: 60;
display: grid;
gap: 1.25rem;
width: calc(100% - 2rem);
max-width: 28rem;
transform: translate(-50%, -50%);
border-radius: 0.75rem;
background: rgb(var(--wh-surface));
box-shadow:
inset 0 0 0 1px rgb(var(--wh-border)),
0 20px 25px -5px rgb(0 0 0 / 0.1),
0 8px 10px -6px rgb(0 0 0 / 0.1);
padding: 1.5rem;
color: rgb(var(--wh-text));
}
.confirm-dialog:focus {
outline: none;
}
.confirm-body {
display: flex;
align-items: flex-start;
gap: 0.875rem;
}
.confirm-icon {
display: grid;
flex: none;
width: 2.25rem;
height: 2.25rem;
place-items: center;
border-radius: 9999px;
background: rgb(var(--wh-bad-dim));
color: rgb(var(--wh-bad));
}
.confirm-title {
font-size: 1rem;
font-weight: 600;
letter-spacing: -0.01em;
line-height: 1.5rem;
overflow-wrap: anywhere;
}
.confirm-description {
color: rgb(var(--wh-muted));
font-size: 0.875rem;
line-height: 1.5rem;
}
.confirm-actions {
display: flex;
justify-content: flex-end;
gap: 0.625rem;
}
.confirm-overlay[data-state="open"],
.confirm-dialog[data-state="open"] {
animation: confirm-in 150ms ease-out;
}
@keyframes confirm-in {
from {
opacity: 0;
}
}
@media (max-width: 420px) {
.confirm-actions {
display: grid;
grid-template-columns: 1fr 1fr;
}
}
@media (prefers-reduced-motion: reduce) {
.confirm-overlay[data-state="open"],
.confirm-dialog[data-state="open"] {
animation: none;
}
}
</style>
+10 -3
View File
@@ -315,6 +315,8 @@
@close="groupEditorOpen = false"
@save="onSaveGroup"
/>
<ConfirmDialog />
</div>
</template>
@@ -343,6 +345,7 @@ import AdminHome from "~/components/AdminHome.vue";
const { t, toggle } = useI18n();
const { push } = useToasts();
const { confirm } = useConfirm();
const route = useRoute();
const router = useRouter();
@@ -582,7 +585,8 @@ async function onToggle(route: Route): Promise<void> {
async function onDelete(route: Route): Promise<void> {
const group = selectedGroup.value;
if (!group) return;
if (!window.confirm(t("confirm.deleteRoute", { name: route.name || route.id }))) return;
if (!(await confirm({ title: t("confirm.deleteRoute", { name: route.name || route.id }) })))
return;
try {
await saveGroupRoutes(
group.id,
@@ -665,8 +669,11 @@ async function onDeleteGroup(group: Group): Promise<void> {
} catch {
// Count is best-effort; proceed without the warning.
}
const warn = used ? t("confirm.deleteGroupWarn", { n: used }) : "";
if (!window.confirm(t("confirm.deleteGroup", { name: group.name || group.id }) + warn)) return;
const confirmed = await confirm({
title: t("confirm.deleteGroup", { name: group.name || group.id }),
description: used ? t("confirm.deleteGroupWarn", { n: used }).trim() : undefined,
});
if (!confirmed) return;
try {
await saveGroups(groups.value.filter((g) => g.id !== group.id));
push(t("toast.groupDeleted"));
+63
View File
@@ -0,0 +1,63 @@
export interface ConfirmOptions {
/** The question, shown as the dialog title. */
title: string;
/** Optional consequence text under the title. */
description?: string;
/** Label of the destructive button (defaults to "Delete"). */
confirmText?: string;
}
interface ConfirmRequest extends ConfirmOptions {
resolve: (confirmed: boolean) => void;
}
/**
* Promise-based destructive-action confirmation shared by the whole console.
* <ConfirmDialog /> (mounted once by ConsolePage) renders the pending request;
* `confirm()` resolves true on confirm and false on cancel / Escape.
*/
export function useConfirm() {
const pending = useState<ConfirmRequest | null>("wh-confirm", () => null);
const hosts = useState<number>("wh-confirm-hosts", () => 0);
// The component that asks; a request it makes after unmounting is refused,
// and one still on screen when it unmounts is cancelled.
const owner = getCurrentInstance();
let asked: ConfirmRequest | null = null;
if (owner) {
onBeforeUnmount(() => {
// Only our own request: another component's newer one stays open.
if (asked && toRaw(pending.value) === asked) settle(false);
asked = null;
});
}
function confirm(options: ConfirmOptions): Promise<boolean> {
// Nobody can answer, or the asker is gone (the console was left while the
// request was being prepared): never resume a stale destructive action.
if (!hosts.value || owner?.isUnmounted) return Promise.resolve(false);
// A newer request supersedes (and cancels) one still on screen.
pending.value?.resolve(false);
return new Promise((resolve) => {
asked = { ...options, resolve };
pending.value = asked;
});
}
function settle(confirmed: boolean): void {
const request = pending.value;
if (!request) return;
pending.value = null;
request.resolve(confirmed);
}
/** Register the dialog that renders requests; the returned detach cancels any pending one. */
function attachHost(): () => void {
hosts.value++;
return () => {
hosts.value--;
settle(false);
};
}
return { pending, confirm, settle, attachHost };
}
+4
View File
@@ -394,6 +394,8 @@ const en: Dict = {
"confirm.deleteRoute": 'Delete route "{name}"?',
"confirm.deleteGroup": 'Delete group "{name}"?',
"confirm.deleteGroupWarn": " {n} route(s) reference it and will lose their group.",
"confirm.cancel": "Cancel",
"confirm.delete": "Delete",
};
const zh: Dict = {
@@ -782,6 +784,8 @@ const zh: Dict = {
"confirm.deleteRoute": "确定删除路由“{name}”吗?",
"confirm.deleteGroup": "确定删除分组“{name}”吗?",
"confirm.deleteGroupWarn": " 有 {n} 条路由引用它,将失去所属分组。",
"confirm.cancel": "取消",
"confirm.delete": "删除",
};
const messages: Record<Locale, Dict> = { en, zh };
+2
View File
@@ -65,6 +65,8 @@ For local debugging only, set `DEBUG_MODE=true` to bypass GitHub OAuth and grant
The console is served as an SPA at `/admin`; its tabs are deep-linkable via the URL path (`/admin/groups`, `/admin/logs`, `/admin/audit`). URLs outside `/admin` that do not match an endpoint return a plain `404` instead of the console.
Destructive actions — deleting routes or groups — ask for confirmation in an in-app dialog.
All management endpoints (`/admin/api/*`) are documented in the [Admin API](../api/admin). Saved routes and groups are persisted to D1 (`d1_routes` / `d1_groups`) immediately, the KV cache is invalidated and the config cache is refreshed so the webhook pipeline picks them up on the next run.
## Filter Types
+2
View File
@@ -64,6 +64,8 @@ WebHooker 在 `/admin` 提供内置配置控制台,可在浏览器中管理路
控制台以 SPA 形式在 `/admin` 提供;其标签页可通过 URL 路径直达(`/admin/groups`、`/admin/logs`、`/admin/audit`)。`/admin` 之外未匹配到端点的 URL 直接返回 `404`,而不会展示控制台。
删除类操作——删除路由或分组——都会先弹出应用内确认框。
所有管理端点(`/admin/api/*`)见 [Admin API](../api/admin)。保存的路由和分组会立即持久化到 D1(`d1_routes` / `d1_groups`),并使 KV 缓存失效、刷新配置缓存,下一次 webhook 处理即会生效。
## 过滤器类型
+5 -1
View File
@@ -37,11 +37,15 @@ export default defineNuxtConfig({
},
vite: {
plugins: [tailwindcss()],
// App components use reka-ui primitives directly, alongside the copy
// @elysola/ui imports. Pre-bundling it up front keeps both on one
// dev instance; otherwise a mid-session discovery splits them and dialogs
// and popovers stop stacking (Escape / outside clicks reach the wrong layer).
// `debug` and `extend` are CommonJS packages @elysola/ui's markdown stack
// (micromark, unified) imports; served unbundled in dev they lack a default
// export and the console fails to start.
optimizeDeps: {
include: ["debug", "extend"],
include: ["reka-ui", "debug", "extend"],
},
},
devtools: { enabled: false },