Merge remote-tracking branch 'origin/master' into i18n-pt_br-eu

Author: haraldschilly

src/packages/frontend/chat/chatroom.tsx

@@ -143,6 +143,9 @@ export function ChatRoom({
   }
 
   function renderFilterRecent() {
+    if (messages == null || messages.size <= 5) {
+      return null;
+    }
     return (
       <Tooltip title="Only show recent threads.">
         <Select
@@ -224,7 +227,7 @@ export function ChatRoom({
   }
 
   function render_button_row() {
-    if (messages == null) {
+    if (messages == null || messages.size <= 5) {
       return null;
     }
     return (
@@ -235,9 +238,6 @@ export function ChatRoom({
           style={{
             margin: 0,
             width: "100%",
-            ...(messages.size >= 2
-              ? undefined
-              : { visibility: "hidden", height: 0 }),
           }}
         />
         {renderFilterRecent()}

src/packages/frontend/chat/side-chat.tsx

@@ -238,14 +238,8 @@ function AddChatCollab({ addCollab, project_id }) {
   }
   return (
     <div>
-      You can{" "}
-      {redux.getProjectsStore().hasLanguageModelEnabled(project_id) && (
-        <>chat with AI or notify a collaborator by typing @, </>
-      )}
-      <A href="https://github.com/sagemathinc/cocalc/discussions">
-        join a discussion on GitHub
-      </A>
-      , and add more collaborators to this project below.
+      @mention AI or collaborators, add more collaborators below, or{" "}
+      <A href="https://discord.gg/EugdaJZ8">join the CoCalc Discord.</A>
       <AddCollaborators project_id={project_id} autoFocus where="side-chat" />
       <div style={{ color: COLORS.GRAY_M }}>
         (Collaborators have access to all files in this project.)

src/packages/frontend/collaborators/project-invite-tokens.tsx

@@ -300,7 +300,7 @@ export const ProjectInviteTokens: React.FC<Props> = React.memo(
     }
 
     return (
-      <Card style={{ width: "100%", overflowX: "auto" }}>
+      <Card style={{ minWidth: "800px", width: "100%", overflow: "auto" }}>
         {heading}
         <br />
         <br />

src/packages/frontend/editors/markdown-input/multimode.tsx

@@ -351,8 +351,8 @@ export default function MultiMarkdownInput({
               color: COLORS.GRAY_M,
               ...(mode == "editor" || hideHelp
                 ? {
-                    position: "absolute",
-                    right: 0,
+                    float: "right",
+                    position: "relative",
                     zIndex: 1,
                   }
                 : { float: "right" }),

src/packages/frontend/frame-editors/code-editor/actions.ts

@@ -25,7 +25,6 @@ import { delay } from "awaiting";
 import * as CodeMirror from "codemirror";
 import { List, Map, fromJS, Set as iSet } from "immutable";
 import { debounce } from "lodash";
-
 import {
   Actions as BaseActions,
   Rendered,
@@ -74,6 +73,7 @@ import {
   history_path,
   len,
   uuid,
+  path_split,
 } from "@cocalc/util/misc";
 import { reuseInFlight } from "@cocalc/util/reuse-in-flight";
 import { set_account_table } from "../../account/util";
@@ -111,6 +111,7 @@ import { test_line } from "./simulate_typing";
 import { misspelled_words } from "./spell-check";
 import { log_opened_time } from "@cocalc/frontend/project/open-file";
 import { ensure_project_running } from "@cocalc/frontend/project/project-start-warning";
+import { alert_message } from "@cocalc/frontend/alerts";
 
 interface gutterMarkerParams {
   line: number;
@@ -1238,7 +1239,7 @@ export class Actions<
     // several other formatting actions.
     // Doing this automatically is fraught with error, since cursors aren't precise...
     if (explicit) {
-      if (!await this.ensureProjectIsRunning(`save ${this.path} to disk`)) {
+      if (!(await this.ensureProjectIsRunning(`save ${this.path} to disk`))) {
         return;
       }
       const account: any = this.redux.getStore("account");
@@ -1916,31 +1917,30 @@ export class Actions<
     }
   }
 
-  // big scary error shown at top
-  public set_error(
-    error?: object | string,
-    style?: ErrorStyles,
-    _id?: string, // id - not currently used, but would be for frame-specific error.
-  ): void {
+  private formatError = (error?: object | string): string | undefined => {
     if (error === undefined) {
-      this.setState({ error });
-    } else {
-      if (typeof error === "object") {
-        const e = (error as any).message;
-        if (e === undefined) {
-          let e = JSON.stringify(error);
-          if (e === "{}") {
-            e = `${error}`;
-          }
-        }
-        if (typeof e != "string") throw Error("bug"); // make typescript happy
-        error = e;
-      }
-      if (IS_TIMEOUT_CALLING_PROJECT(error)) {
-        error = TIMEOUT_CALLING_PROJECT_MSG;
+      return "";
+    }
+    if (IS_TIMEOUT_CALLING_PROJECT(error)) {
+      return TIMEOUT_CALLING_PROJECT_MSG;
+    }
+    if (typeof error == "string") {
+      return error;
+    }
+    const e = (error as any).message;
+    if (e === undefined) {
+      let e = JSON.stringify(error);
+      if (e === "{}") {
+        e = `${error}`;
       }
-      this.setState({ error });
     }
+    return e;
+  };
+
+  // big scary error shown at top
+  topError(error?: object | string, style?: ErrorStyles): void {
+    const e = this.formatError(error);
+    this.setState({ error: e });
 
     switch (style) {
       case "monospace":
@@ -1951,6 +1951,31 @@ export class Actions<
     }
   }
 
+  set_error(error?: object | string, _style?: ErrorStyles): void {
+    // show the error at the a toast if this path is the focused one; otherwise,
+    // do not show the error at all.  We have shown a lot of useless errors
+    //  and now we will show less, and in a minimally harmful way.
+    if (this.redux.getStore("page").get("active_top_tab") != this.project_id) {
+      return;
+    }
+    if (
+      !this.redux
+        .getProjectStore(this.project_id)
+        .get("active_project_tab")
+        .includes(this.path)
+    ) {
+      return;
+    }
+    const e = this.formatError(error);
+    if (e) {
+      alert_message({
+        type: "error",
+        title: path_split(this.path).tail,
+        message: e,
+      });
+    }
+  }
+
   // status - little status message shown at bottom.
   // timeout -- if status message hasn't changed after
   // this long, then blank it.

src/packages/frontend/frame-editors/jupyter-editor/cell-notebook/actions.ts

@@ -803,7 +803,7 @@ export class NotebookFrameActions {
   }
 
   public set_error(error: string): void {
-    this.frame_tree_actions.set_error(error, undefined, this.frame_id);
+    this.frame_tree_actions.set_error(error);
   }
 
   public async command(name: string): Promise<void> {

src/packages/frontend/jupyter/browser-actions.ts

@@ -153,11 +153,7 @@ export class JupyterActions extends JupyterActions0 {
       }
     });
 
-    // Put an entry in the project log once the jupyter notebook gets opened.
-    // NOTE: Obviously, the project does NOT need to put entries in the log.
-    this.syncdb.once("change", () =>
-      this.redux?.getProjectActions(this.project_id).log_opened_time(this.path),
-    );
+    this.initOpenLog();
 
     // project doesn't care about cursors, but browser clients do:
     this.syncdb.on("cursor_activity", this.syncdb_cursor_activity);
@@ -176,6 +172,23 @@ export class JupyterActions extends JupyterActions0 {
     }
   }
 
+  initOpenLog = () => {
+    // Put an entry in the project log once the jupyter notebook gets opened and
+    // shows cells.
+    const reportOpened = () => {
+      if (this._state == "closed") {
+        return;
+      }
+      if (this.syncdb.get_one({ type: "cell" }) != null) {
+        this.redux
+          ?.getProjectActions(this.project_id)
+          .log_opened_time(this.path);
+        this.syncdb.removeListener("change", reportOpened);
+      }
+    };
+    this.syncdb.on("change", reportOpened);
+  };
+
   initUsageInfo = async () => {
     while (this._state != "closed") {
       try {

src/packages/next/components/landing/social-media-icon-list.tsx

@@ -11,6 +11,7 @@ enum SocialMediaType {
   LINKEDIN = "linkedin",
   TWITTER = "twitter",
   YOUTUBE = "youtube",
+  DISCORD = "discord",
 }
 
 const ICON_MAP: Record<SocialMediaType, IconName> = {
@@ -20,6 +21,7 @@ const ICON_MAP: Record<SocialMediaType, IconName> = {
   [SocialMediaType.LINKEDIN]: "linkedin-filled",
   [SocialMediaType.TWITTER]: "twitter",
   [SocialMediaType.YOUTUBE]: "youtube-filled",
+  [SocialMediaType.DISCORD]: "discord",
 };
 
 export interface SocialMediaIconListProps {

src/packages/next/pages/support/community.tsx

@@ -11,6 +11,7 @@ import { MAX_WIDTH } from "lib/config";
 import { Customize } from "lib/customize";
 import withCustomize from "lib/with-customize";
 import MailingList from "public/info/cocalc-mailing-list.png";
+import Discord from "public/info/discord.png";
 import { COLORS } from "@cocalc/util/theme";
 import Facebook from "public/info/facebook.png";
 import GitHubDiscussions from "public/info/github-discussions.png";
@@ -22,6 +23,24 @@ import Twitter from "public/info/twitter.png";
 const imageWidth = "300px";
 
 const dataSource = [
+  {
+    link: "https://discord.gg/nEHs2GK",
+    title: (
+      <>
+        <b>Chat</b> about CoCalc on Discord
+      </>
+    ),
+    logo: "comment",
+    image: Discord,
+    imageWidth,
+    description: (
+      <>
+        Visit the{" "}
+        <A href="https://discord.gg/EugdaJZ8">CoCalc Discord server</A> to chat
+        with other CoCalc users, ask questions, and give us quick feedback.
+      </>
+    ),
+  },
   {
     link: "https://github.com/sagemathinc/cocalc",
     logo: "github",

src/packages/next/pages/support/index.tsx

@@ -73,39 +73,19 @@ const dataSource = [
       </>
     ),
   },
-  {
-    link: "/support/chatgpt",
-    title: "ChatGPT Suppport",
-    logo: "robot",
-    hide: (customize) => !customize.openaiEnabled || !customize.onCoCalcCom,
-    description: (
-      <>
-        Our <A href="/support/chatgpt">integrated ChatGPT support</A> is free
-        and often very helpful since it knows so much about the open source
-        software in CoCalc.
-        <ChatGPTHelp
-          style={{ marginTop: "15px" }}
-          size="large"
-          tag="support-index"
-        />
-      </>
-    ),
-  },
   {
     link: "/support/community",
     title: "CoCalc Community Support",
     logo: "users",
     description: (
       <>
-        <A href="https://github.com/sagemathinc/cocalc/discussions">
-          Join a discussion
-        </A>{" "}
-        or{" "}
+        <A href="https://discord.gg/EugdaJZ8">Join our Discord server</A> or{" "}
         <A href="https://groups.google.com/forum/?fromgroups#!forum/cocalc">
           post to the mailing list.{" "}
         </A>
         <SocialMediaIconList
           links={{
+            discord: "https://discord.gg/EugdaJZ8",
             facebook: "https://www.facebook.com/CoCalcOnline",
             github: "https://github.com/sagemathinc/cocalc",
             linkedin: "https://www.linkedin.com/company/sagemath-inc./",
@@ -117,6 +97,21 @@ const dataSource = [
       </>
     ),
   },
+  {
+    link: "/support/chatgpt",
+    title: "ChatGPT",
+    logo: "robot",
+    hide: (customize) => !customize.openaiEnabled || !customize.onCoCalcCom,
+    description: (
+      <>
+        <ChatGPTHelp
+          style={{ marginTop: "15px" }}
+          size="large"
+          tag="support-index"
+        />
+      </>
+    ),
+  },
   {
     landingPages: true,
     link: ({ supportVideoCall }: CustomizeType) => supportVideoCall,