wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-22 16:27:22 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into staging

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2025-01-18 23:39:26 +07:00
commit 134d889a5b
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pods/front/src/__start.ts
View File

@ -1,5 +1,5 @@
// //
// Copyright © 2023 Hardcore Engineering Inc. // Copyright © 2023, 2025 Hardcore Engineering Inc.
// //
import { Analytics } from '@hcengineering/analytics' import { Analytics } from '@hcengineering/analytics'
@ -44,6 +44,7 @@ startFront(metricsContext, {
DESKTOP_UPDATES_URL: process.env.DESKTOP_UPDATES_URL, DESKTOP_UPDATES_URL: process.env.DESKTOP_UPDATES_URL,
DESKTOP_UPDATES_CHANNEL: process.env.DESKTOP_UPDATES_CHANNEL, DESKTOP_UPDATES_CHANNEL: process.env.DESKTOP_UPDATES_CHANNEL,
ANALYTICS_COLLECTOR_URL: process.env.ANALYTICS_COLLECTOR_URL, ANALYTICS_COLLECTOR_URL: process.env.ANALYTICS_COLLECTOR_URL,
LINK_PREVIEW_URL: process.env.LINK_PREVIEW_URL,
AI_URL: process.env.AI_URL, AI_URL: process.env.AI_URL,
TELEGRAM_BOT_URL: process.env.TELEGRAM_BOT_URL, TELEGRAM_BOT_URL: process.env.TELEGRAM_BOT_URL,
STATS_URL: process.env.STATS_API ?? process.env.STATS_URL, STATS_URL: process.env.STATS_API ?? process.env.STATS_URL,

4
server/front/src/index.ts
View File

@ -1,6 +1,6 @@
// //
// Copyright © 2020, 2021 Anticrm Platform Contributors. // 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"); // 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 // you may not use this file except in compliance with the License. You may
@ -258,6 +258,7 @@ export function start (
brandingUrl?: string brandingUrl?: string
previewConfig: string previewConfig: string
uploadConfig: string uploadConfig: string
linkPreviewUrl?: string
pushPublicKey?: string pushPublicKey?: string
disableSignUp?: string disableSignUp?: string
}, },
@ -307,6 +308,7 @@ export function start (
GMAIL_URL: config.gmailUrl, GMAIL_URL: config.gmailUrl,
CALENDAR_URL: config.calendarUrl, CALENDAR_URL: config.calendarUrl,
COLLABORATOR: config.collaborator, COLLABORATOR: config.collaborator,
LINK_PREVIEW_URL: config.linkPreviewUrl,
COLLABORATOR_URL: config.collaboratorUrl, COLLABORATOR_URL: config.collaboratorUrl,
BRANDING_URL: config.brandingUrl, BRANDING_URL: config.brandingUrl,
PREVIEW_CONFIG: config.previewConfig, PREVIEW_CONFIG: config.previewConfig,

7
server/front/src/starter.ts
View File

@ -1,6 +1,6 @@
// //
// Copyright © 2020, 2021 Anticrm Platform Contributors. // 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"); // 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 // 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 brandingUrl = process.env.BRANDING_URL
const linkPreviewUrl = process.env.LINK_PREVIEW_URL
setMetadata(serverToken.metadata.Secret, serverSecret) setMetadata(serverToken.metadata.Secret, serverSecret)
const disableSignUp = process.env.DISABLE_SIGNUP const disableSignUp = process.env.DISABLE_SIGNUP
@ -130,7 +132,8 @@ export function startFront (ctx: MeasureContext, extraConfig?: Record<string, st
previewConfig, previewConfig,
uploadConfig, uploadConfig,
pushPublicKey, pushPublicKey,
disableSignUp disableSignUp,
linkPreviewUrl
} }
console.log('Starting Front service with', config) console.log('Starting Front service with', config)
const shutdown = start(ctx, config, SERVER_PORT, extraConfig) const shutdown = start(ctx, config, SERVER_PORT, extraConfig)

3
server/postgres/src/storage.ts
View File

@ -1267,7 +1267,8 @@ abstract class PostgresAdapterBase implements DbAdapter {
switch (type) { switch (type) {
case 'common': case 'common':
if (Array.isArray(val) && val.includes(null)) { 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 { } else {
if (val.length > 0) { if (val.length > 0) {
res.push(`${tkey} = ANY(${vars.addArray(val, inferType(val))})`) res.push(`${tkey} = ANY(${vars.addArray(val, inferType(val))})`)