From f27eb751a2eb332306ecb9c5c4f0578d3bf66ee4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Sat, 27 Aug 2022 18:01:19 +0200
Subject: [PATCH] Web UI: rename some directories to a sensible name
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>
---
 .../ChargingStationWorkerBroadcastChannel.ts   |  2 +-
 src/ui/web/src/assets/config.ts                |  2 +-
 .../charging-stations/CSConnector.vue          | 18 +++++++++---------
 .../components/charging-stations/CSData.vue    |  4 ++--
 .../charging-stations/CSInfoModal.vue          |  2 +-
 .../components/charging-stations/CSTable.vue   |  2 +-
 .../{composable => composables}/UIClient.ts    |  8 ++++----
 .../src/{composable => composables}/Utils.ts   |  0
 .../src/{type => types}/ChargingStationType.ts |  0
 .../src/{type => types}/ConfigurationType.ts   |  0
 src/ui/web/src/{type => types}/JsonType.ts     |  0
 src/ui/web/src/{type => types}/UIProtocol.ts   |  0
 src/ui/web/src/views/ChargingStationsView.vue  |  6 +++---
 src/ui/web/tests/unit/CSTable.spec.ts          |  2 +-
 14 files changed, 23 insertions(+), 23 deletions(-)
 rename src/ui/web/src/{composable => composables}/UIClient.ts (95%)
 rename src/ui/web/src/{composable => composables}/Utils.ts (100%)
 rename src/ui/web/src/{type => types}/ChargingStationType.ts (100%)
 rename src/ui/web/src/{type => types}/ConfigurationType.ts (100%)
 rename src/ui/web/src/{type => types}/JsonType.ts (100%)
 rename src/ui/web/src/{type => types}/UIProtocol.ts (100%)

diff --git a/src/charging-station/ChargingStationWorkerBroadcastChannel.ts b/src/charging-station/ChargingStationWorkerBroadcastChannel.ts
index 35e3fb72..6fd226fa 100644
--- a/src/charging-station/ChargingStationWorkerBroadcastChannel.ts
+++ b/src/charging-station/ChargingStationWorkerBroadcastChannel.ts
@@ -15,7 +15,7 @@ import {
   BroadcastChannelResponsePayload,
   MessageEvent,
 } from '../types/WorkerBroadcastChannel';
-import { ResponseStatus } from '../ui/web/src/type/UIProtocol';
+import { ResponseStatus } from '../ui/web/src/types/UIProtocol';
 import logger from '../utils/Logger';
 import type ChargingStation from './ChargingStation';
 import WorkerBroadcastChannel from './WorkerBroadcastChannel';
diff --git a/src/ui/web/src/assets/config.ts b/src/ui/web/src/assets/config.ts
index 43170a2c..ae8a364a 100644
--- a/src/ui/web/src/assets/config.ts
+++ b/src/ui/web/src/assets/config.ts
@@ -1,4 +1,4 @@
-import type { BaseConfig } from '@/type/ConfigurationType';
+import type { BaseConfig } from '@/types/ConfigurationType';
 
 const config: BaseConfig = {
   emobility: {
diff --git a/src/ui/web/src/components/charging-stations/CSConnector.vue b/src/ui/web/src/components/charging-stations/CSConnector.vue
index 81e955d0..2fb7822e 100644
--- a/src/ui/web/src/components/charging-stations/CSConnector.vue
+++ b/src/ui/web/src/components/charging-stations/CSConnector.vue
@@ -25,9 +25,9 @@
 import Button from '../buttons/Button.vue';
 
 // import { reactive } from 'vue';
-import UIClient from '@/composable/UIClient';
-import type { ConnectorStatus } from '@/type/ChargingStationType';
-// import Utils from '@/composable/Utils';
+import UIClient from '@/composables/UIClient';
+import type { ConnectorStatus } from '@/types/ChargingStationType';
+// import Utils from '@/composables/Utils';
 
 const props = defineProps<{
   hashId: string;
@@ -62,21 +62,21 @@ const props = defineProps<{
 // }
 
 function startChargingStation(): void {
-  UIClient.instance.startChargingStation(props.hashId);
+  UIClient.getInstance().startChargingStation(props.hashId);
 }
 function stopChargingStation(): void {
-  UIClient.instance.stopChargingStation(props.hashId);
+  UIClient.getInstance().stopChargingStation(props.hashId);
 }
 function openConnection(): void {
-  UIClient.instance.openConnection(props.hashId);
+  UIClient.getInstance().openConnection(props.hashId);
 }
 function closeConnection(): void {
-  UIClient.instance.closeConnection(props.hashId);
+  UIClient.getInstance().closeConnection(props.hashId);
 }
 function startTransaction(): void {
-  UIClient.instance.startTransaction(props.hashId, props.connectorId, props.idTag);
+  UIClient.getInstance().startTransaction(props.hashId, props.connectorId, props.idTag);
 }
 function stopTransaction(): void {
-  UIClient.instance.stopTransaction(props.hashId, props.transactionId);
+  UIClient.getInstance().stopTransaction(props.hashId, props.transactionId);
 }
 </script>
diff --git a/src/ui/web/src/components/charging-stations/CSData.vue b/src/ui/web/src/components/charging-stations/CSData.vue
index 08a72d5e..3de9a7d6 100644
--- a/src/ui/web/src/components/charging-stations/CSData.vue
+++ b/src/ui/web/src/components/charging-stations/CSData.vue
@@ -20,12 +20,12 @@
 import CSConnector from './CSConnector.vue';
 
 // import { reactive } from 'vue';
-import Utils from '@/composable/Utils';
+import Utils from '@/composables/Utils';
 import type {
   ChargingStationData,
   ChargingStationInfo,
   ConnectorStatus,
-} from '@/type/ChargingStationType';
+} from '@/types/ChargingStationType';
 
 const props = defineProps<{
   chargingStation: ChargingStationData;
diff --git a/src/ui/web/src/components/charging-stations/CSInfoModal.vue b/src/ui/web/src/components/charging-stations/CSInfoModal.vue
index f4505b7d..f9481b58 100644
--- a/src/ui/web/src/components/charging-stations/CSInfoModal.vue
+++ b/src/ui/web/src/components/charging-stations/CSInfoModal.vue
@@ -6,7 +6,7 @@
 
 <script setup lang="ts">
 import Modal from '@/components/Modal.vue';
-import type { ChargingStationInfo } from '@/type/ChargingStationType';
+import type { ChargingStationInfo } from '@/types/ChargingStationType';
 
 const props = defineProps<{
   isVisible: boolean;
diff --git a/src/ui/web/src/components/charging-stations/CSTable.vue b/src/ui/web/src/components/charging-stations/CSTable.vue
index cf96d954..c502677a 100644
--- a/src/ui/web/src/components/charging-stations/CSTable.vue
+++ b/src/ui/web/src/components/charging-stations/CSTable.vue
@@ -27,7 +27,7 @@
 
 <script setup lang="ts">
 import CSData from './CSData.vue';
-import type { ChargingStationData } from '@/type/ChargingStationType';
+import type { ChargingStationData } from '@/types/ChargingStationType';
 
 const props = defineProps<{
   chargingStations: Record<string, ChargingStationData>;
diff --git a/src/ui/web/src/composable/UIClient.ts b/src/ui/web/src/composables/UIClient.ts
similarity index 95%
rename from src/ui/web/src/composable/UIClient.ts
rename to src/ui/web/src/composables/UIClient.ts
index 9ac8923c..0c30494d 100644
--- a/src/ui/web/src/composable/UIClient.ts
+++ b/src/ui/web/src/composables/UIClient.ts
@@ -1,6 +1,6 @@
-import type { JsonType } from '@/type/JsonType';
-import { ProcedureName, ResponseStatus } from '@/type/UIProtocol';
-import type { ProtocolResponse, ResponsePayload } from '@/type/UIProtocol';
+import type { JsonType } from '@/types/JsonType';
+import { ProcedureName, ResponseStatus } from '@/types/UIProtocol';
+import type { ProtocolResponse, ResponsePayload } from '@/types/UIProtocol';
 
 import Utils from './Utils';
 import config from '@/assets/config';
@@ -23,7 +23,7 @@ export default class UIClient {
     this._responseHandlers = new Map<string, ResponseHandler>();
   }
 
-  public static get instance() {
+  public static getInstance() {
     if (UIClient._instance === null) {
       UIClient._instance = new UIClient();
     }
diff --git a/src/ui/web/src/composable/Utils.ts b/src/ui/web/src/composables/Utils.ts
similarity index 100%
rename from src/ui/web/src/composable/Utils.ts
rename to src/ui/web/src/composables/Utils.ts
diff --git a/src/ui/web/src/type/ChargingStationType.ts b/src/ui/web/src/types/ChargingStationType.ts
similarity index 100%
rename from src/ui/web/src/type/ChargingStationType.ts
rename to src/ui/web/src/types/ChargingStationType.ts
diff --git a/src/ui/web/src/type/ConfigurationType.ts b/src/ui/web/src/types/ConfigurationType.ts
similarity index 100%
rename from src/ui/web/src/type/ConfigurationType.ts
rename to src/ui/web/src/types/ConfigurationType.ts
diff --git a/src/ui/web/src/type/JsonType.ts b/src/ui/web/src/types/JsonType.ts
similarity index 100%
rename from src/ui/web/src/type/JsonType.ts
rename to src/ui/web/src/types/JsonType.ts
diff --git a/src/ui/web/src/type/UIProtocol.ts b/src/ui/web/src/types/UIProtocol.ts
similarity index 100%
rename from src/ui/web/src/type/UIProtocol.ts
rename to src/ui/web/src/types/UIProtocol.ts
diff --git a/src/ui/web/src/views/ChargingStationsView.vue b/src/ui/web/src/views/ChargingStationsView.vue
index 3ff26e54..bf11e1a4 100644
--- a/src/ui/web/src/views/ChargingStationsView.vue
+++ b/src/ui/web/src/views/ChargingStationsView.vue
@@ -22,10 +22,10 @@ import ReloadButton from '@/components/buttons/ReloadButton.vue';
 import CSTable from '@/components/charging-stations/CSTable.vue';
 
 import { onMounted, reactive } from 'vue';
-import UIClient from '@/composable/UIClient';
-import type { ChargingStationData } from '@/type/ChargingStationType';
+import UIClient from '@/composables/UIClient';
+import type { ChargingStationData } from '@/types/ChargingStationType';
 
-const UIClientInstance = UIClient.instance;
+const UIClientInstance = UIClient.getInstance();
 
 onMounted(() => {
   UIClientInstance.registerWSonOpenListener(load);
diff --git a/src/ui/web/tests/unit/CSTable.spec.ts b/src/ui/web/tests/unit/CSTable.spec.ts
index 96101802..b77fab86 100644
--- a/src/ui/web/tests/unit/CSTable.spec.ts
+++ b/src/ui/web/tests/unit/CSTable.spec.ts
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 import { shallowMount } from '@vue/test-utils';
 import CSTable from '@/components/charging-stations/CSTable.vue';
-import type { ChargingStationData } from '@/type/ChargingStationType';
+import type { ChargingStationData } from '@/types/ChargingStationType';
 
 describe('CSTable.vue', () => {
   it('renders CS table columns name', () => {
-- 
2.34.1