refactor(ui): cleanup configuration types and variables namespace

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/ui/web/src/assets/config.ts b/ui/web/src/assets/config.ts
index cf6f3eb2d23a41435484386d0ef4a9d850d6bda4..28b3f158eb015198fd68c7fee0ea8f2f1fa17295 100644 (file)
--- a/ui/web/src/assets/config.ts
+++ b/ui/web/src/assets/config.ts
@@ -1,6 +1,6 @@
-import type { BaseConfig } from '@/types'
+import type { ConfigurationData } from '@/types'
 
-const config: BaseConfig = {
+const configuration: ConfigurationData = {
   uiServer: {
     host: 'localhost',
     port: 8080,
@@ -8,4 +8,4 @@ const config: BaseConfig = {
   }
 }
 
-export default config
+export default configuration

diff --git a/ui/web/src/composables/UIClient.ts b/ui/web/src/composables/UIClient.ts
index fa1479ef7d4c1655c446cc436190648b4a03d401..d056f6314e68fc71011ef1e5e2d66704f393c9b1 100644 (file)
--- a/ui/web/src/composables/UIClient.ts
+++ b/ui/web/src/composables/UIClient.ts
@@ -5,7 +5,7 @@ import {
   type ResponsePayload,
   ResponseStatus
 } from '@/types'
-import config from '@/assets/config'
+import configuration from '@/assets/config'
 
 type ResponseHandler = {
   procedureName: ProcedureName
@@ -111,8 +111,8 @@ export class UIClient {
 
   private openWS(): void {
     this.ws = new WebSocket(
-      `ws://${config.uiServer.host}:${config.uiServer.port}`,
-      config.uiServer.protocol
+      `ws://${configuration.uiServer.host}:${configuration.uiServer.port}`,
+      configuration.uiServer.protocol
     )
     this.ws.onmessage = this.responseHandler.bind(this)
     this.ws.onerror = errorEvent => {

diff --git a/ui/web/src/types/ConfigurationType.ts b/ui/web/src/types/ConfigurationType.ts
index 3753d58475ee9d165be6640a5fbc329fbe20a632..cfdbf34a319dcc4b55a87067985dee66af44d561 100644 (file)
--- a/ui/web/src/types/ConfigurationType.ts
+++ b/ui/web/src/types/ConfigurationType.ts
@@ -1,8 +1,8 @@
-export type BaseConfig = {
-  uiServer: UIServerConfig
+export type ConfigurationData = {
+  uiServer: UIServerConfigurationSection
 }
 
-type UIServerConfig = {
+type UIServerConfigurationSection = {
   host: string
   port: number
   protocol: string

diff --git a/ui/web/src/types/index.ts b/ui/web/src/types/index.ts
index ec7821f32a12fa17f5cc15153240ad9d3b2b96bd..1f1f0556747d1d784ff578a0114039e73d3dbf58 100644 (file)
--- a/ui/web/src/types/index.ts
+++ b/ui/web/src/types/index.ts
@@ -3,7 +3,7 @@ export type {
   ChargingStationInfo,
   ConnectorStatus
 } from './ChargingStationType'
-export type { BaseConfig } from './ConfigurationType'
+export type { ConfigurationData } from './ConfigurationType'
 export {
   ProcedureName,
   type ProtocolResponse,