fix(sql-file): toast completion and close dialog on success

2026-10-19 16:16:45 +00:00 · 2026-10-19 02:52:33 +08:00
parent 145003646c
commit 6e7b62b58e
15 changed files with 99 additions and 2 deletions
@@ -1167,3 +1167,53 @@ describe("SqlFileExecutionDialog target preservation (#4844)", () => {
    await vi.waitFor(() => expect(mocks.executeSqlFiles).toHaveBeenCalledWith(expect.objectContaining({ connectionId: "mysql-1", database: "chosen_db" }), ["/tmp/brand_new.sql"]));
  });
 });
+
+describe("SqlFileExecutionDialog completion prompt and close (#12608)", () => {
+  it("toasts success and closes dialog upon successful completion", async () => {
+    const onOpenChange = vi.fn();
+    await mountReadyDialog(onOpenChange);
+
+    mocks.executeSqlFiles.mockImplementationOnce(async (request) => {
+      mocks.progressHandler?.(progress(request.executionId, "done", { statementIndex: 1, successCount: 1, failureCount: 0 }));
+    });
+
+    findButton("sqlFile.execute").click();
+
+    await vi.waitFor(() => expect(mocks.toast).toHaveBeenCalledWith("sqlFile.executeSuccess", 3000));
+    expect(onOpenChange).toHaveBeenCalledWith(false);
+  });
+
+  it("toasts warning and keeps dialog open when execution has statement failures", async () => {
+    const onOpenChange = vi.fn();
+    await mountReadyDialog(onOpenChange);
+
+    mocks.executeSqlFiles.mockImplementationOnce(async (request) => {
+      mocks.progressHandler?.(progress(request.executionId, "done", { statementIndex: 2, successCount: 1, failureCount: 1 }));
+    });
+
+    findButton("sqlFile.execute").click();
+
+    await vi.waitFor(() => expect(mocks.toast).toHaveBeenCalledWith("sqlFile.completedWithErrors", 5000));
+    expect(onOpenChange).not.toHaveBeenCalled();
+  });
+
+  it("toasts success and closes dialog upon manual transaction commit", async () => {
+    const onOpenChange = vi.fn();
+    await mountReadyDialog(onOpenChange);
+    const label = Array.from(root!.querySelectorAll("label")).find((item) => item.textContent?.includes("toolbar.manualTransaction"));
+    label!.querySelector<HTMLInputElement>('input[type="checkbox"]')!.click();
+    await nextTick();
+
+    mocks.executeSqlFiles.mockImplementationOnce(async (request: { executionId: string }) => {
+      mocks.progressHandler?.(progress(request.executionId, "done", { statementIndex: 1, successCount: 1, failureCount: 0 }));
+    });
+    findButton("sqlFile.execute").click();
+
+    await vi.waitFor(() => expect(findButton("toolbar.commit").disabled).toBe(false));
+    expect(onOpenChange).not.toHaveBeenCalled();
+
+    findButton("toolbar.commit").click();
+    await vi.waitFor(() => expect(mocks.toast).toHaveBeenCalledWith("sqlFile.executeSuccess", 3000));
+    expect(onOpenChange).toHaveBeenCalledWith(false);
+  });
+});
@@ -252,6 +252,15 @@ async function finishTransaction(commit: boolean) {
      if (progress.value) updateSqlFileTask(executionId.value, { ...progress.value, status: terminalStatus.value });
    }
    await refreshTargetAfterImport(sqlFileExecutionTarget());
+    if (committed && !outcomeUnknown) {
+      const failureCount = progress.value?.failureCount ?? 0;
+      if (failureCount > 0) {
+        toast(t("sqlFile.completedWithErrors", { succeeded: progress.value?.successCount ?? 0, failed: failureCount }), 5000);
+      } else {
+        toast(t("sqlFile.executeSuccess"), 3000);
+        open.value = false;
+      }
+    }
    return true;
  } catch (error: any) {
    toast(error?.message || String(error), 5000);
@@ -751,6 +760,7 @@ async function startExecution() {
  const taskLabel = previews.value.length === 1 ? previews.value[0]!.fileName : `${previews.value[0]!.fileName} (+${previews.value.length - 1})`;
  activeExecutionTask.value = addSqlFileTask(batchId, taskLabel, filePathDisplay.value);
  let completedSuccessfully = false;
+  let terminal: SqlFileProgress | null = null;

  try {
    await store.ensureConnected(connectionId.value);
@@ -848,7 +858,8 @@ async function startExecution() {
        },
        executionPaths,
      );
-      const terminal = await terminalProgress;
+      terminal = await terminalProgress;
+      progress.value = terminal;
      if (terminal.status === "error") {
        throw new Error(terminal.error || "SQL file execution failed");
      }
@@ -873,7 +884,17 @@ async function startExecution() {
          }
        }
      }
-      if (!txnSessionId.value) await refreshTargetAfterImport(target);
+      if (!txnSessionId.value) {
+        await refreshTargetAfterImport(target);
+        const finalProgress = terminal ?? progress.value;
+        const failureCount = finalProgress?.failureCount ?? 0;
+        if (failureCount > 0) {
+          toast(t("sqlFile.completedWithErrors", { succeeded: finalProgress?.successCount ?? 0, failed: failureCount }), 5000);
+        } else {
+          toast(t("sqlFile.executeSuccess"), 3000);
+          open.value = false;
+        }
+      }
    }
  } catch (e: any) {
    terminalStatus.value = cancelRequested.value ? "cancelled" : "error";
@@ -6827,6 +6827,8 @@ export default withEnglishFallback({
    fileProgress: "Fayl {current} / {total}",
    fileColumn: "Fayl",
    totalFiles: "{count} fayl",
+    executeSuccess: "SQL faylı uğurla icra edildi",
+    completedWithErrors: "İcra tamamlandı: {succeeded} uğurlu, {failed} uğursuz",
  },
  sqlFileTree: {
    folderNameInvalid: "Yol deyil, tək qovluq adı daxil edin.",
@@ -8186,6 +8186,8 @@ export default {
    },
    fileColumn: "File",
    totalFiles: "{count} files",
+    executeSuccess: "SQL file executed successfully",
+    completedWithErrors: "Execution completed: {succeeded} succeeded, {failed} failed",
  },
  sqlFileTree: {
    folderNameInvalid: "Enter a single folder name, not a path.",
@@ -7400,6 +7400,8 @@ export default withEnglishFallback({
    },
    fileColumn: "Archivo",
    totalFiles: "{count} archivos",
+    executeSuccess: "Archivo SQL ejecutado con éxito",
+    completedWithErrors: "Ejecución completada: {succeeded} correctos, {failed} fallidos",
  },
  diff: {
    progress: {
@@ -7526,6 +7526,8 @@ export default withEnglishFallback({
    },
    fileColumn: "File",
    totalFiles: "{count} file",
+    executeSuccess: "File SQL berhasil dijalankan",
+    completedWithErrors: "Eksekusi selesai: {succeeded} berhasil, {failed} gagal",
  },
  sqlFileTree: {
    folderNameInvalid: "Masukkan satu nama folder, bukan jalur.",
@@ -7184,6 +7184,8 @@ export default withEnglishFallback({
    fileProgress: "File {current} di {total}",
    fileColumn: "File",
    totalFiles: "{count} file",
+    executeSuccess: "File SQL eseguito con successo",
+    completedWithErrors: "Esecuzione completata: {succeeded} riusciti, {failed} non riusciti",
  },
  diff: {
    progress: {
@@ -7212,6 +7212,8 @@ export default withEnglishFallback({
    fileProgress: "ファイル {current}/{total}",
    fileColumn: "ファイル",
    totalFiles: "{count} ファイル",
+    executeSuccess: "SQLファイルを実行しました",
+    completedWithErrors: "実行が完了しました: 成功 {succeeded} 件、失敗 {failed} 件",
  },
  diff: {
    progress: {
@@ -6987,6 +6987,8 @@ export default withEnglishFallback({
    fileProgress: "파일 {current}/{total}",
    fileColumn: "파일",
    totalFiles: "{count}개 파일",
+    executeSuccess: "SQL 파일을 실행했습니다",
+    completedWithErrors: "실행 완료: 성공 {succeeded}개, 실패 {failed}개",
  },
  sqlFileTree: {
    folderNameInvalid: "경로가 아닌 폴더 이름 하나를 입력하세요.",
@@ -7183,6 +7183,8 @@ export default withEnglishFallback({
    fileProgress: "Arquivo {current} de {total}",
    fileColumn: "Arquivo",
    totalFiles: "{count} arquivos",
+    executeSuccess: "Arquivo SQL executado com sucesso",
+    completedWithErrors: "Execução concluída: {succeeded} com sucesso, {failed} com falha",
  },
  diff: {
    progress: {
@@ -8433,6 +8433,8 @@ export default withEnglishFallback({
    },
    fileColumn: "Файл",
    totalFiles: "{count} файлов",
+    executeSuccess: "SQL-файл успешно выполнен",
+    completedWithErrors: "Выполнение завершено: успешно {succeeded}, с ошибкой {failed}",
  },
  sqlFileTree: {
    folderNameInvalid: "Введите одно имя папки, а не путь.",
@@ -8842,6 +8842,8 @@ export default withEnglishFallback({
    },
    fileColumn: "ไฟล์",
    totalFiles: "ไฟล์ {count} ไฟล์",
+    executeSuccess: "เรียกใช้ไฟล์ SQL สำเร็จแล้ว",
+    completedWithErrors: "การเรียกใช้เสร็จสิ้น: สำเร็จ {succeeded}, ล้มเหลว {failed}",
  },
  sqlFileTree: {
    locateActiveFile: "ค้นหาตำแหน่งไฟล์ปัจจุบัน",
@@ -6708,6 +6708,8 @@ export default withEnglishFallback({
    fileProgress: "Dosya {current} / {total}",
    fileColumn: "Dosya",
    totalFiles: "{count} dosya",
+    executeSuccess: "SQL dosyası başarıyla çalıştırıldı",
+    completedWithErrors: "Çalıştırma tamamlandı: {succeeded} başarılı, {failed} başarısız",
  },
  sqlFileTree: {
    folderNameInvalid: "Yol yerine tek bir klasör adı girin.",
@@ -8168,6 +8168,8 @@ export default withEnglishFallback({
    },
    fileColumn: "文件",
    totalFiles: "{count} 个文件",
+    executeSuccess: "SQL 文件执行成功",
+    completedWithErrors: "执行完成：成功 {succeeded} 条，失败 {failed} 条",
  },
  sqlFileTree: {
    folderNameInvalid: "请输入单个文件夹名称，不能包含路径。",
@@ -6531,6 +6531,8 @@ export default withEnglishFallback({
    },
    fileColumn: "檔案",
    totalFiles: "{count} 個檔案",
+    executeSuccess: "SQL 檔案執行成功",
+    completedWithErrors: "執行完成：成功 {succeeded} 條，失敗 {failed} 條",
    runInBackground: "背景執行",
  },
  diff: {