From 4147bb7ee6c183f244a10431b4dc53d71917f611 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Fri, 19 May 2023 22:35:53 +0200
Subject: [PATCH] refactor(ui): add types export control
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>
---
 ui/web/src/assets/config.ts                         |  2 +-
 .../components/charging-stations/CSConnector.vue    |  2 +-
 ui/web/src/components/charging-stations/CSData.vue  |  6 +-----
 .../components/charging-stations/CSInfoModal.vue    |  2 +-
 ui/web/src/components/charging-stations/CSTable.vue |  2 +-
 ui/web/src/composables/UIClient.ts                  |  4 ++--
 ui/web/src/types/index.ts                           | 13 +++++++++++++
 ui/web/src/views/ChargingStationsView.vue           |  2 +-
 ui/web/tests/unit/CSTable.spec.ts                   |  2 +-
 9 files changed, 22 insertions(+), 13 deletions(-)
 create mode 100644 ui/web/src/types/index.ts

diff --git a/ui/web/src/assets/config.ts b/ui/web/src/assets/config.ts
index 44bfebde..8d40c744 100644
--- a/ui/web/src/assets/config.ts
+++ b/ui/web/src/assets/config.ts
@@ -1,4 +1,4 @@
-import type { BaseConfig } from '@/types/ConfigurationType';
+import type { BaseConfig } from '@/types';
 
 const config: BaseConfig = {
   uiServer: {
diff --git a/ui/web/src/components/charging-stations/CSConnector.vue b/ui/web/src/components/charging-stations/CSConnector.vue
index 9b171125..05980e41 100644
--- a/ui/web/src/components/charging-stations/CSConnector.vue
+++ b/ui/web/src/components/charging-stations/CSConnector.vue
@@ -26,7 +26,7 @@
 // import { reactive } from 'vue';
 import Button from '../buttons/Button.vue';
 // import IdTagInputModal from './IdTagInputModal.vue';
-import type { ConnectorStatus } from '@/types/ChargingStationType';
+import type { ConnectorStatus } from '@/types';
 import UIClient from '@/composables/UIClient';
 // import Utils from '@/composables/Utils';
 
diff --git a/ui/web/src/components/charging-stations/CSData.vue b/ui/web/src/components/charging-stations/CSData.vue
index 23c413e9..040ba02b 100644
--- a/ui/web/src/components/charging-stations/CSData.vue
+++ b/ui/web/src/components/charging-stations/CSData.vue
@@ -20,11 +20,7 @@
 <script setup lang="ts">
 // import { reactive } from 'vue';
 import CSConnector from './CSConnector.vue';
-import type {
-  ChargingStationData,
-  ChargingStationInfo,
-  ConnectorStatus,
-} from '@/types/ChargingStationType';
+import type { ChargingStationData, ChargingStationInfo, ConnectorStatus } from '@/types';
 import Utils from '@/composables/Utils';
 
 const props = defineProps<{
diff --git a/ui/web/src/components/charging-stations/CSInfoModal.vue b/ui/web/src/components/charging-stations/CSInfoModal.vue
index f2f6a643..337a0366 100644
--- a/ui/web/src/components/charging-stations/CSInfoModal.vue
+++ b/ui/web/src/components/charging-stations/CSInfoModal.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script setup lang="ts">
-import type { ChargingStationInfo } from '@/types/ChargingStationType';
+import type { ChargingStationInfo } from '@/types';
 import Modal from '@/components/Modal.vue';
 
 const props = defineProps<{
diff --git a/ui/web/src/components/charging-stations/CSTable.vue b/ui/web/src/components/charging-stations/CSTable.vue
index 43d03e32..b4be0991 100644
--- a/ui/web/src/components/charging-stations/CSTable.vue
+++ b/ui/web/src/components/charging-stations/CSTable.vue
@@ -31,7 +31,7 @@
 
 <script setup lang="ts">
 import CSData from './CSData.vue';
-import type { ChargingStationData } from '@/types/ChargingStationType';
+import type { ChargingStationData } from '@/types';
 
 const props = defineProps<{
   chargingStations: ChargingStationData[];
diff --git a/ui/web/src/composables/UIClient.ts b/ui/web/src/composables/UIClient.ts
index 5467d16d..c2f1b0c2 100644
--- a/ui/web/src/composables/UIClient.ts
+++ b/ui/web/src/composables/UIClient.ts
@@ -5,13 +5,13 @@ import {
   type RequestPayload,
   type ResponsePayload,
   ResponseStatus,
-} from '@/types/UIProtocol';
+} from '@/types';
 import config from '@/assets/config';
 
 type ResponseHandler = {
   procedureName: ProcedureName;
   resolve: (value: ResponsePayload | PromiseLike<ResponsePayload>) => void;
-  reject: (reason?: any) => void;
+  reject: (reason?: unknown) => void;
 };
 
 export default class UIClient {
diff --git a/ui/web/src/types/index.ts b/ui/web/src/types/index.ts
new file mode 100644
index 00000000..edd7ab5e
--- /dev/null
+++ b/ui/web/src/types/index.ts
@@ -0,0 +1,13 @@
+export type {
+  ChargingStationData,
+  ChargingStationInfo,
+  ConnectorStatus,
+} from './ChargingStationType';
+export {
+  ProcedureName,
+  type ProtocolResponse,
+  type RequestPayload,
+  type ResponsePayload,
+  ResponseStatus,
+} from './UIProtocol';
+export type { BaseConfig } from './ConfigurationType';
diff --git a/ui/web/src/views/ChargingStationsView.vue b/ui/web/src/views/ChargingStationsView.vue
index e0f86dd6..b4f4c39f 100644
--- a/ui/web/src/views/ChargingStationsView.vue
+++ b/ui/web/src/views/ChargingStationsView.vue
@@ -19,7 +19,7 @@
 <script setup lang="ts">
 import { onMounted, reactive } from 'vue';
 import CSTable from '@/components/charging-stations/CSTable.vue';
-import type { ChargingStationData } from '@/types/ChargingStationType';
+import type { ChargingStationData } from '@/types';
 import Container from '@/components/Container.vue';
 import ReloadButton from '@/components/buttons/ReloadButton.vue';
 import UIClient from '@/composables/UIClient';
diff --git a/ui/web/tests/unit/CSTable.spec.ts b/ui/web/tests/unit/CSTable.spec.ts
index 36e91245..cc31c0cf 100644
--- a/ui/web/tests/unit/CSTable.spec.ts
+++ b/ui/web/tests/unit/CSTable.spec.ts
@@ -1,7 +1,7 @@
 import { expect, test } from 'vitest';
 import { shallowMount } from '@vue/test-utils';
 import CSTable from '@/components/charging-stations/CSTable.vue';
-import type { ChargingStationData } from '@/types/ChargingStationType';
+import type { ChargingStationData } from '@/types';
 
 test('renders CS table columns name', () => {
   const chargingStations: ChargingStationData[] = [];
-- 
2.34.1