Merge remote-tracking branch 'origin/master' into sso-exclusive-all

Author: haraldschilly

src/packages/frontend/codemirror/util.ts

@@ -0,0 +1,56 @@
+import { set, get, del } from "@cocalc/frontend/misc/local-storage-typed";
+import { isEqual } from "lodash";
+
+export function getFoldedLines(cm): number[] {
+  if (cm?.foldCode == null) {
+    // not enabled
+    return [];
+  }
+  return cm
+    .getAllMarks()
+    .filter((mark) => mark.__isFold)
+    .map((mark) => mark.find().from.line);
+}
+
+export function setFoldedLines(cm, lines: number[]) {
+  if (cm?.foldCode == null) {
+    // not enabled
+    return;
+  }
+  lines.reverse();
+  for (const n of lines) {
+    cm.foldCode(n);
+  }
+}
+
+function toKey(key: string): string {
+  return `cmfold-${key}`;
+}
+
+export function initFold(cm, key: string) {
+  const k = toKey(key);
+  const lines = get<number[]>(k);
+  if (lines != null) {
+    try {
+      setFoldedLines(cm, lines);
+    } catch (err) {
+      console.warn(`error setting cold folding for ${key}: `, err);
+      del(k);
+    }
+  }
+}
+
+export function saveFold(cm, key: string) {
+  const k = toKey(key);
+  const lines = get<number[]>(k);
+  const lines2 = getFoldedLines(cm);
+  if (lines2.length == 0) {
+    if (lines != null) {
+      del(k);
+    }
+    return;
+  }
+  if (!isEqual(lines, lines2)) {
+    set<number[]>(k, lines2);
+  }
+}

src/packages/frontend/components/link-retry.tsx

@@ -24,7 +24,7 @@ interface Props {
   onClick?: () => void;
   autoStart?: boolean;
   maxTime?: number;
-  tooltip?: string;
+  tooltip?: React.ReactNode;
 }
 
 const LinkRetry: React.FC<Props> = ({

src/packages/frontend/frame-editors/code-editor/codemirror-editor.tsx

@@ -36,6 +36,7 @@ import { GutterMarkers } from "./codemirror-gutter-markers";
 import { Actions } from "./actions";
 import { EditorState } from "../frame-tree/types";
 import { Path } from "../frame-tree/path";
+import { initFold, saveFold } from "@cocalc/frontend/codemirror/util";
 
 const STYLE = {
   width: "100%",
@@ -290,6 +291,16 @@ export const CodemirrorEditor: React.FC<Props> = React.memo((props) => {
     }
     cmRef.current.setOption("readOnly", props.read_only);
     cm_refresh();
+
+    const foldKey = `${props.path}\\${props.id}`;
+    const saveFoldState = () => {
+      if (cmRef.current != null) {
+        saveFold(cmRef.current,foldKey);
+      }
+    };
+    cmRef.current.on("fold" as any, saveFoldState);
+    cmRef.current.on("unfold" as any, saveFoldState);
+    initFold(cmRef.current, foldKey);
   }
 
   function init_new_codemirror(): void {

src/packages/frontend/frame-editors/frame-tree/frame-tree.tsx

@@ -290,7 +290,8 @@ export const FrameTree: React.FC<FrameTreeProps> = React.memo(
       let name_leaf = name;
       let actions_leaf = actions;
       if (
-        spec.name === "TimeTravel" &&
+        typeof spec.name != "string" &&
+        spec.name?.id === "labels.timetravel" &&
         !(actions instanceof TimeTravelActions)
       ) {
         if (path_leaf.slice(path_leaf.length - 12) != ".time-travel") {

src/packages/frontend/i18n/bin/common.sh

@@ -157,6 +157,8 @@ export const labels = defineMessages({
     description: "The button to engage with the AI Assistant dialog",
   },
   timetravel: {
+    // DO NOT CHANGE THIS labels.timetravel ID!!!! It is explcitly used in frontend/frame-editors/frame-tree/frame-tree.tsx
+    // This caused a massive bug when i18n was first merged.
     id: "labels.timetravel",
     defaultMessage: "TimeTravel",
     description:

src/packages/frontend/i18n/bin/compile.sh

@@ -560,7 +560,7 @@
     "defaultMessage": "Describe the problem of that cell in order to get a bugfixed version."
   },
   "jupyter.llm.dell-tool.actions.bugfix.label": {
-    "defaultMessage": "Explain"
+    "defaultMessage": "Fix Bugs"
   },
   "jupyter.llm.dell-tool.actions.document.descr": {
     "defaultMessage": "Add documentation"

src/packages/frontend/i18n/bin/download.sh

@@ -28,6 +28,7 @@ import { Complete, Actions as CompleteActions } from "./complete";
 import { Cursors } from "./cursors";
 import { Position } from "./insert-cell/types";
 import { is_whitespace } from "@cocalc/util/misc";
+import { initFold, saveFold } from "@cocalc/frontend/codemirror/util";
 
 // We cache a little info about each Codemirror editor we make here,
 // so we can restore it when we make the same one again.  Due to
@@ -147,12 +148,17 @@ export const CodeMirrorEditor: React.FC<CodeMirrorEditorProps> = ({
 
   useEffect(() => {
     if (frameActions.current?.frame_id != null) {
-      key.current = `${frameActions.current.frame_id}${id}`;
+      key.current = `${(actions as any)?.path}${
+        frameActions.current.frame_id
+      }${id}`;
     }
     init_codemirror(options, value);
 
     return () => {
       if (cm.current != null) {
+        if (key.current != null) {
+          saveFold(cm.current, key.current);
+        }
         cm_save();
         cm_destroy();
       }
@@ -638,13 +644,6 @@ export const CodeMirrorEditor: React.FC<CodeMirrorEditorProps> = ({
       options0.extraKeys["Ctrl-Enter"] = () => {};
       options0.extraKeys["Alt-Enter"] = () => {};
       options0.extraKeys["Cmd-Enter"] = () => {};
-      /*
-      Disabled for now since fold state isn't preserved.
-      if (options0.foldGutter) {
-        options0.extraKeys["Ctrl-Q"] = cm => cm.foldCodeSelectionAware();
-        options0.gutters = ["CodeMirror-linenumbers", "CodeMirror-foldgutter"];
-      }
-      */
     } else {
       options0.readOnly = true;
     }
@@ -762,6 +761,17 @@ export const CodeMirrorEditor: React.FC<CodeMirrorEditorProps> = ({
     if (is_focused) {
       focus_cm();
     }
+
+    if (key.current != null) {
+      initFold(cm.current, key.current);
+      const save = () => {
+        if (cm.current != null && key.current != null) {
+          saveFold(cm.current, key.current);
+        }
+      };
+      cm.current.on("fold", save);
+      cm.current.on("unfold", save);
+    }
   }
 
   function focus_cm(): void {

src/packages/frontend/i18n/bin/extract.sh

@@ -158,7 +158,7 @@ const ACTIONS: { [mode in Mode]: LLMTool } = {
     icon: "clean-outlined",
     label: defineMessage({
       id: "jupyter.llm.dell-tool.actions.bugfix.label",
-      defaultMessage: "Explain",
+      defaultMessage: "Fix Bugs",
     }),
     descr: defineMessage({
       id: "jupyter.llm.dell-tool.actions.bugfix.descr",

src/packages/frontend/i18n/bin/upload.sh

@@ -28,7 +28,7 @@ import { useAvailableFeatures } from "./use-available-features";
 
 interface Server {
   longName: string;
-  description: string;
+  description: React.ReactNode;
   usesBasePath: boolean;
   icon: IconName;
 }
@@ -66,8 +66,12 @@ code completion, snippets, code refactoring, and embedded Git.`,
   },
   pluto: {
     longName: "Julia Pluto.jl",
-    description:
-      "Reactive notebooks for Julia.  NOTE: This can take a long time to start, so be patient.",
+    description: (
+      <>
+        Reactive notebooks for Julia.{" "}
+        <b>NOTE: Pluto may take a long time to start, so be patient.</b>
+      </>
+    ),
     usesBasePath: false,
     icon: "julia",
   },

src/packages/frontend/i18n/common.ts

@@ -13,13 +13,13 @@ const log = getLogger("server:accounts:creation-actions");
 export default async function accountCreationActions(
   email_address: string,
   account_id: string,
-  tags?: string[]
+  tags?: string[],
 ): Promise<void> {
   log.debug({ account_id, email_address, tags });
   const pool = getPool();
   const { rows } = await pool.query(
     "SELECT action FROM account_creation_actions WHERE email_address=$1 AND expire > NOW()",
-    [email_address]
+    [email_address],
   );
   let numProjects = 0;
   for (const { action } of rows) {
@@ -32,17 +32,12 @@ export default async function accountCreationActions(
     }
   }
   log.debug("added user to", numProjects, "projects");
-  if (numProjects == 0 && tags != null && tags.length > 0) {
-    // didn't get added to any projects, but there are some explicit tags.
+  if (numProjects == 0) {
+    // didn't get added to any projects
     // You're a new user with no known "reason"
     // to use CoCalc, except that you found the page and signed up.  You are
-    // VERY likely to create a project next, or you wouldn't be here.  The only
-    // exception I can think of is accounting people (e.g., in the store) making
-    // an enterprise purchase, and that is probably 0.01% of users, and likely
-    // that sign in flow won't have tags set anyways, so won't end up here.
-    // Also directly creating accounts via the api wouldn't have tags set.
-    // So we create an account for you now to increase your chance of success,
-    // since you tagged some things.
+    // VERY likely to create a project next, or you wouldn't be here.
+    // So we create a project for you now to increase your chance of success.
     // NOTE -- wrapped in closure, since do NOT block on this:
     (async () => {
       try {
@@ -70,6 +65,6 @@ export async function creationActionsDone(account_id: string): Promise<void> {
   const pool = getPool();
   await pool.query(
     "UPDATE accounts SET creation_actions_done=true WHERE account_id=$1::UUID",
-    [account_id]
+    [account_id],
   );
 }

src/packages/frontend/i18n/extracted.json

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