Merge remote-tracking branch 'origin/master' into delete-project-data

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/database/postgres-server-queries.coffee

@@ -619,12 +619,14 @@ exports.extend_PostgreSQL = (ext) -> class PostgreSQL extends ext
                 'account_id = $::UUID' : opts.account_id
             cb     : opts.cb
 
+    # DEPRECATED: use import accountCreationActions from "@cocalc/server/accounts/account-creation-actions"; instead!!!!
     do_account_creation_actions: (opts) =>
         opts = defaults opts,
             email_address : required
             account_id    : required
             cb            : required
         dbg = @_dbg("do_account_creation_actions(email_address='#{opts.email_address}')")
+        dbg("**DEPRECATED!**  This will miss doing important things, e.g., creating initial project.")
         @account_creation_actions
             email_address : opts.email_address
             cb            : (err, actions) =>

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/admin/users/impersonate.tsx

@@ -3,55 +3,54 @@
  *  License: MS-RSL – see LICENSE.md for details
  */
 
-import { Component, Rendered } from "@cocalc/frontend/app-framework";
-import { Loading } from "@cocalc/frontend/components";
-import { webapp_client } from "@cocalc/frontend/webapp-client";
+import { Alert } from "antd";
 import { join } from "path";
+
+import { Rendered, useEffect, useState } from "@cocalc/frontend/app-framework";
+import { Loading } from "@cocalc/frontend/components";
 import { appBasePath } from "@cocalc/frontend/customize/app-base-path";
-import { Alert } from "antd";
+import { webapp_client } from "@cocalc/frontend/webapp-client";
 
 interface Props {
   account_id: string;
   first_name: string;
   last_name: string;
 }
 
-interface State {
-  auth_token?: string;
-  err?: string;
-}
+export function Impersonate(props: Readonly<Props>) {
+  const { first_name, last_name, account_id } = props;
 
-export class Impersonate extends Component<Props, State> {
-  constructor(props, state) {
-    super(props, state);
-    this.state = {};
-  }
+  const [auth_token, set_auth_token] = useState<string | null>(null);
+  const [err, set_err] = useState<string | null>(null);
 
-  async get_token(): Promise<void> {
+  async function get_token(): Promise<void> {
     try {
       const auth_token = await webapp_client.admin_client.get_user_auth_token(
-        this.props.account_id
+        account_id,
       );
-      this.setState({ auth_token });
+      set_auth_token(auth_token);
+      set_err(null);
     } catch (err) {
-      this.setState({ err: err.toString() });
+      set_err(err.toString());
+      set_auth_token(null);
     }
   }
 
-  componentDidMount(): void {
-    this.get_token();
-  }
+  useEffect(() => {
+    get_token();
+  }, []);
 
-  render_link(): Rendered {
-    if (this.state.auth_token == null) {
+  function render_link(): Rendered {
+    if (auth_token == null) {
       return <Loading />;
     }
-    const link = join(appBasePath, `app?auth_token=${this.state.auth_token}`);
+    // lang_temp: https://github.com/sagemathinc/cocalc/issues/7782
+    const link = join(appBasePath, `app?auth_token=${auth_token}&lang_temp=en`);
     return (
       <div>
         <a href={link} target="_blank" rel="noopener noreferrer">
           Right click and open this link in a new incognito window, where you
-          will be signed in as {this.props.first_name} {this.props.last_name}...
+          will be signed in as {first_name} {last_name}...
         </a>
         <br />
         The actual link:
@@ -64,35 +63,31 @@ export class Impersonate extends Component<Props, State> {
     );
   }
 
-  render_err(): Rendered {
-    if (this.state.err != null) {
+  function render_err(): Rendered {
+    if (err != null) {
       return (
         <div>
-          <b>ERROR</b> {this.state.err}
+          <b>ERROR</b> {err}
         </div>
       );
     }
   }
 
-  render(): Rendered {
-    return (
-      <Alert
-        type="warning"
-        style={{
-          margin: "15px",
-        }}
-        message={
-          <b>
-            Impersonate user "{this.props.first_name} {this.props.last_name}"
-          </b>
-        }
-        description={
-          <>
-            {this.render_err()}
-            {this.render_link()}
-          </>
-        }
-      />
-    );
-  }
+  return (
+    <Alert
+      type="warning"
+      style={{ margin: "15px" }}
+      message={
+        <b>
+          Impersonate user "{first_name} {last_name}"
+        </b>
+      }
+      description={
+        <>
+          {render_err()}
+          {render_link()}
+        </>
+      }
+    />
+  );
 }

src/packages/frontend/app/localize.tsx

@@ -140,6 +140,12 @@ function loadAntdLocale(locale: Locale): Promise<AntdLocale> {
         return import("antd/locale/zh_CN");
       case "es":
         return import("antd/locale/es_ES");
+      case "ru":
+        return import("antd/locale/ru_RU");
+      case "fr":
+        return import("antd/locale/fr_FR");
+      case "it":
+        return import("antd/locale/it_IT");
       default:
         unreachable(locale);
         throw new Error(`Unknown locale '${locale}.`);

src/packages/frontend/app/render.tsx

@@ -29,29 +29,43 @@ function App({ children }) {
 
   // setting via ?lang=[locale] takes precedece over account settings
   useAsyncEffect(async () => {
-    const lang = QueryParams.get("lang");
+    const lang_set = QueryParams.get("lang");
+    // lang_temp sets the language *temporarily*, i.e. without changing the account settings and it is sticky
+    // this is useful for impersonation – https://github.com/sagemathinc/cocalc/issues/7782
+    const lang_temp = QueryParams.get("lang_temp");
+    const temp = lang_temp != null;
+    const lang = temp ? lang_temp : lang_set;
     if (lang != null) {
       if (lang in LOCALIZATIONS) {
         console.warn(
-          `URL query parameter 'lang=${lang}' – overriding user configuration.`,
+          `URL query parameter 'lang=${lang}' – overriding user configuration ${
+            temp ? "temporary" : "permanent"
+          }.`,
         );
-        const store = redux.getStore("account");
-        // we have to ensure the account store is available, because this code runs very early
-        await store.async_wait({
-          until: () => store.get_account_id() != null,
-        });
-        redux
-          .getActions("account")
-          .set_other_settings(OTHER_SETTINGS_LOCALE_KEY, lang);
+        if (!temp) {
+          const store = redux.getStore("account");
+          // we have to ensure the account store is available, because this code runs very early
+          await store.async_wait({
+            until: () => store.get_account_id() != null,
+          });
+          redux
+            .getActions("account")
+            .set_other_settings(OTHER_SETTINGS_LOCALE_KEY, lang);
+        }
         setLocale(lang);
       } else {
         console.warn(
-          `URL query parameter 'lang=${lang}' provided, but not a valid locale.`,
+          `URL query parameter '${JSON.stringify({
+            lang_set,
+            lang_temp,
+          })}' provided, but not a valid locale.`,
           `Known values: ${Object.keys(LOCALIZATIONS)}`,
         );
       }
-      // removing the parameter, otherwise this conflicts with further changes of account settings
-      QueryParams.remove("lang");
+      if (!temp) {
+        // removing the parameter, otherwise this conflicts with further changes of account settings
+        QueryParams.remove("lang");
+      }
     } else {
       setLocale(getLocale(other_settings));
     }

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 });
   }