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

Author: haraldschilly

.gitignore

@@ -151,3 +151,8 @@ src/go
 
 # Python virtual environment
 venv
+
+# frontend/i18n files, which are created during build or updating the languages
+src/packages/frontend/i18n/extracted.json
+src/packages/frontend/i18n/*.compiled.json
+

src/packages/backend/package.json

@@ -33,6 +33,7 @@
     "@cocalc/backend": "workspace:*",
     "@cocalc/util": "workspace:*",
     "@types/debug": "^4.1.12",
+    "@types/watchpack": "^2.4.4",
     "awaiting": "^3.0.0",
     "chokidar": "^3.6.0",
     "debug": "^4.3.2",

src/packages/backend/path-watcher.ts

@@ -4,8 +4,8 @@
  */
 
 /*
-Watch A DIRECTORY for changes.  Use ./watcher.ts for a single file.
-
+Watch A DIRECTORY for changes of the files in *that* directory only (not recursive). 
+Use ./watcher.ts for a single file.
 
 Slightly generalized fs.watch that works even when the directory doesn't exist,
 but also doesn't provide any information about what changed.
@@ -54,7 +54,7 @@ const logger = getLogger("backend:path-watcher");
 const POLLING = true;
 
 const DEFAULT_POLL_MS = parseInt(
-  process.env.COCALC_FS_WATCHER_POLL_INTERVAL_MS ?? "1500",
+  process.env.COCALC_FS_WATCHER_POLL_INTERVAL_MS ?? "3000",
 );
 
 const ChokidarOpts: WatchOptions = {
@@ -79,17 +79,13 @@ export class Watcher extends EventEmitter {
   private exists: boolean;
   private watchContents?: FSWatcher;
   private watchExistence?: FSWatcher;
-  private interval_ms: number;
   private debounce_ms: number;
   private debouncedChange: any;
   private log: Function;
 
   constructor(
     path: string,
-    {
-      debounce: debounce_ms = 0,
-      interval: interval_ms,
-    }: { debounce?: number; interval?: number } = {},
+    { debounce: debounce_ms = DEFAULT_POLL_MS }: { debounce?: number } = {},
   ) {
     super();
     this.log = logger.extend(path).debug;
@@ -99,7 +95,6 @@ export class Watcher extends EventEmitter {
     }
     this.path = path.startsWith("/") ? path : join(process.env.HOME, path);
     this.debounce_ms = debounce_ms;
-    this.interval_ms = interval_ms ?? DEFAULT_POLL_MS;
     this.debouncedChange = this.debounce_ms
       ? debounce(this.change, this.debounce_ms, {
           leading: true,
@@ -122,16 +117,8 @@ export class Watcher extends EventEmitter {
     }
   }
 
-  private chokidarOptions = () => {
-    return {
-      ...ChokidarOpts,
-      interval: this.interval_ms,
-      binaryInterval: this.interval_ms,
-    };
-  };
-
   private initWatchContents(): void {
-    this.watchContents = watch(this.path, this.chokidarOptions());
+    this.watchContents = watch(this.path, ChokidarOpts);
     this.watchContents.on("all", this.debouncedChange);
     this.watchContents.on("error", (err) => {
       this.log(`error watching listings -- ${err}`);
@@ -140,7 +127,7 @@ export class Watcher extends EventEmitter {
 
   private async initWatchExistence(): Promise<void> {
     const containing_path = path_split(this.path).head;
-    this.watchExistence = watch(containing_path, this.chokidarOptions());
+    this.watchExistence = watch(containing_path, ChokidarOpts);
     this.watchExistence.on("all", this.watchExistenceChange(containing_path));
     this.watchExistence.on("error", (err) => {
       this.log(`error watching for existence of ${this.path} -- ${err}`);

src/packages/backend/watcher.ts

@@ -40,7 +40,7 @@ export class Watcher extends EventEmitter {
 
   constructor(
     path: string,
-    { debounce, interval = 300 }: { debounce?: number; interval?: number } = {},
+    { debounce, interval = 750 }: { debounce?: number; interval?: number } = {},
   ) {
     super();
     this.path = path;

src/packages/frontend/account/account-page.tsx

@@ -10,10 +10,10 @@ for different account related information
 and configuration.
 */
 
+import { useState } from "react";
 import { DownOutlined } from "@ant-design/icons";
 import { Button, Dropdown, MenuProps, Modal, Space, Tooltip } from "antd";
 import { useIntl } from "react-intl";
-
 import { SignOut } from "@cocalc/frontend/account/sign-out";
 import { AntdTabItem, Col, Row, Tabs } from "@cocalc/frontend/antd-bootstrap";
 import {
@@ -86,6 +86,7 @@ export const AccountPage: React.FC = () => {
   const is_commercial = useTypedRedux("customize", "is_commercial");
   const get_api_key = useTypedRedux("page", "get_api_key");
   const i18n_enabled = useTypedRedux("customize", "i18n");
+  const [langOpen, setLangOpen] = useState<boolean>(false);
 
   // for each exclusive domain, tell the user which strategy to use
   const exclusive_sso_domains = React.useMemo(() => {
@@ -351,13 +352,21 @@ Thank you for your patience and understanding as we work to make our application
         {cur}
         <br />
         {msg}
-        <br />({labels.account_language_tooltip.defaultMessage})
+        {labels.account_language_tooltip.defaultMessage != msg ? (
+          <>
+            <br />({labels.account_language_tooltip.defaultMessage})
+          </>
+        ) : undefined}
       </>
     );
 
     return (
-      <Tooltip title={tooltip} trigger={["hover"]}>
-        <Dropdown menu={menu} trigger={["click"]}>
+      <Tooltip title={langOpen ? undefined : tooltip} trigger={["hover"]}>
+        <Dropdown
+          menu={menu}
+          trigger={["click"]}
+          onOpenChange={(open) => setLangOpen(open)}
+        >
           <Button>
             <Space>
               {lang_icon}

src/packages/frontend/chat/actions.ts

@@ -297,16 +297,16 @@ export class ChatActions extends Actions<ChatState> {
         search: "",
       });
     } else {
-      // TODO: but until we fix search, do this:
+      // TODO: but until we improve search to be by thread (instead of by message), do this:
       this.setState({
         search: "",
       });
     }
     this.ensureDraftStartsWithHashtags(false);
 
-    if (this.store) {
-      const project_id = this.store.get("project_id");
-      const path = this.store.get("path");
+    if (this.store != null) {
+      const project_id = this.store?.get("project_id");
+      const path = this.store?.get("path");
       // set notification saying that we sent an actual chat
       let action;
       if (
@@ -570,7 +570,6 @@ export class ChatActions extends Actions<ChatState> {
   }
 
   public set_uploading(is_uploading: boolean): void {
-    console.log("set_uploading", is_uploading);
     this.setState({ is_uploading });
   }
 

src/packages/frontend/chat/chatroom.tsx

@@ -509,7 +509,7 @@ export const ChatRoom: React.FC<Props> = ({ project_id, path, is_visible }) => {
               height={INPUT_HEIGHT}
               onChange={(value) => {
                 actions.set_input(value);
-                // submitMentionsRef will not acutally submit mentions, we're only interested in the reply value
+                // submitMentionsRef will not actually submit mentions; we're only interested in the reply value
                 const reply =
                   submitMentionsRef.current?.(undefined, true) ?? value;
                 actions?.llm_estimate_cost(reply, "room");

src/packages/frontend/chat/input.tsx

@@ -183,8 +183,8 @@ export default function ChatInput({
         sender_id,
         date,
       });
-      const input = x?.get("input");
-      if (input != null && input != lastSavedRef.current) {
+      const input = x?.get("input") ?? "";
+      if (input != lastSavedRef.current) {
         setInput(input);
         currentInputRef.current = input;
         lastSavedRef.current = input;
@@ -237,8 +237,8 @@ export default function ChatInput({
         saveChat(input);
       }}
       onShiftEnter={(input) => {
-        setInput(input);
-        saveChat(input);
+        setInput("");
+        saveChat("");
         on_send(input);
       }}
       height={height}

src/packages/frontend/client/project.ts

@@ -50,9 +50,6 @@ export class ProjectClient {
 
   constructor(client: WebappClient) {
     this.client = client;
-    this.ipywidgetsGetBuffer = reuseInFlight(
-      this.ipywidgetsGetBuffer.bind(this),
-    );
   }
 
   private async call(message: object): Promise<any> {
@@ -380,16 +377,19 @@ export class ProjectClient {
   }
 
   // This is async, so do "await smc_webapp.configuration(...project_id...)".
-  public async configuration(
-    project_id: string,
-    aspect: ConfigurationAspect,
-    no_cache: boolean,
-  ): Promise<Configuration> {
-    if (!is_valid_uuid_string(project_id)) {
-      throw Error("project_id must be a valid uuid");
-    }
-    return (await this.api(project_id)).configuration(aspect, no_cache);
-  }
+  // for reuseInFlight, see https://github.com/sagemathinc/cocalc/issues/7806
+  public configuration = reuseInFlight(
+    async (
+      project_id: string,
+      aspect: ConfigurationAspect,
+      no_cache: boolean,
+    ): Promise<Configuration> => {
+      if (!is_valid_uuid_string(project_id)) {
+        throw Error("project_id must be a valid uuid");
+      }
+      return (await this.api(project_id)).configuration(aspect, no_cache);
+    },
+  );
 
   // Remove all upgrades from all projects that this user collaborates on.
   public async remove_all_upgrades(projects?: string[]): Promise<void> {
@@ -543,29 +543,30 @@ export class ProjectClient {
     return get_usage_info(project_id);
   }
 
-  // NOTE: we reuseInFlight this in the constructor.
-  public async ipywidgetsGetBuffer(
-    project_id: string,
-    path: string,
-    model_id: string,
-    buffer_path: string,
-    useHttp?: boolean, // ONLY works for home base, NOT compute servers!
-  ): Promise<ArrayBuffer> {
-    if (useHttp) {
-      const url = ipywidgetsGetBufferUrl(
-        project_id,
-        path,
+  public ipywidgetsGetBuffer = reuseInFlight(
+    async (
+      project_id: string,
+      path: string,
+      model_id: string,
+      buffer_path: string,
+      useHttp?: boolean, // ONLY works for home base, NOT compute servers!
+    ): Promise<ArrayBuffer> => {
+      if (useHttp) {
+        const url = ipywidgetsGetBufferUrl(
+          project_id,
+          path,
+          model_id,
+          buffer_path,
+        );
+        return await (await fetch(url)).arrayBuffer();
+      }
+      const actions = redux.getEditorActions(project_id, path);
+      return await actions.jupyter_actions.ipywidgetsGetBuffer(
         model_id,
         buffer_path,
       );
-      return await (await fetch(url)).arrayBuffer();
-    }
-    const actions = redux.getEditorActions(project_id, path);
-    return await actions.jupyter_actions.ipywidgetsGetBuffer(
-      model_id,
-      buffer_path,
-    );
-  }
+    },
+  );
 
   // getting, setting, editing, deleting, etc., the  api keys for a project
   public async api_keys(opts: {

src/packages/frontend/course/actions.ts

@@ -246,7 +246,7 @@ export class CourseActions extends Actions<CourseState> {
 
   // ACTIVITY ACTIONS
   public set_activity(
-    opts: { id: number; desc?: string } | { id?: number; desc: string }
+    opts: { id: number; desc?: string } | { id?: number; desc: string },
   ): number {
     return this.activity.set_activity(opts);
   }
@@ -349,7 +349,7 @@ export class CourseActions extends Actions<CourseState> {
       | "peer_config"
       | "handout"
       | "skip_grading",
-    item_id
+    item_id,
   ): void {
     let adjusted;
     const store = this.get_store();