Merge branch 'master' into fs2

Author: williamstein

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/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,