From 647c8080f940c6a0d0b71f186ad04aeef3961933 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Fri, 17 Apr 2026 02:47:04 +0200
Subject: [PATCH] refactor(ui-web): import randomUUID/validateUUID directly
 from ui-common

Remove re-exports from composables/Utils.ts and composables/index.ts.
Consumers now import directly from ui-common.
---
 .../components/actions/AddChargingStations.vue    |  4 +---
 ui/web/src/composables/Utils.ts                   |  3 ---
 ui/web/src/composables/index.ts                   |  2 --
 ui/web/src/views/ChargingStationsView.vue         | 15 +++++++--------
 ui/web/tests/unit/Utils.test.ts                   |  3 +--
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/ui/web/src/components/actions/AddChargingStations.vue b/ui/web/src/components/actions/AddChargingStations.vue
index fe820e27..159a4006 100644
--- a/ui/web/src/components/actions/AddChargingStations.vue
+++ b/ui/web/src/components/actions/AddChargingStations.vue
@@ -91,15 +91,13 @@
 </template>
 
 <script setup lang="ts">
-import type { UUIDv4 } from 'ui-common'
-
+import { randomUUID, type UUIDv4 } from 'ui-common'
 import { ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 
 import Button from '@/components/buttons/Button.vue'
 import {
   convertToBoolean,
-  randomUUID,
   resetToggleButtonState,
   ROUTE_NAMES,
   useExecuteAction,
diff --git a/ui/web/src/composables/Utils.ts b/ui/web/src/composables/Utils.ts
index 7afeee00..727a8673 100644
--- a/ui/web/src/composables/Utils.ts
+++ b/ui/web/src/composables/Utils.ts
@@ -1,7 +1,6 @@
 import type { ChargingStationData, ConfigurationData } from 'ui-common'
 import type { InjectionKey, Ref } from 'vue'
 
-import { randomUUID, validateUUID } from 'ui-common'
 import { inject } from 'vue'
 import { useToast } from 'vue-toast-notification'
 
@@ -121,8 +120,6 @@ export const resetToggleButtonState = (id: string, shared = false): void => {
   deleteFromLocalStorage(key)
 }
 
-export { randomUUID, validateUUID }
-
 export const useUIClient = (): UIClient => {
   const injected = inject(uiClientKey, undefined)
   if (injected != null) return injected
diff --git a/ui/web/src/composables/index.ts b/ui/web/src/composables/index.ts
index cfcc50e4..c63fc2df 100644
--- a/ui/web/src/composables/index.ts
+++ b/ui/web/src/composables/index.ts
@@ -16,7 +16,6 @@ export {
   getFromLocalStorage,
   getLocalStorage,
   getWebSocketStateName,
-  randomUUID,
   resetToggleButtonState,
   setToLocalStorage,
   templatesKey,
@@ -26,5 +25,4 @@ export {
   useExecuteAction,
   useTemplates,
   useUIClient,
-  validateUUID,
 } from './Utils'
diff --git a/ui/web/src/views/ChargingStationsView.vue b/ui/web/src/views/ChargingStationsView.vue
index e3277e42..499abace 100644
--- a/ui/web/src/views/ChargingStationsView.vue
+++ b/ui/web/src/views/ChargingStationsView.vue
@@ -104,14 +104,14 @@
 </template>
 
 <script setup lang="ts">
-import type {
-  ChargingStationData,
-  ResponsePayload,
-  SimulatorState,
-  UIServerConfigurationSection,
-  UUIDv4,
+import {
+  type ChargingStationData,
+  randomUUID,
+  type ResponsePayload,
+  type SimulatorState,
+  type UIServerConfigurationSection,
+  type UUIDv4,
 } from 'ui-common'
-
 import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import { useToast } from 'vue-toast-notification'
 
@@ -122,7 +122,6 @@ import Container from '@/components/Container.vue'
 import {
   deleteLocalStorageByKeyPattern,
   getFromLocalStorage,
-  randomUUID,
   ROUTE_NAMES,
   setToLocalStorage,
   TOGGLE_BUTTON_KEY_PREFIX,
diff --git a/ui/web/tests/unit/Utils.test.ts b/ui/web/tests/unit/Utils.test.ts
index 3637c5c3..ab8cd688 100644
--- a/ui/web/tests/unit/Utils.test.ts
+++ b/ui/web/tests/unit/Utils.test.ts
@@ -3,6 +3,7 @@
  * @description Unit tests for type conversion, localStorage, UUID, and toggle state utilities.
  */
 import { flushPromises } from '@vue/test-utils'
+import { randomUUID, validateUUID } from 'ui-common'
 import { afterEach, describe, expect, it, vi } from 'vitest'
 
 import {
@@ -11,11 +12,9 @@ import {
   deleteFromLocalStorage,
   getFromLocalStorage,
   getLocalStorage,
-  randomUUID,
   resetToggleButtonState,
   setToLocalStorage,
   useExecuteAction,
-  validateUUID,
 } from '@/composables'
 
 import { toastMock } from '../setup'
-- 
2.53.0