refactor + email text field fix (#2854)

Signed-off-by: Shaanjot Gill <gill.shaanjots@gmail.com>
bcgov · Jun 5, 2024 · 18bb31b · 18bb31b
1 parent 4dda847
commit 18bb31b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 29 deletions.
diff --git a/auth-web/package-lock.json b/auth-web/package-lock.json
diff --git a/auth-web/package.json b/auth-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "auth-web",
-  "version": "2.6.24",
+  "version": "2.6.25",
   "appName": "Auth Web",
   "sbcName": "SBC Common Components",
   "private": true,

diff --git a/auth-web/src/views/auth/staff/SafeEmailView.vue b/auth-web/src/views/auth/staff/SafeEmailView.vue
@@ -52,46 +52,44 @@
   </div>
 </template>
 <script lang="ts">
-import { defineComponent, onMounted, ref } from '@vue/composition-api'
+import { defineComponent, onMounted, reactive, toRefs } from '@vue/composition-api'
 import { SafeEmail } from '@/models/safe-email'
 import StaffService from '@/services/staff.services'
 
 export default defineComponent({
   name: 'SafeEmailView',
   setup () {
-    const safeEmails = ref<SafeEmail[]>()
-    const alertMessage = ref('')
-    const alertType = ref('')
-    const deletedEmail = ref('')
-    const delEmailAlertMsg = ref('')
-    const delEmailAlertType = ref('')
+    const state = reactive({
+      safeEmails: [] as SafeEmail[],
+      alertMessage: '',
+      alertType: '',
+      deletedEmail: '',
+      delEmailAlertMsg: '',
+      delEmailAlertType: ''
+    })
 
     function showGeneralAlert (msg: string, type: string) {
-      alertMessage.value = msg
-      alertType.value = type
+      state.alertMessage = msg
+      state.alertType = type
       // 2 seconds timeout
       setTimeout(() => {
-        alertMessage.value = ''
+        state.alertMessage = ''
       }, 2000)
     }
 
     function showPerEmailAlert (email: string, type: string) {
-      deletedEmail.value = email
-      delEmailAlertType.value = type
-      if (type === 'success') {
-        delEmailAlertMsg.value = `Deleted`
-      } else {
-        delEmailAlertMsg.value = `Error`
-      }
+      state.deletedEmail = email
+      state.delEmailAlertType = type
+      state.delEmailAlertMsg = type === 'success' ? 'Deleted' : 'Error'
       // 1 seconds timeout
       setTimeout(() => {
-        deletedEmail.value = ''
+        state.deletedEmail = ''
       }, 1000)
     }
 
     async function getSafeEmails () {
       try {
-        safeEmails.value = (await StaffService.getSafeEmails()).data
+        state.safeEmails = (await StaffService.getSafeEmails()).data
       } catch (error) {
         showGeneralAlert(`Error fetching safe emails, ${error}`, 'error')
       }
@@ -114,15 +112,10 @@ export default defineComponent({
     })
 
     return {
+      ...toRefs(state),
       deleteEmail,
       getSafeEmails,
-      showGeneralAlert,
-      safeEmails,
-      alertMessage,
-      alertType,
-      deletedEmail,
-      delEmailAlertMsg,
-      delEmailAlertType
+      showGeneralAlert
     }
   }
 })

diff --git a/auth-web/src/views/auth/staff/StaffDashboardView.vue b/auth-web/src/views/auth/staff/StaffDashboardView.vue
@@ -433,6 +433,7 @@ export default defineComponent({
         await StaffService.addSafeEmail(safeListEmailsRequestBody)
         await safeEmailView.value.getSafeEmails()
         safeEmailView.value.showGeneralAlert(`Email ${emailToAdd.value} added successfully`, 'success')
+        emailToAdd.value = ''
       } catch (error) {
         // eslint-disable-next-line no-console
         const errMsg = `Error adding ${emailToAdd.value}, ${error}`