Merge branch 'staging-new'

Signed-off-by: Alexander Onnikov <[email protected]>

Author: aonnikov

.vscode/launch.json

@@ -104,9 +104,12 @@
         "UPLOAD_URL": "/files",
         "AI_BOT_URL": "http://localhost:4010",
         "STATS_URL": "http://huly.local:4900",
-        "QUEUE_CONFIG": "localhost:19092",
+        "QUEUE_CONFIG": "huly.local:19092",
+        "REGION": "cockroach",
+        "QUEUE_REGION": "cockroach",
         "FILES_URL": "http://huly.local:4030/blob/:workspace/:blobId/:filename",
-        "OTEL_EXPORTER_OTLP_ENDPOINT": "http://huly.local:4318/v1/traces"
+        "OTEL_EXPORTER_OTLP_ENDPOINT": "http://huly.local:4318/v1/traces",
+        "BRANDING_PATH": "${workspaceRoot}/dev/branding.json"
       },
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "runtimeVersion": "20",
@@ -972,25 +975,6 @@
       "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
       "sourceMaps": true,
       "cwd": "${workspaceRoot}/services/export/pod-export"
-    },
-    {
-      "name": "Msg2File",
-      "type": "node",
-      "request": "launch",
-      "args": ["src/index.ts"],
-      "env": {
-        "ACCOUNTS_URL": "http://localhost:3000",
-        "DB_URL": "postgresql://root@localhost:26257/defaultdb?sslmode=disable",
-        "PORT": "9087",
-        "SECRET": "secret",
-        "SERVICE_ID": "msg2file-service",
-        "STORAGE_CONFIG": "datalake|http://huly.local:4030"
-      },
-      "runtimeVersion": "20",
-      "runtimeArgs": ["--nolazy", "-r", "ts-node/register"],
-      "sourceMaps": true,
-      "outputCapture": "std",
-      "cwd": "${workspaceRoot}/services/msg2file"
     }
   ]
 }

common/config/rush/pnpm-lock.yaml

@@ -19,7 +19,6 @@ rush docker:build -p 20 \
 --to @hcengineering/pod-datalake \
 --to @hcengineering/pod-mail-worker \
 --to @hcengineering/pod-export \
---to @hcengineering/pod-msg2file \
 --to @hcengineering/pod-media \
 --to @hcengineering/pod-preview \
 --to @hcengineering/pod-external \

common/scripts/docker.sh

@@ -14,9 +14,8 @@
 //
 
 describe('node environment self checking', () => {
-    test('check Jest\'s node environment', () => {
-        const isNodeAvailable = typeof process !== 'undefined';
-        expect(isNodeAvailable).toBe(true);
-    })
-
+  test('check Jest\'s node environment', () => {
+    const isNodeAvailable = typeof process !== 'undefined'
+    expect(isNodeAvailable).toBe(true)
+  })
 })

communication

@@ -0,0 +1,198 @@
+//
+// Copyright © 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
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { Settings } from '../../main/settings'
+import { PackedConfig } from '../../main/config'
+
+const createMockStore = (): { get: jest.Mock, set: jest.Mock } => {
+  const store: Record<string, any> = {}
+  return {
+    get: jest.fn((key: string) => store[key]),
+    set: jest.fn((key: string, value: any) => { store[key] = value })
+  }
+}
+
+jest.mock('electron-store', () => {
+  return jest.fn()
+})
+
+describe('Settings', () => {
+  let originalEnvironment: NodeJS.ProcessEnv
+  let stubStoreInstance: ReturnType<typeof createMockStore>
+
+  beforeEach(() => {
+    originalEnvironment = process.env
+    process.env = { ...originalEnvironment }
+    stubStoreInstance = createMockStore()
+    jest.clearAllMocks()
+  })
+
+  afterEach(() => {
+    process.env = originalEnvironment
+    jest.clearAllMocks()
+  })
+
+  describe('readServerUrl', () => {
+    test('isDev is true', () => {
+      const systemUnderTest = new Settings(stubStoreInstance as any, true)
+
+      const actualUrl = systemUnderTest.readServerUrl()
+
+      expect(actualUrl).toBe('http://huly.local:8087')
+    })
+
+    test('isDev is true and FRONT_URL is set', () => {
+      process.env.FRONT_URL = 'http://custom-dev.local:3000'
+      const systemUnderTest = new Settings(stubStoreInstance as any, true)
+
+      const actualUrl = systemUnderTest.readServerUrl()
+
+      expect(actualUrl).toBe('http://custom-dev.local:3000')
+    })
+
+    test('isDev is false and server is in store', () => {
+      const expectedUrl = 'https://stored.server.com'
+      stubStoreInstance.get.mockReturnValue(expectedUrl)
+      const systemUnderTest = new Settings(stubStoreInstance as any, false)
+
+      const actualUrl = systemUnderTest.readServerUrl()
+
+      expect(actualUrl).toBe(expectedUrl)
+    })
+
+    test('store is empty and packed config exists', () => {
+      stubStoreInstance.get.mockReturnValue(undefined)
+      const expectedUrl = 'https://packed.server.com'
+      const packedConfig: PackedConfig = { server: expectedUrl }
+      const systemUnderTest = new Settings(stubStoreInstance as any, false, packedConfig)
+
+      const actualUrl = systemUnderTest.readServerUrl()
+
+      expect(actualUrl).toBe(expectedUrl)
+    })
+
+    test('store and packed config are empty', () => {
+      stubStoreInstance.get.mockReturnValue(undefined)
+      const expectedUrl = 'https://env.server.com'
+      process.env.FRONT_URL = expectedUrl
+      const systemUnderTest = new Settings(stubStoreInstance as any, false)
+
+      const actualUrl = systemUnderTest.readServerUrl()
+
+      expect(actualUrl).toBe(expectedUrl)
+    })
+
+    test('all options are unavailable', () => {
+      stubStoreInstance.get.mockReturnValue(undefined)
+      delete process.env.FRONT_URL
+      const systemUnderTest = new Settings(stubStoreInstance as any, false)
+
+      const result = systemUnderTest.readServerUrl()
+
+      expect(result).toBe('https://huly.app')
+    })
+
+    test('all (store, packed config, environment) options are available', () => {
+      const expectedUrl = 'https://store.priority.com'
+      stubStoreInstance.get.mockReturnValue(expectedUrl)
+      process.env.FRONT_URL = 'https://env.server.com'
+      const packedConfig: PackedConfig = { server: 'https://packed.server.com' }
+      const systemUnderTest = new Settings(stubStoreInstance as any, false, packedConfig)
+
+      const actualUrl = systemUnderTest.readServerUrl()
+
+      expect(actualUrl).toBe(expectedUrl)
+    })
+  })
+
+  describe('read/write', () => {
+    let systemUnderTest: Settings
+    beforeEach(() => {
+      systemUnderTest = new Settings(stubStoreInstance as any, false)
+    })
+
+    describe('isMinimizeToTrayEnabled', () => {
+      test.each([
+        { storedValue: true, expected: true, description: 'stored value is true' },
+        { storedValue: false, expected: false, description: 'stored value is false' }
+      ])('$description', ({ storedValue, expected }) => {
+        stubStoreInstance.get.mockReturnValue(storedValue)
+
+        const actualValue = systemUnderTest.isMinimizeToTrayEnabled()
+
+        expect(actualValue).toBe(expected)
+      })
+
+      test.each([
+        { storedValue: undefined, description: 'no value is stored (undefined)' },
+        { storedValue: null, description: 'stored value is null' }
+      ])('$description', ({ storedValue }) => {
+        stubStoreInstance.get.mockReturnValue(storedValue)
+
+        const actualValue = systemUnderTest.isMinimizeToTrayEnabled()
+
+        expect(actualValue).toBe(false)
+      })
+    })
+
+    describe('setMinimizeToTrayEnabled', () => {
+      test.each([
+        { value: true, description: 'stored value is true' },
+        { value: false, description: 'stored value is false' }
+      ])('$description', ({ value }) => {
+        systemUnderTest.setMinimizeToTrayEnabled(value)
+
+        expect(systemUnderTest.isMinimizeToTrayEnabled()).toBe(value)
+      })
+    })
+
+    describe('setServerUrl', () => {
+      test('write than read', () => {
+        const expectedUrl = 'https://new.server.com'
+
+        systemUnderTest.setServerUrl(expectedUrl)
+
+        expect(systemUnderTest.readServerUrl()).toBe(expectedUrl)
+      })
+    })
+
+    describe('getWindowBounds', () => {
+      test('read', () => {
+        const expectedValue = { x: 100, y: 300, width: 500, height: 700 }
+        stubStoreInstance.get.mockReturnValue(expectedValue)
+
+        const actulValue = systemUnderTest.getWindowBounds()
+
+        expect(actulValue).toEqual(expectedValue)
+      })
+
+      test('no bounds are stored', () => {
+        stubStoreInstance.get.mockReturnValue(undefined)
+
+        expect(systemUnderTest.getWindowBounds()).toBeUndefined()
+      })
+    })
+
+    describe('setWindowBounds', () => {
+      test('write than read', () => {
+        const expectedValue = { x: 100, y: 200, width: 800, height: 600 }
+
+        systemUnderTest.setWindowBounds(expectedValue)
+
+        expect(systemUnderTest.getWindowBounds()).toBe(expectedValue)
+      })
+    })
+  })
+})

desktop/public/TrayIconWithBadge.ico

@@ -0,0 +1,67 @@
+//
+// Copyright © 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
+// obtain a copy of the License at https://www.eclipse.org/legal/epl-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import { getBadgeIconInfo } from '../../main/trayUtils'
+
+describe('getBadgeIconInfo', () => {
+  const baseTitle = 'Huly'
+
+  it('count of 0', () => {
+    const result = getBadgeIconInfo(0, baseTitle)
+    expect(result).toEqual({
+      fileName: '',
+      tooltip: baseTitle
+    })
+  })
+
+  it('negative count', () => {
+    const result = getBadgeIconInfo(-5, baseTitle)
+    expect(result).toEqual({
+      fileName: '',
+      tooltip: baseTitle
+    })
+  })
+
+  it.each([1, 2, 3, 4, 5, 6, 7, 8, 9])('count of %i', (count: number) => {
+    const result = getBadgeIconInfo(count, baseTitle)
+    expect(result).toEqual({
+      fileName: 'TrayIconWithBadge.ico',
+      tooltip: `${baseTitle}: ${count} unread`
+    })
+  })
+
+  describe('badge count 10-98', () => {
+    const testCases: number[] = []
+    for (let i = 10; i <= 98; i++) {
+      testCases.push(i)
+    }
+
+    it.each(testCases)('count of %i', (count: number) => {
+      const result = getBadgeIconInfo(count, baseTitle)
+      expect(result).toEqual({
+        fileName: 'TrayIconWithBadge.ico',
+        tooltip: `${baseTitle}: ${count} unread`
+      })
+    })
+  })
+
+  it.each([99, 100, 200, 301])('count of %i', (count: number) => {
+    const result = getBadgeIconInfo(count, baseTitle)
+    expect(result).toEqual({
+      fileName: 'TrayIconWithBadge.ico',
+      tooltip: `${baseTitle}: ${count} unread`
+    })
+  })
+})

desktop/src/__test__/main/selfCheckingNode.test.ts

@@ -15,12 +15,12 @@
 import * as path from 'path'
 import * as fs from 'fs'
 
-interface PackedConfig {
+export interface PackedConfig {
   server?: string
   updatesChannelKey?: string
 }
 
-const configPath = path.join(process.resourcesPath, 'config/config.json')
+const configPath = path.join(process.resourcesPath, 'config', 'config.json')
 
 export function readPackedConfig (): PackedConfig | undefined {
   if (fs.existsSync(configPath)) {

desktop/src/__test__/main/settings.test.ts

@@ -13,10 +13,11 @@
 // limitations under the License.
 //
 
-import { app, BrowserWindow } from 'electron'
+import { BrowserWindow } from 'electron'
 import { MenuBarAction, CommandLogout, CommandSelectWorkspace, CommandOpenSettings } from '../ui/types'
+import { TrayController } from './tray'
 
-export function dispatchMenuBarAction (mainWindow: BrowserWindow | undefined, action: MenuBarAction): void {
+export function dispatchMenuBarAction (mainWindow: BrowserWindow | undefined, action: MenuBarAction, tray: TrayController | undefined): void {
   if (mainWindow == null) {
     return
   }
@@ -42,7 +43,7 @@ export function dispatchMenuBarAction (mainWindow: BrowserWindow | undefined, ac
       mainWindow.webContents.send(CommandLogout)
       break
     case 'exit':
-      app.quit()
+      mainWindow.close()
       break
     case 'undo':
       mainWindow.webContents.undo()
@@ -86,6 +87,13 @@ export function dispatchMenuBarAction (mainWindow: BrowserWindow | undefined, ac
     case 'toggle-fullscreen':
       mainWindow.setFullScreen(!mainWindow.isFullScreen())
       break
+    case 'toggle-minimize-to-tray': {
+      if (tray != null) {
+        const newSetting = tray.toggleMinimizeToTray()
+        mainWindow.webContents.send('minimize-to-tray-setting-changed', newSetting)
+      }
+      break
+    }
     default:
       console.log('unknown menu action:', action)
   }