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: