Merge remote-tracking branch 'origin/master' into projects-listing-cleanup-20251010

Author: haraldschilly

src/package.json

@@ -6,6 +6,7 @@
     "make": "pnpm run build",
     "make-dev": "pnpm run build-dev",
     "build": "./workspaces.py install && ./workspaces.py build && pnpm python-api",
+    "tsc-all": "./workspaces.py tsc --parallel",
     "build-dev": "./workspaces.py install && ./workspaces.py build --dev && pnpm python-api",
     "clean": "rm -rf packages/node_modules && ./workspaces.py clean && cd compute/compute && pnpm clean ",
     "hub": "cd packages/hub && npm run hub-project-dev-nobuild",

src/packages/frontend/cspell.json

@@ -46,6 +46,7 @@
     "respawns",
     "revealjs",
     "Rmarkdown",
+    "rtex",
     "rtypes",
     "Sagemath",
     "sagetex",

src/packages/frontend/frame-editors/latex-editor/latex-log-parser.ts

@@ -23,6 +23,8 @@ import { trimEnd } from "lodash";
 
 import { normalize as path_normalize } from "path";
 
+import { filename_extension } from "@cocalc/util/misc";
+
 // Define some constants
 const LOG_WRAP_LIMIT = 79;
 const LATEX_WARNING_REGEX = /^LaTeX Warning: (.*)$/;
@@ -33,6 +35,26 @@ const LINES_REGEX = /lines? ([0-9]+)/;
 // This is used to parse the package name from the package warnings
 const PACKAGE_REGEX = /^(?:Package|Class|Module) (\b.+\b) Warning/;
 
+// Whitelist of text file extensions that can be used with \input{} or \include{}
+const ALLOWED_DEP_EXTENSIONS = [
+  "bbx",
+  "bib",
+  "bst",
+  "cbx",
+  "cfg",
+  "cls",
+  "def",
+  "lbx",
+  "md",
+  "pgf",
+  "rnw",
+  "rtex",
+  "sty",
+  "tex",
+  "tikz",
+  "txt",
+] as const;
+
 class LogText {
   private lines: string[];
   private row: number;
@@ -224,14 +246,25 @@ export class LatexParser {
 
   addDeps(line: string): void {
     line = line.trim();
-    // ignore absolute files
+    // ignore absolute files (starting with /)
     if (line[0] === "/") return;
     if (line[line.length - 1] === "\\") {
       line = line.slice(0, line.length - 1);
     }
-    // we only want to know about tex and bib files
-    const pl = line.toLowerCase(); // could be name.TEX
-    if (!pl.endsWith(".tex") && !pl.endsWith(".bib")) return;
+    // Skip files that contain a colon (like "master.pdf :")
+    if (line.includes(":")) return;
+
+    // Get the file extension (returns empty string if no extension)
+    const ext = filename_extension(line).toLowerCase();
+
+    // If there's an extension, check if it's in the whitelist
+    if (ext) {
+      if (!ALLOWED_DEP_EXTENSIONS.includes(ext as any)) {
+        return;
+      }
+    }
+    // If no extension, include it (files without extensions are allowed)
+
     this.deps.push(line);
   }
 
@@ -306,7 +339,7 @@ export class LatexParser {
     const packageMatch = this.currentLine.match(PACKAGE_REGEX);
     if (!packageMatch) return;
     const packageName = packageMatch[1];
-    // Regex to get rid of the unnecesary (packagename) prefix in most multi-line warnings
+    // Regex to get rid of the unnecessary (packagename) prefix in most multi-line warnings
     const prefixRegex = new RegExp(`(?:\\(${packageName}\\))*[\\s]*(.*)`, "i");
     // After every warning message there's a blank line, let's use it
     while (!!(this.currentLine = this.log.nextLine())) {

src/packages/frontend/misc/latex-log-parser.test.ts

@@ -1,4 +1,5 @@
 import fs from "fs";
+
 import { LatexParser } from "@cocalc/frontend/frame-editors/latex-editor/latex-log-parser";
 
 describe("latex-log-parser", () => {
@@ -14,7 +15,7 @@ describe("latex-log-parser", () => {
     expect(parsed1.deps[1]).toEqual("subfile.tex");
   });
 
-  // This is an abbrivated log of https://github.com/sagemathinc/cocalc/issues/8089
+  // This is an abbreviated log of https://github.com/sagemathinc/cocalc/issues/8089
   test("log2", () => {
     const log2 = fs.readFileSync("./misc/latex-logs/log2.txt", "utf-8");
     const parsed2 = new LatexParser(log2, {
@@ -23,7 +24,27 @@ describe("latex-log-parser", () => {
     const err0 = parsed2.all[0];
     expect(err0.file).toEqual("ch_Euclidean.tex");
     expect(err0.message).toEqual("Marginpar on page 1 moved.");
-    expect(parsed2.deps).toEqual(["01.tex", "02.5.tex"]);
+    expect(parsed2.deps).toEqual(["./livre1.bst", "01.tex", "02.5.tex"]);
     expect(parsed2.files).toEqual(["livre1.tex", "ch_Euclidean.tex"]);
   });
+
+  // Test for non-.tex/.bib files in dependencies (e.g., .txt files used via \input{})
+  test("log3", () => {
+    const log3 = fs.readFileSync("./misc/latex-logs/log3.txt", "utf-8");
+    const parsed3 = new LatexParser(log3, {
+      ignoreDuplicates: true,
+    }).parse();
+    expect(parsed3.deps).toEqual([
+      "../subdir0/file2.md",
+      "long-running.tex",
+      "long-running.txt",
+      "subdir/file_9",
+    ]);
+    // No .tex or .bib files in parentheses, so files array is empty
+    expect(parsed3.files).toEqual([]);
+    expect(parsed3.errors).toEqual([]);
+    expect(parsed3.warnings).toEqual([]);
+    expect(parsed3.typesetting).toEqual([]);
+    expect(parsed3.all).toEqual([]);
+  });
 });

src/packages/frontend/misc/latex-logs/log3.txt

@@ -0,0 +1,27 @@
+(./long-running.txt) (./subdir/file_9)
+(../subdir0/file2.md) [1{/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map}]
+(./long-running.aux) )</usr/share/texlive/texmf-dist/fonts/type1/public/amsfont
+s/cm/cmr10.pfb>
+Output written on long-running.pdf (1 page, 15440 bytes).
+SyncTeX written on long-running.synctex.gz.
+Transcript written on long-running.log.
+Latexmk: Examining 'long-running.log'
+=== TeX engine is 'pdfTeX'
+Latexmk: applying rule 'pdflatex'...
+Latexmk: All targets (long-running.pdf) are up-to-date
+#===Dependents, and related info, for long-running.tex:
+long-running.pdf :\
+../subdir0/file2.md\
+/etc/texmf/web2c/texmf.cnf\
+/usr/share/texlive/texmf-dist/fonts/type1/public/amsfonts/cm/cmr10.pfb\
+/usr/share/texlive/texmf-dist/tex/latex/base/article.cls\
+/usr/share/texlive/texmf-dist/tex/latex/base/size10.clo\
+/usr/share/texlive/texmf-dist/tex/latex/l3backend/l3backend-pdftex.def\
+/usr/share/texlive/texmf-dist/web2c/texmf.cnf\
+/usr/share/texmf/web2c/texmf.cnf\
+/var/lib/texmf/fonts/map/pdftex/updmap/pdftex.map\
+/var/lib/texmf/web2c/pdftex/pdflatex.fmt\
+long-running.tex\
+long-running.txt\
+subdir/file_9
+#===End dependents for long-running.tex:

src/packages/frontend/projects/projects-nav.tsx

@@ -5,7 +5,7 @@
 
 import type { TabsProps } from "antd";
 import { Avatar, Popover, Tabs, Tooltip } from "antd";
-import { cloneElement, CSSProperties, useMemo, useState } from "react";
+import { CSSProperties, useMemo, useState } from "react";
 
 import {
   CSS,
@@ -17,8 +17,8 @@ import {
 import { set_window_title } from "@cocalc/frontend/browser";
 import { Icon, Loading } from "@cocalc/frontend/components";
 import {
-  SortableTabs,
   SortableTab,
+  SortableTabs,
   useItemContext,
   useSortable,
 } from "@cocalc/frontend/components/sortable-tabs";
@@ -31,7 +31,6 @@ import { COLORS } from "@cocalc/util/theme";
 import { useProjectState } from "../project/page/project-state-hook";
 import { useProjectHasInternetAccess } from "../project/settings/has-internet-access-hook";
 import { BuyLicenseForProject } from "../site-licenses/purchase/buy-license-for-project";
-import { blendBackgroundColor } from "./util";
 
 const PROJECT_NAME_STYLE: CSS = {
   whiteSpace: "nowrap",
@@ -176,15 +175,36 @@ function ProjectTab({ project_id }: ProjectTabProps) {
 
   function renderAvatar() {
     const avatar = project?.get("avatar_image_tiny");
-    if (!avatar) return;
-    return (
-      <Avatar
-        style={{ marginTop: "-2px" }}
-        shape="circle"
-        icon={<img src={project.get("avatar_image_tiny")} />}
-        size={20}
-      />
-    );
+    const color = project?.get("color");
+
+    if (avatar) {
+      // Avatar exists: show it with colored border
+      return (
+        <Avatar
+          style={{
+            marginTop: "-2px",
+            border: color ? `2px solid ${color}` : undefined,
+          }}
+          shape="circle"
+          icon={<img src={project.get("avatar_image_tiny")} />}
+          size={20}
+        />
+      );
+    } else if (color) {
+      // No avatar but has color: show colored circle
+      return (
+        <Avatar
+          style={{
+            marginTop: "-2px",
+            backgroundColor: color,
+          }}
+          shape="circle"
+          size={20}
+        />
+      );
+    }
+
+    return undefined;
   }
 
   function onMouseUp(e: React.MouseEvent) {
@@ -242,7 +262,7 @@ export function ProjectsNav(props: ProjectsNavProps) {
   const projectActions = useActions("projects");
   const activeTopTab = useTypedRedux("page", "active_top_tab");
   const openProjects = useTypedRedux("projects", "open_projects");
-  const project_map = useTypedRedux("projects", "project_map");
+  //const project_map = useTypedRedux("projects", "project_map");
 
   const items: TabsProps["items"] = useMemo(() => {
     if (openProjects == null) return [];
@@ -259,14 +279,14 @@ export function ProjectsNav(props: ProjectsNavProps) {
     return openProjects.toJS().map((project_id) => project_id);
   }, [openProjects]);
 
-  const onEdit = (project_id: string, action: "add" | "remove") => {
-    if (action == "add") {
+  function onEdit(project_id: string, action: "add" | "remove") {
+    if (action === "add") {
       actions.set_active_tab("projects");
     } else {
       // close given project
       actions.close_project_tab(project_id);
     }
-  };
+  }
 
   function onDragEnd(event) {
     const { active, over } = event;
@@ -289,39 +309,25 @@ export function ProjectsNav(props: ProjectsNavProps) {
         {(node) => {
           const project_id = node.key;
           const isActive = project_id === activeTopTab;
-          const projectColor = project_map?.getIn([project_id, "color"]) as
-            | string
-            | undefined;
 
           const wrapperStyle: CSS = {
             border: isActive
-              ? `2px solid ${projectColor ? projectColor : "#d3d3d3"}`
-              : `2px solid  ${projectColor ? projectColor : "transparent"}`,
+              ? `2px solid ${"#d3d3d3"}`
+              : `2px solid  ${"transparent"}`,
             borderRadius: "8px",
           };
 
-          // Add background color if project has a color
-          if (projectColor) {
-            // Active tab: lighter/brighter (less color), inactive: darker (more color)
-            wrapperStyle.backgroundColor = blendBackgroundColor(
-              projectColor,
-              isActive ? "white" : COLORS.GRAY_LL,
-              !isActive,
-            );
-          }
-
-          // Clone the node with additional style props to override Ant Design's background
-          const styledNode = cloneElement(node, {
-            style: {
-              ...node.props.style,
-              backgroundColor: wrapperStyle.backgroundColor,
-            },
-          });
-
-          // this is similar to the renderTabBar in sortable-tabs.tsx, but with the above, also styles the background
+          // Kept for reference, this allows to tweak the node props directly
+          // const styledNode = cloneElement(node, {
+          //   style: {
+          //     ...node.props.style,
+          //     backgroundColor: wrapperStyle.backgroundColor,
+          //   },
+          // });
+
           return (
             <SortableTab key={node.key} id={node.key} style={wrapperStyle}>
-              {styledNode}
+              {node}
             </SortableTab>
           );
         }}

src/packages/jupyter/util/cell-utils.ts

@@ -13,7 +13,7 @@ import { field_cmp, len } from "@cocalc/util/misc";
 export function positions_between(
   before_pos: number | undefined,
   after_pos: number | undefined,
-  num: number
+  num: number,
 ) {
   // Return an array of num equally spaced positions starting after
   // before_pos and ending before after_pos, so
@@ -96,10 +96,10 @@ export function ensure_positions_are_unique(cells?: Map<string, any>) {
 }
 
 export function new_cell_pos(
-  cells: Map<string, any>,
+  cells: Map<string, any> | undefined,
   cell_list: List<string>,
   cur_id: string,
-  delta: -1 | 1
+  delta: -1 | 1,
 ): number {
   /*
     Returns pos for a new cell whose position
@@ -113,6 +113,9 @@ export function new_cell_pos(
     Returned undefined whenever don't really know what to do; then caller
     just makes up a pos, and it'll get sorted out.
   */
+  if (cells == null) {
+    return 0;
+  }
   let cell_list_0: List<string>;
   if (cell_list == null) {
     cell_list_0 = sorted_cell_list(cells)!;
@@ -145,7 +148,7 @@ export function new_cell_pos(
 export function move_selected_cells(
   v?: string[],
   selected?: { [id: string]: true },
-  delta?: number
+  delta?: number,
 ) {
   /*
     - v = ordered js array of all cell id's