Merge branch 'develop'

hcengineering · Aug 8, 2024 · 6ae1289 · 6ae1289
2 parents ee49238 + 73cc6b8
commit 6ae1289
Show file tree

Hide file tree

Showing 57 changed files with 1,842 additions and 196 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -188,7 +188,7 @@
       "name": "Debug tool upgrade",
       "type": "node",
       "request": "launch",
-      "args": ["src/__start.ts", "upgrade-workspace", "platform"],
+      "args": ["src/__start.ts", "stress", "ws://localhost:3333", "wrong"],
       "env": {
         "SERVER_SECRET": "secret",
         "MINIO_ACCESS_KEY": "minioadmin",
@@ -203,6 +203,7 @@
       },
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "sourceMaps": true,
+      "outputCapture": "std",
       "cwd": "${workspaceRoot}/dev/tool"
     },
     {
@@ -244,7 +245,7 @@
         "MINIO_ACCESS_KEY": "minioadmin",
         "MINIO_SECRET_KEY": "minioadmin",
         "FRONT_URL": "http://localhost:8080",
-        "PORT": "3500",
+        "PORT": "3500"
       },
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "sourceMaps": true,
@@ -299,7 +300,7 @@
         "MONGO_URL": "mongodb://localhost:27017",
         "MINIO_ENDPOINT": "localhost",
         "MINIO_ACCESS_KEY": "minioadmin",
-        "MINIO_SECRET_KEY": "minioadmin",
+        "MINIO_SECRET_KEY": "minioadmin"
       },
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "runtimeVersion": "20",

diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/desktop/src/ui/platform.ts b/desktop/src/ui/platform.ts
@@ -221,6 +221,7 @@ export async function configurePlatform (): Promise<void> {
     setMetadata(presentation.metadata.FrontVersion, config.VERSION)
   }
   setMetadata(telegram.metadata.TelegramURL, config.TELEGRAM_URL ?? 'http://localhost:8086')
+  setMetadata(telegram.metadata.BotUrl, config.TELEGRAM_BOT_URL)
   setMetadata(gmail.metadata.GmailURL, config.GMAIL_URL ?? 'http://localhost:8087')
   setMetadata(calendar.metadata.CalendarServiceURL, config.CALENDAR_URL ?? 'http://localhost:8095')
   setMetadata(notification.metadata.PushPublicKey, config.PUSH_PUBLIC_KEY)

diff --git a/desktop/src/ui/types.ts b/desktop/src/ui/types.ts
@@ -30,6 +30,7 @@ export interface Config {
   PREVIEW_CONFIG: string
   DESKTOP_UPDATES_URL?: string
   DESKTOP_UPDATES_CHANNEL?: string
+  TELEGRAM_BOT_URL?: string
 }
 
 export interface Branding {

diff --git a/dev/doc-import-tool/src/extract/types.ts b/dev/doc-import-tool/src/extract/types.ts
@@ -130,8 +130,8 @@ const metadataTableCell = z.object({
     col: z.number().min(0),
     slice: z
       .object({
-        start: z.number().min(0).optional(),
-        end: z.number().min(0).optional()
+        start: z.number().optional(),
+        end: z.number().optional()
       })
       .optional()
   })