Merge branch 'master' of github.com:sagemathinc/cocalc

Author: williamstein

src/package.json

@@ -38,5 +38,8 @@
   "bugs": {
     "url": "https://github.com/sagemathinc/cocalc/issues"
   },
-  "homepage": "https://github.com/sagemathinc/cocalc"
+  "homepage": "https://github.com/sagemathinc/cocalc",
+  "dependencies": {
+    "lru-cache": "^7.18.3"
+  }
 }

src/packages/backend/package.json

@@ -39,7 +39,7 @@
     "debug": "^4.3.2",
     "fs-extra": "^11.2.0",
     "lodash": "^4.17.21",
-    "lru-cache": "^7.14.1",
+    "lru-cache": "^7.18.3",
     "password-hash": "^1.2.2",
     "prom-client": "^13.0.0",
     "rimraf": "^5.0.5",

src/packages/database/package.json

@@ -32,7 +32,7 @@
     "immutable": "^4.3.0",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
-    "lru-cache": "^7.14.1",
+    "lru-cache": "^7.18.3",
     "node-fetch": "2.6.7",
     "pg": "^8.7.1",
     "random-key": "^0.3.2",

src/packages/database/qdrant/jsonl.ts

@@ -57,7 +57,7 @@ export async function save({
     "vectors to save in",
     collection,
     "to",
-    file
+    file,
   );
 
   // Create a write stream for the output file
@@ -66,7 +66,7 @@ export async function save({
   // Fetch all points in the collection in blocks, compressing and
   // writing them to the output file
   let offset: string | undefined = undefined;
-  for (let n = 0; n < vectors_count; n += batchSize) {
+  for (let n = 0; n < (vectors_count ?? 0); n += batchSize) {
     log("save: from ", n, " to ", n + batchSize);
     const { points } = await client.scroll(collection, {
       limit: batchSize + (offset ? 1 : 0),
@@ -79,7 +79,7 @@ export async function save({
       // delete first point since it was the offset.
       points.shift();
     }
-    offset = points[points.length-1].id as string;
+    offset = points[points.length - 1].id as string;
     for (const point of points) {
       const compressedLine = JSON.stringify(point) + "\n";
       compressedStream.write(compressedLine);

src/packages/database/qdrant/sqlite.ts

@@ -68,7 +68,7 @@ export async function save({
   // Fetch all points in the collection in blocks, inserting them
   // into our database.
   let offset: string | undefined = undefined;
-  for (let n = 0; n < vectors_count; n += batchSize) {
+  for (let n = 0; n < (vectors_count ?? 0); n += batchSize) {
     log("save: from ", n, " to ", n + batchSize);
     const { points } = await client.scroll(collection, {
       limit: batchSize + (offset ? 1 : 0),
@@ -84,7 +84,7 @@ export async function save({
     offset = points[points.length - 1].id as string;
     // insert points into the sqlite3 table collection efficiently:
     const insertStmt = db.prepare(
-      `INSERT INTO ${collection} (id, payload, vector) VALUES (?, ?, ?)`
+      `INSERT INTO ${collection} (id, payload, vector) VALUES (?, ?, ?)`,
     );
 
     db.transaction(() => {

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

@@ -10,10 +10,9 @@ 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 { Space } 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 {
@@ -22,17 +21,10 @@ import {
   useTypedRedux,
   useWindowDimensions,
 } from "@cocalc/frontend/app-framework";
-import { useLocalizationCtx } from "@cocalc/frontend/app/localize";
-import { Icon, Loading, Paragraph } from "@cocalc/frontend/components";
+import { Icon, Loading } from "@cocalc/frontend/components";
 import { cloudFilesystemsEnabled } from "@cocalc/frontend/compute";
 import CloudFilesystems from "@cocalc/frontend/compute/cloud-filesystem/cloud-filesystems";
-import {
-  getLocale,
-  labels,
-  Locale,
-  LOCALIZATIONS,
-  OTHER_SETTINGS_LOCALE_KEY,
-} from "@cocalc/frontend/i18n";
+import { labels } from "@cocalc/frontend/i18n";
 import { LandingPage } from "@cocalc/frontend/landing-page/landing-page";
 import { local_storage_length } from "@cocalc/frontend/misc/local-storage";
 import PurchasesPage from "@cocalc/frontend/purchases/purchases-page";
@@ -44,19 +36,18 @@ import {
   KUCALC_ON_PREMISES,
 } from "@cocalc/util/db-schema/site-defaults";
 import { AccountPreferences } from "./account-preferences";
+import { I18NSelector } from "./i18n-selector";
 import { LicensesPage } from "./licenses/licenses-page";
 import { PublicPaths } from "./public-paths/public-paths";
 import { SSHKeysPage } from "./ssh-keys/global-ssh-keys";
 import { UpgradesPage } from "./upgrades/upgrades-page";
 
 export const AccountPage: React.FC = () => {
   const intl = useIntl();
-  const { setLocale, locale } = useLocalizationCtx();
 
   const { width: windowWidth } = useWindowDimensions();
   const isWide = windowWidth > 800;
 
-  const other_settings = useTypedRedux("account", "other_settings");
   const active_page = useTypedRedux("account", "active_page");
   const is_logged_in = useTypedRedux("account", "is_logged_in");
   const account_id = useTypedRedux("account", "account_id");
@@ -85,8 +76,6 @@ export const AccountPage: React.FC = () => {
   const ssh_gateway = useTypedRedux("customize", "ssh_gateway");
   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(() => {
@@ -264,126 +253,10 @@ export const AccountPage: React.FC = () => {
     return items;
   }
 
-  function renderI18N(): JSX.Element | null {
-    if (
-      i18n_enabled == null ||
-      i18n_enabled.isEmpty() ||
-      (i18n_enabled.size === 1 && i18n_enabled.includes("en"))
-    ) {
-      return null;
-    }
-
-    const i18n: Locale = getLocale(other_settings);
-
-    const items: MenuProps["items"] =
-      Object.entries(LOCALIZATIONS)
-        .filter(([key, _]) => i18n_enabled.includes(key as any))
-        .map(([key, { name, trans, native, flag }]) => {
-          const other = key === locale ? name : intl.formatMessage(trans);
-          return { key, label: `${flag} ${native} (${other})` };
-        }) ?? [];
-
-    items.push({ type: "divider" });
-    items.push({
-      key: "help",
-      label: (
-        <Space>
-          <Icon name="translation-outlined" />
-          {intl.formatMessage({
-            id: "account.account_page.translation.info.label",
-            defaultMessage: "Translation Info...",
-            description: "Label of translation information modal in dropdown",
-          })}
-        </Space>
-      ),
-      onClick: () =>
-        Modal.info({
-          width: "min(90vw, 600px)",
-          title: intl.formatMessage({
-            id: "account.account_page.translation.info.title",
-            defaultMessage: "Translation Information",
-            description: "Title of translation information modal",
-          }),
-          content: (
-            <Paragraph>
-              {intl.formatMessage({
-                id: "account.account_page.translation.info.content",
-                defaultMessage: `
-We're excited to start offering our application in multiple languages! Here's what you need to know:
-
-<ul>
-<li><b>Work in Progress</b>: Our translation effort is just beginning. Many parts of the application are not yet translated.</li>
-<li><b>Gradual Improvement</b>: We're continuously working to expand our language coverage. You'll see more content translated over time.</li>
-<li><b>Your Help is Welcome</b>: We value our community's input. If you're fluent in multiple languages and would like to contribute to our translation efforts, we'd love to hear from you!</li>
-<li><b>Contact Us</b>: To learn more about contributing to translations or to report any issues, please reach out to our support team.</li>
-</ul>
-
-Thank you for your patience and understanding as we work to make our application accessible to a global audience!`,
-                description: "Content of translation information modal",
-              })}
-            </Paragraph>
-          ),
-        }),
-    });
-
-    const menu: MenuProps = {
-      items,
-      style: { maxHeight: "75vh", overflow: "auto" },
-      onClick: ({ key }) => {
-        if (key in LOCALIZATIONS) {
-          redux
-            .getActions("account")
-            .set_other_settings(OTHER_SETTINGS_LOCALE_KEY, key);
-          setLocale(key);
-        }
-      },
-    };
-
-    const lang_icon = LOCALIZATIONS[i18n]?.flag;
-
-    const title =
-      i18n in LOCALIZATIONS
-        ? intl.formatMessage(LOCALIZATIONS[i18n].trans)
-        : i18n;
-
-    const cur = `${title} (${LOCALIZATIONS[i18n]?.name ?? i18n})`;
-    const msg = intl.formatMessage(labels.account_language_tooltip);
-    const tooltip = (
-      <>
-        {cur}
-        <br />
-        {msg}
-        {labels.account_language_tooltip.defaultMessage != msg ? (
-          <>
-            <br />({labels.account_language_tooltip.defaultMessage})
-          </>
-        ) : undefined}
-      </>
-    );
-
-    return (
-      <Tooltip title={langOpen ? undefined : tooltip} trigger={["hover"]}>
-        <Dropdown
-          menu={menu}
-          trigger={["click"]}
-          onOpenChange={(open) => setLangOpen(open)}
-        >
-          <Button>
-            <Space>
-              {lang_icon}
-              {isWide ? title : undefined}
-              <DownOutlined />
-            </Space>
-          </Button>
-        </Dropdown>
-      </Tooltip>
-    );
-  }
-
   function renderExtraContent() {
     return (
       <Space>
-        {renderI18N()}
+        <I18NSelector isWide={isWide} />
         <SignOut everywhere={false} highlight={true} narrow={!isWide} />
       </Space>
     );