Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -833,7 +833,7 @@
"SECRET": "secret",
"DB_URL": "postgresql://root@localhost:26257/defaultdb?sslmode=disable",
"BUCKETS": "blobs,eu|http://localhost:9000?accessKey=minioadmin&secretKey=minioadmin",
"ACCOUNTS_URL": "http://localhost:3000",
"ACCOUNTS_URL": "http://huly.local:3000",
"STATS_URL": "http://huly.local:4900",
"QUEUE_CONFIG": "localhost:19092"
},
Expand Down
13 changes: 12 additions & 1 deletion common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions desktop/src/ui/platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ import '@hcengineering/ai-assistant-assets'
import analyticsCollector, { analyticsCollectorId } from '@hcengineering/analytics-collector'
import { coreId } from '@hcengineering/core'
import love, { loveId } from '@hcengineering/love'
import presentation, { parsePreviewConfig, parseUploadConfig, presentationId } from '@hcengineering/presentation'
import presentation, { createFileStorage, presentationId } from '@hcengineering/presentation'
import print, { printId } from '@hcengineering/print'
import sign from '@hcengineering/sign'
import textEditor, { textEditorId } from '@hcengineering/text-editor'
Expand Down Expand Up @@ -288,11 +288,11 @@ export async function configurePlatform (onWorkbenchConnect?: () => Promise<void
setMetadata(login.metadata.DisableSignUp, config.DISABLE_SIGNUP === 'true')
setMetadata(login.metadata.HideLocalLogin, config.HIDE_LOCAL_LOGIN === 'true')
setMetadata(presentation.metadata.UploadURL, config.UPLOAD_URL)
setMetadata(presentation.metadata.FilesURL, config.FILES_URL)
setMetadata(presentation.metadata.UploadURL, config.FILES_URL)
setMetadata(presentation.metadata.DatalakeUrl, config.DATALAKE_URL ?? '')
setMetadata(presentation.metadata.FileStorage, createFileStorage(config.UPLOAD_URL, config.DATALAKE_URL, config.HULYLAKE_URL))
setMetadata(presentation.metadata.CollaboratorUrl, config.COLLABORATOR_URL)
setMetadata(presentation.metadata.PreviewUrl, config.PREVIEW_URL)
setMetadata(presentation.metadata.PreviewConfig, parsePreviewConfig(config.PREVIEW_CONFIG))
setMetadata(presentation.metadata.UploadConfig, parseUploadConfig(config.UPLOAD_CONFIG, config.UPLOAD_URL))
setMetadata(presentation.metadata.FrontUrl, config.FRONT_URL)
setMetadata(presentation.metadata.LinkPreviewUrl, config.LINK_PREVIEW_URL ?? '')
setMetadata(presentation.metadata.MailUrl, config.MAIL_URL)
Expand Down
5 changes: 2 additions & 3 deletions desktop/src/ui/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ export interface Config {
DISABLE_SIGNUP?: string
HIDE_LOCAL_LOGIN?: string
FILES_URL: string
UPLOAD_URL: string
DATALAKE_URL?: string
FRONT_URL: string
GITHUB_APP: string
GITHUB_CLIENTID: string
Expand All @@ -31,16 +33,13 @@ export interface Config {
MODEL_VERSION: string
PRESENCE_URL?: string
PREVIEW_URL?: string
PREVIEW_CONFIG?: string
PRINT_URL?: string
PUSH_PUBLIC_KEY: string
REKONI_URL: string
SIGN_URL?: string
STATS_URL?: string
TELEGRAM_BOT_URL?: string
TELEGRAM_URL: string
UPLOAD_CONFIG: string
UPLOAD_URL: string
VERSION: string
STREAM_URL?: string
BACKUP_URL?: string
Expand Down
4 changes: 2 additions & 2 deletions dev/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -262,9 +262,8 @@ services:
- ACCOUNTS_URL=http://huly.local:3000
- STATS_URL=http://huly.local:4900
- FILES_URL=http://huly.local:4030/blob/:workspace/:blobId/:filename
- UPLOAD_URL=http://huly.local:4030/upload/form-data/:workspace
- UPLOAD_URL=/files
- PREVIEW_URL=http://huly.local:4040
- PREVIEW_CONFIG=image|http://huly.local:4030/image/fit=cover,width=:width,height=:height,dpr=:dpr/:workspace/:blobId;video|http://huly.local:4030/meta/:workspace/:blobId
- GMAIL_URL=http://huly.local:8093
- CALENDAR_URL=http://huly.local:8095
- TELEGRAM_URL=http://huly.local:8086
Expand All @@ -286,6 +285,7 @@ services:
# - DISABLE_SIGNUP=true
- OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318/v1/traces
- PULSE_URL=ws://huly.local:8099/ws
- DATALAKE_URL=http://huly.local:4030
- HULYLAKE_URL=http://huly.local:8096
restart: unless-stopped
transactor_cockroach:
Expand Down
1 change: 1 addition & 0 deletions dev/prod/public/config-dev.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"PUBLIC_SCHEDULE_URL": "https://schedule.hc.engineering",
"CALDAV_SERVER_URL": "https://caldav.hc.engineering",
"BACKUP_URL": "https://front.hc.engineering/api/backup",
"DATALAKE_URL": "https://datalake.hc.engineering",
"HULYLAKE_URL": "https://lake.hc.engineering",
"PULSE_URL": "wss://pulse.hc.engineering/ws",
"COMMUNICATION_API_ENABLED": "true",
Expand Down
1 change: 0 additions & 1 deletion dev/prod/public/config-huly.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
"CALENDAR_URL": "https://calendar.huly.app/",
"COLLABORATOR_URL": "wss://collaborator.huly.app",
"BRANDING_URL": "https://huly.app/huly-branding_v2.json",
"PREVIEW_CONFIG": "https://huly.app/files/:workspace?file=:blobId&size=:size",
"GITHUB_APP": "huly-for-github",
"GITHUB_CLIENTID": "Iv1.e263a087de0910e0",
"INTERCOM_APP_ID": "",
Expand Down
5 changes: 0 additions & 5 deletions dev/prod/public/config-worker.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"CALENDAR_URL": "https://calendar.hc.engineering/",
"COLLABORATOR_URL": "wss://collaborator.hc.engineering",
"DESKTOP_UPDATES_CHANNEL": "front",
"FILES_URL": "https://dl.hc.engineering/blob/:workspace/:blobId/:filename",
"GITHUB_APP": "huly-github-staging",
"GITHUB_CLIENTID": "Iv1.cd9d3f7987474b5e",
"GITHUB_URL": "https://github.hc.engineering",
Expand All @@ -15,16 +14,12 @@
"INTERCOM_APP_ID": "",
"LOVE_ENDPOINT": "https://love.hc.engineering/",
"MODEL_VERSION": "",

"PREVIEW_CONFIG": "image|https://dl.hc.engineering/image/fit=scale-down,width=:width,height=:height,dpr=:dpr/:workspace/:blobId;video|https://dl.hc.engineering/video/:workspace/:blobId/meta",

"PRINT_URL": "https://print.hc.engineering",
"REKONI_URL": "https://rekoni.hc.engineering",
"SIGN_URL": "https://sign.hc.engineering",
"STATS_URL": "https://stats.hc.engineering",
"TELEGRAM_BOT_URL": "https://telegram-bot.hc.engineering",
"TELEGRAM_URL": "https://telegram.hc.engineering",
"UPLOAD_CONFIG": "",
"UPLOAD_URL": "https://dl.hc.engineering/upload/form-data/:workspace",
"TRANSACTOR_OVERRIDE": "ws://localhost:3335"
}
6 changes: 3 additions & 3 deletions dev/prod/public/config.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"ACCOUNTS_URL": "/account",
"COLLABORATOR_URL": "ws://huly.local:3078",
"FILES_URL": "http://huly.local:4030/blob/:workspace/:blobId/:filename",
"UPLOAD_URL": "http://huly.local:4030/upload/form-data/:workspace",
"PREVIEW_URL": "http://huly.local:4040",
"PREVIEW_CONFIG": "image|http://huly.local:4030/image/fit=cover,width=:width,height=:height,dpr=:dpr/:workspace/:blobId;video|http://huly.local:4030/meta/:workspace/:blobId",
"FILES_URL": "http://huly.local:4030/blob/:workspace/:blobId/:filename",
"UPLOAD_URL": "/files",
"DATALAKE_URL": "http://huly.local:4030",
"TELEGRAM_URL": "http://huly.local:8086",
"GMAIL_URL": "http://huly.local:8093",
"CALENDAR_URL": "http://localhost:8095",
Expand Down
11 changes: 4 additions & 7 deletions dev/prod/src/platform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,7 @@ import '@hcengineering/ai-assistant-assets'
import { coreId } from '@hcengineering/core'
import presentation, {
loadServerConfig,
parsePreviewConfig,
parseUploadConfig,
createFileStorage,
presentationId
} from '@hcengineering/presentation'

Expand All @@ -155,6 +154,7 @@ export interface Config {
ACCOUNTS_URL: string
UPLOAD_URL: string
FILES_URL: string
DATALAKE_URL?: string
MODEL_VERSION: string
VERSION: string
COLLABORATOR_URL: string
Expand Down Expand Up @@ -183,8 +183,6 @@ export interface Config {
// Could be defined for dev environment
FRONT_URL?: string
PREVIEW_URL?: string
PREVIEW_CONFIG?: string
UPLOAD_CONFIG?: string
STATS_URL?: string
PRESENCE_URL?: string
USE_BINARY_PROTOCOL?: boolean
Expand Down Expand Up @@ -459,14 +457,13 @@ export async function configurePlatform () {

setMetadata(login.metadata.PasswordValidations, PASSWORD_REQUIREMENTS[config.PASSWORD_STRICTNESS ?? 'none'])

setMetadata(presentation.metadata.FilesURL, config.FILES_URL)
setMetadata(presentation.metadata.UploadURL, config.UPLOAD_URL)
setMetadata(presentation.metadata.DatalakeUrl, config.DATALAKE_URL)
setMetadata(presentation.metadata.FileStorage, createFileStorage(config.UPLOAD_URL, config.DATALAKE_URL, config.HULYLAKE_URL))
setMetadata(presentation.metadata.CollaboratorUrl, config.COLLABORATOR_URL)

setMetadata(presentation.metadata.FrontUrl, config.FRONT_URL)
setMetadata(presentation.metadata.PreviewUrl, config.PREVIEW_URL)
setMetadata(presentation.metadata.PreviewConfig, parsePreviewConfig(config.PREVIEW_CONFIG))
setMetadata(presentation.metadata.UploadConfig, parseUploadConfig(config.UPLOAD_CONFIG ?? '', config.UPLOAD_URL))
setMetadata(presentation.metadata.StatsUrl, config.STATS_URL)
setMetadata(presentation.metadata.LinkPreviewUrl, config.LINK_PREVIEW_URL)
setMetadata(presentation.metadata.MailUrl, config.MAIL_URL)
Expand Down
1 change: 1 addition & 0 deletions packages/presentation/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
"@hcengineering/retry": "^0.7.5",
"@hcengineering/hulylake-client": "^0.7.6",
"@hcengineering/hulypulse-client": "^0.7.0",
"@hcengineering/storage-client": "^0.7.6",
"fast-equals": "^5.2.2",
"png-chunks-extract": "^1.0.0",
"svelte": "^4.2.20",
Expand Down
Loading
Loading