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

Author: haraldschilly

src/packages/frontend/course/compute/actions.ts

@@ -17,6 +17,10 @@ import { webapp_client } from "@cocalc/frontend/webapp-client";
 import { map as awaitMap } from "awaiting";
 import { getComputeServers } from "./synctable";
 import { join } from "path";
+import {
+  computeServerManager,
+  type ComputeServerManager,
+} from "@cocalc/conat/compute/manager";
 
 declare var DEBUG: boolean;
 
@@ -388,24 +392,34 @@ export class ComputeActions {
     }
     const course_project_id = store.get("course_project_id");
 
+    let studentAssociations: null | ComputeServerManager = null;
+    // project_client.computeServers can only be used for tabs
+    // for a project that is actually open in the client, so
+    // we use it for the instructor project, but not the student
+    // project, which may not be opened.
     const courseAssociations =
       webapp_client.project_client.computeServers(course_project_id);
 
-    const studentAssociations =
-      webapp_client.project_client.computeServers(target_project_id);
+    try {
+      studentAssociations = computeServerManager({
+        project_id: target_project_id,
+      });
 
-    const ids = await courseAssociations.getServerIdForSubtree(src_path);
-    for (const source in ids) {
-      if (ids[source]) {
-        const tail = source.slice(src_path.length + 1);
-        const path = join(target_path, tail);
-        await studentAssociations.waitUntilReady();
-        // path is on a compute server.
-        studentAssociations.connectComputeServerToPath({
-          id: compute_server_id,
-          path,
-        });
+      const ids = await courseAssociations.getServerIdForSubtree(src_path);
+      for (const source in ids) {
+        if (ids[source]) {
+          const tail = source.slice(src_path.length + 1);
+          const path = join(target_path, tail);
+          await studentAssociations.waitUntilReady();
+          // path is on a compute server.
+          studentAssociations.connectComputeServerToPath({
+            id: compute_server_id,
+            path,
+          });
+        }
       }
+    } finally {
+      studentAssociations?.close();
     }
   };
 }

src/packages/frontend/project/explorer/action-bar.tsx

@@ -3,12 +3,10 @@
  *  License: MS-RSL – see LICENSE.md for details
  */
 
-import { Space } from "antd";
+import { Space, Tooltip } from "antd";
 import * as immutable from "immutable";
-import { throttle } from "lodash";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { FormattedMessage, useIntl } from "react-intl";
-
 import { Button, ButtonToolbar } from "@cocalc/frontend/antd-bootstrap";
 import { Gap, Icon } from "@cocalc/frontend/components";
 import { useStudentProjectFunctionality } from "@cocalc/frontend/course";
@@ -20,8 +18,6 @@ import { file_actions, ProjectActions } from "@cocalc/frontend/project_store";
 import * as misc from "@cocalc/util/misc";
 import { COLORS } from "@cocalc/util/theme";
 
-import { useProjectContext } from "../context";
-
 const ROW_INFO_STYLE = {
   color: COLORS.GRAY,
   height: "22px",
@@ -45,10 +41,6 @@ interface Props {
 
 export const ActionBar: React.FC<Props> = (props: Props) => {
   const intl = useIntl();
-  const [showLabels, setShowLabels] = useState<boolean>(true);
-  const { mainWidthPx } = useProjectContext();
-  const buttonRef = useRef<HTMLDivElement>(null);
-  const widthThld = useRef<number>(0);
   const [select_entire_directory, set_select_entire_directory] = useState<
     "hidden" | "check" | "clear"
   >("hidden");
@@ -76,34 +68,6 @@ export const ActionBar: React.FC<Props> = (props: Props) => {
     }
   }, [props.checked_files, props.listing, select_entire_directory]);
 
-  useEffect(() => {
-    const btnbar = buttonRef.current;
-    if (btnbar == null) return;
-    const resizeObserver = new ResizeObserver(
-      throttle(
-        (entries) => {
-          if (entries.length > 0) {
-            const width = entries[0].contentRect.width;
-            // TODO: this "+100" is sloppy. This makes it much better than before
-            // (e.g. german buttons were cutoff all the time), but could need more tweaking
-            if (showLabels && width > mainWidthPx + 100) {
-              setShowLabels(false);
-              widthThld.current = width;
-            } else if (!showLabels && width < widthThld.current - 1) {
-              setShowLabels(true);
-            }
-          }
-        },
-        100,
-        { leading: false, trailing: true },
-      ),
-    );
-    resizeObserver.observe(btnbar);
-    return () => {
-      resizeObserver.disconnect();
-    };
-  }, [mainWidthPx, buttonRef.current]);
-
   function clear_selection(): void {
     props.actions.set_all_files_unchecked();
     if (select_entire_directory !== "hidden") {
@@ -255,10 +219,12 @@ export const ActionBar: React.FC<Props> = (props: Props) => {
     };
 
     return (
-      <Button onClick={handle_click} disabled={disabled} key={name}>
-        <Icon name={obj.icon} />{" "}
-        {showLabels ? `${intl.formatMessage(obj.name)}...` : ""}
-      </Button>
+      <Tooltip title={intl.formatMessage(obj.name)}>
+        <Button onClick={handle_click} disabled={disabled} key={name}>
+          <Icon name={obj.icon} />
+        </Button>
+        &nbsp;
+      </Tooltip>
     );
   }
 
@@ -337,7 +303,7 @@ export const ActionBar: React.FC<Props> = (props: Props) => {
   }
   return (
     <div style={{ flex: "1 0 auto" }}>
-      <div ref={buttonRef} style={{ flex: "1 0 auto" }}>
+      <div style={{ flex: "1 0 auto" }}>
         <ButtonToolbar style={{ whiteSpace: "nowrap", padding: "0" }}>
           <Space.Compact>
             {props.project_is_running ? render_check_all_button() : undefined}

src/packages/frontend/project/explorer/misc-side-buttons.tsx

@@ -18,8 +18,6 @@ import { ProjectActions } from "@cocalc/frontend/project_store";
 import track from "@cocalc/frontend/user-tracking";
 import { KUCALC_COCALC_COM } from "@cocalc/util/db-schema/site-defaults";
 
-const SHOW_SERVER_LAUNCHERS = false;
-
 import TourButton from "./tour/button";
 
 const OPEN_MSG = defineMessage({
@@ -176,7 +174,7 @@ export const MiscSideButtons: React.FC<Props> = (props) => {
     // we make sure the url ends with a slash, without messing up the full URL
     const s = base.slice(base.length - 1) === "/" ? "" : "/";
     const url = `${base}${s}${current_path ? "lab/tree/" + current_path : ""}`;
-    const values = { name: SPEC.code.longName };
+    const values = { name: SPEC.jupyterlab.longName };
     const tooltip = intl.formatMessage(OPEN_MSG, values);
     const description = intl.formatMessage(SPEC.jupyterlab.description, values);
     return (
@@ -209,12 +207,10 @@ export const MiscSideButtons: React.FC<Props> = (props) => {
       style={{ whiteSpace: "nowrap", padding: "0" }}
       className="pull-right"
     >
-      {SHOW_SERVER_LAUNCHERS && (
-        <Space.Compact>
-          {render_jupyterlab_button()}
-          {render_vscode_button()}
-        </Space.Compact>
-      )}
+      <Space.Compact>
+        {render_jupyterlab_button()}
+        {render_vscode_button()}
+      </Space.Compact>
       <Space.Compact>
         {render_upload_button()}
         {render_library_button()}

src/packages/package.json

@@ -31,7 +31,7 @@
       "[email protected]": "3.0.9",
       "@types/[email protected]": "2.48.13",
       "@types/[email protected]": "2.6.13",
-      "[email protected]": "^1.11.0"
+      "[email protected]": "^1.12.0"
     },
     "onlyBuiltDependencies": [
       "websocket-sftp",

src/packages/pnpm-lock.yaml

@@ -74,7 +74,7 @@
     "async": "^1.5.2",
     "await-spawn": "^4.0.2",
     "awaiting": "^3.0.0",
-    "axios": "^1.11.0",
+    "axios": "^1.12.0",
     "base62": "^2.0.1",
     "base64-js": "^1.5.1",
     "cloudflare": "^2.9.1",

src/packages/server/package.json

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