From 42f675715f5cb0c64601d90a49c2c06979671c60 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Thu, 16 Apr 2026 21:39:21 +0200
Subject: [PATCH] =?utf8?q?refactor(ui):=20consolidate=20constants=20?=
 =?utf8?q?=E2=80=94=20remove=20timeout=20duplicate,=20centralize=20default?=
 =?utf8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

- Remove dead duplicate UI_WEBSOCKET_REQUEST_TIMEOUT_MS from ui/web/src/composables/Constants.ts
- Add DEFAULT_HOST ('localhost') and DEFAULT_PORT (8080) to ui/common/src/constants.ts
- Update ui/cli/src/config/defaults.ts and loader.ts to import from ui-common
- Update ui/web/tests/unit/constants.ts to use DEFAULT_HOST/DEFAULT_PORT from ui-common
- Update ui/cli/tests/config.test.ts to import from ui-common
---
 ui/cli/src/config/defaults.ts       |  2 --
 ui/cli/src/config/loader.ts         | 11 +++++------
 ui/cli/tests/config.test.ts         |  9 ++-------
 ui/common/src/constants.ts          |  2 ++
 ui/web/src/composables/Constants.ts |  1 -
 ui/web/tests/unit/constants.ts      |  8 +++++---
 6 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/ui/cli/src/config/defaults.ts b/ui/cli/src/config/defaults.ts
index 5e16be88..90f5114d 100644
--- a/ui/cli/src/config/defaults.ts
+++ b/ui/cli/src/config/defaults.ts
@@ -1,7 +1,5 @@
 import { Protocol, ProtocolVersion } from 'ui-common'
 
-export const DEFAULT_HOST = 'localhost'
-export const DEFAULT_PORT = 8080
 export const DEFAULT_PROTOCOL = Protocol.UI
 export const DEFAULT_VERSION = ProtocolVersion['0.0.1']
 export const DEFAULT_SECURE = false
diff --git a/ui/cli/src/config/loader.ts b/ui/cli/src/config/loader.ts
index 9b1c6473..423106e1 100644
--- a/ui/cli/src/config/loader.ts
+++ b/ui/cli/src/config/loader.ts
@@ -2,15 +2,14 @@ import { readFile } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { join } from 'node:path'
 import process from 'node:process'
-import { uiServerConfigSchema, type UIServerConfigurationSection } from 'ui-common'
-
 import {
   DEFAULT_HOST,
   DEFAULT_PORT,
-  DEFAULT_PROTOCOL,
-  DEFAULT_SECURE,
-  DEFAULT_VERSION,
-} from './defaults.js'
+  uiServerConfigSchema,
+  type UIServerConfigurationSection,
+} from 'ui-common'
+
+import { DEFAULT_PROTOCOL, DEFAULT_SECURE, DEFAULT_VERSION } from './defaults.js'
 
 interface LoadConfigOptions {
   configPath?: string
diff --git a/ui/cli/tests/config.test.ts b/ui/cli/tests/config.test.ts
index 242c6629..23026360 100644
--- a/ui/cli/tests/config.test.ts
+++ b/ui/cli/tests/config.test.ts
@@ -3,14 +3,9 @@ import { mkdir, mkdtemp, rm, writeFile } from 'node:fs/promises'
 import { tmpdir } from 'node:os'
 import { join } from 'node:path'
 import { afterEach, beforeEach, describe, it } from 'node:test'
+import { DEFAULT_HOST, DEFAULT_PORT } from 'ui-common'
 
-import {
-  DEFAULT_HOST,
-  DEFAULT_PORT,
-  DEFAULT_PROTOCOL,
-  DEFAULT_SECURE,
-  DEFAULT_VERSION,
-} from '../src/config/defaults.js'
+import { DEFAULT_PROTOCOL, DEFAULT_SECURE, DEFAULT_VERSION } from '../src/config/defaults.js'
 import { loadConfig } from '../src/config/loader.js'
 
 let tempDir: string
diff --git a/ui/common/src/constants.ts b/ui/common/src/constants.ts
index 2e5b1972..2c3a3b98 100644
--- a/ui/common/src/constants.ts
+++ b/ui/common/src/constants.ts
@@ -1 +1,3 @@
+export const DEFAULT_HOST = 'localhost'
+export const DEFAULT_PORT = 8080
 export const UI_WEBSOCKET_REQUEST_TIMEOUT_MS = 60_000
diff --git a/ui/web/src/composables/Constants.ts b/ui/web/src/composables/Constants.ts
index 18e18ea6..83143d64 100644
--- a/ui/web/src/composables/Constants.ts
+++ b/ui/web/src/composables/Constants.ts
@@ -13,4 +13,3 @@ export const ROUTE_NAMES = {
 export const SHARED_TOGGLE_BUTTON_KEY_PREFIX = 'shared-toggle-button-'
 export const TOGGLE_BUTTON_KEY_PREFIX = 'toggle-button-'
 export const UI_SERVER_CONFIGURATION_INDEX_KEY = 'uiServerConfigurationIndex'
-export const UI_WEBSOCKET_REQUEST_TIMEOUT_MS = 60_000
diff --git a/ui/web/tests/unit/constants.ts b/ui/web/tests/unit/constants.ts
index e1c920a9..ab8868e1 100644
--- a/ui/web/tests/unit/constants.ts
+++ b/ui/web/tests/unit/constants.ts
@@ -7,6 +7,8 @@ import {
   type ChargingStationData,
   type ChargingStationInfo,
   type ConnectorStatus,
+  DEFAULT_HOST,
+  DEFAULT_PORT,
   type EvseEntry,
   OCPP16AvailabilityType,
   OCPP16ChargePointStatus,
@@ -22,7 +24,7 @@ import {
 export const TEST_HASH_ID = 'test-hash-id-abc123'
 export const TEST_ID_TAG = 'RFID-TAG-001'
 export const TEST_STATION_ID = 'CS-TEST-001'
-export const TEST_WS_URL = 'ws://localhost:8080'
+export const TEST_WS_URL = `ws://${DEFAULT_HOST}:${DEFAULT_PORT.toString()}`
 
 // ── Factory Functions ─────────────────────────────────────────────────────────
 
@@ -108,8 +110,8 @@ export function createUIServerConfig (
   overrides?: Partial<UIServerConfigurationSection>
 ): UIServerConfigurationSection {
   return {
-    host: 'localhost',
-    port: 8080,
+    host: DEFAULT_HOST,
+    port: DEFAULT_PORT,
     protocol: Protocol.UI,
     version: ProtocolVersion['0.0.1'],
     ...overrides,
-- 
2.43.0