Merge branch 'develop' into staging

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
hcengineering · Jan 18, 2025 · 134d889 · 134d889
2 parents 895ed20 + 67ca63d
commit 134d889
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/pods/front/src/__start.ts b/pods/front/src/__start.ts
@@ -1,5 +1,5 @@
 //
-// Copyright © 2023 Hardcore Engineering Inc.
+// Copyright © 2023, 2025 Hardcore Engineering Inc.
 //
 
 import { Analytics } from '@hcengineering/analytics'
@@ -44,6 +44,7 @@ startFront(metricsContext, {
   DESKTOP_UPDATES_URL: process.env.DESKTOP_UPDATES_URL,
   DESKTOP_UPDATES_CHANNEL: process.env.DESKTOP_UPDATES_CHANNEL,
   ANALYTICS_COLLECTOR_URL: process.env.ANALYTICS_COLLECTOR_URL,
+  LINK_PREVIEW_URL: process.env.LINK_PREVIEW_URL,
   AI_URL: process.env.AI_URL,
   TELEGRAM_BOT_URL: process.env.TELEGRAM_BOT_URL,
   STATS_URL: process.env.STATS_API ?? process.env.STATS_URL,

diff --git a/server/front/src/index.ts b/server/front/src/index.ts
@@ -1,6 +1,6 @@
 //
 // Copyright © 2020, 2021 Anticrm Platform Contributors.
-// Copyright © 2021 Hardcore Engineering Inc.
+// Copyright © 2021, 2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -258,6 +258,7 @@ export function start (
     brandingUrl?: string
     previewConfig: string
     uploadConfig: string
+    linkPreviewUrl?: string
     pushPublicKey?: string
     disableSignUp?: string
   },
@@ -307,6 +308,7 @@ export function start (
       GMAIL_URL: config.gmailUrl,
       CALENDAR_URL: config.calendarUrl,
       COLLABORATOR: config.collaborator,
+      LINK_PREVIEW_URL: config.linkPreviewUrl,
       COLLABORATOR_URL: config.collaboratorUrl,
       BRANDING_URL: config.brandingUrl,
       PREVIEW_CONFIG: config.previewConfig,

diff --git a/server/front/src/starter.ts b/server/front/src/starter.ts
@@ -1,6 +1,6 @@
 //
 // Copyright © 2020, 2021 Anticrm Platform Contributors.
-// Copyright © 2021, 2024 Hardcore Engineering Inc.
+// Copyright © 2021-2025 Hardcore Engineering Inc.
 //
 // Licensed under the Eclipse Public License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License. You may
@@ -109,6 +109,8 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record<string, st
 
   const brandingUrl = process.env.BRANDING_URL
 
+  const linkPreviewUrl = process.env.LINK_PREVIEW_URL
+
   setMetadata(serverToken.metadata.Secret, serverSecret)
 
   const disableSignUp = process.env.DISABLE_SIGNUP
@@ -130,7 +132,8 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record<string, st
     previewConfig,
     uploadConfig,
     pushPublicKey,
-    disableSignUp
+    disableSignUp,
+    linkPreviewUrl
   }
   console.log('Starting Front service with', config)
   const shutdown = start(ctx, config, SERVER_PORT, extraConfig)

diff --git a/server/postgres/src/storage.ts b/server/postgres/src/storage.ts
@@ -1267,7 +1267,8 @@ abstract class PostgresAdapterBase implements DbAdapter {
             switch (type) {
               case 'common':
                 if (Array.isArray(val) && val.includes(null)) {
-                  res.push(`(${tkey} = ANY(${vars.addArray(val, inferType(val))})) OR ${tkey} IS NULL`)
+                  const vv = vars.addArray(val, inferType(val))
+                  res.push(`(${tkey} = ANY(${vv}) OR ${tkey} IS NULL)`)
                 } else {
                   if (val.length > 0) {
                     res.push(`${tkey} = ANY(${vars.addArray(val, inferType(val))})`)