Merge remote-tracking branch 'origin/master' into latex-new-output-panel

Author: haraldschilly

src/packages/frontend/client/project.ts

@@ -279,14 +279,14 @@ export class ProjectClient {
         compute_server_id: opts.compute_server_id ?? 0,
         service: EXEC_STREAM_SERVICE,
       });
-
       let lastSeq = -1;
 
       const req = cn.requestMany(
         subject,
         { ...opts, debug },
         {
           maxWait: (opts.timeout ?? 300) * 1000,
+          waitForInterest: true,
         },
       );
       for await (const resp of await req) {

src/packages/frontend/compute/compute-server.tsx

@@ -1,7 +1,6 @@
 import { Button, Card, Divider, Modal, Popconfirm, Spin } from "antd";
-import { CSSProperties, useMemo, useState } from "react";
-
-import { useTypedRedux } from "@cocalc/frontend/app-framework";
+import { CSSProperties, useEffect, useMemo, useState } from "react";
+import { redux, useTypedRedux } from "@cocalc/frontend/app-framework";
 import { Icon } from "@cocalc/frontend/components";
 import ShowError from "@cocalc/frontend/components/error";
 import { CancelText } from "@cocalc/frontend/i18n/components";
@@ -564,6 +563,13 @@ export default function ComputeServer({
 }
 
 export function useServer({ id, project_id }) {
+  useEffect(() => {
+    const actions = redux.getProjectActions(project_id);
+    actions.incrementReferenceCount();
+    return () => {
+      actions.decrementReferenceCount();
+    };
+  }, [project_id]);
   const computeServers = useTypedRedux({ project_id }, "compute_servers");
   const server = useMemo(() => {
     return computeServers?.get(`${id}`)?.toJS();

src/packages/frontend/compute/spend-limit.tsx

@@ -44,8 +44,11 @@ export function SpendLimit({
   const [error, setError] = useState<string>("");
   const [saving, setSaving] = useState<boolean>(false);
   const [spendLimit, setSpendLimit] = useState<Partial<ISpendLimit>>(
-    server.configuration?.spendLimit ?? SPEND_LIMIT_DEFAULTS,
+    server?.configuration?.spendLimit ?? SPEND_LIMIT_DEFAULTS,
   );
+  useEffect(() => {
+    setSpendLimit(server?.configuration?.spendLimit ?? SPEND_LIMIT_DEFAULTS);
+  }, [server?.configuration]);
 
   if (server == null) {
     return <Spin />;
@@ -197,6 +200,7 @@ export function SpendLimitModal({ id, project_id, close, extra = [] }) {
         </div>
       }
     >
+      {help && <div>Configure limits on spending here.</div>}
       <SpendLimit id={id} project_id={project_id} help={help} extra={extra} />
     </Modal>
   );

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

@@ -7,18 +7,16 @@
 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 { type UserSearchResult as User } from "@cocalc/util/db-schema/accounts";
 import { FakeSyncstring } from "./syncstring-fake";
+import { type UserSearchResult as User } from "@cocalc/util/db-schema/accounts";
 export { type User };
+import { excludeFromComputeServer } from "@cocalc/frontend/file-associations";
 
 import type { ExecOpts, ExecOutput } from "@cocalc/util/db-schema/projects";
 export type { ExecOpts, ExecOutput };
@@ -27,40 +25,6 @@ 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/jupyter-editor/editor.ts

@@ -456,7 +456,7 @@ const JUPYTER_MENUS = {
           icon: "dot-circle",
           label: ({ props }) => {
             const actions = props.actions.jupyter_actions;
-            const store = actions.store;
+            const store = actions?.store;
             if (!store) {
               return "Kernels";
             }
@@ -477,7 +477,7 @@ const JUPYTER_MENUS = {
           name: "kernels",
           children: ({ props }) => {
             const actions = props.actions.jupyter_actions;
-            const store = actions.store;
+            const store = actions?.store;
             if (!store) {
               return [];
             }

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

@@ -5,10 +5,7 @@
 
 // data and functions specific to the latex editor.
 
-import {
-  ExecOutput,
-  showProjectRestartDialog,
-} from "@cocalc/frontend/frame-editors/generic/client";
+import { ExecOutput } 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";
@@ -171,17 +168,7 @@ export async function runJob(opts: RunJobOpts): Promise<ExecOutput> {
     });
 
     stream.on("error", (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(
-          new Error(
-            "Unable to run the compilation. Please check up on the project.",
-          ),
-        );
-      }
+      reject(new Error(`Unable to run the compilation. ${err}`));
     });
   });
 }

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

@@ -4,11 +4,10 @@
  */
 
 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, showProjectRestartDialog } from "../generic/client";
+import { ExecOutput } from "../generic/client";
 
 // something in the rmarkdown source code replaces all spaces by dashes
 // [hsy] I think this is because of calling pandoc.
@@ -158,13 +157,7 @@ export async function runJob(opts: RunJobOpts): Promise<ExecOutput> {
     });
 
     stream.on("error", (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);
-      }
+      reject(err);
     });
   });
 }

src/packages/frontend/project_actions.ts

@@ -336,9 +336,31 @@ export class ProjectActions extends Actions<ProjectStoreState> {
   };
   isTabClosed = () => !this.isTabOpened();
 
+  // The expensive part of the actions should NOT exist if and only if
+  // the reference count is 0 *AND* the tab is closed.
+  private referenceCount = 0;
+
+  incrementReferenceCount = () => {
+    this.referenceCount++;
+    this.initExpensive();
+  };
+
+  decrementReferenceCount = () => {
+    if (this.referenceCount <= 0) {
+      console.warn(
+        "BUG: attempt to decrement project actions reference count below 0",
+      );
+      return;
+    }
+    this.referenceCount--;
+    if (this.referenceCount <= 0 && !this.isTabOpened()) {
+      this.closeExpensive();
+    }
+  };
+
   private expensiveLoop = async () => {
     while (this.state != "closed") {
-      if (this.isTabOpened()) {
+      if (this.isTabOpened() || this.referenceCount > 0) {
         this.initExpensive();
       } else {
         this.closeExpensive();

src/packages/util/smc-version.js

@@ -1,2 +1,2 @@
 /* autogenerated by the update_version script */
-exports.version=1758034770;
+exports.version=1758657266;