Skip to content

armgit / dbx

Public Imported from GitHub
0

25 MB lightweight cross-platform database client for 100+ databases, including MySQL, PostgreSQL, SQLite, Redis, MongoDB, DuckDB, SQL Server, and Dameng. Built-in AI, MCP Server, CLI, desktop and Docker. | 轻量级跨平台数据库管理工具,支持 MySQL、PostgreSQL、SQLite、Redis、MongoDB、达梦等 100+ 数据库,提供桌面端、Docker、CLI、内置 AI 助手和 MCP。

fix(export): allow confirmed recovery after unacknowledged cancellation (#13805)

efeiree8eb8b6434ff
diff --git a/apps/desktop/src/components/export/DatabaseExportDialog.vue b/apps/desktop/src/components/export/DatabaseExportDialog.vue
index 62462d4c79..316280030e 100644
--- a/apps/desktop/src/components/export/DatabaseExportDialog.vue
+++ b/apps/desktop/src/components/export/DatabaseExportDialog.vue
@@ -487,7 +487,7 @@ async function startDesktopExport() {
batchDatabaseTotal.value = 0;
batchRowsExported.value = 0;
exportProgress.value = { exportId: id, currentObject: "", objectIndex: 0, totalObjects: 0, rowsExported: 0, totalRows: null, status: "Running", error: null, preparing: true };
- const ownsView = () => !disposed && exportId.value === id;
+ const ownsView = () => !task.removed && !disposed && exportId.value === id;
const sync = () => {
if (!ownsView()) return;
desktopTaskStatus.value = task.status;
@@ -602,7 +602,7 @@ async function startDesktopExport() {
exportProgress.value = final;
exportWarning.value = firstError;
}
- if (!cancelled) {
+ if (!cancelled && !task.removed) {
if (captured.allDatabases)
notifyExportComplete({
filePath: firstFile || destination,
diff --git a/apps/desktop/src/components/export/ExportProgressPopover.vue b/apps/desktop/src/components/export/ExportProgressPopover.vue
index 7dd1c5f505..8bcf884973 100644
--- a/apps/desktop/src/components/export/ExportProgressPopover.vue
+++ b/apps/desktop/src/components/export/ExportProgressPopover.vue
@@ -13,10 +13,29 @@ import { useToast } from "@/composables/useToast";
import { isTauriRuntime } from "@/lib/backend/tauriRuntime";
import { copyToClipboard } from "@/lib/common/clipboard";
import * as api from "@/lib/backend/api";
+import DangerConfirmDialog from "@/components/editor/DangerConfirmDialog.vue";
const { t } = useI18n();
const { toast } = useToast();
-const { tasks, activeCount, hasActive, clearFinished, cancelTask, removeTask } = useExportTracker();
+const { tasks, activeCount, hasActive, clearFinished, cancelTask, removeTask, recoverCancelledTask } = useExportTracker();
+const recoveryOpen = ref(false);
+const pendingRemoval = ref<ExportTask>();
+
+function requestRemoval(task: ExportTask) {
+ if (task.canRemove === false) return;
+ if (task.status === "Unknown" || task.canRecoverCancellation) {
+ pendingRemoval.value = task;
+ recoveryOpen.value = true;
+ } else if (isFinished(task.status)) removeTask(task.exportId);
+}
+
+function confirmRemoval() {
+ const task = pendingRemoval.value;
+ pendingRemoval.value = undefined;
+ if (!task || !tasks.value.includes(task) || task.canRemove === false) return;
+ if (task.status === "Cancelling" && task.canRecoverCancellation) recoverCancelledTask(task.exportId);
+ else if (task.status === "Unknown" || isFinished(task.status)) removeTask(task.exportId);
+}
const open = ref(false);
const showAll = ref(false);
const expandedFailureTaskIds = ref<string[]>([]);
@@ -468,7 +487,7 @@ function openTask(task: ExportTask): void {
<FolderOpen class="h-3.5 w-3.5 text-muted-foreground hover:text-foreground" />
</button>
<button
- v-if="(isActive(task.status) || task.status === 'Queued') && task.canCancel !== false"
+ v-if="!task.canRecoverCancellation && (isActive(task.status) || task.status === 'Queued') && task.canCancel !== false"
class="flex h-6 w-6 items-center justify-center rounded hover:bg-muted disabled:cursor-not-allowed"
:disabled="task.status === 'Cancelling'"
:title="task.status === 'Cancelling' ? t('databaseBackup.cancelling') : t('exportProgress.cancel')"
@@ -477,7 +496,7 @@ function openTask(task: ExportTask): void {
<Loader2 v-if="task.status === 'Cancelling'" class="h-3.5 w-3.5 animate-spin text-primary" />
<X v-else class="h-3.5 w-3.5 text-muted-foreground hover:text-destructive" />
</button>
- <button v-else-if="task.canRemove !== false && (isFinished(task.status) || task.status === 'Unknown')" class="flex h-6 w-6 items-center justify-center rounded hover:bg-muted" :title="t('exportProgress.delete')" @click="removeTask(task.exportId)">
+ <button v-else-if="task.canRemove !== false && (isFinished(task.status) || task.status === 'Unknown' || task.canRecoverCancellation)" class="flex h-6 w-6 items-center justify-center rounded hover:bg-muted" :title="t('exportProgress.delete')" @click="requestRemoval(task)">
<X class="h-3.5 w-3.5 text-muted-foreground hover:text-foreground" />
</button>
</div>
@@ -497,6 +516,7 @@ function openTask(task: ExportTask): void {
</div>
</PopoverContent>
</Popover>
+ <DangerConfirmDialog v-model:open="recoveryOpen" :title="t('exportProgress.recoveryTitle')" :message="t('exportProgress.recoveryMessage')" :confirm-label="t('exportProgress.recoveryConfirm')" initial-focus="cancel" @confirm="confirmRemoval" />
</template>
<style scoped>
diff --git a/apps/desktop/src/components/export/__tests__/DatabaseExportDialog.queue.spec.ts b/apps/desktop/src/components/export/__tests__/DatabaseExportDialog.queue.spec.ts
index a7de0b1338..27205d02a2 100644
--- a/apps/desktop/src/components/export/__tests__/DatabaseExportDialog.queue.spec.ts
+++ b/apps/desktop/src/components/export/__tests__/DatabaseExportDialog.queue.spec.ts
@@ -207,3 +207,35 @@ it("does not release the queue when rollback completion is unknown", async () =>
expect(next).not.toHaveBeenCalled();
expect(tracker.tasks.value[0]!.errorMessage).toBe("rollback reply lost");
});
+
+it.each([false, true])("recovers the UI lease without rolling back a still-running snapshot (batch: %s)", async (batch) => {
+ const tracker = useExportTracker();
+ const dialog = await mountDialog(batch);
+ await dialog.start();
+ await vi.waitFor(() => expect(operations).toHaveLength(1));
+ const root = tracker.tasks.value[0]!;
+ const next = vi.fn().mockResolvedValue("settled");
+ tracker.submitExportTask(tracker.addTask("next", "csv", "different-output.csv"), "queued", next);
+ vi.useFakeTimers();
+ try {
+ await tracker.cancelTask(root.exportId);
+ await vi.advanceTimersByTimeAsync(30_000);
+ expect(root.canRecoverCancellation).toBe(true);
+ expect(mocks.rollback).not.toHaveBeenCalled();
+ expect(next).not.toHaveBeenCalled();
+ tracker.recoverCancelledTask(root.exportId);
+ expect(next).toHaveBeenCalledOnce();
+ expect(mocks.rollback).not.toHaveBeenCalled();
+ expect(operations).toHaveLength(1);
+ mocks.toast.mockClear();
+ terminal(0, "Done");
+ await vi.advanceTimersByTimeAsync(0);
+ expect(mocks.rollback).toHaveBeenCalledOnce();
+ expect(operations).toHaveLength(1);
+ expect(next).toHaveBeenCalledOnce();
+ expect(tracker.tasks.value).not.toContain(root);
+ expect(mocks.toast).not.toHaveBeenCalled();
+ } finally {
+ vi.useRealTimers();
+ }
+});
diff --git a/apps/desktop/src/components/export/__tests__/ExportProgressPopover.spec.ts b/apps/desktop/src/components/export/__tests__/ExportProgressPopover.spec.ts
index 1188e4082c..f6535bc77a 100644
--- a/apps/desktop/src/components/export/__tests__/ExportProgressPopover.spec.ts
+++ b/apps/desktop/src/components/export/__tests__/ExportProgressPopover.spec.ts
@@ -105,7 +105,7 @@ describe("table copy background task", () => {
expect(cancel).toHaveBeenCalledOnce();
task.status = "Unknown";
await nextTick();
- expect(document.querySelector('button[title="Delete"]')).toBeNull();
+ expect(document.querySelector('button[title="Remove"]')).toBeNull();
tracker.removeTask(task.exportId);
expect(tracker.tasks.value).toContain(task);
task.status = "Done";
@@ -714,7 +714,7 @@ describe("ExportProgressPopover file name and reveal action", () => {
expect(run).not.toHaveBeenCalled();
});
- it("does not offer deletion or animate progress for an unknown export", async () => {
+ it("requires confirmation before deleting an unknown export and does not animate it", async () => {
const tracker = useExportTracker();
const task = tracker.addTask("Query Result", "csv", "/tmp/unknown.csv");
task.status = "Unknown";
@@ -722,8 +722,24 @@ describe("ExportProgressPopover file name and reveal action", () => {
await mountPopover();
expect(document.body.textContent).toContain("Export status unknown; the queue is blocked");
expect(document.body.textContent).toContain("transport interrupted");
- expect(document.body.querySelector('button[title="Delete"]')).toBeNull();
+ const remove = document.body.querySelector<HTMLButtonElement>('button[title="Remove"]');
+ expect(remove).not.toBeNull();
expect(document.body.querySelector(".export-progress-indeterminate")).toBeNull();
+ remove!.click();
+ await nextTick();
+ expect(tracker.tasks.value).toContain(task);
+ expect(document.body.textContent).toContain(i18n.global.t("exportProgress.recoveryMessage"));
+ const dialog = document.body.querySelector('[role="dialog"]');
+ const cancel = Array.from(dialog!.querySelectorAll("button")).find((button) => button.textContent?.trim() === "Cancel");
+ cancel!.click();
+ await nextTick();
+ expect(tracker.tasks.value).toContain(task);
+ remove!.click();
+ await nextTick();
+ const confirm = Array.from(document.body.querySelector('[role="dialog"]')!.querySelectorAll("button")).find((button) => button.textContent?.trim() === i18n.global.t("exportProgress.recoveryConfirm"));
+ confirm!.click();
+ await nextTick();
+ expect(tracker.tasks.value).not.toContain(task);
});
it("shows the saved file name instead of the synthetic query-result label", async () => {
@@ -739,6 +755,38 @@ describe("ExportProgressPopover file name and reveal action", () => {
expect(document.body.textContent).not.toContain("Query Result.xlsx");
});
+ it("offers confirmed recovery independently of the cancel button and releases only after acceptance", async () => {
+ const tracker = useExportTracker();
+ const task = tracker.addTask("stalled", "csv", "/old/stalled.csv");
+ let finish!: (outcome: "settled") => void;
+ tracker.submitExportTask(
+ task,
+ "queued",
+ () =>
+ new Promise((resolve) => {
+ finish = resolve;
+ }),
+ );
+ const next = vi.fn(async () => "settled" as const);
+ tracker.submitExportTask(tracker.addTask("next", "csv", "/different/next.csv"), "queued", next);
+ task.status = "Cancelling";
+ task.canCancel = false;
+ task.canRecoverCancellation = true;
+ await mountPopover();
+ document.body.querySelector<HTMLButtonElement>('button[title="Remove"]')!.click();
+ await nextTick();
+ expect(next).not.toHaveBeenCalled();
+ const confirm = Array.from(document.body.querySelector('[role="dialog"]')!.querySelectorAll("button")).find((button) => button.textContent?.trim() === i18n.global.t("exportProgress.recoveryConfirm"));
+ expect(document.body.textContent).toContain(i18n.global.t("exportProgress.recoveryMessage"));
+ confirm!.click();
+ await nextTick();
+ expect(next).toHaveBeenCalledOnce();
+ expect(tracker.tasks.value).not.toContain(task);
+ finish("settled");
+ await Promise.resolve();
+ expect(next).toHaveBeenCalledOnce();
+ });
+
it("falls back to the table label when the task has no file path", async () => {
const tracker = useExportTracker();
tracker.addTask("audit_log", "csv", "");
diff --git a/apps/desktop/src/components/objects/ObjectBrowser.vue b/apps/desktop/src/components/objects/ObjectBrowser.vue
index 663540a241..f1c033dfd7 100644
--- a/apps/desktop/src/components/objects/ObjectBrowser.vue
+++ b/apps/desktop/src/components/objects/ObjectBrowser.vue
@@ -4064,8 +4064,10 @@ async function exportTableData(
task.totalRows = result.rows.length;
task.finishedAt = Date.now();
}
- toast(t("grid.exported"));
- void autoRevealExportedPathIfConfigured(filePath);
+ if (!task?.removed) {
+ toast(t("grid.exported"));
+ void autoRevealExportedPathIfConfigured(filePath);
+ }
return "settled";
}
let columns: string[] | undefined;
@@ -4125,7 +4127,7 @@ async function exportTableData(
const terminalProgress = await (native ? api.startTableExport(request, onProgress, true) : api.startTableExport(request, onProgress));
if (native && terminalProgress.status !== "Done" && terminalProgress.status !== "Error" && terminalProgress.status !== "Cancelled") throw new SnapshotCompletionError("unknown", "Export completion was not confirmed");
updateTableExportTask(currentTask.exportId, terminalProgress);
- if (terminalProgress.status === "Done") {
+ if (terminalProgress.status === "Done" && !task.removed) {
toast(t("grid.exported"));
}
return "settled";
@@ -4140,7 +4142,7 @@ async function exportTableData(
task.errorMessage = e?.message || String(e);
task.finishedAt = unknown ? undefined : Date.now();
}
- toast(t("grid.exportFailed", { message: e?.message || String(e) }), 5000);
+ if (!task?.removed) toast(t("grid.exportFailed", { message: e?.message || String(e) }), 5000);
return unknown ? "unknown" : "settled";
} finally {
if (native && task) {
diff --git a/apps/desktop/src/composables/__tests__/useDataGridExport.queue.spec.ts b/apps/desktop/src/composables/__tests__/useDataGridExport.queue.spec.ts
index d3ab16c717..feb2f7f0a8 100644
--- a/apps/desktop/src/composables/__tests__/useDataGridExport.queue.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useDataGridExport.queue.spec.ts
@@ -167,6 +167,39 @@ describe("data grid queued table export", () => {
finish(0);
});
+ it("keeps the newer grid view and suppresses late success after manual recovery", async () => {
+ const { useDataGridExport } = await import("../useDataGridExport");
+ const { useExportTracker } = await import("../useExportTracker");
+ const { options, progress } = fixture();
+ const grid = useDataGridExport(options);
+ const tracker = useExportTracker();
+ await grid.exportCsv();
+ await vi.waitFor(() => expect(pending).toHaveLength(1));
+ const root = tracker.tasks.value[0]!;
+ await grid.exportCsv();
+ vi.useFakeTimers();
+ try {
+ await tracker.cancelTask(root.exportId);
+ await vi.advanceTimersByTimeAsync(30_000);
+ tracker.recoverCancelledTask(root.exportId);
+ await vi.advanceTimersByTimeAsync(0);
+ expect(pending).toHaveLength(2);
+ expect(progress.value.filePath).toBe("C:/exports/report-2.csv");
+ const currentView = { ...progress.value };
+ mocks.toast.mockClear();
+ finish(0, "Done");
+ await vi.advanceTimersByTimeAsync(0);
+ expect(progress.value).toEqual(currentView);
+ expect(mocks.toast).not.toHaveBeenCalled();
+ expect(mocks.openTemp).not.toHaveBeenCalled();
+ expect(tracker.tasks.value).not.toContain(root);
+ finish(1);
+ await vi.advanceTimersByTimeAsync(0);
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+
it("cancels a waiting file without starting a backend export", async () => {
const { useDataGridExport } = await import("../useDataGridExport");
const { options, progress } = fixture();
diff --git a/apps/desktop/src/composables/__tests__/useExportTracker.queue.spec.ts b/apps/desktop/src/composables/__tests__/useExportTracker.queue.spec.ts
index 04c8731b4c..31e274b148 100644
--- a/apps/desktop/src/composables/__tests__/useExportTracker.queue.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useExportTracker.queue.spec.ts
@@ -79,4 +79,101 @@ describe("export tracker queue", () => {
second.finish("settled");
await Promise.resolve();
});
+
+ it.each(["resolved", "rejected", "pending"])("offers manual recovery when cancellation is %s but has no terminal", async (cancellation) => {
+ vi.useFakeTimers();
+ try {
+ const { useExportTracker } = await import("../useExportTracker");
+ const tracker = useExportTracker();
+ const first = completion();
+ const running = tracker.addTask("first", "csv", "first.csv");
+ tracker.submitExportTask(running, "queued", first.run);
+ const second = completion();
+ tracker.submitExportTask(tracker.addTask("second", "csv", "second.csv"), "queued", second.run);
+
+ await vi.advanceTimersByTimeAsync(120_000);
+ expect(running.status).toBe("Running");
+ expect(running.canRecoverCancellation).not.toBe(true);
+ tracker.registerTaskCancelHandler(running.exportId, () => {
+ running.status = "Cancelling";
+ if (cancellation === "rejected") return Promise.reject(new Error("cancel response lost"));
+ if (cancellation === "pending") return new Promise<void>(() => {});
+ });
+ void tracker.cancelTask(running.exportId);
+ await vi.advanceTimersByTimeAsync(29_999);
+ expect(running.canRecoverCancellation).not.toBe(true);
+ await vi.advanceTimersByTimeAsync(1);
+ expect(running.canRecoverCancellation).toBe(true);
+ expect(running.status).toBe("Cancelling");
+ expect(second.run).not.toHaveBeenCalled();
+ expect(first.run).toHaveBeenCalledOnce();
+ tracker.recoverCancelledTask(running.exportId);
+ expect(running.removed).toBe(true);
+ expect(second.run).toHaveBeenCalledOnce();
+ tracker.recoverCancelledTask(running.exportId);
+ first.finish("settled");
+ await Promise.resolve();
+ expect(second.run).toHaveBeenCalledOnce();
+ expect(tracker.tasks.value).toHaveLength(1);
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+
+ it("recovers a batch from its current child without needing an enabled cancel button", async () => {
+ vi.useFakeTimers();
+ try {
+ const { useExportTracker } = await import("../useExportTracker");
+ const tracker = useExportTracker();
+ const root = tracker.addTask("batch", "csv", "/exports");
+ const first = completion();
+ tracker.submitExportTask(root, "queued", first.run);
+ const child = tracker.addTask("child", "csv", "/exports/child.csv");
+ tracker.registerTaskCancelHandler(
+ child.exportId,
+ () => {
+ root.status = "Cancelling";
+ child.status = "Cancelling";
+ child.canCancel = false;
+ },
+ root.exportId,
+ );
+ const second = completion();
+ tracker.submitExportTask(tracker.addTask("next", "csv", "/next.csv"), "queued", second.run);
+ await tracker.cancelTask(child.exportId);
+ await vi.advanceTimersByTimeAsync(30_000);
+ expect(child.canRecoverCancellation).toBe(true);
+ expect(second.run).not.toHaveBeenCalled();
+ tracker.recoverCancelledTask(child.exportId);
+ expect(root.removed).toBe(true);
+ expect(child.removed).toBe(true);
+ expect(second.run).toHaveBeenCalledOnce();
+ first.finish("settled");
+ second.finish("settled");
+ await Promise.resolve();
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+
+ it("clears recovery eligibility when the real task finishes before the deadline", async () => {
+ vi.useFakeTimers();
+ try {
+ const { useExportTracker } = await import("../useExportTracker");
+ const tracker = useExportTracker();
+ const task = tracker.addTask("first", "csv", "first.csv");
+ const first = completion();
+ tracker.submitExportTask(task, "queued", first.run);
+ await tracker.cancelTask(task.exportId);
+ tracker.updateTableExportTask(task.exportId, { exportId: task.exportId, tableName: "first", rowsExported: 0, totalRows: null, status: "Cancelled" });
+ first.finish("settled");
+ await vi.advanceTimersByTimeAsync(60_000);
+ expect(task.canRecoverCancellation).not.toBe(true);
+ expect(vi.getTimerCount()).toBe(0);
+ tracker.recoverCancelledTask(task.exportId);
+ expect(tracker.tasks.value).toContain(task);
+ } finally {
+ vi.useRealTimers();
+ }
+ });
});
diff --git a/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.queue.spec.ts b/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.queue.spec.ts
index 5a6c5402a2..a220d338d8 100644
--- a/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.queue.spec.ts
+++ b/apps/desktop/src/composables/__tests__/useSidebarTreeExportRuntime.queue.spec.ts
@@ -236,6 +236,37 @@ describe("sidebar Mongo manual export queue", () => {
expect(tracker.tasks.value[0]!.status).toBe("Done");
});
+ it.each([false, true])("recovers the original lease from a cancelled table row and ignores late success (batch: %s)", async (batch) => {
+ const { runtime, tracker } = await tableFixture(batch);
+ await runtime.exportData("csv");
+ await vi.waitFor(() => expect(tables).toHaveLength(1));
+ const root = tracker.tasks.value[0]!;
+ const child = tracker.tasks.value.find((task) => task.exportId === tables[0]!.request.exportId)!;
+ const next = vi.fn().mockResolvedValue("settled");
+ tracker.submitExportTask(tracker.addTask("next", "csv", "C:/different/next.csv"), "queued", next);
+ vi.useFakeTimers();
+ try {
+ await tracker.cancelTask(child.exportId);
+ await vi.advanceTimersByTimeAsync(30_000);
+ expect(child.canRecoverCancellation).toBe(true);
+ expect(next).not.toHaveBeenCalled();
+ tracker.recoverCancelledTask(child.exportId);
+ expect(root.removed).toBe(true);
+ expect(child.removed).toBe(true);
+ expect(next).toHaveBeenCalledOnce();
+ mocks.toast.mockClear();
+ finishTable(0, "Done");
+ await vi.advanceTimersByTimeAsync(0);
+ expect(tables).toHaveLength(1);
+ expect(mocks.toast).not.toHaveBeenCalled();
+ expect(tracker.tasks.value).not.toContain(root);
+ expect(tracker.tasks.value).not.toContain(child);
+ expect(next).toHaveBeenCalledOnce();
+ } finally {
+ vi.useRealTimers();
+ }
+ });
+
it.each(["terminal", "transport"] as const)("does not release a cancelled table batch on cancel acknowledgement (%s)", async (outcome) => {
const { runtime, tracker } = await tableFixture(true);
await runtime.exportData("csv");
diff --git a/apps/desktop/src/composables/useDataGridExport.ts b/apps/desktop/src/composables/useDataGridExport.ts
index e48f606246..cb617a888e 100644
--- a/apps/desktop/src/composables/useDataGridExport.ts
+++ b/apps/desktop/src/composables/useDataGridExport.ts
@@ -2463,7 +2463,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
if (exportCancelHandler) {
exportCancelHandler.value = () => tracker.cancelTask(exportId);
}
- const ownsView = () => !scopeDisposed && currentExportViewId === exportId;
+ const ownsView = () => !task.removed && !scopeDisposed && currentExportViewId === exportId;
const updateView = () => {
if (ownsView()) {
if (exportProgressState) exportProgressState.value = { ...exportProgressState.value, status: task.status, startedAt: task.startedAt, finishedAt: task.finishedAt, errorMessage: task.errorMessage };
@@ -2512,7 +2512,7 @@ export function useDataGridExport(options: UseDataGridExportOptions) {
});
if (!terminalSeen) tracker.updateTableExportTask(exportId, progress);
terminalSeen ||= progress.status === "Done" || progress.status === "Error" || progress.status === "Cancelled";
- if (progress.status === "Done") {
+ if (progress.status === "Done" && !task.removed) {
notifyExportSuccess(openAfterExport ? undefined : outputPath);
if (openAfterExport && isTauriRuntime()) await api.openQueryResultTempFile(outputPath);
}
diff --git a/apps/desktop/src/composables/useExportTracker.ts b/apps/desktop/src/composables/useExportTracker.ts
index f828761d75..a0166630b5 100644
--- a/apps/desktop/src/composables/useExportTracker.ts
+++ b/apps/desktop/src/composables/useExportTracker.ts
@@ -103,6 +103,9 @@ export interface ExportTask {
dictionaryProgressKnown?: boolean;
canCancel?: boolean;
canRemove?: boolean;
+ canRecoverCancellation?: boolean;
+ manualExportRootId?: string;
+ removed?: boolean;
copyPhase?: "preparing" | "structure" | "data" | "refreshing" | "cancelling" | "succeeded" | "failed" | "cancelled" | "unknown";
onOpen?: () => void;
onRemove?: () => void;
@@ -205,6 +208,16 @@ const taskMap = reactive<Map<string, ExportTask>>(new Map());
const activeTransferRuns = new Set<string>();
const packageTransferConfirmations = new WeakMap<ExportTask, api.OraclePackageTransferRequest>();
const taskCancelHandlers = new Map<string, () => void | Promise<void>>();
+const manualExportRuns = new Map<string, { task: ExportTask; timer?: ReturnType<typeof setTimeout> }>();
+
+function clearCancellationRecovery(exportId: string) {
+ const run = manualExportRuns.get(exportId);
+ if (run?.timer) clearTimeout(run.timer);
+ if (run) run.timer = undefined;
+ for (const task of taskMap.values()) {
+ if (task.manualExportRootId === exportId) task.canRecoverCancellation = false;
+ }
+}
const transferFailureStates = new Map<string, TransferFailureState>();
const sqlFileFailureStates = new Map<string, SqlFileFailureState>();
const textEncoder = new TextEncoder();
@@ -453,6 +466,7 @@ export function useExportTracker() {
const hasActive = computed(() => activeCount.value > 0);
function submitExportTask(task: ExportTask, mode: ManualExportMode, run: () => Promise<"settled" | "unknown">, onStateChange?: (task: ExportTask) => void) {
+ task.manualExportRootId = task.exportId;
let handle: ReturnType<typeof submitManualExport>;
const cancelQueued = () => {
handle.cancelQueued();
@@ -460,8 +474,23 @@ export function useExportTracker() {
handle = submitManualExport({
id: task.exportId,
mode,
- run,
+ run() {
+ manualExportRuns.set(task.exportId, { task });
+ const finish = () => {
+ clearCancellationRecovery(task.exportId);
+ manualExportRuns.delete(task.exportId);
+ };
+ try {
+ const pending = run();
+ void pending.then(finish, finish);
+ return pending;
+ } catch (error) {
+ finish();
+ throw error;
+ }
+ },
onStateChange(state, error) {
+ if (task.removed) return;
if (state === "queued") {
task.status = "Queued";
task.startedAt = undefined;
@@ -955,6 +984,19 @@ export function useExportTracker() {
function removeTask(exportId: string) {
const task = taskMap.get(exportId);
if (task?.canRemove === false) return;
+ if (task?.status === "Unknown" && task.manualExportRootId) {
+ const rootId = task.manualExportRootId;
+ const members = [...taskMap.values()].filter((member) => member.manualExportRootId === rootId);
+ if (members.some((member) => member.canRemove === false)) return;
+ clearCancellationRecovery(rootId);
+ for (const member of members) {
+ member.removed = true;
+ taskMap.delete(member.exportId);
+ taskCancelHandlers.delete(member.exportId);
+ }
+ releaseManualExport(rootId);
+ return;
+ }
if (task?.status === "Unknown") releaseManualExport(exportId);
if (task && (task.status === "Done" || task.status === "Error" || task.status === "Cancelled")) cleanupFinishedTask(task);
taskMap.delete(exportId);
@@ -975,8 +1017,10 @@ export function useExportTracker() {
}
}
- function registerTaskCancelHandler(exportId: string, handler: () => void | Promise<void>) {
+ function registerTaskCancelHandler(exportId: string, handler: () => void | Promise<void>, rootId?: string) {
taskCancelHandlers.set(exportId, handler);
+ const task = taskMap.get(exportId);
+ if (task && rootId) task.manualExportRootId = rootId;
}
function unregisterTaskCancelHandler(exportId: string) {
@@ -987,6 +1031,16 @@ export function useExportTracker() {
const task = taskMap.get(exportId);
if (task?.canCancel === false) return;
if (task && (task.kind === "table-export" || task.kind === "database-export") && (task.status === "Done" || task.status === "Error" || task.status === "Cancelled" || task.status === "Unknown" || task.status === "Cancelling")) return;
+ const rootId = task?.manualExportRootId;
+ const run = rootId ? manualExportRuns.get(rootId) : undefined;
+ if (run && !run.timer) {
+ run.timer = setTimeout(() => {
+ if (manualExportRuns.get(rootId!) !== run || run.task.removed) return;
+ for (const member of taskMap.values()) {
+ if (member.manualExportRootId === rootId && member.status === "Cancelling") member.canRecoverCancellation = true;
+ }
+ }, 30_000);
+ }
try {
const customHandler = taskCancelHandlers.get(exportId);
if (customHandler) {
@@ -1001,11 +1055,20 @@ export function useExportTracker() {
markTableExportTaskCancelling(exportId);
await api.cancelTableExport(exportId);
}
- } catch {
- // ignore
+ } catch (error) {
+ if (run && !run.task.removed) run.task.errorMessage = error instanceof Error ? error.message : String(error);
}
}
+ function recoverCancelledTask(exportId: string) {
+ const task = taskMap.get(exportId);
+ if (!task?.canRecoverCancellation || task.status !== "Cancelling" || task.canRemove === false) return;
+ const root = taskMap.get(task.manualExportRootId ?? exportId);
+ if (!root || root.canRemove === false) return;
+ root.status = "Unknown";
+ removeTask(root.exportId);
+ }
+
return {
tasks,
activeCount,
@@ -1035,6 +1098,7 @@ export function useExportTracker() {
registerTaskCancelHandler,
unregisterTaskCancelHandler,
removeTask,
+ recoverCancelledTask,
clearFinished,
cancelTask,
};
diff --git a/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts b/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
index c17482232f..6402e353ff 100644
--- a/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
+++ b/apps/desktop/src/composables/useSidebarTreeExportRuntime.ts
@@ -457,7 +457,7 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
task.totalRows = result.rows.length;
task.finishedAt = Date.now();
}
- if (!suppressDoneToast) {
+ if (!suppressDoneToast && !task?.removed) {
notifyExportComplete({
filePath: outputPath,
message: t("grid.exported"),
@@ -588,7 +588,7 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
currentTask.status = "Done";
currentTask.rowsExported = result.rows.length;
currentTask.totalRows = result.rows.length;
- if (!suppressDoneToast) {
+ if (!suppressDoneToast && !currentTask.removed) {
notifyExportComplete({
filePath: outputPath,
message: t("grid.exported"),
@@ -643,7 +643,7 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
if (progress.status === "Done" || progress.status === "Error" || progress.status === "Cancelled") terminalProgress = progress;
updateTableExportTask(currentTask.exportId, progress);
if (progress.status === "Done") {
- if (!suppressDoneToast) {
+ if (!suppressDoneToast && !currentTask.removed) {
notifyExportComplete({
filePath: request.filePath,
message: t("grid.exported"),
@@ -651,7 +651,7 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
toast,
});
}
- } else if (progress.status === "Error") toast(t("grid.exportFailed", { message: translateBackendError(t, progress.errorMessage || "") }), 5000);
+ } else if (progress.status === "Error" && !currentTask.removed) toast(t("grid.exportFailed", { message: translateBackendError(t, progress.errorMessage || "") }), 5000);
};
await (operation ? api.startTableExport(request, onProgress, true) : api.startTableExport(request, onProgress)).catch((error) => {
if (error instanceof SnapshotCompletionError && error.status === "failed") throw error;
@@ -761,7 +761,7 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
active.task = child;
active.cancel = cancelChild;
task.canCancel = child.canCancel !== false;
- if (child !== task) tracker.registerTaskCancelHandler(child.exportId, cancel);
+ if (child !== task) tracker.registerTaskCancelHandler(child.exportId, cancel, task.exportId);
},
};
const succeeded = format === "json" ? await exportDataLegacyForTarget(target, outputDirectory, targets.length > 1, operation) : await exportTableData(target, format, { ...capturedOptions[index], suppressDoneToast: targets.length > 1, operation });
@@ -780,7 +780,7 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
}
if (error instanceof SnapshotCompletionError && error.status === "cancelled") break;
failed = true;
- toast(t("grid.exportFailed", { message: translateBackendError(t, error) }), 5000);
+ if (!task.removed) toast(t("grid.exportFailed", { message: translateBackendError(t, error) }), 5000);
}
if (active.task && active.task !== task) tracker.unregisterTaskCancelHandler(active.task.exportId);
active.task = undefined;
@@ -789,7 +789,7 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
}
task.status = exported === targets.length ? "Done" : controller.signal.aborted ? "Cancelled" : failed ? "Error" : "Done";
task.finishedAt = Date.now();
- if (targets.length > 1 && exported > 0) toast(t("contextMenu.exportDataMultipleSuccess", { count: exported }));
+ if (!task.removed && targets.length > 1 && exported > 0) toast(t("contextMenu.exportDataMultipleSuccess", { count: exported }));
return "settled";
} finally {
if (!unknown) {
@@ -866,14 +866,14 @@ export function useSidebarTreeExportRuntime(options: SidebarTreeExportRuntimeOpt
task.status = "Done";
task.rowsExported = summary.documentsExported;
task.finishedAt = Date.now();
- notifyExportComplete({ filePath: outputPath, message: t("grid.exported"), openFolderLabel: t("exportProgress.openFolder"), toast });
+ if (!task.removed) notifyExportComplete({ filePath: outputPath, message: t("grid.exported"), openFolderLabel: t("exportProgress.openFolder"), toast });
return "settled";
} catch (error) {
task.errorMessage = error instanceof Error ? error.message : String(error);
const status = error instanceof SnapshotCompletionError ? error.status : started ? "unknown" : "failed";
task.status = status === "unknown" ? "Unknown" : status === "cancelled" ? "Cancelled" : "Error";
task.finishedAt = status === "unknown" ? undefined : Date.now();
- if (status !== "cancelled") toast(t("grid.exportFailed", { message: translateBackendError(t, error) }), 5000);
+ if (!task.removed && status !== "cancelled") toast(t("grid.exportFailed", { message: translateBackendError(t, error) }), 5000);
return status === "unknown" ? "unknown" : "settled";
} finally {
if (task.status !== "Unknown") tracker.unregisterTaskCancelHandler(task.exportId);
diff --git a/apps/desktop/src/i18n/locales/en.ts b/apps/desktop/src/i18n/locales/en.ts
index cf10423c09..85512c223d 100644
--- a/apps/desktop/src/i18n/locales/en.ts
+++ b/apps/desktop/src/i18n/locales/en.ts
@@ -3976,6 +3976,10 @@ export default {
cut: "Cut",
},
exportProgress: {
+ recoveryTitle: "Remove unconfirmed export?",
+ recoveryMessage:
+ "The background export may still be running. Deleting this task will let later queued exports start; it will not cancel or retry the original export. The original task may later write to or clean up a file at the same path, potentially overwriting or deleting it. Before continuing, ensure later tasks use a different output path.",
+ recoveryConfirm: "Delete and continue queue",
connectionChanged: "The export connection changed. Start a new export.",
transactionUnavailable: "The export transaction is no longer available. Start a new export.",
executionMode: "Execution",
diff --git a/apps/desktop/src/i18n/locales/es.ts b/apps/desktop/src/i18n/locales/es.ts
index 9c477cbfe0..4dfcf11bf1 100644
--- a/apps/desktop/src/i18n/locales/es.ts
+++ b/apps/desktop/src/i18n/locales/es.ts
@@ -3688,6 +3688,10 @@ export default withEnglishFallback({
pageProbeDescription: "Esta página muestra como máximo {count} filas; se lee como máximo 1 fila adicional para determinar si hay una página siguiente.",
},
exportProgress: {
+ recoveryTitle: "¿Eliminar la exportación cuyo final no se ha confirmado?",
+ recoveryMessage:
+ "Es posible que la exportación en segundo plano siga ejecutándose. Al eliminar esta tarea, se permitirá iniciar las exportaciones posteriores de la cola; no se volverá a cancelar ni a reintentar la exportación original. La tarea original podría escribir más adelante en un archivo de la misma ruta o eliminarlo durante la limpieza, sobrescribiéndolo o borrándolo. Antes de continuar, asegúrate de que las tareas posteriores usen una ruta de salida diferente.",
+ recoveryConfirm: "Eliminar y continuar la cola",
connectionChanged: "La conexión de exportación ha cambiado. Inicie una nueva exportación.",
transactionUnavailable: "La transacción de exportación ya no está disponible. Inicie una nueva exportación.",
executionMode: "Ejecución",
diff --git a/apps/desktop/src/i18n/locales/it.ts b/apps/desktop/src/i18n/locales/it.ts
index f16312eb6f..39fa66af0f 100644
--- a/apps/desktop/src/i18n/locales/it.ts
+++ b/apps/desktop/src/i18n/locales/it.ts
@@ -3561,6 +3561,10 @@ export default withEnglishFallback({
pageProbeDescription: "Questa pagina mostra al massimo {count} righe; viene letta al massimo 1 riga aggiuntiva per determinare se esiste una pagina successiva.",
},
exportProgress: {
+ recoveryTitle: "Eliminare l'esportazione di cui non è stata confermata la fine?",
+ recoveryMessage:
+ "L'esportazione in background potrebbe essere ancora in esecuzione. Eliminare questa attività consentirà l'avvio delle successive esportazioni in coda; non annullerà né riproverà l'esportazione originale. L'attività originale potrebbe in seguito scrivere o eseguire la pulizia di un file nello stesso percorso, sovrascrivendolo o eliminandolo. Prima di continuare, assicurati che le attività successive usino un percorso di output diverso.",
+ recoveryConfirm: "Elimina e continua la coda",
connectionChanged: "La connessione di esportazione è cambiata. Avvia una nuova esportazione.",
transactionUnavailable: "La transazione di esportazione non è più disponibile. Avvia una nuova esportazione.",
executionMode: "Esecuzione",
diff --git a/apps/desktop/src/i18n/locales/ja.ts b/apps/desktop/src/i18n/locales/ja.ts
index 2d159ca918..f040bedac6 100644
--- a/apps/desktop/src/i18n/locales/ja.ts
+++ b/apps/desktop/src/i18n/locales/ja.ts
@@ -3583,6 +3583,10 @@ export default withEnglishFallback({
pageProbeDescription: "このページには最大 {count} 行を表示し、次のページがあるかどうかを判断するために最大 1 行を追加で読み取ります。",
},
exportProgress: {
+ recoveryTitle: "終了が確認できていないエクスポートを削除しますか?",
+ recoveryMessage:
+ "バックグラウンドのエクスポートはまだ実行中の可能性があります。このタスクを削除すると、後続のキュー内エクスポートが開始できるようになりますが、元のエクスポートを再度キャンセルしたり再試行したりすることはありません。元のタスクが後から同じパスのファイルに書き込んだり、クリーンアップで削除したりして、上書きまたは削除する可能性があります。続行する前に、後続のタスクで異なる出力パスを使用することを確認してください。",
+ recoveryConfirm: "削除してキューを続行",
connectionChanged: "エクスポート先の接続が変更されました。エクスポートをやり直してください。",
transactionUnavailable: "エクスポートに使用するトランザクションは無効です。エクスポートをやり直してください。",
executionMode: "実行方法",
diff --git a/apps/desktop/src/i18n/locales/ko.ts b/apps/desktop/src/i18n/locales/ko.ts
index a61bd3ddb8..b9447f6833 100644
--- a/apps/desktop/src/i18n/locales/ko.ts
+++ b/apps/desktop/src/i18n/locales/ko.ts
@@ -3513,6 +3513,10 @@ export default withEnglishFallback({
pageProbeDescription: "이 페이지에는 최대 {count}행이 표시되며, 다음 페이지가 있는지 판단하기 위해 최대 1행을 추가로 읽습니다.",
},
exportProgress: {
+ recoveryTitle: "완료 여부가 확인되지 않은 내보내기를 삭제할까요?",
+ recoveryMessage:
+ "백그라운드 내보내기가 아직 실행 중일 수 있습니다. 이 작업을 삭제하면 이후 대기 중인 내보내기가 시작되지만, 원래 내보내기를 다시 취소하거나 재시도하지는 않습니다. 원래 작업이 나중에 같은 경로의 파일에 쓰거나 정리 작업으로 삭제하여 파일을 덮어쓰거나 삭제할 수 있습니다. 계속하기 전에 이후 작업이 다른 출력 경로를 사용하도록 하세요.",
+ recoveryConfirm: "삭제하고 대기열 계속 진행",
connectionChanged: "내보내기 연결이 변경되었습니다. 새로 내보내세요.",
transactionUnavailable: "내보내기 트랜잭션을 더 이상 사용할 수 없습니다. 새로 내보내세요.",
executionMode: "실행 방식",
diff --git a/apps/desktop/src/i18n/locales/pt-BR.ts b/apps/desktop/src/i18n/locales/pt-BR.ts
index 02dc3dd535..1a181c218d 100644
--- a/apps/desktop/src/i18n/locales/pt-BR.ts
+++ b/apps/desktop/src/i18n/locales/pt-BR.ts
@@ -3559,6 +3559,10 @@ export default withEnglishFallback({
pageProbeDescription: "Esta página exibe no máximo {count} linhas, com leitura adicional de no máximo 1 linha para determinar se há uma próxima página.",
},
exportProgress: {
+ recoveryTitle: "Excluir a exportação cuja conclusão não foi confirmada?",
+ recoveryMessage:
+ "A exportação em segundo plano ainda pode estar em execução. Excluir esta tarefa permitirá que as próximas exportações da fila sejam iniciadas; isso não cancelará nem tentará novamente a exportação original. A tarefa original poderá gravar posteriormente em um arquivo no mesmo caminho ou removê-lo durante a limpeza, sobrescrevendo-o ou excluindo-o. Antes de continuar, confirme que as próximas tarefas usarão um caminho de saída diferente.",
+ recoveryConfirm: "Excluir e continuar a fila",
connectionChanged: "A conexão de exportação mudou. Inicie uma nova exportação.",
transactionUnavailable: "A transação de exportação não está mais disponível. Inicie uma nova exportação.",
executionMode: "Execução",
diff --git a/apps/desktop/src/i18n/locales/ru.ts b/apps/desktop/src/i18n/locales/ru.ts
index 565dcf7772..61baf1e3c5 100644
--- a/apps/desktop/src/i18n/locales/ru.ts
+++ b/apps/desktop/src/i18n/locales/ru.ts
@@ -3643,6 +3643,10 @@ export default withEnglishFallback({
pageProbeDescription: "На этой странице отображается не более {count} строк; дополнительно считывается не более 1 строки, чтобы определить, есть ли следующая страница.",
},
exportProgress: {
+ recoveryTitle: "Удалить экспорт, завершение которого не подтверждено?",
+ recoveryMessage:
+ "Фоновый экспорт всё ещё может выполняться. Удаление этой задачи позволит запустить следующие экспорты в очереди, но не отменит повторно и не запустит заново исходный экспорт. Исходная задача позднее может записать данные в файл по тому же пути или удалить его при очистке, перезаписав или удалив файл. Перед продолжением убедитесь, что последующие задачи используют другой путь вывода.",
+ recoveryConfirm: "Удалить и продолжить очередь",
connectionChanged: "Подключение для экспорта изменилось. Начните новый экспорт.",
transactionUnavailable: "Транзакция для экспорта больше недоступна. Начните новый экспорт.",
executionMode: "Режим выполнения",
diff --git a/apps/desktop/src/i18n/locales/th.ts b/apps/desktop/src/i18n/locales/th.ts
index 547a7d2926..9365fe67f9 100644
--- a/apps/desktop/src/i18n/locales/th.ts
+++ b/apps/desktop/src/i18n/locales/th.ts
@@ -3819,6 +3819,9 @@ export default withEnglishFallback({
copyExtractorHeaderTwoRows: "ชื่อและคำอธิบาย (แบ่งเป็นสองบรรทัด)",
},
exportProgress: {
+ recoveryTitle: "ลบการส่งออกที่ยังยืนยันไม่ได้ว่าสิ้นสุดแล้วหรือไม่",
+ recoveryMessage: "การส่งออกเบื้องหลังอาจยังทำงานอยู่ การลบงานนี้จะทำให้การส่งออกที่อยู่ถัดไปในคิวเริ่มทำงานได้ แต่จะไม่ยกเลิกหรือเริ่มการส่งออกเดิมใหม่อีกครั้ง งานเดิมอาจเขียนทับหรือลบไฟล์ในภายหลังเมื่อเขียนหรือทำความสะอาดไฟล์ที่พาธเดียวกัน ก่อนดำเนินการต่อ โปรดตรวจสอบให้งานถัดไปใช้พาธเอาต์พุตอื่น",
+ recoveryConfirm: "ลบและดำเนินคิวต่อ",
connectionChanged: "การเชื่อมต่อสำหรับส่งออกเปลี่ยนไป โปรดเริ่มส่งออกใหม่",
transactionUnavailable: "ไม่สามารถใช้ธุรกรรมสำหรับส่งออกได้แล้ว โปรดเริ่มส่งออกใหม่",
executionMode: "วิธีดำเนินการ",
diff --git a/apps/desktop/src/i18n/locales/zh-CN.ts b/apps/desktop/src/i18n/locales/zh-CN.ts
index f8d64122ba..53fc4d52e6 100644
--- a/apps/desktop/src/i18n/locales/zh-CN.ts
+++ b/apps/desktop/src/i18n/locales/zh-CN.ts
@@ -3906,6 +3906,9 @@ export default withEnglishFallback({
victoriaMetricsTruncatedHint: "结果超过加载上限,仅加载前 {count} 行。右下角每页行数只调整已加载数据的分页显示;请缩短查询时间范围或增加筛选条件以获取完整结果。",
},
exportProgress: {
+ recoveryTitle: "删除未确认结束的导出?",
+ recoveryMessage: "后台导出可能仍在运行。删除任务会允许后续排队导出启动,不会再次取消或重试原导出。原任务后续写入或清理可能覆盖、删除同路径文件;继续前请确保后续任务使用不同输出路径。",
+ recoveryConfirm: "删除并继续队列",
connectionChanged: "导出连接已变化,请重新发起导出。",
transactionUnavailable: "导出事务已失效,请重新发起导出。",
executionMode: "执行方式",
diff --git a/apps/desktop/src/i18n/locales/zh-TW.ts b/apps/desktop/src/i18n/locales/zh-TW.ts
index 4c269a033c..e72f757ada 100644
--- a/apps/desktop/src/i18n/locales/zh-TW.ts
+++ b/apps/desktop/src/i18n/locales/zh-TW.ts
@@ -3541,6 +3541,9 @@ export default withEnglishFallback({
tableDataPreviewLoadFailed: "載入完整文字失敗:{message}",
},
exportProgress: {
+ recoveryTitle: "刪除尚未確認結束的匯出?",
+ recoveryMessage: "背景匯出可能仍在執行。刪除工作會允許後續排隊匯出啟動,不會再次取消或重試原匯出。原工作後續寫入或清理可能覆寫、刪除相同路徑的檔案;繼續前請確保後續工作使用不同的輸出路徑。",
+ recoveryConfirm: "刪除並繼續佇列",
connectionChanged: "匯出連線已變更,請重新發起匯出。",
transactionUnavailable: "匯出交易已失效,請重新發起匯出。",
executionMode: "執行方式",