frontend/latex,qmd,rmd: showProjectRestartDialog for all 3 of them for outdated projects

Author: haraldschilly

src/packages/backend/exec-stream.ts

@@ -180,7 +180,6 @@ export async function executeStream(
     }
 
     // Stats monitoring is now handled by execute-code.ts via streamCB
-    // No need for duplicate monitoring here
   } catch (err) {
     stream({ error: `${err}` });
     stream(null); // End the stream

src/packages/frontend/frame-editors/generic/client.ts

@@ -7,16 +7,18 @@
 Typescript async/await rewrite of @cocalc/util/client.coffee...
 */
 
+import { Modal } from "antd";
 import { Map } from "immutable";
+
 import { redux } from "@cocalc/frontend/app-framework";
+import { excludeFromComputeServer } from "@cocalc/frontend/file-associations";
 import { webapp_client } from "@cocalc/frontend/webapp-client";
 import { CompressedPatch } from "@cocalc/sync/editor/generic/types";
 import { callback2 } from "@cocalc/util/async-utils";
 import { Config as FormatterConfig } from "@cocalc/util/code-formatter";
-import { FakeSyncstring } from "./syncstring-fake";
 import { type UserSearchResult as User } from "@cocalc/util/db-schema/accounts";
+import { FakeSyncstring } from "./syncstring-fake";
 export { type User };
-import { excludeFromComputeServer } from "@cocalc/frontend/file-associations";
 
 import type { ExecOpts, ExecOutput } from "@cocalc/util/db-schema/projects";
 export type { ExecOpts, ExecOutput };
@@ -25,6 +27,40 @@ import * as schema from "@cocalc/util/schema";
 
 import { DEFAULT_FONT_SIZE } from "@cocalc/util/db-schema";
 
+// Track which projects have already shown the restart dialog
+const shownRestartDialogs = new Set<string>();
+
+export function showProjectRestartDialog(project_id: string): void {
+  // Only show the dialog once per project
+  if (shownRestartDialogs.has(project_id)) {
+    return;
+  }
+
+  shownRestartDialogs.add(project_id);
+
+  const actions = redux.getActions("projects");
+
+  Modal.confirm({
+    title: "Project Needs Update",
+    content: `This project needs to be restarted to support the new streaming compilation feature.
+    Your work is automatically saved and will not be lost.`,
+    okText: "Restart Project",
+    cancelText: "Not Now",
+    width: 500,
+    onOk: () => {
+      if (actions) {
+        actions.restart_project(project_id);
+      }
+      // Clear the tracking when user clicks OK
+      shownRestartDialogs.delete(project_id);
+    },
+    onCancel: () => {
+      // Clear the tracking when user dismisses the dialog
+      shownRestartDialogs.delete(project_id);
+    },
+  });
+}
+
 export function server_time(): Date {
   return webapp_client.time_client.server_time();
 }

src/packages/frontend/frame-editors/latex-editor/util.ts

@@ -5,19 +5,16 @@
 
 // data and functions specific to the latex editor.
 
-import { Modal } from "antd";
-
-import { redux } from "@cocalc/frontend/app-framework";
-import { ExecOutput } from "@cocalc/frontend/frame-editors/generic/client";
+import {
+  ExecOutput,
+  showProjectRestartDialog,
+} from "@cocalc/frontend/frame-editors/generic/client";
 import { webapp_client } from "@cocalc/frontend/webapp-client";
 import { ExecOptsBlocking } from "@cocalc/util/db-schema/projects";
 import { separate_file_extension } from "@cocalc/util/misc";
 import { ExecuteCodeOutputAsync } from "@cocalc/util/types/execute-code";
 import { TIMEOUT_LATEX_JOB_S } from "./constants";
 
-// Track which projects have already shown the restart dialog
-const shownRestartDialogs = new Set<string>();
-
 export function pdf_path(path: string): string {
   // if it is already a pdf, don't change the upper/lower casing -- #4562
   const { name, ext } = separate_file_extension(path);
@@ -188,34 +185,3 @@ export async function runJob(opts: RunJobOpts): Promise<ExecOutput> {
     });
   });
 }
-
-function showProjectRestartDialog(project_id: string): void {
-  // Only show the dialog once per project
-  if (shownRestartDialogs.has(project_id)) {
-    return;
-  }
-
-  shownRestartDialogs.add(project_id);
-
-  const actions = redux.getActions("projects");
-
-  Modal.confirm({
-    title: "Project Needs Update",
-    content: `This project needs to be restarted to support the new streaming compilation feature.
-    Your work is automatically saved and will not be lost.`,
-    okText: "Restart Project",
-    cancelText: "Not Now",
-    width: 500,
-    onOk: () => {
-      if (actions) {
-        actions.restart_project(project_id);
-      }
-      // Clear the tracking when user clicks OK
-      shownRestartDialogs.delete(project_id);
-    },
-    onCancel: () => {
-      // Clear the tracking when user dismisses the dialog
-      shownRestartDialogs.delete(project_id);
-    },
-  });
-}

src/packages/frontend/frame-editors/rmd-editor/utils.ts

@@ -8,7 +8,7 @@ import { join } from "path";
 import { webapp_client } from "@cocalc/frontend/webapp-client";
 import { change_filename_extension, path_split } from "@cocalc/util/misc";
 import { ExecuteCodeOutputAsync } from "@cocalc/util/types/execute-code";
-import { ExecOutput } from "../generic/client";
+import { ExecOutput, showProjectRestartDialog } from "../generic/client";
 
 // something in the rmarkdown source code replaces all spaces by dashes
 // [hsy] I think this is because of calling pandoc.
@@ -158,7 +158,13 @@ export async function runJob(opts: RunJobOpts): Promise<ExecOutput> {
     });
 
     stream.on("error", (err) => {
-      reject(err);
+      // Check if this is a 503 error (exec-stream service not available in old project)
+      if (err?.code === 503) {
+        showProjectRestartDialog(project_id);
+        reject(err);
+      } else {
+        reject(err);
+      }
     });
   });
 }