Skip to content

Commit 134d889

Browse files
committed
Merge branch 'develop' into staging
Signed-off-by: Andrey Sobolev <[email protected]>
2 parents 895ed20 + 67ca63d commit 134d889

File tree

4 files changed

+12
-5
lines changed

4 files changed

+12
-5
lines changed

Diff for: pods/front/src/__start.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
//
2-
// Copyright © 2023 Hardcore Engineering Inc.
2+
// Copyright © 2023, 2025 Hardcore Engineering Inc.
33
//
44

55
import { Analytics } from '@hcengineering/analytics'
@@ -44,6 +44,7 @@ startFront(metricsContext, {
4444
DESKTOP_UPDATES_URL: process.env.DESKTOP_UPDATES_URL,
4545
DESKTOP_UPDATES_CHANNEL: process.env.DESKTOP_UPDATES_CHANNEL,
4646
ANALYTICS_COLLECTOR_URL: process.env.ANALYTICS_COLLECTOR_URL,
47+
LINK_PREVIEW_URL: process.env.LINK_PREVIEW_URL,
4748
AI_URL: process.env.AI_URL,
4849
TELEGRAM_BOT_URL: process.env.TELEGRAM_BOT_URL,
4950
STATS_URL: process.env.STATS_API ?? process.env.STATS_URL,

Diff for: server/front/src/index.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// Copyright © 2020, 2021 Anticrm Platform Contributors.
3-
// Copyright © 2021 Hardcore Engineering Inc.
3+
// Copyright © 2021, 2025 Hardcore Engineering Inc.
44
//
55
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
66
// you may not use this file except in compliance with the License. You may
@@ -258,6 +258,7 @@ export function start (
258258
brandingUrl?: string
259259
previewConfig: string
260260
uploadConfig: string
261+
linkPreviewUrl?: string
261262
pushPublicKey?: string
262263
disableSignUp?: string
263264
},
@@ -307,6 +308,7 @@ export function start (
307308
GMAIL_URL: config.gmailUrl,
308309
CALENDAR_URL: config.calendarUrl,
309310
COLLABORATOR: config.collaborator,
311+
LINK_PREVIEW_URL: config.linkPreviewUrl,
310312
COLLABORATOR_URL: config.collaboratorUrl,
311313
BRANDING_URL: config.brandingUrl,
312314
PREVIEW_CONFIG: config.previewConfig,

Diff for: server/front/src/starter.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//
22
// Copyright © 2020, 2021 Anticrm Platform Contributors.
3-
// Copyright © 2021, 2024 Hardcore Engineering Inc.
3+
// Copyright © 2021-2025 Hardcore Engineering Inc.
44
//
55
// Licensed under the Eclipse Public License, Version 2.0 (the "License");
66
// 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
109109

110110
const brandingUrl = process.env.BRANDING_URL
111111

112+
const linkPreviewUrl = process.env.LINK_PREVIEW_URL
113+
112114
setMetadata(serverToken.metadata.Secret, serverSecret)
113115

114116
const disableSignUp = process.env.DISABLE_SIGNUP
@@ -130,7 +132,8 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record<string, st
130132
previewConfig,
131133
uploadConfig,
132134
pushPublicKey,
133-
disableSignUp
135+
disableSignUp,
136+
linkPreviewUrl
134137
}
135138
console.log('Starting Front service with', config)
136139
const shutdown = start(ctx, config, SERVER_PORT, extraConfig)

Diff for: server/postgres/src/storage.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1267,7 +1267,8 @@ abstract class PostgresAdapterBase implements DbAdapter {
12671267
switch (type) {
12681268
case 'common':
12691269
if (Array.isArray(val) && val.includes(null)) {
1270-
res.push(`(${tkey} = ANY(${vars.addArray(val, inferType(val))})) OR ${tkey} IS NULL`)
1270+
const vv = vars.addArray(val, inferType(val))
1271+
res.push(`(${tkey} = ANY(${vv}) OR ${tkey} IS NULL)`)
12711272
} else {
12721273
if (val.length > 0) {
12731274
res.push(`${tkey} = ANY(${vars.addArray(val, inferType(val))})`)

0 commit comments

Comments
 (0)