fix(transfer): keep task active after table errors

This commit is contained in:
Guoyu Su authored and GitHub committed 2026-07-09 18:30:29 +08:00
1 parent e25be6335d
commit 15d392bc44
9 files changed
+119 -11

No files matched your search

+2 -1
View File
@@ -100,6 +100,7 @@ import type {
AppSupportInfo,
} from "@/lib/backend/tauri";
import type { QueryEditability } from "@/lib/sql/sqlAnalysis";
import { isTerminalTransferProgress } from "@/lib/backend/transferProgress";
import type {
DataGridColumnDistinctValuesSqlOptions,
DataGridColumnValueFilterConditionOptions,
@@ -1316,7 +1317,7 @@ export async function startTransfer(request: TransferRequest, onProgress: (progr
es.onmessage = (e) => {
const progress: TransferProgress = JSON.parse(e.data);
onProgress(progress);
if (progress.status === "done" || progress.status === "error" || progress.status === "cancelled") {
if (isTerminalTransferProgress(progress)) {
es.close();
resolve();
}
+3 -1
View File
@@ -38,6 +38,7 @@ import type { CollectionInfo } from "@/types/database";
import type { SidebarObjectKind } from "@/lib/database/databaseObjectCapabilities";
import type { AiConfig, AiTestConnectionResult } from "@/stores/settingsStore";
import type { QueryEditability } from "@/lib/sql/sqlAnalysis";
import { isTerminalTransferProgress } from "@/lib/backend/transferProgress";
import type {
DataGridColumnDistinctValuesSqlOptions,
DataGridColumnValueFilterConditionOptions,
@@ -1942,6 +1943,7 @@ export interface TransferProgress {
totalRows: number | null;
status: "running" | "tableDone" | "done" | "error" | "cancelled";
error: string | null;
terminal: boolean;
}
export async function startTransfer(request: TransferRequest, onProgress: (progress: TransferProgress) => void): Promise<void> {
@@ -1952,7 +1954,7 @@ export async function startTransfer(request: TransferRequest, onProgress: (progr
unlisten = await listen<TransferProgress>("transfer-progress", (event) => {
if (event.payload.transferId !== request.transferId) return;
onProgress(event.payload);
if (event.payload.status === "done" || event.payload.status === "error" || event.payload.status === "cancelled") {
if (isTerminalTransferProgress(event.payload)) {
unlisten?.();
resolve();
}
@@ -0,0 +1,8 @@
type TransferProgressTerminalState = {
terminal?: boolean;
status: "running" | "tableDone" | "done" | "error" | "cancelled";
};
export function isTerminalTransferProgress(progress: TransferProgressTerminalState): boolean {
return progress.terminal === true || progress.status === "done" || progress.status === "cancelled";
}