From 50c6a1e098df87bac70cb8c6f7262ca8e8a0ca3e Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Thu, 30 Apr 2026 09:35:59 +0200
Subject: [PATCH] refactor(ui-web): reorganize composables into core/
 infrastructure and shared/composables/

---
 ui/web/src/composables/Utils.ts               | 148 ------------------
 ui/web/src/{composables => core}/Constants.ts |   0
 ui/web/src/{composables => core}/UIClient.ts  |   0
 ui/web/src/{composables => core}/index.ts     |  19 +--
 ui/web/src/core/providers.ts                  |  39 +++++
 ui/web/src/core/storage.ts                    |  75 +++++++++
 ui/web/src/main.ts                            |   2 +-
 ui/web/src/router/index.ts                    |   2 +-
 .../src/shared/components/SkinLoadError.vue   |   2 +-
 ui/web/src/shared/composables/index.ts        |   1 +
 .../shared/composables/useAddStationsForm.ts  |   2 +-
 .../shared/composables/useConnectorActions.ts |   2 +-
 ui/web/src/shared/composables/useFetchData.ts |  38 +++++
 .../src/shared/composables/useLayoutData.ts   |  10 +-
 .../src/shared/composables/useSetUrlForm.ts   |   2 +-
 .../shared/composables/useSimulatorControl.ts |   2 +-
 ui/web/src/shared/composables/useSkin.ts      |   2 +-
 .../src/shared/composables/useStartTxForm.ts  |   2 +-
 .../shared/composables/useStationActions.ts   |   2 +-
 ui/web/src/shared/composables/useTheme.ts     |   2 +-
 .../src/shared/utils/formatSupervisionUrl.ts  |   2 +-
 ui/web/src/skins/classic/ClassicLayout.vue    |   2 +-
 .../actions/AddChargingStations.vue           |   2 +-
 .../components/actions/SetSupervisionUrl.vue  |   2 +-
 .../components/actions/StartTransaction.vue   |   2 +-
 .../components/buttons/ToggleButton.vue       |   2 +-
 .../charging-stations/CSConnector.vue         |   2 +-
 .../components/charging-stations/CSData.vue   |   2 +-
 ui/web/src/skins/modern/ModernLayout.vue      |   6 +-
 .../skins/modern/components/StationCard.vue   |   2 +-
 .../components/dialogs/AuthorizeDialog.vue    |   2 +-
 .../dialogs/SetSupervisionUrlDialog.vue       |   2 +-
 ui/web/tests/unit/UIClient.test.ts            |   2 +-
 ui/web/tests/unit/Utils.test.ts               |   4 +-
 ui/web/tests/unit/router.test.ts              |   2 +-
 .../composables/useAddStationsForm.test.ts    |   2 +-
 .../composables/useConnectorActions.test.ts   |   2 +-
 .../shared/composables/useLayoutData.test.ts  |   4 +-
 .../shared/composables/useSetUrlForm.test.ts  |   2 +-
 .../composables/useSimulatorControl.test.ts   |   4 +-
 .../shared/composables/useStartTxForm.test.ts |   2 +-
 .../composables/useStationActions.test.ts     |   2 +-
 .../tests/unit/skins/classic/Actions.test.ts  |   2 +-
 .../unit/skins/classic/CSConnector.test.ts    |   2 +-
 .../tests/unit/skins/classic/CSData.test.ts   |   2 +-
 .../tests/unit/skins/classic/CSTable.test.ts  |   2 +-
 .../skins/classic/ClassicComponents.test.ts   |   2 +-
 .../unit/skins/classic/ClassicLayout.test.ts  |   2 +-
 .../unit/skins/modern/ConnectorRow.test.ts    |   2 +-
 .../tests/unit/skins/modern/Dialogs.test.ts   |   2 +-
 .../unit/skins/modern/ModernLayout.test.ts    |   4 +-
 .../unit/skins/modern/StationCard.test.ts     |   2 +-
 52 files changed, 213 insertions(+), 215 deletions(-)
 delete mode 100644 ui/web/src/composables/Utils.ts
 rename ui/web/src/{composables => core}/Constants.ts (100%)
 rename ui/web/src/{composables => core}/UIClient.ts (100%)
 rename ui/web/src/{composables => core}/index.ts (90%)
 create mode 100644 ui/web/src/core/providers.ts
 create mode 100644 ui/web/src/core/storage.ts
 create mode 100644 ui/web/src/shared/composables/useFetchData.ts

diff --git a/ui/web/src/composables/Utils.ts b/ui/web/src/composables/Utils.ts
deleted file mode 100644
index 1917a855..00000000
--- a/ui/web/src/composables/Utils.ts
+++ /dev/null
@@ -1,148 +0,0 @@
-import type { ChargingStationData, ConfigurationData, ResponsePayload } from 'ui-common'
-import type { InjectionKey, Ref } from 'vue'
-
-import { inject, ref as vueRef } from 'vue'
-import { useToast } from 'vue-toast-notification'
-
-import { SHARED_TOGGLE_BUTTON_KEY_PREFIX, TOGGLE_BUTTON_KEY_PREFIX } from './Constants.js'
-import { UIClient } from './UIClient.js'
-
-export const configurationKey: InjectionKey<Ref<ConfigurationData>> = Symbol('configuration')
-export const chargingStationsKey: InjectionKey<Ref<ChargingStationData[]>> =
-  Symbol('chargingStations')
-export const templatesKey: InjectionKey<Ref<string[]>> = Symbol('templates')
-export const uiClientKey: InjectionKey<UIClient> = Symbol('uiClient')
-
-export const getFromLocalStorage = <T>(key: string, defaultValue: T): T => {
-  try {
-    const item = localStorage.getItem(key)
-    return item != null ? (JSON.parse(item) as T) : defaultValue
-  } catch {
-    if (import.meta.env.DEV) {
-      console.debug(`[localStorage] Failed to read key '${key}', using default`)
-    }
-    return defaultValue
-  }
-}
-
-// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
-export const setToLocalStorage = <T>(key: string, value: T): void => {
-  try {
-    localStorage.setItem(key, JSON.stringify(value))
-  } catch {
-    // localStorage.setItem() can throw:
-    // - QuotaExceededError when the origin's storage quota is genuinely exceeded
-    // - SecurityError when storage is blocked by user settings or browser policies
-    //   (e.g., "Block All Cookies" in Safari, third-party iframe in Chrome, file: URLs)
-    if (import.meta.env.DEV) {
-      console.debug(`[localStorage] Failed to write key '${key}'`)
-    }
-  }
-}
-
-export const deleteFromLocalStorage = (key: string): void => {
-  try {
-    localStorage.removeItem(key)
-  } catch {
-    if (import.meta.env.DEV) {
-      console.debug(`[localStorage] Failed to delete key '${key}'`)
-    }
-  }
-}
-
-export const getLocalStorage = (): Storage => {
-  try {
-    return localStorage
-  } catch {
-    throw new Error('localStorage is not available')
-  }
-}
-
-/**
- * Deletes all localStorage entries whose key includes the given pattern.
- * @param pattern - Substring to match against localStorage keys
- */
-export const deleteLocalStorageByKeyPattern = (pattern: string): void => {
-  try {
-    const keysToDelete = Object.keys(localStorage).filter(key => key.includes(pattern))
-    for (const key of keysToDelete) {
-      deleteFromLocalStorage(key)
-    }
-  } catch {
-    if (import.meta.env.DEV) {
-      console.debug(`[localStorage] Failed to delete keys matching '${pattern}'`)
-    }
-  }
-}
-
-/**
- * Resets the state of a toggle button by removing its entry from localStorage.
- * @param id - The identifier of the toggle button
- * @param shared - Whether the toggle button is shared
- */
-export const resetToggleButtonState = (id: string, shared = false): void => {
-  const key = shared
-    ? `${SHARED_TOGGLE_BUTTON_KEY_PREFIX}${id}`
-    : `${TOGGLE_BUTTON_KEY_PREFIX}${id}`
-  deleteFromLocalStorage(key)
-}
-
-export const useUIClient = (): UIClient => {
-  const injected = inject(uiClientKey, undefined)
-  if (injected != null) return injected
-  if (import.meta.env.DEV) {
-    console.debug('[useUIClient] Accessed outside provide scope — using singleton fallback')
-  }
-  return UIClient.getInstance()
-}
-
-export const useConfiguration = (): Ref<ConfigurationData> => {
-  const injected = inject(configurationKey, undefined)
-  if (injected != null) return injected
-  throw new Error('configuration not provided')
-}
-
-export const useChargingStations = (): Ref<ChargingStationData[]> => {
-  const injected = inject(chargingStationsKey, undefined)
-  if (injected != null) return injected
-  throw new Error('chargingStations not provided')
-}
-
-export const useTemplates = (): Ref<string[]> => {
-  const injected = inject(templatesKey, undefined)
-  if (injected != null) return injected
-  throw new Error('templates not provided')
-}
-
-export const useFetchData = (
-  clientFn: () => Promise<ResponsePayload>,
-  onSuccess: (response: ResponsePayload) => void,
-  errorMsg: string,
-  onError?: () => void
-): { fetch: () => void; fetching: Ref<boolean> } => {
-  const fetching = vueRef(false)
-  const $toast = useToast()
-  const fetch = (): void => {
-    if (!fetching.value) {
-      fetching.value = true
-      clientFn()
-        .then((response: ResponsePayload) => {
-          onSuccess(response)
-          return undefined
-        })
-        .finally(() => {
-          fetching.value = false
-        })
-        .catch((error: unknown) => {
-          try {
-            onError?.()
-          } catch (callbackError: unknown) {
-            console.error('Error in onError callback:', callbackError)
-          }
-          $toast.error(errorMsg)
-          console.error(`${errorMsg}:`, error)
-        })
-    }
-  }
-  return { fetch, fetching }
-}
diff --git a/ui/web/src/composables/Constants.ts b/ui/web/src/core/Constants.ts
similarity index 100%
rename from ui/web/src/composables/Constants.ts
rename to ui/web/src/core/Constants.ts
diff --git a/ui/web/src/composables/UIClient.ts b/ui/web/src/core/UIClient.ts
similarity index 100%
rename from ui/web/src/composables/UIClient.ts
rename to ui/web/src/core/UIClient.ts
diff --git a/ui/web/src/composables/index.ts b/ui/web/src/core/index.ts
similarity index 90%
rename from ui/web/src/composables/index.ts
rename to ui/web/src/core/index.ts
index 7086a0a9..1b6e7b98 100644
--- a/ui/web/src/composables/index.ts
+++ b/ui/web/src/core/index.ts
@@ -6,21 +6,22 @@ export {
   TOGGLE_BUTTON_KEY_PREFIX,
   UI_SERVER_CONFIGURATION_INDEX_KEY,
 } from './Constants.js'
-export { UIClient } from './UIClient.js'
 export {
   chargingStationsKey,
   configurationKey,
-  deleteFromLocalStorage,
-  deleteLocalStorageByKeyPattern,
-  getFromLocalStorage,
-  getLocalStorage,
-  resetToggleButtonState,
-  setToLocalStorage,
   templatesKey,
   uiClientKey,
   useChargingStations,
   useConfiguration,
-  useFetchData,
   useTemplates,
   useUIClient,
-} from './Utils.js'
+} from './providers.js'
+export {
+  deleteFromLocalStorage,
+  deleteLocalStorageByKeyPattern,
+  getFromLocalStorage,
+  getLocalStorage,
+  resetToggleButtonState,
+  setToLocalStorage,
+} from './storage.js'
+export { UIClient } from './UIClient.js'
diff --git a/ui/web/src/core/providers.ts b/ui/web/src/core/providers.ts
new file mode 100644
index 00000000..b28c53ba
--- /dev/null
+++ b/ui/web/src/core/providers.ts
@@ -0,0 +1,39 @@
+import type { ChargingStationData, ConfigurationData } from 'ui-common'
+import type { InjectionKey, Ref } from 'vue'
+
+import { inject } from 'vue'
+
+import { UIClient } from './UIClient.js'
+
+export const configurationKey: InjectionKey<Ref<ConfigurationData>> = Symbol('configuration')
+export const chargingStationsKey: InjectionKey<Ref<ChargingStationData[]>> =
+  Symbol('chargingStations')
+export const templatesKey: InjectionKey<Ref<string[]>> = Symbol('templates')
+export const uiClientKey: InjectionKey<UIClient> = Symbol('uiClient')
+
+export const useUIClient = (): UIClient => {
+  const injected = inject(uiClientKey, undefined)
+  if (injected != null) return injected
+  if (import.meta.env.DEV) {
+    console.debug('[useUIClient] Accessed outside provide scope — using singleton fallback')
+  }
+  return UIClient.getInstance()
+}
+
+export const useConfiguration = (): Ref<ConfigurationData> => {
+  const injected = inject(configurationKey, undefined)
+  if (injected != null) return injected
+  throw new Error('configuration not provided')
+}
+
+export const useChargingStations = (): Ref<ChargingStationData[]> => {
+  const injected = inject(chargingStationsKey, undefined)
+  if (injected != null) return injected
+  throw new Error('chargingStations not provided')
+}
+
+export const useTemplates = (): Ref<string[]> => {
+  const injected = inject(templatesKey, undefined)
+  if (injected != null) return injected
+  throw new Error('templates not provided')
+}
diff --git a/ui/web/src/core/storage.ts b/ui/web/src/core/storage.ts
new file mode 100644
index 00000000..bd4893a0
--- /dev/null
+++ b/ui/web/src/core/storage.ts
@@ -0,0 +1,75 @@
+import { SHARED_TOGGLE_BUTTON_KEY_PREFIX, TOGGLE_BUTTON_KEY_PREFIX } from './Constants.js'
+
+export const getFromLocalStorage = <T>(key: string, defaultValue: T): T => {
+  try {
+    const item = localStorage.getItem(key)
+    return item != null ? (JSON.parse(item) as T) : defaultValue
+  } catch {
+    if (import.meta.env.DEV) {
+      console.debug(`[localStorage] Failed to read key '${key}', using default`)
+    }
+    return defaultValue
+  }
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
+export const setToLocalStorage = <T>(key: string, value: T): void => {
+  try {
+    localStorage.setItem(key, JSON.stringify(value))
+  } catch {
+    // localStorage.setItem() can throw:
+    // - QuotaExceededError when the origin's storage quota is genuinely exceeded
+    // - SecurityError when storage is blocked by user settings or browser policies
+    //   (e.g., "Block All Cookies" in Safari, third-party iframe in Chrome, file: URLs)
+    if (import.meta.env.DEV) {
+      console.debug(`[localStorage] Failed to write key '${key}'`)
+    }
+  }
+}
+
+export const deleteFromLocalStorage = (key: string): void => {
+  try {
+    localStorage.removeItem(key)
+  } catch {
+    if (import.meta.env.DEV) {
+      console.debug(`[localStorage] Failed to delete key '${key}'`)
+    }
+  }
+}
+
+export const getLocalStorage = (): Storage => {
+  try {
+    return localStorage
+  } catch {
+    throw new Error('localStorage is not available')
+  }
+}
+
+/**
+ * Deletes all localStorage entries whose key includes the given pattern.
+ * @param pattern - Substring to match against localStorage keys
+ */
+export const deleteLocalStorageByKeyPattern = (pattern: string): void => {
+  try {
+    const keysToDelete = Object.keys(localStorage).filter(key => key.includes(pattern))
+    for (const key of keysToDelete) {
+      deleteFromLocalStorage(key)
+    }
+  } catch {
+    if (import.meta.env.DEV) {
+      console.debug(`[localStorage] Failed to delete keys matching '${pattern}'`)
+    }
+  }
+}
+
+/**
+ * Resets the state of a toggle button by removing its entry from localStorage.
+ * @param id - The identifier of the toggle button
+ * @param shared - Whether the toggle button is shared
+ */
+export const resetToggleButtonState = (id: string, shared = false): void => {
+  const key = shared
+    ? `${SHARED_TOGGLE_BUTTON_KEY_PREFIX}${id}`
+    : `${TOGGLE_BUTTON_KEY_PREFIX}${id}`
+  deleteFromLocalStorage(key)
+}
diff --git a/ui/web/src/main.ts b/ui/web/src/main.ts
index a574a776..48c8db14 100644
--- a/ui/web/src/main.ts
+++ b/ui/web/src/main.ts
@@ -18,7 +18,7 @@ import {
   UI_SERVER_CONFIGURATION_INDEX_KEY,
   UIClient,
   uiClientKey,
-} from '@/composables/index.js'
+} from '@/core/index.js'
 import { router } from '@/router'
 import { SKIN_STORAGE_KEY, useSkin } from '@/shared/composables/useSkin.js'
 import { DEFAULT_THEME, THEME_STORAGE_KEY, useTheme } from '@/shared/composables/useTheme.js'
diff --git a/ui/web/src/router/index.ts b/ui/web/src/router/index.ts
index 13b35cc6..b1685a20 100644
--- a/ui/web/src/router/index.ts
+++ b/ui/web/src/router/index.ts
@@ -3,7 +3,7 @@ import { h } from 'vue'
 import { createRouter, createWebHistory, type RouteLocationNormalized } from 'vue-router'
 import { useToast } from 'vue-toast-notification'
 
-import { ROUTE_NAMES } from '@/composables/index.js'
+import { ROUTE_NAMES } from '@/core/index.js'
 import { useSkin } from '@/shared/composables/useSkin.js'
 import { DEFAULT_SKIN } from '@/skins/registry.js'
 
diff --git a/ui/web/src/shared/components/SkinLoadError.vue b/ui/web/src/shared/components/SkinLoadError.vue
index 0c995522..60dfeea5 100644
--- a/ui/web/src/shared/components/SkinLoadError.vue
+++ b/ui/web/src/shared/components/SkinLoadError.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script setup lang="ts">
-import { setToLocalStorage } from '@/composables/Utils.js'
+import { setToLocalStorage } from '@/core/index.js'
 import { SKIN_STORAGE_KEY } from '@/shared/composables/useSkin.js'
 import { DEFAULT_SKIN, skins } from '@/skins/registry.js'
 
diff --git a/ui/web/src/shared/composables/index.ts b/ui/web/src/shared/composables/index.ts
index 74132e0c..85572fa0 100644
--- a/ui/web/src/shared/composables/index.ts
+++ b/ui/web/src/shared/composables/index.ts
@@ -1,6 +1,7 @@
 export { useAddStationsForm } from './useAddStationsForm.js'
 export { useAsyncAction } from './useAsyncAction.js'
 export { useConnectorActions } from './useConnectorActions.js'
+export { useFetchData } from './useFetchData.js'
 export { useLayoutData } from './useLayoutData.js'
 export { useSetUrlForm } from './useSetUrlForm.js'
 export { useSimulatorControl } from './useSimulatorControl.js'
diff --git a/ui/web/src/shared/composables/useAddStationsForm.ts b/ui/web/src/shared/composables/useAddStationsForm.ts
index bc1a0035..f6a2057d 100644
--- a/ui/web/src/shared/composables/useAddStationsForm.ts
+++ b/ui/web/src/shared/composables/useAddStationsForm.ts
@@ -2,7 +2,7 @@ import { randomUUID, type UUIDv4 } from 'ui-common'
 import { type DeepReadonly, readonly, ref, type Ref, watch } from 'vue'
 import { useToast } from 'vue-toast-notification'
 
-import { useTemplates, useUIClient } from '@/composables/Utils.js'
+import { useTemplates, useUIClient } from '@/core/index.js'
 
 export interface AddStationsFormState {
   autoStart: boolean
diff --git a/ui/web/src/shared/composables/useConnectorActions.ts b/ui/web/src/shared/composables/useConnectorActions.ts
index 01b719c7..ccf8ffce 100644
--- a/ui/web/src/shared/composables/useConnectorActions.ts
+++ b/ui/web/src/shared/composables/useConnectorActions.ts
@@ -7,7 +7,7 @@ import type { OCPPVersion } from 'ui-common'
 import { computed, type MaybeRefOrGetter, readonly, toValue } from 'vue'
 import { useToast } from 'vue-toast-notification'
 
-import { useUIClient } from '@/composables/Utils.js'
+import { useUIClient } from '@/core/index.js'
 import { useAsyncAction } from '@/shared/composables/useAsyncAction.js'
 
 interface ConnectorActionsDeps {
diff --git a/ui/web/src/shared/composables/useFetchData.ts b/ui/web/src/shared/composables/useFetchData.ts
new file mode 100644
index 00000000..118a6321
--- /dev/null
+++ b/ui/web/src/shared/composables/useFetchData.ts
@@ -0,0 +1,38 @@
+import type { ResponsePayload } from 'ui-common'
+import type { Ref } from 'vue'
+
+import { ref as vueRef } from 'vue'
+import { useToast } from 'vue-toast-notification'
+
+export const useFetchData = (
+  clientFn: () => Promise<ResponsePayload>,
+  onSuccess: (response: ResponsePayload) => void,
+  errorMsg: string,
+  onError?: () => void
+): { fetch: () => void; fetching: Ref<boolean> } => {
+  const fetching = vueRef(false)
+  const $toast = useToast()
+  const fetch = (): void => {
+    if (!fetching.value) {
+      fetching.value = true
+      clientFn()
+        .then((response: ResponsePayload) => {
+          onSuccess(response)
+          return undefined
+        })
+        .finally(() => {
+          fetching.value = false
+        })
+        .catch((error: unknown) => {
+          try {
+            onError?.()
+          } catch (callbackError: unknown) {
+            console.error('Error in onError callback:', callbackError)
+          }
+          $toast.error(errorMsg)
+          console.error(`${errorMsg}:`, error)
+        })
+    }
+  }
+  return { fetch, fetching }
+}
diff --git a/ui/web/src/shared/composables/useLayoutData.ts b/ui/web/src/shared/composables/useLayoutData.ts
index 73fa1902..f2df9c70 100644
--- a/ui/web/src/shared/composables/useLayoutData.ts
+++ b/ui/web/src/shared/composables/useLayoutData.ts
@@ -10,13 +10,9 @@ import {
   shallowRef,
 } from 'vue'
 
-import {
-  useChargingStations,
-  useConfiguration,
-  useFetchData,
-  useTemplates,
-  useUIClient,
-} from '@/composables/index.js'
+import { useChargingStations, useConfiguration, useTemplates, useUIClient } from '@/core/index.js'
+
+import { useFetchData } from './useFetchData.js'
 
 export interface LayoutData {
   /** Fetches only the charging stations list. */
diff --git a/ui/web/src/shared/composables/useSetUrlForm.ts b/ui/web/src/shared/composables/useSetUrlForm.ts
index 37d9fa22..8d9e7c05 100644
--- a/ui/web/src/shared/composables/useSetUrlForm.ts
+++ b/ui/web/src/shared/composables/useSetUrlForm.ts
@@ -1,7 +1,7 @@
 import { readonly, ref, type Ref } from 'vue'
 import { useToast } from 'vue-toast-notification'
 
-import { useUIClient } from '@/composables/Utils.js'
+import { useUIClient } from '@/core/index.js'
 
 export interface SetUrlFormState {
   supervisionPassword: string
diff --git a/ui/web/src/shared/composables/useSimulatorControl.ts b/ui/web/src/shared/composables/useSimulatorControl.ts
index 3ba75998..ef30d32c 100644
--- a/ui/web/src/shared/composables/useSimulatorControl.ts
+++ b/ui/web/src/shared/composables/useSimulatorControl.ts
@@ -10,7 +10,7 @@ import {
   useChargingStations,
   useConfiguration,
   useUIClient,
-} from '@/composables/index.js'
+} from '@/core/index.js'
 import { useAsyncAction } from '@/shared/composables/useAsyncAction.js'
 import { type LayoutData } from '@/shared/composables/useLayoutData.js'
 
diff --git a/ui/web/src/shared/composables/useSkin.ts b/ui/web/src/shared/composables/useSkin.ts
index d8b20609..f5bc2463 100644
--- a/ui/web/src/shared/composables/useSkin.ts
+++ b/ui/web/src/shared/composables/useSkin.ts
@@ -1,7 +1,7 @@
 import { type SKIN_IDS } from 'ui-common'
 import { readonly, ref, type Ref } from 'vue'
 
-import { getFromLocalStorage, setToLocalStorage } from '@/composables/Utils.js'
+import { getFromLocalStorage, setToLocalStorage } from '@/core/index.js'
 import { validateTokenContract } from '@/shared/tokens/contract.js'
 // Intentional: registry.ts is pure metadata (ids, labels, loaders) — no behavioral coupling.
 import { DEFAULT_SKIN, type SkinDefinition, skins } from '@/skins/registry.js'
diff --git a/ui/web/src/shared/composables/useStartTxForm.ts b/ui/web/src/shared/composables/useStartTxForm.ts
index 0ba82579..c487117e 100644
--- a/ui/web/src/shared/composables/useStartTxForm.ts
+++ b/ui/web/src/shared/composables/useStartTxForm.ts
@@ -2,7 +2,7 @@ import { convertToInt, type OCPPVersion } from 'ui-common'
 import { readonly, ref, type Ref } from 'vue'
 import { useToast } from 'vue-toast-notification'
 
-import { useUIClient } from '@/composables/Utils.js'
+import { useUIClient } from '@/core/index.js'
 
 export interface StartTxFormConfig {
   connectorId: string
diff --git a/ui/web/src/shared/composables/useStationActions.ts b/ui/web/src/shared/composables/useStationActions.ts
index ea0c152d..5a0c3917 100644
--- a/ui/web/src/shared/composables/useStationActions.ts
+++ b/ui/web/src/shared/composables/useStationActions.ts
@@ -4,7 +4,7 @@
  */
 import { readonly } from 'vue'
 
-import { useUIClient } from '@/composables/Utils.js'
+import { useUIClient } from '@/core/index.js'
 import { useAsyncAction } from '@/shared/composables/useAsyncAction.js'
 
 /**
diff --git a/ui/web/src/shared/composables/useTheme.ts b/ui/web/src/shared/composables/useTheme.ts
index 57e5faf9..9f399956 100644
--- a/ui/web/src/shared/composables/useTheme.ts
+++ b/ui/web/src/shared/composables/useTheme.ts
@@ -1,7 +1,7 @@
 import { THEME_IDS } from 'ui-common'
 import { readonly, ref, type Ref } from 'vue'
 
-import { getFromLocalStorage, setToLocalStorage } from '@/composables/Utils.js'
+import { getFromLocalStorage, setToLocalStorage } from '@/core/index.js'
 import { validateTokenContract } from '@/shared/tokens/contract.js'
 
 export const AVAILABLE_THEMES = THEME_IDS
diff --git a/ui/web/src/shared/utils/formatSupervisionUrl.ts b/ui/web/src/shared/utils/formatSupervisionUrl.ts
index da394a42..0c9d6b99 100644
--- a/ui/web/src/shared/utils/formatSupervisionUrl.ts
+++ b/ui/web/src/shared/utils/formatSupervisionUrl.ts
@@ -1,4 +1,4 @@
-import { EMPTY_VALUE_PLACEHOLDER } from '@/composables/Constants.js'
+import { EMPTY_VALUE_PLACEHOLDER } from '@/core/Constants.js'
 
 export interface FormatSupervisionUrlOptions {
   /** Insert zero-width-space after dots for word-break in table cells. */
diff --git a/ui/web/src/skins/classic/ClassicLayout.vue b/ui/web/src/skins/classic/ClassicLayout.vue
index c57ab1cc..ae91b53e 100644
--- a/ui/web/src/skins/classic/ClassicLayout.vue
+++ b/ui/web/src/skins/classic/ClassicLayout.vue
@@ -110,7 +110,7 @@ import {
   TOGGLE_BUTTON_KEY_PREFIX,
   UI_SERVER_CONFIGURATION_INDEX_KEY,
   useChargingStations,
-} from '@/composables'
+} from '@/core'
 import { useLayoutData } from '@/shared/composables/useLayoutData.js'
 import { useSimulatorControl } from '@/shared/composables/useSimulatorControl.js'
 import { useSkin } from '@/shared/composables/useSkin.js'
diff --git a/ui/web/src/skins/classic/components/actions/AddChargingStations.vue b/ui/web/src/skins/classic/components/actions/AddChargingStations.vue
index 6699651e..1da70e47 100644
--- a/ui/web/src/skins/classic/components/actions/AddChargingStations.vue
+++ b/ui/web/src/skins/classic/components/actions/AddChargingStations.vue
@@ -123,7 +123,7 @@
 <script setup lang="ts">
 import { useRouter } from 'vue-router'
 
-import { resetToggleButtonState, ROUTE_NAMES } from '@/composables'
+import { resetToggleButtonState, ROUTE_NAMES } from '@/core'
 import { useAddStationsForm } from '@/shared/composables/useAddStationsForm.js'
 
 import Button from '../buttons/ClassicButton.vue'
diff --git a/ui/web/src/skins/classic/components/actions/SetSupervisionUrl.vue b/ui/web/src/skins/classic/components/actions/SetSupervisionUrl.vue
index 3689712c..d4f7d3d5 100644
--- a/ui/web/src/skins/classic/components/actions/SetSupervisionUrl.vue
+++ b/ui/web/src/skins/classic/components/actions/SetSupervisionUrl.vue
@@ -44,7 +44,7 @@
 <script setup lang="ts">
 import { useRouter } from 'vue-router'
 
-import { resetToggleButtonState, ROUTE_NAMES } from '@/composables'
+import { resetToggleButtonState, ROUTE_NAMES } from '@/core'
 import { useSetUrlForm } from '@/shared/composables/useSetUrlForm.js'
 
 import Button from '../buttons/ClassicButton.vue'
diff --git a/ui/web/src/skins/classic/components/actions/StartTransaction.vue b/ui/web/src/skins/classic/components/actions/StartTransaction.vue
index 33e82d65..762d39dd 100644
--- a/ui/web/src/skins/classic/components/actions/StartTransaction.vue
+++ b/ui/web/src/skins/classic/components/actions/StartTransaction.vue
@@ -42,7 +42,7 @@ import type { OCPPVersion } from 'ui-common'
 import { computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 
-import { resetToggleButtonState, ROUTE_NAMES } from '@/composables'
+import { resetToggleButtonState, ROUTE_NAMES } from '@/core'
 import { useStartTxForm } from '@/shared/composables/useStartTxForm.js'
 
 import Button from '../buttons/ClassicButton.vue'
diff --git a/ui/web/src/skins/classic/components/buttons/ToggleButton.vue b/ui/web/src/skins/classic/components/buttons/ToggleButton.vue
index d8a946f2..ecc38b1c 100644
--- a/ui/web/src/skins/classic/components/buttons/ToggleButton.vue
+++ b/ui/web/src/skins/classic/components/buttons/ToggleButton.vue
@@ -16,7 +16,7 @@ import {
   setToLocalStorage,
   SHARED_TOGGLE_BUTTON_KEY_PREFIX,
   TOGGLE_BUTTON_KEY_PREFIX,
-} from '@/composables'
+} from '@/core'
 
 import Button from './ClassicButton.vue'
 
diff --git a/ui/web/src/skins/classic/components/charging-stations/CSConnector.vue b/ui/web/src/skins/classic/components/charging-stations/CSConnector.vue
index 7f121e4d..7f33f735 100644
--- a/ui/web/src/skins/classic/components/charging-stations/CSConnector.vue
+++ b/ui/web/src/skins/classic/components/charging-stations/CSConnector.vue
@@ -71,7 +71,7 @@ import type { ConnectorStatus, OCPPVersion, Status } from 'ui-common'
 import { computed } from 'vue'
 import { useRouter } from 'vue-router'
 
-import { EMPTY_VALUE_PLACEHOLDER, ROUTE_NAMES } from '@/composables'
+import { EMPTY_VALUE_PLACEHOLDER, ROUTE_NAMES } from '@/core'
 import { useConnectorActions } from '@/shared/composables/useConnectorActions.js'
 
 import Button from '../buttons/ClassicButton.vue'
diff --git a/ui/web/src/skins/classic/components/charging-stations/CSData.vue b/ui/web/src/skins/classic/components/charging-stations/CSData.vue
index a87233c9..0eea87c5 100644
--- a/ui/web/src/skins/classic/components/charging-stations/CSData.vue
+++ b/ui/web/src/skins/classic/components/charging-stations/CSData.vue
@@ -125,7 +125,7 @@ import {
 } from 'ui-common'
 import { computed } from 'vue'
 
-import { deleteLocalStorageByKeyPattern, EMPTY_VALUE_PLACEHOLDER, ROUTE_NAMES } from '@/composables'
+import { deleteLocalStorageByKeyPattern, EMPTY_VALUE_PLACEHOLDER, ROUTE_NAMES } from '@/core'
 import { useStationActions } from '@/shared/composables/useStationActions.js'
 import { formatSupervisionUrl } from '@/shared/utils/formatSupervisionUrl.js'
 import { getATGStatus, getConnectorEntries } from '@/shared/utils/stationStatus.js'
diff --git a/ui/web/src/skins/modern/ModernLayout.vue b/ui/web/src/skins/modern/ModernLayout.vue
index fe9ce54e..fc7f2b3b 100644
--- a/ui/web/src/skins/modern/ModernLayout.vue
+++ b/ui/web/src/skins/modern/ModernLayout.vue
@@ -81,11 +81,7 @@
 import { type OCPPVersion } from 'ui-common'
 import { defineAsyncComponent, ref } from 'vue'
 
-import {
-  getFromLocalStorage,
-  UI_SERVER_CONFIGURATION_INDEX_KEY,
-  useChargingStations,
-} from '@/composables'
+import { getFromLocalStorage, UI_SERVER_CONFIGURATION_INDEX_KEY, useChargingStations } from '@/core'
 import SkinLoadError from '@/shared/components/SkinLoadError.vue'
 import SkinLoading from '@/shared/components/SkinLoading.vue'
 import { useLayoutData } from '@/shared/composables/useLayoutData.js'
diff --git a/ui/web/src/skins/modern/components/StationCard.vue b/ui/web/src/skins/modern/components/StationCard.vue
index cc415717..fe0665e3 100644
--- a/ui/web/src/skins/modern/components/StationCard.vue
+++ b/ui/web/src/skins/modern/components/StationCard.vue
@@ -168,7 +168,7 @@ import {
 } from 'ui-common'
 import { computed, ref } from 'vue'
 
-import { deleteLocalStorageByKeyPattern, EMPTY_VALUE_PLACEHOLDER as EMPTY } from '@/composables'
+import { deleteLocalStorageByKeyPattern, EMPTY_VALUE_PLACEHOLDER as EMPTY } from '@/core'
 import { useStationActions } from '@/shared/composables/useStationActions.js'
 import { formatSupervisionUrl } from '@/shared/utils/formatSupervisionUrl.js'
 import {
diff --git a/ui/web/src/skins/modern/components/dialogs/AuthorizeDialog.vue b/ui/web/src/skins/modern/components/dialogs/AuthorizeDialog.vue
index 701b33be..aa8ae6ba 100644
--- a/ui/web/src/skins/modern/components/dialogs/AuthorizeDialog.vue
+++ b/ui/web/src/skins/modern/components/dialogs/AuthorizeDialog.vue
@@ -63,7 +63,7 @@
 import { computed, ref } from 'vue'
 import { useToast } from 'vue-toast-notification'
 
-import { useUIClient } from '@/composables'
+import { useUIClient } from '@/core'
 
 import { type FailureInfo, getFailureInfo } from '../../utils/errors.js'
 import ActionButton from '../ActionButton.vue'
diff --git a/ui/web/src/skins/modern/components/dialogs/SetSupervisionUrlDialog.vue b/ui/web/src/skins/modern/components/dialogs/SetSupervisionUrlDialog.vue
index 7c515e4e..0689f786 100644
--- a/ui/web/src/skins/modern/components/dialogs/SetSupervisionUrlDialog.vue
+++ b/ui/web/src/skins/modern/components/dialogs/SetSupervisionUrlDialog.vue
@@ -83,7 +83,7 @@
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue'
 
-import { useChargingStations, useUIClient } from '@/composables'
+import { useChargingStations, useUIClient } from '@/core'
 import { useSetUrlForm } from '@/shared/composables/useSetUrlForm.js'
 import { stripStationId } from '@/shared/utils/stripStationId.js'
 
diff --git a/ui/web/tests/unit/UIClient.test.ts b/ui/web/tests/unit/UIClient.test.ts
index 138ffe9f..b2b7d4ef 100644
--- a/ui/web/tests/unit/UIClient.test.ts
+++ b/ui/web/tests/unit/UIClient.test.ts
@@ -14,7 +14,7 @@ import {
 } from 'ui-common'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { UIClient } from '@/composables'
+import { UIClient } from '@/core'
 
 import { toastMock } from '../setup'
 import { createUIServerConfig, TEST_HASH_ID, TEST_ID_TAG } from './constants'
diff --git a/ui/web/tests/unit/Utils.test.ts b/ui/web/tests/unit/Utils.test.ts
index fe124dd7..566a3bc0 100644
--- a/ui/web/tests/unit/Utils.test.ts
+++ b/ui/web/tests/unit/Utils.test.ts
@@ -14,9 +14,9 @@ import {
   setToLocalStorage,
   useChargingStations,
   useConfiguration,
-  useFetchData,
   useTemplates,
-} from '@/composables'
+} from '@/core'
+import { useFetchData } from '@/shared/composables/useFetchData.js'
 
 import { toastMock } from '../setup'
 
diff --git a/ui/web/tests/unit/router.test.ts b/ui/web/tests/unit/router.test.ts
index 76e9b860..52a440a6 100644
--- a/ui/web/tests/unit/router.test.ts
+++ b/ui/web/tests/unit/router.test.ts
@@ -4,7 +4,7 @@
  */
 import { describe, expect, it, vi } from 'vitest'
 
-import { ROUTE_NAMES } from '@/composables'
+import { ROUTE_NAMES } from '@/core'
 import { router } from '@/router/index.js'
 
 vi.mock('@/shared/composables/useSkin.js', async importOriginal => {
diff --git a/ui/web/tests/unit/shared/composables/useAddStationsForm.test.ts b/ui/web/tests/unit/shared/composables/useAddStationsForm.test.ts
index b1edacdd..c14d00e8 100644
--- a/ui/web/tests/unit/shared/composables/useAddStationsForm.test.ts
+++ b/ui/web/tests/unit/shared/composables/useAddStationsForm.test.ts
@@ -10,7 +10,7 @@ import { toastMock } from '../../../setup.js'
 const mockAddChargingStations = vi.fn().mockResolvedValue({ status: 'success' })
 const mockTemplates = ref(['template1.json', 'template2.json'])
 
-vi.mock('@/composables/Utils.js', () => ({
+vi.mock('@/core/index.js', () => ({
   resetToggleButtonState: vi.fn(),
   useTemplates: () => mockTemplates,
   useUIClient: () => ({
diff --git a/ui/web/tests/unit/shared/composables/useConnectorActions.test.ts b/ui/web/tests/unit/shared/composables/useConnectorActions.test.ts
index 7eafc4cd..a28a6211 100644
--- a/ui/web/tests/unit/shared/composables/useConnectorActions.test.ts
+++ b/ui/web/tests/unit/shared/composables/useConnectorActions.test.ts
@@ -12,7 +12,7 @@ import { createMockUIClient, type MockUIClient, withSetup } from '../../helpers.
 
 let mockClient: MockUIClient
 
-vi.mock('@/composables/Utils.js', () => ({
+vi.mock('@/core/index.js', () => ({
   useUIClient: () => mockClient,
 }))
 
diff --git a/ui/web/tests/unit/shared/composables/useLayoutData.test.ts b/ui/web/tests/unit/shared/composables/useLayoutData.test.ts
index 3a7ee8e6..688bf39b 100644
--- a/ui/web/tests/unit/shared/composables/useLayoutData.test.ts
+++ b/ui/web/tests/unit/shared/composables/useLayoutData.test.ts
@@ -8,9 +8,9 @@ import { flushPromises } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { type Ref, ref } from 'vue'
 
-import { useChargingStations, useConfiguration, useTemplates, useUIClient } from '@/composables'
+import { useChargingStations, useConfiguration, useTemplates, useUIClient } from '@/core'
 
-vi.mock('@/composables', async importOriginal => {
+vi.mock('@/core', async importOriginal => {
   const actual = await importOriginal()
   return {
     ...(actual as Record<string, unknown>),
diff --git a/ui/web/tests/unit/shared/composables/useSetUrlForm.test.ts b/ui/web/tests/unit/shared/composables/useSetUrlForm.test.ts
index 3ea701ee..ac221882 100644
--- a/ui/web/tests/unit/shared/composables/useSetUrlForm.test.ts
+++ b/ui/web/tests/unit/shared/composables/useSetUrlForm.test.ts
@@ -8,7 +8,7 @@ import { toastMock } from '../../../setup.js'
 
 const mockSetSupervisionUrl = vi.fn().mockResolvedValue({ status: 'success' })
 
-vi.mock('@/composables/Utils.js', () => ({
+vi.mock('@/core/index.js', () => ({
   useUIClient: () => ({
     setSupervisionUrl: mockSetSupervisionUrl,
   }),
diff --git a/ui/web/tests/unit/shared/composables/useSimulatorControl.test.ts b/ui/web/tests/unit/shared/composables/useSimulatorControl.test.ts
index d0909db5..c408263b 100644
--- a/ui/web/tests/unit/shared/composables/useSimulatorControl.test.ts
+++ b/ui/web/tests/unit/shared/composables/useSimulatorControl.test.ts
@@ -15,13 +15,13 @@ import {
   useChargingStations,
   useConfiguration,
   useUIClient,
-} from '@/composables'
+} from '@/core'
 
 import { toastMock } from '../../../setup.js'
 import { createUIServerConfig } from '../../constants'
 import { createMockUIClient, type MockUIClient, withSetup } from '../../helpers.js'
 
-vi.mock('@/composables', async importOriginal => {
+vi.mock('@/core', async importOriginal => {
   const actual = await importOriginal()
   return {
     ...(actual as Record<string, unknown>),
diff --git a/ui/web/tests/unit/shared/composables/useStartTxForm.test.ts b/ui/web/tests/unit/shared/composables/useStartTxForm.test.ts
index d0a5c0ee..d653ee0e 100644
--- a/ui/web/tests/unit/shared/composables/useStartTxForm.test.ts
+++ b/ui/web/tests/unit/shared/composables/useStartTxForm.test.ts
@@ -9,7 +9,7 @@ import { toastMock } from '../../../setup.js'
 const mockAuthorize = vi.fn().mockResolvedValue({ status: 'success' })
 const mockStartTransaction = vi.fn().mockResolvedValue({ status: 'success' })
 
-vi.mock('@/composables/Utils.js', () => ({
+vi.mock('@/core/index.js', () => ({
   useUIClient: () => ({
     authorize: mockAuthorize,
     startTransaction: mockStartTransaction,
diff --git a/ui/web/tests/unit/shared/composables/useStationActions.test.ts b/ui/web/tests/unit/shared/composables/useStationActions.test.ts
index 12785f6f..a32ae6b0 100644
--- a/ui/web/tests/unit/shared/composables/useStationActions.test.ts
+++ b/ui/web/tests/unit/shared/composables/useStationActions.test.ts
@@ -11,7 +11,7 @@ import { createMockUIClient, type MockUIClient, withSetup } from '../../helpers.
 
 let mockUIClient: MockUIClient
 
-vi.mock('@/composables/Utils.js', () => ({
+vi.mock('@/core/index.js', () => ({
   useUIClient: () => mockUIClient,
 }))
 
diff --git a/ui/web/tests/unit/skins/classic/Actions.test.ts b/ui/web/tests/unit/skins/classic/Actions.test.ts
index 0fb2f0b2..883f9da4 100644
--- a/ui/web/tests/unit/skins/classic/Actions.test.ts
+++ b/ui/web/tests/unit/skins/classic/Actions.test.ts
@@ -6,7 +6,7 @@ import { flushPromises, mount } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref, shallowRef } from 'vue'
 
-import { chargingStationsKey, configurationKey, templatesKey, uiClientKey } from '@/composables'
+import { chargingStationsKey, configurationKey, templatesKey, uiClientKey } from '@/core'
 import AddChargingStations from '@/skins/classic/components/actions/AddChargingStations.vue'
 import SetSupervisionUrl from '@/skins/classic/components/actions/SetSupervisionUrl.vue'
 import StartTransaction from '@/skins/classic/components/actions/StartTransaction.vue'
diff --git a/ui/web/tests/unit/skins/classic/CSConnector.test.ts b/ui/web/tests/unit/skins/classic/CSConnector.test.ts
index 7c02c5af..a2efabf5 100644
--- a/ui/web/tests/unit/skins/classic/CSConnector.test.ts
+++ b/ui/web/tests/unit/skins/classic/CSConnector.test.ts
@@ -6,7 +6,7 @@ import { flushPromises, mount } from '@vue/test-utils'
 import { type ConnectorStatus, OCPP16ChargePointStatus, OCPPVersion } from 'ui-common'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { uiClientKey } from '@/composables'
+import { uiClientKey } from '@/core'
 import CSConnector from '@/skins/classic/components/charging-stations/CSConnector.vue'
 
 import { toastMock } from '../../../setup.js'
diff --git a/ui/web/tests/unit/skins/classic/CSData.test.ts b/ui/web/tests/unit/skins/classic/CSData.test.ts
index 4683b8dc..4de141ee 100644
--- a/ui/web/tests/unit/skins/classic/CSData.test.ts
+++ b/ui/web/tests/unit/skins/classic/CSData.test.ts
@@ -6,7 +6,7 @@ import { flushPromises, mount } from '@vue/test-utils'
 import { type ChargingStationData, OCPP16AvailabilityType, OCPPVersion } from 'ui-common'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { uiClientKey } from '@/composables'
+import { uiClientKey } from '@/core'
 import CSData from '@/skins/classic/components/charging-stations/CSData.vue'
 
 import { toastMock } from '../../../setup.js'
diff --git a/ui/web/tests/unit/skins/classic/CSTable.test.ts b/ui/web/tests/unit/skins/classic/CSTable.test.ts
index f9cb2736..1dfe9346 100644
--- a/ui/web/tests/unit/skins/classic/CSTable.test.ts
+++ b/ui/web/tests/unit/skins/classic/CSTable.test.ts
@@ -5,7 +5,7 @@
 import { shallowMount } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { uiClientKey } from '@/composables'
+import { uiClientKey } from '@/core'
 import CSTable from '@/skins/classic/components/charging-stations/CSTable.vue'
 
 import { createChargingStationData } from '../../constants.js'
diff --git a/ui/web/tests/unit/skins/classic/ClassicComponents.test.ts b/ui/web/tests/unit/skins/classic/ClassicComponents.test.ts
index f9285e2a..1f164943 100644
--- a/ui/web/tests/unit/skins/classic/ClassicComponents.test.ts
+++ b/ui/web/tests/unit/skins/classic/ClassicComponents.test.ts
@@ -8,7 +8,7 @@ import { flushPromises, mount } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { defineComponent, shallowRef } from 'vue'
 
-import { chargingStationsKey, configurationKey, templatesKey, uiClientKey } from '@/composables'
+import { chargingStationsKey, configurationKey, templatesKey, uiClientKey } from '@/core'
 import ToggleButton from '@/skins/classic/components/buttons/ToggleButton.vue'
 import CSTable from '@/skins/classic/components/charging-stations/CSTable.vue'
 
diff --git a/ui/web/tests/unit/skins/classic/ClassicLayout.test.ts b/ui/web/tests/unit/skins/classic/ClassicLayout.test.ts
index bd56723f..b745e6dc 100644
--- a/ui/web/tests/unit/skins/classic/ClassicLayout.test.ts
+++ b/ui/web/tests/unit/skins/classic/ClassicLayout.test.ts
@@ -6,7 +6,7 @@ import { flushPromises, mount } from '@vue/test-utils'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { ref } from 'vue'
 
-import { chargingStationsKey, configurationKey, templatesKey, uiClientKey } from '@/composables'
+import { chargingStationsKey, configurationKey, templatesKey, uiClientKey } from '@/core'
 import ClassicLayout from '@/skins/classic/ClassicLayout.vue'
 
 import { createUIServerConfig } from '../../constants'
diff --git a/ui/web/tests/unit/skins/modern/ConnectorRow.test.ts b/ui/web/tests/unit/skins/modern/ConnectorRow.test.ts
index 87735225..93f5e267 100644
--- a/ui/web/tests/unit/skins/modern/ConnectorRow.test.ts
+++ b/ui/web/tests/unit/skins/modern/ConnectorRow.test.ts
@@ -11,7 +11,7 @@ import {
 } from 'ui-common'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { uiClientKey } from '@/composables'
+import { uiClientKey } from '@/core'
 import ConnectorRow from '@/skins/modern/components/ConnectorRow.vue'
 
 import { toastMock } from '../../../setup.js'
diff --git a/ui/web/tests/unit/skins/modern/Dialogs.test.ts b/ui/web/tests/unit/skins/modern/Dialogs.test.ts
index c8cefa37..9d8d00be 100644
--- a/ui/web/tests/unit/skins/modern/Dialogs.test.ts
+++ b/ui/web/tests/unit/skins/modern/Dialogs.test.ts
@@ -8,7 +8,7 @@ import { ResponseStatus, ServerFailureError } from 'ui-common'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 import { defineComponent, ref } from 'vue'
 
-import { chargingStationsKey, templatesKey, uiClientKey } from '@/composables'
+import { chargingStationsKey, templatesKey, uiClientKey } from '@/core'
 
 // Mock Modal to render slots inline (no Teleport), so `wrapper.find()` works.
 vi.mock('@/skins/modern/components/ModernModal.vue', () => ({
diff --git a/ui/web/tests/unit/skins/modern/ModernLayout.test.ts b/ui/web/tests/unit/skins/modern/ModernLayout.test.ts
index 76645574..015fa072 100644
--- a/ui/web/tests/unit/skins/modern/ModernLayout.test.ts
+++ b/ui/web/tests/unit/skins/modern/ModernLayout.test.ts
@@ -14,14 +14,14 @@ import {
   UI_SERVER_CONFIGURATION_INDEX_KEY,
   uiClientKey,
   useUIClient,
-} from '@/composables'
+} from '@/core'
 import ModernLayout from '@/skins/modern/ModernLayout.vue'
 
 import { toastMock } from '../../../setup.js'
 import { createChargingStationData, createUIServerConfig } from '../../constants'
 import { createMockUIClient, type MockUIClient } from '../../helpers.js'
 
-vi.mock('@/composables', async importOriginal => {
+vi.mock('@/core', async importOriginal => {
   const actual = await importOriginal()
   return { ...(actual as Record<string, unknown>), useUIClient: vi.fn() }
 })
diff --git a/ui/web/tests/unit/skins/modern/StationCard.test.ts b/ui/web/tests/unit/skins/modern/StationCard.test.ts
index cb9679f7..de7a083d 100644
--- a/ui/web/tests/unit/skins/modern/StationCard.test.ts
+++ b/ui/web/tests/unit/skins/modern/StationCard.test.ts
@@ -6,7 +6,7 @@ import { flushPromises, mount } from '@vue/test-utils'
 import { type ChargingStationData, OCPP16AvailabilityType } from 'ui-common'
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
 
-import { uiClientKey } from '@/composables'
+import { uiClientKey } from '@/core'
 import StationCard from '@/skins/modern/components/StationCard.vue'
 
 import { toastMock } from '../../../setup.js'
-- 
2.43.0