From 3b0c6e17e092aaf540a4011d95236dd9ab4f7e7b Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= <jerome.benoit@sap.com>
Date: Thu, 29 Feb 2024 11:54:05 +0100
Subject: [PATCH] refactor(ui): factor out app initialization
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>
---
 .../actions/AddChargingStations.vue           | 31 ++++++-------------
 .../components/actions/SetSupervisionUrl.vue  |  4 +--
 .../components/actions/StartTransaction.vue   |  4 +--
 .../src/components/buttons/ReloadButton.vue   |  2 +-
 ui/web/src/main.ts                            |  3 ++
 ui/web/src/views/ChargingStationsView.vue     | 31 +++++++++++++------
 6 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/ui/web/src/components/actions/AddChargingStations.vue b/ui/web/src/components/actions/AddChargingStations.vue
index 51e8a830..ff9f5f61 100644
--- a/ui/web/src/components/actions/AddChargingStations.vue
+++ b/ui/web/src/components/actions/AddChargingStations.vue
@@ -2,7 +2,13 @@
   <h1 id="action">Action</h1>
   <h2>Add Charging Stations</h2>
   <p>Template:</p>
-  <select v-show="state.ready" v-model="state.template">
+  <select
+    v-show="
+      Array.isArray(app?.appContext.config.globalProperties.$templates) &&
+      app?.appContext.config.globalProperties.$templates.length > 0
+    "
+    v-model="state.template"
+  >
     <option disabled value="">Please select a template</option>
     <option v-for="template in app?.appContext.config.globalProperties.$templates">
       {{ template }}
@@ -93,14 +99,12 @@
 </template>
 
 <script setup lang="ts">
-import { getCurrentInstance, onMounted, reactive } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import { useToast } from 'vue-toast-notification'
 import Button from '@/components/buttons/Button.vue'
-import type { ResponsePayload } from '@/types'
 import { convertToBoolean } from '@/composables'
 
-const state = reactive({
-  ready: false,
+const state = ref({
   template: '',
   numberOfStations: 1,
   supervisionUrl: '',
@@ -114,23 +118,6 @@ const app = getCurrentInstance()
 const uiClient = app?.appContext.config.globalProperties.$uiClient
 
 const $toast = useToast()
-
-onMounted(() => {
-  uiClient
-    .listTemplates()
-    .then((response: ResponsePayload) => {
-      if (app != null && app.appContext.config.globalProperties.$templates == null) {
-        app.appContext.config.globalProperties.$templates = response.templates
-      }
-    })
-    .catch((error: Error) => {
-      $toast.error('Error at fetching charging station templates')
-      console.error('Error at fetching charging station templates:', error)
-    })
-    .finally(() => {
-      state.ready = true
-    })
-})
 </script>
 
 <style>
diff --git a/ui/web/src/components/actions/SetSupervisionUrl.vue b/ui/web/src/components/actions/SetSupervisionUrl.vue
index e50316bf..ff2a4b80 100644
--- a/ui/web/src/components/actions/SetSupervisionUrl.vue
+++ b/ui/web/src/components/actions/SetSupervisionUrl.vue
@@ -36,7 +36,7 @@
 </template>
 
 <script setup lang="ts">
-import { getCurrentInstance, reactive } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import Button from '@/components/buttons/Button.vue'
 
 const props = defineProps<{
@@ -44,7 +44,7 @@ const props = defineProps<{
   chargingStationId: string
 }>()
 
-const state = reactive({
+const state = ref({
   supervisionUrl: ''
 })
 
diff --git a/ui/web/src/components/actions/StartTransaction.vue b/ui/web/src/components/actions/StartTransaction.vue
index fed7d3be..22acbef3 100644
--- a/ui/web/src/components/actions/StartTransaction.vue
+++ b/ui/web/src/components/actions/StartTransaction.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script setup lang="ts">
-import { getCurrentInstance, reactive } from 'vue'
+import { getCurrentInstance, ref } from 'vue'
 import Button from '@/components/buttons/Button.vue'
 import { convertToInt } from '@/composables'
 
@@ -40,7 +40,7 @@ const props = defineProps<{
   connectorId: string
 }>()
 
-const state = reactive({
+const state = ref({
   idTag: ''
 })
 
diff --git a/ui/web/src/components/buttons/ReloadButton.vue b/ui/web/src/components/buttons/ReloadButton.vue
index 2fa291af..bf74ec9a 100644
--- a/ui/web/src/components/buttons/ReloadButton.vue
+++ b/ui/web/src/components/buttons/ReloadButton.vue
@@ -1,6 +1,6 @@
 <template>
   <FlatButton>
-    <span style="display: inline-block" :class="{ spin: loading }"> &#8635; </span>
+    <span :class="{ spin: loading }"> &#8635; </span>
   </FlatButton>
 </template>
 
diff --git a/ui/web/src/main.ts b/ui/web/src/main.ts
index 8c16f4a7..5d34ae91 100644
--- a/ui/web/src/main.ts
+++ b/ui/web/src/main.ts
@@ -21,6 +21,9 @@ const initializeApp = (app: AppType, config: ConfigurationData) => {
   if (app.config.globalProperties.$configuration == null) {
     app.config.globalProperties.$configuration = config
   }
+  if (!Array.isArray(app.config.globalProperties.$templates)) {
+    app.config.globalProperties.$templates = []
+  }
   if (!Array.isArray(app.config.globalProperties.$chargingStations)) {
     app.config.globalProperties.$chargingStations = []
   }
diff --git a/ui/web/src/views/ChargingStationsView.vue b/ui/web/src/views/ChargingStationsView.vue
index 90433782..a19c14c3 100644
--- a/ui/web/src/views/ChargingStationsView.vue
+++ b/ui/web/src/views/ChargingStationsView.vue
@@ -20,7 +20,6 @@
                 'open',
                 () => {
                   setToLocalStorage<number>('uiServerConfigurationIndex', state.uiServerIndex)
-                  delete app?.appContext.config.globalProperties.$templates
                   $router.currentRoute.value.name !== 'charging-stations' &&
                     $router.push({ name: 'charging-stations' })
                 },
@@ -75,7 +74,7 @@
 </template>
 
 <script setup lang="ts">
-import { getCurrentInstance, onMounted, reactive } from 'vue'
+import { getCurrentInstance, onMounted, ref } from 'vue'
 import { useToast } from 'vue-toast-notification'
 import CSTable from '@/components/charging-stations/CSTable.vue'
 import type { ResponsePayload, UIServerConfigurationSection } from '@/types'
@@ -92,15 +91,29 @@ const app = getCurrentInstance()
 
 const initializeWSEventListeners = () => {
   app?.appContext.config.globalProperties.$uiClient.registerWSEventListener('open', () => {
-    loadChargingStations(() => (state.renderChargingStationsList = randomUUID()))
+    uiClient
+      .listTemplates()
+      .then((response: ResponsePayload) => {
+        if (app != null) {
+          app.appContext.config.globalProperties.$templates = response.templates
+        }
+      })
+      .catch((error: Error) => {
+        if (app != null) {
+          app.appContext.config.globalProperties.$templates = []
+        }
+        $toast.error('Error at fetching charging station templates')
+        console.error('Error at fetching charging station templates:', error)
+      })
+    loadChargingStations(() => (state.value.renderChargingStationsList = randomUUID()))
   })
   app?.appContext.config.globalProperties.$uiClient.registerWSEventListener('error', () => {
     app.appContext.config.globalProperties.$chargingStations = []
-    state.renderChargingStationsList = randomUUID()
+    state.value.renderChargingStationsList = randomUUID()
   })
   app?.appContext.config.globalProperties.$uiClient.registerWSEventListener('close', () => {
     app.appContext.config.globalProperties.$chargingStations = []
-    state.renderChargingStationsList = randomUUID()
+    state.value.renderChargingStationsList = randomUUID()
   })
 }
 
@@ -108,7 +121,7 @@ onMounted(() => {
   initializeWSEventListeners()
 })
 
-const state = reactive({
+const state = ref({
   renderChargingStationsList: randomUUID(),
   loading: false,
   uiServerIndex: getFromLocalStorage<number>('uiServerConfigurationIndex', 0)
@@ -126,8 +139,8 @@ const uiServerConfigurations: { configuration: UIServerConfigurationSection; ind
 const $toast = useToast()
 
 const loadChargingStations = (renderCallback?: () => void): void => {
-  if (state.loading === false) {
-    state.loading = true
+  if (state.value.loading === false) {
+    state.value.loading = true
     uiClient
       .listChargingStations()
       .then((response: ResponsePayload) => {
@@ -146,7 +159,7 @@ const loadChargingStations = (renderCallback?: () => void): void => {
         if (renderCallback != null) {
           renderCallback()
         }
-        state.loading = false
+        state.value.loading = false
       })
   }
 }
-- 
2.34.1