From abc63634ca79bdc6584525a620e49dd092eb39cf Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 22 Aug 2023 11:00:53 -0700
Subject: [PATCH 001/313] Test

---
 frontend/src/routes.ts | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index 80a0af91f7..09b5a44e7c 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -9,6 +9,8 @@ import ErrorPage from '@/pages/ErrorPage.vue'
 import NotFoundPage from '@/pages/NotFoundPage.vue'
 import ForestClientUserSession from '@/helpers/ForestClientUserSession'
 
+import { nodeEnv } from '@/CoreConstants'
+
 const routes: RouteRecordRaw[] = [
   {
     path: '/landing',
@@ -117,6 +119,16 @@ const routes: RouteRecordRaw[] = [
   }
 ]
 
+if (nodeEnv === 'openshift-dev') {
+  const names = ['form', 'confirmation']
+
+  routes.forEach((route) => {
+    if (names.includes(route.name as string)) {
+      route.meta?.visibleTo.push('idir')
+    }
+  })
+}
+
 const router = createRouter({
   history: createWebHistory(),
   routes

From d76a6aeaef2c2e6d3b55c13461281038bf164ec2 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 22 Aug 2023 12:29:34 -0700
Subject: [PATCH 002/313] chore: preventing optimizeDeps to kick in

---
 frontend/vite.config.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index ae54265499..904838b3d2 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -65,6 +65,7 @@ export default defineConfig(({ command, mode }) => {
         ]
       },
       environment: 'jsdom'
-    }
+    },
+    optimizeDeps: false
   }
 })

From b484c9b68e46890df0d34b9fea314192730e09e0 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 06:44:31 -0700
Subject: [PATCH 003/313] fix: fixing landing page style

---
 frontend/src/App.vue                         |   2 +-
 frontend/src/assets/styles/global.scss       |  14 +
 frontend/src/pages/ApplyClientNumberPage.vue | 400 +++++++++----------
 frontend/src/pages/LandingPage.vue           |  80 ++--
 frontend/src/routes.ts                       |   8 +
 5 files changed, 266 insertions(+), 238 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index f893a12c6b..52b1050474 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -2,7 +2,7 @@
   <div class="headers">
     <main-header-component v-if="!$route.meta.hideHeader"></main-header-component>
   </div>
-  <div class="screen">
+  <div :class="{[`${$route.meta.format}`]:true}">
     <div class="content">
     <router-view></router-view>
     </div>
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 2ec1bee75d..03f514d362 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -205,6 +205,20 @@ body {
 
 
 /* Recreating the style */
+.spacing {
+  padding:1.5rem;
+}
+
+.landing-subtitle {
+  margin: 1.5rem 0rem 0rem 0rem;
+}
+
+.full {
+  margin: 0rem;
+  padding-bottom: 0px;
+  display: flex;
+  background: var(--light-theme-background-background, #FFF);
+}
 .screen {
   margin: 3rem 2.5rem 2.5rem 2.5rem;
   padding-bottom: 0px;
diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index 21eec597b6..f3b590dda2 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -1,3 +1,203 @@
+<script setup lang="ts">
+import { reactive, watch, toRef, ref, getCurrentInstance, computed } from 'vue'
+import { useEventBus } from '@vueuse/core'
+import { useRouter } from 'vue-router'
+import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16'
+import Save16 from '@carbon/icons-vue/es/save/16'
+import LogOut16 from '@carbon/icons-vue/es/logout/16'
+import Check16 from '@carbon/icons-vue/es/checkmark/16'
+import BusinessInformationWizardStep from '@/pages/applyform/BusinessInformationWizardStep.vue'
+import AddressWizardStep from '@/pages/applyform/AddressWizardStep.vue'
+import ContactWizardStep from '@/pages/applyform/ContactWizardStep.vue'
+import ReviewWizardStep from '@/pages/applyform/ReviewWizardStep.vue'
+import {
+  newFormDataDto,
+  type FormDataDto,
+  type Contact
+} from '@/dto/ApplyClientNumberDto'
+
+import type { ValidationMessageType, ModalNotification } from '@/dto/CommonTypesDto'
+import { usePost } from '@/composables/useFetch'
+import ForestClientUserSession from '@/helpers/ForestClientUserSession'
+import useFocus from '@/composables/useFocus';
+
+const { setFocusedComponent } = useFocus();
+const submitterInformation = ForestClientUserSession.user
+const errorBus = useEventBus<ValidationMessageType[]>(
+  'submission-error-notification'
+)
+const generalErrorBus = useEventBus<string>('general-error-notification')
+const exitBus = useEventBus<Record<string, boolean | null>>('exit-notification')
+
+const router = useRouter()
+
+const instance = getCurrentInstance()
+const session = instance?.appContext.config.globalProperties.$session
+
+const submitterContact: Contact = {
+  locationNames: [],
+  contactType: { value: '', text: '' },
+  phoneNumber: '',
+  firstName: session?.user?.firstName ?? '',
+  lastName: session?.user?.lastName ?? '',
+  email: session?.user?.email ?? ''
+}
+
+let formDataDto = ref<FormDataDto>({ ...newFormDataDto() })
+
+//---- Form Data ----//
+let formData = reactive<FormDataDto>({
+  ...formDataDto.value,
+  location: {
+    addresses: formDataDto.value.location.addresses,
+    contacts: [submitterContact]
+  }
+})
+
+const { response, error, fetch } = usePost(
+  '/api/clients/submissions',
+  toRef(formData).value,
+  {
+    skip: true,
+    headers: {
+      'x-user-id': submitterInformation?.userId || '',
+      'x-user-email': submitterInformation?.email || '',
+      'x-user-name': submitterInformation?.firstName || ''
+    }
+  }
+)
+
+watch([response], () => {
+  if (response.value.status === 201) {
+    router.push({ name: 'confirmation' })
+  }
+})
+
+watch([error], () => {
+  if (error.value.response.status === 400) {
+    const validationErrors: ValidationMessageType[] = error.value.response.data
+    const fieldIds = [
+      'businessInformation.businessType',
+      'businessInformation.legalType',
+      'businessInformation.clientType'
+    ]
+
+    const matchingFields = validationErrors.find((item) =>
+      fieldIds.includes(item.fieldId)
+    )
+    if (matchingFields) {
+      generalErrorBus.emit(
+        `There was an error submitting your application. ${matchingFields.errorMsg}`
+      )
+      setFocusedComponent('top-notification')
+    }
+  } else {
+    generalErrorBus.emit(
+      `There was an error submitting your application. ${error.value.data}}`
+    )
+    window.scrollTo({ top: 0, behavior: 'smooth' })
+  }
+})
+
+const submit = () => {
+  errorBus.emit([])
+  generalErrorBus.emit('')
+  fetch()
+}
+
+
+// Tab system
+const progressData = reactive(
+  ['Business information','Address','Contacts','Review']
+  .map((title, index) => {
+    return {
+      title,
+      subtitle: `Step ${index + 1}`,
+      kind: index === 0 ? 'current' : 'queued',
+      enabled: true,
+      valid: false
+    }
+  })
+  
+)
+
+const currentTab = ref(0);
+
+const stateIcon = (index: number) => {
+  if (currentTab.value == index) return 'current'
+  if (currentTab.value > index || progressData[index].valid) return 'complete'
+  return 'queued'
+}
+
+const isLast = computed(() => currentTab.value === progressData.length - 1)
+const isFirst = computed(() => currentTab.value === 0)
+const isCurrentValid = computed(() => progressData[currentTab.value].valid)
+const isNextAvailable = computed(() => !isCurrentValid.value || isLast.value)
+const isFormValid = computed(() => progressData.every((entry: any) => entry.valid))
+const endAndLogOut = ref<boolean>(false)
+const mailAndLogOut = ref<boolean>(false)
+
+const goToStep = (index: number) => (currentTab.value = index)
+
+const onNext = () => {
+  if (currentTab.value + 1 < progressData.length) {
+    currentTab.value++
+    progressData[currentTab.value-1].kind = stateIcon(currentTab.value-1)
+    progressData[currentTab.value].kind = stateIcon(currentTab.value)
+    setFocusedComponent(`focus-${currentTab.value}`)
+  }
+}
+const onBack = () => {
+  if (currentTab.value - 1 >= 0) {
+    currentTab.value--
+    progressData[currentTab.value+1].kind = stateIcon(currentTab.value+1)
+    progressData[currentTab.value].kind = stateIcon(currentTab.value)
+    setFocusedComponent(`focus-${currentTab.value}`)
+  }
+}
+const validateStep = (valid: boolean) => {
+  progressData[currentTab.value].valid = valid
+}
+const openToast = (event: ModalNotification) => {
+  console.log(event)
+}
+
+const saveChange = () => {
+  openToast({
+    message: `“${progressData[currentTab.value].title}” changes was saved successfully.`,
+    kind: 'Success',
+    active: true,
+    handler: () => {}
+  })
+  goToStep(3)
+}
+
+const processAndLogOut = () => {
+  if (mailAndLogOut.value) {
+    usePost(
+      '/api/clients/mail',
+      {
+        incorporation: formData.businessInformation.incorporationNumber,
+        name: formData.businessInformation.businessName,
+        userName: submitterInformation?.name || '',
+        userId: submitterInformation?.userId || '',
+        mail: submitterInformation?.email || ''
+      },
+      {}
+    )
+  }
+  session?.logOut()
+}
+
+exitBus.on((event: Record<string, boolean | null>) => {
+  endAndLogOut.value = event.goodStanding ? event.goodStanding : false
+  mailAndLogOut.value = event.duplicated ? event.duplicated : false
+})
+
+const globalErrorMessage = ref<string>('')
+generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
+</script>
+
 <template>
   <div class="form-header">
     <div class="form-header-title">
@@ -203,203 +403,3 @@
     </div>
   </div>
 </template>
-
-<script setup lang="ts">
-import { reactive, watch, toRef, ref, getCurrentInstance, computed } from 'vue'
-import { useEventBus } from '@vueuse/core'
-import { useRouter } from 'vue-router'
-import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16'
-import Save16 from '@carbon/icons-vue/es/save/16'
-import LogOut16 from '@carbon/icons-vue/es/logout/16'
-import Check16 from '@carbon/icons-vue/es/checkmark/16'
-import BusinessInformationWizardStep from '@/pages/applyform/BusinessInformationWizardStep.vue'
-import AddressWizardStep from '@/pages/applyform/AddressWizardStep.vue'
-import ContactWizardStep from '@/pages/applyform/ContactWizardStep.vue'
-import ReviewWizardStep from '@/pages/applyform/ReviewWizardStep.vue'
-import {
-  newFormDataDto,
-  type FormDataDto,
-  type Contact
-} from '@/dto/ApplyClientNumberDto'
-
-import type { ValidationMessageType, ModalNotification } from '@/dto/CommonTypesDto'
-import { usePost } from '@/composables/useFetch'
-import ForestClientUserSession from '@/helpers/ForestClientUserSession'
-import useFocus from '@/composables/useFocus';
-
-const { setFocusedComponent } = useFocus();
-const submitterInformation = ForestClientUserSession.user
-const errorBus = useEventBus<ValidationMessageType[]>(
-  'submission-error-notification'
-)
-const generalErrorBus = useEventBus<string>('general-error-notification')
-const exitBus = useEventBus<Record<string, boolean | null>>('exit-notification')
-
-const router = useRouter()
-
-const instance = getCurrentInstance()
-const session = instance?.appContext.config.globalProperties.$session
-
-const submitterContact: Contact = {
-  locationNames: [],
-  contactType: { value: '', text: '' },
-  phoneNumber: '',
-  firstName: session?.user?.firstName ?? '',
-  lastName: session?.user?.lastName ?? '',
-  email: session?.user?.email ?? ''
-}
-
-let formDataDto = ref<FormDataDto>({ ...newFormDataDto() })
-
-//---- Form Data ----//
-let formData = reactive<FormDataDto>({
-  ...formDataDto.value,
-  location: {
-    addresses: formDataDto.value.location.addresses,
-    contacts: [submitterContact]
-  }
-})
-
-const { response, error, fetch } = usePost(
-  '/api/clients/submissions',
-  toRef(formData).value,
-  {
-    skip: true,
-    headers: {
-      'x-user-id': submitterInformation?.userId || '',
-      'x-user-email': submitterInformation?.email || '',
-      'x-user-name': submitterInformation?.firstName || ''
-    }
-  }
-)
-
-watch([response], () => {
-  if (response.value.status === 201) {
-    router.push({ name: 'confirmation' })
-  }
-})
-
-watch([error], () => {
-  if (error.value.response.status === 400) {
-    const validationErrors: ValidationMessageType[] = error.value.response.data
-    const fieldIds = [
-      'businessInformation.businessType',
-      'businessInformation.legalType',
-      'businessInformation.clientType'
-    ]
-
-    const matchingFields = validationErrors.find((item) =>
-      fieldIds.includes(item.fieldId)
-    )
-    if (matchingFields) {
-      generalErrorBus.emit(
-        `There was an error submitting your application. ${matchingFields.errorMsg}`
-      )
-      setFocusedComponent('top-notification')
-    }
-  } else {
-    generalErrorBus.emit(
-      `There was an error submitting your application. ${error.value.data}}`
-    )
-    window.scrollTo({ top: 0, behavior: 'smooth' })
-  }
-})
-
-const submit = () => {
-  errorBus.emit([])
-  generalErrorBus.emit('')
-  fetch()
-}
-
-
-// Tab system
-const progressData = reactive(
-  ['Business information','Address','Contacts','Review']
-  .map((title, index) => {
-    return {
-      title,
-      subtitle: `Step ${index + 1}`,
-      kind: index === 0 ? 'current' : 'queued',
-      enabled: true,
-      valid: false
-    }
-  })
-  
-)
-
-const currentTab = ref(0);
-
-const stateIcon = (index: number) => {
-  if (currentTab.value == index) return 'current'
-  if (currentTab.value > index || progressData[index].valid) return 'complete'
-  return 'queued'
-}
-
-const isLast = computed(() => currentTab.value === progressData.length - 1)
-const isFirst = computed(() => currentTab.value === 0)
-const isCurrentValid = computed(() => progressData[currentTab.value].valid)
-const isNextAvailable = computed(() => !isCurrentValid.value || isLast.value)
-const isFormValid = computed(() => progressData.every((entry: any) => entry.valid))
-const endAndLogOut = ref<boolean>(false)
-const mailAndLogOut = ref<boolean>(false)
-
-const goToStep = (index: number) => (currentTab.value = index)
-
-const onNext = () => {
-  if (currentTab.value + 1 < progressData.length) {
-    currentTab.value++
-    progressData[currentTab.value-1].kind = stateIcon(currentTab.value-1)
-    progressData[currentTab.value].kind = stateIcon(currentTab.value)
-    setFocusedComponent(`focus-${currentTab.value}`)
-  }
-}
-const onBack = () => {
-  if (currentTab.value - 1 >= 0) {
-    currentTab.value--
-    progressData[currentTab.value+1].kind = stateIcon(currentTab.value+1)
-    progressData[currentTab.value].kind = stateIcon(currentTab.value)
-    setFocusedComponent(`focus-${currentTab.value}`)
-  }
-}
-const validateStep = (valid: boolean) => {
-  progressData[currentTab.value].valid = valid
-}
-const openToast = (event: ModalNotification) => {
-  console.log(event)
-}
-
-const saveChange = () => {
-  openToast({
-    message: `“${progressData[currentTab.value].title}” changes was saved successfully.`,
-    kind: 'Success',
-    active: true,
-    handler: () => {}
-  })
-  goToStep(3)
-}
-
-const processAndLogOut = () => {
-  if (mailAndLogOut.value) {
-    usePost(
-      '/api/clients/mail',
-      {
-        incorporation: formData.businessInformation.incorporationNumber,
-        name: formData.businessInformation.businessName,
-        userName: submitterInformation?.name || '',
-        userId: submitterInformation?.userId || '',
-        mail: submitterInformation?.email || ''
-      },
-      {}
-    )
-  }
-  session?.logOut()
-}
-
-exitBus.on((event: Record<string, boolean | null>) => {
-  endAndLogOut.value = event.goodStanding ? event.goodStanding : false
-  mailAndLogOut.value = event.duplicated ? event.duplicated : false
-})
-
-const globalErrorMessage = ref<string>('')
-generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
-</script>
diff --git a/frontend/src/pages/LandingPage.vue b/frontend/src/pages/LandingPage.vue
index a5b6604c10..ed3bfd469f 100644
--- a/frontend/src/pages/LandingPage.vue
+++ b/frontend/src/pages/LandingPage.vue
@@ -18,46 +18,51 @@ if (query.ref && query.ref === 'external') {
   <div class="full-width">
     <div class="row bx--row landing-grid">
       <div class="bx--col-sm-8 bx--col-md-10 bx--col-lg-10">
-        <img :src="logo" alt="BCGov Logo" width="160" class="logo" />
-        <h1 id="landing-title" class="landing-title">Welcome to CLIENT</h1>
+
+        <img :src="logo" alt="Government of British Columbia Logo" width="160" class="logo" />
+        
+        <h1 id="landing-title" class="landing-title">Client Management System</h1>
+        
         <h2 id="landing-subtitle" class="landing-subtitle">
-          The Ministry of Forests' client management system
+          Create and manage client accounts
         </h2>
-
-        <p id="landing-desc" class="landing-desc">
-          Check and manage client submissions
-        </p>
-
-        <bx-btn
-          kind="primary"
-          iconLayout=""
-          class="landing-button"
-          :href="$backend+'/login?code=idir'"
-        >
-          <span>Login with IDIR</span>
-          <login16 slot="icon" />
-        </bx-btn>
-        <bx-btn
-          v-if="$features.BCSC_LOGIN"
-          kind="primary"
-          iconLayout=""
-          class="landing-button"
-          :href="$backend+'/login?code=bcsc'"
-        >
-          <span>Login with BC Services Card</span>
-          <login16 slot="icon" />
-        </bx-btn>
-        <bx-btn
-          v-if="$features.BCEID_LOGIN"
-          kind="primary"
-          iconLayout=""
-          class="landing-button"
-          :href="$backend+'/login?code=bceidbusiness'"
-        >
-          <span>Login with BCeID</span>
-          <login16 slot="icon" />
-        </bx-btn>
+        <div class="spacing"></div>
+        <div class="form-footer-group-buttons">
+          <bx-btn
+            kind="primary"
+            iconLayout=""
+            class="landing-button"
+            :href="$backend+'/login?code=idir'"
+          >
+            <span>Login with IDIR</span>
+            <login16 slot="icon" />
+          </bx-btn>
+          
+          <bx-btn
+            v-if="$features.BCSC_LOGIN"
+            kind="primary"
+            iconLayout=""
+            class="landing-button"
+            :href="$backend+'/login?code=bcsc'"
+          >
+            <span>Login with BC Services Card</span>
+            <login16 slot="icon" />
+          </bx-btn>
+          
+          <bx-btn
+            v-if="$features.BCEID_LOGIN"
+            kind="primary"
+            iconLayout=""
+            class="landing-button"
+            :href="$backend+'/login?code=bceidbusiness'"
+          >
+            <span>Login with BCeID</span>
+            <login16 slot="icon" />
+          </bx-btn>
+        
+        </div>
       </div>
+      
       <div class="bx--col-sm-8 bx--col-md-6 bx--col-lg-6 landing-img-column">
         <img
           :src="Seeding"
@@ -65,6 +70,7 @@ if (query.ref && query.ref === 'external') {
           class="landing-img"
         />
       </div>
+
     </div>
   </div>
 </template>
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index 09b5a44e7c..edb607a218 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -18,6 +18,7 @@ const routes: RouteRecordRaw[] = [
     component: LandingPage,
     props: true,
     meta: {
+      format: 'full',
       hideHeader: true,
       requireAuth: false,
       showLoggedIn: false,
@@ -36,6 +37,7 @@ const routes: RouteRecordRaw[] = [
     component: ApplyClientNumber,
     props: true,
     meta: {
+      format: 'screen',
       hideHeader: false,
       requireAuth: true,
       showLoggedIn: true,
@@ -51,6 +53,7 @@ const routes: RouteRecordRaw[] = [
     component: FormSubmittedPage,
     props: true,
     meta: {
+      format: 'full',
       hideHeader: false,
       requireAuth: true,
       showLoggedIn: true,
@@ -66,6 +69,7 @@ const routes: RouteRecordRaw[] = [
     component: ReviewApplicationPage,
     props: true,
     meta: {
+      format: 'screen',
       hideHeader: false,
       requireAuth: true,
       showLoggedIn: true,
@@ -82,6 +86,7 @@ const routes: RouteRecordRaw[] = [
     component: UserLoadingPage,
     props: true,
     meta: {
+      format: 'full',
       hideHeader: true,
       requireAuth: false,
       showLoggedIn: false,
@@ -99,6 +104,7 @@ const routes: RouteRecordRaw[] = [
     component: ErrorPage,
     props: true,
     meta: {
+      format: 'full',
       hideHeader: true,
       requireAuth: false,
       showLoggedIn: true,
@@ -111,6 +117,7 @@ const routes: RouteRecordRaw[] = [
     component: NotFoundPage,
     props: true,
     meta: {
+      format: 'full',
       hideHeader: true,
       requireAuth: false,
       showLoggedIn: true,
@@ -164,6 +171,7 @@ export { routes, router }
 declare module 'vue-router' {
   // eslint-disable-next-line no-unused-vars
   interface RouteMeta {
+    format: string
     hideHeader: boolean
     requireAuth: boolean
     showLoggedIn: boolean

From 648e199f3bb8c0831259436ebf1e86cfcd0da74b Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 06:52:02 -0700
Subject: [PATCH 004/313] docs: updating documentations

---
 .github/pull_request_template.md               | 15 +++++++++++----
 frontend/.devcontainer/frontend.code-workspace |  1 +
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index dcb3541773..3801a8f03f 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -8,7 +8,7 @@ Fixes # (issue)
 
 ## Type of change
 
-Please delete options that are not relevant.
+<!-- Please delete options that are not relevant. -->
 
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
@@ -17,10 +17,17 @@ Please delete options that are not relevant.
 
 # How Has This Been Tested?
 
-Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+<!-- Please describe the tests you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration -->
 
-- [ ] Test A
-- [ ] Test B
+<!-- Please delete options that are not relevant. -->
+
+- [ ] New unit tests
+- [ ] New integrated tests
+- [ ] New component tests
+- [ ] New end-to-end tests
+- [ ] New user flow tests
+- [ ] No new tests are required
+- [ ] Manual tests (description below)
 
 
 ## Checklist
diff --git a/frontend/.devcontainer/frontend.code-workspace b/frontend/.devcontainer/frontend.code-workspace
index bca41dcafe..9ee6ecedc6 100644
--- a/frontend/.devcontainer/frontend.code-workspace
+++ b/frontend/.devcontainer/frontend.code-workspace
@@ -35,5 +35,6 @@
 		"[xml]": {
 			"editor.defaultFormatter": "redhat.vscode-xml"
 		},
+		"typescript.tsdk": "node_modules/typescript/lib",
 	}
 }
\ No newline at end of file

From 62ca782f40e474b4a1d6f8aea3f4292c8e887607 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 08:31:22 -0700
Subject: [PATCH 005/313] fix: capitalizing bc registry names

---
 .../ca/bc/gov/app/controller/client/ClientController.java     | 4 +++-
 .../main/java/ca/bc/gov/app/dto/client/ClientLookUpDto.java   | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
index 2b6266e10f..be5cdc4c71 100644
--- a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
+++ b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
@@ -9,6 +9,7 @@
 import io.swagger.v3.oas.annotations.tags.Tag;
 import java.time.LocalDate;
 import lombok.RequiredArgsConstructor;
+import org.apache.commons.text.WordUtils;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -81,7 +82,8 @@ public Flux<ClientLookUpDto> findByClientName(
       @PathVariable String name
   ) {
     return clientService
-        .findByClientNameOrIncorporation(name);
+        .findByClientNameOrIncorporation(name)
+        .map(client -> client.withName(WordUtils.capitalize(client.name())));
   }
 
   @GetMapping(value = "/incorporation/{incorporationId}")
diff --git a/backend/src/main/java/ca/bc/gov/app/dto/client/ClientLookUpDto.java b/backend/src/main/java/ca/bc/gov/app/dto/client/ClientLookUpDto.java
index 6451c09a2c..d7110b4bbd 100644
--- a/backend/src/main/java/ca/bc/gov/app/dto/client/ClientLookUpDto.java
+++ b/backend/src/main/java/ca/bc/gov/app/dto/client/ClientLookUpDto.java
@@ -1,6 +1,7 @@
 package ca.bc.gov.app.dto.client;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.With;
 
 
 @Schema(
@@ -14,6 +15,7 @@
         "legalType": "SP"
         }"""
 )
+@With
 public record ClientLookUpDto(
     @Schema(description = "The code for that specific object", example = "00000002")
     String code,

From 665d33d23724e346d872a7cd299efea1016985b4 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 08:31:38 -0700
Subject: [PATCH 006/313] fix: fixing step 1 styles

---
 frontend/src/assets/styles/global.scss           | 16 ++++++++++++++++
 frontend/src/helpers/DataConversors.ts           |  6 ++++++
 frontend/src/pages/ApplyClientNumberPage.vue     |  6 +++---
 .../applyform/BusinessInformationWizardStep.vue  | 15 +++++----------
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 03f514d362..e87f43fe97 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -6,6 +6,8 @@
 
 :root {
   --others-transparent-transparent: rgba(255, 255, 255, 0);
+  --cds-interactive-01:#0073E6;
+  --light-theme-button-button-primary: #0073E6
 }
 
 * {
@@ -162,6 +164,9 @@ body {
   text-decoration: none;
   color: var(--light-theme-text-text-primary, #131315);
 }
+.bx--progress-step-text p a:hover {
+  color: var(--light-theme-link-link-primary, #005CB8);
+}
 .bx--progress-step-text p span {
   color: var(--light-theme-text-text-primary, #131315);
 }
@@ -348,6 +353,17 @@ body {
   font-weight: 400;
   line-height: 1.5rem; /* 150% */
 }
+.body-compact-01 {
+  color: var(--light-theme-text-text-primary, #131315);
+
+  /* Body styles/body-compact-01 */
+  font-family: BC Sans;
+  font-size: 0.875rem;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 1.25rem; /* 142.857% */
+  letter-spacing: 0.01rem;
+}
 
 .divider {
   align-self: stretch;
diff --git a/frontend/src/helpers/DataConversors.ts b/frontend/src/helpers/DataConversors.ts
index b635f38abb..b5d980c1e0 100644
--- a/frontend/src/helpers/DataConversors.ts
+++ b/frontend/src/helpers/DataConversors.ts
@@ -27,3 +27,9 @@ export const retrieveClientType = (legalType: string): string => {
       throw new Error('Unknown Legal Type.')
   }
 }
+
+export const toMixedCase = (inputString: string) =>
+  inputString
+    .split(' ')
+    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(' ')
diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index f3b590dda2..41da4a5c46 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -202,7 +202,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
   <div class="form-header">
     <div class="form-header-title">
       <span class="heading-05">New client application</span>
-      <p class="body-01">All fields are mandatory unless noted</p>
+      <p class="body-01">All fields are mandatory</p>
     </div>
       <wizard-progress-indicator-component
       :model-value="progressData"
@@ -215,7 +215,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
     <div v-if="currentTab == 0" class="form-steps-01">
       <div class="form-steps-01-title">
         <span class="heading-04">Before you begin</span>
-        <ol type="1" class="bulleted-list body-02">
+        <ol type="1" class="bulleted-list body-compact-01">
           <li>
             A registered business must be in good standing with BC
             Registries
@@ -247,7 +247,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
         
         <div class="form-steps-section-01">
           <label class="heading-03">Mailing address</label>
-            <p class="body-01">
+            <p class="body-01 heading-compact-01-dark">
               This is the primary address you will receive mail.
               <br /><br />
               If you’d like another address, for example a seed orchard or if
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index 00d30a9330..9d90ba3b38 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -11,7 +11,7 @@ import type {
 import RadioInputComponent from '@/components/forms/RadioInputComponent.vue'
 import { isNotEmpty } from '@/helpers/validators/GlobalValidators'
 import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
-import { retrieveClientType } from '@/helpers/DataConversors'
+import { retrieveClientType, toMixedCase } from '@/helpers/DataConversors'
 import ForestClientUserSession from '@/helpers/ForestClientUserSession'
 
 //Defining the props and emiter to reveice the data and emit an update
@@ -229,15 +229,11 @@ watch([selectedOption], () => {
     <bx-inline-loading status="active" v-if="showDetailsLoading">Loading client details...</bx-inline-loading>
     <display-block-component
       kind="info"
-      title="BC registered business name"
-      v-show="showAutoCompleteInfo && selectedOption === ClientTypeEnum.R"
+      title="If the name of your registered business does not appear in the list, follow these steps:"
+      v-if="showAutoCompleteInfo && selectedOption === ClientTypeEnum.R"
       id="business"
     >
       <div>
-        <p>
-          If the name of your registered business does not appear in the list,
-          follow these steps:
-        </p>
         <ol type="1" class="bulleted-list">
           <li>
             Log into Manage Account in
@@ -259,7 +255,7 @@ watch([selectedOption], () => {
     </display-block-component>
 
     <display-block-component
-      v-show="showGoodStandingError"
+      v-if="showGoodStandingError"
       kind="error"
       title="Not in good standing with BC Registries"
     >
@@ -278,7 +274,7 @@ watch([selectedOption], () => {
     </display-block-component>
 
     <display-block-component
-      v-show="showDuplicatedError"
+      v-if="showDuplicatedError"
       kind="error"
       title="Client already exists"
     >
@@ -299,5 +295,4 @@ watch([selectedOption], () => {
     :validations="[]"
     :enabled="false"
   />
-  <br />
 </template>
\ No newline at end of file

From 37e47bc8ef483afff4308f8a29648e3fc3377e86 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 23 Aug 2023 09:11:16 -0700
Subject: [PATCH 007/313] Small fixed

---
 frontend/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 52b1050474..1ef735737c 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="headers">
+  <div class="headers" v-if="$session?.isLoggedIn()">
     <main-header-component v-if="!$route.meta.hideHeader"></main-header-component>
   </div>
   <div :class="{[`${$route.meta.format}`]:true}">

From b904f1a3f9d57a23b1e60467658c3e5cf507ad95 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 09:57:51 -0700
Subject: [PATCH 008/313] fix: fixing step 2 style

---
 frontend/src/assets/styles/global.scss        |  9 +-
 .../grouping/AddressGroupComponent.vue        | 16 ++--
 frontend/src/dto/ApplyClientNumberDto.ts      |  6 +-
 frontend/src/helpers/DataConversors.ts        |  7 ++
 .../helpers/validators/GlobalValidators.ts    |  2 +-
 frontend/src/pages/ApplyClientNumberPage.vue  |  7 +-
 .../src/pages/applyform/AddressWizardStep.vue | 96 ++++++++++---------
 .../BusinessInformationWizardStep.vue         |  4 +-
 .../stub/__files/response-details-JJ.json     | 22 +----
 .../validators/GlobalValidators.spec.ts       |  2 +-
 10 files changed, 81 insertions(+), 90 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index e87f43fe97..b14b9c473e 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -7,7 +7,10 @@
 :root {
   --others-transparent-transparent: rgba(255, 255, 255, 0);
   --cds-interactive-01:#0073E6;
-  --light-theme-button-button-primary: #0073E6
+  --light-theme-button-button-primary: #0073E6;
+  --cds-interactive-03: #005CB8;
+  --light-theme-button-button-tertiary: #005CB8;
+  --cds-focus: #0073E6;
 }
 
 * {
@@ -290,10 +293,10 @@ body {
   letter-spacing: 0.01rem;
 }
 .heading-compact-01-dark {
-  color: var(--light-theme-text-text-primary, #131315);
+  color: var(--light-theme-text-text-primary, #131315) !important;
 }
 .heading-02 {
-  color: var(--light-theme-text-text-primary, #131315);
+  color: var(--light-theme-text-text-primary, #131315) !important;
 
   /* Fixed heading styles/heading-02 */
   font-family: BC Sans;
diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index ac83119ece..86f36332b3 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -139,7 +139,7 @@ const postalCodeMask = computed(() => {
     case 'CA':
       return 'A#A#A#'
     case 'US':
-      return '#####'
+      return '#####' // TODO: Should fix mask to allow 00000 or 00000-0000
     default:
       return '##########'
   }
@@ -148,11 +148,11 @@ const postalCodeMask = computed(() => {
 const postalCodePlaceholder = computed(() => {
   switch (selectedValue.country.value) {
     case 'CA':
-      return 'A1A1A1'
+      return 'Use A1A1A1 format'
     case 'US':
-      return '99999'
+      return 'Use 00000 or 00000-0000 format'
     default:
-      return '12345'
+      return 'Use 00000 format'
   }
 })
 
@@ -260,7 +260,7 @@ onMounted(() =>{
     <AutoCompleteInputComponent
       :id="'addr_' + id"
             label="Street address or PO box"
-      placeholder="Start typing to search for your address or PO box"
+      placeholder="Start typing to search for your street address or PO box"
       tip=""
       v-model="selectedValue.streetAddress"
       :contents="content"
@@ -284,7 +284,7 @@ onMounted(() =>{
   <text-input-component
     :id="'city_' + id"
     label="City"
-    placeholder="City"
+    placeholder=""
     v-model="selectedValue.city"
     tip=""
     :enabled="true"
@@ -324,9 +324,9 @@ onMounted(() =>{
   <text-input-component
     :id="'postalCode_' + id"
     :label="postalCodeNaming"
-    :placeholder="postalCodePlaceholder"
+    placeholder=""
+    :tip="postalCodePlaceholder"
     :enabled="true"
-    tip=""
     :error-message="addressError"
     v-model="modelValue.postalCode"
     :mask="postalCodeMask"
diff --git a/frontend/src/dto/ApplyClientNumberDto.ts b/frontend/src/dto/ApplyClientNumberDto.ts
index 628d6e63e2..80269349dd 100644
--- a/frontend/src/dto/ApplyClientNumberDto.ts
+++ b/frontend/src/dto/ApplyClientNumberDto.ts
@@ -53,7 +53,7 @@ export const formDataDto: FormDataDto = {
   location: {
     addresses: [
       {
-        locationName: 'Mailing Address',
+        locationName: 'Mailing address',
         streetAddress: '',
         country: { value: 'CA', text: 'Canada' },
         province: { value: 'BC', text: 'British Columbia' },
@@ -65,7 +65,7 @@ export const formDataDto: FormDataDto = {
   }
 }
 
-export const emptyAddress: Address = () =>
+export const emptyAddress = (): Address =>
   JSON.parse(
     JSON.stringify({
       locationName: '',
@@ -86,5 +86,5 @@ export const emptyContact: Contact = {
   email: ''
 }
 
-export const newFormDataDto: FormDataDto = () =>
+export const newFormDataDto = (): FormDataDto =>
   JSON.parse(JSON.stringify(formDataDto))
diff --git a/frontend/src/helpers/DataConversors.ts b/frontend/src/helpers/DataConversors.ts
index b5d980c1e0..3abd4a2a76 100644
--- a/frontend/src/helpers/DataConversors.ts
+++ b/frontend/src/helpers/DataConversors.ts
@@ -1,3 +1,5 @@
+import { type Address, emptyAddress } from '@/dto/ApplyClientNumberDto'
+
 export const retrieveClientType = (legalType: string): string => {
   switch (legalType) {
     case 'A':
@@ -33,3 +35,8 @@ export const toMixedCase = (inputString: string) =>
     .split(' ')
     .map(word => word.charAt(0).toUpperCase() + word.slice(1))
     .join(' ')
+
+export const exportAddress = (addresses: Address[]) : Address[] => {
+  if (addresses && addresses.length > 0) { return addresses }
+  return [{ ...emptyAddress(), locationName: 'Mailing Aaddress' }]
+}
diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 202718d828..8f7a8dd37b 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -17,7 +17,7 @@ const usZipCodeRegex: RegExp = /^\d{5}(?:[-\s]\d{4})?$/
  **/
 export const isNotEmpty = (value: string) => {
   if (value && value.trim().length > 0) return ''
-  return 'This field is required and cannot be empty'
+  return 'This field is required'
 }
 
 /**
diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index 41da4a5c46..444af778fe 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -246,13 +246,8 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
         <span class="heading-04">{{ progressData[1].title}}</span>
         
         <div class="form-steps-section-01">
-          <label class="heading-03">Mailing address</label>
             <p class="body-01 heading-compact-01-dark">
-              This is the primary address you will receive mail.
-              <br /><br />
-              If you’d like another address, for example a seed orchard or if
-              your street address is different from your mailing address, select
-              the ”Add another address” button below.
+              This is the primary address where you will receive mail.
             </p>
         </div>
       
diff --git a/frontend/src/pages/applyform/AddressWizardStep.vue b/frontend/src/pages/applyform/AddressWizardStep.vue
index c9a897cc44..cf3139cc1a 100644
--- a/frontend/src/pages/applyform/AddressWizardStep.vue
+++ b/frontend/src/pages/applyform/AddressWizardStep.vue
@@ -1,50 +1,3 @@
-<template>
-  <address-group-component
-    :id="0"
-    v-model="formData.location.addresses[0]"
-    :countryList="countryList"
-    :validations="[uniqueValues.add]"
-    :revalidate="revalidate"
-    @update:model-value="updateAddress($event, 0)"
-    @valid="updateValidState(0, $event)"
-  />
-
-<hr v-if="otherAddresses.length > 0"/>
-
-<div class="frame-01">
-  <div v-if="otherAddresses.length > 0" class="grouping-01">
-    <span class="heading-03">Additional address</span>
-    <span class="body-01">Provide a name to identify your additional address</span>
-  </div>
-
-  <div v-for="(address, index) in otherAddresses">
-    <hr v-if="index > 0"/>
-    <address-group-component
-      :key="index + 1"
-      :id="index + 1"
-      v-bind:model-value="address"
-      :countryList="countryList"
-      :validations="[uniqueValues.add]"
-      :revalidate="revalidate"
-      @update:model-value="updateAddress($event, index + 1)"
-      @valid="updateValidState(index + 1, $event)"
-      @remove="handleRemove(index + 1)"
-    />
-  </div>
-
-</div>
-<bx-btn
-    kind="tertiary"
-    iconLayout=""
-    class="bx--btn"
-    @click.prevent="addAddress"
-    size="field"
-  >
-    <span>Add another address</span>
-    <Add16 slot="icon" />
-  </bx-btn>
-</template>
-
 <script setup lang="ts">
 import { watch, ref, computed, reactive, onMounted} from 'vue'
 import { useEventBus } from '@vueuse/core'
@@ -152,3 +105,52 @@ const handleRemove = (index: number) => {
 
 onMounted(() => setFocusedComponent('addr_0'))
 </script>
+
+<template>
+  <address-group-component
+    :id="0"
+    v-model="formData.location.addresses[0]"
+    :countryList="countryList"
+    :validations="[uniqueValues.add]"
+    :revalidate="revalidate"
+    @update:model-value="updateAddress($event, 0)"
+    @valid="updateValidState(0, $event)"
+  />
+
+<hr v-if="otherAddresses.length > 0"/>
+
+<div class="frame-01">
+  <div v-if="otherAddresses.length > 0" class="grouping-01">
+    <span class="heading-03">Additional address</span>
+  </div>
+
+  <div v-for="(address, index) in otherAddresses">
+    <hr v-if="index > 0"/>
+    <address-group-component
+      :key="index + 1"
+      :id="index + 1"
+      v-bind:model-value="address"
+      :countryList="countryList"
+      :validations="[uniqueValues.add]"
+      :revalidate="revalidate"
+      @update:model-value="updateAddress($event, index + 1)"
+      @valid="updateValidState(index + 1, $event)"
+      @remove="handleRemove(index + 1)"
+    />
+  </div>
+
+</div>
+<p class="body-01 heading-compact-01-dark">
+If you’d like to include another address, for example a seed orchard or if your street address is different from your mailing address, select the “Add another address” button below.
+</p>
+<bx-btn
+    kind="tertiary"
+    iconLayout=""
+    class="bx--btn"
+    @click.prevent="addAddress"
+    size="field"
+  >
+    <span>Add another address</span>
+    <Add16 slot="icon" />
+  </bx-btn>
+</template>
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index 9d90ba3b38..028f8def5c 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -11,7 +11,7 @@ import type {
 import RadioInputComponent from '@/components/forms/RadioInputComponent.vue'
 import { isNotEmpty } from '@/helpers/validators/GlobalValidators'
 import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
-import { retrieveClientType, toMixedCase } from '@/helpers/DataConversors'
+import { retrieveClientType, exportAddress } from '@/helpers/DataConversors'
 import ForestClientUserSession from '@/helpers/ForestClientUserSession'
 
 //Defining the props and emiter to reveice the data and emit an update
@@ -154,7 +154,7 @@ watch([detailsData], () => {
       formData.value.location.contacts[0],
       ...forestClientDetails.contacts
     ]
-    formData.value.location.addresses = forestClientDetails.addresses
+    formData.value.location.addresses = exportAddress(forestClientDetails.addresses)
     formData.value.businessInformation.goodStandingInd =
       forestClientDetails.goodStanding ? 'Y' : 'N'
     toggleErrorMessages(!forestClientDetails.goodStanding, null)
diff --git a/frontend/stub/__files/response-details-JJ.json b/frontend/stub/__files/response-details-JJ.json
index 1193319d83..7c7d70511e 100644
--- a/frontend/stub/__files/response-details-JJ.json
+++ b/frontend/stub/__files/response-details-JJ.json
@@ -2,23 +2,7 @@
   "name": "Dum-Gondor Cultural Association of Middle Earth",
   "id": "{{request.path.[2]}}",
   "goodStanding": true,
-  "addresses": [
-    {
-      "streetAddress": "123 Fake DR",
-      "country": {
-        "value": "CA",
-        "text": "Canada"
-      },
-      "province": {
-        "value": "BC",
-        "text": "British Columbia"
-      },
-      "city": "Fakest City",
-      "postalCode": "A0A0A0",
-      "index": 0,
-      "locationName": "Mailing Address"
-    }
-  ],
+  "addresses": null,
   "contacts": [
     {
       "contactType": {
@@ -32,8 +16,8 @@
       "index": 0,
       "locationNames": [
         {
-          "value": "0",
-          "text": "Mailing Address"
+          "value": "00",
+          "text": "Mailing address"
         }
       ]
     }
diff --git a/frontend/tests/unittests/helpers/validators/GlobalValidators.spec.ts b/frontend/tests/unittests/helpers/validators/GlobalValidators.spec.ts
index 338d5d9a64..f828a009a0 100644
--- a/frontend/tests/unittests/helpers/validators/GlobalValidators.spec.ts
+++ b/frontend/tests/unittests/helpers/validators/GlobalValidators.spec.ts
@@ -26,7 +26,7 @@ describe('GlobalValidators', () => {
     expect(isNotEmpty(' a ')).toBe('')
   })
   it('should return an error message when isNotEmpty is called on an empty string', () => {
-    expect(isNotEmpty('')).toBe('This field is required and cannot be empty')
+    expect(isNotEmpty('')).toBe('This field is required')
   })
 
   it('should return empty when isEmail is called with a valid email', () => {

From 02b9a35805b1219bf3d17d91ab3d9b13d34c76f2 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 10:54:30 -0700
Subject: [PATCH 009/313] fix: fixing modal

---
 frontend/src/App.vue                   | 106 +++++++++++++------------
 frontend/src/assets/styles/global.scss |  22 +++++
 2 files changed, 77 insertions(+), 51 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 1ef735737c..74495cf0b8 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,3 +1,51 @@
+<script setup lang="ts">
+import { ref, computed, useSlots, reactive, provide } from 'vue'
+import { useEventBus } from '@vueuse/core'
+import type { ModalNotification } from '@/dto/CommonTypesDto'
+import Delete16 from '@carbon/icons-vue/es/trash-can/16'
+
+const modalBus = useEventBus<ModalNotification>('modal-notification')
+const toastBus = useEventBus<ModalNotification>('toast-notification')
+
+//Modal opening and closing
+const modalContent = ref<ModalNotification>({
+  active: false,
+  message: '',
+  kind: '',
+  handler: () => {}
+})
+
+const toastContent = ref<ModalNotification>({
+  active: false,
+  message: '',
+  kind: '',
+  handler: () => {}
+})
+
+const openModal = (event: ModalNotification) => (modalContent.value = event)
+
+const closeModal = () =>
+  (modalContent.value = { ...modalContent.value, active: false })
+
+const openToast = (event: ModalNotification) => {
+  toastContent.value = event
+  setTimeout(() => (toastContent.value.active = false), 8000)
+}
+
+const deleteContentModal = () => {
+  openToast({
+    message: `“${modalContent.value.message}” additional ${modalContent.value.kind} was deleted successfully`,
+    kind: 'Success',
+    active: true,
+    handler: () => {}
+  })
+  modalContent.value.handler()
+  closeModal()
+}
+
+modalBus.on(openModal)
+</script>
+
 <template>
   <div class="headers" v-if="$session?.isLoggedIn()">
     <main-header-component v-if="!$route.meta.hideHeader"></main-header-component>
@@ -18,26 +66,28 @@
   >
     <bx-modal-header>
       <bx-modal-close-button></bx-modal-close-button>
-      <bx-modal-label>Delete additional {{ modalContent.kind }}</bx-modal-label>
       <bx-modal-heading
         >Are you sure you want to delete "{{ modalContent.message }}" additional
-        {{ modalContent.kind }}</bx-modal-heading
+        {{ modalContent.kind }}?</bx-modal-heading
       >
     </bx-modal-header>
     <bx-modal-body><p></p></bx-modal-body>
 
     <bx-modal-footer>
-      <bx-btn kind="secondary" 
+      <div class="modal-footer">
+        <bx-btn kind="secondary" 
               data-modal-close
               class="bx--modal-btn bx--modal-btn1">
         Cancel
       </bx-btn>
-      <span class="bx--modal-btn-divider"></span>
+      
       <bx-btn kind="danger" 
               @click.prevent="deleteContentModal"
               class="bx--modal-btn bx--modal-btn2">
-        Delete additional {{ modalContent.kind }}
+        Delete
+        <Delete16 slot="icon" />
       </bx-btn>
+      </div>
     </bx-modal-footer>
   </bx-modal>
 </div>
@@ -53,49 +103,3 @@
   </bx-toast-notification>
 </template>
 
-<script setup lang="ts">
-import { ref, computed, useSlots, reactive, provide } from 'vue'
-import { useEventBus } from '@vueuse/core'
-import type { ModalNotification } from '@/dto/CommonTypesDto'
-
-const modalBus = useEventBus<ModalNotification>('modal-notification')
-const toastBus = useEventBus<ModalNotification>('toast-notification')
-
-//Modal opening and closing
-const modalContent = ref<ModalNotification>({
-  active: false,
-  message: '',
-  kind: '',
-  handler: () => {}
-})
-
-const toastContent = ref<ModalNotification>({
-  active: false,
-  message: '',
-  kind: '',
-  handler: () => {}
-})
-
-const openModal = (event: ModalNotification) => (modalContent.value = event)
-
-const closeModal = () =>
-  (modalContent.value = { ...modalContent.value, active: false })
-
-const openToast = (event: ModalNotification) => {
-  toastContent.value = event
-  setTimeout(() => (toastContent.value.active = false), 8000)
-}
-
-const deleteContentModal = () => {
-  openToast({
-    message: `“${modalContent.value.message}” additional ${modalContent.value.kind} was deleted successfully`,
-    kind: 'Success',
-    active: true,
-    handler: () => {}
-  })
-  modalContent.value.handler()
-  closeModal()
-}
-
-modalBus.on(openModal)
-</script>
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index b14b9c473e..314c2540e3 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -645,6 +645,28 @@ body {
   align-self: stretch;
 }
 
+bx-modal{
+display: flex;
+}
+
+bx-modal-footer {
+  align-self: stretch;
+}
+
+.modal-footer {
+  justify-content: center;
+  align-content: stretch;
+  padding: 1rem;
+  display: flex;
+  align-self: stretch;
+  flex-wrap: wrap;
+  gap: 0.5rem;
+  flex-grow: 1;
+}
+.bx--modal-btn {
+  flex-grow: 1;
+}
+
 /* Small (up to 320px) */
 @media screen and (max-width: 320px) {
 

From 97a44b128f3e03965a40edcb4d7e5600dc27e4c5 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 10:59:41 -0700
Subject: [PATCH 010/313] fix: fixing toast notification

---
 frontend/src/App.vue                   | 4 ++--
 frontend/src/assets/styles/global.scss | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 74495cf0b8..481696d0ed 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -97,8 +97,8 @@ modalBus.on(openModal)
       class="wizard-head-toast"
       timeout="8000"
       kind="success"
-      :title="toastContent.kind"
-      :subtitle="toastContent.message"
+      :title="toastContent.message"
+      subtitle=""
     >
   </bx-toast-notification>
 </template>
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 314c2540e3..d003174282 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -63,11 +63,12 @@ body {
 }
 
 .wizard-head-toast {
-  position: absolute;
+  position: fixed;
   right: 1.5625rem;
   top: 5rem;
   border-radius: 0.25rem;
   background: var(--light-theme-background-background-inverse, #2D2D2F);
+  z-index: 999; /* Higher value to ensure it's on top */
 
   /* Light Theme/Shadows/Menu */
   box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.30);

From 1bee1168ffcae61a5b4df2320d3c05c52dec2d6b Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 11:16:29 -0700
Subject: [PATCH 011/313] chore: fixing stub content

---
 frontend/cypress/fixtures/address.json                      | 2 +-
 frontend/cypress/fixtures/addresses.json                    | 2 +-
 frontend/cypress/fixtures/example.json                      | 4 ++--
 frontend/stub/__files/response-details-FM.json              | 2 +-
 frontend/stub/__files/response-details-UU.json              | 4 ++--
 frontend/stub/__files/response-details-XX.json              | 4 ++--
 frontend/stub/__files/response-details-YY.json              | 4 ++--
 .../components/grouping/AddressGroupComponent.cy.ts         | 2 +-
 .../components/grouping/ContactGroupComponent.cy.ts         | 6 +++---
 .../tests/unittests/services/ForestClientService.spec.ts    | 4 ++--
 10 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/frontend/cypress/fixtures/address.json b/frontend/cypress/fixtures/address.json
index f0f3f38236..52ced9f0e3 100644
--- a/frontend/cypress/fixtures/address.json
+++ b/frontend/cypress/fixtures/address.json
@@ -10,5 +10,5 @@
   },
   "city": "Victoria",
   "postalCode": "V8T5J9",
-  "locationName": "Mailing Address"
+  "locationName": "Mailing address"
 }
\ No newline at end of file
diff --git a/frontend/cypress/fixtures/addresses.json b/frontend/cypress/fixtures/addresses.json
index ffc738f3b5..c3d5e0b127 100644
--- a/frontend/cypress/fixtures/addresses.json
+++ b/frontend/cypress/fixtures/addresses.json
@@ -1,7 +1,7 @@
 [
   {
   "code": "00",
-  "name": "Mailing Address"
+  "name": "Mailing address"
 },
 {
   "code":"01",
diff --git a/frontend/cypress/fixtures/example.json b/frontend/cypress/fixtures/example.json
index 12f560de15..17c896b11a 100644
--- a/frontend/cypress/fixtures/example.json
+++ b/frontend/cypress/fixtures/example.json
@@ -16,7 +16,7 @@
       "city": "Fakest City",
       "postalCode": "A0A0A0",
       "index": 0,
-      "locationName": "Mailing Address"
+      "locationName": "Mailing address"
     }
   ],
   "contacts": [
@@ -33,7 +33,7 @@
       "locationNames": [
         {
           "value": "0",
-          "text": "Mailing Address"
+          "text": "Mailing address"
         }
       ]
     }
diff --git a/frontend/stub/__files/response-details-FM.json b/frontend/stub/__files/response-details-FM.json
index 82cf8f04b6..5a6cc1f380 100644
--- a/frontend/stub/__files/response-details-FM.json
+++ b/frontend/stub/__files/response-details-FM.json
@@ -16,7 +16,7 @@
       "city": "Fakest City",
       "postalCode": "A0A0A0",
       "index": 0,
-      "locationName": "Mailing Address"
+      "locationName": "Mailing address"
     }
   ],
   "contacts": [
diff --git a/frontend/stub/__files/response-details-UU.json b/frontend/stub/__files/response-details-UU.json
index cc43dc2114..96e9558d88 100644
--- a/frontend/stub/__files/response-details-UU.json
+++ b/frontend/stub/__files/response-details-UU.json
@@ -16,7 +16,7 @@
       "city": "Victoria",
       "postalCode": "V8T5J9",
       "index": 0,
-      "locationName": "Mailing Address"
+      "locationName": "Mailing address"
     },
     {
       "streetAddress": "42000 Loggers Ln Suite 101",
@@ -48,7 +48,7 @@
       "locationNames": [
         {
           "value": "0",
-          "text": "Mailing Address"
+          "text": "Mailing address"
         }
       ]
     }
diff --git a/frontend/stub/__files/response-details-XX.json b/frontend/stub/__files/response-details-XX.json
index 35770d792c..18e5cbaccb 100644
--- a/frontend/stub/__files/response-details-XX.json
+++ b/frontend/stub/__files/response-details-XX.json
@@ -16,7 +16,7 @@
       "city": "Fakest City",
       "postalCode": "A0A0A0",
       "index": 0,
-      "locationName": "Mailing Address"
+      "locationName": "Mailing address"
     }
   ],
   "contacts": [
@@ -33,7 +33,7 @@
       "locationNames": [
         {
           "value": "0",
-          "text": "Mailing Address"
+          "text": "Mailing address"
         }
       ]
     }
diff --git a/frontend/stub/__files/response-details-YY.json b/frontend/stub/__files/response-details-YY.json
index 1568e34b3b..ea0b1c0dbb 100644
--- a/frontend/stub/__files/response-details-YY.json
+++ b/frontend/stub/__files/response-details-YY.json
@@ -16,7 +16,7 @@
       "city": "Fakest City",
       "postalCode": "A0A0A0",
       "index": 0,
-      "locationName": "Mailing Address"
+      "locationName": "Mailing address"
     }
   ],
   "contacts": [
@@ -33,7 +33,7 @@
       "locationNames": [
         {
           "value": "0",
-          "text": "Mailing Address"
+          "text": "Mailing address"
         }
       ]
     }
diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index bca8e52d8f..d1e5227f53 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -130,7 +130,7 @@ describe('<AddressGroupComponent />', () => {
 
     cy.get('#name_1')
       .should('be.visible')
-      .and('have.value', 'Mailing Address')
+      .and('have.value', 'Mailing address')
       .and('have.focus')
   })
 
diff --git a/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts b/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts
index 40e5c87f58..dbfa642aa3 100644
--- a/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts
@@ -166,7 +166,7 @@ describe('<ContactGroupComponent />', () => {
 
     cy.get('bx-tag#tag_address_0_0.bx-tag')
       .should('be.visible')
-      .and('have.text', 'Mailing Address ')
+      .and('have.text', 'Mailing address ')
   })
 
   it('should render the component and select both addresses and show it as tag', () => {
@@ -206,7 +206,7 @@ describe('<ContactGroupComponent />', () => {
 
     cy.get('bx-tag#tag_address_0_0.bx-tag')
       .should('be.visible')
-      .and('have.text', 'Mailing Address ')
+      .and('have.text', 'Mailing address ')
 
     cy.get('bx-tag#tag_address_0_1.bx-tag')
       .should('be.visible')
@@ -245,7 +245,7 @@ describe('<ContactGroupComponent />', () => {
 
     cy.get('bx-tag#tag_address_0_0.bx-tag')
       .should('be.visible')
-      .and('have.text', 'Mailing Address ')
+      .and('have.text', 'Mailing address ')
       .find('svg')
       .click()
 
diff --git a/frontend/tests/unittests/services/ForestClientService.spec.ts b/frontend/tests/unittests/services/ForestClientService.spec.ts
index 7af7c74b2d..07562cbe9e 100644
--- a/frontend/tests/unittests/services/ForestClientService.spec.ts
+++ b/frontend/tests/unittests/services/ForestClientService.spec.ts
@@ -20,7 +20,7 @@ describe('ForestClientService.ts', () => {
     },
     city: 'Victoria',
     postalCode: 'V8T5J9',
-    locationName: 'Mailing Address'
+    locationName: 'Mailing address'
   }
   const sampleContact = {
     contactType: {
@@ -34,7 +34,7 @@ describe('ForestClientService.ts', () => {
     locationNames: [
       {
         value: '0',
-        text: 'Mailing Address'
+        text: 'Mailing address'
       }
     ]
   }

From 5dd12615236140c3db3cdcef661b043d45ae3572 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 11:17:18 -0700
Subject: [PATCH 012/313] fix: fixing step 3 style

---
 frontend/src/pages/ApplyClientNumberPage.vue  |   2 +-
 .../src/pages/applyform/ContactWizardStep.vue | 111 +++++++++---------
 2 files changed, 57 insertions(+), 56 deletions(-)

diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index 444af778fe..88ac336cc6 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -267,7 +267,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
           <span class="heading-03"
               >Add authorized people to the account</span
             >
-            <p class="body-01">
+            <p class="body-01 heading-compact-01-dark">
               Your first name, last name and email address are from your BCeID.
               If they're incorrect,
               <a
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index fe81e07502..0b761864cf 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -1,58 +1,3 @@
-<template>
-  <contact-group-component
-    :id="0"
-    v-model="formData.location.contacts[0]"
-    :roleList="roleList"
-    :addressList="addresses"
-    :validations="[uniqueValues.add]"
-    :revalidate="revalidate"
-    :enabled="false"
-    @update:model-value="updateContact($event, 0)"
-    @valid="updateValidState(0, $event)"
-  />
-
-  <hr v-if="otherContacts.length > 0"/>
-
-  <div class="frame-01" v-if="otherContacts.length > 0">
-    <div class="grouping-01">
-      <span class="heading-03">Additional address</span>
-      <span class="body-01">Provide a name to identify your additional address</span>
-    </div>
-    <div  v-for="(contact, index) in otherContacts">
-      <hr v-if="index > 0"/>
-    <contact-group-component
-    
-      :key="index + 1"
-      :id="index + 1"
-      v-bind:modelValue="contact"
-      :roleList="roleList"
-      :addressList="addresses"
-      :validations="[uniqueValues.add]"
-      :enabled="true"
-      :revalidate="revalidate"
-      @update:model-value="updateContact($event, index + 1)"
-      @valid="updateValidState(index + 1, $event)"
-      @remove="handleRemove(index + 1)"
-    />
-    </div>
-  </div>
-
-  <span class="body-01">
-              To add another contact to the account, select "Add another
-              contact" button below.</span>
-
-  <bx-btn
-    kind="tertiary"
-    iconLayout=""
-    class="bx--btn"
-    @click.prevent="addContact"
-    size="field"
-  >
-    <span>Add another contact</span>
-    <Add16 slot="icon" />
-  </bx-btn>
-</template>
-
 <script setup lang="ts">
 import { watch, ref, computed, reactive, onMounted } from 'vue'
 import { useEventBus } from '@vueuse/core'
@@ -164,3 +109,59 @@ const handleRemove = (index: number) => {
 
 onMounted(() => setFocusedComponent('address_0'))
 </script>
+
+<template>
+  <contact-group-component
+    :id="0"
+    v-model="formData.location.contacts[0]"
+    :roleList="roleList"
+    :addressList="addresses"
+    :validations="[uniqueValues.add]"
+    :revalidate="revalidate"
+    :enabled="false"
+    @update:model-value="updateContact($event, 0)"
+    @valid="updateValidState(0, $event)"
+  />
+
+  <hr v-if="otherContacts.length > 0"/>
+
+  <div class="frame-01" v-if="otherContacts.length > 0">
+    <div class="grouping-01">
+      <span class="heading-03">Additional contact</span>
+    </div>
+    <div  v-for="(contact, index) in otherContacts">
+      <hr v-if="index > 0"/>
+    <contact-group-component
+    
+      :key="index + 1"
+      :id="index + 1"
+      v-bind:modelValue="contact"
+      :roleList="roleList"
+      :addressList="addresses"
+      :validations="[uniqueValues.add]"
+      :enabled="true"
+      :revalidate="revalidate"
+      @update:model-value="updateContact($event, index + 1)"
+      @valid="updateValidState(index + 1, $event)"
+      @remove="handleRemove(index + 1)"
+    />
+    </div>
+  </div>
+
+  <span class="body-01">
+              To add another contact to the account, select "Add another
+              contact" button below.</span>
+
+  <bx-btn
+    kind="tertiary"
+    iconLayout=""
+    class="bx--btn"
+    @click.prevent="addContact"
+    size="field"
+  >
+    <span>Add another contact</span>
+    <Add16 slot="icon" />
+  </bx-btn>
+</template>
+
+

From 0a767baec2177559aa04edc2cde92c116d599606 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 11:17:34 -0700
Subject: [PATCH 013/313] fix: fixing step 3 style

---
 frontend/src/components/grouping/ContactGroupComponent.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index 924d00ecd9..2ce3fe08d7 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -97,6 +97,7 @@ onMounted(() =>{
 </script>
 
 <template>
+  <div class="frame-01">
   <multiselect-input-component
     :id="'address_' + id"
     label="Address name"
@@ -207,4 +208,5 @@ onMounted(() =>{
     <span>Delete contact</span>
     <Delete16 slot="icon" />
   </bx-btn>
+</div>
 </template>

From 0a7eab97f19394a4298502c22e43d4365aed0e2f Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 11:17:59 -0700
Subject: [PATCH 014/313] fix: fixing confirmation style

---
 frontend/src/assets/styles/global.scss   | 39 +++++++++++++++++++++++-
 frontend/src/pages/FormSubmittedPage.vue |  4 +--
 frontend/src/routes.ts                   |  2 +-
 3 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index d003174282..486fe1a198 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -221,7 +221,12 @@ body {
 .landing-subtitle {
   margin: 1.5rem 0rem 0rem 0rem;
 }
-
+.full-centered {
+  display: flex;
+  padding: 8.125rem 13.375rem 15rem 2.5rem;
+  align-items: center;
+  background: var(--light-theme-layer-layer-02, #FFF);
+}
 .full {
   margin: 0rem;
   padding-bottom: 0px;
@@ -336,6 +341,29 @@ body {
   font-weight: 400;
   line-height: 2.5rem; /* 125% */
 }
+.fluid-heading-05 {
+  align-self: stretch;
+  color: var(--light-theme-text-text-primary, #131315);
+
+  /* Fluid styles/MAX/fluid-heading-05 */
+  font-family: BC Sans;
+  font-size: 3.75rem;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 4.375rem; /* 116.667% */
+}
+.fluid-paragraph-01 {
+  align-self: stretch;
+  color: var(--light-theme-text-text-secondary, #606062);
+
+  /* Fluid styles/MAX/fluid-paragraph-01 */
+  font-family: BC Sans;
+  font-size: 2rem;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 2.5rem; /* 125% */
+
+}
 .body-01 {
   color: var(--light-theme-text-text-secondary, #606062);
 
@@ -388,6 +416,9 @@ body {
   flex-direction: column;
   gap: 1.5rem;
 }
+.form-header-stretched {
+  align-self: stretch
+}
 
 .form-header-title {
   align-self: stretch;
@@ -510,6 +541,12 @@ body {
   gap: 0.75rem;
 }
 
+.frame-03 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
 .grouping-01 {
   align-self: stretch;
   display: flex;
diff --git a/frontend/src/pages/FormSubmittedPage.vue b/frontend/src/pages/FormSubmittedPage.vue
index eb8c6665ad..ecbb82f964 100644
--- a/frontend/src/pages/FormSubmittedPage.vue
+++ b/frontend/src/pages/FormSubmittedPage.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="bx--content submission-head">
+  <div class="frame-03">
     <SVG alt="Badge pictogram" class="submission-badge"></SVG>
     <div ref="i"></div>
-    <div class="submission-text">
+    <div class="form-header form-header-stretched">
       <h1>Application submitted!</h1>
       <p>Your application for a client number has been submitted.</p>
       <p>
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index edb607a218..517ac0c8f2 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -53,7 +53,7 @@ const routes: RouteRecordRaw[] = [
     component: FormSubmittedPage,
     props: true,
     meta: {
-      format: 'full',
+      format: 'full-centered',
       hideHeader: false,
       requireAuth: true,
       showLoggedIn: true,

From 150f5eeb6679809c9c8bfe6b01b1fc18d34eba98 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 23 Aug 2023 11:52:22 -0700
Subject: [PATCH 015/313] fix: fixing user flow sample

---
 cypress/cypress/e2e/sample.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cypress/cypress/e2e/sample.ts b/cypress/cypress/e2e/sample.ts
index 355c36f48f..b86902accb 100644
--- a/cypress/cypress/e2e/sample.ts
+++ b/cypress/cypress/e2e/sample.ts
@@ -5,5 +5,5 @@ Given("I am on the form page", () => {
 });
 
 Then("I can see the title", () => {
-  cy.contains('Welcome to CLIENT')
+  cy.contains('Client Management System')
 });

From 81e4bdac58b614a838f2f485b8770453f32b2108 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 23 Aug 2023 12:02:06 -0700
Subject: [PATCH 016/313] Made some content changes

---
 frontend/src/App.vue                               | 2 +-
 frontend/src/dto/CommonTypesDto.ts                 | 1 +
 frontend/src/pages/applyform/AddressWizardStep.vue | 3 ++-
 frontend/src/pages/applyform/ContactWizardStep.vue | 9 ++++++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 481696d0ed..a94a3aef12 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -97,7 +97,7 @@ modalBus.on(openModal)
       class="wizard-head-toast"
       timeout="8000"
       kind="success"
-      :title="toastContent.message"
+      :title="toastContent.toastTitle"
       subtitle=""
     >
   </bx-toast-notification>
diff --git a/frontend/src/dto/CommonTypesDto.ts b/frontend/src/dto/CommonTypesDto.ts
index c677fc0f44..6ce5a43ba3 100644
--- a/frontend/src/dto/CommonTypesDto.ts
+++ b/frontend/src/dto/CommonTypesDto.ts
@@ -53,6 +53,7 @@ export interface Submitter {
 export interface ModalNotification {
   message: string
   kind: string
+  toastTitle: string
   active: boolean
   handler: () => void
 }
diff --git a/frontend/src/pages/applyform/AddressWizardStep.vue b/frontend/src/pages/applyform/AddressWizardStep.vue
index cf3139cc1a..088572fe97 100644
--- a/frontend/src/pages/applyform/AddressWizardStep.vue
+++ b/frontend/src/pages/applyform/AddressWizardStep.vue
@@ -87,7 +87,7 @@ const removeAddress = (index: number) => () => {
   delete validation[index];
   uniqueValues.remove('Address',index+'')
   uniqueValues.remove('Names',index+'')
-  bus.emit({ active: false, message: '', kind: '', handler: () => {} });
+  bus.emit({ active: false, message: '', kind: '', toastTitle: '', handler: () => {} });
   setFocusedComponent(`addr_addr_${index-1}`);
 };
 
@@ -98,6 +98,7 @@ const handleRemove = (index: number) => {
   bus.emit({
     message: selectedAddress,
     kind: 'address',
+    toastTitle: 'The additional address was deleted',
     handler: removeAddress(index),
     active: true
   });
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index 0b761864cf..ec168ade7c 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -73,7 +73,7 @@ const removeContact = (index: number) => () => {
     updateContact(undefined, index)
     delete validation[index]
     uniqueValues.remove('Name',index+'')
-    bus.emit({ active: false, message: '', kind: '', handler: () => {} })
+    bus.emit({ active: false, message: '', kind: '', toastTitle: '', handler: () => {} })
 }
 
 //Validation
@@ -98,10 +98,13 @@ watch([validation], () => emit('valid', checkValid()))
 emit('valid', false)
 
 const handleRemove = (index: number) => {
-  const selectedContact = formData.location.contacts[index]
+  const selectedContact = formData.location.contacts[index].firstName.length !== 0
+    ? formData.location.contacts[index].firstName + formData.location.contacts[index].lastName
+    : 'Contact #' + index;
   bus.emit({
-    message: selectedContact.firstName || 'this',
+    message: selectedContact,
     kind: 'Contact deleted',
+    toastTitle: 'The additional contact was deleted',
     handler: removeContact(index),
     active: true
   })

From 3797f405fb0c178c1ad97ba5fee7bae26d78e05b Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 23 Aug 2023 12:13:22 -0700
Subject: [PATCH 017/313] no message

---
 frontend/src/App.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index a94a3aef12..bbbfb34ff1 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -12,6 +12,7 @@ const modalContent = ref<ModalNotification>({
   active: false,
   message: '',
   kind: '',
+  toastTitle: '',
   handler: () => {}
 })
 
@@ -19,6 +20,7 @@ const toastContent = ref<ModalNotification>({
   active: false,
   message: '',
   kind: '',
+  toastTitle: '',
   handler: () => {}
 })
 
@@ -36,6 +38,7 @@ const deleteContentModal = () => {
   openToast({
     message: `“${modalContent.value.message}” additional ${modalContent.value.kind} was deleted successfully`,
     kind: 'Success',
+    toastTitle: '',
     active: true,
     handler: () => {}
   })

From 118b4e0bb2f468eb9ac87a7a83a84be831143222 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 23 Aug 2023 12:16:45 -0700
Subject: [PATCH 018/313] Made content changes

---
 frontend/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index bbbfb34ff1..e992c0026b 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -38,7 +38,7 @@ const deleteContentModal = () => {
   openToast({
     message: `“${modalContent.value.message}” additional ${modalContent.value.kind} was deleted successfully`,
     kind: 'Success',
-    toastTitle: '',
+    toastTitle: modalContent.value.toastTitle,
     active: true,
     handler: () => {}
   })

From b18bebb81efc57ca4f006ea88bdb763f32a539ee Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 23 Aug 2023 12:19:43 -0700
Subject: [PATCH 019/313] Moved CSS classes to keep it DRY

---
 frontend/src/assets/styles/global.scss | 37 +++++++++++++++++---------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 486fe1a198..e568651db6 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -122,29 +122,20 @@ body {
   display: flex;
   flex-direction: column;
 }
+
 .form-header-progress {
   display: flex;
 }
+
 .bx--progress-indicator {
   flex-direction: row;
 }
+
 .bx--progress-step {
   border-top: solid 0.125rem;
   flex: 1;
 }
 
-@media screen and (max-width: 320px) {
-  .bx--progress-indicator {
-    flex-direction: column;
-  }
-  .bx--progress-step {
-    border-top: none;
-    border-left: solid 0.125rem;
-    flex: none;
-  }
-}
-
-
 .bx--progress-indicator {
   display: flex;
   justify-content: space-between;
@@ -740,14 +731,17 @@ bx-modal-footer {
     flex-direction: column;
     align-items: center;
   }
+
   .headers{
     padding: 0rem 1rem;
     gap: 1rem;
     flex-shrink: 0;
   }
+
   .headers a img {
     width: 2.5rem;
   }
+
   .heading {
     width: 6.5rem;
     padding: 1rem 0.5rem;
@@ -755,29 +749,36 @@ bx-modal-footer {
     align-items: center;
     flex-shrink: 0;
   }
+
   .heading span:last-child {
     display: none;
   }
+
   .heading-space {
     width: 2rem;
     flex-shrink: 0;
   }
+
   .bx--btn-header {
     width: 1.25rem;
     height: 1.25rem;
     border: none !important;
   }
+
   .bx--btn-header::part(button) {
     width: 2.5rem;
     border: none !important;
     margin-right: 20rem !important;
   }
+
   .bx--btn-reset {
     width: 2.5rem;
   }
+
   .form-header {
     align-self: stretch;
   }
+
   .form-header-progress {
     flex-direction: column;
   }
@@ -785,6 +786,7 @@ bx-modal-footer {
   .bx--progress-step{
     width: 18rem;
   }
+
   .bx--progress-step svg {
     margin: 0.6rem;
   }
@@ -793,6 +795,7 @@ bx-modal-footer {
     align-self: stretch;
     width: 18rem;
   }
+
   .form-steps-01{
     align-self: stretch;
     width: 18rem;
@@ -808,6 +811,16 @@ bx-modal-footer {
     justify-content: flex-end;
   }
 
+  .bx--progress-indicator {
+    flex-direction: column;
+  }
+
+  .bx--progress-step {
+    border-top: none;
+    border-left: solid 0.125rem;
+    flex: none;
+  }
+
 }
 
 /* Medium (from 321px to 671px) */

From 54c8230b2d6e814a6a4d571061bb9b83ed2003f8 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 23 Aug 2023 12:22:24 -0700
Subject: [PATCH 020/313] Change request for small screens

---
 frontend/src/assets/styles/global.scss | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index e568651db6..8b2dc27522 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -692,6 +692,7 @@ bx-modal-footer {
   gap: 0.5rem;
   flex-grow: 1;
 }
+
 .bx--modal-btn {
   flex-grow: 1;
 }
@@ -699,6 +700,11 @@ bx-modal-footer {
 /* Small (up to 320px) */
 @media screen and (max-width: 320px) {
 
+  .wizard-head-toast {
+    right: 0.5rem;
+    top: 0.5rem;
+  }
+
   bx-modal::part(dialog) {
     max-height: 21.25rem;
     position: relative;

From 9a87c6994cae57a3e6fd5b9f2f7894cc0d043855 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 24 Aug 2023 10:29:43 -0700
Subject: [PATCH 021/313] Changed hover color for tertiary buttons

---
 frontend/src/assets/styles/global.scss        | 39 ++++++++++++++-----
 .../src/components/MainHeaderComponent.vue    |  4 +-
 .../src/pages/applyform/AddressWizardStep.vue |  2 +-
 .../src/pages/applyform/ContactWizardStep.vue |  2 +-
 .../src/pages/applyform/ReviewWizardStep.vue  |  6 +--
 5 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 8b2dc27522..5962d25318 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -64,7 +64,7 @@ body {
 
 .wizard-head-toast {
   position: fixed;
-  right: 1.5625rem;
+  right: 1.5rem;
   top: 5rem;
   border-radius: 0.25rem;
   background: var(--light-theme-background-background-inverse, #2D2D2F);
@@ -159,9 +159,11 @@ body {
   text-decoration: none;
   color: var(--light-theme-text-text-primary, #131315);
 }
+
 .bx--progress-step-text p a:hover {
   color: var(--light-theme-link-link-primary, #005CB8);
 }
+
 .bx--progress-step-text p span {
   color: var(--light-theme-text-text-primary, #131315);
 }
@@ -212,24 +214,28 @@ body {
 .landing-subtitle {
   margin: 1.5rem 0rem 0rem 0rem;
 }
+
 .full-centered {
   display: flex;
   padding: 8.125rem 13.375rem 15rem 2.5rem;
   align-items: center;
   background: var(--light-theme-layer-layer-02, #FFF);
 }
+
 .full {
   margin: 0rem;
   padding-bottom: 0px;
   display: flex;
   background: var(--light-theme-background-background, #FFF);
 }
+
 .screen {
   margin: 3rem 2.5rem 2.5rem 2.5rem;
   padding-bottom: 0px;
   display: flex;
   background: var(--light-theme-background-background, #FFF);
 }
+
 .headers {
   display: flex;
   height: 3rem;
@@ -241,20 +247,24 @@ body {
   flex: 1 0 0;
   background: var(--light-theme-background-background-brand, #0073E6);
 }
+
 .headers a img {
   width: 7.5rem;
   flex-shrink: 0;
 }
+
 .heading {
   display: flex;
   padding: 0.9375rem 2rem 0.9375rem 0.5rem;
   align-items: flex-start;
   gap: 0.1875rem;
 }
+
 .heading-space {
   flex: 1 0 0;
   align-self: stretch;
 }
+
 .heading-button-transparent {
   display: flex;
   width: 12.375rem;
@@ -266,6 +276,7 @@ body {
   background: var(--others-transparent-transparent, #FFF);
   background-blend-mode: multiply;
 }
+
 .heading-button {
   display: flex;
   width: 9.6875rem;
@@ -278,6 +289,7 @@ body {
   background: var(--others-transparent-transparent, #FFF);
   background-blend-mode: multiply;
 }
+
 .heading-compact-01 {
   color: var(--dark-theme-text-text-primary, #F3F3F5);
 
@@ -289,9 +301,11 @@ body {
   line-height: 1.125rem; /* 128.571% */
   letter-spacing: 0.01rem;
 }
+
 .heading-compact-01-dark {
   color: var(--light-theme-text-text-primary, #131315) !important;
 }
+
 .heading-02 {
   color: var(--light-theme-text-text-primary, #131315) !important;
 
@@ -302,6 +316,7 @@ body {
   font-weight: 700;
   line-height: 1.5rem; /* 150% */
 }
+
 .heading-03 {
   color: var(--light-theme-text-text-primary, #131315);
 
@@ -312,6 +327,7 @@ body {
   font-weight: 400;
   line-height: 1.75rem; /* 140% */
 }
+
 .heading-04 {
   color: var(--light-theme-text-text-primary, #131315);
 
@@ -322,6 +338,7 @@ body {
   font-weight: 400;
   line-height: 2.25rem; /* 128.571% */
 }
+
 .heading-05 {
   color: var(--light-theme-text-text-primary, #131315);
 
@@ -332,6 +349,7 @@ body {
   font-weight: 400;
   line-height: 2.5rem; /* 125% */
 }
+
 .fluid-heading-05 {
   align-self: stretch;
   color: var(--light-theme-text-text-primary, #131315);
@@ -343,6 +361,7 @@ body {
   font-weight: 400;
   line-height: 4.375rem; /* 116.667% */
 }
+
 .fluid-paragraph-01 {
   align-self: stretch;
   color: var(--light-theme-text-text-secondary, #606062);
@@ -355,6 +374,7 @@ body {
   line-height: 2.5rem; /* 125% */
 
 }
+
 .body-01 {
   color: var(--light-theme-text-text-secondary, #606062);
 
@@ -366,6 +386,7 @@ body {
   line-height: 1.25rem; /* 142.857% */
   letter-spacing: 0.01rem;
 }
+
 .body-02 {
   color: var(--light-theme-text-text-secondary, #606062);
 
@@ -376,6 +397,7 @@ body {
   font-weight: 400;
   line-height: 1.5rem; /* 150% */
 }
+
 .body-compact-01 {
   color: var(--light-theme-text-text-primary, #131315);
 
@@ -407,6 +429,7 @@ body {
   flex-direction: column;
   gap: 1.5rem;
 }
+
 .form-header-stretched {
   align-self: stretch
 }
@@ -620,6 +643,10 @@ body {
   transform: inherit;
 }
 
+.bx--btn-tertiary::part(button):hover {
+  background: #0052A3;
+}
+
 .label-01 {
   align-self: stretch;
   color: var(--light-theme-text-text-primary, #131315);
@@ -701,8 +728,8 @@ bx-modal-footer {
 @media screen and (max-width: 320px) {
 
   .wizard-head-toast {
-    right: 0.5rem;
-    top: 0.5rem;
+    right: 0rem;
+    top: 0rem;
   }
 
   bx-modal::part(dialog) {
@@ -870,16 +897,10 @@ bx-modal-footer {
     width: 2.5rem;
   }
 
-  .bx--btn-header::part(button):hover {
-    background: var(--light-theme-background-background-brand, #0073E6);
-  }
-
   .form-header {
     align-self: stretch;
   }
 
- 
-
 }
 
 /* Large (from 672px to 1055px) */
diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 63f1cc2d2d..b2b2fcb1d9 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -26,7 +26,7 @@
       data-id="logout-btn"
       kind="tertiary"
       iconLayout=""
-      class="bx--btn bx--btn-header bx--btn-reset"
+      class="bx--btn bx--btn-header bx--btn-reset bx--btn-tertiary"
       @click.prevent="$session?.logOut"
       size="field"
     >
@@ -38,7 +38,7 @@
       data-id="logout-btn"
       kind="tertiary"
       iconLayout=""
-      class="bx--btn bx--btn-header bx--btn-reset"
+      class="bx--btn bx--btn-header bx--btn-reset bx--btn-tertiary"
       @click.prevent="$session?.logOut"
       size="field"
     >
diff --git a/frontend/src/pages/applyform/AddressWizardStep.vue b/frontend/src/pages/applyform/AddressWizardStep.vue
index 088572fe97..abb92f0b7b 100644
--- a/frontend/src/pages/applyform/AddressWizardStep.vue
+++ b/frontend/src/pages/applyform/AddressWizardStep.vue
@@ -147,7 +147,7 @@ If you’d like to include another address, for example a seed orchard or if you
 <bx-btn
     kind="tertiary"
     iconLayout=""
-    class="bx--btn"
+    class="bx--btn bx--btn-tertiary"
     @click.prevent="addAddress"
     size="field"
   >
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index ec168ade7c..8f3790f95e 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -158,7 +158,7 @@ onMounted(() => setFocusedComponent('address_0'))
   <bx-btn
     kind="tertiary"
     iconLayout=""
-    class="bx--btn"
+    class="bx--btn bx--btn-tertiary"
     @click.prevent="addContact"
     size="field"
   >
diff --git a/frontend/src/pages/applyform/ReviewWizardStep.vue b/frontend/src/pages/applyform/ReviewWizardStep.vue
index b798fed8f6..6c16e52389 100644
--- a/frontend/src/pages/applyform/ReviewWizardStep.vue
+++ b/frontend/src/pages/applyform/ReviewWizardStep.vue
@@ -15,7 +15,7 @@
     <bx-btn
       kind="tertiary"
       iconLayout=""
-      class="bx--btn"
+      class="bx--btn bx--btn-tertiary"
       size="field"
       @click.prevent="goToStep(0)"
     >
@@ -43,7 +43,7 @@
     <bx-btn
       kind="tertiary"
       iconLayout=""
-      class="bx--btn"
+      class="bx--btn bx--btn-tertiary"
       size="field"
       @click.prevent="goToStep(1)"
     >
@@ -73,7 +73,7 @@
     <bx-btn
       kind="tertiary"
       iconLayout=""
-      class="bx--btn"
+      class="bx--btn bx--btn-tertiary"
       size="field"
       @click.prevent="goToStep(2)"
     >

From e6854e8947ba1cf6493da17abed92db49a790248 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 24 Aug 2023 11:05:40 -0700
Subject: [PATCH 022/313] Revert "Changed hover color for tertiary buttons"

This reverts commit 9a87c6994cae57a3e6fd5b9f2f7894cc0d043855.
---
 frontend/src/assets/styles/global.scss        | 39 +++++--------------
 .../src/components/MainHeaderComponent.vue    |  4 +-
 .../src/pages/applyform/AddressWizardStep.vue |  2 +-
 .../src/pages/applyform/ContactWizardStep.vue |  2 +-
 .../src/pages/applyform/ReviewWizardStep.vue  |  6 +--
 5 files changed, 16 insertions(+), 37 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 5962d25318..8b2dc27522 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -64,7 +64,7 @@ body {
 
 .wizard-head-toast {
   position: fixed;
-  right: 1.5rem;
+  right: 1.5625rem;
   top: 5rem;
   border-radius: 0.25rem;
   background: var(--light-theme-background-background-inverse, #2D2D2F);
@@ -159,11 +159,9 @@ body {
   text-decoration: none;
   color: var(--light-theme-text-text-primary, #131315);
 }
-
 .bx--progress-step-text p a:hover {
   color: var(--light-theme-link-link-primary, #005CB8);
 }
-
 .bx--progress-step-text p span {
   color: var(--light-theme-text-text-primary, #131315);
 }
@@ -214,28 +212,24 @@ body {
 .landing-subtitle {
   margin: 1.5rem 0rem 0rem 0rem;
 }
-
 .full-centered {
   display: flex;
   padding: 8.125rem 13.375rem 15rem 2.5rem;
   align-items: center;
   background: var(--light-theme-layer-layer-02, #FFF);
 }
-
 .full {
   margin: 0rem;
   padding-bottom: 0px;
   display: flex;
   background: var(--light-theme-background-background, #FFF);
 }
-
 .screen {
   margin: 3rem 2.5rem 2.5rem 2.5rem;
   padding-bottom: 0px;
   display: flex;
   background: var(--light-theme-background-background, #FFF);
 }
-
 .headers {
   display: flex;
   height: 3rem;
@@ -247,24 +241,20 @@ body {
   flex: 1 0 0;
   background: var(--light-theme-background-background-brand, #0073E6);
 }
-
 .headers a img {
   width: 7.5rem;
   flex-shrink: 0;
 }
-
 .heading {
   display: flex;
   padding: 0.9375rem 2rem 0.9375rem 0.5rem;
   align-items: flex-start;
   gap: 0.1875rem;
 }
-
 .heading-space {
   flex: 1 0 0;
   align-self: stretch;
 }
-
 .heading-button-transparent {
   display: flex;
   width: 12.375rem;
@@ -276,7 +266,6 @@ body {
   background: var(--others-transparent-transparent, #FFF);
   background-blend-mode: multiply;
 }
-
 .heading-button {
   display: flex;
   width: 9.6875rem;
@@ -289,7 +278,6 @@ body {
   background: var(--others-transparent-transparent, #FFF);
   background-blend-mode: multiply;
 }
-
 .heading-compact-01 {
   color: var(--dark-theme-text-text-primary, #F3F3F5);
 
@@ -301,11 +289,9 @@ body {
   line-height: 1.125rem; /* 128.571% */
   letter-spacing: 0.01rem;
 }
-
 .heading-compact-01-dark {
   color: var(--light-theme-text-text-primary, #131315) !important;
 }
-
 .heading-02 {
   color: var(--light-theme-text-text-primary, #131315) !important;
 
@@ -316,7 +302,6 @@ body {
   font-weight: 700;
   line-height: 1.5rem; /* 150% */
 }
-
 .heading-03 {
   color: var(--light-theme-text-text-primary, #131315);
 
@@ -327,7 +312,6 @@ body {
   font-weight: 400;
   line-height: 1.75rem; /* 140% */
 }
-
 .heading-04 {
   color: var(--light-theme-text-text-primary, #131315);
 
@@ -338,7 +322,6 @@ body {
   font-weight: 400;
   line-height: 2.25rem; /* 128.571% */
 }
-
 .heading-05 {
   color: var(--light-theme-text-text-primary, #131315);
 
@@ -349,7 +332,6 @@ body {
   font-weight: 400;
   line-height: 2.5rem; /* 125% */
 }
-
 .fluid-heading-05 {
   align-self: stretch;
   color: var(--light-theme-text-text-primary, #131315);
@@ -361,7 +343,6 @@ body {
   font-weight: 400;
   line-height: 4.375rem; /* 116.667% */
 }
-
 .fluid-paragraph-01 {
   align-self: stretch;
   color: var(--light-theme-text-text-secondary, #606062);
@@ -374,7 +355,6 @@ body {
   line-height: 2.5rem; /* 125% */
 
 }
-
 .body-01 {
   color: var(--light-theme-text-text-secondary, #606062);
 
@@ -386,7 +366,6 @@ body {
   line-height: 1.25rem; /* 142.857% */
   letter-spacing: 0.01rem;
 }
-
 .body-02 {
   color: var(--light-theme-text-text-secondary, #606062);
 
@@ -397,7 +376,6 @@ body {
   font-weight: 400;
   line-height: 1.5rem; /* 150% */
 }
-
 .body-compact-01 {
   color: var(--light-theme-text-text-primary, #131315);
 
@@ -429,7 +407,6 @@ body {
   flex-direction: column;
   gap: 1.5rem;
 }
-
 .form-header-stretched {
   align-self: stretch
 }
@@ -643,10 +620,6 @@ body {
   transform: inherit;
 }
 
-.bx--btn-tertiary::part(button):hover {
-  background: #0052A3;
-}
-
 .label-01 {
   align-self: stretch;
   color: var(--light-theme-text-text-primary, #131315);
@@ -728,8 +701,8 @@ bx-modal-footer {
 @media screen and (max-width: 320px) {
 
   .wizard-head-toast {
-    right: 0rem;
-    top: 0rem;
+    right: 0.5rem;
+    top: 0.5rem;
   }
 
   bx-modal::part(dialog) {
@@ -897,10 +870,16 @@ bx-modal-footer {
     width: 2.5rem;
   }
 
+  .bx--btn-header::part(button):hover {
+    background: var(--light-theme-background-background-brand, #0073E6);
+  }
+
   .form-header {
     align-self: stretch;
   }
 
+ 
+
 }
 
 /* Large (from 672px to 1055px) */
diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index b2b2fcb1d9..63f1cc2d2d 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -26,7 +26,7 @@
       data-id="logout-btn"
       kind="tertiary"
       iconLayout=""
-      class="bx--btn bx--btn-header bx--btn-reset bx--btn-tertiary"
+      class="bx--btn bx--btn-header bx--btn-reset"
       @click.prevent="$session?.logOut"
       size="field"
     >
@@ -38,7 +38,7 @@
       data-id="logout-btn"
       kind="tertiary"
       iconLayout=""
-      class="bx--btn bx--btn-header bx--btn-reset bx--btn-tertiary"
+      class="bx--btn bx--btn-header bx--btn-reset"
       @click.prevent="$session?.logOut"
       size="field"
     >
diff --git a/frontend/src/pages/applyform/AddressWizardStep.vue b/frontend/src/pages/applyform/AddressWizardStep.vue
index abb92f0b7b..088572fe97 100644
--- a/frontend/src/pages/applyform/AddressWizardStep.vue
+++ b/frontend/src/pages/applyform/AddressWizardStep.vue
@@ -147,7 +147,7 @@ If you’d like to include another address, for example a seed orchard or if you
 <bx-btn
     kind="tertiary"
     iconLayout=""
-    class="bx--btn bx--btn-tertiary"
+    class="bx--btn"
     @click.prevent="addAddress"
     size="field"
   >
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index 8f3790f95e..ec168ade7c 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -158,7 +158,7 @@ onMounted(() => setFocusedComponent('address_0'))
   <bx-btn
     kind="tertiary"
     iconLayout=""
-    class="bx--btn bx--btn-tertiary"
+    class="bx--btn"
     @click.prevent="addContact"
     size="field"
   >
diff --git a/frontend/src/pages/applyform/ReviewWizardStep.vue b/frontend/src/pages/applyform/ReviewWizardStep.vue
index 6c16e52389..b798fed8f6 100644
--- a/frontend/src/pages/applyform/ReviewWizardStep.vue
+++ b/frontend/src/pages/applyform/ReviewWizardStep.vue
@@ -15,7 +15,7 @@
     <bx-btn
       kind="tertiary"
       iconLayout=""
-      class="bx--btn bx--btn-tertiary"
+      class="bx--btn"
       size="field"
       @click.prevent="goToStep(0)"
     >
@@ -43,7 +43,7 @@
     <bx-btn
       kind="tertiary"
       iconLayout=""
-      class="bx--btn bx--btn-tertiary"
+      class="bx--btn"
       size="field"
       @click.prevent="goToStep(1)"
     >
@@ -73,7 +73,7 @@
     <bx-btn
       kind="tertiary"
       iconLayout=""
-      class="bx--btn bx--btn-tertiary"
+      class="bx--btn"
       size="field"
       @click.prevent="goToStep(2)"
     >

From a02b886bd20471212542fbda1cbaa0e12e21e766 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 24 Aug 2023 13:44:34 -0700
Subject: [PATCH 023/313] Added hover colors for buttons and beautified code

---
 frontend/src/assets/styles/global.scss | 149 +++++++++++++------------
 1 file changed, 76 insertions(+), 73 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 8b2dc27522..6b3ad79894 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -1,24 +1,36 @@
-@use 'sass:map';
+@use "sass:map";
 
-@use '@bcgov-nr/nr-fsa-theme/style-sheets/carbon-components-overrides.scss';
+@use "@bcgov-nr/nr-fsa-theme/style-sheets/carbon-components-overrides.scss";
 
-@use '@bcgov-nr/nr-fsa-theme/design-tokens/type-family.scss' as typeFamily;
+@use "@bcgov-nr/nr-fsa-theme/design-tokens/type-family.scss" as typeFamily;
 
 :root {
   --others-transparent-transparent: rgba(255, 255, 255, 0);
-  --cds-interactive-01:#0073E6;
-  --light-theme-button-button-primary: #0073E6;
-  --cds-interactive-03: #005CB8;
-  --light-theme-button-button-tertiary: #005CB8;
-  --cds-focus: #0073E6;
+  --cds-interactive-01: #0073e6;
+  --light-theme-button-button-primary: #0073e6;
+  --cds-interactive-03: #005cb8;
+  --light-theme-button-button-tertiary: #005cb8;
+  --cds-focus: #0073e6;
+
+  //Primary button
+  --cds-hover-primary: #0066cc;
+
+  //Secondary button
+  --cds-hover-secondary: #535355;
+
+  //Tertiary button
+  --cds-hover-tertiary: #0052a3;
+
+  //Danger Ghost button
+  --cds-hover-danger: #b32001;
 }
 
 * {
-  font-family: 'BCSans', 'Noto Sans', Verdana, Arial, sans-serif;
+  font-family: "BCSans", "Noto Sans", Verdana, Arial, sans-serif;
 }
 
 body {
-  font-family: map.get(typeFamily.$type-family, 'sans');
+  font-family: map.get(typeFamily.$type-family, "sans");
 }
 
 .bulleted-list {
@@ -46,7 +58,7 @@ body {
 }
 
 .inner-spotlight-group-markup {
-  border-bottom: solid 1px #DFDFE1;
+  border-bottom: solid 1px #dfdfe1;
 }
 
 .bx-tag {
@@ -67,11 +79,11 @@ body {
   right: 1.5625rem;
   top: 5rem;
   border-radius: 0.25rem;
-  background: var(--light-theme-background-background-inverse, #2D2D2F);
+  background: var(--light-theme-background-background-inverse, #2d2d2f);
   z-index: 999; /* Higher value to ensure it's on top */
 
   /* Light Theme/Shadows/Menu */
-  box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.30);
+  box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.3);
 }
 
 .submission-head {
@@ -160,7 +172,7 @@ body {
   color: var(--light-theme-text-text-primary, #131315);
 }
 .bx--progress-step-text p a:hover {
-  color: var(--light-theme-link-link-primary, #005CB8);
+  color: var(--light-theme-link-link-primary, #005cb8);
 }
 .bx--progress-step-text p span {
   color: var(--light-theme-text-text-primary, #131315);
@@ -172,41 +184,40 @@ body {
 }
 
 .bx--progress-step-current {
-  border-color: #0073E6;
+  border-color: #0073e6;
 }
 
 .bx--progress-step-queued {
-  border-color: #DFDFE1;
+  border-color: #dfdfe1;
 }
 
 .bx--progress-step-error {
-  border-color: #E72000;
+  border-color: #e72000;
 }
 
 .bx--progress-step-complete {
-  border-color: #0073E6;
+  border-color: #0073e6;
 }
 
 .bx--progress-step-icon-current {
-  color: #0073E6;
+  color: #0073e6;
 }
 
 .bx--progress-step-icon-error {
-  color: #E72000;
+  color: #e72000;
 }
 
 .bx--progress-step-icon-complete {
-  color: #0073E6;
+  color: #0073e6;
 }
 
 .bx--progress-step-icon-queued {
-  color: #DFDFE1;
+  color: #dfdfe1;
 }
 
-
 /* Recreating the style */
 .spacing {
-  padding:1.5rem;
+  padding: 1.5rem;
 }
 
 .landing-subtitle {
@@ -216,19 +227,19 @@ body {
   display: flex;
   padding: 8.125rem 13.375rem 15rem 2.5rem;
   align-items: center;
-  background: var(--light-theme-layer-layer-02, #FFF);
+  background: var(--light-theme-layer-layer-02, #fff);
 }
 .full {
   margin: 0rem;
   padding-bottom: 0px;
   display: flex;
-  background: var(--light-theme-background-background, #FFF);
+  background: var(--light-theme-background-background, #fff);
 }
 .screen {
   margin: 3rem 2.5rem 2.5rem 2.5rem;
   padding-bottom: 0px;
   display: flex;
-  background: var(--light-theme-background-background, #FFF);
+  background: var(--light-theme-background-background, #fff);
 }
 .headers {
   display: flex;
@@ -236,10 +247,10 @@ body {
   padding: 0rem 2.5rem;
   align-items: center;
   flex-grow: 1;
-	align-self: stretch;
+  align-self: stretch;
   gap: 1.5rem;
   flex: 1 0 0;
-  background: var(--light-theme-background-background-brand, #0073E6);
+  background: var(--light-theme-background-background-brand, #0073e6);
 }
 .headers a img {
   width: 7.5rem;
@@ -263,7 +274,7 @@ body {
   align-items: flex-start;
   flex-shrink: 0;
   border-radius: 0.25rem;
-  background: var(--others-transparent-transparent, #FFF);
+  background: var(--others-transparent-transparent, #fff);
   background-blend-mode: multiply;
 }
 .heading-button {
@@ -274,12 +285,12 @@ body {
   align-items: flex-start;
   flex-shrink: 0;
   border-radius: 0.25rem;
-  border: 1px solid var(--dark-theme-button-button-tertiary, #FFF);
-  background: var(--others-transparent-transparent, #FFF);
+  border: 1px solid var(--dark-theme-button-button-tertiary, #fff);
+  background: var(--others-transparent-transparent, #fff);
   background-blend-mode: multiply;
 }
 .heading-compact-01 {
-  color: var(--dark-theme-text-text-primary, #F3F3F5);
+  color: var(--dark-theme-text-text-primary, #f3f3f5);
 
   /* Fixed heading styles/heading-compact-01 */
   font-family: BC Sans;
@@ -353,7 +364,6 @@ body {
   font-style: normal;
   font-weight: 400;
   line-height: 2.5rem; /* 125% */
-
 }
 .body-01 {
   color: var(--light-theme-text-text-secondary, #606062);
@@ -391,12 +401,12 @@ body {
 .divider {
   align-self: stretch;
   width: 100%;
-  background: var(--light-theme-border-border-subtle-02, #DFDFE1);
+  background: var(--light-theme-border-border-subtle-02, #dfdfe1);
 }
 
 .content {
   flex-grow: 1;
-	align-self: stretch;
+  align-self: stretch;
   display: flex;
   flex-direction: column;
   gap: 3rem;
@@ -408,7 +418,7 @@ body {
   gap: 1.5rem;
 }
 .form-header-stretched {
-  align-self: stretch
+  align-self: stretch;
 }
 
 .form-header-title {
@@ -428,7 +438,7 @@ body {
 
 .form-steps {
   flex-grow: 1;
-	align-self: stretch;
+  align-self: stretch;
   display: flex;
   flex-direction: column;
   gap: 2.5rem;
@@ -518,14 +528,13 @@ body {
 }
 
 .frame-01 {
-
   align-self: stretch;
   display: flex;
   flex-direction: column;
   gap: 2rem;
 }
 
-.frame-02{
+.frame-02 {
   align-self: stretch;
   display: inline-flex;
   flex-direction: column;
@@ -550,7 +559,7 @@ body {
   display: flex;
   flex-direction: column;
   gap: 0.25rem;
-  background: var(--others-transparent-transparent, #FFF);
+  background: var(--others-transparent-transparent, #fff);
   background-blend-mode: multiply;
 }
 
@@ -559,7 +568,7 @@ body {
   display: flex;
   flex-direction: column;
   gap: 0.25rem;
-  background: var(--others-transparent-transparent, #FFF);
+  background: var(--others-transparent-transparent, #fff);
   background-blend-mode: multiply;
 }
 
@@ -568,7 +577,7 @@ body {
   display: flex;
   flex-direction: column;
   gap: 0.25rem;
-  background: var(--others-transparent-transparent, #FFF);
+  background: var(--others-transparent-transparent, #fff);
   background-blend-mode: multiply;
 }
 
@@ -587,8 +596,8 @@ body {
   padding: 2rem;
   gap: 2.5rem;
   border-radius: 0.5rem;
-  border: 1px solid var(--light-theme-border-border-subtle-00, #DFDFE1);
-  background: #FFF;
+  border: 1px solid var(--light-theme-border-border-subtle-00, #dfdfe1);
+  background: #fff;
 }
 
 .grouping-06 {
@@ -652,7 +661,7 @@ body {
   display: flex;
   align-items: flex-start;
   border-radius: 62.5rem;
-  background: var(--dark-theme-tag-blue-background, #00478F);
+  background: var(--dark-theme-tag-blue-background, #00478f);
 }
 
 .bx--modal-btn-divider {
@@ -674,8 +683,8 @@ body {
   align-self: stretch;
 }
 
-bx-modal{
-display: flex;
+bx-modal {
+  display: flex;
 }
 
 bx-modal-footer {
@@ -699,7 +708,6 @@ bx-modal-footer {
 
 /* Small (up to 320px) */
 @media screen and (max-width: 320px) {
-
   .wizard-head-toast {
     right: 0.5rem;
     top: 0.5rem;
@@ -721,24 +729,24 @@ bx-modal-footer {
     padding: 0 1rem 0 1rem;
     margin: 0;
   }
-  
+
   .bx--modal-btn {
-    height: 1.13rem  !important;
+    height: 1.13rem !important;
     position: absolute;
     width: 90%;
   }
-  
+
   .bx--modal-btn2 {
     bottom: 2.5rem;
   }
 
-  .screen{
+  .screen {
     margin: 1.5rem 1rem 1rem 1rem;
     flex-direction: column;
     align-items: center;
   }
 
-  .headers{
+  .headers {
     padding: 0rem 1rem;
     gap: 1rem;
     flex-shrink: 0;
@@ -789,7 +797,7 @@ bx-modal-footer {
     flex-direction: column;
   }
 
-  .bx--progress-step{
+  .bx--progress-step {
     width: 18rem;
   }
 
@@ -797,22 +805,22 @@ bx-modal-footer {
     margin: 0.6rem;
   }
 
-  .form-steps{
+  .form-steps {
     align-self: stretch;
     width: 18rem;
   }
 
-  .form-steps-01{
+  .form-steps-01 {
     align-self: stretch;
     width: 18rem;
   }
 
-  .form-steps-01-title{
+  .form-steps-01-title {
     gap: 0.5rem;
     align-self: stretch;
   }
 
-  .form-footer-group-buttons{
+  .form-footer-group-buttons {
     flex-direction: column-reverse;
     justify-content: flex-end;
   }
@@ -826,24 +834,22 @@ bx-modal-footer {
     border-left: solid 0.125rem;
     flex: none;
   }
-
 }
 
 /* Medium (from 321px to 671px) */
 @media screen and (min-width: 321px) and (max-width: 671px) {
- 
   .form-header-title span {
-    color:purple;
+    color: purple;
   }
 
   /* Lower range width is still a mess */
 
-  .screen{
+  .screen {
     margin: 2rem;
     align-items: center;
   }
 
-  .headers{
+  .headers {
     padding: 0rem 1rem;
     gap: 1rem;
     flex-shrink: 0;
@@ -871,20 +877,17 @@ bx-modal-footer {
   }
 
   .bx--btn-header::part(button):hover {
-    background: var(--light-theme-background-background-brand, #0073E6);
+    background: var(--light-theme-background-background-brand, #0073e6);
   }
 
   .form-header {
     align-self: stretch;
   }
-
- 
-
 }
 
 /* Large (from 672px to 1055px) */
 @media screen and (min-width: 672px) and (max-width: 1055px) {
-  .screen{
+  .screen {
     margin: 2rem;
     align-items: center;
   }
@@ -892,7 +895,7 @@ bx-modal-footer {
 
 /* X-Large (from 1057px to 1311px) */
 @media screen and (min-width: 1056px) and (max-width: 1311px) {
-  .screen{
+  .screen {
     margin: 2rem;
     align-items: center;
   }
@@ -900,7 +903,7 @@ bx-modal-footer {
 
 /* XX-Large (from 1312px to 1583px) */
 @media screen and (min-width: 1312px) and (max-width: 1583px) {
-  .screen{
+  .screen {
     margin: 2rem;
     align-items: center;
   }
@@ -908,14 +911,14 @@ bx-modal-footer {
 
 /* XXX-Large (from 1584px to 1783px) */
 @media screen and (min-width: 1584px) and (max-width: 1783px) {
-  .form-steps{
+  .form-steps {
     width: 50vw;
   }
 }
 
 /* Larger than XXX-Large (1784px and above) */
 @media screen and (min-width: 1784px) {
-  .form-steps{
+  .form-steps {
     width: 50vw;
   }
 }

From 91d0f1a1155803cab2cde6c8db216a341b91f6c6 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 24 Aug 2023 16:13:52 -0700
Subject: [PATCH 024/313] Aligned color for the buttons according to the FSA
 theme

---
 frontend/src/assets/styles/global.scss | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 6b3ad79894..645bc2e48a 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -6,22 +6,28 @@
 
 :root {
   --others-transparent-transparent: rgba(255, 255, 255, 0);
-  --cds-interactive-01: #0073e6;
   --light-theme-button-button-primary: #0073e6;
-  --cds-interactive-03: #005cb8;
+  --light-theme-button-button-secondary: #464648;
   --light-theme-button-button-tertiary: #005cb8;
   --cds-focus: #0073e6;
 
   //Primary button
-  --cds-hover-primary: #0066cc;
+  --cds-interactive-01: #0073E6;
+  --cds-active-primary: #0073E6;
+  --cds-hover-primary: #0066CC;
 
   //Secondary button
+  --cds-interactive-02: #464648;
+  --cds-active-secondary: #464648;
   --cds-hover-secondary: #535355;
 
   //Tertiary button
-  --cds-hover-tertiary: #0052a3;
+  --cds-interactive-03: #005CB8;
+  --cds-active-tertiary: #005CB8;
+  --cds-hover-tertiary: #0052A3;
 
   //Danger Ghost button
+  --cds-danger-01: #e72000;
   --cds-hover-danger: #b32001;
 }
 

From d564a0113b733b2141ff8ac2463795a43cca8339 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 24 Aug 2023 06:00:13 -0700
Subject: [PATCH 025/313] chore: fixing eslint config for vscode

---
 frontend/.eslintrc.cjs | 34 ----------------------------------
 frontend/.eslintrc.js  | 27 +++++++++++++++++++++++++--
 2 files changed, 25 insertions(+), 36 deletions(-)
 delete mode 100644 frontend/.eslintrc.cjs

diff --git a/frontend/.eslintrc.cjs b/frontend/.eslintrc.cjs
deleted file mode 100644
index 03899c7cf8..0000000000
--- a/frontend/.eslintrc.cjs
+++ /dev/null
@@ -1,34 +0,0 @@
-/* eslint-env node */
-require('@rushstack/eslint-patch/modern-module-resolution')
-
-module.exports = {
-  root: true,
-  'import/resolver': {
-    node: {
-      extensions: ['.js', '.jsx', '.ts', '.tsx', '.vue'],
-      moduleDirectory: ['node_modules', 'src/']
-    },
-    typescript: {
-      alwaysTryTypes: true
-    }
-  },
-  extends: [
-    'plugin:vue/vue3-essential',
-    'plugin:import/errors',
-    'plugin:import/warnings',
-    'plugin:import/typescript',
-    'eslint:recommended',
-    'prettier',
-    '@vue/eslint-config-typescript/recommended',
-    '@vue/eslint-config-prettier'
-  ],
-  env: {
-    'vue/setup-compiler-macros': true
-  },
-  overrides: [
-    {
-      files: ['cypress/integration/**.spec.{js,ts,jsx,tsx}'],
-      extends: ['plugin:cypress/recommended']
-    }
-  ]
-}
diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index 0a6a7f4c04..46a37085a7 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -1,15 +1,32 @@
 module.exports = {
+  root: true,
   env: {
     browser: true,
     es2021: true,
     jest: true,
-    node: true
+    node: true,
+    'vue/setup-compiler-macros': true
+  },
+  'import/resolver': {
+    node: {
+      extensions: ['.js', '.jsx', '.ts', '.tsx', '.vue'],
+      moduleDirectory: ['node_modules', 'src/']
+    },
+    typescript: {
+      alwaysTryTypes: true
+    }
   },
   extends: [
     'plugin:import/errors',
     'plugin:import/warnings',
     'plugin:import/typescript',
-    'standard'
+    'standard',
+    'prettier',
+    'plugin:vue/vue3-essential',
+    'eslint:recommended',
+    '@vue/typescript/recommended',
+    '@vue/eslint-config-typescript/recommended',
+    '@vue/eslint-config-prettier'
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
@@ -18,6 +35,12 @@ module.exports = {
   },
   plugins: ['@typescript-eslint'],
   rules: {},
+  overrides: [
+    {
+      files: ['cypress/integration/**.spec.{js,ts,jsx,tsx}'],
+      extends: ['plugin:cypress/recommended']
+    }
+  ],
   globals: {
     config: 'readable',
     cy: 'readonly',

From aa8eb613baf7fb2a698ee60f24de33ff5b3a09c9 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 28 Aug 2023 10:25:11 -0700
Subject: [PATCH 026/313] fix: fixing validators and component format

---
 frontend/src/App.vue                          |   6 +-
 frontend/src/assets/styles/global.scss        |   8 +-
 frontend/src/components/DataFetcher.vue       |   4 +-
 .../src/components/MainHeaderComponent.vue    | 106 +++++-----
 .../forms/AutoCompleteInputComponent.vue      | 100 +++++----
 .../forms/DropdownInputComponent.vue          |  54 +++--
 .../forms/MultiselectInputComponent.vue       |  91 ++++----
 .../components/forms/RadioInputComponent.vue  |  54 ++---
 .../components/forms/TextInputComponent.vue   |  65 +++---
 .../grouping/AddressGroupComponent.vue        |  48 ++---
 .../grouping/ContactGroupComponent.vue        |  44 ++--
 .../visuals/DisplayBlockComponent.vue         |  43 ++--
 .../WizardProgressIndicatorComponent.vue      |  96 +++++----
 frontend/src/composables/useFocus.ts          |  37 ++--
 .../validators/ExternalFormValidations.ts     | 136 ++++++++++++
 .../helpers/validators/GlobalValidators.ts    |   8 +
 frontend/src/pages/ApplyClientNumberPage.vue  | 200 +++++++++++++-----
 .../src/pages/applyform/AddressWizardStep.vue |   2 +-
 .../BusinessInformationWizardStep.vue         |  24 ++-
 .../src/pages/applyform/ContactWizardStep.vue |   6 +-
 .../src/pages/applyform/ReviewWizardStep.vue  |  70 +++---
 21 files changed, 738 insertions(+), 464 deletions(-)
 create mode 100644 frontend/src/helpers/validators/ExternalFormValidations.ts

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index e992c0026b..4844498493 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,7 +1,10 @@
 <script setup lang="ts">
-import { ref, computed, useSlots, reactive, provide } from 'vue'
+import { ref } from 'vue'
+// Composables
 import { useEventBus } from '@vueuse/core'
+// Imported Types
 import type { ModalNotification } from '@/dto/CommonTypesDto'
+// @ts-ignore
 import Delete16 from '@carbon/icons-vue/es/trash-can/16'
 
 const modalBus = useEventBus<ModalNotification>('modal-notification')
@@ -47,6 +50,7 @@ const deleteContentModal = () => {
 }
 
 modalBus.on(openModal)
+toastBus.on(openToast)
 </script>
 
 <template>
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 645bc2e48a..f00c409615 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -190,7 +190,7 @@ body {
 }
 
 .bx--progress-step-current {
-  border-color: #0073e6;
+  border-color: var(--cds-interactive-01);
 }
 
 .bx--progress-step-queued {
@@ -202,11 +202,11 @@ body {
 }
 
 .bx--progress-step-complete {
-  border-color: #0073e6;
+  border-color: var(--cds-interactive-01);
 }
 
 .bx--progress-step-icon-current {
-  color: #0073e6;
+  color: var(--cds-interactive-01);
 }
 
 .bx--progress-step-icon-error {
@@ -214,7 +214,7 @@ body {
 }
 
 .bx--progress-step-icon-complete {
-  color: #0073e6;
+  color: var(--cds-interactive-01)
 }
 
 .bx--progress-step-icon-queued {
diff --git a/frontend/src/components/DataFetcher.vue b/frontend/src/components/DataFetcher.vue
index f2ce352448..45b8f20418 100644
--- a/frontend/src/components/DataFetcher.vue
+++ b/frontend/src/components/DataFetcher.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
-import { useFetchTo } from '@/composables/useFetch'
 import { ref, watch, computed } from 'vue'
+// Composables
+import { useFetchTo } from '@/composables/useFetch'
+
 
 const props = defineProps<{
   url: string
diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 63f1cc2d2d..51b21179d8 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -1,57 +1,9 @@
-<template>
-
-    <a href="https://gov.bc.ca">
-      <img
-        src="/img/logo1.svg"
-        alt="Go to the Government of British Columbia website"
-        v-if="isSmallScreen"
-      />
-      <img
-        src="/img/bc_for_logo.png"
-        alt="Go to the Government of British Columbia website"
-        v-else
-      />
-    </a>
-    <div class="heading">
-      <span class="heading-compact-01" v-if="$session?.user?.provider !== 'idir'">Ministry of Forests</span>
-      <span class="heading-compact-01" v-else>Client Management System</span>
-      <span class="heading-compact-01" v-if="env !== 'Prod'">Env. {{ env }} - Rel. {{appVersion}}</span>
-    </div>
-    
-    <div class="heading-space"></div>
-
-    <!-- Remember to add profile button here -->
-    <bx-btn
-      v-if="$session?.isLoggedIn() && (isSmallScreen || isMediumScreen)"
-      data-id="logout-btn"
-      kind="tertiary"
-      iconLayout=""
-      class="bx--btn bx--btn-header bx--btn-reset"
-      @click.prevent="$session?.logOut"
-      size="field"
-    >
-      <Logout16 slot="icon" />
-    </bx-btn>
-
-    <bx-btn
-      v-if="$session?.isLoggedIn() && (!isSmallScreen && !isMediumScreen)"
-      data-id="logout-btn"
-      kind="tertiary"
-      iconLayout=""
-      class="bx--btn bx--btn-header bx--btn-reset"
-      @click.prevent="$session?.logOut"
-      size="field"
-    >
-      <span>Logout</span>
-      <Logout16 slot="icon" />
-    </bx-btn>
-
-</template>
-
 <script setup lang="ts">
-import Logout16 from '@carbon/icons-vue/es/logout/16';
-import { nodeEnv, appVersion } from '@/CoreConstants';
 import { ref, computed, onMounted } from 'vue';
+// Types
+import { nodeEnv, appVersion } from '@/CoreConstants';
+// @ts-ignore
+import Logout16 from '@carbon/icons-vue/es/logout/16';
 
 const envPrefix = "openshift-";
 const env = ref(nodeEnv);
@@ -67,3 +19,53 @@ const isMediumScreen = computed(() => screenWidth.value <= 671);
 
 onMounted(() => window.addEventListener('resize', updateScreenWidth));
 </script>
+
+<template>
+
+  <a href="https://gov.bc.ca">
+    <img
+      src="/img/logo1.svg"
+      alt="Go to the Government of British Columbia website"
+      v-if="isSmallScreen"
+    />
+    <img
+      src="/img/bc_for_logo.png"
+      alt="Go to the Government of British Columbia website"
+      v-else
+    />
+  </a>
+  <div class="heading">
+    <span class="heading-compact-01" v-if="$session?.user?.provider !== 'idir'">Ministry of Forests</span>
+    <span class="heading-compact-01" v-else>Client Management System</span>
+    <span class="heading-compact-01" v-if="env !== 'Prod'">Env. {{ env }} - Rel. {{appVersion}}</span>
+  </div>
+  
+  <div class="heading-space"></div>
+
+  <!-- Remember to add profile button here -->
+  <bx-btn
+    v-if="$session?.isLoggedIn() && (isSmallScreen || isMediumScreen)"
+    data-id="logout-btn"
+    kind="tertiary"
+    iconLayout=""
+    class="bx--btn bx--btn-header bx--btn-reset"
+    @click.prevent="$session?.logOut"
+    size="field"
+  >
+    <Logout16 slot="icon" />
+  </bx-btn>
+
+  <bx-btn
+    v-if="$session?.isLoggedIn() && (!isSmallScreen && !isMediumScreen)"
+    data-id="logout-btn"
+    kind="tertiary"
+    iconLayout=""
+    class="bx--btn bx--btn-header bx--btn-reset"
+    @click.prevent="$session?.logOut"
+    size="field"
+  >
+    <span>Logout</span>
+    <Logout16 slot="icon" />
+  </bx-btn>
+
+</template>
diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index 0e03324380..2fbfd69ddf 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -1,51 +1,6 @@
-<template>
-  <bx-form-item class="grouping-02">
-    <bx-input
-      :id="id"
-      :name="id"
-      type="text"
-      :data-scroll="id"
-      :data-id="'input-' + id"
-      :placeholder="'Start typing to search for your ' + label"
-      :value="inputValue"
-      :label-text="label"
-      :helper-text="tip"
-      @focus="autoCompleteVisible = true"
-      :invalid="error ? true : false"
-      :validityMessage="error"
-      @blur="(event:any) => blur(event.target.value)"
-      @input="(event:any) => inputValue = event.target.value"
-    />
-    <div
-      class="autocomplete-items"
-      :id="id + 'list'"
-      v-show="
-        autoCompleteVisible && inputValue.length > 2 && contents.length > 0
-      "
-    >
-      <div class="autocomplete-items-ct" v-if="loading">
-        <bx-inline-loading status="active">Loading data...</bx-inline-loading>
-      </div>
-      <div class="autocomplete-items-ct" v-else>
-        <div
-          v-for="item in contents"
-          :key="item.code"
-          :data-id="item.code"
-          :data-value="item.name"
-          class="autocomplete-items-cell"
-          @click="selectAutocompleteItem"
-        >
-          <strong :data-id="item.code" :data-value="item.name">{{
-            item.name
-          }}</strong>
-        </div>
-      </div>
-    </div>
-  </bx-form-item>
-</template>
-
 <script setup lang="ts">
 import { ref, watch } from 'vue'
+import { useEventBus } from '@vueuse/core'
 import { isEmpty, type BusinessSearchResult } from '@/dto/CommonTypesDto'
 
 //Define the input properties for this component
@@ -73,6 +28,8 @@ const autoCompleteVisible = ref(false)
 //We initialize the error message handling for validation
 const error = ref<string | undefined>(props.errorMessage || '')
 
+const revalidateBus = useEventBus<void>('revalidate-bus')
+
 //We watch for error changes to emit events
 watch(error, () => emit('error', error.value))
 watch(
@@ -144,7 +101,58 @@ const selectAutocompleteItem = (event: any) => {
   emit('update:selected-value', selectedValue)
   autoCompleteVisible.value = false
 }
+
+revalidateBus.on(() => validateInput(inputValue.value))
 </script>
+
+<template>
+  <bx-form-item class="grouping-02">
+    <bx-input
+      :id="id"
+      :name="id"
+      type="text"
+      :data-focus="id"
+      :data-scroll="id"
+      :data-id="'input-' + id"
+      :placeholder="'Start typing to search for your ' + label"
+      :value="inputValue"
+      :label-text="label"
+      :helper-text="tip"
+      @focus="autoCompleteVisible = true"
+      :invalid="error ? true : false"
+      :validityMessage="error"
+      @blur="(event:any) => blur(event.target.value)"
+      @input="(event:any) => inputValue = event.target.value"
+    />
+    <div
+      class="autocomplete-items"
+      :id="id + 'list'"
+      v-show="
+        autoCompleteVisible && inputValue.length > 2 && contents.length > 0
+      "
+    >
+      <div class="autocomplete-items-ct" v-if="loading">
+        <bx-inline-loading status="active">Loading data...</bx-inline-loading>
+      </div>
+      <div class="autocomplete-items-ct" v-else>
+        <div
+          v-for="item in contents"
+          :key="item.code"
+          :data-id="item.code"
+          :data-value="item.name"
+          class="autocomplete-items-cell"
+          @click="selectAutocompleteItem"
+        >
+          <strong :data-id="item.code" :data-value="item.name">{{
+            item.name
+          }}</strong>
+        </div>
+      </div>
+    </div>
+  </bx-form-item>
+</template>
+
+
 <style scoped>
 .autocomplete {
   /*the container must be positioned relative:*/
diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index ce8bab26f9..e5eddfe28f 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -1,28 +1,6 @@
-<template>
-  <div class="grouping-03">
-  <bx-dropdown
-    :id="id"
-    :data-scroll="id"
-    :value="selectedValue"
-    :label-text="label"
-    :helper-text="tip"
-    :invalid="error ? true : false"
-    :validityMessage="error"
-    @bx-dropdown-beingselected="(target:any) => selectedValue = target.detail.item.__value"
-  >
-    <bx-dropdown-item
-      v-for="option in modelValue"
-      :key="option.code"
-      :value="option.code"
-      :data-item="option.code"
-      >{{ option.name }}</bx-dropdown-item
-    >
-  </bx-dropdown>
-</div>
-</template>
-
 <script setup lang="ts">
 import { ref, watch } from 'vue'
+import { useEventBus } from '@vueuse/core'
 import { type CodeNameType, isEmpty } from '@/dto/CommonTypesDto'
 
 //Define the input properties for this component
@@ -47,6 +25,8 @@ const emit = defineEmits<{
 //We initialize the error message handling for validation
 const error = ref<string | undefined>(props.errorMessage || '')
 
+const revalidateBus = useEventBus<void>('revalidate-bus')
+
 //We watch for error changes to emit events
 watch(error, () => emit('error', error.value))
 watch(
@@ -101,4 +81,32 @@ watch(
     setTimeout(() => (selectedValue.value = props.initialValue), 400)
   }
 )
+
+revalidateBus.on(() => validateInput(selectedValue.value))
 </script>
+
+
+<template>
+  <div class="grouping-03">
+  <bx-dropdown
+    :id="id"
+    :data-focus="id"
+    :data-scroll="id"
+    :value="selectedValue"
+    :label-text="label"
+    :helper-text="tip"
+    :invalid="error ? true : false"
+    :validityMessage="error"
+    @bx-dropdown-beingselected="(target:any) => selectedValue = target.detail.item.__value"
+  >
+    <bx-dropdown-item
+      v-for="option in modelValue"
+      :key="option.code"
+      :value="option.code"
+      :data-item="option.code"
+      >{{ option.name }}</bx-dropdown-item
+    >
+  </bx-dropdown>
+</div>
+</template>
+
diff --git a/frontend/src/components/forms/MultiselectInputComponent.vue b/frontend/src/components/forms/MultiselectInputComponent.vue
index b93d3f978e..786c3e7c6e 100644
--- a/frontend/src/components/forms/MultiselectInputComponent.vue
+++ b/frontend/src/components/forms/MultiselectInputComponent.vue
@@ -1,47 +1,8 @@
-<template>
-  <div class="grouping-03">
-    <div class="frame-02">
-      <bx-dropdown
-        :id="id"
-        :data-scroll="id"
-        :value="selectedValue"
-        :label-text="label"
-        :helper-text="tip"
-        :invalid="error ? true : false"
-        :validityMessage="error"
-        @bx-dropdown-beingselected="(target:any) => validateInput(target.detail.item.__value)"
-        @bx-dropdown-selected="(target:any) => addFromSelection(target.detail.item.__value)"
-      >
-        <bx-dropdown-item
-          v-for="option in modelValue"
-          :data-item="option.code"
-          :key="option.code"
-          :value="option.code"
-          >{{ option.name }}</bx-dropdown-item
-        >
-      </bx-dropdown>
-      <div class="bx-tag-box">
-        <bx-tag
-          v-for="(tag, index) in items"
-          title="Clear selection"
-          class="bx-tag"
-          :data-tag="'tag_' + id + '_' + index"
-          :id="'tag_' + id + '_' + index"
-          :key="index"
-        >
-          {{ tag }}
-          <CloseOutline16
-            :id="'close_' + id + '_' + index"
-            @click="removeFromSelection(tag)"
-          />
-        </bx-tag>
-      </div>
-    </div>
-  </div>
-</template>
 <script setup lang="ts">
 import { ref, watch } from 'vue'
-import { type CodeNameType } from '@/dto/CommonTypesDto'
+import { useEventBus } from '@vueuse/core'
+import type {  CodeNameType } from '@/dto/CommonTypesDto'
+//@ts-ignore
 import CloseOutline16 from '@carbon/icons-vue/es/close/16'
 
 //Define the input properties for this component
@@ -67,6 +28,8 @@ const emit = defineEmits<{
 //We initialize the error message handling for validation
 const error = ref<string | undefined>(props.errorMessage || '')
 
+const revalidateBus = useEventBus<void>('revalidate-bus')
+
 //We watch for error changes to emit events
 watch(error, () => emit('error', error.value))
 watch(
@@ -134,4 +97,48 @@ watch([items], () => emitChange())
 
 props.selectedValues?.forEach((value: string) => addFromSelection(value))
 validateInput(selectedValue.value)
+revalidateBus.on(() => validateInput(selectedValue.value))
 </script>
+
+<template>
+  <div class="grouping-03">
+    <div class="frame-02">
+      <bx-dropdown
+        :id="id"
+        :data-focus="id"
+        :data-scroll="id"
+        :value="selectedValue"
+        :label-text="label"
+        :helper-text="tip"
+        :invalid="error ? true : false"
+        :validityMessage="error"
+        @bx-dropdown-beingselected="(target:any) => validateInput(target.detail.item.__value)"
+        @bx-dropdown-selected="(target:any) => addFromSelection(target.detail.item.__value)"
+      >
+        <bx-dropdown-item
+          v-for="option in modelValue"
+          :data-item="option.code"
+          :key="option.code"
+          :value="option.code"
+          >{{ option.name }}</bx-dropdown-item
+        >
+      </bx-dropdown>
+      <div class="bx-tag-box">
+        <bx-tag
+          v-for="(tag, index) in items"
+          title="Clear selection"
+          class="bx-tag"
+          :data-tag="'tag_' + id + '_' + index"
+          :id="'tag_' + id + '_' + index"
+          :key="index"
+        >
+          {{ tag }}
+          <CloseOutline16
+            :id="'close_' + id + '_' + index"
+            @click="removeFromSelection(tag)"
+          />
+        </bx-tag>
+      </div>
+    </div>
+  </div>
+</template>
\ No newline at end of file
diff --git a/frontend/src/components/forms/RadioInputComponent.vue b/frontend/src/components/forms/RadioInputComponent.vue
index a5d02e3d8f..0bda5f4776 100644
--- a/frontend/src/components/forms/RadioInputComponent.vue
+++ b/frontend/src/components/forms/RadioInputComponent.vue
@@ -1,28 +1,6 @@
-<template>
-  <div class="grouping-01">
-    <label :for="id + 'rb'" class="label-01 label-01-primary">{{ label }}</label>
-    <bx-radio-button-group
-      :data-scroll="id"
-      label-position="right"
-      orientation="vertical"
-      :name="id + 'rb'"
-      :id="id + 'rb'"
-      v-model="selectedValue"
-      @bx-radio-button-group-changed="updateSelectedValue"
-      class="grouping-01"
-    >
-      <bx-radio-button
-        v-for="option in modelValue"
-        :key="id + 'rb' + option.value"
-        :label-text="option.text"
-        :value="option.value"
-      />
-    </bx-radio-button-group>
-  </div>
-</template>
-
 <script setup lang="ts">
 import { ref, watch } from 'vue'
+import { useEventBus } from '@vueuse/core'
 import { type CodeDescrType, isEmpty } from '@/dto/CommonTypesDto'
 
 const props = defineProps<{
@@ -45,6 +23,8 @@ const selectedValue = ref<string>(props.initialValue)
 //We initialize the error message handling for validation
 const error = ref<string | undefined>(props.errorMessage || '')
 
+const revalidateBus = useEventBus<void>('revalidate-bus')
+
 //We watch for error changes to emit events
 watch(error, () => emit('error', error.value))
 watch(
@@ -81,5 +61,31 @@ watch(selectedValue, () => {
 
 const updateSelectedValue = (event: any) =>
   (selectedValue.value = event.detail.value)
-//validateInput()
+  revalidateBus.on(() => validateInput())
 </script>
+
+<template>
+  <div class="grouping-01">
+    <label :for="id + 'rb'" class="label-01 label-01-primary">{{ label }}</label>
+    <bx-radio-button-group
+      :data-focus="id"
+      :data-scroll="id"
+      label-position="right"
+      orientation="vertical"
+      :name="id + 'rb'"
+      :id="id + 'rb'"
+      v-model="selectedValue"
+      @bx-radio-button-group-changed="updateSelectedValue"
+      class="grouping-01"
+    >
+      <bx-radio-button
+        v-for="option in modelValue"
+        :key="id + 'rb' + option.value"
+        :label-text="option.text"
+        :value="option.value"
+      />
+    </bx-radio-button-group>
+  </div>
+</template>
+
+
diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index de0d8974b7..7a9e262410 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -1,33 +1,6 @@
-<template>
-    <bx-form-item class="grouping-02" v-if="enabled">
-      <bx-input
-        v-if="enabled"
-        :id="id"
-        :data-scroll="id"
-        :data-id="'input-' + id"
-        :placeholder="placeholder"
-        :value="selectedValue"
-        :label-text="enabled ? label : null"
-        :helper-text="tip"
-        :disabled="!enabled"
-        :color-scheme="enabled ? '' : 'light'"
-        :invalid="error ? true : false"
-        :validityMessage="error"
-        v-mask="mask"
-        @blur="(event:any) => validateInput(event.target.value)"
-        @input="(event:any) => selectedValue = event.target.value"
-      />
-    </bx-form-item>
-
-    <div v-if="!enabled" class="grouping-04">
-      <div :data-scroll="id" class="grouping-04-label"><span :for="id" class="label-01">{{ label }}</span></div>
-      <span class="text-01">{{ selectedValue }}</span>
-    </div>
-
-</template>
-
 <script setup lang="ts">
 import { ref, watch } from 'vue'
+import { useEventBus } from '@vueuse/core'
 import { isEmpty } from '@/dto/CommonTypesDto'
 
 //Define the input properties for this component
@@ -53,6 +26,8 @@ const emit = defineEmits<{
 //We initialize the error message handling for validation
 const error = ref<string | undefined>(props.errorMessage || '')
 
+const revalidateBus = useEventBus<void>('revalidate-bus')
+
 //We watch for error changes to emit events
 watch(error, () => emit('error', error.value))
 watch(
@@ -95,12 +70,44 @@ const validateInput = (newValue: string) => {
   }
 }
 
+revalidateBus.on(() => {
+  validateInput(selectedValue.value)
+})
 </script>
 
+<template>
+  <bx-form-item class="grouping-02" v-if="enabled">
+    <bx-input
+      v-if="enabled"
+      :id="id"
+      :data-focus="id"
+      :data-scroll="id"
+      :data-id="'input-' + id"
+      :placeholder="placeholder"
+      :value="selectedValue"
+      :label-text="enabled ? label : null"
+      :helper-text="tip"
+      :disabled="!enabled"
+      :color-scheme="enabled ? '' : 'light'"
+      :invalid="error ? true : false"
+      :validityMessage="error"
+      v-mask="mask"
+      @blur="(event:any) => validateInput(event.target.value)"
+      @input="(event:any) => selectedValue = event.target.value"
+    />
+  </bx-form-item>
+
+  <div v-if="!enabled" class="grouping-04">
+    <div :data-scroll="id" class="grouping-04-label"><span :for="id" class="label-01">{{ label }}</span></div>
+    <span class="text-01">{{ selectedValue }}</span>
+  </div>
+
+</template>
+
 <style scoped>
 .bx-input-disabled {
   height: 2.5rem;
-  color: #131315; /*Change to common color*/
+  color: var(--light-theme-text-text-primary, #131315);
   padding-top: 0.69rem;
 }
 </style>
diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 86f36332b3..faa66c30d8 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -1,21 +1,17 @@
 <script setup lang="ts">
 import { reactive, watch, computed, ref, onMounted } from 'vue'
+// Composables
 import { useEventBus } from '@vueuse/core'
-import Delete16 from '@carbon/icons-vue/es/trash-can/16'
+import { useFetchTo } from '@/composables/useFetch'
+import { useFocus } from '@/composables/useFocus'
+// Types
 import type { CodeNameType, BusinessSearchResult } from '@/dto/CommonTypesDto'
 import type { Address } from '@/dto/ApplyClientNumberDto'
-import {
-  isNotEmpty,
-  isCanadianPostalCode,
-  isUsZipCode,
-  isOnlyNumbers,
-  isMaxSize,
-  isMinSize,
-  isNoSpecialCharacters
-} from '@/helpers/validators/GlobalValidators'
+// Validators
+import { getValidations } from '@/helpers/validators/ExternalFormValidations'
 import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
-import { useFetchTo } from '@/composables/useFetch'
-import useFocus from '@/composables/useFocus'
+// @ts-ignore
+import Delete16 from '@carbon/icons-vue/es/trash-can/16'
 
 //Define the input properties for this component
 const props = defineProps<{
@@ -116,19 +112,17 @@ const postalCodeValidators = computed(() => {
   switch (selectedValue.country.value) {
     case 'CA':
       return [
-        isCanadianPostalCode,
+      ...getValidations('location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'),
         submissionValidation(`location.adresses[${props.id}].postalCode`)
       ]
     case 'US':
       return [
-        isUsZipCode,
+      ...getValidations('location.addresses.*.postalCode(location.addresses.*.country.text === "US")'),
         submissionValidation(`location.adresses[${props.id}].postalCode`)
       ]
     default:
       return [
-        isOnlyNumbers,
-        isMinSize(5),
-        isMaxSize(10),
+        ...getValidations('location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")'),
         submissionValidation(`location.adresses[${props.id}].postalCode`)
       ]
   }
@@ -163,7 +157,7 @@ const provinceNaming = computed(() => {
     case 'US':
       return 'State'
     default:
-      return 'Province/terrytory or state'
+      return 'Province/territory or state'
   }
 })
 
@@ -225,10 +219,7 @@ onMounted(() =>{
     v-model="selectedValue.locationName"
     :enabled="true"
     :validations="[
-      isNotEmpty,
-      isMinSize(3),
-      isMaxSize(50),
-      isNoSpecialCharacters,
+      ...getValidations('location.adresses.*.locationName'),
       submissionValidation(`location.adresses[${id}].locationName`)
     ]"
     :error-message="nameError"
@@ -243,7 +234,7 @@ onMounted(() =>{
     tip=""
     :enabled="true"
     :model-value="countryList"
-    :validations="[submissionValidation(`location.adresses[${id}].country`)]"
+    :validations="[...getValidations('location.addresses.country.text'),submissionValidation(`location.adresses[${id}].country`)]"
     :error-message="addressError"
     @update:selected-value="updateStateProvince($event, 'country')"
     @update:model-value="resetProvinceOnChange"
@@ -265,9 +256,7 @@ onMounted(() =>{
       v-model="selectedValue.streetAddress"
       :contents="content"
       :validations="[
-        isNotEmpty,
-        isMinSize(5),
-        isMaxSize(50),
+        ...getValidations('location.adresses.*.streetAddress'),
         submissionValidation(`location.adresses[${id}].streetAddress`)
       ]"
       :loading="loading"
@@ -290,10 +279,7 @@ onMounted(() =>{
     :enabled="true"
     :error-message="addressError"
     :validations="[
-      isNotEmpty,
-      isMinSize(3),
-      isMaxSize(50),
-      isNoSpecialCharacters,
+      ...getValidations('location.adresses.*.city'),
       submissionValidation(`location.adresses[${id}].city`)
     ]"
     @empty="validation.city = !$event"
@@ -314,7 +300,7 @@ onMounted(() =>{
       :model-value="content"
       :enabled="true"
       tip=""
-      :validations="[submissionValidation(`location.adresses[${id}].province`)]"
+      :validations="[...getValidations('location.addresses.*.province.text'),submissionValidation(`location.adresses[${id}].province`)]"
       :error-message="addressError"
       @update:selected-value="updateStateProvince($event, 'province')"
       @empty="validation.province = !$event"
diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index 2ce3fe08d7..6730775f43 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -1,18 +1,15 @@
 <script setup lang="ts">
 import { reactive, watch, ref, onMounted } from 'vue'
-import Delete16 from '@carbon/icons-vue/es/trash-can/16'
+// Importing composables
+import { useFocus } from '@/composables/useFocus'
+// Importing types
 import type { CodeDescrType, CodeNameType } from '@/dto/CommonTypesDto'
 import type { Contact } from '@/dto/ApplyClientNumberDto'
-import {
-  isNotEmpty,
-  isEmail,
-  isPhoneNumber,
-  isMaxSize,
-  isMinSize,
-  isNoSpecialCharacters
-} from '@/helpers/validators/GlobalValidators'
+// Importing validatons
+import { getValidations } from '@/helpers/validators/ExternalFormValidations'
 import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
-import useFocus from '@/composables/useFocus'
+// @ts-ignore
+import Delete16 from '@carbon/icons-vue/es/trash-can/16'
 
 //Define the input properties for this component
 const props = defineProps<{
@@ -99,15 +96,15 @@ onMounted(() =>{
 <template>
   <div class="frame-01">
   <multiselect-input-component
-    :id="'address_' + id"
+    :id="'addressname_' + id"
     label="Address name"
     tip="Select an address name for the contact. A contact can have more than one address"
     :initial-value="''"
     :model-value="addressList"
     :selectedValues="selectedValue.locationNames?.map((location:CodeDescrType) => location?.value)"
     :validations="[
-      isNotEmpty,
-      submissionValidation(`location.contacts[${id}].province`)
+      ...getValidations('location.contacts.*.locationNames.*.text'),
+      submissionValidation(`location.contacts[${id}].locationNames`)
     ]"
     @update:selected-value="
       selectedValue.locationNames = nameTypesToCodeDescr($event)
@@ -122,6 +119,7 @@ onMounted(() =>{
     :initial-value="selectedValue.contactType.value"
     :model-value="roleList"
     :validations="[
+      ...getValidations('location.contacts.*.contactType.text'),
       submissionValidation(`location.contacts[${id}].contactType`)
     ]"
     @update:selected-value="
@@ -136,10 +134,7 @@ onMounted(() =>{
     placeholder="First name"
     v-model="selectedValue.firstName"
     :validations="[
-      isMinSize(1),
-      isMaxSize(25),
-      isNotEmpty,
-      isNoSpecialCharacters,
+      ...getValidations('location.contacts.*.firstName'),
       submissionValidation(`location.contacts[${id}].firstName`)
     ]"
     :enabled="enabled"
@@ -153,10 +148,7 @@ onMounted(() =>{
     placeholder="Last name"
     v-model="selectedValue.lastName"
     :validations="[
-      isMinSize(1),
-      isMaxSize(25),
-      isNotEmpty,
-      isNoSpecialCharacters,
+      ...getValidations('location.contacts.*.lastName'),
       submissionValidation(`location.contacts[${id}].lastName`)
     ]"
     :enabled="enabled"
@@ -170,10 +162,7 @@ onMounted(() =>{
     placeholder="Email"
     v-model="selectedValue.email"
     :validations="[
-      isNotEmpty,
-      isEmail,
-      isMinSize(6),
-      isMaxSize(50),
+      ...getValidations('location.contacts.*.email'),
       submissionValidation(`location.contacts[${id}].email`)
     ]"
     :enabled="enabled"
@@ -188,10 +177,7 @@ onMounted(() =>{
     v-model="selectedValue.phoneNumber"
     :enabled="true"
     :validations="[
-      isNotEmpty,
-      isPhoneNumber,
-      isMaxSize(15),
-      isMinSize(10),
+      ...getValidations('location.contacts.*.phoneNumber'),
       submissionValidation(`location.contacts[${id}].phoneNumber`)
     ]"
     @empty="validation.phoneNumber = !$event"
diff --git a/frontend/src/components/visuals/DisplayBlockComponent.vue b/frontend/src/components/visuals/DisplayBlockComponent.vue
index 2b19cb9d0b..165d8c2b34 100644
--- a/frontend/src/components/visuals/DisplayBlockComponent.vue
+++ b/frontend/src/components/visuals/DisplayBlockComponent.vue
@@ -1,3 +1,25 @@
+<script setup lang="ts">
+//@ts-ignore
+import CheckmarkFilled20 from '@carbon/icons-vue/es/checkmark--filled/24'
+//@ts-ignore
+import WarningFilled20 from '@carbon/icons-vue/es/warning--filled/24'
+//@ts-ignore
+import InfoFilled20 from '@carbon/icons-vue/es/information--filled/24'
+
+const props = defineProps<{
+  kind: string
+  title: string
+  subtitle?: string
+}>()
+
+const iconsForKinds: Record<string, any> = {
+  ['success']: CheckmarkFilled20,
+  ['info']: InfoFilled20,
+  ['warning']: WarningFilled20,
+  ['error']: WarningFilled20
+}
+</script>
+
 <template>
   <div
   data-scroll="top-notification"
@@ -26,24 +48,7 @@
   </div>
 </template>
 
-<script setup lang="ts">
-const props = defineProps<{
-  kind: string
-  title: string
-  subtitle?: string
-}>()
-
-import CheckmarkFilled20 from '@carbon/icons-vue/es/checkmark--filled/24'
-import WarningFilled20 from '@carbon/icons-vue/es/warning--filled/24'
-import InfoFilled20 from '@carbon/icons-vue/es/information--filled/24'
 
-const iconsForKinds: Record<string, any> = {
-  ['success']: CheckmarkFilled20,
-  ['info']: InfoFilled20,
-  ['warning']: WarningFilled20,
-  ['error']: WarningFilled20
-}
-</script>
 
 <style scoped>
 .display-block-wrapper {
@@ -60,9 +65,9 @@ const iconsForKinds: Record<string, any> = {
 
 .display-block-wrapper-info {
   background: #c2e0ff;
-  border: 1px solid #0073E6;
+  border: 1px solid var(--cds-interactive-01);
   border-radius: 4px;
-  border-left: 4px solid #0073E6;
+  border-left: 4px solid var(--cds-interactive-01);
 }
 
 .display-block-wrapper-success {
diff --git a/frontend/src/components/wizard/WizardProgressIndicatorComponent.vue b/frontend/src/components/wizard/WizardProgressIndicatorComponent.vue
index 4c1459c7e5..af263932d6 100644
--- a/frontend/src/components/wizard/WizardProgressIndicatorComponent.vue
+++ b/frontend/src/components/wizard/WizardProgressIndicatorComponent.vue
@@ -1,3 +1,54 @@
+<script setup lang="ts">
+import { toRef, watch } from 'vue'
+// Composables
+import { useEventBus } from '@vueuse/core'
+// Types
+import type { ProgressData } from '@/dto/CommonTypesDto'
+// @ts-ignore
+import Checkmark16 from '@carbon/icons-vue/es/checkmark--outline/16'
+// @ts-ignore
+import Error16 from '@carbon/icons-vue/es/error--outline/16'
+// @ts-ignore
+import Circle16 from '@carbon/icons-vue/es/circle-dash/16'
+// @ts-ignore
+import Info16 from '@carbon/icons-vue/es/incomplete/16'
+
+const props = defineProps<{ modelValue: Array<ProgressData> }>()
+
+// eslint-disable typescript:S6598
+const emit = defineEmits<{ (e: 'go-to', value: number): void }>()
+
+const bus = useEventBus<boolean>('navigation-notification')
+
+const values = toRef(props.modelValue)
+watch(
+  () => props.modelValue,
+  () => {
+    values.value = props.modelValue
+  }
+)
+bus.on(
+  (value: boolean) =>
+    (values.value = values.value.map((item: ProgressData) => {
+      if (item.kind === 'queued') {
+        item.enabled = value
+      }
+      return item
+    }))
+)
+
+const iconsForKinds: Record<string, any> = {
+  ['complete']: Checkmark16,
+  ['current']: Info16,
+  ['queued']: Circle16,
+  ['error']: Error16
+}
+
+const canShowLink = (step: ProgressData) => {
+  return step.kind === 'current' || step.kind === 'complete'
+}
+</script>
+
 <template>
   <div class="form-header-progress">
     <div
@@ -48,48 +99,3 @@
   </div>
 </template>
 
-<script setup lang="ts">
-import { toRef, watch } from 'vue'
-import { useEventBus } from '@vueuse/core'
-import type { ProgressData } from '@/dto/CommonTypesDto'
-
-import Checkmark16 from '@carbon/icons-vue/es/checkmark--outline/16'
-import Error16 from '@carbon/icons-vue/es/error--outline/16'
-import Circle16 from '@carbon/icons-vue/es/circle-dash/16'
-import Info16 from '@carbon/icons-vue/es/incomplete/16'
-
-const props = defineProps<{ modelValue: Array<ProgressData> }>()
-
-/* eslint-disable typescript:S6598 */
-const emit = defineEmits<{ (e: 'go-to', value: number): void }>()
-
-const bus = useEventBus<boolean>('navigation-notification')
-
-const values = toRef(props.modelValue)
-watch(
-  () => props.modelValue,
-  () => {
-    values.value = props.modelValue
-  }
-)
-bus.on(
-  (value: boolean) =>
-    (values.value = values.value.map((item: ProgressData) => {
-      if (item.kind === 'queued') {
-        item.enabled = value
-      }
-      return item
-    }))
-)
-
-const iconsForKinds: Record<string, any> = {
-  ['complete']: Checkmark16,
-  ['current']: Info16,
-  ['queued']: Circle16,
-  ['error']: Error16
-}
-
-const canShowLink = (step: ProgressData) => {
-  return step.kind === 'current' || step.kind === 'complete'
-}
-</script>
\ No newline at end of file
diff --git a/frontend/src/composables/useFocus.ts b/frontend/src/composables/useFocus.ts
index 8125f877e3..d44845b300 100644
--- a/frontend/src/composables/useFocus.ts
+++ b/frontend/src/composables/useFocus.ts
@@ -1,27 +1,34 @@
 import { ref } from 'vue'
-export default function useFocus () {
-  let focusedComponent = ''
-  const changeFocus = () => {
+/**
+ * useFocus composable is used to set focus and/or scroll to a component
+ * @returns two functions to set focus and scroll to a component
+ */
+export function useFocus () {
+  // setActionOn is a function that execute the action on an a component
+  const setActionOn = (focusedComponent:string, key: string,action:((target:any) => {})) => {
+    console.log('setActionOn',focusedComponent,key)
     if (focusedComponent) {
-      const element = document.querySelector(`[data-scroll="${focusedComponent}"]`)
+      const element = document.querySelector(`[${key}="${focusedComponent}"]`)
       if (element) {
-        element.focus()
-        element.scrollIntoView({ behavior: 'smooth', block: 'start' })
+        action(element)
         return element
       }
       return undefined
     }
   }
-  const setFocusedComponent = (componentName:string) => {
-    focusedComponent = componentName
+
+  // execute is a function that execute the action on an a component after a delay
+  // The delay is here to allow the component to be rendered before to execute the action
+  const execute = (componentName:string,key:string,action:((target:any) => {})) => {
     const refComponent = ref<Element|undefined>(undefined)
-    console.log('test0')
-    setTimeout(() => {
-      refComponent.value = changeFocus()
-      console.log('test1', refComponent.value)
-    }, 100)
-    console.log('test2')
+    setTimeout(() => (refComponent.value = setActionOn(componentName,key,action)), 100)
     return refComponent
   }
-  return { setFocusedComponent }
+
+  // Set the focus on a component with the data-focus attribute
+  const setFocusedComponent = (componentName:string) => (execute(componentName,'data-focus', (element) => element.focus()))
+  // Scroll into view a component with the data-scroll attribute
+  const setScrollPoint = (componentName:string) => (execute(componentName,'data-scroll', (element) => element.scrollIntoView({ behavior: 'smooth', block: 'start' })))
+
+  return { setFocusedComponent, setScrollPoint }
 }
diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
new file mode 100644
index 0000000000..4b5d1b5e9c
--- /dev/null
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -0,0 +1,136 @@
+import {
+  isNotEmpty,
+  isEmail,
+  isPhoneNumber,
+  isCanadianPostalCode,
+  isUsZipCode,
+  isMaxSize,
+  isMinSize,
+  isOnlyNumbers,
+  isNoSpecialCharacters
+} from '@/helpers/validators/GlobalValidators'
+
+import type { FormDataDto } from '@/dto/ApplyClientNumberDto'
+
+// We declare here a collection of all validations for every field in the form
+const globalValidations : Record<string, Function[]> = {}
+
+// Step 1: Business Information
+globalValidations['businessInformation.businessName'] = [isNotEmpty]
+
+// Step 2: Addresses
+globalValidations['location.addresses.*.locationName'] = [
+  isNotEmpty,
+  isMinSize(3),
+  isMaxSize(50),
+  isNoSpecialCharacters
+]
+globalValidations['location.addresses.*.country.text'] = [isNotEmpty]
+globalValidations['location.addresses.*.province.text'] = [isNotEmpty]
+globalValidations['location.addresses.*.city'] = [
+  isNotEmpty,
+  isMinSize(3),
+  isMaxSize(50),
+  isNoSpecialCharacters
+]
+globalValidations['location.addresses.*.streetAddress'] = [isNotEmpty, isMinSize(5), isMaxSize(50)]
+globalValidations['location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'] = [isCanadianPostalCode]
+globalValidations['location.addresses.*.postalCode(location.addresses.*.country.text === "US")'] = [isUsZipCode]
+globalValidations['location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && country.text !== "US")'] = [isOnlyNumbers, isMinSize(5), isMaxSize(10)]
+
+// Step 3: Contacts
+
+globalValidations['location.contacts.*.locationNames.*.text'] = [isNotEmpty]
+globalValidations['location.contacts.*.contactType.text'] = [isNotEmpty]
+globalValidations['location.contacts.*.firstName'] = [
+  isMinSize(1),
+  isMaxSize(25),
+  isNotEmpty,
+  isNoSpecialCharacters
+]
+globalValidations['location.contacts.*.lastName'] = [
+  isMinSize(1),
+  isMaxSize(25),
+  isNotEmpty,
+  isNoSpecialCharacters
+]
+globalValidations['location.contacts.*.email'] = [
+  isNotEmpty,
+  isEmail,
+  isMinSize(6),
+  isMaxSize(50)
+]
+globalValidations['location.contacts.*.phoneNumber'] = [
+  isNotEmpty,
+  isPhoneNumber,
+  isMaxSize(15),
+  isMinSize(10)
+]
+
+// Associate the field with the validators here
+
+// This function will extract the field value from the object
+export const getField = (path:string, value: FormDataDto):any => {
+  // First we set is in a temporary variable
+  let temporaryValue: any = value
+  // We split the path by dots and iterate over it
+  path.split('.').forEach((key:string) => {
+    // If the temporary value is not undefined we dig in
+    if (temporaryValue[key] !== undefined) {
+      // If the temporary value is an array we iterate over it
+      if (Array.isArray(temporaryValue[key])) {
+        // Array fields are split by star to indicate that we want to iterate over the array
+        // Due to that, we split the path by the star and get the second element containing the rest of the path
+        temporaryValue = temporaryValue[key].map((item:any) => getField(path.split('.*.').slice(1).join('.*.'), item))
+        // if is not an array we just set the value
+      } else { temporaryValue = temporaryValue[key] }
+    }
+  })
+
+  // At the end we return the value, keep in mind that the value can be an array if the field is an array
+  return temporaryValue
+}
+
+// This function will return all validators for the field
+export const getValidations = (key: string) : Function[] => (globalValidations[key] || [])
+
+
+// This function will run the validators and return the errors
+export const validate = (keys: string[], target: FormDataDto): boolean => {
+// For every received key we get the validations and run them
+return keys.every((key) => {
+  // First we get all validators for that field
+  const validations: Function[] = getValidations(key);
+  //If there is no corresponding key in the validations we return false
+  if(!validations) return false
+  // For every validator we run it and check if the result is empty
+  return validations.every((validation: Function) => {
+    // We split the field key and the condition if it has one
+    const [fieldKey, fieldCondition] = key.includes('(') ? key.replace(')','').split('(') : [key, 'true'];
+    // We then load the field value
+    const fieldValue = getField(fieldKey, target);
+    // We define a function that will run the validation if the condition is true
+    const buildEval = (condition: string) => condition === 'true' ? 'true' : `target.${condition}`;
+    const runValidation = (item: any,condition:string) => eval(condition) ? validation(item) === '' : true;
+    // If the field value is an array we run the validation for every item in the array
+    if (Array.isArray(fieldValue)) {
+      return fieldValue.every((item: any,index:number) => {
+        // And sometimes we can end up with another array inside, that's life
+        if (Array.isArray(item)) {
+          if(item.length === 0) item.push('')
+          return item.every((subItem:any) => runValidation(subItem,buildEval(fieldCondition.replace('.*.',`[${index}].`))));
+        }
+        // If it is not an array here, just validate it
+        return runValidation(item,buildEval(fieldCondition.replace('.*.',`[${index}].`)));
+      });
+    }
+    // If the field value is not an array we run the validation for the field
+    return runValidation(fieldValue,fieldCondition);
+  });
+});
+}
+
+export const addValidation = (key: string, validation: Function) => {
+  if (!globalValidations[key]) globalValidations[key] = [];
+  globalValidations[key].push(validation);
+}
\ No newline at end of file
diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 8f7a8dd37b..6e68c30e7b 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -1,3 +1,5 @@
+import type { Ref } from 'vue'
+
 // Defines the used regular expressions
 const emailRegex: RegExp = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
 const specialCharacters: RegExp = /^[a-zA-Z0-9\sÀ-ÖØ-öø-ÿ]+$/
@@ -193,3 +195,9 @@ export const isNoSpecialCharacters = (value: string) => {
   if (specialCharacters.test(value)) return ''
   return 'No special characters allowed'
 }
+
+
+export const isContainedIn = (values: Ref<string[]>) => (value: string) => {
+  if (values.value.includes(value)) return ''
+  return 'No value selected'
+}
\ No newline at end of file
diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index 88ac336cc6..9f0bb8b4ef 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -1,36 +1,44 @@
 <script setup lang="ts">
 import { reactive, watch, toRef, ref, getCurrentInstance, computed } from 'vue'
+// Composables
 import { useEventBus } from '@vueuse/core'
 import { useRouter } from 'vue-router'
-import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16'
-import Save16 from '@carbon/icons-vue/es/save/16'
-import LogOut16 from '@carbon/icons-vue/es/logout/16'
-import Check16 from '@carbon/icons-vue/es/checkmark/16'
+import { useFocus } from '@/composables/useFocus';
+import { usePost } from '@/composables/useFetch'
+// Imported Pages
 import BusinessInformationWizardStep from '@/pages/applyform/BusinessInformationWizardStep.vue'
 import AddressWizardStep from '@/pages/applyform/AddressWizardStep.vue'
 import ContactWizardStep from '@/pages/applyform/ContactWizardStep.vue'
 import ReviewWizardStep from '@/pages/applyform/ReviewWizardStep.vue'
+// Imported types
 import {
   newFormDataDto,
   type FormDataDto,
   type Contact
 } from '@/dto/ApplyClientNumberDto'
-
 import type { ValidationMessageType, ModalNotification } from '@/dto/CommonTypesDto'
-import { usePost } from '@/composables/useFetch'
+// Imported User session
 import ForestClientUserSession from '@/helpers/ForestClientUserSession'
-import useFocus from '@/composables/useFocus';
+// Imported global validations
+import { addValidation,validate } from '@/helpers/validators/ExternalFormValidations'
+// @ts-ignore
+import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16'
+// @ts-ignore
+import Save16 from '@carbon/icons-vue/es/save/16'
+// @ts-ignore
+import LogOut16 from '@carbon/icons-vue/es/logout/16'
+// @ts-ignore
+import Check16 from '@carbon/icons-vue/es/checkmark/16'
+import { isContainedIn } from '@/helpers/validators/GlobalValidators';
 
-const { setFocusedComponent } = useFocus();
-const submitterInformation = ForestClientUserSession.user
-const errorBus = useEventBus<ValidationMessageType[]>(
-  'submission-error-notification'
-)
+const errorBus = useEventBus<ValidationMessageType[]>('submission-error-notification')
 const generalErrorBus = useEventBus<string>('general-error-notification')
 const exitBus = useEventBus<Record<string, boolean | null>>('exit-notification')
+const toastBus = useEventBus<ModalNotification>('toast-notification')
 
 const router = useRouter()
-
+const { setScrollPoint } = useFocus();
+const submitterInformation = ForestClientUserSession.user
 const instance = getCurrentInstance()
 const session = instance?.appContext.config.globalProperties.$session
 
@@ -54,6 +62,8 @@ let formData = reactive<FormDataDto>({
   }
 })
 
+const locations = computed(() => formData.location.addresses.map((address:any) => address.locationName))
+
 const { response, error, fetch } = usePost(
   '/api/clients/submissions',
   toRef(formData).value,
@@ -89,37 +99,93 @@ watch([error], () => {
       generalErrorBus.emit(
         `There was an error submitting your application. ${matchingFields.errorMsg}`
       )
-      setFocusedComponent('top-notification')
+      setScrollPoint('top')
     }
   } else {
     generalErrorBus.emit(
       `There was an error submitting your application. ${error.value.data}}`
     )
-    window.scrollTo({ top: 0, behavior: 'smooth' })
+    setScrollPoint('top')
   }
 })
 
-const submit = () => {
-  errorBus.emit([])
-  generalErrorBus.emit('')
-  fetch()
-}
+addValidation('location.contacts.*.locationNames.*.text', isContainedIn(locations))
 
 
 // Tab system
-const progressData = reactive(
-  ['Business information','Address','Contacts','Review']
-  .map((title, index) => {
-    return {
-      title,
-      subtitle: `Step ${index + 1}`,
-      kind: index === 0 ? 'current' : 'queued',
-      enabled: true,
-      valid: false
-    }
-  })
-  
-)
+const progressData = reactive([
+  {
+    title: 'Business Information',
+    subtitle: 'Step 1',
+    kind: 'current',
+    enabled: true,
+    valid: false,
+    step:0,
+    fields: [
+      'businessInformation.businessType',
+      'businessInformation.businessName'
+    ]
+  },{
+    title: 'Address',
+    subtitle: 'Step 2',
+    kind: 'queued',
+    enabled: true,
+    valid: false,
+    step:1,
+    fields: [
+      'location.addresses.*.locationName',
+      'location.addresses.*.country.text',
+      'location.addresses.*.province.text',
+      'location.addresses.*.city',
+      'location.addresses.*.streetAddress',
+      'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
+      'location.addresses.*.postalCode(location.addresses.*.country.text === "US")',
+      'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")'
+    ]
+  },
+  {
+    title: 'Contacts',
+    subtitle: 'Step 3',
+    kind: 'queued',
+    enabled: true,
+    valid: false,
+    step:2,
+    fields: [
+      'location.contacts.*.locationNames.*.text',
+      'location.contacts.*.contactType.text',
+      'location.contacts.*.firstName',
+      'location.contacts.*.lastName',
+      'location.contacts.*.email',
+      'location.contacts.*.phoneNumber'
+    ]
+  },
+  {
+    title: 'Review',
+    subtitle: 'Step 4',
+    kind: 'queued',
+    enabled: true,
+    valid: false,
+    step:3,
+    fields: [
+    'businessInformation.businessType',
+    'businessInformation.businessName',
+    'location.addresses.*.locationName',
+    'location.addresses.*.country.text',
+    'location.addresses.*.province.text',
+    'location.addresses.*.city',
+    'location.addresses.*.streetAddress',
+    'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
+    'location.addresses.*.postalCode(location.addresses.*.country.text === "US")',
+    'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")',
+    'location.contacts.*.locationNames.*.text',
+    'location.contacts.*.contactType.text',
+    'location.contacts.*.firstName',
+    'location.contacts.*.lastName',
+    'location.contacts.*.email',
+    'location.contacts.*.phoneNumber'
+    ]
+  }
+])
 
 const currentTab = ref(0);
 
@@ -129,6 +195,16 @@ const stateIcon = (index: number) => {
   return 'queued'
 }
 
+const checkStepValidity = (stepNumber: number) : boolean =>{
+  progressData.forEach((step:any) => {
+    if(step.step <= stepNumber){
+      step.valid = validate(step.fields,formData);
+      if(!step.valid) step.kind = 'error'
+    }
+  })
+  return progressData[stepNumber].valid
+}
+
 const isLast = computed(() => currentTab.value === progressData.length - 1)
 const isFirst = computed(() => currentTab.value === 0)
 const isCurrentValid = computed(() => progressData[currentTab.value].valid)
@@ -137,14 +213,18 @@ const isFormValid = computed(() => progressData.every((entry: any) => entry.vali
 const endAndLogOut = ref<boolean>(false)
 const mailAndLogOut = ref<boolean>(false)
 
-const goToStep = (index: number) => (currentTab.value = index)
+const goToStep = (index: number) => {
+  if(checkStepValidity(index)) currentTab.value = index
+}
 
 const onNext = () => {
   if (currentTab.value + 1 < progressData.length) {
-    currentTab.value++
-    progressData[currentTab.value-1].kind = stateIcon(currentTab.value-1)
-    progressData[currentTab.value].kind = stateIcon(currentTab.value)
-    setFocusedComponent(`focus-${currentTab.value}`)
+    if(checkStepValidity(currentTab.value)){
+      currentTab.value++
+      progressData[currentTab.value-1].kind = stateIcon(currentTab.value-1)
+      progressData[currentTab.value].kind = stateIcon(currentTab.value)
+      setScrollPoint('top')
+    }
   }
 }
 const onBack = () => {
@@ -152,24 +232,22 @@ const onBack = () => {
     currentTab.value--
     progressData[currentTab.value+1].kind = stateIcon(currentTab.value+1)
     progressData[currentTab.value].kind = stateIcon(currentTab.value)
-    setFocusedComponent(`focus-${currentTab.value}`)
+    setScrollPoint('top')
   }
 }
 const validateStep = (valid: boolean) => {
   progressData[currentTab.value].valid = valid
 }
-const openToast = (event: ModalNotification) => {
-  console.log(event)
-}
-
 const saveChange = () => {
-  openToast({
-    message: `“${progressData[currentTab.value].title}” changes was saved successfully.`,
-    kind: 'Success',
-    active: true,
-    handler: () => {}
-  })
-  goToStep(3)
+  if(checkStepValidity(currentTab.value)){
+    toastBus.emit({
+      message: `“${progressData[currentTab.value].title}” changes was saved successfully.`,
+      kind: 'Success',
+      active: true,
+      handler: () => {}
+    })
+    goToStep(3)
+  }
 }
 
 const processAndLogOut = () => {
@@ -189,6 +267,14 @@ const processAndLogOut = () => {
   session?.logOut()
 }
 
+const submit = () => {
+  errorBus.emit([])
+  generalErrorBus.emit('')
+  if(checkStepValidity(currentTab.value)){
+    fetch()
+  }
+}
+
 exitBus.on((event: Record<string, boolean | null>) => {
   endAndLogOut.value = event.goodStanding ? event.goodStanding : false
   mailAndLogOut.value = event.duplicated ? event.duplicated : false
@@ -196,12 +282,16 @@ exitBus.on((event: Record<string, boolean | null>) => {
 
 const globalErrorMessage = ref<string>('')
 generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
+
+watch(formData,() =>{
+  checkStepValidity(currentTab.value)
+})
 </script>
 
 <template>
   <div class="form-header">
     <div class="form-header-title">
-      <span class="heading-05">New client application</span>
+      <span class="heading-05" data-scroll="top">New client application</span>
       <p class="body-01">All fields are mandatory</p>
     </div>
       <wizard-progress-indicator-component
@@ -214,7 +304,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
 
     <div v-if="currentTab == 0" class="form-steps-01">
       <div class="form-steps-01-title">
-        <span class="heading-04">Before you begin</span>
+        <span class="heading-04" data-scroll="scroll-0">Before you begin</span>
         <ol type="1" class="bulleted-list body-compact-01">
           <li>
             A registered business must be in good standing with BC
@@ -243,7 +333,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
 
     <div v-if="currentTab == 1" class="form-steps-02">
       <div class="form-steps-section">
-        <span class="heading-04">{{ progressData[1].title}}</span>
+        <span class="heading-04" data-scroll="scroll-1">{{ progressData[1].title}}</span>
         
         <div class="form-steps-section-01">
             <p class="body-01 heading-compact-01-dark">
@@ -261,7 +351,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
 
     <div v-if="currentTab == 2" class="form-steps-03">
       <div class="form-steps-section">
-        <span class="heading-04">{{ progressData[2].title}}</span>
+        <span class="heading-04" data-scroll="scroll-2">{{ progressData[2].title}}</span>
         
         <div class="form-steps-section-01">
           <span class="heading-03"
@@ -301,7 +391,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
 
 
       <div class="form-steps-section form-steps-section-04">
-          <span class="heading-04" data-scroll="focus-3">{{ progressData[3].title}}</span>
+          <span class="heading-04" data-scroll="scroll-3">{{ progressData[3].title}}</span>
           <span class="body-02">Review the content and make any changes by navigating through the steps above or using the "Edit" buttons in each section below.</span>
 
         <review-wizard-step
diff --git a/frontend/src/pages/applyform/AddressWizardStep.vue b/frontend/src/pages/applyform/AddressWizardStep.vue
index 088572fe97..8d510d40b6 100644
--- a/frontend/src/pages/applyform/AddressWizardStep.vue
+++ b/frontend/src/pages/applyform/AddressWizardStep.vue
@@ -10,7 +10,7 @@ import {
 import { useFetchTo } from '@/composables/useFetch'
 import type { ModalNotification } from '@/dto/CommonTypesDto'
 import { isUniqueDescriptive } from '@/helpers/validators/GlobalValidators'
-import useFocus from '@/composables/useFocus'
+import { useFocus } from '@/composables/useFocus'
 
 //Defining the props and emitter to receive the data and emit an update
 const props = defineProps<{ data: FormDataDto; active: boolean }>()
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index 028f8def5c..b07e4f29b7 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -1,17 +1,22 @@
 <script setup lang="ts">
 import { watch, computed, ref, reactive } from 'vue'
+// Importing composables
 import { useEventBus } from '@vueuse/core'
 import { useFetchTo } from '@/composables/useFetch'
-import useFocus from '@/composables/useFocus'
-import { type BusinessSearchResult, ClientTypeEnum } from '@/dto/CommonTypesDto'
+import { useFocus } from '@/composables/useFocus'
+// Importing types
+import type { BusinessSearchResult} from '@/dto/CommonTypesDto'
+import { ClientTypeEnum } from '@/dto/CommonTypesDto'
 import type {
   FormDataDto,
   ForestClientDetailsDto
 } from '@/dto/ApplyClientNumberDto'
-import RadioInputComponent from '@/components/forms/RadioInputComponent.vue'
-import { isNotEmpty } from '@/helpers/validators/GlobalValidators'
+// Importing validators
+import { getValidations } from '@/helpers/validators/ExternalFormValidations'
 import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
+// Importing helper functions
 import { retrieveClientType, exportAddress } from '@/helpers/DataConversors'
+// Importing session
 import ForestClientUserSession from '@/helpers/ForestClientUserSession'
 
 //Defining the props and emiter to reveice the data and emit an update
@@ -78,8 +83,8 @@ const toggleErrorMessages = (
   goodStanding: boolean | null,
   duplicated: boolean | null
 ) => {
-  showGoodStandingError.value = goodStanding ? goodStanding : false
-  showDuplicatedError.value = duplicated ? duplicated : false
+  showGoodStandingError.value = goodStanding || false
+  showDuplicatedError.value = duplicated || false
 
   if (goodStanding || duplicated) {
     navigationBus.emit(false)
@@ -198,7 +203,7 @@ watch([selectedOption], () => {
       },
       { value: 'U', text: 'I have an unregistered sole proprietorship' }
     ]"
-    :validations="[submissionValidation('businessInformation.businessType')]"
+    :validations="[...getValidations('businessInformation.businessType'),submissionValidation('businessInformation.businessType')]"
     @update:model-value="
       formData.businessInformation.businessType = $event ?? ''
     "
@@ -219,10 +224,7 @@ watch([selectedOption], () => {
       tip=""
       v-model="formData.businessInformation.businessName"
       :contents="content"
-      :validations="[
-        isNotEmpty,
-        submissionValidation('businessInformation.businessName')
-      ]"
+      :validations="[...getValidations('businessInformation.businessName'),submissionValidation('businessInformation.businessName')]"
       :loading="loading"
       @update:selected-value="autoCompleteResult = $event"
     />
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index ec168ade7c..d027703cce 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -2,14 +2,13 @@
 import { watch, ref, computed, reactive, onMounted } from 'vue'
 import { useEventBus } from '@vueuse/core'
 import Add16 from '@carbon/icons-vue/es/add/16'
-
 import {
   type FormDataDto,
   type Contact,
   emptyContact
 } from '@/dto/ApplyClientNumberDto'
 import { useFetchTo } from '@/composables/useFetch'
-import useFocus from '@/composables/useFocus'
+import { useFocus } from '@/composables/useFocus'
 import type { CodeNameType, ModalNotification } from '@/dto/CommonTypesDto'
 import { isUniqueDescriptive } from '@/helpers/validators/GlobalValidators'
 
@@ -110,7 +109,7 @@ const handleRemove = (index: number) => {
   })
 }
 
-onMounted(() => setFocusedComponent('address_0'))
+onMounted(() => setFocusedComponent('addressname_0'))
 </script>
 
 <template>
@@ -135,7 +134,6 @@ onMounted(() => setFocusedComponent('address_0'))
     <div  v-for="(contact, index) in otherContacts">
       <hr v-if="index > 0"/>
     <contact-group-component
-    
       :key="index + 1"
       :id="index + 1"
       v-bind:modelValue="contact"
diff --git a/frontend/src/pages/applyform/ReviewWizardStep.vue b/frontend/src/pages/applyform/ReviewWizardStep.vue
index b798fed8f6..31c0a57c4f 100644
--- a/frontend/src/pages/applyform/ReviewWizardStep.vue
+++ b/frontend/src/pages/applyform/ReviewWizardStep.vue
@@ -1,3 +1,41 @@
+<script setup lang="ts">
+import { watch, ref, onMounted } from 'vue'
+import { useEventBus } from '@vueuse/core'
+import type { FormDataDto } from '@/dto/ApplyClientNumberDto'
+import Edit16 from '@carbon/icons-vue/es/edit/16'
+
+//Defining the props and emiter to reveice the data and emit an update
+const props = defineProps<{
+  data: FormDataDto
+  active: boolean
+  goToStep: Function
+}>()
+
+const emit = defineEmits<{
+  (e: 'update:data', value: FormDataDto): void
+  (e: 'valid', value: boolean): void
+}>()
+
+const revalidateBus = useEventBus<void>('revalidate-bus')
+
+//Set the prop as a ref, and then emit when it changes
+const formData = ref<FormDataDto>(props.data)
+watch([formData], () => emit('update:data', formData.value))
+
+//So far, hardcoded the value but should be coming from somewhere else
+const companyBusinessTypes: Record<string, string> = {
+  R: 'B.C. Registered Business - Corporation',
+  U: 'Sole Proprietorship'
+}
+
+//We emit valid here because there is nothing else to be done here apart from showing information
+emit('valid', true)
+
+onMounted(() => {
+  revalidateBus.emit()
+  })
+</script>
+
 <template>
   <div class="grouping-05">
     <label class="heading-03">Business information</label>
@@ -82,35 +120,3 @@
     </bx-btn>
   </div>
 </template>
-
-<script setup lang="ts">
-import { watch, ref } from 'vue'
-
-import type { FormDataDto } from '@/dto/ApplyClientNumberDto'
-import Edit16 from '@carbon/icons-vue/es/edit/16'
-
-//Defining the props and emiter to reveice the data and emit an update
-const props = defineProps<{
-  data: FormDataDto
-  active: boolean
-  goToStep: Function
-}>()
-
-const emit = defineEmits<{
-  (e: 'update:data', value: FormDataDto): void
-  (e: 'valid', value: boolean): void
-}>()
-
-//Set the prop as a ref, and then emit when it changes
-const formData = ref<FormDataDto>(props.data)
-watch([formData], () => emit('update:data', formData.value))
-
-//So far, hardcoded the value but should be coming from somewhere else
-const companyBusinessTypes: Record<string, string> = {
-  R: 'B.C. Registered Business - Corporation',
-  U: 'Sole Proprietorship'
-}
-
-//We emit valid here because there is nothing else to be done here apart from showing information
-emit('valid', true)
-</script>

From efb30ff9a59015e7d9a76890c44a467e923432e9 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 28 Aug 2023 12:57:51 -0700
Subject: [PATCH 027/313] fix: fixing progress bar

---
 frontend/src/pages/ApplyClientNumberPage.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index 9f0bb8b4ef..213bc3e216 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -199,7 +199,7 @@ const checkStepValidity = (stepNumber: number) : boolean =>{
   progressData.forEach((step:any) => {
     if(step.step <= stepNumber){
       step.valid = validate(step.fields,formData);
-      if(!step.valid) step.kind = 'error'
+      //if(!step.valid) step.kind = 'error'
     }
   })
   return progressData[stepNumber].valid
@@ -243,6 +243,7 @@ const saveChange = () => {
     toastBus.emit({
       message: `“${progressData[currentTab.value].title}” changes was saved successfully.`,
       kind: 'Success',
+      toastTitle:'',
       active: true,
       handler: () => {}
     })
@@ -282,10 +283,6 @@ exitBus.on((event: Record<string, boolean | null>) => {
 
 const globalErrorMessage = ref<string>('')
 generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
-
-watch(formData,() =>{
-  checkStepValidity(currentTab.value)
-})
 </script>
 
 <template>

From 1c454257ddb38c1c4a0fe27d11b6db04490479dc Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 28 Aug 2023 14:02:14 -0700
Subject: [PATCH 028/313] fix: fixing focus and scroll to view

---
 .../src/components/grouping/AddressGroupComponent.vue     | 4 ++--
 .../src/components/grouping/ContactGroupComponent.vue     | 2 +-
 frontend/src/composables/useFocus.ts                      | 8 ++++----
 frontend/src/pages/applyform/AddressWizardStep.vue        | 4 ++--
 .../src/pages/applyform/BusinessInformationWizardStep.vue | 5 -----
 frontend/src/pages/applyform/ContactWizardStep.vue        | 2 +-
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index faa66c30d8..00c1ba3f9b 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -204,8 +204,8 @@ watch([detailsData], () => {
 })
 
 onMounted(() =>{
-  if(props.id == 0) setFocusedComponent(`addr_${props.id}`)
-  else setFocusedComponent(`name_${props.id}`)
+  if(props.id == 0) setFocusedComponent(`addr_${props.id}`,800)
+  else setFocusedComponent(`name_${props.id}`,200)
 })
 </script>
 
diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index 6730775f43..e79b333cf9 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -89,7 +89,7 @@ const nameTypesToCodeDescr = (
 }
 
 onMounted(() =>{
-  setFocusedComponent(`address_${props.id}`)
+  setFocusedComponent(`address_${props.id}`,800)
 })
 </script>
 
diff --git a/frontend/src/composables/useFocus.ts b/frontend/src/composables/useFocus.ts
index d44845b300..e062562c12 100644
--- a/frontend/src/composables/useFocus.ts
+++ b/frontend/src/composables/useFocus.ts
@@ -19,16 +19,16 @@ export function useFocus () {
 
   // execute is a function that execute the action on an a component after a delay
   // The delay is here to allow the component to be rendered before to execute the action
-  const execute = (componentName:string,key:string,action:((target:any) => {})) => {
+  const execute = (componentName:string,key:string,action:((target:any) => {}),time:number = 100) => {
     const refComponent = ref<Element|undefined>(undefined)
-    setTimeout(() => (refComponent.value = setActionOn(componentName,key,action)), 100)
+    setTimeout(() => (refComponent.value = setActionOn(componentName,key,action)), time)
     return refComponent
   }
 
   // Set the focus on a component with the data-focus attribute
-  const setFocusedComponent = (componentName:string) => (execute(componentName,'data-focus', (element) => element.focus()))
+  const setFocusedComponent = (componentName:string,time:number = 100) => (execute(componentName,'data-focus', (element) => element.focus(),time))
   // Scroll into view a component with the data-scroll attribute
-  const setScrollPoint = (componentName:string) => (execute(componentName,'data-scroll', (element) => element.scrollIntoView({ behavior: 'smooth', block: 'start' })))
+  const setScrollPoint = (componentName:string,time:number = 100) => (execute(componentName,'data-scroll', (element) => element.scrollIntoView({ behavior: 'smooth', block: 'start' }),time))
 
   return { setFocusedComponent, setScrollPoint }
 }
diff --git a/frontend/src/pages/applyform/AddressWizardStep.vue b/frontend/src/pages/applyform/AddressWizardStep.vue
index 8d510d40b6..8b8652d57f 100644
--- a/frontend/src/pages/applyform/AddressWizardStep.vue
+++ b/frontend/src/pages/applyform/AddressWizardStep.vue
@@ -88,7 +88,7 @@ const removeAddress = (index: number) => () => {
   uniqueValues.remove('Address',index+'')
   uniqueValues.remove('Names',index+'')
   bus.emit({ active: false, message: '', kind: '', toastTitle: '', handler: () => {} });
-  setFocusedComponent(`addr_addr_${index-1}`);
+  setFocusedComponent(`addr_addr_${index-1}`,200);
 };
 
 const handleRemove = (index: number) => {
@@ -104,7 +104,7 @@ const handleRemove = (index: number) => {
   });
 };
 
-onMounted(() => setFocusedComponent('addr_0'))
+onMounted(() => setFocusedComponent('addr_0',800))
 </script>
 
 <template>
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index b07e4f29b7..651080a676 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -3,7 +3,6 @@ import { watch, computed, ref, reactive } from 'vue'
 // Importing composables
 import { useEventBus } from '@vueuse/core'
 import { useFetchTo } from '@/composables/useFetch'
-import { useFocus } from '@/composables/useFocus'
 // Importing types
 import type { BusinessSearchResult} from '@/dto/CommonTypesDto'
 import { ClientTypeEnum } from '@/dto/CommonTypesDto'
@@ -32,8 +31,6 @@ const navigationBus = useEventBus<boolean>('navigation-notification')
 const exitBus = useEventBus<Record<string, boolean | null>>('exit-notification')
 const generalErrorBus = useEventBus<string>('general-error-notification')
 
-const { setFocusedComponent } = useFocus();
-
 //Set the prop as a ref, and then emit when it changes
 const formData = ref<FormDataDto>(props.data)
 watch(
@@ -181,12 +178,10 @@ watch([selectedOption], () => {
       ForestClientUserSession.user?.businessName ? ForestClientUserSession.user?.businessName :fromName
     validation.business = true
     emit('update:data', formData.value)
-    setFocusedComponent('nextBtn')
   } else {
     formData.value.businessInformation.businessName = ''
     validation.business = false
     showAutoCompleteInfo.value = true
-    setFocusedComponent('business')
   }
 })
 </script>
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index d027703cce..0e1bfa9019 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -109,7 +109,7 @@ const handleRemove = (index: number) => {
   })
 }
 
-onMounted(() => setFocusedComponent('addressname_0'))
+onMounted(() => setFocusedComponent('addressname_0',800))
 </script>
 
 <template>

From 29b71464e114bd13e4568c53a7b0e90ea1c08cc3 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 29 Aug 2023 06:45:57 -0700
Subject: [PATCH 029/313] chore: updating lint and preetier

---
 frontend/.eslintrc.js              | 42 ++++++++++++++++++------------
 frontend/.prettierrc               |  1 -
 frontend/.prettierrc.js            |  8 ++++++
 frontend/package-lock.json         | 10 +++----
 frontend/package.json              | 10 +++----
 frontend/tsconfig.app.json         |  1 +
 frontend/tsconfig.vite-config.json |  1 +
 7 files changed, 46 insertions(+), 27 deletions(-)
 delete mode 100644 frontend/.prettierrc
 create mode 100644 frontend/.prettierrc.js

diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index 46a37085a7..72ea83cf16 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -5,16 +5,18 @@ module.exports = {
     es2021: true,
     jest: true,
     node: true,
-    'vue/setup-compiler-macros': true
+    'vue/setup-compiler-macros': true,
   },
-  'import/resolver': {
-    node: {
-      extensions: ['.js', '.jsx', '.ts', '.tsx', '.vue'],
-      moduleDirectory: ['node_modules', 'src/']
+  settings: {
+    'import/resolver': {
+      node: {
+        extensions: ['.js', '.jsx', '.ts', '.tsx', '.vue'],
+        moduleDirectory: ['node_modules', 'src/'],
+      },
+      typescript: {
+        alwaysTryTypes: true,
+      },
     },
-    typescript: {
-      alwaysTryTypes: true
-    }
   },
   extends: [
     'plugin:import/errors',
@@ -23,27 +25,35 @@ module.exports = {
     'standard',
     'prettier',
     'plugin:vue/vue3-essential',
+    'plugin:prettier/recommended',
     'eslint:recommended',
     '@vue/typescript/recommended',
     '@vue/eslint-config-typescript/recommended',
-    '@vue/eslint-config-prettier'
+    '@vue/eslint-config-prettier',
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
     ecmaVersion: 'latest',
-    sourceType: 'module'
+    sourceType: 'module',
+  },
+  plugins: ['@typescript-eslint', 'prettier'],
+  rules: {
+    'prettier/prettier': 'error',
+    '@typescript-eslint/explicit-module-boundary-types': 'error',
+    '@typescript-eslint/no-unused-vars': 'error',
+    'vue/no-multiple-template-root': 'error',
+    'vue/no-v-html': 'error',
+    'vue/require-prop-types': 'error',
   },
-  plugins: ['@typescript-eslint'],
-  rules: {},
   overrides: [
     {
       files: ['cypress/integration/**.spec.{js,ts,jsx,tsx}'],
-      extends: ['plugin:cypress/recommended']
-    }
+      extends: ['plugin:cypress/recommended'],
+    },
   ],
   globals: {
     config: 'readable',
     cy: 'readonly',
-    Cypress: 'readonly'
-  }
+    Cypress: 'readonly',
+  },
 }
diff --git a/frontend/.prettierrc b/frontend/.prettierrc
deleted file mode 100644
index 0967ef424b..0000000000
--- a/frontend/.prettierrc
+++ /dev/null
@@ -1 +0,0 @@
-{}
diff --git a/frontend/.prettierrc.js b/frontend/.prettierrc.js
new file mode 100644
index 0000000000..be7ee4d9c4
--- /dev/null
+++ b/frontend/.prettierrc.js
@@ -0,0 +1,8 @@
+module.exports = {
+  semi: false,
+  singleQuote: true,
+  printWidth: 100,
+  tabWidth: 2,
+  trailingComma: 'all',
+  arrowParens: 'always',
+};
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 39419a9564..b9a1516fd4 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -31,8 +31,8 @@
         "@types/cypress": "^1.1.3",
         "@types/jsdom": "^21.1.0",
         "@types/node": "^18.14.2",
-        "@typescript-eslint/eslint-plugin": "^6.0.0",
-        "@typescript-eslint/parser": "^6.0.0",
+        "@typescript-eslint/eslint-plugin": "^6.5.0",
+        "@typescript-eslint/parser": "^6.5.0",
         "@vitejs/plugin-vue": "^4.0.0",
         "@vitest/coverage-istanbul": "^0.34.0",
         "@vue/eslint-config-prettier": "^8.0.0",
@@ -40,18 +40,18 @@
         "@vue/test-utils": "^2.4.0",
         "@vue/tsconfig": "^0.1.3",
         "cypress": "^12.17.4",
-        "eslint": "^8.44.0",
+        "eslint": "^8.48.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-config-standard": "^17.1.0",
         "eslint-plugin-cypress": "^2.12.1",
         "eslint-plugin-import": "^2.27.5",
-        "eslint-plugin-vue": "^9.0.0",
+        "eslint-plugin-vue": "^9.17.0",
         "istanbul-lib-coverage": "^3.2.0",
         "istanbul-lib-instrument": "^6.0.0",
         "jsdom": "^22.1.0",
         "lcov-result-merger": "^4.1.0",
         "nyc": "^15.1.0",
-        "prettier": "^3.0.0",
+        "prettier": "^3.0.3",
         "sass": "^1.63.4",
         "sass-loader": "^13.3.2",
         "source-map-support": "^0.5.21",
diff --git a/frontend/package.json b/frontend/package.json
index efe9a0fc19..b1755206a7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -64,8 +64,8 @@
     "@types/cypress": "^1.1.3",
     "@types/jsdom": "^21.1.0",
     "@types/node": "^18.14.2",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.5.0",
+    "@typescript-eslint/parser": "^6.5.0",
     "@vitejs/plugin-vue": "^4.0.0",
     "@vitest/coverage-istanbul": "^0.34.0",
     "@vue/eslint-config-prettier": "^8.0.0",
@@ -73,18 +73,18 @@
     "@vue/test-utils": "^2.4.0",
     "@vue/tsconfig": "^0.1.3",
     "cypress": "^12.17.4",
-    "eslint": "^8.44.0",
+    "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard": "^17.1.0",
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-vue": "^9.0.0",
+    "eslint-plugin-vue": "^9.17.0",
     "istanbul-lib-coverage": "^3.2.0",
     "istanbul-lib-instrument": "^6.0.0",
     "jsdom": "^22.1.0",
     "lcov-result-merger": "^4.1.0",
     "nyc": "^15.1.0",
-    "prettier": "^3.0.0",
+    "prettier": "^3.0.3",
     "sass": "^1.63.4",
     "sass-loader": "^13.3.2",
     "source-map-support": "^0.5.21",
diff --git a/frontend/tsconfig.app.json b/frontend/tsconfig.app.json
index b8c00330d9..d8f03a594b 100644
--- a/frontend/tsconfig.app.json
+++ b/frontend/tsconfig.app.json
@@ -4,6 +4,7 @@
   "exclude": ["src/tests/*"],
   "compilerOptions": {
     "composite": true,
+    "verbatimModuleSyntax": true,
     "baseUrl": ".",
     "paths": {
       "@/*": ["./src/*"]
diff --git a/frontend/tsconfig.vite-config.json b/frontend/tsconfig.vite-config.json
index d20d872603..205e9037e2 100644
--- a/frontend/tsconfig.vite-config.json
+++ b/frontend/tsconfig.vite-config.json
@@ -3,6 +3,7 @@
   "include": ["vite.config.*"],
   "compilerOptions": {
     "composite": true,
+    "verbatimModuleSyntax": true,
     "types": ["node", "vitest"]
   }
 }

From 6a503096f630f436a434600350f8bfb114dbb674 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 29 Aug 2023 08:07:53 -0700
Subject: [PATCH 030/313] fix: fixing notification bar color

---
 frontend/src/assets/styles/global.scss        | 31 +++++++++++++++++--
 .../visuals/DisplayBlockComponent.vue         | 11 ++++---
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index f00c409615..2c6c6ef821 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -10,6 +10,20 @@
   --light-theme-button-button-secondary: #464648;
   --light-theme-button-button-tertiary: #005cb8;
   --cds-focus: #0073e6;
+  --light-theme-link-link-primary: #005CB8;
+  --light-theme-link-link-primary-hover: #00478f;
+  --light-theme-link-link-secondary: #00478f;
+  --light-theme-link-link-secondary-hover: #00478f;
+  --light-theme-link-link-inverse: #5cadff;
+  --light-theme-link-link-visited: #7c1cdf;
+  --dark-theme-link-link-primary: #5cadff;
+  --dark-theme-link-link-primary-hover: #85c2ff;
+  --dark-theme-link-link-secondary: #85c2ff;
+  --dark-theme-link-link-secondary-hover: #005cb8;
+  --dark-theme-link-link-inverse: #005cb8;
+  --dark-theme-link-link-visited: #c59af1;
+  --light-theme-support-support-info: #00478f;
+  --light-theme-notifications-support-info-border: rgba(0, 102, 204, 1);
 
   //Primary button
   --cds-interactive-01: #0073E6;
@@ -39,6 +53,18 @@ body {
   font-family: map.get(typeFamily.$type-family, "sans");
 }
 
+a {
+  color: var(--light-theme-link-link-primary, #005cb8);
+}
+
+a:hover {
+  color: var(--light-theme-link-link-primary-hover, #00478f);
+}
+
+a:visited {
+  color: var(--light-theme-link-link-visited, #7c1cdf);
+}
+
 .bulleted-list {
   list-style: decimal;
   margin-left: 1.5rem;
@@ -186,6 +212,7 @@ body {
 
 .bx--progress-step-text p a:hover {
   text-decoration: underline;
+  color: var(--light-theme-link-link-primary-hover, #00478f);
   cursor: pointer;
 }
 
@@ -198,7 +225,7 @@ body {
 }
 
 .bx--progress-step-error {
-  border-color: #e72000;
+  border-color: var(--cds-danger-01);
 }
 
 .bx--progress-step-complete {
@@ -210,7 +237,7 @@ body {
 }
 
 .bx--progress-step-icon-error {
-  color: #e72000;
+  color: var(--cds-danger-01);
 }
 
 .bx--progress-step-icon-complete {
diff --git a/frontend/src/components/visuals/DisplayBlockComponent.vue b/frontend/src/components/visuals/DisplayBlockComponent.vue
index 165d8c2b34..416f9c436d 100644
--- a/frontend/src/components/visuals/DisplayBlockComponent.vue
+++ b/frontend/src/components/visuals/DisplayBlockComponent.vue
@@ -64,10 +64,11 @@ const iconsForKinds: Record<string, any> = {
 }
 
 .display-block-wrapper-info {
+  border-radius: 0.25rem;
+  border: 1px solid var(--light-theme-notifications-support-info-border, rgba(0, 102, 204, 0.40));
+  background: var(--light-theme-notifications-notification-info-background, #C2E0FF);
   background: #c2e0ff;
-  border: 1px solid var(--cds-interactive-01);
-  border-radius: 4px;
-  border-left: 4px solid var(--cds-interactive-01);
+  border-left: 4px solid var(--light-theme-notifications-support-info-border, rgba(0, 102, 204, 0.40));
 }
 
 .display-block-wrapper-success {
@@ -92,13 +93,13 @@ const iconsForKinds: Record<string, any> = {
 }
 
 .display-block-icon-info {
-  color: #0073E6;
+  color: var(--light-theme-notifications-support-info-border, rgba(0, 102, 204, 0.40));
 }
 .display-block-icon-success {
   color: #198038;
 }
 .display-block-icon-error {
-  color: #E72000;
+  color: var(--cds-danger-01);
 }
 .display-block-icon-warning {
   color: #f1c21b;

From 02465416d9a5ca783d674cbcc8120c1702ad7629 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 29 Aug 2023 11:18:41 -0700
Subject: [PATCH 031/313] fix: fixing round 2 of style issues

---
 frontend/src/assets/styles/global.scss        |   2 +-
 .../grouping/AddressGroupComponent.vue        |   9 +-
 frontend/src/composables/useFocus.ts          |  43 +++++--
 .../helpers/validators/GlobalValidators.ts    | 112 +++++++++++-------
 frontend/src/pages/ApplyClientNumberPage.vue  |  30 ++---
 .../src/pages/applyform/ContactWizardStep.vue |  13 +-
 frontend/tsconfig.app.json                    |   1 +
 frontend/tsconfig.vitest.json                 |   2 +-
 8 files changed, 132 insertions(+), 80 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 2c6c6ef821..fa7b08eb2b 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -24,7 +24,7 @@
   --dark-theme-link-link-visited: #c59af1;
   --light-theme-support-support-info: #00478f;
   --light-theme-notifications-support-info-border: rgba(0, 102, 204, 1);
-
+  --light-theme-text-text-primary: #131315;
   //Primary button
   --cds-interactive-01: #0073E6;
   --cds-active-primary: #0073E6;
diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 00c1ba3f9b..e35915be63 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -184,7 +184,8 @@ watch([autoCompleteResult], () => {
     )
 
     watch([error], () => {
-      generalErrorBus.emit(error.value.response.data.message)
+      // @ts-ignore
+      generalErrorBus.emit(error.response?.data.message)
     })
 
     watch(
@@ -250,9 +251,9 @@ onMounted(() =>{
   >
     <AutoCompleteInputComponent
       :id="'addr_' + id"
-            label="Street address or PO box"
-      placeholder="Start typing to search for your street address or PO box"
-      tip=""
+      label="Street address or PO box"
+      placeholder=""
+      tip="Start typing to search for your street address or PO box"
       v-model="selectedValue.streetAddress"
       :contents="content"
       :validations="[
diff --git a/frontend/src/composables/useFocus.ts b/frontend/src/composables/useFocus.ts
index e062562c12..1aaf8cbca1 100644
--- a/frontend/src/composables/useFocus.ts
+++ b/frontend/src/composables/useFocus.ts
@@ -1,12 +1,22 @@
 import { ref } from 'vue'
+import type { Ref } from 'vue'
+
+type OptionalElement = Element | HTMLElement | undefined
+
 /**
  * useFocus composable is used to set focus and/or scroll to a component
  * @returns two functions to set focus and scroll to a component
  */
-export function useFocus () {
+export const useFocus = (): {
+  setFocusedComponent: (componentName: string, time?: number) => Ref<OptionalElement>
+  setScrollPoint: (componentName: string, time?: number) => Ref<OptionalElement>
+} => {
   // setActionOn is a function that execute the action on an a component
-  const setActionOn = (focusedComponent:string, key: string,action:((target:any) => {})) => {
-    console.log('setActionOn',focusedComponent,key)
+  const setActionOn = (
+    focusedComponent: string,
+    key: string,
+    action: (target: Element | HTMLElement) => unknown,
+  ) => {
     if (focusedComponent) {
       const element = document.querySelector(`[${key}="${focusedComponent}"]`)
       if (element) {
@@ -19,16 +29,33 @@ export function useFocus () {
 
   // execute is a function that execute the action on an a component after a delay
   // The delay is here to allow the component to be rendered before to execute the action
-  const execute = (componentName:string,key:string,action:((target:any) => {}),time:number = 100) => {
-    const refComponent = ref<Element|undefined>(undefined)
-    setTimeout(() => (refComponent.value = setActionOn(componentName,key,action)), time)
+  const execute = (
+    componentName: string,
+    key: string,
+    action: (target: Element | HTMLElement) => unknown,
+    time: number = 100,
+  ): Ref<OptionalElement> => {
+    const refComponent = ref<OptionalElement>(undefined)
+    setTimeout(() => (refComponent.value = setActionOn(componentName, key, action)), time)
     return refComponent
   }
 
   // Set the focus on a component with the data-focus attribute
-  const setFocusedComponent = (componentName:string,time:number = 100) => (execute(componentName,'data-focus', (element) => element.focus(),time))
+  const setFocusedComponent = (componentName: string, time: number = 100): Ref<OptionalElement> =>
+    execute(
+      componentName,
+      'data-focus',
+      (element) => (element instanceof HTMLElement ? element.focus() : undefined),
+      time,
+    )
   // Scroll into view a component with the data-scroll attribute
-  const setScrollPoint = (componentName:string,time:number = 100) => (execute(componentName,'data-scroll', (element) => element.scrollIntoView({ behavior: 'smooth', block: 'start' }),time))
+  const setScrollPoint = (componentName: string, time: number = 100): Ref<Element | undefined> =>
+    execute(
+      componentName,
+      'data-scroll',
+      (element) => element.scrollIntoView({ behavior: 'smooth', block: 'start' }),
+      time,
+    )
 
   return { setFocusedComponent, setScrollPoint }
 }
diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 6e68c30e7b..ae6f24e830 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -1,6 +1,7 @@
 import type { Ref } from 'vue'
 
 // Defines the used regular expressions
+// @sonar-ignore-next-line
 const emailRegex: RegExp = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
 const specialCharacters: RegExp = /^[a-zA-Z0-9\sÀ-ÖØ-öø-ÿ]+$/
 const e164Regex: RegExp = /^((\+?[1-9]\d{1,14})|(\(\d{3}\) \d{3}-\d{4}))$/
@@ -17,9 +18,9 @@ const usZipCodeRegex: RegExp = /^\d{5}(?:[-\s]\d{4})?$/
  * isNotEmpty('a') // true
  * isNotEmpty(' a ') // true
  **/
-export const isNotEmpty = (value: string) => {
+export const isNotEmpty = (value: string, message: string = 'This field is required'): string => {
   if (value && value.trim().length > 0) return ''
-  return 'This field is required'
+  return message
 }
 
 /**
@@ -35,14 +36,20 @@ export const isNotEmpty = (value: string) => {
  * isEmail(' a@b ') // false
  * isEmail('mail@mail.com') // true
  **/
-export const isEmail = (value: string) => {
+export const isEmail = (
+  value: string,
+  message: string = 'This field must be a valid email',
+): string => {
   if (isNotEmpty(value) === '' && emailRegex.test(value)) return ''
-  return 'This field must be a valid email'
+  return message
 }
 
-export const isPhoneNumber = (value: string) => {
+export const isPhoneNumber = (
+  value: string,
+  message: string = 'This field must be a valid phone number',
+): string => {
   if (isNotEmpty(value) === '' && e164Regex.test(value)) return ''
-  return 'This field must be a valid phone number'
+  return message
 }
 
 /**
@@ -64,9 +71,12 @@ export const isPhoneNumber = (value: string) => {
  * isCanadianPostalCode('A1A 1A1') // false
  * isCanadianPostalCode('A1A-1A1') // false
  **/
-export const isCanadianPostalCode = (value: string) => {
+export const isCanadianPostalCode = (
+  value: string,
+  message: string = 'This field must be a valid Canadian postal code without spaces or dashes',
+): string => {
   if (isNotEmpty(value) === '' && canadianPostalCodeRegex.test(value)) return ''
-  return 'This field must be a valid Canadian postal code without spaces or dashes'
+  return message
 }
 
 /**
@@ -88,11 +98,14 @@ export const isCanadianPostalCode = (value: string) => {
  * isUsZipCode("123456") // false
  * isUsZipCode("ABCDE") // false
  **/
-export const isUsZipCode = (value: string) => {
+export const isUsZipCode = (
+  value: string,
+  message: string = 'This field must be a valid US zip code',
+): string => {
   if (isNotEmpty(value) === '' && usZipCodeRegex.test(value)) {
     return ''
   }
-  return 'This field must be a valid US zip code'
+  return message
 }
 
 /**
@@ -107,10 +120,10 @@ export const isUsZipCode = (value: string) => {
  * isMaxSize(5)('abcde') // true
  * isMaxSize(5)('abcdef') // false
  **/
-export const isMaxSize = (maxSize: number) => {
-  return (value: string) => {
+export const isMaxSize = (maxSize: number, message: string = 'This field must be smaller') => {
+  return (value: string): string => {
     if (value && value.length <= maxSize) return ''
-    return `This field must be at most ${maxSize} characters long`
+    return message
   }
 }
 
@@ -126,10 +139,10 @@ export const isMaxSize = (maxSize: number) => {
  * isMinSize(5)('abcde') // true
  * isMinSize(5)('abcdef') // true
  **/
-export const isMinSize = (minSize: number) => {
-  return (value: string) => {
+export const isMinSize = (minSize: number, message: string = 'This field must bigger') => {
+  return (value: string): string => {
     if (isNotEmpty(value) === '' && value.length >= minSize) return ''
-    return `This field must be at least ${minSize} characters long`
+    return message
   }
 }
 
@@ -145,9 +158,12 @@ export const isMinSize = (minSize: number) => {
  * isOnlyNumbers('123') // true
  * isOnlyNumbers('123a') // false
  **/
-export const isOnlyNumbers = (value: string) => {
+export const isOnlyNumbers = (
+  value: string,
+  message: string = 'This field must be composed of only numbers',
+): string => {
   if (isNotEmpty(value) === '' && /^\d*$/.exec(value)) return ''
-  return 'This field must be composed of only numbers'
+  return message
 }
 
 /**
@@ -161,43 +177,47 @@ export const isOnlyNumbers = (value: string) => {
  * isUnique.add('key', 'field')('value'); // false
  * isUnique.remove('key', 'field'); // true
  **/
-export const isUniqueDescriptive = () => {
+export const isUniqueDescriptive = (): {
+  add: (key: string, fieldId: string) => (value: string, message: string) => string
+  remove: (key: string, fieldId: string) => boolean
+} => {
   const record: Record<string, Record<string, string>> = {}
 
-  const add = (key: string, fieldId: string) => (value: string) => {
-    // if the record contains the key and the fieldId is not the same as mine, check all the values, except the one if my fieldId to see if it includes my value
-    const fieldsToCheck = Object.keys(record[key] || {}).filter(
-      (field) => field !== fieldId
-    )
-    // Get all the values of the fields to check, except the one of my fieldId
-    const values = fieldsToCheck.map((field: string) => record[key][field])
-    record[key] = { ...record[key], [fieldId]: value }
-
-    if (
-      values.some(
-        (entry: string) => entry.toLowerCase() === value.toLowerCase()
-      )
-    ) {
-      return 'This value is already in use'
-    }
+  const add =
+    (key: string, fieldId: string) =>
+    (value: string, message: string = 'This value is already in use'): string => {
+      // if the record contains the key and the fieldId is not the same as mine, check all the values, except the one if my fieldId to see if it includes my value
+      const fieldsToCheck = Object.keys(record[key] || {}).filter((field) => field !== fieldId)
+      // Get all the values of the fields to check, except the one of my fieldId
+      const values = fieldsToCheck.map((field: string) => record[key][field])
+      record[key] = { ...record[key], [fieldId]: value }
 
-    return ''
-  }
+      if (values.some((entry: string) => entry.toLowerCase() === value.toLowerCase())) {
+        return message
+      }
 
-  const remove = (key: string, fieldId: string) : boolean => delete record[key][fieldId]
+      return ''
+    }
+
+  const remove = (key: string, fieldId: string): boolean => delete record[key][fieldId]
 
   return {
-    add, remove
+    add,
+    remove,
   }
 }
 
-export const isNoSpecialCharacters = (value: string) => {
+export const isNoSpecialCharacters = (
+  value: string,
+  message: string = 'No special characters allowed',
+): string => {
   if (specialCharacters.test(value)) return ''
-  return 'No special characters allowed'
+  return message
 }
 
-
-export const isContainedIn = (values: Ref<string[]>) => (value: string) => {
-  if (values.value.includes(value)) return ''
-  return 'No value selected'
-}
\ No newline at end of file
+export const isContainedIn =
+  (values: Ref<string[]>) =>
+  (value: string, message = 'No value selected'): string => {
+    if (values.value.includes(value)) return ''
+    return message
+  }
diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index 213bc3e216..22ad4b0493 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -12,9 +12,11 @@ import ContactWizardStep from '@/pages/applyform/ContactWizardStep.vue'
 import ReviewWizardStep from '@/pages/applyform/ReviewWizardStep.vue'
 // Imported types
 import {
-  newFormDataDto,
-  type FormDataDto,
-  type Contact
+  newFormDataDto
+} from '@/dto/ApplyClientNumberDto'
+import type {
+  FormDataDto,
+  Contact
 } from '@/dto/ApplyClientNumberDto'
 import type { ValidationMessageType, ModalNotification } from '@/dto/CommonTypesDto'
 // Imported User session
@@ -70,9 +72,9 @@ const { response, error, fetch } = usePost(
   {
     skip: true,
     headers: {
-      'x-user-id': submitterInformation?.userId || '',
-      'x-user-email': submitterInformation?.email || '',
-      'x-user-name': submitterInformation?.firstName || ''
+      'x-user-id': submitterInformation?.userId ?? '',
+      'x-user-email': submitterInformation?.email ?? '',
+      'x-user-name': submitterInformation?.firstName ?? ''
     }
   }
 )
@@ -84,8 +86,8 @@ watch([response], () => {
 })
 
 watch([error], () => {
-  if (error.value.response.status === 400) {
-    const validationErrors: ValidationMessageType[] = error.value.response.data
+  if (error.response?.status === 400) {
+    const validationErrors: ValidationMessageType[] = error.response?.data as ValidationMessageType[]
     const fieldIds = [
       'businessInformation.businessType',
       'businessInformation.legalType',
@@ -103,7 +105,7 @@ watch([error], () => {
     }
   } else {
     generalErrorBus.emit(
-      `There was an error submitting your application. ${error.value.data}}`
+      `There was an error submitting your application. ${error.response?.data}}`
     )
     setScrollPoint('top')
   }
@@ -112,6 +114,7 @@ watch([error], () => {
 addValidation('location.contacts.*.locationNames.*.text', isContainedIn(locations))
 
 
+
 // Tab system
 const progressData = reactive([
   {
@@ -199,7 +202,6 @@ const checkStepValidity = (stepNumber: number) : boolean =>{
   progressData.forEach((step:any) => {
     if(step.step <= stepNumber){
       step.valid = validate(step.fields,formData);
-      //if(!step.valid) step.kind = 'error'
     }
   })
   return progressData[stepNumber].valid
@@ -258,9 +260,9 @@ const processAndLogOut = () => {
       {
         incorporation: formData.businessInformation.incorporationNumber,
         name: formData.businessInformation.businessName,
-        userName: submitterInformation?.name || '',
-        userId: submitterInformation?.userId || '',
-        mail: submitterInformation?.email || ''
+        userName: submitterInformation?.name ?? '',
+        userId: submitterInformation?.userId ?? '',
+        mail: submitterInformation?.email ?? ''
       },
       {}
     )
@@ -302,7 +304,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
     <div v-if="currentTab == 0" class="form-steps-01">
       <div class="form-steps-01-title">
         <span class="heading-04" data-scroll="scroll-0">Before you begin</span>
-        <ol type="1" class="bulleted-list body-compact-01">
+        <ol type="1" class="bulleted-list body-02">
           <li>
             A registered business must be in good standing with BC
             Registries
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index 0e1bfa9019..3c82cc15f8 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -1,16 +1,17 @@
 <script setup lang="ts">
 import { watch, ref, computed, reactive, onMounted } from 'vue'
+// Composables
 import { useEventBus } from '@vueuse/core'
-import Add16 from '@carbon/icons-vue/es/add/16'
-import {
-  type FormDataDto,
-  type Contact,
-  emptyContact
-} from '@/dto/ApplyClientNumberDto'
 import { useFetchTo } from '@/composables/useFetch'
 import { useFocus } from '@/composables/useFocus'
+// Type Imports
+import type { FormDataDto, Contact } from '@/dto/ApplyClientNumberDto'
+import { emptyContact } from '@/dto/ApplyClientNumberDto'
 import type { CodeNameType, ModalNotification } from '@/dto/CommonTypesDto'
+// Validators
 import { isUniqueDescriptive } from '@/helpers/validators/GlobalValidators'
+// @ts-ignore
+import Add16 from '@carbon/icons-vue/es/add/16'
 
 
 //Defining the props and emiter to reveice the data and emit an update
diff --git a/frontend/tsconfig.app.json b/frontend/tsconfig.app.json
index d8f03a594b..c01982b05b 100644
--- a/frontend/tsconfig.app.json
+++ b/frontend/tsconfig.app.json
@@ -4,6 +4,7 @@
   "exclude": ["src/tests/*"],
   "compilerOptions": {
     "composite": true,
+    "lib": ["es2017", "dom", "dom.iterable"],
     "verbatimModuleSyntax": true,
     "baseUrl": ".",
     "paths": {
diff --git a/frontend/tsconfig.vitest.json b/frontend/tsconfig.vitest.json
index 60f9b9a8dd..7ebd672bd8 100644
--- a/frontend/tsconfig.vitest.json
+++ b/frontend/tsconfig.vitest.json
@@ -3,7 +3,7 @@
   "exclude": [],
   "compilerOptions": {
     "composite": true,
-    "lib": [],
+    "lib": ["es2017", "dom", "dom.iterable"],
     "types": ["node", "jsdom"],
     "ignoreDeprecations": "5.0",
     "verbatimModuleSyntax": true

From 55a7228c49bf0eeb768b1d04389c7c1123883fa7 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 29 Aug 2023 12:00:43 -0700
Subject: [PATCH 032/313] fix: adding new validator for individuals

---
 frontend/.eslintrc.js                         |   1 +
 frontend/src/dto/ApplyClientNumberDto.ts      |  19 +-
 .../validators/ExternalFormValidations.ts     | 199 +++++++++++-------
 .../helpers/validators/GlobalValidators.ts    | 101 +++++----
 4 files changed, 189 insertions(+), 131 deletions(-)

diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index 72ea83cf16..3239935012 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -44,6 +44,7 @@ module.exports = {
     'vue/no-multiple-template-root': 'error',
     'vue/no-v-html': 'error',
     'vue/require-prop-types': 'error',
+    '@typescript-eslint/no-explicit-any': 'off',
   },
   overrides: [
     {
diff --git a/frontend/src/dto/ApplyClientNumberDto.ts b/frontend/src/dto/ApplyClientNumberDto.ts
index 80269349dd..d29e548dfc 100644
--- a/frontend/src/dto/ApplyClientNumberDto.ts
+++ b/frontend/src/dto/ApplyClientNumberDto.ts
@@ -48,7 +48,7 @@ export const formDataDto: FormDataDto = {
     clientType: '',
     incorporationNumber: '',
     businessName: '',
-    goodStandingInd: ''
+    goodStandingInd: '',
   },
   location: {
     addresses: [
@@ -58,11 +58,11 @@ export const formDataDto: FormDataDto = {
         country: { value: 'CA', text: 'Canada' },
         province: { value: 'BC', text: 'British Columbia' },
         city: '',
-        postalCode: ''
-      }
+        postalCode: '',
+      },
     ],
-    contacts: []
-  }
+    contacts: [],
+  },
 }
 
 export const emptyAddress = (): Address =>
@@ -73,8 +73,8 @@ export const emptyAddress = (): Address =>
       country: { value: 'CA', text: 'Canada' },
       province: { value: 'BC', text: 'British Columbia' },
       city: '',
-      postalCode: ''
-    })
+      postalCode: '',
+    }),
   )
 
 export const emptyContact: Contact = {
@@ -83,8 +83,7 @@ export const emptyContact: Contact = {
   firstName: '',
   lastName: '',
   phoneNumber: '',
-  email: ''
+  email: '',
 }
 
-export const newFormDataDto = (): FormDataDto =>
-  JSON.parse(JSON.stringify(formDataDto))
+export const newFormDataDto = (): FormDataDto => JSON.parse(JSON.stringify(formDataDto))
diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
index 4b5d1b5e9c..78fbdec4ed 100644
--- a/frontend/src/helpers/validators/ExternalFormValidations.ts
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -7,83 +7,125 @@ import {
   isMaxSize,
   isMinSize,
   isOnlyNumbers,
-  isNoSpecialCharacters
+  isNoSpecialCharacters,
+  isNot,
 } from '@/helpers/validators/GlobalValidators'
 
 import type { FormDataDto } from '@/dto/ApplyClientNumberDto'
 
 // We declare here a collection of all validations for every field in the form
-const globalValidations : Record<string, Function[]> = {}
+const globalValidations: Record<string, ((value: string) => string)[]> = {}
 
 // Step 1: Business Information
-globalValidations['businessInformation.businessName'] = [isNotEmpty]
+globalValidations['businessInformation.businessName'] = [
+  isNotEmpty('Business Name cannot be empty'),
+]
+globalValidations['businessInformation.clientType'] = [
+  isNot('I', 'Individuals are not supported at the moment'),
+]
 
 // Step 2: Addresses
 globalValidations['location.addresses.*.locationName'] = [
-  isNotEmpty,
-  isMinSize(3),
-  isMaxSize(50),
-  isNoSpecialCharacters
+  isNotEmpty('You must provide a name for this location'),
+  isMinSize(
+    'The location name must be between 3 and 50 characters and cannot contain special characters',
+  )(3),
+  isMaxSize(
+    'The location name must be between 3 and 50 characters and cannot contain special characters',
+  )(50),
+  isNoSpecialCharacters(
+    'The location name must be between 3 and 50 characters and cannot contain special characters',
+  ),
 ]
-globalValidations['location.addresses.*.country.text'] = [isNotEmpty]
-globalValidations['location.addresses.*.province.text'] = [isNotEmpty]
+globalValidations['location.addresses.*.country.text'] = [isNotEmpty('You must select a country')]
+globalValidations['location.addresses.*.province.text'] = [isNotEmpty('You must select a value')]
 globalValidations['location.addresses.*.city'] = [
-  isNotEmpty,
-  isMinSize(3),
-  isMaxSize(50),
-  isNoSpecialCharacters
+  isNotEmpty('You must provide a city'),
+  isMinSize(
+    'The city name must be between 3 and 50 characters and cannot contain special characters',
+  )(3),
+  isMaxSize(
+    'The city name must be between 3 and 50 characters and cannot contain special characters',
+  )(50),
+  isNoSpecialCharacters(
+    'The city name must be between 3 and 50 characters and cannot contain special characters',
+  ),
+]
+globalValidations['location.addresses.*.streetAddress'] = [
+  isNotEmpty('Please provide a valid address or PO Box'),
+  isMinSize('The address must be between 5 and 50 characters')(5),
+  isMaxSize('The address must be between 5 and 50 characters')(50),
+]
+globalValidations['location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'] = [
+  isCanadianPostalCode,
+]
+globalValidations['location.addresses.*.postalCode(location.addresses.*.country.text === "US")'] = [
+  isUsZipCode,
+]
+globalValidations[
+  'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && country.text !== "US")'
+] = [
+  isOnlyNumbers(
+    'Postal code should be composed of only numbers and should be between 5 and 10 characters',
+  ),
+  isMinSize(
+    'Postal code should be composed of only numbers and should be between 5 and 10 characters',
+  )(5),
+  isMaxSize(
+    'Postal code should be composed of only numbers and should be between 5 and 10 characters',
+  )(10),
 ]
-globalValidations['location.addresses.*.streetAddress'] = [isNotEmpty, isMinSize(5), isMaxSize(50)]
-globalValidations['location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'] = [isCanadianPostalCode]
-globalValidations['location.addresses.*.postalCode(location.addresses.*.country.text === "US")'] = [isUsZipCode]
-globalValidations['location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && country.text !== "US")'] = [isOnlyNumbers, isMinSize(5), isMaxSize(10)]
 
 // Step 3: Contacts
 
-globalValidations['location.contacts.*.locationNames.*.text'] = [isNotEmpty]
-globalValidations['location.contacts.*.contactType.text'] = [isNotEmpty]
+globalValidations['location.contacts.*.locationNames.*.text'] = [
+  isNotEmpty('You must select at least one location'),
+]
+globalValidations['location.contacts.*.contactType.text'] = [
+  isNotEmpty('You must select at least one contact type'),
+]
 globalValidations['location.contacts.*.firstName'] = [
-  isMinSize(1),
-  isMaxSize(25),
-  isNotEmpty,
-  isNoSpecialCharacters
+  isMinSize('Name should be between 1 and 25 characters with no special character')(1),
+  isMaxSize('Name should be between 1 and 25 characters with no special character')(25),
+  isNoSpecialCharacters('Name should be between 1 and 25 characters with no special character'),
 ]
 globalValidations['location.contacts.*.lastName'] = [
-  isMinSize(1),
-  isMaxSize(25),
-  isNotEmpty,
-  isNoSpecialCharacters
+  isMinSize('Name should be between 1 and 25 characters with no special character')(1),
+  isMaxSize('Name should be between 1 and 25 characters with no special character')(25),
+  isNoSpecialCharacters('Name should be between 1 and 25 characters with no special character'),
 ]
 globalValidations['location.contacts.*.email'] = [
-  isNotEmpty,
-  isEmail,
-  isMinSize(6),
-  isMaxSize(50)
+  isEmail('Please provide a valid email address'),
+  isMinSize('Please provide a valid email address')(6),
+  isMaxSize('Please provide a valid email address')(50),
 ]
 globalValidations['location.contacts.*.phoneNumber'] = [
-  isNotEmpty,
-  isPhoneNumber,
-  isMaxSize(15),
-  isMinSize(10)
+  isPhoneNumber('Please provide a valid phone number'),
+  isMaxSize('Please provide a valid phone number')(15),
+  isMinSize('Please provide a valid phone number')(10),
 ]
 
 // Associate the field with the validators here
 
 // This function will extract the field value from the object
-export const getField = (path:string, value: FormDataDto):any => {
+export const getField = (path: string, value: FormDataDto): string | string[] => {
   // First we set is in a temporary variable
   let temporaryValue: any = value
   // We split the path by dots and iterate over it
-  path.split('.').forEach((key:string) => {
+  path.split('.').forEach((key: string) => {
     // If the temporary value is not undefined we dig in
     if (temporaryValue[key] !== undefined) {
       // If the temporary value is an array we iterate over it
       if (Array.isArray(temporaryValue[key])) {
         // Array fields are split by star to indicate that we want to iterate over the array
         // Due to that, we split the path by the star and get the second element containing the rest of the path
-        temporaryValue = temporaryValue[key].map((item:any) => getField(path.split('.*.').slice(1).join('.*.'), item))
+        temporaryValue = temporaryValue[key].map((item: any) =>
+          getField(path.split('.*.').slice(1).join('.*.'), item),
+        )
         // if is not an array we just set the value
-      } else { temporaryValue = temporaryValue[key] }
+      } else {
+        temporaryValue = temporaryValue[key]
+      }
     }
   })
 
@@ -92,45 +134,52 @@ export const getField = (path:string, value: FormDataDto):any => {
 }
 
 // This function will return all validators for the field
-export const getValidations = (key: string) : Function[] => (globalValidations[key] || [])
-
+export const getValidations = (key: string): ((value: string) => string)[] =>
+  globalValidations[key] || []
 
 // This function will run the validators and return the errors
 export const validate = (keys: string[], target: FormDataDto): boolean => {
-// For every received key we get the validations and run them
-return keys.every((key) => {
-  // First we get all validators for that field
-  const validations: Function[] = getValidations(key);
-  //If there is no corresponding key in the validations we return false
-  if(!validations) return false
-  // For every validator we run it and check if the result is empty
-  return validations.every((validation: Function) => {
+  // For every received key we get the validations and run them
+  return keys.every((key) => {
+    // First we get all validators for that field
+    const validations: ((value: string) => string)[] = getValidations(key)
+    // If there is no corresponding key in the validations we return false
+    if (!validations) return false
     // We split the field key and the condition if it has one
-    const [fieldKey, fieldCondition] = key.includes('(') ? key.replace(')','').split('(') : [key, 'true'];
-    // We then load the field value
-    const fieldValue = getField(fieldKey, target);
-    // We define a function that will run the validation if the condition is true
-    const buildEval = (condition: string) => condition === 'true' ? 'true' : `target.${condition}`;
-    const runValidation = (item: any,condition:string) => eval(condition) ? validation(item) === '' : true;
-    // If the field value is an array we run the validation for every item in the array
-    if (Array.isArray(fieldValue)) {
-      return fieldValue.every((item: any,index:number) => {
-        // And sometimes we can end up with another array inside, that's life
-        if (Array.isArray(item)) {
-          if(item.length === 0) item.push('')
-          return item.every((subItem:any) => runValidation(subItem,buildEval(fieldCondition.replace('.*.',`[${index}].`))));
-        }
-        // If it is not an array here, just validate it
-        return runValidation(item,buildEval(fieldCondition.replace('.*.',`[${index}].`)));
-      });
-    }
-    // If the field value is not an array we run the validation for the field
-    return runValidation(fieldValue,fieldCondition);
-  });
-});
+    const [fieldKey, fieldCondition] = key.includes('(')
+      ? key.replace(')', '').split('(')
+      : [key, 'true']
+    // For every validator we run it and check if the result is empty
+    return validations.every((validation: (value: string) => string) => {
+      // We then load the field value
+      const fieldValue = getField(fieldKey, target)
+      // We define a function that will run the validation if the condition is true
+      const buildEval = (condition: string) =>
+        condition === 'true' ? 'true' : `target.${condition}`
+      const runValidation = (item: any, condition: string) =>
+        // eslint-disable-next-line no-eval
+        eval(condition) ? validation(item) === '' : true
+      // If the field value is an array we run the validation for every item in the array
+      if (Array.isArray(fieldValue)) {
+        return fieldValue.every((item: any, index: number) => {
+          // And sometimes we can end up with another array inside, that's life
+          if (Array.isArray(item)) {
+            if (item.length === 0) item.push('')
+            return item.every((subItem: any) =>
+              runValidation(subItem, buildEval(fieldCondition.replace('.*.', `[${index}].`))),
+            )
+          }
+          // If it is not an array here, just validate it
+          return runValidation(item, buildEval(fieldCondition.replace('.*.', `[${index}].`)))
+        })
+      }
+      // If the field value is not an array we run the validation for the field
+      return runValidation(fieldValue, fieldCondition)
+    })
+  })
 }
 
-export const addValidation = (key: string, validation: Function) => {
-  if (!globalValidations[key]) globalValidations[key] = [];
-  globalValidations[key].push(validation);
-}
\ No newline at end of file
+export const addValidation = (key: string, validation: (value: string) => string): void => {
+  if (!globalValidations[key]) globalValidations[key] = []
+  globalValidations[key].push(validation)
+}
diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index ae6f24e830..cadd67f1c1 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -18,10 +18,12 @@ const usZipCodeRegex: RegExp = /^\d{5}(?:[-\s]\d{4})?$/
  * isNotEmpty('a') // true
  * isNotEmpty(' a ') // true
  **/
-export const isNotEmpty = (value: string, message: string = 'This field is required'): string => {
-  if (value && value.trim().length > 0) return ''
-  return message
-}
+export const isNotEmpty =
+  (message: string = 'This field is required') =>
+  (value: string): string => {
+    if (value && value.trim().length > 0) return ''
+    return message
+  }
 
 /**
  * Checks if the value is an email
@@ -36,21 +38,19 @@ export const isNotEmpty = (value: string, message: string = 'This field is requi
  * isEmail(' a@b ') // false
  * isEmail('mail@mail.com') // true
  **/
-export const isEmail = (
-  value: string,
-  message: string = 'This field must be a valid email',
-): string => {
-  if (isNotEmpty(value) === '' && emailRegex.test(value)) return ''
-  return message
-}
+export const isEmail =
+  (message: string = 'This field must be a valid email') =>
+  (value: string): string => {
+    if (isNotEmpty(message)(value) === '' && emailRegex.test(value)) return ''
+    return message
+  }
 
-export const isPhoneNumber = (
-  value: string,
-  message: string = 'This field must be a valid phone number',
-): string => {
-  if (isNotEmpty(value) === '' && e164Regex.test(value)) return ''
-  return message
-}
+export const isPhoneNumber =
+  (message: string = 'This field must be a valid phone number') =>
+  (value: string): string => {
+    if (isNotEmpty(message)(value) === '' && e164Regex.test(value)) return ''
+    return message
+  }
 
 /**
  * Checks if the value is a canadian postal code
@@ -75,7 +75,7 @@ export const isCanadianPostalCode = (
   value: string,
   message: string = 'This field must be a valid Canadian postal code without spaces or dashes',
 ): string => {
-  if (isNotEmpty(value) === '' && canadianPostalCodeRegex.test(value)) return ''
+  if (isNotEmpty(message)(value) === '' && canadianPostalCodeRegex.test(value)) return ''
   return message
 }
 
@@ -102,7 +102,7 @@ export const isUsZipCode = (
   value: string,
   message: string = 'This field must be a valid US zip code',
 ): string => {
-  if (isNotEmpty(value) === '' && usZipCodeRegex.test(value)) {
+  if (isNotEmpty(message)(value) === '' && usZipCodeRegex.test(value)) {
     return ''
   }
   return message
@@ -120,12 +120,14 @@ export const isUsZipCode = (
  * isMaxSize(5)('abcde') // true
  * isMaxSize(5)('abcdef') // false
  **/
-export const isMaxSize = (maxSize: number, message: string = 'This field must be smaller') => {
-  return (value: string): string => {
-    if (value && value.length <= maxSize) return ''
-    return message
+export const isMaxSize =
+  (message: string = 'This field must be smaller') =>
+  (maxSize: number) => {
+    return (value: string): string => {
+      if (isNotEmpty(message)(value) && value.length <= maxSize) return ''
+      return message
+    }
   }
-}
 
 /**
  * Checks if the value is not empty and has a minimum size
@@ -139,12 +141,14 @@ export const isMaxSize = (maxSize: number, message: string = 'This field must be
  * isMinSize(5)('abcde') // true
  * isMinSize(5)('abcdef') // true
  **/
-export const isMinSize = (minSize: number, message: string = 'This field must bigger') => {
-  return (value: string): string => {
-    if (isNotEmpty(value) === '' && value.length >= minSize) return ''
-    return message
+export const isMinSize =
+  (message: string = 'This field must bigger') =>
+  (minSize: number) => {
+    return (value: string): string => {
+      if (isNotEmpty(message)(value) === '' && value.length >= minSize) return ''
+      return message
+    }
   }
-}
 
 /**
  * Checks if the value is not empty and is composed of only numbers
@@ -158,13 +162,12 @@ export const isMinSize = (minSize: number, message: string = 'This field must bi
  * isOnlyNumbers('123') // true
  * isOnlyNumbers('123a') // false
  **/
-export const isOnlyNumbers = (
-  value: string,
-  message: string = 'This field must be composed of only numbers',
-): string => {
-  if (isNotEmpty(value) === '' && /^\d*$/.exec(value)) return ''
-  return message
-}
+export const isOnlyNumbers =
+  (message: string = 'Only numbers allowed') =>
+  (value: string): string => {
+    if (isNotEmpty(message)(value) === '' && /^\d*$/.exec(value)) return ''
+    return message
+  }
 
 /**
  * Check if value is unique in the group of entries
@@ -207,17 +210,23 @@ export const isUniqueDescriptive = (): {
   }
 }
 
-export const isNoSpecialCharacters = (
-  value: string,
-  message: string = 'No special characters allowed',
-): string => {
-  if (specialCharacters.test(value)) return ''
-  return message
-}
+export const isNoSpecialCharacters =
+  (message: string = 'No special characters allowed') =>
+  (value: string): string => {
+    if (specialCharacters.test(value)) return ''
+    return message
+  }
 
 export const isContainedIn =
-  (values: Ref<string[]>) =>
-  (value: string, message = 'No value selected'): string => {
+  (values: Ref<string[]>, message = 'No value selected') =>
+  (value: string): string => {
     if (values.value.includes(value)) return ''
     return message
   }
+
+export const isNot =
+  (referenceValue: string, message = 'Value is not allowed') =>
+  (value: string): string => {
+    if (value !== referenceValue) return ''
+    return message
+  }

From 214a17bdbc15eddb1c7e82bb40ca64b21da922ba Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 29 Aug 2023 12:59:23 -0700
Subject: [PATCH 033/313] test: fixing some of the tests

---
 .../validators/ExternalFormValidations.ts     | 12 +--
 .../helpers/validators/GlobalValidators.ts    |  4 +-
 frontend/src/pages/ApplyClientNumberPage.vue  |  3 +-
 .../BusinessInformationWizardStep.vue         | 22 +++--
 frontend/tests/unittests/App.spec.ts          | 27 +++++-
 .../ExternalFormValidations.spec.ts           | 78 ++++++++++++++++
 .../validators/GlobalValidators.spec.ts       | 91 +++++++++++--------
 frontend/tsconfig.vitest.json                 |  5 +-
 frontend/vite.config.ts                       |  4 +-
 9 files changed, 184 insertions(+), 62 deletions(-)
 create mode 100644 frontend/tests/unittests/helpers/validators/ExternalFormValidations.spec.ts

diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
index 78fbdec4ed..dfe2f94b99 100644
--- a/frontend/src/helpers/validators/ExternalFormValidations.ts
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -111,20 +111,22 @@ globalValidations['location.contacts.*.phoneNumber'] = [
 export const getField = (path: string, value: FormDataDto): string | string[] => {
   // First we set is in a temporary variable
   let temporaryValue: any = value
+  console.log(path, value)
   // We split the path by dots and iterate over it
   path.split('.').forEach((key: string) => {
+    const fieldKey = key.includes('(') ? key.replace(')', '').split('(')[0] : key
     // If the temporary value is not undefined we dig in
-    if (temporaryValue[key] !== undefined) {
+    if (temporaryValue[fieldKey] !== undefined) {
       // If the temporary value is an array we iterate over it
-      if (Array.isArray(temporaryValue[key])) {
+      if (Array.isArray(temporaryValue[fieldKey])) {
         // Array fields are split by star to indicate that we want to iterate over the array
         // Due to that, we split the path by the star and get the second element containing the rest of the path
-        temporaryValue = temporaryValue[key].map((item: any) =>
+        temporaryValue = temporaryValue[fieldKey].map((item: any) =>
           getField(path.split('.*.').slice(1).join('.*.'), item),
         )
         // if is not an array we just set the value
       } else {
-        temporaryValue = temporaryValue[key]
+        temporaryValue = temporaryValue[fieldKey]
       }
     }
   })
@@ -143,8 +145,6 @@ export const validate = (keys: string[], target: FormDataDto): boolean => {
   return keys.every((key) => {
     // First we get all validators for that field
     const validations: ((value: string) => string)[] = getValidations(key)
-    // If there is no corresponding key in the validations we return false
-    if (!validations) return false
     // We split the field key and the condition if it has one
     const [fieldKey, fieldCondition] = key.includes('(')
       ? key.replace(')', '').split('(')
diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index cadd67f1c1..da40ab35e9 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -124,7 +124,7 @@ export const isMaxSize =
   (message: string = 'This field must be smaller') =>
   (maxSize: number) => {
     return (value: string): string => {
-      if (isNotEmpty(message)(value) && value.length <= maxSize) return ''
+      if (isNotEmpty(message)(value) === '' && value.length <= maxSize) return ''
       return message
     }
   }
@@ -163,7 +163,7 @@ export const isMinSize =
  * isOnlyNumbers('123a') // false
  **/
 export const isOnlyNumbers =
-  (message: string = 'Only numbers allowed') =>
+  (message: string = 'This field must be composed of only numbers') =>
   (value: string): string => {
     if (isNotEmpty(message)(value) === '' && /^\d*$/.exec(value)) return ''
     return message
diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index 22ad4b0493..167c439714 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -126,7 +126,8 @@ const progressData = reactive([
     step:0,
     fields: [
       'businessInformation.businessType',
-      'businessInformation.businessName'
+      'businessInformation.businessName',
+      'businessInformation.clientType'
     ]
   },{
     title: 'Address',
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index 651080a676..d72ac8b049 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -40,8 +40,8 @@ watch(
 
 // -- Validation of the component --
 const validation = reactive<Record<string, boolean>>({
-  businessType: formData.value.businessInformation.businessType ? true : false,
-  business: formData.value.businessInformation.businessName ? true : false
+  businessType: !!formData.value.businessInformation.businessType,
+  business: !!formData.value.businessInformation.businessName
 })
 
 const checkValid = () =>
@@ -80,8 +80,8 @@ const toggleErrorMessages = (
   goodStanding: boolean | null,
   duplicated: boolean | null
 ) => {
-  showGoodStandingError.value = goodStanding || false
-  showDuplicatedError.value = duplicated || false
+  showGoodStandingError.value = goodStanding ?? false
+  showDuplicatedError.value = duplicated ?? false
 
   if (goodStanding || duplicated) {
     navigationBus.emit(false)
@@ -129,17 +129,18 @@ watch([autoCompleteResult], () => {
 
     showDetailsLoading.value = true
     watch([error], () => {
-      if (error.value.response.status === 409) {
+      if (error.response?.status === 409) {
         toggleErrorMessages(null, true)
         return
       }
-      if (error.value.response.status === 404) {
+      if (error.response?.status === 404) {
         toggleErrorMessages(null, null)
         validation.business = true
         emit('update:data', formData.value)
         return
       }
-      generalErrorBus.emit(error.value.response.data.message)
+      // @ts-ignore
+      generalErrorBus.emit(error.response?.data.message)
     })
 
     watch(
@@ -219,7 +220,12 @@ watch([selectedOption], () => {
       tip=""
       v-model="formData.businessInformation.businessName"
       :contents="content"
-      :validations="[...getValidations('businessInformation.businessName'),submissionValidation('businessInformation.businessName')]"
+      :validations="[
+        ...getValidations('businessInformation.businessName'),
+        ...getValidations('businessInformation.clientType'),
+        submissionValidation('businessInformation.businessName'),
+        submissionValidation('businessInformation.clientType')
+        ]"
       :loading="loading"
       @update:selected-value="autoCompleteResult = $event"
     />
diff --git a/frontend/tests/unittests/App.spec.ts b/frontend/tests/unittests/App.spec.ts
index a82f6eb7cd..b6e49e3322 100644
--- a/frontend/tests/unittests/App.spec.ts
+++ b/frontend/tests/unittests/App.spec.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest'
+import { describe, it, expect, vi } from 'vitest'
 import { mount } from '@vue/test-utils'
 import { createRouter, createWebHistory } from 'vue-router'
 import App from '@/App.vue'
@@ -15,35 +15,52 @@ describe('App.vue', () => {
         path: '/',
         name: 'home',
         component: TestComponent,
-        props: true
+        props: true,
+        meta: {
+          format: 'internal'
+        }
       },
       {
         path: '/form',
         name: 'form',
         component: TestComponent,
-        props: true
+        props: true,
+        meta: {
+          format: 'internal'
+        }
       },
       {
         path: '/internal',
         name: 'internal',
         component: TestComponent,
-        props: true
+        props: true,
+        meta: {
+          format: 'internal'
+        }
       }
     ]
   })
 
+  const session = {
+    session: { user: { provider: 'bcsc' } },
+    isLoggedIn: () => true,
+    logOut: vi.fn()
+  }
+
   it('should set submitter information and redirect for idir identity provider', async () => {
     const wrapper = mount(App, {
       global: {
         stubs: {
           MainHeaderComponent: TestComponent
         },
+        mocks: {
+          $session: session
+        },
         plugins: [router]
       }
     })
 
     await wrapper.vm.$nextTick()
-
     const span = await wrapper.find('#provide-test')
 
     expect(span.text()).toBe('Hello World')
diff --git a/frontend/tests/unittests/helpers/validators/ExternalFormValidations.spec.ts b/frontend/tests/unittests/helpers/validators/ExternalFormValidations.spec.ts
new file mode 100644
index 0000000000..ea04bd3d84
--- /dev/null
+++ b/frontend/tests/unittests/helpers/validators/ExternalFormValidations.spec.ts
@@ -0,0 +1,78 @@
+import { describe, it, expect } from 'vitest'
+
+import { 
+  getField,
+  getValidations,
+  validate,
+  addValidation 
+} from '@/helpers/validators/ExternalFormValidations'
+
+describe('ExternalFormValidations.ts', () => {
+
+  const formDataDto = {
+    businessInformation: {
+      businessType: 'JJ',
+      legalType: '',
+      clientType: '',
+      incorporationNumber: '',
+      businessName: 'The Test Client Corp',
+      goodStandingInd: '',
+    },
+    location: {
+      addresses: [
+        {
+          locationName: 'Mailing address',
+          streetAddress: '',
+          country: { value: 'CA', text: 'Canada' },
+          province: { value: '', text: '' },
+          city: '',
+          postalCode: 'A1A1A1',
+        },
+      ],
+      contacts: [{
+        locationNames: [{text:'Mailing address', value:'0'}],
+      }],
+    },
+  }
+
+  it('should get a list of functions for a field', () => {
+    addValidation('test', () => '')
+    expect(getValidations('test')).toEqual([expect.any(Function)])
+  })
+  it('should return an empty array for invalid fields', () => {
+    expect(getValidations('test2')).toEqual([])
+  })
+  it('should return the value of a simple field', () => {
+    expect(getField('businessInformation.businessType', formDataDto)).toEqual('JJ')
+  })
+  it('should return the value of a nested field', () => {
+    expect(getField('location.addresses.*.country.text', formDataDto)).toEqual(['Canada'])
+  })
+  it('should return the value of a nested field with a condition', () => {
+    expect(getField('location.addresses.*.postalCode(location.addresses.*.country.text === "CA")', formDataDto)).toEqual(['A1A1A1'])
+  })
+  it('should return the value of a nested field with a condition', () => {
+    expect(getField('location.addresses.*.postalCode(location.addresses.*.country.text === "US")', formDataDto)).toEqual(['A1A1A1'])
+  })
+  it('should return the value of a nested field within a nested field', () => {
+    expect(getField('location.contacts.*.locationNames.*.text', formDataDto)).toEqual([['Mailing address']])
+  })
+  it('should return true for a valid businessName', () => {
+    expect(validate(['businessInformation.businessName'], formDataDto)).toBeTruthy()
+  })
+  it('should return true for nested fields', () => {
+    expect(validate(['location.addresses.*.locationName'], formDataDto)).toBeTruthy()
+  })
+  it('should return true for nested fields with conditions', () => {
+    expect(validate(['location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'], formDataDto)).toBeTruthy()
+  })
+  it('should return true for nested fields withing nested fields', () => {
+    expect(validate(['location.contacts.*.locationNames.*.text'], formDataDto)).toBeTruthy()
+  })
+  it('should return true for fields with no validations', () => {
+    expect(validate(['businessInformation.businessType'], formDataDto)).toBeTruthy()
+  })
+  it('should return true for nested fields with conditions', () => {
+    expect(validate(['location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'], formDataDto)).toBeTruthy()
+  })
+})
\ No newline at end of file
diff --git a/frontend/tests/unittests/helpers/validators/GlobalValidators.spec.ts b/frontend/tests/unittests/helpers/validators/GlobalValidators.spec.ts
index f828a009a0..bfaca1028a 100644
--- a/frontend/tests/unittests/helpers/validators/GlobalValidators.spec.ts
+++ b/frontend/tests/unittests/helpers/validators/GlobalValidators.spec.ts
@@ -1,4 +1,5 @@
 import { describe, it, expect } from 'vitest'
+import { ref } from 'vue'
 import {
   isNotEmpty,
   isEmail,
@@ -9,99 +10,101 @@ import {
   isMinSize,
   isOnlyNumbers,
   isUniqueDescriptive,
-  isNoSpecialCharacters
+  isNoSpecialCharacters,
+  isContainedIn,
+  isNot,
 } from '@/helpers/validators/GlobalValidators'
 
 describe('GlobalValidators', () => {
   it('should return empty when isNotEmpty is called with a non-empty string', () => {
-    expect(isNotEmpty('a')).toBe('')
+    expect(isNotEmpty()('a')).toBe('')
   })
   it('should return empty when isNotEmpty is called on a string with leading whitespaces', () => {
-    expect(isNotEmpty(' a')).toBe('')
+    expect(isNotEmpty()(' a')).toBe('')
   })
   it('should return empty when isNotEmpty is called on a string with trailing whitespaces', () => {
-    expect(isNotEmpty('a ')).toBe('')
+    expect(isNotEmpty()('a ')).toBe('')
   })
   it('should return empty when isNotEmpty is called on a string with leading and trailing whitespaces', () => {
-    expect(isNotEmpty(' a ')).toBe('')
+    expect(isNotEmpty()(' a ')).toBe('')
   })
   it('should return an error message when isNotEmpty is called on an empty string', () => {
-    expect(isNotEmpty('')).toBe('This field is required')
+    expect(isNotEmpty()('')).toBe('This field is required')
   })
 
   it('should return empty when isEmail is called with a valid email', () => {
-    expect(isEmail('mail@mail.ca')).toBe('')
+    expect(isEmail()('mail@mail.ca')).toBe('')
   })
   it('should return an error message when isEmail is called with an invalid email', () => {
-    expect(isEmail('mail')).toBe('This field must be a valid email')
+    expect(isEmail()('mail')).toBe('This field must be a valid email')
   })
   it('should return an error message when isEmail is called with an empty string', () => {
-    expect(isEmail('')).toBe('This field must be a valid email')
+    expect(isEmail()('')).toBe('This field must be a valid email')
   })
   it('should return an error message when isEmail is called with a string with leading whitespaces', () => {
-    expect(isEmail('  mail@mail.ca')).toBe('This field must be a valid email')
+    expect(isEmail()('  mail@mail.ca')).toBe('This field must be a valid email')
   })
   it('should return an error message when isEmail is called with a string with trailing whitespaces', () => {
-    expect(isEmail('mail@mail.ca  ')).toBe('This field must be a valid email')
+    expect(isEmail()('mail@mail.ca  ')).toBe('This field must be a valid email')
   })
   it('should return an error message when isEmail is called with a string with leading and trailing whitespaces', () => {
-    expect(isEmail('  mail@mail.ca  ')).toBe('This field must be a valid email')
+    expect(isEmail()('  mail@mail.ca  ')).toBe('This field must be a valid email')
   })
   it('should return an error message when isEmail is called with an email with whitespace in the middle of it', () => {
-    expect(isEmail('mail @mail.ca')).toBe('This field must be a valid email')
+    expect(isEmail()('mail @mail.ca')).toBe('This field must be a valid email')
   })
 
   it('should return empty when isPhoneNumber is called with a valid phone number', () => {
-    expect(isPhoneNumber('+14165555555')).toBe('')
+    expect(isPhoneNumber()('+14165555555')).toBe('')
   })
   it('should return empty when isPhoneNumber is called with a phone number without country code', () => {
-    expect(isPhoneNumber('4165555555')).toBe('')
+    expect(isPhoneNumber()('4165555555')).toBe('')
   })
   it('should return an error message when isPhoneNumber is called with an empty string', () => {
-    expect(isPhoneNumber('')).toBe('This field must be a valid phone number')
+    expect(isPhoneNumber()('')).toBe('This field must be a valid phone number')
   })
   it('should return an error message when isPhoneNumber is called with a string with leading whitespaces', () => {
-    expect(isPhoneNumber('  +14165555555')).toBe(
+    expect(isPhoneNumber()('  +14165555555')).toBe(
       'This field must be a valid phone number'
     )
   })
   it('should return an error message when isPhoneNumber is called with a string with trailing whitespaces', () => {
-    expect(isPhoneNumber('+14165555555  ')).toBe(
+    expect(isPhoneNumber()('+14165555555  ')).toBe(
       'This field must be a valid phone number'
     )
   })
   it('should return an error message when isPhoneNumber is called with a string with leading and trailing whitespaces', () => {
-    expect(isPhoneNumber('  +14165555555  ')).toBe(
+    expect(isPhoneNumber()('  +14165555555  ')).toBe(
       'This field must be a valid phone number'
     )
   })
   it('should return an error message when isPhoneNumber is called with a phone number with whitespace in the middle of it', () => {
-    expect(isPhoneNumber('+1416 555 5555')).toBe(
+    expect(isPhoneNumber()('+1416 555 5555')).toBe(
       'This field must be a valid phone number'
     )
   })
   it('should return an error message when isPhoneNumber is called with a phone number with a letter in it', () => {
-    expect(isPhoneNumber('+1416555a555')).toBe(
+    expect(isPhoneNumber()('+1416555a555')).toBe(
       'This field must be a valid phone number'
     )
   })
   it('should return an error message when isPhoneNumber is called with a phone number with a special character in it', () => {
-    expect(isPhoneNumber('+1416555!555')).toBe(
+    expect(isPhoneNumber()('+1416555!555')).toBe(
       'This field must be a valid phone number'
     )
   })
   it('should return an error message when isPhoneNumber is called with a phone number with a space in it', () => {
-    expect(isPhoneNumber('+1416555 555')).toBe(
+    expect(isPhoneNumber()('+1416555 555')).toBe(
       'This field must be a valid phone number'
     )
   })
   it('should return an error message when isPhoneNumber is called with a phone number with a dash in it', () => {
-    expect(isPhoneNumber('+1416555-555')).toBe(
+    expect(isPhoneNumber()('+1416555-555')).toBe(
       'This field must be a valid phone number'
     )
   })
   it('should return an error message when isPhoneNumber is called with a phone number with a dot in it', () => {
-    expect(isPhoneNumber('+1416555.555')).toBe(
+    expect(isPhoneNumber()('+1416555.555')).toBe(
       'This field must be a valid phone number'
     )
   })
@@ -177,42 +180,42 @@ describe('GlobalValidators', () => {
     expect(isUsZipCode('1234a')).toBe('This field must be a valid US zip code')
   })
   it('should return empty when isMaxSize is called on a string with a size less than the max size', () => {
-    expect(isMaxSize(5)('123')).toBe('')
+    expect(isMaxSize()(5)('123')).toBe('')
   })
   it('should return empty when isMaxSize is called on a string with a size equal to the max size', () => {
-    expect(isMaxSize(5)('12345')).toBe('')
+    expect(isMaxSize()(5)('12345')).toBe('')
   })
   it('should return an error message when isMaxSize is called on a string with a size greater than the max size', () => {
-    expect(isMaxSize(5)('123456')).toBe(
+    expect(isMaxSize('This field must be at most 5 characters long')(5)('123456')).toBe(
       'This field must be at most 5 characters long'
     )
   })
   it('should return empty when isMinSize is called on a string with a size greater than the min size', () => {
-    expect(isMinSize(5)('123456')).toBe('')
+    expect(isMinSize()(5)('123456')).toBe('')
   })
   it('should return empty when isMinSize is called on a string with a size equal to the min size', () => {
-    expect(isMinSize(5)('12345')).toBe('')
+    expect(isMinSize()(5)('12345')).toBe('')
   })
   it('should return an error message when isMinSize is called on a string with a size less than the min size', () => {
-    expect(isMinSize(5)('1234')).toBe(
+    expect(isMinSize('This field must be at least 5 characters long')(5)('1234')).toBe(
       'This field must be at least 5 characters long'
     )
   })
   it('should return an error message when isMinSize is called on an empty string', () => {
-    expect(isMinSize(5)('')).toBe(
+    expect(isMinSize('This field must be at least 5 characters long')(5)('')).toBe(
       'This field must be at least 5 characters long'
     )
   })
   it('should return empty when isOnlyNumbers is called on a string with only numbers', () => {
-    expect(isOnlyNumbers('123')).toBe('')
+    expect(isOnlyNumbers()('123')).toBe('')
   })
   it('should return an error message when isOnlyNumbers is called on a string with letters', () => {
-    expect(isOnlyNumbers('123a')).toBe(
+    expect(isOnlyNumbers()('123a')).toBe(
       'This field must be composed of only numbers'
     )
   })
   it('should return an error message when isOnlyNumbers is called on an empty string', () => {
-    expect(isOnlyNumbers('')).toBe(
+    expect(isOnlyNumbers()('')).toBe(
       'This field must be composed of only numbers'
     )
   })
@@ -229,14 +232,26 @@ describe('GlobalValidators', () => {
     )
   })
   it('should return empty when isNoSpecialCharacters is called on a string with no special characters', () => {
-    expect(isNoSpecialCharacters('abc123')).toBe('')
+    expect(isNoSpecialCharacters()('abc123')).toBe('')
   })
   it('should return an error message when isNoSpecialCharacters is called on a string with special characters', () => {
-    expect(isNoSpecialCharacters('abc123!')).toBe(
+    expect(isNoSpecialCharacters()('abc123!')).toBe(
       'No special characters allowed'
     )
   })
   it('should return an error message when isNoSpecialCharacters is called on an empty string', () => {
-    expect(isNoSpecialCharacters('')).toBe('No special characters allowed')
+    expect(isNoSpecialCharacters()('')).toBe('No special characters allowed')
+  })
+  it('should return empty when content is contained in the list', () => {
+    expect(isContainedIn(ref(['a', 'b']))('a')).toBe('')
+  })
+  it('should return an error message when content is not contained in the list', () => {
+    expect(isContainedIn(ref(['a', 'b']))('c')).toBe('No value selected')
+  })
+  it('should return empty when value is different than the other value', () => {
+    expect(isNot('a')('b')).toBe('')
+  })
+  it('should return an error message when value is equal to the other value', () => {
+    expect(isNot('a')('a')).toBe('Value is not allowed')
   })
 })
diff --git a/frontend/tsconfig.vitest.json b/frontend/tsconfig.vitest.json
index 7ebd672bd8..45fa920374 100644
--- a/frontend/tsconfig.vitest.json
+++ b/frontend/tsconfig.vitest.json
@@ -6,6 +6,9 @@
     "lib": ["es2017", "dom", "dom.iterable"],
     "types": ["node", "jsdom"],
     "ignoreDeprecations": "5.0",
-    "verbatimModuleSyntax": true
+    "verbatimModuleSyntax": true,
+    "paths": {
+      "@/*": ["../src/*"]
+    },
   }
 }
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 904838b3d2..69900fcab2 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -61,7 +61,9 @@ export default defineConfig(({ command, mode }) => {
           '**/dto/**/*',
           '**/core/**/*',
           '**/CoreConstants.ts',
-          '**/main.ts'
+          '**/main.ts',
+          '.prettierrc.js',
+          '.eslintrc.js',
         ]
       },
       environment: 'jsdom'

From bb1be93f59faa2cc2c54ddca09fc9a9bbfb63ce0 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 29 Aug 2023 13:01:27 -0700
Subject: [PATCH 034/313] chore: fixing typo

---
 frontend/src/helpers/DataConversors.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/helpers/DataConversors.ts b/frontend/src/helpers/DataConversors.ts
index 3abd4a2a76..91661506cc 100644
--- a/frontend/src/helpers/DataConversors.ts
+++ b/frontend/src/helpers/DataConversors.ts
@@ -33,10 +33,12 @@ export const retrieveClientType = (legalType: string): string => {
 export const toMixedCase = (inputString: string) =>
   inputString
     .split(' ')
-    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
     .join(' ')
 
-export const exportAddress = (addresses: Address[]) : Address[] => {
-  if (addresses && addresses.length > 0) { return addresses }
-  return [{ ...emptyAddress(), locationName: 'Mailing Aaddress' }]
+export const exportAddress = (addresses: Address[]): Address[] => {
+  if (addresses && addresses.length > 0) {
+    return addresses
+  }
+  return [{ ...emptyAddress(), locationName: 'Mailing address' }]
 }

From 08ed8008e38af6e9fd1b682fb792479520365398 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 30 Aug 2023 04:56:55 -0700
Subject: [PATCH 035/313] chore: adding conditional render to postal hint

---
 frontend/package-lock.json                    | 13 +----------
 frontend/package.json                         |  3 +--
 .../grouping/AddressGroupComponent.vue        | 22 +++++++++++++------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index b9a1516fd4..e430ef180c 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -28,7 +28,6 @@
         "@cypress/webpack-preprocessor": "^5.17.1",
         "@istanbuljs/nyc-config-typescript": "^1.0.2",
         "@rushstack/eslint-patch": "^1.1.0",
-        "@types/cypress": "^1.1.3",
         "@types/jsdom": "^21.1.0",
         "@types/node": "^18.14.2",
         "@typescript-eslint/eslint-plugin": "^6.5.0",
@@ -60,7 +59,7 @@
         "typescript": "~5.1.0",
         "unplugin-icons": "^0.15.3",
         "unplugin-vue-components": "^0.24.0",
-        "vite": "^4.0.0",
+        "vite": "^4.4.9",
         "vite-plugin-istanbul": "^5.0.0",
         "vitest": "^0.34.0",
         "volar-service-vetur": "latest",
@@ -3081,16 +3080,6 @@
         "@types/chai": "*"
       }
     },
-    "node_modules/@types/cypress": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@types/cypress/-/cypress-1.1.3.tgz",
-      "integrity": "sha512-OXe0Gw8LeCflkG1oPgFpyrYWJmEKqYncBsD/J0r17r0ETx/TnIGDNLwXt/pFYSYuYTpzcq1q3g62M9DrfsBL4g==",
-      "deprecated": "This is a stub types definition for cypress (https://cypress.io). cypress provides its own type definitions, so you don't need @types/cypress installed!",
-      "dev": true,
-      "dependencies": {
-        "cypress": "*"
-      }
-    },
     "node_modules/@types/eslint": {
       "version": "8.44.2",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index b1755206a7..dfba93bd44 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -61,7 +61,6 @@
     "@cypress/webpack-preprocessor": "^5.17.1",
     "@istanbuljs/nyc-config-typescript": "^1.0.2",
     "@rushstack/eslint-patch": "^1.1.0",
-    "@types/cypress": "^1.1.3",
     "@types/jsdom": "^21.1.0",
     "@types/node": "^18.14.2",
     "@typescript-eslint/eslint-plugin": "^6.5.0",
@@ -93,7 +92,7 @@
     "typescript": "~5.1.0",
     "unplugin-icons": "^0.15.3",
     "unplugin-vue-components": "^0.24.0",
-    "vite": "^4.0.0",
+    "vite": "^4.4.9",
     "vite-plugin-istanbul": "^5.0.0",
     "vitest": "^0.34.0",
     "volar-service-vetur": "latest",
diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index e35915be63..6f3390041e 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -139,14 +139,20 @@ const postalCodeMask = computed(() => {
   }
 })
 
+const postalCodeShowHint = ref(false)
+
 const postalCodePlaceholder = computed(() => {
-  switch (selectedValue.country.value) {
-    case 'CA':
-      return 'Use A1A1A1 format'
-    case 'US':
-      return 'Use 00000 or 00000-0000 format'
-    default:
-      return 'Use 00000 format'
+  if(postalCodeShowHint.value) {
+    switch (selectedValue.country.value) {
+      case 'CA':
+        return 'Use A1A1A1 format'
+      case 'US':
+        return 'Use 00000 or 00000-0000 format'
+      default:
+        return 'Use 00000 format'
+    }
+  }else{
+    return ''
   }
 })
 
@@ -201,6 +207,8 @@ watch([detailsData], () => {
     selectedValue.city = detailsData.value.city
     selectedValue.province = detailsData.value.province
     selectedValue.postalCode = detailsData.value.postalCode.replace(/\s/g, '')
+    if(!selectedValue.postalCode) postalCodeShowHint.value = true
+    else postalCodeShowHint.value = false
   }
 })
 

From 581e141211804d16b3ecb4bc3448dfdd3ce1bff0 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 30 Aug 2023 06:56:29 -0700
Subject: [PATCH 036/313] fix: removing client type validation

---
 frontend/src/helpers/validators/ExternalFormValidations.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
index dfe2f94b99..839b67e17f 100644
--- a/frontend/src/helpers/validators/ExternalFormValidations.ts
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -20,9 +20,6 @@ const globalValidations: Record<string, ((value: string) => string)[]> = {}
 globalValidations['businessInformation.businessName'] = [
   isNotEmpty('Business Name cannot be empty'),
 ]
-globalValidations['businessInformation.clientType'] = [
-  isNot('I', 'Individuals are not supported at the moment'),
-]
 
 // Step 2: Addresses
 globalValidations['location.addresses.*.locationName'] = [

From e1a8d7fc30c0b66a897e7146fa7642356c1cdf39 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 30 Aug 2023 08:45:55 -0700
Subject: [PATCH 037/313] fix: last style fixes

---
 frontend/src/assets/styles/global.scss        | 49 ++++++++++++++++---
 .../forms/AutoCompleteInputComponent.vue      |  3 +-
 .../forms/MultiselectInputComponent.vue       |  4 +-
 .../grouping/AddressGroupComponent.vue        |  1 +
 .../grouping/ContactGroupComponent.vue        |  6 +--
 .../visuals/DisplayBlockComponent.vue         |  6 +--
 .../validators/ExternalFormValidations.ts     | 12 ++---
 frontend/src/pages/ApplyClientNumberPage.vue  |  2 +-
 .../src/pages/applyform/AddressWizardStep.vue | 14 +++---
 .../src/pages/applyform/ContactWizardStep.vue |  9 ++--
 .../stub/__files/response-address-search.json |  6 ++-
 frontend/stub/mappings/backend.json           | 13 ++++-
 12 files changed, 87 insertions(+), 38 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index fa7b08eb2b..b30a2bd6a8 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -25,6 +25,10 @@
   --light-theme-support-support-info: #00478f;
   --light-theme-notifications-support-info-border: rgba(0, 102, 204, 1);
   --light-theme-text-text-primary: #131315;
+  --border-subtle-02: #dfdfe1;
+  --light-theme-tag-blue-background: #c2e0ff;
+  --light-theme-tag-blue-text:#00478f;
+  --light-theme-focus: #0073e6;
   //Primary button
   --cds-interactive-01: #0073E6;
   --cds-active-primary: #0073E6;
@@ -64,6 +68,13 @@ a:hover {
 a:visited {
   color: var(--light-theme-link-link-visited, #7c1cdf);
 }
+hr {
+  display: block;
+  border: 0;
+  border-top: 1px solid var(--border-subtle-02,#dfdfe1);
+  margin: 1em 0;
+  padding: 0;
+}
 
 .bulleted-list {
   list-style: decimal;
@@ -90,12 +101,7 @@ a:visited {
 }
 
 .inner-spotlight-group-markup {
-  border-bottom: solid 1px #dfdfe1;
-}
-
-.bx-tag {
-  background-color: #00478f;
-  color: white;
+  border-bottom: solid 1px var(--border-subtle-02);
 }
 
 .wizard-head {
@@ -654,6 +660,14 @@ a:visited {
   gap: 0.125rem;
   flex: 1 0 0;
 }
+.grouping-09 {
+  align-self: stretch;
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  padding-top: 2rem;
+  padding-bottom: 1.5rem;
+}
 
 .bx--btn-reset {
   position: relative;
@@ -694,7 +708,25 @@ a:visited {
   display: flex;
   align-items: flex-start;
   border-radius: 62.5rem;
-  background: var(--dark-theme-tag-blue-background, #00478f);
+  background: var(--light-theme-tag-blue-background, #c2e0ff);
+  gap: 0.125rem;
+  padding: 0 !important;
+}
+.bx-tag span{
+  color: var(--light-theme-tag-blue-text,#00478f);
+  margin: 0.19rem 0.5rem 0.31rem 0.5rem !important;
+}
+.bx-tag svg {
+  color: var(--light-theme-tag-blue-text,#00478f);
+  margin: 0.25rem !important;
+  border-radius: 150%;
+}
+.bx-tag svg:hover {
+  background-color: var(--light-theme-tag-blue-hover, #99ccff);
+  cursor: pointer;
+}
+.bx-tag svg:focus {
+  outline: 2px solid var(--light-theme-focus, #99ccff);
 }
 
 .bx--modal-btn-divider {
@@ -711,7 +743,8 @@ a:visited {
 
 .display-block-icon-wrapper {
   display: flex;
-  padding-top: 14px;
+  padding-top: 1rem;
+  padding-left: 1rem;
   align-items: flex-start;
   align-self: stretch;
 }
diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index 2fbfd69ddf..667b6b4694 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -8,6 +8,7 @@ const props = defineProps<{
   id: string
   label: string
   tip?: string
+  placeholder?: string
   modelValue: string
   contents: Array<BusinessSearchResult>
   validations: Array<Function>
@@ -114,7 +115,7 @@ revalidateBus.on(() => validateInput(inputValue.value))
       :data-focus="id"
       :data-scroll="id"
       :data-id="'input-' + id"
-      :placeholder="'Start typing to search for your ' + label"
+      :placeholder="placeholder"
       :value="inputValue"
       :label-text="label"
       :helper-text="tip"
diff --git a/frontend/src/components/forms/MultiselectInputComponent.vue b/frontend/src/components/forms/MultiselectInputComponent.vue
index 786c3e7c6e..bd2c095440 100644
--- a/frontend/src/components/forms/MultiselectInputComponent.vue
+++ b/frontend/src/components/forms/MultiselectInputComponent.vue
@@ -125,6 +125,7 @@ revalidateBus.on(() => validateInput(selectedValue.value))
       </bx-dropdown>
       <div class="bx-tag-box">
         <bx-tag
+          filter="true"
           v-for="(tag, index) in items"
           title="Clear selection"
           class="bx-tag"
@@ -132,8 +133,9 @@ revalidateBus.on(() => validateInput(selectedValue.value))
           :id="'tag_' + id + '_' + index"
           :key="index"
         >
-          {{ tag }}
+          <span>{{ tag }}</span>
           <CloseOutline16
+          tabindex="1"
             :id="'close_' + id + '_' + index"
             @click="removeFromSelection(tag)"
           />
diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 6f3390041e..b803140f67 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -192,6 +192,7 @@ watch([autoCompleteResult], () => {
     watch([error], () => {
       // @ts-ignore
       generalErrorBus.emit(error.response?.data.message)
+      postalCodeShowHint.value = true
     })
 
     watch(
diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index e79b333cf9..24fdb52601 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -131,7 +131,7 @@ onMounted(() =>{
   <text-input-component
     :id="'firstName_' + id"
     label="First name"
-    placeholder="First name"
+    placeholder=""
     v-model="selectedValue.firstName"
     :validations="[
       ...getValidations('location.contacts.*.firstName'),
@@ -145,7 +145,7 @@ onMounted(() =>{
   <text-input-component
     :id="'lastName_' + id"
     label="Last name"
-    placeholder="Last name"
+    placeholder=""
     v-model="selectedValue.lastName"
     :validations="[
       ...getValidations('location.contacts.*.lastName'),
@@ -159,7 +159,7 @@ onMounted(() =>{
   <text-input-component
     :id="'email_' + id"
     label="Email address"
-    placeholder="Email"
+    placeholder=""
     v-model="selectedValue.email"
     :validations="[
       ...getValidations('location.contacts.*.email'),
diff --git a/frontend/src/components/visuals/DisplayBlockComponent.vue b/frontend/src/components/visuals/DisplayBlockComponent.vue
index 416f9c436d..e7bcf7d478 100644
--- a/frontend/src/components/visuals/DisplayBlockComponent.vue
+++ b/frontend/src/components/visuals/DisplayBlockComponent.vue
@@ -55,8 +55,8 @@ const iconsForKinds: Record<string, any> = {
   display: flex;
   flex-direction: row;
   align-items: flex-start;
-  padding: 15px;
-  gap: 16px;
+  padding: 0.25rem;
+  gap: 1rem;
 }
 
 .display-block-wrapper p span {
@@ -93,7 +93,7 @@ const iconsForKinds: Record<string, any> = {
 }
 
 .display-block-icon-info {
-  color: var(--light-theme-notifications-support-info-border, rgba(0, 102, 204, 0.40));
+  color: var(--light-theme-support-info, #00478F);
 }
 .display-block-icon-success {
   color: #198038;
diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
index 839b67e17f..6afe42001d 100644
--- a/frontend/src/helpers/validators/ExternalFormValidations.ts
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -82,14 +82,14 @@ globalValidations['location.contacts.*.contactType.text'] = [
   isNotEmpty('You must select at least one contact type'),
 ]
 globalValidations['location.contacts.*.firstName'] = [
-  isMinSize('Name should be between 1 and 25 characters with no special character')(1),
-  isMaxSize('Name should be between 1 and 25 characters with no special character')(25),
-  isNoSpecialCharacters('Name should be between 1 and 25 characters with no special character'),
+  isMinSize('Enter a name')(1),
+  isMaxSize('Enter a name')(25),
+  isNoSpecialCharacters('Enter a name'),
 ]
 globalValidations['location.contacts.*.lastName'] = [
-  isMinSize('Name should be between 1 and 25 characters with no special character')(1),
-  isMaxSize('Name should be between 1 and 25 characters with no special character')(25),
-  isNoSpecialCharacters('Name should be between 1 and 25 characters with no special character'),
+  isMinSize('Enter a name')(1),
+  isMaxSize('Enter a name')(25),
+  isNoSpecialCharacters('Enter a name'),
 ]
 globalValidations['location.contacts.*.email'] = [
   isEmail('Please provide a valid email address'),
diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index 167c439714..65cecc1213 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -305,7 +305,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
     <div v-if="currentTab == 0" class="form-steps-01">
       <div class="form-steps-01-title">
         <span class="heading-04" data-scroll="scroll-0">Before you begin</span>
-        <ol type="1" class="bulleted-list body-02">
+        <ol type="1" class="bulleted-list body-compact-01">
           <li>
             A registered business must be in good standing with BC
             Registries
diff --git a/frontend/src/pages/applyform/AddressWizardStep.vue b/frontend/src/pages/applyform/AddressWizardStep.vue
index 8b8652d57f..5cb5f0dd69 100644
--- a/frontend/src/pages/applyform/AddressWizardStep.vue
+++ b/frontend/src/pages/applyform/AddressWizardStep.vue
@@ -118,15 +118,13 @@ onMounted(() => setFocusedComponent('addr_0',800))
     @valid="updateValidState(0, $event)"
   />
 
-<hr v-if="otherAddresses.length > 0"/>
-
-<div class="frame-01">
-  <div v-if="otherAddresses.length > 0" class="grouping-01">
-    <span class="heading-03">Additional address</span>
-  </div>
-
+<div class="frame-01" v-if="otherAddresses.length > 0">
+  
   <div v-for="(address, index) in otherAddresses">
-    <hr v-if="index > 0"/>
+    <hr />
+    <div class="grouping-09">
+      <span class="heading-03">Additional address</span>
+    </div>
     <address-group-component
       :key="index + 1"
       :id="index + 1"
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index 3c82cc15f8..0c8a5cb167 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -126,14 +126,13 @@ onMounted(() => setFocusedComponent('addressname_0',800))
     @valid="updateValidState(0, $event)"
   />
 
-  <hr v-if="otherContacts.length > 0"/>
-
   <div class="frame-01" v-if="otherContacts.length > 0">
-    <div class="grouping-01">
+
+    <div  v-for="(contact, index) in otherContacts">
+      <hr />
+      <div class="grouping-09">
       <span class="heading-03">Additional contact</span>
     </div>
-    <div  v-for="(contact, index) in otherContacts">
-      <hr v-if="index > 0"/>
     <contact-group-component
       :key="index + 1"
       :id="index + 1"
diff --git a/frontend/stub/__files/response-address-search.json b/frontend/stub/__files/response-address-search.json
index f0f9638da2..1e5d8a2a56 100644
--- a/frontend/stub/__files/response-address-search.json
+++ b/frontend/stub/__files/response-address-search.json
@@ -1,6 +1,10 @@
 [
   {
-    "code": "AA|AA|A|00000000",
+    "code": "AA",
     "name": "1234 Nowhere St Victoria, BC, V8V 8V8"
+  },
+  {
+    "code": "BB",
+    "name": "505 Fail St Victoria, BC, V8V 8V8"
   }
 ]
diff --git a/frontend/stub/mappings/backend.json b/frontend/stub/mappings/backend.json
index 722e522341..af325afd3f 100644
--- a/frontend/stub/mappings/backend.json
+++ b/frontend/stub/mappings/backend.json
@@ -166,7 +166,7 @@
     },
     {
       "request": {
-        "urlPattern": "/api/clients/addresses/(.*)",
+        "url": "/api/clients/addresses/AA",
         "method": "GET"
       },
       "response": {
@@ -175,6 +175,17 @@
         "transformers": ["response-template"],
         "fixedDelayMilliseconds": 2500
       }
+    },
+    {
+      "request": {
+        "url": "/api/clients/addresses/BB",
+        "method": "GET"
+      },
+      "response": {
+        "status": 404,
+        "transformers": ["response-template"],
+        "fixedDelayMilliseconds": 2500
+      }
     }
   ]
 }

From 8c47e9d5be94cf9f6c8df221c2a00cd7de8234a2 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 31 Aug 2023 10:40:44 -0700
Subject: [PATCH 038/313] Made code reviews, fixed spelling mistakes and
 beautified code.

---
 frontend/src/pages/ApplyClientNumberPage.vue | 198 +++++++++----------
 1 file changed, 98 insertions(+), 100 deletions(-)

diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index 65cecc1213..ff2d2db070 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -1,48 +1,48 @@
 <script setup lang="ts">
-import { reactive, watch, toRef, ref, getCurrentInstance, computed } from 'vue'
+import { reactive, watch, toRef, ref, getCurrentInstance, computed } from 'vue';
 // Composables
-import { useEventBus } from '@vueuse/core'
-import { useRouter } from 'vue-router'
+import { useEventBus } from '@vueuse/core';
+import { useRouter } from 'vue-router';
 import { useFocus } from '@/composables/useFocus';
-import { usePost } from '@/composables/useFetch'
+import { usePost } from '@/composables/useFetch';
 // Imported Pages
-import BusinessInformationWizardStep from '@/pages/applyform/BusinessInformationWizardStep.vue'
-import AddressWizardStep from '@/pages/applyform/AddressWizardStep.vue'
-import ContactWizardStep from '@/pages/applyform/ContactWizardStep.vue'
-import ReviewWizardStep from '@/pages/applyform/ReviewWizardStep.vue'
+import BusinessInformationWizardStep from '@/pages/applyform/BusinessInformationWizardStep.vue';
+import AddressWizardStep from '@/pages/applyform/AddressWizardStep.vue';
+import ContactWizardStep from '@/pages/applyform/ContactWizardStep.vue';
+import ReviewWizardStep from '@/pages/applyform/ReviewWizardStep.vue';
 // Imported types
 import {
   newFormDataDto
-} from '@/dto/ApplyClientNumberDto'
+} from '@/dto/ApplyClientNumberDto';
 import type {
   FormDataDto,
   Contact
-} from '@/dto/ApplyClientNumberDto'
-import type { ValidationMessageType, ModalNotification } from '@/dto/CommonTypesDto'
+} from '@/dto/ApplyClientNumberDto';
+import type { ValidationMessageType, ModalNotification } from '@/dto/CommonTypesDto';
 // Imported User session
-import ForestClientUserSession from '@/helpers/ForestClientUserSession'
+import ForestClientUserSession from '@/helpers/ForestClientUserSession';
 // Imported global validations
-import { addValidation,validate } from '@/helpers/validators/ExternalFormValidations'
+import { addValidation, validate } from '@/helpers/validators/ExternalFormValidations';
 // @ts-ignore
-import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16'
+import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16';
 // @ts-ignore
-import Save16 from '@carbon/icons-vue/es/save/16'
+import Save16 from '@carbon/icons-vue/es/save/16';
 // @ts-ignore
-import LogOut16 from '@carbon/icons-vue/es/logout/16'
+import LogOut16 from '@carbon/icons-vue/es/logout/16';
 // @ts-ignore
-import Check16 from '@carbon/icons-vue/es/checkmark/16'
+import Check16 from '@carbon/icons-vue/es/checkmark/16';
 import { isContainedIn } from '@/helpers/validators/GlobalValidators';
 
-const errorBus = useEventBus<ValidationMessageType[]>('submission-error-notification')
-const generalErrorBus = useEventBus<string>('general-error-notification')
-const exitBus = useEventBus<Record<string, boolean | null>>('exit-notification')
-const toastBus = useEventBus<ModalNotification>('toast-notification')
+const errorBus = useEventBus<ValidationMessageType[]>('submission-error-notification');
+const generalErrorBus = useEventBus<string>('general-error-notification');
+const exitBus = useEventBus<Record<string, boolean | null>>('exit-notification');
+const toastBus = useEventBus<ModalNotification>('toast-notification');
 
-const router = useRouter()
+const router = useRouter();
 const { setScrollPoint } = useFocus();
-const submitterInformation = ForestClientUserSession.user
-const instance = getCurrentInstance()
-const session = instance?.appContext.config.globalProperties.$session
+const submitterInformation = ForestClientUserSession.user;
+const instance = getCurrentInstance();
+const session = instance?.appContext.config.globalProperties.$session;
 
 const submitterContact: Contact = {
   locationNames: [],
@@ -51,9 +51,9 @@ const submitterContact: Contact = {
   firstName: session?.user?.firstName ?? '',
   lastName: session?.user?.lastName ?? '',
   email: session?.user?.email ?? ''
-}
+};
 
-let formDataDto = ref<FormDataDto>({ ...newFormDataDto() })
+let formDataDto = ref<FormDataDto>({ ...newFormDataDto() });
 
 //---- Form Data ----//
 let formData = reactive<FormDataDto>({
@@ -62,9 +62,9 @@ let formData = reactive<FormDataDto>({
     addresses: formDataDto.value.location.addresses,
     contacts: [submitterContact]
   }
-})
+});
 
-const locations = computed(() => formData.location.addresses.map((address:any) => address.locationName))
+const locations = computed(() => formData.location.addresses.map((address:any) => address.locationName));
 
 const { response, error, fetch } = usePost(
   '/api/clients/submissions',
@@ -77,43 +77,41 @@ const { response, error, fetch } = usePost(
       'x-user-name': submitterInformation?.firstName ?? ''
     }
   }
-)
+);
 
 watch([response], () => {
   if (response.value.status === 201) {
-    router.push({ name: 'confirmation' })
+    router.push({ name: 'confirmation' });
   }
-})
+});
 
 watch([error], () => {
   if (error.response?.status === 400) {
-    const validationErrors: ValidationMessageType[] = error.response?.data as ValidationMessageType[]
+    const validationErrors: ValidationMessageType[] = error.response?.data as ValidationMessageType[];
     const fieldIds = [
       'businessInformation.businessType',
       'businessInformation.legalType',
       'businessInformation.clientType'
-    ]
+    ];
 
     const matchingFields = validationErrors.find((item) =>
       fieldIds.includes(item.fieldId)
-    )
+    );
     if (matchingFields) {
       generalErrorBus.emit(
         `There was an error submitting your application. ${matchingFields.errorMsg}`
-      )
-      setScrollPoint('top')
+      );
+      setScrollPoint('top');
     }
   } else {
     generalErrorBus.emit(
-      `There was an error submitting your application. ${error.response?.data}}`
-    )
-    setScrollPoint('top')
+      `There was an error submitting your application. ${error.response?.data}`
+    );
+    setScrollPoint('top');
   }
-})
-
-addValidation('location.contacts.*.locationNames.*.text', isContainedIn(locations))
-
+});
 
+addValidation('location.contacts.*.locationNames.*.text', isContainedIn(locations));
 
 // Tab system
 const progressData = reactive([
@@ -123,7 +121,7 @@ const progressData = reactive([
     kind: 'current',
     enabled: true,
     valid: false,
-    step:0,
+    step: 0,
     fields: [
       'businessInformation.businessType',
       'businessInformation.businessName',
@@ -135,7 +133,7 @@ const progressData = reactive([
     kind: 'queued',
     enabled: true,
     valid: false,
-    step:1,
+    step: 1,
     fields: [
       'location.addresses.*.locationName',
       'location.addresses.*.country.text',
@@ -153,7 +151,7 @@ const progressData = reactive([
     kind: 'queued',
     enabled: true,
     valid: false,
-    step:2,
+    step: 2,
     fields: [
       'location.contacts.*.locationNames.*.text',
       'location.contacts.*.contactType.text',
@@ -169,7 +167,7 @@ const progressData = reactive([
     kind: 'queued',
     enabled: true,
     valid: false,
-    step:3,
+    step: 3,
     fields: [
     'businessInformation.businessType',
     'businessInformation.businessName',
@@ -189,70 +187,70 @@ const progressData = reactive([
     'location.contacts.*.phoneNumber'
     ]
   }
-])
+]);
 
 const currentTab = ref(0);
 
 const stateIcon = (index: number) => {
-  if (currentTab.value == index) return 'current'
-  if (currentTab.value > index || progressData[index].valid) return 'complete'
-  return 'queued'
-}
+  if (currentTab.value == index) return 'current';
+  if (currentTab.value > index || progressData[index].valid) return 'complete';
+  return 'queued';
+};
 
-const checkStepValidity = (stepNumber: number) : boolean =>{
+const checkStepValidity = (stepNumber: number): boolean => {
   progressData.forEach((step:any) => {
-    if(step.step <= stepNumber){
-      step.valid = validate(step.fields,formData);
+    if (step.step <= stepNumber) {
+      step.valid = validate(step.fields, formData);
     }
-  })
-  return progressData[stepNumber].valid
-}
-
-const isLast = computed(() => currentTab.value === progressData.length - 1)
-const isFirst = computed(() => currentTab.value === 0)
-const isCurrentValid = computed(() => progressData[currentTab.value].valid)
-const isNextAvailable = computed(() => !isCurrentValid.value || isLast.value)
-const isFormValid = computed(() => progressData.every((entry: any) => entry.valid))
-const endAndLogOut = ref<boolean>(false)
-const mailAndLogOut = ref<boolean>(false)
+  });
+  return progressData[stepNumber].valid;
+};
+
+const isLast = computed(() => currentTab.value === progressData.length - 1);
+const isFirst = computed(() => currentTab.value === 0);
+const isCurrentValid = computed(() => progressData[currentTab.value].valid);
+const isNextAvailable = computed(() => !isCurrentValid.value || isLast.value);
+const isFormValid = computed(() => progressData.every((entry: any) => entry.valid));
+const endAndLogOut = ref<boolean>(false);
+const mailAndLogOut = ref<boolean>(false);
 
 const goToStep = (index: number) => {
-  if(checkStepValidity(index)) currentTab.value = index
-}
+  if (checkStepValidity(index)) currentTab.value = index;
+};
 
 const onNext = () => {
   if (currentTab.value + 1 < progressData.length) {
-    if(checkStepValidity(currentTab.value)){
-      currentTab.value++
-      progressData[currentTab.value-1].kind = stateIcon(currentTab.value-1)
-      progressData[currentTab.value].kind = stateIcon(currentTab.value)
-      setScrollPoint('top')
+    if (checkStepValidity(currentTab.value)) {
+      currentTab.value++;
+      progressData[currentTab.value - 1].kind = stateIcon(currentTab.value - 1);
+      progressData[currentTab.value].kind = stateIcon(currentTab.value);
+      setScrollPoint('top');
     }
   }
-}
+};
 const onBack = () => {
   if (currentTab.value - 1 >= 0) {
-    currentTab.value--
-    progressData[currentTab.value+1].kind = stateIcon(currentTab.value+1)
-    progressData[currentTab.value].kind = stateIcon(currentTab.value)
-    setScrollPoint('top')
+    currentTab.value--;
+    progressData[currentTab.value + 1].kind = stateIcon(currentTab.value + 1);
+    progressData[currentTab.value].kind = stateIcon(currentTab.value);
+    setScrollPoint('top');
   }
-}
+};
 const validateStep = (valid: boolean) => {
-  progressData[currentTab.value].valid = valid
-}
+  progressData[currentTab.value].valid = valid;
+};
 const saveChange = () => {
-  if(checkStepValidity(currentTab.value)){
+  if (checkStepValidity(currentTab.value)) {
     toastBus.emit({
-      message: `“${progressData[currentTab.value].title}” changes was saved successfully.`,
+      message: `“${progressData[currentTab.value].title}” changes were saved successfully.`,
       kind: 'Success',
       toastTitle:'',
       active: true,
       handler: () => {}
-    })
-    goToStep(3)
+    });
+    goToStep(3);
   }
-}
+};
 
 const processAndLogOut = () => {
   if (mailAndLogOut.value) {
@@ -266,26 +264,26 @@ const processAndLogOut = () => {
         mail: submitterInformation?.email ?? ''
       },
       {}
-    )
+    );
   }
-  session?.logOut()
-}
+  session?.logOut();
+};
 
 const submit = () => {
-  errorBus.emit([])
-  generalErrorBus.emit('')
-  if(checkStepValidity(currentTab.value)){
-    fetch()
+  errorBus.emit([]);
+  generalErrorBus.emit('');
+  if (checkStepValidity(currentTab.value)) {
+    fetch();
   }
-}
+};
 
 exitBus.on((event: Record<string, boolean | null>) => {
-  endAndLogOut.value = event.goodStanding ? event.goodStanding : false
-  mailAndLogOut.value = event.duplicated ? event.duplicated : false
-})
+  endAndLogOut.value = event.goodStanding ? event.goodStanding : false;
+  mailAndLogOut.value = event.duplicated ? event.duplicated : false;
+});
 
-const globalErrorMessage = ref<string>('')
-generalErrorBus.on((event: string) => (globalErrorMessage.value = event))
+const globalErrorMessage = ref<string>('');
+generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
 </script>
 
 <template>

From 926372c37a437ce6e6aa38b54638da073600adc8 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 31 Aug 2023 11:08:28 -0700
Subject: [PATCH 039/313] Beautified code

---
 frontend/src/pages/ApplyClientNumberPage.vue | 242 ++++++++++---------
 1 file changed, 128 insertions(+), 114 deletions(-)

diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index ff2d2db070..d998507bf8 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -1,42 +1,46 @@
 <script setup lang="ts">
-import { reactive, watch, toRef, ref, getCurrentInstance, computed } from 'vue';
+import { reactive, watch, toRef, ref, getCurrentInstance, computed } from "vue";
 // Composables
-import { useEventBus } from '@vueuse/core';
-import { useRouter } from 'vue-router';
-import { useFocus } from '@/composables/useFocus';
-import { usePost } from '@/composables/useFetch';
+import { useEventBus } from "@vueuse/core";
+import { useRouter } from "vue-router";
+import { useFocus } from "@/composables/useFocus";
+import { usePost } from "@/composables/useFetch";
 // Imported Pages
-import BusinessInformationWizardStep from '@/pages/applyform/BusinessInformationWizardStep.vue';
-import AddressWizardStep from '@/pages/applyform/AddressWizardStep.vue';
-import ContactWizardStep from '@/pages/applyform/ContactWizardStep.vue';
-import ReviewWizardStep from '@/pages/applyform/ReviewWizardStep.vue';
+import BusinessInformationWizardStep from "@/pages/applyform/BusinessInformationWizardStep.vue";
+import AddressWizardStep from "@/pages/applyform/AddressWizardStep.vue";
+import ContactWizardStep from "@/pages/applyform/ContactWizardStep.vue";
+import ReviewWizardStep from "@/pages/applyform/ReviewWizardStep.vue";
 // Imported types
-import {
-  newFormDataDto
-} from '@/dto/ApplyClientNumberDto';
+import { newFormDataDto } from "@/dto/ApplyClientNumberDto";
+import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
 import type {
-  FormDataDto,
-  Contact
-} from '@/dto/ApplyClientNumberDto';
-import type { ValidationMessageType, ModalNotification } from '@/dto/CommonTypesDto';
+  ValidationMessageType,
+  ModalNotification,
+} from "@/dto/CommonTypesDto";
 // Imported User session
-import ForestClientUserSession from '@/helpers/ForestClientUserSession';
+import ForestClientUserSession from "@/helpers/ForestClientUserSession";
 // Imported global validations
-import { addValidation, validate } from '@/helpers/validators/ExternalFormValidations';
+import {
+  addValidation,
+  validate,
+} from "@/helpers/validators/ExternalFormValidations";
 // @ts-ignore
-import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16';
+import ArrowRight16 from "@carbon/icons-vue/es/arrow--right/16";
 // @ts-ignore
-import Save16 from '@carbon/icons-vue/es/save/16';
+import Save16 from "@carbon/icons-vue/es/save/16";
 // @ts-ignore
-import LogOut16 from '@carbon/icons-vue/es/logout/16';
+import LogOut16 from "@carbon/icons-vue/es/logout/16";
 // @ts-ignore
-import Check16 from '@carbon/icons-vue/es/checkmark/16';
-import { isContainedIn } from '@/helpers/validators/GlobalValidators';
+import Check16 from "@carbon/icons-vue/es/checkmark/16";
+import { isContainedIn } from "@/helpers/validators/GlobalValidators";
 
-const errorBus = useEventBus<ValidationMessageType[]>('submission-error-notification');
-const generalErrorBus = useEventBus<string>('general-error-notification');
-const exitBus = useEventBus<Record<string, boolean | null>>('exit-notification');
-const toastBus = useEventBus<ModalNotification>('toast-notification');
+const errorBus = useEventBus<ValidationMessageType[]>(
+  "submission-error-notification"
+);
+const generalErrorBus = useEventBus<string>("general-error-notification");
+const exitBus =
+  useEventBus<Record<string, boolean | null>>("exit-notification");
+const toastBus = useEventBus<ModalNotification>("toast-notification");
 
 const router = useRouter();
 const { setScrollPoint } = useFocus();
@@ -46,11 +50,11 @@ const session = instance?.appContext.config.globalProperties.$session;
 
 const submitterContact: Contact = {
   locationNames: [],
-  contactType: { value: '', text: '' },
-  phoneNumber: '',
-  firstName: session?.user?.firstName ?? '',
-  lastName: session?.user?.lastName ?? '',
-  email: session?.user?.email ?? ''
+  contactType: { value: "", text: "" },
+  phoneNumber: "",
+  firstName: session?.user?.firstName ?? "",
+  lastName: session?.user?.lastName ?? "",
+  email: session?.user?.email ?? "",
 };
 
 let formDataDto = ref<FormDataDto>({ ...newFormDataDto() });
@@ -60,38 +64,41 @@ let formData = reactive<FormDataDto>({
   ...formDataDto.value,
   location: {
     addresses: formDataDto.value.location.addresses,
-    contacts: [submitterContact]
-  }
+    contacts: [submitterContact],
+  },
 });
 
-const locations = computed(() => formData.location.addresses.map((address:any) => address.locationName));
+const locations = computed(() =>
+  formData.location.addresses.map((address: any) => address.locationName)
+);
 
 const { response, error, fetch } = usePost(
-  '/api/clients/submissions',
+  "/api/clients/submissions",
   toRef(formData).value,
   {
     skip: true,
     headers: {
-      'x-user-id': submitterInformation?.userId ?? '',
-      'x-user-email': submitterInformation?.email ?? '',
-      'x-user-name': submitterInformation?.firstName ?? ''
-    }
+      "x-user-id": submitterInformation?.userId ?? "",
+      "x-user-email": submitterInformation?.email ?? "",
+      "x-user-name": submitterInformation?.firstName ?? "",
+    },
   }
 );
 
 watch([response], () => {
   if (response.value.status === 201) {
-    router.push({ name: 'confirmation' });
+    router.push({ name: "confirmation" });
   }
 });
 
 watch([error], () => {
   if (error.response?.status === 400) {
-    const validationErrors: ValidationMessageType[] = error.response?.data as ValidationMessageType[];
+    const validationErrors: ValidationMessageType[] = error.response
+      ?.data as ValidationMessageType[];
     const fieldIds = [
-      'businessInformation.businessType',
-      'businessInformation.legalType',
-      'businessInformation.clientType'
+      "businessInformation.businessType",
+      "businessInformation.legalType",
+      "businessInformation.clientType",
     ];
 
     const matchingFields = validationErrors.find((item) =>
@@ -101,104 +108,108 @@ watch([error], () => {
       generalErrorBus.emit(
         `There was an error submitting your application. ${matchingFields.errorMsg}`
       );
-      setScrollPoint('top');
+      setScrollPoint("top");
     }
   } else {
     generalErrorBus.emit(
       `There was an error submitting your application. ${error.response?.data}`
     );
-    setScrollPoint('top');
+    setScrollPoint("top");
   }
 });
 
-addValidation('location.contacts.*.locationNames.*.text', isContainedIn(locations));
+addValidation(
+  "location.contacts.*.locationNames.*.text",
+  isContainedIn(locations)
+);
 
 // Tab system
 const progressData = reactive([
   {
-    title: 'Business Information',
-    subtitle: 'Step 1',
-    kind: 'current',
+    title: "Business Information",
+    subtitle: "Step 1",
+    kind: "current",
     enabled: true,
     valid: false,
     step: 0,
     fields: [
-      'businessInformation.businessType',
-      'businessInformation.businessName',
-      'businessInformation.clientType'
-    ]
-  },{
-    title: 'Address',
-    subtitle: 'Step 2',
-    kind: 'queued',
+      "businessInformation.businessType",
+      "businessInformation.businessName",
+      "businessInformation.clientType",
+    ],
+  },
+  {
+    title: "Address",
+    subtitle: "Step 2",
+    kind: "queued",
     enabled: true,
     valid: false,
     step: 1,
     fields: [
-      'location.addresses.*.locationName',
-      'location.addresses.*.country.text',
-      'location.addresses.*.province.text',
-      'location.addresses.*.city',
-      'location.addresses.*.streetAddress',
+      "location.addresses.*.locationName",
+      "location.addresses.*.country.text",
+      "location.addresses.*.province.text",
+      "location.addresses.*.city",
+      "location.addresses.*.streetAddress",
       'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
       'location.addresses.*.postalCode(location.addresses.*.country.text === "US")',
-      'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")'
-    ]
+      'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")',
+    ],
   },
   {
-    title: 'Contacts',
-    subtitle: 'Step 3',
-    kind: 'queued',
+    title: "Contacts",
+    subtitle: "Step 3",
+    kind: "queued",
     enabled: true,
     valid: false,
     step: 2,
     fields: [
-      'location.contacts.*.locationNames.*.text',
-      'location.contacts.*.contactType.text',
-      'location.contacts.*.firstName',
-      'location.contacts.*.lastName',
-      'location.contacts.*.email',
-      'location.contacts.*.phoneNumber'
-    ]
+      "location.contacts.*.locationNames.*.text",
+      "location.contacts.*.contactType.text",
+      "location.contacts.*.firstName",
+      "location.contacts.*.lastName",
+      "location.contacts.*.email",
+      "location.contacts.*.phoneNumber",
+    ],
   },
   {
-    title: 'Review',
-    subtitle: 'Step 4',
-    kind: 'queued',
+    title: "Review",
+    subtitle: "Step 4",
+    kind: "queued",
     enabled: true,
     valid: false,
     step: 3,
     fields: [
-    'businessInformation.businessType',
-    'businessInformation.businessName',
-    'location.addresses.*.locationName',
-    'location.addresses.*.country.text',
-    'location.addresses.*.province.text',
-    'location.addresses.*.city',
-    'location.addresses.*.streetAddress',
-    'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
-    'location.addresses.*.postalCode(location.addresses.*.country.text === "US")',
-    'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")',
-    'location.contacts.*.locationNames.*.text',
-    'location.contacts.*.contactType.text',
-    'location.contacts.*.firstName',
-    'location.contacts.*.lastName',
-    'location.contacts.*.email',
-    'location.contacts.*.phoneNumber'
-    ]
-  }
+      "businessInformation.businessType",
+      "businessInformation.businessName",
+      "location.addresses.*.locationName",
+      "location.addresses.*.country.text",
+      "location.addresses.*.province.text",
+      "location.addresses.*.city",
+      "location.addresses.*.streetAddress",
+      'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
+      'location.addresses.*.postalCode(location.addresses.*.country.text === "US")',
+      'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")',
+      "location.contacts.*.locationNames.*.text",
+      "location.contacts.*.contactType.text",
+      "location.contacts.*.firstName",
+      "location.contacts.*.lastName",
+      "location.contacts.*.email",
+      "location.contacts.*.phoneNumber",
+    ],
+  },
 ]);
 
 const currentTab = ref(0);
 
 const stateIcon = (index: number) => {
-  if (currentTab.value == index) return 'current';
-  if (currentTab.value > index || progressData[index].valid) return 'complete';
-  return 'queued';
+  if (currentTab.value == index) return "current";
+  if (currentTab.value > index || progressData[index].valid) return "complete";
+  return "queued";
 };
 
 const checkStepValidity = (stepNumber: number): boolean => {
-  progressData.forEach((step:any) => {
+  progressData.forEach((step: any) => {
     if (step.step <= stepNumber) {
       step.valid = validate(step.fields, formData);
     }
@@ -210,7 +221,9 @@ const isLast = computed(() => currentTab.value === progressData.length - 1);
 const isFirst = computed(() => currentTab.value === 0);
 const isCurrentValid = computed(() => progressData[currentTab.value].valid);
 const isNextAvailable = computed(() => !isCurrentValid.value || isLast.value);
-const isFormValid = computed(() => progressData.every((entry: any) => entry.valid));
+const isFormValid = computed(() =>
+  progressData.every((entry: any) => entry.valid)
+);
 const endAndLogOut = ref<boolean>(false);
 const mailAndLogOut = ref<boolean>(false);
 
@@ -224,7 +237,7 @@ const onNext = () => {
       currentTab.value++;
       progressData[currentTab.value - 1].kind = stateIcon(currentTab.value - 1);
       progressData[currentTab.value].kind = stateIcon(currentTab.value);
-      setScrollPoint('top');
+      setScrollPoint("top");
     }
   }
 };
@@ -233,7 +246,7 @@ const onBack = () => {
     currentTab.value--;
     progressData[currentTab.value + 1].kind = stateIcon(currentTab.value + 1);
     progressData[currentTab.value].kind = stateIcon(currentTab.value);
-    setScrollPoint('top');
+    setScrollPoint("top");
   }
 };
 const validateStep = (valid: boolean) => {
@@ -242,11 +255,12 @@ const validateStep = (valid: boolean) => {
 const saveChange = () => {
   if (checkStepValidity(currentTab.value)) {
     toastBus.emit({
-      message: `“${progressData[currentTab.value].title}” changes were saved successfully.`,
-      kind: 'Success',
-      toastTitle:'',
+      message: `“${progressData[currentTab.value].title
+        }” changes were saved successfully.`,
+      kind: "Success",
+      toastTitle: "",
       active: true,
-      handler: () => {}
+      handler: () => { },
     });
     goToStep(3);
   }
@@ -255,13 +269,13 @@ const saveChange = () => {
 const processAndLogOut = () => {
   if (mailAndLogOut.value) {
     usePost(
-      '/api/clients/mail',
+      "/api/clients/mail",
       {
         incorporation: formData.businessInformation.incorporationNumber,
         name: formData.businessInformation.businessName,
-        userName: submitterInformation?.name ?? '',
-        userId: submitterInformation?.userId ?? '',
-        mail: submitterInformation?.email ?? ''
+        userName: submitterInformation?.name ?? "",
+        userId: submitterInformation?.userId ?? "",
+        mail: submitterInformation?.email ?? "",
       },
       {}
     );
@@ -271,7 +285,7 @@ const processAndLogOut = () => {
 
 const submit = () => {
   errorBus.emit([]);
-  generalErrorBus.emit('');
+  generalErrorBus.emit("");
   if (checkStepValidity(currentTab.value)) {
     fetch();
   }
@@ -282,7 +296,7 @@ exitBus.on((event: Record<string, boolean | null>) => {
   mailAndLogOut.value = event.duplicated ? event.duplicated : false;
 });
 
-const globalErrorMessage = ref<string>('');
+const globalErrorMessage = ref<string>("");
 generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
 </script>
 

From 03bec35412d8e7311c91f70b3244908c9ed7f93a Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 05:10:11 -0700
Subject: [PATCH 040/313] feat: updating carbon web components

---
 frontend/package-lock.json | 133 ++++++++++++++++---------------------
 frontend/package.json      |  11 ++-
 2 files changed, 64 insertions(+), 80 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index e430ef180c..191bcdf41a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -11,16 +11,15 @@
       "dependencies": {
         "@bcgov-nr/nr-fsa-theme": "^1.1.3",
         "@bcgov/bc-sans": "^2.0.0",
-        "@carbon/icons": "^11.20.0",
-        "@carbon/icons-vue": "^10.49.1",
-        "@carbon/pictograms": "^12.18.0",
-        "@carbon/styles": "^1.30.0",
-        "@carbon/web-components": "^1.28.0",
+        "@carbon/icons-vue": "^10.72.1",
+        "@carbon/pictograms": "^12.22.0",
+        "@carbon/styles": "^1.36.0",
+        "@carbon/web-components": "^2.0.1",
         "@vueuse/core": "^10.2.0",
         "axios": "^1.3.3",
         "dotenv": "^16.0.0",
         "vue": "^3.2.47",
-        "vue-router": "^4.2.2",
+        "vue-router": "^4.2.4",
         "vue-the-mask": "^0.11.1"
       },
       "devDependencies": {
@@ -1910,11 +1909,6 @@
       "resolved": "https://registry.npmjs.org/@carbon/icon-helpers/-/icon-helpers-10.44.0.tgz",
       "integrity": "sha512-8gvP8Qr2pNspIUPiQRQQUB9gdklLxfs7JDIz4a/PUzon7IcVielpl08blh2IjpbDr/cZSje5fwn3CAInCKNb1g=="
     },
-    "node_modules/@carbon/icons": {
-      "version": "11.25.0",
-      "resolved": "https://registry.npmjs.org/@carbon/icons/-/icons-11.25.0.tgz",
-      "integrity": "sha512-Pdd/6lY7v/c0dk3HVr+XteAc0PyumIA7WrdcSipaICivxuSiD2Wxzo8dO1aoB4OAqNOzLnODODAiDHr5xqCGkg=="
-    },
     "node_modules/@carbon/icons-vue": {
       "version": "10.72.1",
       "resolved": "https://registry.npmjs.org/@carbon/icons-vue/-/icons-vue-10.72.1.tgz",
@@ -1961,14 +1955,6 @@
         }
       }
     },
-    "node_modules/@carbon/telemetry": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/@carbon/telemetry/-/telemetry-0.1.0.tgz",
-      "integrity": "sha512-kNWt0bkgPwGW0i5h7HFuljbKRXPvIhsKbB+1tEURAYLXoJg9iJLF1eGvWN5iVoFCS2zje4GR3OGOsvvKVe7Hlg==",
-      "bin": {
-        "carbon-telemetry": "bin/carbon-telemetry.js"
-      }
-    },
     "node_modules/@carbon/themes": {
       "version": "11.24.0",
       "resolved": "https://registry.npmjs.org/@carbon/themes/-/themes-11.24.0.tgz",
@@ -1990,15 +1976,14 @@
       }
     },
     "node_modules/@carbon/web-components": {
-      "version": "1.31.0",
-      "resolved": "https://registry.npmjs.org/@carbon/web-components/-/web-components-1.31.0.tgz",
-      "integrity": "sha512-VW+B24snyYnt7PSwpT3qhmtKcQW1+KlzfED3jN9ubuOYmUzbOsTqzMFay0zKB7e0Ublrlv+utkgvN6EUxd4CUg==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@carbon/web-components/-/web-components-2.0.1.tgz",
+      "integrity": "sha512-M0t++AdvPWmPmYFyF/ZCcIA+SHMgLTiYi3GeKNFE5pFPiX+apNYZOG58KAOf6yirYfjmirRC8ZttURXnJZH4dw==",
       "dependencies": {
         "@babel/runtime": "^7.16.3",
-        "carbon-components": "10.58.3",
-        "flatpickr": "4.6.13",
-        "lit-element": "^2.5.1",
-        "lit-html": "^1.4.1",
+        "@carbon/styles": "^1.35.0",
+        "flatpickr": "4.6.1",
+        "lit": "^2.7.6",
         "lodash-es": "^4.17.21"
       }
     },
@@ -2916,6 +2901,19 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@lit-labs/ssr-dom-shim": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.1.1.tgz",
+      "integrity": "sha512-kXOeFbfCm4fFf2A3WwVEeQj55tMZa8c8/f9AKHMobQMkzNUfUj+antR3fRPaZJawsa1aZiP/Da3ndpZrwEe4rQ=="
+    },
+    "node_modules/@lit/reactive-element": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/@lit/reactive-element/-/reactive-element-1.6.3.tgz",
+      "integrity": "sha512-QuTgnG52Poic7uM1AN5yJ09QMe0O28e10XzSvWDz02TJiiKee4stsiownEIadWm8nYzyDAyT+gKzUoZmiWQtsQ==",
+      "dependencies": {
+        "@lit-labs/ssr-dom-shim": "^1.0.0"
+      }
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3167,6 +3165,11 @@
       "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
       "dev": true
     },
+    "node_modules/@types/trusted-types": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz",
+      "integrity": "sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g=="
+    },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.17",
       "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.17.tgz",
@@ -5336,23 +5339,6 @@
         }
       ]
     },
-    "node_modules/carbon-components": {
-      "version": "10.58.3",
-      "resolved": "https://registry.npmjs.org/carbon-components/-/carbon-components-10.58.3.tgz",
-      "integrity": "sha512-RjTnrWCGStsIZ7nErw97AZI9sQWxQ8oIgo3QMdV0FWFcpTOECA4I9Dy4WPpRRdSMBcQpLetTxqjDGourM4u8Tw==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "@carbon/telemetry": "0.1.0",
-        "flatpickr": "4.6.1",
-        "lodash.debounce": "^4.0.8",
-        "warning": "^3.0.0"
-      }
-    },
-    "node_modules/carbon-components/node_modules/flatpickr": {
-      "version": "4.6.1",
-      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.1.tgz",
-      "integrity": "sha512-3ULSxbXmcMIRzer/2jLNweoqHpwDvsjEawO2FUd9UFR8uPwLM+LruZcPDpuZStcEgbQKhuFOfXo4nYdGladSNw=="
-    },
     "node_modules/caseless": {
       "version": "0.12.0",
       "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@@ -7657,9 +7643,9 @@
       }
     },
     "node_modules/flatpickr": {
-      "version": "4.6.13",
-      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.13.tgz",
-      "integrity": "sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw=="
+      "version": "4.6.1",
+      "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.1.tgz",
+      "integrity": "sha512-3ULSxbXmcMIRzer/2jLNweoqHpwDvsjEawO2FUd9UFR8uPwLM+LruZcPDpuZStcEgbQKhuFOfXo4nYdGladSNw=="
     },
     "node_modules/flatted": {
       "version": "3.2.7",
@@ -9038,7 +9024,8 @@
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
@@ -9275,18 +9262,33 @@
         }
       }
     },
+    "node_modules/lit": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/lit/-/lit-2.8.0.tgz",
+      "integrity": "sha512-4Sc3OFX9QHOJaHbmTMk28SYgVxLN3ePDjg7hofEft2zWlehFL3LiAuapWc4U/kYwMYJSh2hTCPZ6/LIC7ii0MA==",
+      "dependencies": {
+        "@lit/reactive-element": "^1.6.0",
+        "lit-element": "^3.3.0",
+        "lit-html": "^2.8.0"
+      }
+    },
     "node_modules/lit-element": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-2.5.1.tgz",
-      "integrity": "sha512-ogu7PiJTA33bEK0xGu1dmaX5vhcRjBXCFexPja0e7P7jqLhTpNKYRPmE+GmiCaRVAbiQKGkUgkh/i6+bh++dPQ==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/lit-element/-/lit-element-3.3.3.tgz",
+      "integrity": "sha512-XbeRxmTHubXENkV4h8RIPyr8lXc+Ff28rkcQzw3G6up2xg5E8Zu1IgOWIwBLEQsu3cOVFqdYwiVi0hv0SlpqUA==",
       "dependencies": {
-        "lit-html": "^1.1.1"
+        "@lit-labs/ssr-dom-shim": "^1.1.0",
+        "@lit/reactive-element": "^1.3.0",
+        "lit-html": "^2.8.0"
       }
     },
     "node_modules/lit-html": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-1.4.1.tgz",
-      "integrity": "sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA=="
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.8.0.tgz",
+      "integrity": "sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q==",
+      "dependencies": {
+        "@types/trusted-types": "^2.0.2"
+      }
     },
     "node_modules/loader-runner": {
       "version": "4.3.0",
@@ -9365,7 +9367,9 @@
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==",
+      "dev": true,
+      "peer": true
     },
     "node_modules/lodash.flattendeep": {
       "version": "4.4.0",
@@ -9553,17 +9557,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
-      },
-      "bin": {
-        "loose-envify": "cli.js"
-      }
-    },
     "node_modules/loupe": {
       "version": "2.3.6",
       "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
@@ -13493,14 +13486,6 @@
         "form-data": "^4.0.0"
       }
     },
-    "node_modules/warning": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/warning/-/warning-3.0.0.tgz",
-      "integrity": "sha512-jMBt6pUrKn5I+OGgtQ4YZLdhIeJmObddh6CsibPxyQ5yPZm1XExSyzC1LCNX7BzhxWgiHmizBWJTHJIjMjTQYQ==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
     "node_modules/watchpack": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
diff --git a/frontend/package.json b/frontend/package.json
index dfba93bd44..1aa067d671 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -44,16 +44,15 @@
   "dependencies": {
     "@bcgov-nr/nr-fsa-theme": "^1.1.3",
     "@bcgov/bc-sans": "^2.0.0",
-    "@carbon/icons": "^11.20.0",
-    "@carbon/icons-vue": "^10.49.1",
-    "@carbon/pictograms": "^12.18.0",
-    "@carbon/styles": "^1.30.0",
-    "@carbon/web-components": "^1.28.0",
+    "@carbon/icons-vue": "^10.72.1",
+    "@carbon/pictograms": "^12.22.0",
+    "@carbon/styles": "^1.36.0",
+    "@carbon/web-components": "^2.0.1",
     "@vueuse/core": "^10.2.0",
     "axios": "^1.3.3",
     "dotenv": "^16.0.0",
     "vue": "^3.2.47",
-    "vue-router": "^4.2.2",
+    "vue-router": "^4.2.4",
     "vue-the-mask": "^0.11.1"
   },
   "devDependencies": {

From 32298ca7b04b3bcc9b6c38d094ae02b6b0094a8b Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 05:10:24 -0700
Subject: [PATCH 041/313] fear: updating radio button

---
 .../components/forms/RadioInputComponent.vue  | 27 ++++++++++++-------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/forms/RadioInputComponent.vue b/frontend/src/components/forms/RadioInputComponent.vue
index 0bda5f4776..10f65af482 100644
--- a/frontend/src/components/forms/RadioInputComponent.vue
+++ b/frontend/src/components/forms/RadioInputComponent.vue
@@ -1,11 +1,17 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue'
+// Carbon 
+import '@carbon/web-components/es/components/radio-button/index';
+// Composables
 import { useEventBus } from '@vueuse/core'
-import { type CodeDescrType, isEmpty } from '@/dto/CommonTypesDto'
+// Types
+import type { CodeDescrType } from '@/dto/CommonTypesDto'
+import { isEmpty } from '@/dto/CommonTypesDto'
 
 const props = defineProps<{
   id: string
   label: string
+  tip?: string
   modelValue: Array<CodeDescrType>
   initialValue: string
   validations: Array<Function>
@@ -66,25 +72,26 @@ const updateSelectedValue = (event: any) =>
 
 <template>
   <div class="grouping-01">
-    <label :for="id + 'rb'" class="label-01 label-01-primary">{{ label }}</label>
-    <bx-radio-button-group
-      :data-focus="id"
-      :data-scroll="id"
+    <cds-radio-button-group
+      :id="id + 'rb'"
+      :name="id + 'rb'"
       label-position="right"
       orientation="vertical"
-      :name="id + 'rb'"
-      :id="id + 'rb'"
+      :legend-text="label"
+      :helper-text="tip"
       v-model="selectedValue"
-      @bx-radio-button-group-changed="updateSelectedValue"
+      @cds-radio-button-group-changed="updateSelectedValue"
       class="grouping-01"
+      :data-focus="id"
+      :data-scroll="id"
     >
-      <bx-radio-button
+      <cds-radio-button
         v-for="option in modelValue"
         :key="id + 'rb' + option.value"
         :label-text="option.text"
         :value="option.value"
       />
-    </bx-radio-button-group>
+    </cds-radio-button-group>
   </div>
 </template>
 

From 408166ab5071aff6bf2f13a61568597b636f3f23 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 05:43:18 -0700
Subject: [PATCH 042/313] feat: updating styles

---
 frontend/src/assets/styles/global.scss | 4 +---
 frontend/src/styles.ts                 | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index b30a2bd6a8..a04425a80e 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -1,7 +1,5 @@
 @use "sass:map";
-
-@use "@bcgov-nr/nr-fsa-theme/style-sheets/carbon-components-overrides.scss";
-
+@use '@carbon/styles';
 @use "@bcgov-nr/nr-fsa-theme/design-tokens/type-family.scss" as typeFamily;
 
 :root {
diff --git a/frontend/src/styles.ts b/frontend/src/styles.ts
index 3350355c58..45855f2c94 100644
--- a/frontend/src/styles.ts
+++ b/frontend/src/styles.ts
@@ -1,8 +1,4 @@
 // Importing BC typography
 import '@bcgov/bc-sans/css/BCSans.css'
 
-// Import Carbon WebComponents
-import '@carbon/web-components/es'
-import 'carbon-components/css/carbon-components.min.css'
-
-import '@/assets/styles/global.scss'
\ No newline at end of file
+import '@/assets/styles/global.scss'

From 874ab7ece3ece0f4611a86a3f5b49b372c7a2b08 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 05:43:27 -0700
Subject: [PATCH 043/313] feat: updating autocomplete

---
 .../forms/AutoCompleteInputComponent.vue      | 89 ++++++++-----------
 1 file changed, 36 insertions(+), 53 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index 667b6b4694..bcbb505d8c 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -1,7 +1,12 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/combo-box/index';
+// Composables
 import { useEventBus } from '@vueuse/core'
-import { isEmpty, type BusinessSearchResult } from '@/dto/CommonTypesDto'
+// Types
+import type { BusinessSearchResult } from '@/dto/CommonTypesDto'
+import { isEmpty } from '@/dto/CommonTypesDto'
 
 //Define the input properties for this component
 const props = defineProps<{
@@ -24,8 +29,6 @@ const emit = defineEmits<{
   (e: 'update:selected-value', value: BusinessSearchResult | undefined): void
 }>()
 
-const autoCompleteVisible = ref(false)
-
 //We initialize the error message handling for validation
 const error = ref<string | undefined>(props.errorMessage || '')
 
@@ -45,8 +48,8 @@ let selectedValue: BusinessSearchResult | undefined = undefined
 
 //This function emits the events on update
 const emitValueChange = (newValue: string): void => {
-  const reference = props.contents.find((entry) => entry.name === newValue)
-  emit('update:model-value', newValue)
+  const reference = props.contents.find((entry) => entry.code === newValue)
+  emit('update:model-value', reference?.name ?? newValue)
   emit('empty', isEmpty(reference))
 
   /* 
@@ -77,10 +80,6 @@ watch([inputValue], () => {
   emitValueChange(inputValue.value)
 })
 
-const blur = (newValue: string) => {
-  validateInput(newValue)
-  setTimeout(() => (autoCompleteVisible.value = false), 150)
-}
 //We call all the validations
 const validateInput = (newValue: string) => {
   if (props.validations) {
@@ -96,61 +95,45 @@ const validateInput = (newValue: string) => {
 }
 
 const selectAutocompleteItem = (event: any) => {
-  const newValue = event.target.getAttribute('data-value')
-  selectedValue = props.contents.find((entry) => entry.name === newValue)
-  inputValue.value = newValue
-  emit('update:selected-value', selectedValue)
-  autoCompleteVisible.value = false
+  emitValueChange(event.target.value)
+}
+
+const onTyping = (event: any) => {
+  inputValue.value = event.srcElement._filterInputValue
+  emit('update:model-value', inputValue.value)
 }
 
 revalidateBus.on(() => validateInput(inputValue.value))
 </script>
 
 <template>
-  <bx-form-item class="grouping-02">
-    <bx-input
+  <div class="groupong-02">
+    <cds-combo-box
       :id="id"
       :name="id"
-      type="text"
+      :helper-text="tip"
+      :title-text="label"
+      :value="inputValue"
+      :label="modelValue"
+      filterable
+      @cds-combo-box-selected="selectAutocompleteItem"
+      v-on:input="onTyping"
       :data-focus="id"
       :data-scroll="id"
       :data-id="'input-' + id"
-      :placeholder="placeholder"
-      :value="inputValue"
-      :label-text="label"
-      :helper-text="tip"
-      @focus="autoCompleteVisible = true"
-      :invalid="error ? true : false"
-      :validityMessage="error"
-      @blur="(event:any) => blur(event.target.value)"
-      @input="(event:any) => inputValue = event.target.value"
-    />
-    <div
-      class="autocomplete-items"
-      :id="id + 'list'"
-      v-show="
-        autoCompleteVisible && inputValue.length > 2 && contents.length > 0
-      "
-    >
-      <div class="autocomplete-items-ct" v-if="loading">
-        <bx-inline-loading status="active">Loading data...</bx-inline-loading>
-      </div>
-      <div class="autocomplete-items-ct" v-else>
-        <div
-          v-for="item in contents"
-          :key="item.code"
-          :data-id="item.code"
-          :data-value="item.name"
-          class="autocomplete-items-cell"
-          @click="selectAutocompleteItem"
-        >
-          <strong :data-id="item.code" :data-value="item.name">{{
-            item.name
-          }}</strong>
-        </div>
-      </div>
-    </div>
-  </bx-form-item>
+      >
+
+      <cds-combo-box-item
+        v-for="item in contents"
+        :key="item.code"
+        :data-id="item.code"
+        :data-value="item.name" 
+        :value="item.code">
+        {{ item.name }}
+      </cds-combo-box-item>
+      
+    </cds-combo-box>
+  </div>
 </template>
 
 

From b43e72533d7287579efcf39bff2fca24620b8874 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 06:00:18 -0700
Subject: [PATCH 044/313] fix: fixing autocomplete component

---
 .../forms/AutoCompleteInputComponent.vue      | 21 ++++---------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index bcbb505d8c..c9700c9cea 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -48,23 +48,10 @@ let selectedValue: BusinessSearchResult | undefined = undefined
 
 //This function emits the events on update
 const emitValueChange = (newValue: string): void => {
-  const reference = props.contents.find((entry) => entry.code === newValue)
-  emit('update:model-value', reference?.name ?? newValue)
-  emit('empty', isEmpty(reference))
-
-  /* 
-  Fire the update:selected-value with undefined when:
-  - there was an item previously selected (clicked);
-  - and the value in the input was changed by typing or removing some
-  characters.
-  Note: we know the change was not due to selecting (clicking) a new item
-  because otherwise the newValue would already correspond to the
-  selectedValue.name.
-  */
-  if (selectedValue && newValue !== selectedValue.name) {
-    selectedValue = undefined
-    emit('update:selected-value', selectedValue)
-  }
+  selectedValue = props.contents.find((entry) => entry.code === newValue)
+  emit('update:model-value', selectedValue?.name ?? newValue)
+  emit('update:selected-value', selectedValue)
+  emit('empty', isEmpty(selectedValue))
 }
 
 emit('empty', true)

From 0c2d32f485838e4da725c38a5ac5cf513f00db56 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 07:02:37 -0700
Subject: [PATCH 045/313] feat: updating modal and toast

---
 frontend/src/App.vue                         | 60 ++++++++++----------
 frontend/src/pages/ApplyClientNumberPage.vue | 47 +++++++--------
 2 files changed, 55 insertions(+), 52 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 4844498493..5ff28152a1 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
 import { ref } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/modal/index';
+import '@carbon/web-components/es/components/notification/index';
 // Composables
 import { useEventBus } from '@vueuse/core'
 // Imported Types
@@ -65,41 +68,40 @@ toastBus.on(openToast)
 
   <div class="modals">
     
-  <bx-modal
-    id="modal-example"
+  <cds-modal
+    id="modal-global"
     size="sm"
     :open="modalContent.active"
-    @bx-modal-closed="closeModal"
+    @cds-modal-closed="closeModal"
   >
-    <bx-modal-header>
-      <bx-modal-close-button></bx-modal-close-button>
-      <bx-modal-heading
+    <cds-modal-header>
+      <cds-modal-close-button></cds-modal-close-button>
+      <cds-modal-heading
         >Are you sure you want to delete "{{ modalContent.message }}" additional
-        {{ modalContent.kind }}?</bx-modal-heading
-      >
-    </bx-modal-header>
-    <bx-modal-body><p></p></bx-modal-body>
+        {{ modalContent.kind }}?
+      </cds-modal-heading>
+    </cds-modal-header>
+    <cds-modal-body><p></p></cds-modal-body>
 
-    <bx-modal-footer>
-      <div class="modal-footer">
-        <bx-btn kind="secondary" 
-              data-modal-close
-              class="bx--modal-btn bx--modal-btn1">
-        Cancel
-      </bx-btn>
-      
-      <bx-btn kind="danger" 
-              @click.prevent="deleteContentModal"
-              class="bx--modal-btn bx--modal-btn2">
-        Delete
-        <Delete16 slot="icon" />
-      </bx-btn>
-      </div>
-    </bx-modal-footer>
-  </bx-modal>
+    <cds-modal-footer>
+        <cds-modal-footer-button 
+          kind="secondary" 
+          data-modal-close>
+          Cancel
+        </cds-modal-footer-button>
+        
+        <cds-modal-footer-button 
+          kind="danger"
+          v-on:click="deleteContentModal">
+          Delete
+          <Delete16 slot="icon" />
+        </cds-modal-footer-button>
+
+      </cds-modal-footer>
+  </cds-modal>
 </div>
 
-  <bx-toast-notification
+  <cds-toast-notification
       v-if="toastContent.active"
       class="wizard-head-toast"
       timeout="8000"
@@ -107,6 +109,6 @@ toastBus.on(openToast)
       :title="toastContent.toastTitle"
       subtitle=""
     >
-  </bx-toast-notification>
+  </cds-toast-notification>
 </template>
 
diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index d998507bf8..985f67e4cb 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
-import { reactive, watch, toRef, ref, getCurrentInstance, computed } from "vue";
+import { reactive, watch, toRef, ref, getCurrentInstance, computed } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/button/index';
 // Composables
 import { useEventBus } from "@vueuse/core";
 import { useRouter } from "vue-router";
@@ -428,33 +430,32 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
         below</span
       >
       <div class="form-footer-group-buttons">
-        <bx-btn
-            data-test="wizard-back-button"
+        <cds-button
             v-if="!isFirst"
             kind="secondary"
-            iconLayout=""
-            class="bx--btn"
             :disabled="isFirst"
-            @click.prevent="onBack"
+            v-on:click="onBack"
+            data-test="wizard-back-button"
           >
           <span>Back</span>
-        </bx-btn>
+        </cds-button>
 
-        <bx-btn
-            id="nextBtn"
-            v-if="!isLast && !isFormValid && !endAndLogOut && !mailAndLogOut"
-            data-test="wizard-next-button"
-            kind="primary"
-            iconLayout=""
-            class="bx--btn"
-            :disabled="progressData[currentTab].valid === false"
-            @click.prevent="onNext"
+        <cds-button
+          v-if="!isLast && !isFormValid && !endAndLogOut && !mailAndLogOut"
+          id="nextBtn"
+          kind="primary"
+          v-on:click="onNext"
+          :disabled="progressData[currentTab].valid === false"
+          data-test="wizard-next-button"
+          tooltip-position="top"
+          tooltip-text="All fields must be filled out correctly"
+          :open-tooltip="progressData[currentTab].valid === false"
           >
           <span>Next</span>
           <ArrowRight16 slot="icon" />
-        </bx-btn>
+        </cds-button>
 
-        <bx-btn
+        <cds-button
           v-if="isLast && !endAndLogOut && !mailAndLogOut"
             data-test="wizard-submit-button"
             kind="primary"
@@ -464,9 +465,9 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
           >
           <span>Submit application</span>
           <Check16 slot="icon" />
-        </bx-btn>
+        </cds-button>
 
-        <bx-btn
+        <cds-button
           data-test="wizard-save-button"
           kind="primary"
           iconLayout=""
@@ -477,9 +478,9 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
         >
           <span>Save</span>
           <Save16 slot="icon" />
-        </bx-btn>
+        </cds-button>
 
-        <bx-btn
+        <cds-button
           data-test="wizard-logout-button"
           kind="primary"
           iconLayout=""
@@ -492,7 +493,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
             logout</span
           >
           <LogOut16 slot="icon" />
-        </bx-btn>
+        </cds-button>
 
         </div>
       </div>

From 78521be015b775e2f6b1ad7bd0b604cee40b8723 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 07:09:03 -0700
Subject: [PATCH 046/313] feat: updating test input

---
 .../components/forms/TextInputComponent.vue   | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index 7a9e262410..dabecce001 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -1,6 +1,10 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/text-input/index';
+// Composables
 import { useEventBus } from '@vueuse/core'
+// Types
 import { isEmpty } from '@/dto/CommonTypesDto'
 
 //Define the input properties for this component
@@ -76,26 +80,25 @@ revalidateBus.on(() => {
 </script>
 
 <template>
-  <bx-form-item class="grouping-02" v-if="enabled">
-    <bx-input
+  <div class="grouping-02" v-if="enabled">
+    <cds-text-input
       v-if="enabled"
       :id="id"
-      :data-focus="id"
-      :data-scroll="id"
-      :data-id="'input-' + id"
       :placeholder="placeholder"
       :value="selectedValue"
-      :label-text="enabled ? label : null"
+      :label="enabled ? label : null"
       :helper-text="tip"
       :disabled="!enabled"
-      :color-scheme="enabled ? '' : 'light'"
       :invalid="error ? true : false"
-      :validityMessage="error"
+      :invalid-text="error"
       v-mask="mask"
       @blur="(event:any) => validateInput(event.target.value)"
       @input="(event:any) => selectedValue = event.target.value"
+      :data-focus="id"
+      :data-scroll="id"
+      :data-id="'input-' + id"
     />
-  </bx-form-item>
+  </div>
 
   <div v-if="!enabled" class="grouping-04">
     <div :data-scroll="id" class="grouping-04-label"><span :for="id" class="label-01">{{ label }}</span></div>

From 6855af2fed55e2b564ad63a123ada84c97966ee8 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 07:15:04 -0700
Subject: [PATCH 047/313] feat: dropdown updated

---
 .../forms/AutoCompleteInputComponent.vue      |  2 ++
 .../forms/DropdownInputComponent.vue          | 31 ++++++++++++++++---
 .../components/forms/RadioInputComponent.vue  |  2 ++
 3 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index c9700c9cea..f27070c8a2 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -103,6 +103,8 @@ revalidateBus.on(() => validateInput(inputValue.value))
       :value="inputValue"
       :label="modelValue"
       filterable
+      :invalid="error ? true : false"
+      :invalid-text="error"
       @cds-combo-box-selected="selectAutocompleteItem"
       v-on:input="onTyping"
       :data-focus="id"
diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index e5eddfe28f..00d05ad281 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -1,7 +1,12 @@
 <script setup lang="ts">
 import { ref, watch } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/combo-box/index';
+// Composables
 import { useEventBus } from '@vueuse/core'
-import { type CodeNameType, isEmpty } from '@/dto/CommonTypesDto'
+// Types
+import type { CodeNameType } from '@/dto/CommonTypesDto'
+import { isEmpty } from '@/dto/CommonTypesDto'
 
 //Define the input properties for this component
 const props = defineProps<{
@@ -88,10 +93,28 @@ revalidateBus.on(() => validateInput(selectedValue.value))
 
 <template>
   <div class="grouping-03">
+    <cds-combo-box
+      :id="id"
+      filterable
+      :helper-text="tip"
+      :title-text="label"
+      :label="selectedValue"
+      :invalid="error ? true : false"
+      :invalid-text="error"
+      @cds-combo-box-selected="(event:any) => selectedValue = event.target.value"
+      :data-focus="id"
+      :data-scroll="id">
+      <cds-combo-box-item 
+        v-for="option in modelValue"
+        :key="option.code"
+        :value="option.code"
+        :data-item="option.code">
+        {{ option.name }}
+      </cds-combo-box-item>
+    </cds-combo-box>
   <bx-dropdown
-    :id="id"
-    :data-focus="id"
-    :data-scroll="id"
+    
+   
     :value="selectedValue"
     :label-text="label"
     :helper-text="tip"
diff --git a/frontend/src/components/forms/RadioInputComponent.vue b/frontend/src/components/forms/RadioInputComponent.vue
index 10f65af482..f7a4a56f7c 100644
--- a/frontend/src/components/forms/RadioInputComponent.vue
+++ b/frontend/src/components/forms/RadioInputComponent.vue
@@ -80,6 +80,8 @@ const updateSelectedValue = (event: any) =>
       :legend-text="label"
       :helper-text="tip"
       v-model="selectedValue"
+      :invalid="error ? true : false"
+      :invalid-text="error"
       @cds-radio-button-group-changed="updateSelectedValue"
       class="grouping-01"
       :data-focus="id"

From bcb9294f73f40c9386a53eae72cacd8764cf7aa4 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 09:20:30 -0700
Subject: [PATCH 048/313] fix: fixing autocomplete and dropdown

---
 .../forms/AutoCompleteInputComponent.vue      | 14 +++--
 .../forms/DropdownInputComponent.vue          | 36 ++++--------
 frontend/src/helpers/DataConversors.ts        | 56 ++++++++++---------
 .../validators/ExternalFormValidations.ts     |  1 -
 4 files changed, 51 insertions(+), 56 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index f27070c8a2..0b2f673c32 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { ref, computed, watch } from 'vue'
 // Carbon
 import '@carbon/web-components/es/components/combo-box/index';
 // Composables
@@ -44,6 +44,11 @@ watch(
 //We set the value prop as a reference for update reason
 const inputValue = ref(props.modelValue)
 
+// This is to make the input list contains the selected value to show when component render
+const inputList = computed<Array<BusinessSearchResult>>(() =>
+  ((!props.contents || props.contents.length === 0) ? [{name: props.modelValue, code: '',status:'',legalType:''}] : props.contents)
+)
+
 let selectedValue: BusinessSearchResult | undefined = undefined
 
 //This function emits the events on update
@@ -82,7 +87,7 @@ const validateInput = (newValue: string) => {
 }
 
 const selectAutocompleteItem = (event: any) => {
-  emitValueChange(event.target.value)
+  emitValueChange(event.detail.item.getAttribute('data-id'))
 }
 
 const onTyping = (event: any) => {
@@ -101,7 +106,6 @@ revalidateBus.on(() => validateInput(inputValue.value))
       :helper-text="tip"
       :title-text="label"
       :value="inputValue"
-      :label="modelValue"
       filterable
       :invalid="error ? true : false"
       :invalid-text="error"
@@ -113,11 +117,11 @@ revalidateBus.on(() => validateInput(inputValue.value))
       >
 
       <cds-combo-box-item
-        v-for="item in contents"
+        v-for="item in inputList"
         :key="item.code"
         :data-id="item.code"
         :data-value="item.name" 
-        :value="item.code">
+        :value="item.name">
         {{ item.name }}
       </cds-combo-box-item>
       
diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index 00d05ad281..dd4ac93f46 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { ref, computed, watch } from 'vue'
 // Carbon
 import '@carbon/web-components/es/components/combo-box/index';
 // Composables
@@ -41,6 +41,11 @@ watch(
 
 //We set it as a separated ref due to props not being updatable
 const selectedValue = ref(props.initialValue)
+// This is to make the input list contains the selected value to show when component render
+const inputList = computed<Array<CodeNameType>>(() =>
+  ((!props.modelValue || props.modelValue.length === 0) ? [{name: props.initialValue, code: '',status:'',legalType:''}] : props.modelValue)
+)
+
 //We set the value prop as a reference for update reason
 emit('empty', isEmpty(props.initialValue))
 //This function emits the events on update
@@ -98,38 +103,21 @@ revalidateBus.on(() => validateInput(selectedValue.value))
       filterable
       :helper-text="tip"
       :title-text="label"
-      :label="selectedValue"
+      :value="selectedValue"
       :invalid="error ? true : false"
       :invalid-text="error"
-      @cds-combo-box-selected="(event:any) => selectedValue = event.target.value"
+      @cds-combo-box-selected="(event:any) => selectedValue = event.detail.item.getAttribute('data-id')"
       :data-focus="id"
       :data-scroll="id">
       <cds-combo-box-item 
-        v-for="option in modelValue"
+        v-for="option in inputList"
         :key="option.code"
-        :value="option.code"
-        :data-item="option.code">
+        :value="option.name"
+        :data-id="option.code"
+        :data-value="option.name">
         {{ option.name }}
       </cds-combo-box-item>
     </cds-combo-box>
-  <bx-dropdown
-    
-   
-    :value="selectedValue"
-    :label-text="label"
-    :helper-text="tip"
-    :invalid="error ? true : false"
-    :validityMessage="error"
-    @bx-dropdown-beingselected="(target:any) => selectedValue = target.detail.item.__value"
-  >
-    <bx-dropdown-item
-      v-for="option in modelValue"
-      :key="option.code"
-      :value="option.code"
-      :data-item="option.code"
-      >{{ option.name }}</bx-dropdown-item
-    >
-  </bx-dropdown>
 </div>
 </template>
 
diff --git a/frontend/src/helpers/DataConversors.ts b/frontend/src/helpers/DataConversors.ts
index 91661506cc..2b06c460b1 100644
--- a/frontend/src/helpers/DataConversors.ts
+++ b/frontend/src/helpers/DataConversors.ts
@@ -1,32 +1,36 @@
 import { type Address, emptyAddress } from '@/dto/ApplyClientNumberDto'
 
 export const retrieveClientType = (legalType: string): string => {
-  switch (legalType) {
-    case 'A':
-    case 'B':
-    case 'BC':
-    case 'C':
-    case 'CP':
-    case 'EPR':
-    case 'FOR':
-    case 'LIC':
-    case 'REG':
-      return 'C'
-    case 'S':
-    case 'XS':
-      return 'S'
-    case 'XCP':
-      return 'A'
-    case 'SP':
-      return 'I'
-    case 'GP':
-      return 'P'
-    case 'LP':
-    case 'XL':
-    case 'XP':
-      return 'L'
-    default:
-      throw new Error('Unknown Legal Type.')
+  if (legalType) {
+    switch (legalType) {
+      case 'A':
+      case 'B':
+      case 'BC':
+      case 'C':
+      case 'CP':
+      case 'EPR':
+      case 'FOR':
+      case 'LIC':
+      case 'REG':
+        return 'C'
+      case 'S':
+      case 'XS':
+        return 'S'
+      case 'XCP':
+        return 'A'
+      case 'SP':
+        return 'I'
+      case 'GP':
+        return 'P'
+      case 'LP':
+      case 'XL':
+      case 'XP':
+        return 'L'
+      default:
+        throw new Error('Unknown Legal Type ' + legalType)
+    }
+  } else {
+    return ''
   }
 }
 
diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
index 6afe42001d..8b3cf2e05f 100644
--- a/frontend/src/helpers/validators/ExternalFormValidations.ts
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -108,7 +108,6 @@ globalValidations['location.contacts.*.phoneNumber'] = [
 export const getField = (path: string, value: FormDataDto): string | string[] => {
   // First we set is in a temporary variable
   let temporaryValue: any = value
-  console.log(path, value)
   // We split the path by dots and iterate over it
   path.split('.').forEach((key: string) => {
     const fieldKey = key.includes('(') ? key.replace(')', '').split('(')[0] : key

From 24a78992d4a217e57941412fb75c9b41e65bcc95 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 09:20:48 -0700
Subject: [PATCH 049/313] fix: fixing pages

---
 .../src/pages/applyform/AddressWizardStep.vue | 25 ++++++-------
 .../BusinessInformationWizardStep.vue         | 36 +++++++++++--------
 .../src/pages/applyform/ContactWizardStep.vue |  9 +++--
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/frontend/src/pages/applyform/AddressWizardStep.vue b/frontend/src/pages/applyform/AddressWizardStep.vue
index 5cb5f0dd69..46314d8f81 100644
--- a/frontend/src/pages/applyform/AddressWizardStep.vue
+++ b/frontend/src/pages/applyform/AddressWizardStep.vue
@@ -1,16 +1,20 @@
 <script setup lang="ts">
 import { watch, ref, computed, reactive, onMounted} from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/button/index';
+// Composables
 import { useEventBus } from '@vueuse/core'
-import Add16 from '@carbon/icons-vue/es/add/16'
-import {
-  type FormDataDto,
-  type Address,
-  emptyAddress
-} from '@/dto/ApplyClientNumberDto'
+import { useFocus } from '@/composables/useFocus'
 import { useFetchTo } from '@/composables/useFetch'
+// Type
+import type { FormDataDto, Address } from '@/dto/ApplyClientNumberDto'
+import { emptyAddress } from '@/dto/ApplyClientNumberDto'
 import type { ModalNotification } from '@/dto/CommonTypesDto'
 import { isUniqueDescriptive } from '@/helpers/validators/GlobalValidators'
-import { useFocus } from '@/composables/useFocus'
+
+
+// @ts-ignore
+import Add16 from '@carbon/icons-vue/es/add/16'
 
 //Defining the props and emitter to receive the data and emit an update
 const props = defineProps<{ data: FormDataDto; active: boolean }>()
@@ -142,14 +146,11 @@ onMounted(() => setFocusedComponent('addr_0',800))
 <p class="body-01 heading-compact-01-dark">
 If you’d like to include another address, for example a seed orchard or if your street address is different from your mailing address, select the “Add another address” button below.
 </p>
-<bx-btn
+<cds-button
     kind="tertiary"
-    iconLayout=""
-    class="bx--btn"
     @click.prevent="addAddress"
-    size="field"
   >
     <span>Add another address</span>
     <Add16 slot="icon" />
-  </bx-btn>
+  </cds-button>
 </template>
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index d72ac8b049..d90978ea53 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -1,5 +1,8 @@
 <script setup lang="ts">
 import { watch, computed, ref, reactive } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/inline-loading/index';
+import '@carbon/web-components/es/components/notification/index';
 // Importing composables
 import { useEventBus } from '@vueuse/core'
 import { useFetchTo } from '@/composables/useFetch'
@@ -96,6 +99,7 @@ const toggleErrorMessages = (
 //incorporation number and client type
 const autoCompleteResult = ref<BusinessSearchResult>()
 watch([autoCompleteResult], () => {
+
   // reset business validation state
   validation.business = false
 
@@ -128,19 +132,19 @@ watch([autoCompleteResult], () => {
     )
 
     showDetailsLoading.value = true
-    watch([error], () => {
-      if (error.response?.status === 409) {
+    watch(error, () => {
+      if (error.value.response?.status === 409) {
         toggleErrorMessages(null, true)
         return
       }
-      if (error.response?.status === 404) {
+      if (error.value.response?.status === 404) {
         toggleErrorMessages(null, null)
         validation.business = true
         emit('update:data', formData.value)
         return
       }
       // @ts-ignore
-      generalErrorBus.emit(error.response?.data.message)
+      generalErrorBus.emit(error.value.response?.data.message)
     })
 
     watch(
@@ -229,13 +233,13 @@ watch([selectedOption], () => {
       :loading="loading"
       @update:selected-value="autoCompleteResult = $event"
     />
-    <bx-inline-loading status="active" v-if="showDetailsLoading">Loading client details...</bx-inline-loading>
-    <display-block-component
-      kind="info"
-      title="If the name of your registered business does not appear in the list, follow these steps:"
+    <cds-inline-loading status="active" v-if="showDetailsLoading">Loading client details...</cds-inline-loading>
+
+    <cds-inline-notification
       v-if="showAutoCompleteInfo && selectedOption === ClientTypeEnum.R"
-      id="business"
-    >
+      open="true"
+      kind="info"
+      title="If the name of your registered business does not appear in the list, follow these steps:">
       <div>
         <ol type="1" class="bulleted-list">
           <li>
@@ -255,10 +259,11 @@ watch([selectedOption], () => {
           </li>
         </ol>
       </div>
-    </display-block-component>
+    </cds-inline-notification>
 
-    <display-block-component
+    <cds-inline-notification
       v-if="showGoodStandingError"
+      open="true"
       kind="error"
       title="Not in good standing with BC Registries"
     >
@@ -274,10 +279,11 @@ watch([selectedOption], () => {
         >
         account to find out why.
       </p>
-    </display-block-component>
+    </cds-inline-notification>
 
-    <display-block-component
+    <cds-inline-notification
       v-if="showDuplicatedError"
+      open="true"
       kind="error"
       title="Client already exists"
     >
@@ -286,7 +292,7 @@ watch([selectedOption], () => {
         client number. Select the 'Receive email and logout' button below to
         have it sent to you at {{ formData.location.contacts[0].email }}
       </p>
-    </display-block-component>
+    </cds-inline-notification>
   </data-fetcher>
 
   <text-input-component
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index 0c8a5cb167..de7d1a3632 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { watch, ref, computed, reactive, onMounted } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/button/index';
 // Composables
 import { useEventBus } from '@vueuse/core'
 import { useFetchTo } from '@/composables/useFetch'
@@ -153,16 +155,13 @@ onMounted(() => setFocusedComponent('addressname_0',800))
               To add another contact to the account, select "Add another
               contact" button below.</span>
 
-  <bx-btn
+  <cds-button
     kind="tertiary"
-    iconLayout=""
-    class="bx--btn"
     @click.prevent="addContact"
-    size="field"
   >
     <span>Add another contact</span>
     <Add16 slot="icon" />
-  </bx-btn>
+  </cds-button>
 </template>
 
 

From 2d097fbfa84f9d0731e84294b1e5f7d7ee82c1fd Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 11:07:03 -0700
Subject: [PATCH 050/313] fix: fixing dropdown

---
 .../components/forms/DropdownInputComponent.vue   | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index dd4ac93f46..d8148e0f97 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -60,6 +60,7 @@ const emitValueChange = (newValue: string): void => {
 }
 //Watch for changes on the input
 watch([selectedValue], () => {
+  console.log('watch',selectedValue.value)
   validateInput(selectedValue.value)
   emitValueChange(selectedValue.value)
 })
@@ -77,20 +78,6 @@ const validateInput = (newValue: any) => {
         .shift() ?? props.errorMessage
   }
 }
-watch(
-  () => props.modelValue,
-  () => {
-    selectedValue.value = ''
-    setTimeout(() => (selectedValue.value = props.initialValue), 400)
-  }
-)
-watch(
-  () => props.initialValue,
-  () => {
-    if(selectedValue.value === props.initialValue) return
-    setTimeout(() => (selectedValue.value = props.initialValue), 400)
-  }
-)
 
 revalidateBus.on(() => validateInput(selectedValue.value))
 </script>

From 46d75576192bfe707e57e3c418dbfbb8158f1743 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 11:07:13 -0700
Subject: [PATCH 051/313] feat: updating multi select

---
 .../forms/MultiselectInputComponent.vue       | 78 +++++++++++--------
 1 file changed, 47 insertions(+), 31 deletions(-)

diff --git a/frontend/src/components/forms/MultiselectInputComponent.vue b/frontend/src/components/forms/MultiselectInputComponent.vue
index bd2c095440..89af434e0e 100644
--- a/frontend/src/components/forms/MultiselectInputComponent.vue
+++ b/frontend/src/components/forms/MultiselectInputComponent.vue
@@ -1,9 +1,12 @@
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { ref,computed, watch } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/multi-select/index';
+import '@carbon/web-components/es/components/tag/index';
+// Composables
 import { useEventBus } from '@vueuse/core'
+// Types
 import type {  CodeNameType } from '@/dto/CommonTypesDto'
-//@ts-ignore
-import CloseOutline16 from '@carbon/icons-vue/es/close/16'
 
 //Define the input properties for this component
 const props = defineProps<{
@@ -39,6 +42,10 @@ watch(
 
 //We set it as a separated ref due to props not being updatable
 const selectedValue = ref(props.initialValue)
+const inputList = computed<Array<CodeNameType>>(() =>
+  ((!props.modelValue || props.modelValue.length === 0) ? [{name: props.initialValue, code: '',status:'',legalType:''}] : props.modelValue)
+)
+
 //We set the value prop as a reference for update reason
 emit('empty', props.selectedValues ? props.initialValue.length === 0 : true)
 
@@ -83,13 +90,23 @@ const emitChange = () => {
 }
 
 const addFromSelection = (itemCode: string) => {
-  const reference = props.modelValue.find((entry) => entry.code === itemCode)
-  if (reference) items.value.push(reference.name)
+  const reference = props.modelValue.find((entry) => entry.name === itemCode)
+  if (reference) {
+    items.value.push(reference.name)
+    selectedValue.value = items.value.join(',')
+  }
+  emitChange()
+}
+
+const selectItems = (event:any) =>{
+  selectedValue.value = event.target.value
+  items.value = event.target.value.split(',').filter((value:string) => value)
   emitChange()
 }
 
-const removeFromSelection = (itemName: string) => {
-  items.value = items.value.filter((entry) => entry !== itemName)
+const removeFromSelection = (event: any) => {
+  items.value = items.value.filter((entry) => entry !== event.srcElement.attributes['data-value'].value)
+  selectedValue.value = items.value.join(',')
   emitChange()
 }
 
@@ -103,43 +120,42 @@ revalidateBus.on(() => validateInput(selectedValue.value))
 <template>
   <div class="grouping-03">
     <div class="frame-02">
-      <bx-dropdown
+      <cds-multi-select
         :id="id"
-        :data-focus="id"
-        :data-scroll="id"
         :value="selectedValue"
-        :label-text="label"
+        :label="selectedValue"
+        :title-text="label"
         :helper-text="tip"
         :invalid="error ? true : false"
-        :validityMessage="error"
-        @bx-dropdown-beingselected="(target:any) => validateInput(target.detail.item.__value)"
-        @bx-dropdown-selected="(target:any) => addFromSelection(target.detail.item.__value)"
+        :invalid-text="error"
+        filterable
+        @cds-multi-select-selected="selectItems"
+        :data-focus="id"
+        :data-scroll="id"
       >
-        <bx-dropdown-item
-          v-for="option in modelValue"
-          :data-item="option.code"
+        <cds-multi-select-item
+          v-for="option in inputList"
           :key="option.code"
-          :value="option.code"
-          >{{ option.name }}</bx-dropdown-item
-        >
-      </bx-dropdown>
+          :value="option.name"
+          :data-id="option.code"
+          :data-value="option.name">
+          {{ option.name }}
+        </cds-multi-select-item>
+      </cds-multi-select>
       <div class="bx-tag-box">
-        <bx-tag
-          filter="true"
+        <cds-tag
+          filter
           v-for="(tag, index) in items"
           title="Clear selection"
           class="bx-tag"
           :data-tag="'tag_' + id + '_' + index"
+          :data-value="tag"
           :id="'tag_' + id + '_' + index"
           :key="index"
-        >
-          <span>{{ tag }}</span>
-          <CloseOutline16
-          tabindex="1"
-            :id="'close_' + id + '_' + index"
-            @click="removeFromSelection(tag)"
-          />
-        </bx-tag>
+          type="blue"
+          @cds-tag-closed="removeFromSelection"
+        >{{ tag }}
+        </cds-tag>
       </div>
     </div>
   </div>

From 4ba91f74d33598e82f77d17e4000882beac9f4b5 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 11:07:25 -0700
Subject: [PATCH 052/313] fix: fixing group components

---
 .../grouping/AddressGroupComponent.vue        | 19 ++++++++-----------
 .../grouping/ContactGroupComponent.vue        | 17 ++++++++---------
 2 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index b803140f67..8164e1ad72 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -223,7 +223,7 @@ onMounted(() =>{
   <div class="frame-01">
   <text-input-component
     :id="'name_' + id"
-        label="Location or address name"
+    label="Location or address name"
     placeholder=""
     tip="For example, 'Campbell River Region' or 'Castlegar Woods Division'"
     v-model="selectedValue.locationName"
@@ -240,7 +240,7 @@ onMounted(() =>{
   <dropdown-input-component
     :id="'country_' + id"
     label="Country"
-    :initial-value="selectedValue.country.value"
+    :initial-value="selectedValue.country.text"
     tip=""
     :enabled="true"
     :model-value="countryList"
@@ -277,7 +277,7 @@ onMounted(() =>{
         validation.streetAddress = selectedValue.streetAddress ? true : false
       "
     />
-    <bx-inline-loading status="active" v-if="showDetailsLoading">Loading address details...</bx-inline-loading>
+    <cds-inline-loading status="active" v-if="showDetailsLoading">Loading address details...</cds-inline-loading>
   </data-fetcher>
 
   <text-input-component
@@ -306,7 +306,7 @@ onMounted(() =>{
     <dropdown-input-component
       :id="'province_' + id"
       :label="provinceNaming"
-      :initial-value="selectedValue.province.value"
+      :initial-value="selectedValue.province.text"
       :model-value="content"
       :enabled="true"
       tip=""
@@ -331,16 +331,13 @@ onMounted(() =>{
     @empty="validation.postalCode = !$event"
   />
 
-  <bx-btn
-    v-show="id > 0"
-    kind="danger-ghost"
-    iconLayout=""
-    class="bx--btn"
+  <cds-button
+    v-if="id > 0"
+    kind="danger-tertiary"
     @click.prevent="emit('remove', id)"
-    size="field"
   >
     <span>Delete address</span>
     <Delete16 slot="icon" />
-  </bx-btn>
+  </cds-button>
   </div>
 </template>
diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index 24fdb52601..7b2cfa33cc 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { reactive, watch, ref, onMounted } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/button/index';
 // Importing composables
 import { useFocus } from '@/composables/useFocus'
 // Importing types
@@ -101,7 +103,7 @@ onMounted(() =>{
     tip="Select an address name for the contact. A contact can have more than one address"
     :initial-value="''"
     :model-value="addressList"
-    :selectedValues="selectedValue.locationNames?.map((location:CodeDescrType) => location?.value)"
+    :selectedValues="selectedValue.locationNames?.map((location:CodeDescrType) => location?.text)"
     :validations="[
       ...getValidations('location.contacts.*.locationNames.*.text'),
       submissionValidation(`location.contacts[${id}].locationNames`)
@@ -116,7 +118,7 @@ onMounted(() =>{
     :id="'role_' + id"
     label="Primary role"
     tip="Choose the primary role for this contact"
-    :initial-value="selectedValue.contactType.value"
+    :initial-value="selectedValue.contactType.text"
     :model-value="roleList"
     :validations="[
       ...getValidations('location.contacts.*.contactType.text'),
@@ -183,16 +185,13 @@ onMounted(() =>{
     @empty="validation.phoneNumber = !$event"
   />
 
-  <bx-btn
-    v-show="id > 0"
-    kind="danger-ghost"
-    iconLayout=""
-    class="bx--btn"
+  <cds-button
+    v-if="id > 0"
+    kind="danger-tertiary"
     @click.prevent="emit('remove', id)"
-    size="field"
   >
     <span>Delete contact</span>
     <Delete16 slot="icon" />
-  </bx-btn>
+  </cds-button>
 </div>
 </template>

From b75f690e718347b05a29133320697e23b9e61e91 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 11:07:37 -0700
Subject: [PATCH 053/313] fix: fixing header and button type

---
 frontend/src/components/MainHeaderComponent.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 51b21179d8..5b3838f992 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { ref, computed, onMounted } from 'vue';
+// Carbon
+import '@carbon/web-components/es/components/button/index';
 // Types
 import { nodeEnv, appVersion } from '@/CoreConstants';
 // @ts-ignore
@@ -43,29 +45,23 @@ onMounted(() => window.addEventListener('resize', updateScreenWidth));
   <div class="heading-space"></div>
 
   <!-- Remember to add profile button here -->
-  <bx-btn
+  <cds-button
     v-if="$session?.isLoggedIn() && (isSmallScreen || isMediumScreen)"
     data-id="logout-btn"
     kind="tertiary"
-    iconLayout=""
-    class="bx--btn bx--btn-header bx--btn-reset"
     @click.prevent="$session?.logOut"
-    size="field"
   >
     <Logout16 slot="icon" />
-  </bx-btn>
+  </cds-button>
 
-  <bx-btn
+  <cds-button
     v-if="$session?.isLoggedIn() && (!isSmallScreen && !isMediumScreen)"
     data-id="logout-btn"
     kind="tertiary"
-    iconLayout=""
-    class="bx--btn bx--btn-header bx--btn-reset"
     @click.prevent="$session?.logOut"
-    size="field"
   >
     <span>Logout</span>
     <Logout16 slot="icon" />
-  </bx-btn>
+  </cds-button>
 
 </template>

From 48af3d195a76fdf071f573f089edf683df12a3f5 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 31 Aug 2023 11:29:38 -0700
Subject: [PATCH 054/313] fix: fixing mask class and component id

---
 frontend/src/main.ts    | 2 +-
 frontend/vite.config.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 69f4da0a78..439950ba60 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -13,7 +13,7 @@ import '@/styles'
 const app = createApp(App)
 
 app.use(router)
-app.directive('mask', masking('.bx--text-input__field-wrapper input'))
+app.directive('mask', masking('.cds--text-input__field-wrapper  input'))
 app.config.globalProperties.$session = ForestClientUserSession
 app.config.globalProperties.$features = featureFlags
 app.config.globalProperties.$backend = backendUrl
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 69900fcab2..ff9553d57f 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -13,7 +13,7 @@ export default defineConfig(({ command, mode }) => {
       vue({
         template: {
           compilerOptions: {
-            isCustomElement: (tag) => tag.includes('bx-')
+            isCustomElement: (tag) => tag.includes('cds-')
           }
         }
       }),
@@ -68,6 +68,6 @@ export default defineConfig(({ command, mode }) => {
       },
       environment: 'jsdom'
     },
-    optimizeDeps: false
+    optimizeDeps: true
   }
 })

From 3437f6392b5d82227d4fd70d4cdf304d5400be27 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 05:08:18 -0700
Subject: [PATCH 055/313] fix: fixing mask directive

---
 frontend/src/helpers/CustomDirectives.ts | 2 ++
 frontend/src/main.ts                     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/helpers/CustomDirectives.ts b/frontend/src/helpers/CustomDirectives.ts
index 3160330ca2..1039b4da6e 100644
--- a/frontend/src/helpers/CustomDirectives.ts
+++ b/frontend/src/helpers/CustomDirectives.ts
@@ -1,9 +1,11 @@
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 import { mask } from 'vue-the-mask'
 
 export const masking = (shadowSelector: string) => (el: any, binding: any) => {
   if (el.shadowRoot && binding.value) {
     const input = el.shadowRoot.querySelector(shadowSelector)
     if (input) {
+      input.setAttribute('v-mask', binding.value)
       const observer = new MutationObserver(() => mask(input, binding))
       observer.observe(input, { attributes: true })
     }
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 439950ba60..c50881bd3d 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -13,7 +13,7 @@ import '@/styles'
 const app = createApp(App)
 
 app.use(router)
-app.directive('mask', masking('.cds--text-input__field-wrapper  input'))
+app.directive('mask', masking('.cds--text-input__field-wrapper input'))
 app.config.globalProperties.$session = ForestClientUserSession
 app.config.globalProperties.$features = featureFlags
 app.config.globalProperties.$backend = backendUrl

From eafd13ba9cf7336ec408db411a91c1c7197938e8 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 05:08:56 -0700
Subject: [PATCH 056/313] fix: fixing buttons

---
 .../src/components/MainHeaderComponent.vue    | 39 ++++++++++---------
 .../grouping/AddressGroupComponent.vue        |  7 +++-
 .../grouping/ContactGroupComponent.vue        |  4 +-
 frontend/src/pages/ApplyClientNumberPage.vue  | 11 +++---
 .../src/pages/applyform/ReviewWizardStep.vue  | 35 ++++++++---------
 5 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 5b3838f992..7e2439d938 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -44,24 +44,27 @@ onMounted(() => window.addEventListener('resize', updateScreenWidth));
   
   <div class="heading-space"></div>
 
-  <!-- Remember to add profile button here -->
-  <cds-button
-    v-if="$session?.isLoggedIn() && (isSmallScreen || isMediumScreen)"
-    data-id="logout-btn"
-    kind="tertiary"
-    @click.prevent="$session?.logOut"
-  >
-    <Logout16 slot="icon" />
-  </cds-button>
+  <div class="heading-buttons">
 
-  <cds-button
-    v-if="$session?.isLoggedIn() && (!isSmallScreen && !isMediumScreen)"
-    data-id="logout-btn"
-    kind="tertiary"
-    @click.prevent="$session?.logOut"
-  >
-    <span>Logout</span>
-    <Logout16 slot="icon" />
-  </cds-button>
+    <!-- Remember to add profile button here -->
+    <cds-button
+      v-if="$session?.isLoggedIn() && (isSmallScreen || isMediumScreen)"
+      data-id="logout-btn"
+      kind="tertiary"
+      size="sm"
+      @click.prevent="$session?.logOut"
+    >
+      <Logout16 slot="icon" />
+    </cds-button>
 
+    <cds-button
+      v-if="$session?.isLoggedIn() && (!isSmallScreen && !isMediumScreen)"
+      data-id="logout-btn"
+      kind="tertiary"
+      @click.prevent="$session?.logOut"
+    >
+      <span>Logout</span>
+      <Logout16 slot="icon" />
+    </cds-button>
+  </div>
 </template>
diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 8164e1ad72..62c3418e5f 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -1,5 +1,7 @@
 <script setup lang="ts">
 import { reactive, watch, computed, ref, onMounted } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/button/index';
 // Composables
 import { useEventBus } from '@vueuse/core'
 import { useFetchTo } from '@/composables/useFetch'
@@ -330,14 +332,15 @@ onMounted(() =>{
     @error="validation.postalCode = !$event"
     @empty="validation.postalCode = !$event"
   />
-
+<div class="grouping-06">
   <cds-button
     v-if="id > 0"
-    kind="danger-tertiary"
+    kind="danger--tertiary"
     @click.prevent="emit('remove', id)"
   >
     <span>Delete address</span>
     <Delete16 slot="icon" />
   </cds-button>
+</div>
   </div>
 </template>
diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index 7b2cfa33cc..64c54d941b 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -185,13 +185,15 @@ onMounted(() =>{
     @empty="validation.phoneNumber = !$event"
   />
 
+  <div class="grouping-06">
   <cds-button
     v-if="id > 0"
-    kind="danger-tertiary"
+    kind="danger--tertiary"
     @click.prevent="emit('remove', id)"
   >
     <span>Delete contact</span>
     <Delete16 slot="icon" />
   </cds-button>
 </div>
+</div>
 </template>
diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index 985f67e4cb..355f2c6505 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -433,6 +433,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
         <cds-button
             v-if="!isFirst"
             kind="secondary"
+            size="lg"
             :disabled="isFirst"
             v-on:click="onBack"
             data-test="wizard-back-button"
@@ -444,6 +445,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
           v-if="!isLast && !isFormValid && !endAndLogOut && !mailAndLogOut"
           id="nextBtn"
           kind="primary"
+          size="lg"
           v-on:click="onNext"
           :disabled="progressData[currentTab].valid === false"
           data-test="wizard-next-button"
@@ -459,8 +461,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
           v-if="isLast && !endAndLogOut && !mailAndLogOut"
             data-test="wizard-submit-button"
             kind="primary"
-            iconLayout=""
-            class="bx--btn"
+            size="lg"
             @click.prevent="submit"
           >
           <span>Submit application</span>
@@ -470,8 +471,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
         <cds-button
           data-test="wizard-save-button"
           kind="primary"
-          iconLayout=""
-          class="bx--btn"
+          size="lg"
           :disabled="isNextAvailable"
           v-if="!isLast && isFormValid && !endAndLogOut && !mailAndLogOut"
           @click.prevent="saveChange"
@@ -483,8 +483,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
         <cds-button
           data-test="wizard-logout-button"
           kind="primary"
-          iconLayout=""
-          class="bx--btn"
+          size="lg"
           v-show="!isLast && (endAndLogOut || mailAndLogOut)"
           @click.prevent="processAndLogOut"
         >
diff --git a/frontend/src/pages/applyform/ReviewWizardStep.vue b/frontend/src/pages/applyform/ReviewWizardStep.vue
index 31c0a57c4f..b38ba02e92 100644
--- a/frontend/src/pages/applyform/ReviewWizardStep.vue
+++ b/frontend/src/pages/applyform/ReviewWizardStep.vue
@@ -1,7 +1,12 @@
 <script setup lang="ts">
 import { watch, ref, onMounted } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/button/index';
+// Composables
 import { useEventBus } from '@vueuse/core'
+// Types
 import type { FormDataDto } from '@/dto/ApplyClientNumberDto'
+// @ts-ignore
 import Edit16 from '@carbon/icons-vue/es/edit/16'
 
 //Defining the props and emiter to reveice the data and emit an update
@@ -49,17 +54,15 @@ onMounted(() => {
         }}
       </p>
     </div>
-
-    <bx-btn
+<div class="grouping-06">
+    <cds-button
       kind="tertiary"
-      iconLayout=""
-      class="bx--btn"
-      size="field"
       @click.prevent="goToStep(0)"
     >
       <span>Edit business information</span>
       <Edit16 slot="icon" />
-    </bx-btn>
+    </cds-button>
+    </div>
   </div>
 
   <div class="grouping-05">
@@ -77,17 +80,15 @@ onMounted(() => {
       <span class="body-compact-01">{{ address.country.text }}</span>
       <span class="body-compact-01">{{ address.postalCode }}</span>
     </div>
-
-    <bx-btn
+<div class="grouping-06">
+    <cds-button
       kind="tertiary"
-      iconLayout=""
-      class="bx--btn"
-      size="field"
       @click.prevent="goToStep(1)"
     >
       <span>Edit address</span>
       <Edit16 slot="icon" />
-    </bx-btn>
+    </cds-button>
+    </div>
   </div>
 
   <div class="grouping-05">
@@ -107,16 +108,14 @@ onMounted(() => {
       <span class="body-compact-01">{{ contact.email }}</span>
       <span class="body-compact-01">{{ contact.phoneNumber }}</span>
     </div>
-
-    <bx-btn
+<div class="grouping-06">
+    <cds-button
       kind="tertiary"
-      iconLayout=""
-      class="bx--btn"
-      size="field"
       @click.prevent="goToStep(2)"
     >
       <span>Edit contacts</span>
       <Edit16 slot="icon" />
-    </bx-btn>
+    </cds-button>
+    </div>
   </div>
 </template>

From 050c9463c74d824bec80b7b8444f1bb9b2d4fede Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 05:09:18 -0700
Subject: [PATCH 057/313] fix: fixing autocomplete

---
 frontend/src/components/forms/AutoCompleteInputComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index 0b2f673c32..d042146a4f 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -46,7 +46,7 @@ const inputValue = ref(props.modelValue)
 
 // This is to make the input list contains the selected value to show when component render
 const inputList = computed<Array<BusinessSearchResult>>(() =>
-  ((!props.contents || props.contents.length === 0) ? [{name: props.modelValue, code: '',status:'',legalType:''}] : props.contents)
+  ((!props.contents || props.contents.length === 0) ? [{name: props.modelValue, code: '',status:'',legalType:''}] : props.contents).filter(entry => entry.name)
 )
 
 let selectedValue: BusinessSearchResult | undefined = undefined

From 5482dad9fc105492d8d695313fb9a592a39550a6 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 05:09:30 -0700
Subject: [PATCH 058/313] fix: fixing multiselect

---
 frontend/src/components/forms/MultiselectInputComponent.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/MultiselectInputComponent.vue b/frontend/src/components/forms/MultiselectInputComponent.vue
index 89af434e0e..585205764d 100644
--- a/frontend/src/components/forms/MultiselectInputComponent.vue
+++ b/frontend/src/components/forms/MultiselectInputComponent.vue
@@ -154,7 +154,8 @@ revalidateBus.on(() => validateInput(selectedValue.value))
           :key="index"
           type="blue"
           @cds-tag-closed="removeFromSelection"
-        >{{ tag }}
+        >
+        <span>{{ tag }}</span>
         </cds-tag>
       </div>
     </div>

From b6923ebd5a63b6a62157d7ac68a5ec9d7674d280 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 05:09:46 -0700
Subject: [PATCH 059/313] fix: fixing text input

---
 frontend/src/components/forms/TextInputComponent.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index dabecce001..e9f5dd46dd 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -44,13 +44,6 @@ const selectedValue = ref<string>(props.modelValue)
 
 //We set the value prop as a reference for update reason
 emit('empty', isEmpty(props.modelValue))
-watch(
-  () => props.modelValue,
-  () => {
-    selectedValue.value = props.modelValue
-    validateInput(selectedValue.value)
-  }
-)
 
 //This function emits the events on update
 const emitValueChange = (newValue: string): void => {

From c03fa7f2f953001b032d1a1d4daa0aeb40f69b6f Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 05:10:06 -0700
Subject: [PATCH 060/313] fix: fixing notification

---
 frontend/src/assets/styles/global.scss        | 163 +++++-------------
 .../BusinessInformationWizardStep.vue         | 116 +++++++------
 2 files changed, 99 insertions(+), 180 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index a04425a80e..8618568ef8 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -22,6 +22,8 @@
   --dark-theme-link-link-visited: #c59af1;
   --light-theme-support-support-info: #00478f;
   --light-theme-notifications-support-info-border: rgba(0, 102, 204, 1);
+  --light-theme-notifications-notification-info-background: #C2E0FF;
+  --light-theme-background-background-inverse: #2d2d2f;
   --light-theme-text-text-primary: #131315;
   --border-subtle-02: #dfdfe1;
   --light-theme-tag-blue-background: #c2e0ff;
@@ -47,6 +49,26 @@
   --cds-hover-danger: #b32001;
 }
 
+.heading-buttons {
+  --cds-text-inverse:var(--border-subtle-02);
+  --cds-button-tertiary: var(--border-subtle-02);
+  --cds-button-tertiary-hover: var(--others-transparent-transparent);
+}
+.heading-buttons cds-button span {
+  width:7rem;
+}
+cds-button::part(button) {
+  border-radius: 0.25rem;
+}
+cds-button span {
+  width:11rem;
+}
+.notifications {
+  --cds-background-inverse: var(--light-theme-notifications-notification-info-background);
+  --cds-support-info-inverse: var(--light-theme-notifications-support-info-border);
+  --cds-text-inverse: var(--light-theme-text-text-primary);
+}
+
 * {
   font-family: "BCSans", "Noto Sans", Verdana, Arial, sans-serif;
 }
@@ -83,33 +105,6 @@ hr {
   padding-bottom: 0.625rem;
 }
 
-.inner-spotlight-topic {
-  line-height: 24px;
-  font-size: 16px;
-  font-weight: 700;
-  margin-bottom: 4px;
-}
-
-.inner-spotlight-group {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-  align-items: stretch;
-  width: 100%;
-}
-
-.inner-spotlight-group-markup {
-  border-bottom: solid 1px var(--border-subtle-02);
-}
-
-.wizard-head {
-  display: flex;
-}
-
-.wizard-head-text {
-  flex-grow: 1;
-}
-
 .wizard-head-toast {
   position: fixed;
   right: 1.5625rem;
@@ -122,32 +117,6 @@ hr {
   box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.3);
 }
 
-.submission-head {
-  display: flex;
-}
-
-.submission-text {
-  width: 620px;
-  flex-grow: 1;
-}
-
-.submission-text h1 {
-  font-style: normal;
-  font-weight: 400;
-  font-size: 48px;
-  line-height: 70px;
-}
-
-.submission-text p {
-  font-style: normal;
-  font-weight: 400;
-  font-size: 26px;
-  line-height: 40px;
-  padding: 24px 0px;
-  color: #606062;
-  width: 620px;
-}
-
 .submission-badge {
   width: 414px;
   height: 414px;
@@ -155,17 +124,6 @@ hr {
   fill: var(--cds-hover-primary, #0353e9);
 }
 
-.wizard-mid-content {
-  width: 50%;
-}
-
-.spinner-block {
-  display: flex;
-  gap: 1rem;
-  align-items: center;
-  max-height: 0.5rem;
-}
-
 .bx--progress {
   display: flex;
   flex-direction: column;
@@ -177,14 +135,6 @@ hr {
 
 .bx--progress-indicator {
   flex-direction: row;
-}
-
-.bx--progress-step {
-  border-top: solid 0.125rem;
-  flex: 1;
-}
-
-.bx--progress-indicator {
   display: flex;
   justify-content: space-between;
   margin-bottom: 3rem;
@@ -192,6 +142,8 @@ hr {
 }
 
 .bx--progress-step {
+  border-top: solid 0.125rem;
+  flex: 1;
   display: flex;
   padding: 0.625rem 1rem 0rem 0rem;
   align-items: flex-start;
@@ -207,18 +159,14 @@ hr {
   text-decoration: none;
   color: var(--light-theme-text-text-primary, #131315);
 }
-.bx--progress-step-text p a:hover {
-  color: var(--light-theme-link-link-primary, #005cb8);
-}
-.bx--progress-step-text p span {
-  color: var(--light-theme-text-text-primary, #131315);
-}
-
 .bx--progress-step-text p a:hover {
   text-decoration: underline;
   color: var(--light-theme-link-link-primary-hover, #00478f);
   cursor: pointer;
 }
+.bx--progress-step-text p span {
+  color: var(--light-theme-text-text-primary, #131315);
+}
 
 .bx--progress-step-current {
   border-color: var(--cds-interactive-01);
@@ -280,13 +228,11 @@ hr {
 }
 .headers {
   display: flex;
-  height: 3rem;
-  padding: 0rem 2.5rem;
+  padding: 0.75rem 2.5rem;
   align-items: center;
-  flex-grow: 1;
+  flex: 1 0 0;
   align-self: stretch;
   gap: 1.5rem;
-  flex: 1 0 0;
   background: var(--light-theme-background-background-brand, #0073e6);
 }
 .headers a img {
@@ -330,7 +276,7 @@ hr {
   color: var(--dark-theme-text-text-primary, #f3f3f5);
 
   /* Fixed heading styles/heading-compact-01 */
-  font-family: BC Sans;
+  font-family:BC Sans, sans-serif;
   font-size: 0.875rem;
   font-style: normal;
   font-weight: 700;
@@ -344,7 +290,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315) !important;
 
   /* Fixed heading styles/heading-02 */
-  font-family: BC Sans;
+  font-family:BC Sans, sans-serif;
   font-size: 1rem;
   font-style: normal;
   font-weight: 700;
@@ -354,7 +300,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315);
 
   /* Fixed heading styles/heading-03 */
-  font-family: BC Sans;
+  font-family:BC Sans, sans-serif;
   font-size: 1.25rem;
   font-style: normal;
   font-weight: 400;
@@ -364,7 +310,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315);
 
   /* Fixed heading styles/heading-04 */
-  font-family: BC Sans;
+  font-family:BC Sans, sans-serif;
   font-size: 1.75rem;
   font-style: normal;
   font-weight: 400;
@@ -374,7 +320,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315);
 
   /* Fixed heading styles/heading-05 */
-  font-family: BC Sans;
+  font-family:BC Sans, sans-serif;
   font-size: 2rem;
   font-style: normal;
   font-weight: 400;
@@ -385,7 +331,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315);
 
   /* Fluid styles/MAX/fluid-heading-05 */
-  font-family: BC Sans;
+  font-family:BC Sans, sans-serif;
   font-size: 3.75rem;
   font-style: normal;
   font-weight: 400;
@@ -396,7 +342,7 @@ hr {
   color: var(--light-theme-text-text-secondary, #606062);
 
   /* Fluid styles/MAX/fluid-paragraph-01 */
-  font-family: BC Sans;
+  font-family:BC Sans, sans-serif;
   font-size: 2rem;
   font-style: normal;
   font-weight: 400;
@@ -406,7 +352,7 @@ hr {
   color: var(--light-theme-text-text-secondary, #606062);
 
   /* Body styles/body-01 */
-  font-family: BC Sans;
+  font-family:BC Sans, sans-serif;
   font-size: 0.875rem;
   font-style: normal;
   font-weight: 400;
@@ -417,7 +363,7 @@ hr {
   color: var(--light-theme-text-text-secondary, #606062);
 
   /* Body styles/body-02 */
-  font-family: BC Sans;
+  font-family:BC Sans, sans-serif;
   font-size: 1rem;
   font-style: normal;
   font-weight: 400;
@@ -427,7 +373,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315);
 
   /* Body styles/body-compact-01 */
-  font-family: BC Sans;
+  font-family:BC Sans, sans-serif;
   font-size: 0.875rem;
   font-style: normal;
   font-weight: 400;
@@ -679,7 +625,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315);
 
   /* Utility styles/label-01 */
-  font-family: BC Sans;
+  font-family: BC Sans, sans-serif;
   font-size: 0.75rem;
   font-style: normal;
   font-weight: 400;
@@ -702,35 +648,6 @@ hr {
   gap: 0.5rem;
 }
 
-.bx-tag {
-  display: flex;
-  align-items: flex-start;
-  border-radius: 62.5rem;
-  background: var(--light-theme-tag-blue-background, #c2e0ff);
-  gap: 0.125rem;
-  padding: 0 !important;
-}
-.bx-tag span{
-  color: var(--light-theme-tag-blue-text,#00478f);
-  margin: 0.19rem 0.5rem 0.31rem 0.5rem !important;
-}
-.bx-tag svg {
-  color: var(--light-theme-tag-blue-text,#00478f);
-  margin: 0.25rem !important;
-  border-radius: 150%;
-}
-.bx-tag svg:hover {
-  background-color: var(--light-theme-tag-blue-hover, #99ccff);
-  cursor: pointer;
-}
-.bx-tag svg:focus {
-  outline: 2px solid var(--light-theme-focus, #99ccff);
-}
-
-.bx--modal-btn-divider {
-  width: 0.5rem;
-}
-
 .display-block-wrapper {
   display: flex;
   align-items: flex-start;
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index d90978ea53..32ab45c8c3 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -234,65 +234,67 @@ watch([selectedOption], () => {
       @update:selected-value="autoCompleteResult = $event"
     />
     <cds-inline-loading status="active" v-if="showDetailsLoading">Loading client details...</cds-inline-loading>
+    <div class="notifications">
+      <cds-inline-notification
+        v-if="showAutoCompleteInfo && selectedOption === ClientTypeEnum.R"
+        open="true"
+        kind="info"
+        hide-close-button="true"
+        title="If the name of your registered business does not appear in the list, follow these steps:">
+        <div>
+          <ol type="1" class="bulleted-list">
+            <li>
+              Log into Manage Account in
+              <a
+                href="https://www.bceid.ca/"
+                target="_blank"
+                rel="noopener noreferrer"
+                >BCeID</a
+              >
+              to find your business name
+            </li>
+            <li>
+              If your name isn’t there, call BC Registry toll free at
+              <a href="tel:18775261526">1-877-526-1526</a> or email them at
+              <a href="mailto:BCRegistries@gov.bc.ca">BCRegistries@gov.bc.ca</a>.
+            </li>
+          </ol>
+        </div>
+      </cds-inline-notification>
 
-    <cds-inline-notification
-      v-if="showAutoCompleteInfo && selectedOption === ClientTypeEnum.R"
-      open="true"
-      kind="info"
-      title="If the name of your registered business does not appear in the list, follow these steps:">
-      <div>
-        <ol type="1" class="bulleted-list">
-          <li>
-            Log into Manage Account in
-            <a
-              href="https://www.bceid.ca/"
-              target="_blank"
-              rel="noopener noreferrer"
-              >BCeID</a
-            >
-            to find your business name
-          </li>
-          <li>
-            If your name isn’t there, call BC Registry toll free at
-            <a href="tel:18775261526">1-877-526-1526</a> or email them at
-            <a href="mailto:BCRegistries@gov.bc.ca">BCRegistries@gov.bc.ca</a>.
-          </li>
-        </ol>
-      </div>
-    </cds-inline-notification>
+      <cds-inline-notification
+        v-if="showGoodStandingError"
+        open="true"
+        kind="error"
+        title="Not in good standing with BC Registries"
+      >
+        <p>
+          Your request for a client number cannot go ahead because “{{
+            formData.businessInformation.businessName
+          }}” is not in good standing with BC Registries. Go to your
+          <a
+            href="https://www.bcregistry.gov.bc.ca/"
+            target="_blank"
+            rel="noopener noreferrer"
+            >BC Registries</a
+          >
+          account to find out why.
+        </p>
+      </cds-inline-notification>
 
-    <cds-inline-notification
-      v-if="showGoodStandingError"
-      open="true"
-      kind="error"
-      title="Not in good standing with BC Registries"
-    >
-      <p>
-        Your request for a client number cannot go ahead because “{{
-          formData.businessInformation.businessName
-        }}” is not in good standing with BC Registries. Go to your
-        <a
-          href="https://www.bcregistry.gov.bc.ca/"
-          target="_blank"
-          rel="noopener noreferrer"
-          >BC Registries</a
-        >
-        account to find out why.
-      </p>
-    </cds-inline-notification>
-
-    <cds-inline-notification
-      v-if="showDuplicatedError"
-      open="true"
-      kind="error"
-      title="Client already exists"
-    >
-      <p>
-        Looks like “{{ formData.businessInformation.businessName }}” has a
-        client number. Select the 'Receive email and logout' button below to
-        have it sent to you at {{ formData.location.contacts[0].email }}
-      </p>
-    </cds-inline-notification>
+      <cds-inline-notification
+        v-if="showDuplicatedError"
+        open="true"
+        kind="error"
+        title="Client already exists"
+      >
+        <p>
+          Looks like “{{ formData.businessInformation.businessName }}” has a
+          client number. Select the 'Receive email and logout' button below to
+          have it sent to you at {{ formData.location.contacts[0].email }}
+        </p>
+      </cds-inline-notification>
+    </div>
   </data-fetcher>
 
   <text-input-component

From 580cf8a52a6a4661a22f39bbdf31a12da51351e2 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 06:54:16 -0700
Subject: [PATCH 061/313] chore: removing tags from multiselect

---
 .../forms/MultiselectInputComponent.vue       | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/frontend/src/components/forms/MultiselectInputComponent.vue b/frontend/src/components/forms/MultiselectInputComponent.vue
index 585205764d..63d19e4722 100644
--- a/frontend/src/components/forms/MultiselectInputComponent.vue
+++ b/frontend/src/components/forms/MultiselectInputComponent.vue
@@ -104,12 +104,6 @@ const selectItems = (event:any) =>{
   emitChange()
 }
 
-const removeFromSelection = (event: any) => {
-  items.value = items.value.filter((entry) => entry !== event.srcElement.attributes['data-value'].value)
-  selectedValue.value = items.value.join(',')
-  emitChange()
-}
-
 watch([items], () => emitChange())
 
 props.selectedValues?.forEach((value: string) => addFromSelection(value))
@@ -142,22 +136,6 @@ revalidateBus.on(() => validateInput(selectedValue.value))
           {{ option.name }}
         </cds-multi-select-item>
       </cds-multi-select>
-      <div class="bx-tag-box">
-        <cds-tag
-          filter
-          v-for="(tag, index) in items"
-          title="Clear selection"
-          class="bx-tag"
-          :data-tag="'tag_' + id + '_' + index"
-          :data-value="tag"
-          :id="'tag_' + id + '_' + index"
-          :key="index"
-          type="blue"
-          @cds-tag-closed="removeFromSelection"
-        >
-        <span>{{ tag }}</span>
-        </cds-tag>
-      </div>
     </div>
   </div>
 </template>
\ No newline at end of file

From 210e50a3fa539301a24f2c29c93e17bcfaae82b4 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 06:54:46 -0700
Subject: [PATCH 062/313] fix: fixing dividers and notification block

---
 .../src/pages/applyform/BusinessInformationWizardStep.vue     | 2 +-
 frontend/src/pages/applyform/ReviewWizardStep.vue             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index 32ab45c8c3..a72dafd80e 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -234,7 +234,7 @@ watch([selectedOption], () => {
       @update:selected-value="autoCompleteResult = $event"
     />
     <cds-inline-loading status="active" v-if="showDetailsLoading">Loading client details...</cds-inline-loading>
-    <div class="notifications">
+    <div class="notifications" v-if="(showAutoCompleteInfo && selectedOption === ClientTypeEnum.R) || showGoodStandingError || showDuplicatedError">
       <cds-inline-notification
         v-if="showAutoCompleteInfo && selectedOption === ClientTypeEnum.R"
         open="true"
diff --git a/frontend/src/pages/applyform/ReviewWizardStep.vue b/frontend/src/pages/applyform/ReviewWizardStep.vue
index b38ba02e92..a8bd4aca4e 100644
--- a/frontend/src/pages/applyform/ReviewWizardStep.vue
+++ b/frontend/src/pages/applyform/ReviewWizardStep.vue
@@ -73,7 +73,7 @@ onMounted(() => {
       :key="address.locationName"
       class="grouping-07"
     >
-      <hr v-if="index > 0"/>
+      <hr class="divider" v-if="index > 0"/>
       <span class="heading-02">{{ address.locationName }}</span>
       <span class="body-compact-01">{{ address.streetAddress }}</span>
       <span class="body-compact-01">{{ address.city }}, {{ address.province.text }}</span>
@@ -99,7 +99,7 @@ onMounted(() => {
       :key="contact.email"
       class="grouping-07"
     >
-      <hr v-if="index > 0"/>
+      <hr class="divider" v-if="index > 0"/>
       <span class="heading-02">{{ contact.firstName }} {{ contact.lastName }}</span>
       <span class="body-compact-01">
         {{ contact.locationNames.map((codeDesc) => codeDesc.text).join(', ') }}

From 02aa2963b376a248f2fca5e55a1d3eb7991afb6e Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 08:11:18 -0700
Subject: [PATCH 063/313] chore: updating dependencies

---
 frontend/package-lock.json | 24 +++++++++++++++++-------
 frontend/package.json      |  4 ++--
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 191bcdf41a..c83b233141 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -50,8 +50,8 @@
         "lcov-result-merger": "^4.1.0",
         "nyc": "^15.1.0",
         "prettier": "^3.0.3",
-        "sass": "^1.63.4",
-        "sass-loader": "^13.3.2",
+        "sass": "^1.66.1",
+        "sass-loader": "^12.6.0",
         "source-map-support": "^0.5.21",
         "start-server-and-test": "^2.0.0",
         "ts-node": "^10.9.1",
@@ -9190,6 +9190,15 @@
         "json-buffer": "3.0.1"
       }
     },
+    "node_modules/klona": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz",
+      "integrity": "sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/kolorist": {
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz",
@@ -11396,15 +11405,16 @@
       }
     },
     "node_modules/sass-loader": {
-      "version": "13.3.2",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-13.3.2.tgz",
-      "integrity": "sha512-CQbKl57kdEv+KDLquhC+gE3pXt74LEAzm+tzywcA0/aHZuub8wTErbjAoNI57rPUWRYRNC5WUnNl8eGJNbDdwg==",
+      "version": "12.6.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
+      "integrity": "sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==",
       "dev": true,
       "dependencies": {
+        "klona": "^2.0.4",
         "neo-async": "^2.6.2"
       },
       "engines": {
-        "node": ">= 14.15.0"
+        "node": ">= 12.13.0"
       },
       "funding": {
         "type": "opencollective",
@@ -11412,7 +11422,7 @@
       },
       "peerDependencies": {
         "fibers": ">= 3.1.0",
-        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0 || ^9.0.0",
+        "node-sass": "^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0",
         "sass": "^1.3.0",
         "sass-embedded": "*",
         "webpack": "^5.0.0"
diff --git a/frontend/package.json b/frontend/package.json
index 1aa067d671..49999d5470 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -83,8 +83,8 @@
     "lcov-result-merger": "^4.1.0",
     "nyc": "^15.1.0",
     "prettier": "^3.0.3",
-    "sass": "^1.63.4",
-    "sass-loader": "^13.3.2",
+    "sass": "^1.66.1",
+    "sass-loader": "^12.6.0",
     "source-map-support": "^0.5.21",
     "start-server-and-test": "^2.0.0",
     "ts-node": "^10.9.1",

From 8a0d271cdd4f6190d7c1f39f7c93c1cd3cc68eae Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 08:11:45 -0700
Subject: [PATCH 064/313] feat: updating progress indicator

---
 frontend/src/assets/styles/global.scss       | 27 ++++++++----
 frontend/src/pages/ApplyClientNumberPage.vue | 43 ++++++++------------
 2 files changed, 37 insertions(+), 33 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 8618568ef8..700f69996f 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -29,6 +29,8 @@
   --light-theme-tag-blue-background: #c2e0ff;
   --light-theme-tag-blue-text:#00478f;
   --light-theme-focus: #0073e6;
+  --light-theme-miscellaneous-interactive:#0073E6;
+
   //Primary button
   --cds-interactive-01: #0073E6;
   --cds-active-primary: #0073E6;
@@ -68,6 +70,18 @@ cds-button span {
   --cds-support-info-inverse: var(--light-theme-notifications-support-info-border);
   --cds-text-inverse: var(--light-theme-text-text-primary);
 }
+.step-active {
+  --cds-border-subtle: var(--light-theme-miscellaneous-interactive);
+}
+.cds--progress-label {
+  overflow: visible !important;
+  
+}
+.cds--progress-label:hover {
+  box-shadow: none !important;
+  text-decoration: underline;
+  text-underline-offset: 0.325rem;
+}
 
 * {
   font-family: "BCSans", "Noto Sans", Verdana, Arial, sans-serif;
@@ -92,8 +106,9 @@ hr {
   display: block;
   border: 0;
   border-top: 1px solid var(--border-subtle-02,#dfdfe1);
-  margin: 1em 0;
   padding: 0;
+  align-self: stretch;
+  width: 100%;
 }
 
 .bulleted-list {
@@ -381,12 +396,6 @@ hr {
   letter-spacing: 0.01rem;
 }
 
-.divider {
-  align-self: stretch;
-  width: 100%;
-  background: var(--light-theme-border-border-subtle-02, #dfdfe1);
-}
-
 .content {
   flex-grow: 1;
   align-self: stretch;
@@ -399,6 +408,8 @@ hr {
   display: flex;
   flex-direction: column;
   gap: 1.5rem;
+  --cds-icon-primary: var(--light-theme-miscellaneous-interactive);
+  //--cds-border-subtle: var(--light-theme-miscellaneous-interactive); aplica em todos
 }
 .form-header-stretched {
   align-self: stretch;
@@ -466,7 +477,7 @@ hr {
   display: flex;
   flex-direction: column;
   align-items: flex-start;
-  gap: 2.5rem;
+  gap: 1.5rem;
 }
 
 .form-steps-section-01 {
diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index 355f2c6505..ebf601cae1 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -2,6 +2,7 @@
 import { reactive, watch, toRef, ref, getCurrentInstance, computed } from 'vue'
 // Carbon
 import '@carbon/web-components/es/components/button/index';
+import '@carbon/web-components/es/components/progress-indicator/index';
 // Composables
 import { useEventBus } from "@vueuse/core";
 import { useRouter } from "vue-router";
@@ -120,10 +121,7 @@ watch([error], () => {
   }
 });
 
-addValidation(
-  "location.contacts.*.locationNames.*.text",
-  isContainedIn(locations)
-);
+addValidation('location.contacts.*.locationNames.*.text', isContainedIn(locations))
 
 // Tab system
 const progressData = reactive([
@@ -205,10 +203,10 @@ const progressData = reactive([
 const currentTab = ref(0);
 
 const stateIcon = (index: number) => {
-  if (currentTab.value == index) return "current";
-  if (currentTab.value > index || progressData[index].valid) return "complete";
-  return "queued";
-};
+  if (currentTab.value == index) return 'current'
+  if (currentTab.value > index || progressData[index].valid) return 'complete'
+  return 'incomplete'
+}
 
 const checkStepValidity = (stepNumber: number): boolean => {
   progressData.forEach((step: any) => {
@@ -308,10 +306,17 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
       <span class="heading-05" data-scroll="top">New client application</span>
       <p class="body-01">All fields are mandatory</p>
     </div>
-      <wizard-progress-indicator-component
-      :model-value="progressData"
-      @go-to="goToStep"
-    />
+    <cds-progress-indicator space-equally>
+        <cds-progress-step 
+          v-for="item in progressData"
+          :key="item.step"
+          :secondary-label="item.subtitle"
+          :state="item.step <= currentTab ? item.step < currentTab ? 'complete' : 'current' : 'incomplete'"
+          :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"
+          >
+          <span class="cds--progress-label">{{ item.title }}</span>
+        </cds-progress-step>
+      </cds-progress-indicator>
   </div>
 
   <div class="form-steps">
@@ -442,7 +447,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
         </cds-button>
 
         <cds-button
-          v-if="!isLast && !isFormValid && !endAndLogOut && !mailAndLogOut"
+          v-if="!isLast && !endAndLogOut && !mailAndLogOut"
           id="nextBtn"
           kind="primary"
           size="lg"
@@ -468,18 +473,6 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
           <Check16 slot="icon" />
         </cds-button>
 
-        <cds-button
-          data-test="wizard-save-button"
-          kind="primary"
-          size="lg"
-          :disabled="isNextAvailable"
-          v-if="!isLast && isFormValid && !endAndLogOut && !mailAndLogOut"
-          @click.prevent="saveChange"
-        >
-          <span>Save</span>
-          <Save16 slot="icon" />
-        </cds-button>
-
         <cds-button
           data-test="wizard-logout-button"
           kind="primary"

From 72674c48e1088721dcd600bbe48cc2799e0a5e03 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 08:12:32 -0700
Subject: [PATCH 065/313] fix: fixing masking issue

---
 frontend/src/components/forms/TextInputComponent.vue       | 2 +-
 frontend/src/components/grouping/AddressGroupComponent.vue | 2 +-
 frontend/src/helpers/CustomDirectives.ts                   | 7 ++++---
 frontend/src/main.ts                                       | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index e9f5dd46dd..658838116e 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -84,7 +84,7 @@ revalidateBus.on(() => {
       :disabled="!enabled"
       :invalid="error ? true : false"
       :invalid-text="error"
-      v-mask="mask"
+      v-masked="mask"
       @blur="(event:any) => validateInput(event.target.value)"
       @input="(event:any) => selectedValue = event.target.value"
       :data-focus="id"
diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 62c3418e5f..073901a5db 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -135,7 +135,7 @@ const postalCodeMask = computed(() => {
     case 'CA':
       return 'A#A#A#'
     case 'US':
-      return '#####' // TODO: Should fix mask to allow 00000 or 00000-0000
+      return ['#####','#####-####']
     default:
       return '##########'
   }
diff --git a/frontend/src/helpers/CustomDirectives.ts b/frontend/src/helpers/CustomDirectives.ts
index 1039b4da6e..cb2f463b29 100644
--- a/frontend/src/helpers/CustomDirectives.ts
+++ b/frontend/src/helpers/CustomDirectives.ts
@@ -5,9 +5,10 @@ export const masking = (shadowSelector: string) => (el: any, binding: any) => {
   if (el.shadowRoot && binding.value) {
     const input = el.shadowRoot.querySelector(shadowSelector)
     if (input) {
-      input.setAttribute('v-mask', binding.value)
-      const observer = new MutationObserver(() => mask(input, binding))
-      observer.observe(input, { attributes: true })
+      if (binding.value !== input.getAttribute('v-mask')) {
+        input.setAttribute('v-mask', binding.value)
+        mask(input, binding)
+      }
     }
   }
 }
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index c50881bd3d..d466ee5a69 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -1,5 +1,5 @@
 import { createApp } from 'vue'
-
+import VueTheMask from 'vue-the-mask'
 import App from '@/App.vue'
 import { router } from '@/routes'
 import { featureFlags, backendUrl } from '@/CoreConstants'
@@ -13,7 +13,8 @@ import '@/styles'
 const app = createApp(App)
 
 app.use(router)
-app.directive('mask', masking('.cds--text-input__field-wrapper input'))
+app.use(VueTheMask)
+app.directive('masked', masking('.cds--text-input__field-wrapper input'))
 app.config.globalProperties.$session = ForestClientUserSession
 app.config.globalProperties.$features = featureFlags
 app.config.globalProperties.$backend = backendUrl

From d0026b06e893e4fceb64776c1b73a9cc21384300 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 08:16:08 -0700
Subject: [PATCH 066/313] fix: fixing style

---
 frontend/src/assets/styles/global.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 700f69996f..097ff288c0 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -409,7 +409,6 @@ hr {
   flex-direction: column;
   gap: 1.5rem;
   --cds-icon-primary: var(--light-theme-miscellaneous-interactive);
-  //--cds-border-subtle: var(--light-theme-miscellaneous-interactive); aplica em todos
 }
 .form-header-stretched {
   align-self: stretch;

From 6e5d1fa86492e652bf08e5b40a28b21588d0cc14 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 08:17:44 -0700
Subject: [PATCH 067/313] chore: removing unused code

---
 .../visuals/DisplayBlockComponent.vue         | 107 -----------------
 .../WizardProgressIndicatorComponent.vue      | 101 ----------------
 .../visuals/DisplayBlockComponent.cy.ts       |  49 --------
 .../WizardProgressIndicatorComponent.cy.ts    | 109 ------------------
 .../WizardProgressIndicatorComponent.spec.ts  | 102 ----------------
 5 files changed, 468 deletions(-)
 delete mode 100644 frontend/src/components/visuals/DisplayBlockComponent.vue
 delete mode 100644 frontend/src/components/wizard/WizardProgressIndicatorComponent.vue
 delete mode 100644 frontend/tests/components/components/visuals/DisplayBlockComponent.cy.ts
 delete mode 100644 frontend/tests/components/components/wizard/WizardProgressIndicatorComponent.cy.ts
 delete mode 100644 frontend/tests/unittests/components/wizard/WizardProgressIndicatorComponent.spec.ts

diff --git a/frontend/src/components/visuals/DisplayBlockComponent.vue b/frontend/src/components/visuals/DisplayBlockComponent.vue
deleted file mode 100644
index e7bcf7d478..0000000000
--- a/frontend/src/components/visuals/DisplayBlockComponent.vue
+++ /dev/null
@@ -1,107 +0,0 @@
-<script setup lang="ts">
-//@ts-ignore
-import CheckmarkFilled20 from '@carbon/icons-vue/es/checkmark--filled/24'
-//@ts-ignore
-import WarningFilled20 from '@carbon/icons-vue/es/warning--filled/24'
-//@ts-ignore
-import InfoFilled20 from '@carbon/icons-vue/es/information--filled/24'
-
-const props = defineProps<{
-  kind: string
-  title: string
-  subtitle?: string
-}>()
-
-const iconsForKinds: Record<string, any> = {
-  ['success']: CheckmarkFilled20,
-  ['info']: InfoFilled20,
-  ['warning']: WarningFilled20,
-  ['error']: WarningFilled20
-}
-</script>
-
-<template>
-  <div
-  data-scroll="top-notification"
-    data-testid="display-block-wrapper"
-    :class="{
-      'display-block-wrapper': true,
-      [`display-block-wrapper-${kind}`]: true
-    }"
-  >
-  <div class="display-block-icon-wrapper">
-    <component
-      data-testid="display-block-icon"
-      :is="iconsForKinds[kind]"
-      :class="{
-        'display-block-icon': true,
-        [`display-block-icon-${kind}`]: true
-      }"
-      :alt="kind"
-    />
-    </div>
-    <div class="grouping-08">
-        <p class="heading-compact-01 heading-compact-01-dark ">{{ title }}</p>
-        <span class="body-compact-01">{{ subtitle }}</span>
-      <slot></slot>
-    </div>
-  </div>
-</template>
-
-
-
-<style scoped>
-.display-block-wrapper {
-  display: flex;
-  flex-direction: row;
-  align-items: flex-start;
-  padding: 0.25rem;
-  gap: 1rem;
-}
-
-.display-block-wrapper p span {
-  font-weight: bold;
-}
-
-.display-block-wrapper-info {
-  border-radius: 0.25rem;
-  border: 1px solid var(--light-theme-notifications-support-info-border, rgba(0, 102, 204, 0.40));
-  background: var(--light-theme-notifications-notification-info-background, #C2E0FF);
-  background: #c2e0ff;
-  border-left: 4px solid var(--light-theme-notifications-support-info-border, rgba(0, 102, 204, 0.40));
-}
-
-.display-block-wrapper-success {
-  background: #defbe6;
-  border: 1px solid #198038;
-  border-radius: 4px;
-  border-left: 4px solid #198038;
-}
-
-.display-block-wrapper-error {
-  background: #fff1f1;
-  border: 1px solid #E72000;
-  border-radius: 4px;
-  border-left: 4px solid #E72000;
-}
-
-.display-block-wrapper-warning {
-  background: #fdf6dd;
-  border: 1px solid #f1c21b;
-  border-radius: 4px;
-  border-left: 4px solid #f1c21b;
-}
-
-.display-block-icon-info {
-  color: var(--light-theme-support-info, #00478F);
-}
-.display-block-icon-success {
-  color: #198038;
-}
-.display-block-icon-error {
-  color: var(--cds-danger-01);
-}
-.display-block-icon-warning {
-  color: #f1c21b;
-}
-</style>
diff --git a/frontend/src/components/wizard/WizardProgressIndicatorComponent.vue b/frontend/src/components/wizard/WizardProgressIndicatorComponent.vue
deleted file mode 100644
index af263932d6..0000000000
--- a/frontend/src/components/wizard/WizardProgressIndicatorComponent.vue
+++ /dev/null
@@ -1,101 +0,0 @@
-<script setup lang="ts">
-import { toRef, watch } from 'vue'
-// Composables
-import { useEventBus } from '@vueuse/core'
-// Types
-import type { ProgressData } from '@/dto/CommonTypesDto'
-// @ts-ignore
-import Checkmark16 from '@carbon/icons-vue/es/checkmark--outline/16'
-// @ts-ignore
-import Error16 from '@carbon/icons-vue/es/error--outline/16'
-// @ts-ignore
-import Circle16 from '@carbon/icons-vue/es/circle-dash/16'
-// @ts-ignore
-import Info16 from '@carbon/icons-vue/es/incomplete/16'
-
-const props = defineProps<{ modelValue: Array<ProgressData> }>()
-
-// eslint-disable typescript:S6598
-const emit = defineEmits<{ (e: 'go-to', value: number): void }>()
-
-const bus = useEventBus<boolean>('navigation-notification')
-
-const values = toRef(props.modelValue)
-watch(
-  () => props.modelValue,
-  () => {
-    values.value = props.modelValue
-  }
-)
-bus.on(
-  (value: boolean) =>
-    (values.value = values.value.map((item: ProgressData) => {
-      if (item.kind === 'queued') {
-        item.enabled = value
-      }
-      return item
-    }))
-)
-
-const iconsForKinds: Record<string, any> = {
-  ['complete']: Checkmark16,
-  ['current']: Info16,
-  ['queued']: Circle16,
-  ['error']: Error16
-}
-
-const canShowLink = (step: ProgressData) => {
-  return step.kind === 'current' || step.kind === 'complete'
-}
-</script>
-
-<template>
-  <div class="form-header-progress">
-    <div
-      v-for="(step, index) in values"
-      :class="{
-        'bx--progress-step': true,
-        [`bx--progress-step-${step.kind}`]: true
-      }"
-      :data-test="'step-' + index"
-    >
-      <component
-        name="icon"
-        :is="iconsForKinds[step.kind]"
-        :alt="step.kind"
-        :class="{
-          'bx--progress-step-icon': true,
-          [`bx--progress-step-icon-${step.kind}`]: true
-        }"
-      />
-      <div class="bx--progress-step-text">
-        <p>
-          <a
-            v-if="canShowLink(step)"
-            @click.prevent="emit('go-to', index)"
-            rel="noopener noreferrer"
-            :class="{
-              'body-compact-01': true,
-              'body-compact-01-active': step.kind === 'current'
-            }"
-            >{{ step.title }}</a
-          >
-          <span
-            v-else
-            :class="{
-              'body-compact-01-active': step.kind === 'current',
-              'body-compact-01': step.kind !== 'current',
-
-            }"
-            >{{ step.title }}</span
-          >
-        </p>
-        <span
-        class="label-01"
-          >{{ step.subtitle }}</span
-        >
-      </div>
-    </div>
-  </div>
-</template>
-
diff --git a/frontend/tests/components/components/visuals/DisplayBlockComponent.cy.ts b/frontend/tests/components/components/visuals/DisplayBlockComponent.cy.ts
deleted file mode 100644
index 7d73cd2417..0000000000
--- a/frontend/tests/components/components/visuals/DisplayBlockComponent.cy.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import DisplayBlockComponent from '@/components/visuals/DisplayBlockComponent.vue'
-
-describe('<DisplayBlockComponent />', () => {
-  ;['info', 'success', 'warning', 'error'].forEach((kind: string) => {
-    it(`should render the component as ${kind}`, () => {
-      cy.mount(DisplayBlockComponent, {
-        props: {
-          kind,
-          title: `Test ${kind}`,
-          subtitle: `Test Sub${kind}`
-        }
-      })
-      cy.get('div').should('be.visible')
-
-      cy.get('[data-testid="display-block-wrapper"]')
-        .should('have.attr', 'class')
-        .and('contain', 'display-block-wrapper')
-        .and('contain', `display-block-wrapper-${kind}`)
-
-      cy.get('[data-testid="display-block-icon"]')
-        .should('have.attr', 'class')
-        .and('contain', 'display-block-icon')
-        .and('contain', `display-block-icon-${kind}`)
-
-      cy.get('[data-testid="display-block-icon"]')
-        .should('have.attr', 'alt')
-        .and('contain', kind)
-
-      cy.get('p').should('be.visible').and('contain', `Test ${kind}`)
-
-      cy.get('span').should('be.visible').and('contain', `Test Sub${kind}`)
-    })
-  })
-
-  it('should render default slot content', () => {
-    cy.mount(DisplayBlockComponent, {
-      props: {
-        kind: 'info',
-        title: 'Test Info',
-        subtitle: 'Test SubInfo'
-      },
-      slots: {
-        default: 'Test Default Slot'
-      }
-    })
-    cy.get('div.grouping-08').should('be.visible')
-    cy.get('div.grouping-08').should('contain', 'Test Default Slot')
-  })
-})
diff --git a/frontend/tests/components/components/wizard/WizardProgressIndicatorComponent.cy.ts b/frontend/tests/components/components/wizard/WizardProgressIndicatorComponent.cy.ts
deleted file mode 100644
index 4136fd834b..0000000000
--- a/frontend/tests/components/components/wizard/WizardProgressIndicatorComponent.cy.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import WizardProgressIndicatorComponent from '@/components/wizard/WizardProgressIndicatorComponent.vue'
-import type { ProgressData } from '@/dto/CommonTypesDto'
-
-describe('<WizardProgressIndicatorComponent />', () => {
-  beforeEach(() => {
-    cy.fixture('progress.1.json').as('progress1Fixture')
-    cy.fixture('progress.2.json').as('progress2Fixture')
-  })
-
-  it('steps are displayed horizontally', () => {
-    cy.viewport(768, 660)
-    cy.get('@progress1Fixture').then((progress:ProgressData[]) => {
-      cy.mount(WizardProgressIndicatorComponent, {
-        props: { modelValue: progress }
-      })
-    })
-
-    cy.get('.bx--progress-step')
-      .then((elements) =>
-        elements.map((_index, el) => el.getBoundingClientRect())
-      )
-      .as('stepContainers')
-
-    cy.get<DOMRect[]>('@stepContainers').should('have.lengthOf', 4)
-
-    cy.get<DOMRect[]>('@stepContainers').then((stepContainers) => {
-      expect(stepContainers[0].top)
-        .to.eq(stepContainers[1].top)
-        .and.eq(stepContainers[2].top)
-        .and.eq(stepContainers[3].top)
-
-      expect(stepContainers[0].left).to.be.lessThan(stepContainers[1].left)
-      expect(stepContainers[1].left).to.be.lessThan(stepContainers[2].left)
-      expect(stepContainers[2].left).to.be.lessThan(stepContainers[3].left)
-    })
-  })
-
-  it('steps are displayed vertically', () => {
-    cy.viewport(320, 660)
-    cy.get('@progress1Fixture').then((progress:ProgressData[]) => {
-      cy.mount(WizardProgressIndicatorComponent, {
-        props: { modelValue: progress }
-      })
-    })
-    cy.get('.bx--progress-step')
-      .then((elements) =>
-        elements.map(function () {
-          return this.getBoundingClientRect()
-        })
-      )
-      .as('stepContainers')
-
-    cy.get<DOMRect[]>('@stepContainers').should('have.lengthOf', 4)
-
-    cy.get<DOMRect[]>('@stepContainers').then((stepContainers) => {
-      expect(stepContainers[0].left)
-        .to.eq(stepContainers[1].left)
-        .and.eq(stepContainers[2].left)
-        .and.eq(stepContainers[3].left)
-
-      expect(stepContainers[0].top).to.be.lessThan(stepContainers[1].top)
-      expect(stepContainers[1].top).to.be.lessThan(stepContainers[2].top)
-      expect(stepContainers[2].top).to.be.lessThan(stepContainers[3].top)
-    })
-  })
-
-  it('should render all states', () => {
-    cy.viewport(768, 660)
-    cy.get('@progress2Fixture').then((progress:ProgressData[]) => {
-      cy.mount(WizardProgressIndicatorComponent, {
-        props: { modelValue: progress }
-      })
-    })
-
-    cy.get('.bx--progress-step')
-      .then((elements) =>
-        elements.map((_index, el) => el.getBoundingClientRect())
-      )
-      .as('stepContainers')
-
-    cy.get('[data-test="step-0"')
-      .should('be.visible')
-      .and('have.class', 'bx--progress-step-complete')
-      .find('svg')
-      .should('be.visible')
-      .and('have.class', 'bx--progress-step-icon-complete')
-
-    cy.get('[data-test="step-1"')
-      .should('be.visible')
-      .and('have.class', 'bx--progress-step-current')
-      .find('svg')
-      .should('be.visible')
-      .and('have.class', 'bx--progress-step-icon-current')
-
-    cy.get('[data-test="step-2"')
-      .should('be.visible')
-      .and('have.class', 'bx--progress-step-queued')
-      .find('svg')
-      .should('be.visible')
-      .and('have.class', 'bx--progress-step-icon-queued')
-
-    cy.get('[data-test="step-3"')
-      .should('be.visible')
-      .and('have.class', 'bx--progress-step-error')
-      .find('svg')
-      .should('be.visible')
-      .and('have.class', 'bx--progress-step-icon-error')
-  })
-})
diff --git a/frontend/tests/unittests/components/wizard/WizardProgressIndicatorComponent.spec.ts b/frontend/tests/unittests/components/wizard/WizardProgressIndicatorComponent.spec.ts
deleted file mode 100644
index 7de597d08b..0000000000
--- a/frontend/tests/unittests/components/wizard/WizardProgressIndicatorComponent.spec.ts
+++ /dev/null
@@ -1,102 +0,0 @@
-import { describe, it, expect } from 'vitest'
-import { mount } from '@vue/test-utils'
-import WizardProgressIndicatorComponent from '@/components/wizard/WizardProgressIndicatorComponent.vue'
-
-describe('WizardProgressIndicatorComponent.vue', () => {
-  it('should render the component', () => {
-    const wrapper = mount(WizardProgressIndicatorComponent, {
-      props: {
-        modelValue: [
-          {
-            kind: 'current',
-            title: 'First step',
-            subtitle: 'Classic step',
-            enabled: true
-          },
-          {
-            kind: 'queued',
-            title: 'Second step',
-            subtitle: 'Classic step',
-            enabled: true
-          }
-        ]
-      }
-    })
-    expect(wrapper.exists()).toBe(true)
-  })
-
-  it('should update component when queue moved', async () => {
-    const wrapper = mount(WizardProgressIndicatorComponent, {
-      props: {
-        modelValue: [
-          {
-            kind: 'current',
-            title: 'First step',
-            subtitle: 'Classic step',
-            enabled: true
-          },
-          {
-            kind: 'queued',
-            title: 'Second step',
-            subtitle: 'Classic step',
-            enabled: true
-          }
-        ]
-      }
-    })
-
-    let step0Icon = await wrapper.find('[name="icon"]')
-    expect(step0Icon.element.tagName).toBe('svg')
-    expect(step0Icon.attributes('alt')).toBe('current')
-
-    await wrapper.setProps({
-      modelValue: [
-        {
-          kind: 'complete',
-          title: 'First step',
-          subtitle: 'Classic step',
-          enabled: true
-        },
-        {
-          kind: 'current',
-          title: 'Second step',
-          subtitle: 'Classic step',
-          enabled: true
-        }
-      ]
-    })
-
-    step0Icon = await wrapper.find('[name="icon"]')
-    expect(step0Icon.element.tagName).toBe('svg')
-    expect(step0Icon.attributes('alt')).toBe('complete')
-  })
-
-  it('should be able to move back to previous step once is completed', async () => {
-    const wrapper = mount(WizardProgressIndicatorComponent, {
-      props: {
-        modelValue: [
-          {
-            kind: 'complete',
-            title: 'First step',
-            subtitle: 'Classic step',
-            enabled: true
-          },
-          {
-            kind: 'current',
-            title: 'Second step',
-            subtitle: 'Classic step',
-            enabled: true
-          }
-        ]
-      }
-    })
-
-    const step0 = wrapper.find(
-      'div[data-test="step-0"] > div.bx--progress-step-text > p > a'
-    )
-    expect(step0.exists()).toBe(true)
-
-    await step0.trigger('click')
-    expect(wrapper.emitted('go-to')![0][0]).toBe(0)
-  })
-})

From 846e3981f0cf5b0cfb846c323e17382959d2441e Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 10:32:40 -0700
Subject: [PATCH 068/313] feat: updating global error notification

---
 frontend/src/pages/ApplyClientNumberPage.vue | 22 +++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/ApplyClientNumberPage.vue
index ebf601cae1..05ef772407 100644
--- a/frontend/src/pages/ApplyClientNumberPage.vue
+++ b/frontend/src/pages/ApplyClientNumberPage.vue
@@ -3,6 +3,7 @@ import { reactive, watch, toRef, ref, getCurrentInstance, computed } from 'vue'
 // Carbon
 import '@carbon/web-components/es/components/button/index';
 import '@carbon/web-components/es/components/progress-indicator/index';
+import '@carbon/web-components/es/components/notification/index';
 // Composables
 import { useEventBus } from "@vueuse/core";
 import { useRouter } from "vue-router";
@@ -317,8 +318,21 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
           <span class="cds--progress-label">{{ item.title }}</span>
         </cds-progress-step>
       </cds-progress-indicator>
+      <cds-inline-notification
+      v-if="globalErrorMessage"
+      v-shadow="true"
+      low-contrast="true"
+      hide-close-button="true"
+      open="true"
+      kind="error"
+      title="Your application could not be submitted"
+      :subtitle="globalErrorMessage"
+    >
+    </cds-inline-notification>
   </div>
 
+
+
   <div class="form-steps">
 
     <div v-if="currentTab == 0" class="form-steps-01">
@@ -400,14 +414,6 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
 
     <div v-if="currentTab == 3" class="form-steps-04">
 
-      <display-block-component
-      v-if="globalErrorMessage"
-      kind="error"
-      title="Your application could not be submitted"
-      :subtitle="globalErrorMessage"
-    >
-    </display-block-component>
-
 
       <div class="form-steps-section form-steps-section-04">
           <span class="heading-04" data-scroll="scroll-3">{{ progressData[3].title}}</span>

From c7f9b6183f34e673b5196b594ac2bfa921362c4f Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 10:33:01 -0700
Subject: [PATCH 069/313] fix: fixing notifications to be low contrast

---
 frontend/src/assets/styles/global.scss                   | 9 ++++-----
 .../pages/applyform/BusinessInformationWizardStep.vue    | 7 ++++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 097ff288c0..2ff6ae815c 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -65,11 +65,6 @@ cds-button::part(button) {
 cds-button span {
   width:11rem;
 }
-.notifications {
-  --cds-background-inverse: var(--light-theme-notifications-notification-info-background);
-  --cds-support-info-inverse: var(--light-theme-notifications-support-info-border);
-  --cds-text-inverse: var(--light-theme-text-text-primary);
-}
 .step-active {
   --cds-border-subtle: var(--light-theme-miscellaneous-interactive);
 }
@@ -83,6 +78,10 @@ cds-button span {
   text-underline-offset: 0.325rem;
 }
 
+cds-inline-notification::part(div), cds-inline-notification, .cds--inline-notification {
+  max-width: 100%;
+}
+
 * {
   font-family: "BCSans", "Noto Sans", Verdana, Arial, sans-serif;
 }
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index a72dafd80e..a5b4f45c99 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -234,9 +234,10 @@ watch([selectedOption], () => {
       @update:selected-value="autoCompleteResult = $event"
     />
     <cds-inline-loading status="active" v-if="showDetailsLoading">Loading client details...</cds-inline-loading>
-    <div class="notifications" v-if="(showAutoCompleteInfo && selectedOption === ClientTypeEnum.R) || showGoodStandingError || showDuplicatedError">
+    <div v-if="(showAutoCompleteInfo && selectedOption === ClientTypeEnum.R) || showGoodStandingError || showDuplicatedError">
       <cds-inline-notification
         v-if="showAutoCompleteInfo && selectedOption === ClientTypeEnum.R"
+        low-contrast="true"
         open="true"
         kind="info"
         hide-close-button="true"
@@ -264,6 +265,8 @@ watch([selectedOption], () => {
 
       <cds-inline-notification
         v-if="showGoodStandingError"
+        hide-close-button="true"
+        low-contrast="true"
         open="true"
         kind="error"
         title="Not in good standing with BC Registries"
@@ -284,6 +287,8 @@ watch([selectedOption], () => {
 
       <cds-inline-notification
         v-if="showDuplicatedError"
+        hide-close-button="true"
+        low-contrast="true"
         open="true"
         kind="error"
         title="Client already exists"

From 22f3ba4936e27b7a389e62dc54271cb32dfa1703 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 10:33:16 -0700
Subject: [PATCH 070/313] chore: adding a new directive

---
 frontend/src/helpers/CustomDirectives.ts | 25 ++++++++++++++++++++++++
 frontend/src/main.ts                     |  3 ++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/frontend/src/helpers/CustomDirectives.ts b/frontend/src/helpers/CustomDirectives.ts
index cb2f463b29..089707a38f 100644
--- a/frontend/src/helpers/CustomDirectives.ts
+++ b/frontend/src/helpers/CustomDirectives.ts
@@ -12,3 +12,28 @@ export const masking = (shadowSelector: string) => (el: any, binding: any) => {
     }
   }
 }
+
+const handleMutations = (mutationsList: any) => {
+  for (const mutation of mutationsList) {
+    if (mutation.type === 'childList') {
+      for (const node of mutation.addedNodes) {
+        if (node.nodeType === Node.ELEMENT_NODE) {
+          if (node.getAttribute('part')) return
+          node.setAttribute('part', node.tagName.toLowerCase())
+        }
+      }
+    }
+  }
+}
+
+export const shadowPart = {
+  mounted: (el: any) => {
+    if (el.shadowRoot) {
+      if (!el.getAttribute('parting')) {
+        const observer = new MutationObserver(handleMutations)
+        observer.observe(el.shadowRoot, { childList: true, subtree: true })
+        el.setAttribute('parting', 'true')
+      }
+    }
+  },
+}
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index d466ee5a69..94c363c02d 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -3,7 +3,7 @@ import VueTheMask from 'vue-the-mask'
 import App from '@/App.vue'
 import { router } from '@/routes'
 import { featureFlags, backendUrl } from '@/CoreConstants'
-import { masking } from '@/helpers/CustomDirectives'
+import { masking, shadowPart } from '@/helpers/CustomDirectives'
 import type { SessionProperties } from '@/dto/CommonTypesDto'
 import ForestClientUserSession from '@/helpers/ForestClientUserSession'
 
@@ -15,6 +15,7 @@ const app = createApp(App)
 app.use(router)
 app.use(VueTheMask)
 app.directive('masked', masking('.cds--text-input__field-wrapper input'))
+app.directive('shadow', shadowPart)
 app.config.globalProperties.$session = ForestClientUserSession
 app.config.globalProperties.$features = featureFlags
 app.config.globalProperties.$backend = backendUrl

From 78bebdb79b9c570626548feab28a3ff57ba9c2a1 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 10:58:06 -0700
Subject: [PATCH 071/313] fix: fixing data conversor test case

---
 frontend/tests/unittests/helpers/DataConversors.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/tests/unittests/helpers/DataConversors.spec.ts b/frontend/tests/unittests/helpers/DataConversors.spec.ts
index 9d1ad6379c..45ee566881 100644
--- a/frontend/tests/unittests/helpers/DataConversors.spec.ts
+++ b/frontend/tests/unittests/helpers/DataConversors.spec.ts
@@ -29,6 +29,6 @@ describe('DataConversors.ts', () => {
   it('throw an error when legalType is unknown', () => {
     expect(() => {
       retrieveClientType('Z')
-    }).toThrow('Unknown Legal Type.')
+    }).toThrow('Unknown Legal Type Z')
   })
 })

From d401d7284a910bde0046e8f8c9b0d9aac8ebdd78 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 10:58:19 -0700
Subject: [PATCH 072/313] fix: fixing main header tests

---
 frontend/tests/unittests/components/MainHeaderComponent.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/tests/unittests/components/MainHeaderComponent.spec.ts b/frontend/tests/unittests/components/MainHeaderComponent.spec.ts
index 895e898c52..72609884d6 100644
--- a/frontend/tests/unittests/components/MainHeaderComponent.spec.ts
+++ b/frontend/tests/unittests/components/MainHeaderComponent.spec.ts
@@ -20,7 +20,7 @@ describe('MainHeaderComponent.vue', () => {
     })
 
     expect(wrapper.html()).not.toBe('')
-    expect(wrapper.find('bx-btn').exists()).toBe(true)
+    expect(wrapper.find('cds-button').exists()).toBe(true)
     expect(wrapper.html()).toContain('Ministry of Forests')
   })
 

From 2bac58d59a0339b66fb20725ee492136599d9514 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 10:58:33 -0700
Subject: [PATCH 073/313] fix: fixing auto complete tests and blur event

---
 .../forms/AutoCompleteInputComponent.vue      |  1 +
 .../forms/AutoCompleteInputComponent.spec.ts  | 20 ++++---------------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index d042146a4f..5c514f3a39 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -111,6 +111,7 @@ revalidateBus.on(() => validateInput(inputValue.value))
       :invalid-text="error"
       @cds-combo-box-selected="selectAutocompleteItem"
       v-on:input="onTyping"
+      v-on:blur="(event:any) => validateInput(event.srcElement._filterInputValue)"
       :data-focus="id"
       :data-scroll="id"
       :data-id="'input-' + id"
diff --git a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
index 8a64949a9c..aaf2512b62 100644
--- a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
@@ -12,6 +12,7 @@ describe('Auto Complete Input Component', () => {
     { code: 'TC', name: 'TAMCADA' },
     { code: 'TD', name: 'TADANARA' }
   ]
+  const eventContent = (value:string) => {return { detail: { item: { 'data-id': value, getAttribute: (key:string) => value } }}}
 
   it('renders the input field with the provided id', () => {
     const wrapper = mount(AutoCompleteInputComponent, {
@@ -25,14 +26,7 @@ describe('Auto Complete Input Component', () => {
     })
 
     expect(wrapper.find(`#${id}`).exists()).toBe(true)
-    expect(wrapper.find(`#${id}list`).exists()).toBe(true)
 
-    const options = wrapper.findAll('.autocomplete-items-cell')
-
-    expect(options.length).toBe(contents.length)
-    for (let index = 0; index < contents.length; index++) {
-      expect(options[index].text()).toContain(contents[index].name)
-    }
   })
 
   it('emits the "update" event with the updated value', async () => {
@@ -102,9 +96,7 @@ describe('Auto Complete Input Component', () => {
       }
     })
 
-    const options = wrapper.findAll('.autocomplete-items-cell')
-    const firstOption = options[0]
-    await firstOption.trigger('click')
+    await wrapper.find(`#${id}`).trigger('cds-combo-box-selected',eventContent('TA'));
     expect(wrapper.emitted('update:selected-value')).toBeTruthy()
     expect(wrapper.emitted('update:selected-value')![0][0]).toEqual(contents[0])
   })
@@ -123,9 +115,7 @@ describe('Auto Complete Input Component', () => {
         }
       })
 
-      const options = wrapper.findAll('.autocomplete-items-cell')
-      const firstOption = options[0]
-      await firstOption.trigger('click')
+      await wrapper.find(`#${id}`).trigger('cds-combo-box-selected',eventContent(contents[0].code));
 
       // Now an option is effectively selected
       expect(wrapper.emitted('update:selected-value')).toBeTruthy()
@@ -143,9 +133,7 @@ describe('Auto Complete Input Component', () => {
     })
 
     it('emits the "update:selected-value" with the newly selected value', async () => {
-      const options = wrapper.findAll('.autocomplete-items-cell')
-      const secondOption = options[1]
-      await secondOption.trigger('click')
+      await wrapper.find(`#${id}`).trigger('cds-combo-box-selected',eventContent(contents[1].code));
 
       expect(wrapper.emitted('update:selected-value')).toHaveLength(2)
       expect(wrapper.emitted('update:selected-value')![1][0]).toEqual(

From 16cf5bca299481dc1e99ff6d20fc028e3122e26d Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 11:10:49 -0700
Subject: [PATCH 074/313] fix: fixing text input lazy loading

---
 frontend/src/components/forms/TextInputComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index 658838116e..af18fc21aa 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -95,7 +95,7 @@ revalidateBus.on(() => {
 
   <div v-if="!enabled" class="grouping-04">
     <div :data-scroll="id" class="grouping-04-label"><span :for="id" class="label-01">{{ label }}</span></div>
-    <span class="text-01">{{ selectedValue }}</span>
+    <span class="text-01">{{ modelValue }}</span>
   </div>
 
 </template>

From 3bdb1258f104cd364b4f00086fcd73a7342d5ec6 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 11:24:03 -0700
Subject: [PATCH 075/313] fix: fixing dropdown tests

---
 .../forms/DropdownInputComponent.vue          |  3 +-
 .../forms/DropdownInputComponent.spec.ts      | 39 ++++++++-----------
 2 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index d8148e0f97..b00f62ddb6 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -60,7 +60,6 @@ const emitValueChange = (newValue: string): void => {
 }
 //Watch for changes on the input
 watch([selectedValue], () => {
-  console.log('watch',selectedValue.value)
   validateInput(selectedValue.value)
   emitValueChange(selectedValue.value)
 })
@@ -79,6 +78,8 @@ const validateInput = (newValue: any) => {
   }
 }
 
+watch(inputList,() => (selectedValue.value = props.initialValue))
+
 revalidateBus.on(() => validateInput(selectedValue.value))
 </script>
 
diff --git a/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts b/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
index 13bb35c914..64060ddd22 100644
--- a/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
@@ -8,6 +8,9 @@ describe('DropdownInputComponent', () => {
     (value: any) => (value === 'A' ? 'A is not supported' : '')
   ]
 
+  const eventContent = (value:string) => {return { detail: { item: { 'data-id': value, getAttribute: (key:string) => value } }}}
+
+
   it('should render', () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {
@@ -23,9 +26,9 @@ describe('DropdownInputComponent', () => {
       }
     })
 
-    expect(wrapper.find('bx-dropdown-item[value="A"]').exists()).toBe(true)
-    expect(wrapper.find('bx-dropdown-item[value="B"]').exists()).toBe(true)
-    expect(wrapper.find('bx-dropdown-item[value="C"]').exists()).toBe(false)
+    expect(wrapper.find('cds-combo-box-item[data-value="Value A"]').exists()).toBe(true)
+    expect(wrapper.find('cds-combo-box-item[data-value="Value B"]').exists()).toBe(true)
+    expect(wrapper.find('cds-combo-box-item[data-value="Value C"]').exists()).toBe(false)
   })
 
   it('should emit event when changing selection', async () => {
@@ -43,11 +46,9 @@ describe('DropdownInputComponent', () => {
       }
     })
 
-    const dropdown = wrapper.find('bx-dropdown')
+    const dropdown = wrapper.find('cds-combo-box')
 
-    await dropdown.trigger('bx-dropdown-beingselected', {
-      detail: { item: { __value: 'A' } }
-    })
+    await dropdown.trigger('cds-combo-box-selected', eventContent('A'))
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
     expect(wrapper.emitted('update:modelValue')![0][0]).toBe('A')
@@ -77,11 +78,9 @@ describe('DropdownInputComponent', () => {
     expect(wrapper.emitted('empty')).toBeTruthy()
     expect(wrapper.emitted('empty')![0][0]).toBe(true)
 
-    const dropdown = wrapper.find('bx-dropdown')
+    const dropdown = wrapper.find('cds-combo-box')
 
-    await dropdown.trigger('bx-dropdown-beingselected', {
-      detail: { item: { __value: 'A' } }
-    })
+    await dropdown.trigger('cds-combo-box-selected', eventContent('A'))
 
     expect(wrapper.emitted('empty')).toBeTruthy()
     expect(wrapper.emitted('empty')![1][0]).toBe(false)
@@ -102,11 +101,9 @@ describe('DropdownInputComponent', () => {
       }
     })
 
-    const dropdown = wrapper.find('bx-dropdown')
+    const dropdown = wrapper.find('cds-combo-box')
 
-    await dropdown.trigger('bx-dropdown-beingselected', {
-      detail: { item: { __value: 'A' } }
-    })
+    await dropdown.trigger('cds-combo-box-selected', eventContent('A'))
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
     expect(wrapper.emitted('update:modelValue')![0][0]).toBe('A')
@@ -136,11 +133,9 @@ describe('DropdownInputComponent', () => {
       }
     })
 
-    const dropdown = wrapper.find('bx-dropdown')
+    const dropdown = wrapper.find('cds-combo-box')
 
-    await dropdown.trigger('bx-dropdown-beingselected', {
-      detail: { item: { __value: 'B' } }
-    })
+    await dropdown.trigger('cds-combo-box-selected', eventContent('B'))
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
     expect(wrapper.emitted('update:modelValue')![0][0]).toBe('B')
@@ -170,11 +165,9 @@ describe('DropdownInputComponent', () => {
       }
     })
 
-    const dropdown = wrapper.find('bx-dropdown')
+    const dropdown = wrapper.find('cds-combo-box')
 
-    await dropdown.trigger('bx-dropdown-beingselected', {
-      detail: { item: { __value: 'A' } }
-    })
+    await dropdown.trigger('cds-combo-box-selected', eventContent('A'))
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
     expect(wrapper.emitted('update:modelValue')![0][0]).toBe('A')

From 59129cbf91a65524e21c20a079c3bf6562831898 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 12:14:52 -0700
Subject: [PATCH 076/313] fix: fixing autocomplete for address

---
 .../src/components/forms/AutoCompleteInputComponent.vue   | 2 ++
 frontend/src/components/forms/TextInputComponent.vue      | 2 ++
 .../src/components/grouping/AddressGroupComponent.vue     | 8 ++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index 5c514f3a39..d55162e1a1 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -96,6 +96,8 @@ const onTyping = (event: any) => {
 }
 
 revalidateBus.on(() => validateInput(inputValue.value))
+
+watch(() => props.modelValue,() => inputValue.value = props.modelValue)
 </script>
 
 <template>
diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index af18fc21aa..be831e2f5d 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -70,6 +70,8 @@ const validateInput = (newValue: string) => {
 revalidateBus.on(() => {
   validateInput(selectedValue.value)
 })
+
+watch(() => props.modelValue,() => selectedValue.value = props.modelValue)
 </script>
 
 <template>
diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 073901a5db..2f2eae8c5f 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -90,6 +90,8 @@ const resetProvinceOnChange = (receivedCountry: any) => {
     selectedValue.province = { value: '', text: '' }
 }
 
+const addressControl = ref(false)
+
 //Validations
 const validation = reactive<Record<string, boolean>>({
   locationName: props.id == 0,
@@ -181,6 +183,7 @@ const autoCompleteResult = ref<BusinessSearchResult|undefined>({} as BusinessSea
 const detailsData = ref<Address | null>(null)
 
 watch([autoCompleteResult], () => {
+  addressControl.value = false
   if (autoCompleteResult.value) {
     showDetailsLoading.value = true
     const { error, loading: detailsLoading } = useFetchTo(
@@ -212,6 +215,7 @@ watch([detailsData], () => {
     selectedValue.postalCode = detailsData.value.postalCode.replace(/\s/g, '')
     if(!selectedValue.postalCode) postalCodeShowHint.value = true
     else postalCodeShowHint.value = false
+    addressControl.value = true
   }
 })
 
@@ -266,7 +270,7 @@ onMounted(() =>{
       placeholder=""
       tip="Start typing to search for your street address or PO box"
       v-model="selectedValue.streetAddress"
-      :contents="content"
+      :contents="addressControl ? [] : content"
       :validations="[
         ...getValidations('location.adresses.*.streetAddress'),
         submissionValidation(`location.adresses[${id}].streetAddress`)
@@ -327,7 +331,7 @@ onMounted(() =>{
     :enabled="true"
     :error-message="addressError"
     v-model="modelValue.postalCode"
-    :mask="postalCodeMask"
+    :masked="postalCodeMask"
     :validations="postalCodeValidators"
     @error="validation.postalCode = !$event"
     @empty="validation.postalCode = !$event"

From 74639322fe4ba4787c2a7aaaa5de24883c5e3617 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 1 Sep 2023 12:23:15 -0700
Subject: [PATCH 077/313] fix: fixing radio test

---
 .../forms/RadioInputComponent.spec.ts         | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts b/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts
index 022615e7ee..a817c72ded 100644
--- a/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts
@@ -23,10 +23,10 @@ describe('Radio Input Component', () => {
         initialValue: ''
       }
     })
-
+console.log(wrapper.html())
     for (const value of values) {
       expect(wrapper.html()).toContain(
-        `<bx-radio-button label-text="${value.text}" value="${value.value}"></bx-radio-button>`
+        `<cds-radio-button label-text="${value.text}"></cds-radio-button>`
       )
     }
   })
@@ -43,8 +43,8 @@ describe('Radio Input Component', () => {
     })
 
     await wrapper
-      .find(`[name=${id}rb]`)
-      .trigger('bx-radio-button-group-changed', {
+      .find(`[id=${id}rb]`)
+      .trigger('cds-radio-button-group-changed', {
         detail: { value: 'A' }
       })
 
@@ -67,8 +67,8 @@ describe('Radio Input Component', () => {
     })
 
     await wrapper
-      .find(`[name=${id}rb]`)
-      .trigger('bx-radio-button-group-changed', {
+      .find(`[id=${id}rb]`)
+      .trigger('cds-radio-button-group-changed', {
         detail: { value: 'B' }
       })
 
@@ -90,8 +90,8 @@ describe('Radio Input Component', () => {
     })
 
     await wrapper
-      .find(`[name=${id}rb]`)
-      .trigger('bx-radio-button-group-changed', {
+      .find(`[id=${id}rb]`)
+      .trigger('cds-radio-button-group-changed', {
         detail: { value: 'A' }
       })
 
@@ -107,8 +107,8 @@ describe('Radio Input Component', () => {
     expect(updateEvent[0]).toStrictEqual(['A'])
 
     await wrapper
-      .find(`[name=${id}rb]`)
-      .trigger('bx-radio-button-group-changed', {
+      .find(`[id=${id}rb]`)
+      .trigger('cds-radio-button-group-changed', {
         detail: { value: 'B' }
       })
 

From 00de5dcb39cf11137335a4ff354f3c152e414aa5 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 5 Sep 2023 05:32:45 -0700
Subject: [PATCH 078/313] test: fixing tests

---
 .../forms/MultiselectInputComponent.vue       | 10 +--
 .../forms/MultiselectInputComponent.spec.ts   | 77 +++++++------------
 .../forms/RadioInputComponent.spec.ts         |  1 -
 .../forms/TextInputComponent.spec.ts          |  8 +-
 4 files changed, 36 insertions(+), 60 deletions(-)

diff --git a/frontend/src/components/forms/MultiselectInputComponent.vue b/frontend/src/components/forms/MultiselectInputComponent.vue
index 63d19e4722..a26fa27df0 100644
--- a/frontend/src/components/forms/MultiselectInputComponent.vue
+++ b/frontend/src/components/forms/MultiselectInputComponent.vue
@@ -95,13 +95,13 @@ const addFromSelection = (itemCode: string) => {
     items.value.push(reference.name)
     selectedValue.value = items.value.join(',')
   }
-  emitChange()
 }
 
-const selectItems = (event:any) =>{
-  selectedValue.value = event.target.value
-  items.value = event.target.value.split(',').filter((value:string) => value)
-  emitChange()
+const selectItems = (event:any) => {
+  // Why this undefined data check is here you might ask? Well, it's because I can't emit the event with value on target
+  const contentValue = event?.data !== undefined ? event?.data : event.target.value
+  selectedValue.value = contentValue
+  items.value = contentValue.split(',').filter((value:string) => value)
 }
 
 watch([items], () => emitChange())
diff --git a/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts b/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
index 731c32fa88..aee0495ddb 100644
--- a/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
@@ -9,6 +9,9 @@ describe('MultiselectInputComponent', () => {
       value === 'A' || value === 'Value A' ? 'A is not supported' : ''
   ]
 
+  const eventContent = (value:string) => {return { data:  value }}
+
+
   it('should render', () => {
     const wrapper = mount(MultiselectInputComponent, {
       props: {
@@ -24,9 +27,9 @@ describe('MultiselectInputComponent', () => {
       }
     })
 
-    expect(wrapper.find('bx-dropdown-item[value="A"]').exists()).toBe(true)
-    expect(wrapper.find('bx-dropdown-item[value="B"]').exists()).toBe(true)
-    expect(wrapper.find('bx-dropdown-item[value="C"]').exists()).toBe(false)
+    expect(wrapper.find('cds-multi-select-item[data-value="Value A"]').exists()).toBe(true)
+    expect(wrapper.find('cds-multi-select-item[data-value="Value B"]').exists()).toBe(true)
+    expect(wrapper.find('cds-multi-select-item[data-value="Value C"]').exists()).toBe(false)
   })
 
   it('should emit event when changing selection', async () => {
@@ -44,18 +47,14 @@ describe('MultiselectInputComponent', () => {
       }
     })
 
-    const dropdown = wrapper.find('bx-dropdown')
+    const dropdown = wrapper.find('cds-multi-select')
 
-    await dropdown.trigger('bx-dropdown-selected', {
-      detail: { item: { __value: 'A' } }
-    })
+    await dropdown.trigger('cds-multi-select-selected',eventContent('Value A'))
 
     await wrapper.vm.$nextTick()
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual([
-      'Value A'
-    ])
+    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual(['Value A'])
 
     expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
     expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual([
@@ -84,11 +83,9 @@ describe('MultiselectInputComponent', () => {
     expect(wrapper.emitted('empty')).toBeTruthy()
     expect(wrapper.emitted('empty')![0][0]).toBe(true)
 
-    const dropdown = wrapper.find('bx-dropdown')
+    const dropdown = wrapper.find('cds-multi-select')
 
-    await dropdown.trigger('bx-dropdown-selected', {
-      detail: { item: { __value: 'A' } }
-    })
+    await dropdown.trigger('cds-multi-select-selected',eventContent('Value A'))
 
     expect(wrapper.emitted('empty')).toBeTruthy()
     expect(wrapper.emitted('empty')![1][0]).toBe(false)
@@ -109,19 +106,12 @@ describe('MultiselectInputComponent', () => {
       }
     })
 
-    const dropdown = wrapper.find('bx-dropdown')
+    const dropdown = wrapper.find('cds-multi-select')
 
-    await dropdown.trigger('bx-dropdown-selected', {
-      detail: { item: { __value: 'A' } }
-    })
-    await dropdown.trigger('bx-dropdown-beingselected', {
-      detail: { item: { __value: 'A' } }
-    })
+    await dropdown.trigger('cds-multi-select-selected',eventContent('Value A'))
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual([
-      'Value A'
-    ])
+    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual(['Value A'])
 
     expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
     expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual([
@@ -150,16 +140,12 @@ describe('MultiselectInputComponent', () => {
       }
     })
 
-    const dropdown = wrapper.find('bx-dropdown')
+    const dropdown = wrapper.find('cds-multi-select')
 
-    await dropdown.trigger('bx-dropdown-selected', {
-      detail: { item: { __value: 'B' } }
-    })
+    await dropdown.trigger('cds-multi-select-selected', eventContent('Value B'))
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual([
-      'Value B'
-    ])
+    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual(['Value B'])
 
     expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
     expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual([
@@ -185,14 +171,12 @@ describe('MultiselectInputComponent', () => {
         ],
         initialValue: '',
         validations: [],
-        selectedValues: ['A']
+        selectedValues: ['Value A']
       }
     })
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual([
-      'Value A'
-    ])
+    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual(['Value A'])
 
     expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
     expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual([
@@ -218,30 +202,23 @@ describe('MultiselectInputComponent', () => {
       }
     })
 
-    const dropdown = wrapper.find('bx-dropdown')
+    const dropdown = wrapper.find('#test')
 
-    await dropdown.trigger('bx-dropdown-selected', {
-      detail: { item: { __value: 'A' } }
-    })
+    await dropdown.trigger('cds-multi-select-selected',eventContent('Value A'))
 
+    await wrapper.vm.$nextTick()
     await wrapper.vm.$nextTick()
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual([
-      'Value A'
-    ])
+    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual(['Value A'])
 
     expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual([
-      {
-        code: 'A',
-        name: 'Value A'
-      }
-    ])
+    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual([ { code: 'A', name: 'Value A' } ])
 
-    const close = wrapper.find('#close_test_0')
+    await dropdown.trigger('cds-multi-select-selected',eventContent(''))
 
-    await close.trigger('click')
+    await wrapper.vm.$nextTick()
+    await wrapper.vm.$nextTick()
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
     expect(wrapper.emitted('update:modelValue')![1][0]).toStrictEqual([])
diff --git a/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts b/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts
index a817c72ded..f7d4ca37d7 100644
--- a/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts
@@ -23,7 +23,6 @@ describe('Radio Input Component', () => {
         initialValue: ''
       }
     })
-console.log(wrapper.html())
     for (const value of values) {
       expect(wrapper.html()).toContain(
         `<cds-radio-button label-text="${value.text}"></cds-radio-button>`
diff --git a/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts b/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
index a53190032e..5c419763b8 100644
--- a/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
@@ -17,7 +17,7 @@ describe('Text Input Component', () => {
         enabled: true
       },
       directives: {
-        mask: () => {}
+        masked: () => {}
       }
     })
 
@@ -35,7 +35,7 @@ describe('Text Input Component', () => {
         enabled: true
       },
       directives: {
-        mask: () => {}
+        masked: () => {}
       }
     })
 
@@ -58,7 +58,7 @@ describe('Text Input Component', () => {
         enabled: true
       },
       directives: {
-        mask: () => {}
+        masked: () => {}
       }
     })
 
@@ -80,7 +80,7 @@ describe('Text Input Component', () => {
         enabled: true
       },
       directives: {
-        mask: () => {}
+        masked: () => {}
       }
     })
 

From 48eebac6cbc432d20147e0bd17d6f974fdd28a47 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 5 Sep 2023 07:04:25 -0700
Subject: [PATCH 079/313] text: fixing component tests

---
 .../grouping/AddressGroupComponent.cy.ts      |  82 +++----
 .../grouping/ContactGroupComponent.cy.ts      | 201 +++++++-----------
 2 files changed, 113 insertions(+), 170 deletions(-)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index d1e5227f53..0d969b3358 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -1,10 +1,7 @@
 import AddressGroupComponent from '@/components/grouping/AddressGroupComponent.vue'
 
 describe('<AddressGroupComponent />', () => {
-  const dummyValidation = (): ((
-    key: string,
-    field: string
-  ) => (value: string) => string) => {
+  const dummyValidation = (): ((key: string, field: string) => (value: string) => string) => {
     return (key: string, fieldId: string) => (value: string) => {
       if (value.includes('fault')) return 'Error'
       return ''
@@ -12,17 +9,13 @@ describe('<AddressGroupComponent />', () => {
   }
 
   beforeEach(() => {
-    cy.intercept(
-      'GET',
-      '/api/clients/activeCountryCodes/CA?page=0&size=250',
-      { fixture: 'provinces.json' }
-    ).as('getProvinces')
-
-    cy.intercept(
-      'GET',
-      '/api/clients/activeCountryCodes/US?page=0&size=250',
-      { fixture: 'states.json' }
-    ).as('getStates')
+    cy.intercept('GET', '/api/clients/activeCountryCodes/CA?page=0&size=250', {
+      fixture: 'provinces.json',
+    }).as('getProvinces')
+
+    cy.intercept('GET', '/api/clients/activeCountryCodes/US?page=0&size=250', {
+      fixture: 'states.json',
+    }).as('getStates')
 
     cy.fixture('address.json').as('addressFixture')
     cy.fixture('countries.json').as('countriesFixture')
@@ -36,48 +29,48 @@ describe('<AddressGroupComponent />', () => {
             id: 0,
             modelValue: address,
             countryList: countries,
-            validations: []
-          }
+            validations: [],
+          },
         })
       })
     })
 
     cy.wait('@getProvinces')
 
-    cy.get('#country_0').should('be.visible').and('have.value', 'CA')
+    cy.get('#country_0').should('be.visible').and('have.value', 'Canada')
 
-    cy.get('bx-input')
+    cy.get('#addr_0')
       .should('be.visible')
       .and('have.id', 'addr_0')
       .and('have.value', '2975 Jutland Rd')
 
     cy.get('#city_0').should('be.visible').and('have.value', 'Victoria')
 
-    cy.get('#province_0').should('be.visible').and('have.value', 'BC')
+    cy.get('#province_0').should('be.visible').and('have.value', 'British Columbia')
 
     cy.get('#postalCode_0').should('be.visible').and('have.value', 'V8T5J9')
   })
 
   it('should render the component with validation', () => {
-    cy.get('@addressFixture').then((address:any) => {
+    cy.get('@addressFixture').then((address: any) => {
       cy.get('@countriesFixture').then((countries) => {
         cy.mount(AddressGroupComponent, {
           props: {
             id: 0,
             modelValue: {
               ...address,
-              streetAddress: address.streetAddress + ' fault'
+              streetAddress: address.streetAddress + ' fault',
             },
             countryList: countries,
-            validations: [dummyValidation()]
-          }
+            validations: [dummyValidation()],
+          },
         })
       })
     })
 
     cy.wait('@getProvinces')
 
-    cy.get('@addressFixture').then((address:any) => {
+    cy.get('@addressFixture').then((address: any) => {
       cy.get('#addr_0')
         .should('be.visible')
         .and('have.value', address.streetAddress + ' fault')
@@ -85,10 +78,10 @@ describe('<AddressGroupComponent />', () => {
 
     cy.get('#postalCode_0')
       .shadow()
-      .find('.bx--form-requirement')
+      .find('.cds--form-requirement')
       .should('be.visible')
       .find('slot')
-      .and('have.text', ' Error ')
+      .and('include.text', 'Error')
   })
 
   it('should render the component and set focus on street address input', () => {
@@ -99,17 +92,15 @@ describe('<AddressGroupComponent />', () => {
             id: 0,
             modelValue: address,
             countryList: countries,
-            validations: []
-          }
+            validations: [],
+          },
         })
       })
     })
 
     cy.wait('@getProvinces')
 
-    cy.get('#addr_0')
-      .should('be.visible')
-      .and('have.focus')
+    cy.get('#addr_0').should('be.visible').and('have.focus')
   })
 
   it('should render the component and show the address name if id is bigger than 0', () => {
@@ -120,18 +111,15 @@ describe('<AddressGroupComponent />', () => {
             id: 1,
             modelValue: address,
             countryList: countries,
-            validations: []
-          }
+            validations: [],
+          },
         })
       })
     })
 
     cy.wait('@getProvinces')
 
-    cy.get('#name_1')
-      .should('be.visible')
-      .and('have.value', 'Mailing address')
-      .and('have.focus')
+    cy.get('#name_1').should('be.visible').and('have.value', 'Mailing address').and('have.focus')
   })
 
   it('should render the component and reset province when country changes', () => {
@@ -142,8 +130,8 @@ describe('<AddressGroupComponent />', () => {
             id: 0,
             modelValue: address,
             countryList: countries,
-            validations: []
-          }
+            validations: [],
+          },
         })
       })
     })
@@ -154,15 +142,15 @@ describe('<AddressGroupComponent />', () => {
       .should('be.visible')
       .shadow()
       .find('label')
-      .and('have.text', '  Postal code  ')
+      .and('include.text', 'Postal code')
 
     cy.get('#country_0')
       .should('be.visible')
-      .and('have.value', 'CA')
+      .and('have.value', 'Canada')
       .click()
-      .find('[data-item="US"]')
+      .find('cds-combo-box-item[data-id="US"]')
       .click()
-      .and('have.value', 'US')
+      .and('have.value', 'United States of America')
 
     cy.wait('@getStates')
 
@@ -170,14 +158,14 @@ describe('<AddressGroupComponent />', () => {
       .should('be.visible')
       .and('have.value', '')
       .click()
-      .find('[data-item="IL"]')
+      .find('cds-combo-box-item[data-id="IL"]')
       .click()
-      .and('have.value', 'IL')
+      .and('have.value', 'Illinois')
 
     cy.get('#postalCode_0')
       .should('be.visible')
       .shadow()
       .find('label')
-      .and('have.text', '  Zip code  ')
+      .and('include.text', 'Zip code')
   })
 })
diff --git a/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts b/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts
index dbfa642aa3..96f0252c83 100644
--- a/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts
@@ -2,10 +2,7 @@ import ContactGroupComponent from '@/components/grouping/ContactGroupComponent.v
 import type { Contact } from '@/dto/ApplyClientNumberDto'
 
 describe('<ContactGroupComponent />', () => {
-  const dummyValidation = (): ((
-    key: string,
-    field: string
-  ) => (value: string) => string) => {
+  const dummyValidation = (): ((key: string, field: string) => (value: string) => string) => {
     return (key: string, fieldId: string) => (value: string) => {
       if (value.includes('fault')) return 'Error'
       return ''
@@ -19,7 +16,7 @@ describe('<ContactGroupComponent />', () => {
   })
 
   it('should render the component', () => {
-    cy.get('@contactFixture').then((contact:Contact) => {
+    cy.get('@contactFixture').then((contact: Contact) => {
       cy.get('@rolesFixture').then((roles) => {
         cy.get('@addressesFixture').then((addresses) => {
           cy.mount(ContactGroupComponent, {
@@ -29,35 +26,26 @@ describe('<ContactGroupComponent />', () => {
               enabled: true,
               roleList: roles,
               addressList: addresses,
-              validations: []
-            }
+              validations: [],
+            },
           })
         })
       })
     })
 
-    cy.get('@contactFixture')
-      .then((contact:Contact) => {
-        cy.get('#firstName_0')
-          .should('be.visible')
-          .and('have.value', contact.firstName)
+    cy.get('@contactFixture').then((contact: Contact) => {
+      cy.get('#firstName_0').should('be.visible').and('have.value', contact.firstName)
 
-        cy.get('#lastName_0')
-          .should('be.visible')
-          .and('have.value', contact.lastName)
+      cy.get('#lastName_0').should('be.visible').and('have.value', contact.lastName)
 
-        cy.get('#email_0')
-          .should('be.visible')
-          .and('have.value', '')
+      cy.get('#email_0').should('be.visible').and('have.value', '')
 
-        cy.get('#phoneNumber_0')
-          .should('be.visible')
-          .and('have.value', '')
-      })
+      cy.get('#phoneNumber_0').should('be.visible').and('have.value', '')
+    })
   })
 
   it('should render the component with validation', () => {
-    cy.get('@contactFixture').then((contact:Contact) => {
+    cy.get('@contactFixture').then((contact: Contact) => {
       cy.get('@rolesFixture').then((roles) => {
         cy.get('@addressesFixture').then((addresses) => {
           cy.mount(ContactGroupComponent, {
@@ -65,77 +53,47 @@ describe('<ContactGroupComponent />', () => {
               id: 0,
               modelValue: {
                 ...contact,
-                firstName: contact.firstName + ' fault'
+                firstName: contact.firstName + ' fault',
               },
               enabled: true,
               roleList: roles,
               addressList: addresses,
-              validations: [dummyValidation()]
-            }
+              validations: [dummyValidation()],
+            },
           })
         })
       })
     })
 
-    cy.get('@contactFixture')
-      .then((contact:Contact) => {
-        cy.get('#firstName_0')
-          .should('be.visible')
-          .and('have.value', contact.firstName + ' fault')
+    cy.get('@contactFixture').then((contact: Contact) => {
+      cy.get('#firstName_0')
+        .should('be.visible')
+        .and('have.value', contact.firstName + ' fault')
 
-        cy.get('#firstName_0')
-          .shadow()
-          .find('.bx--form-requirement')
-          .should('be.visible')
-          .find('slot')
-          .and('have.text', ' Error ')
+      cy.get('#firstName_0')
+        .shadow()
+        .find('.cds--form-requirement')
+        .should('be.visible')
+        .find('slot')
+        .and('include.text', 'Error')
 
-        cy.get('#lastName_0')
-          .should('be.visible')
-          .and('have.value', contact.lastName)
+      cy.get('#lastName_0').should('be.visible').and('have.value', contact.lastName)
 
-        cy.get('#lastName_0')
-          .shadow()
-          .find('.bx--form-requirement')
-          .should('be.visible')
-          .find('slot')
-          .and('have.text', ' Error ')
+      cy.get('#lastName_0')
+        .shadow()
+        .find('.cds--form-requirement')
+        .should('be.visible')
+        .find('slot')
+        .and('include.text', 'Error')
 
-        cy.get('#email_0')
-          .should('be.visible')
-          .and('have.value', '')
+      cy.get('#email_0').should('be.visible').and('have.value', '')
 
-        cy.get('#phoneNumber_0')
-          .should('be.visible')
-          .and('have.value', '')
-      })
-  })
-
-  it('it should render the component and set focus on address input', () => {
-    cy.get('@contactFixture').then((contact:Contact) => {
-      cy.get('@rolesFixture').then((roles) => {
-        cy.get('@addressesFixture').then((addresses) => {
-          cy.mount(ContactGroupComponent, {
-            props: {
-              id: 0,
-              modelValue: contact,
-              enabled: true,
-              roleList: roles,
-              addressList: addresses,
-              validations: []
-            }
-          })
-        })
-      })
+      cy.get('#phoneNumber_0').should('be.visible').and('have.value', '')
     })
-
-    cy.get('#address_0')
-      .should('be.visible')
-      .and('have.focus')
   })
 
-  it('should render the component and select first address and show it as tag', () => {
-    cy.get('@contactFixture').then((contact:Contact) => {
+  it('should render the component and select first address and show on component', () => {
+    cy.get('@contactFixture').then((contact: Contact) => {
       cy.get('@rolesFixture').then((roles) => {
         cy.get('@addressesFixture').then((addresses) => {
           cy.mount(ContactGroupComponent, {
@@ -143,34 +101,32 @@ describe('<ContactGroupComponent />', () => {
               id: 0,
               modelValue: {
                 ...contact,
-                addresses: [addresses[0], addresses[1]]
+                addresses: [addresses[0], addresses[1]],
               },
               enabled: true,
               roleList: roles,
               addressList: addresses,
-              validations: []
-            }
+              validations: [],
+            },
           })
         })
       })
     })
 
-    cy.get('#address_0')
-      .should('be.visible')
-      .and('have.value', '')
+    cy.get('#addressname_0').should('be.visible').and('have.value', '')
 
-    cy.get('#address_0')
+    cy.get('#addressname_0')
       .click()
-      .find('[data-item="00"]')
+      .find('cds-multi-select-item[data-value="Mailing address"]')
+      .should('exist')
+      .and('be.visible')
       .click()
 
-    cy.get('bx-tag#tag_address_0_0.bx-tag')
-      .should('be.visible')
-      .and('have.text', 'Mailing address ')
+    cy.get('#addressname_0').should('be.visible').and('have.value', 'Mailing address')
   })
 
-  it('should render the component and select both addresses and show it as tag', () => {
-    cy.get('@contactFixture').then((contact:Contact) => {
+  it('should render the component and select both addresses and show it as value', () => {
+    cy.get('@contactFixture').then((contact: Contact) => {
       cy.get('@rolesFixture').then((roles) => {
         cy.get('@addressesFixture').then((addresses) => {
           cy.mount(ContactGroupComponent, {
@@ -178,43 +134,41 @@ describe('<ContactGroupComponent />', () => {
               id: 0,
               modelValue: {
                 ...contact,
-                addresses: [addresses[0], addresses[1]]
+                addresses: [addresses[0], addresses[1]],
               },
               enabled: true,
               roleList: roles,
               addressList: addresses,
-              validations: []
-            }
+              validations: [],
+            },
           })
         })
       })
     })
 
-    cy.get('#address_0')
-      .should('be.visible')
-      .and('have.value', '')
+    cy.get('#addressname_0').should('be.visible').and('have.value', '')
 
-    cy.get('#address_0')
+    cy.get('#addressname_0')
       .click()
-      .find('[data-item="00"]')
+      .find('cds-multi-select-item[data-value="Mailing address"]')
+      .should('exist')
+      .and('be.visible')
       .click()
 
-    cy.get('#address_0')
+    cy.get('#addressname_0')
       .click()
-      .find('[data-item="01"]')
+      .find('cds-multi-select-item[data-value="Jutland office"]')
+      .should('exist')
+      .and('be.visible')
       .click()
 
-    cy.get('bx-tag#tag_address_0_0.bx-tag')
-      .should('be.visible')
-      .and('have.text', 'Mailing address ')
-
-    cy.get('bx-tag#tag_address_0_1.bx-tag')
+    cy.get('#addressname_0')
       .should('be.visible')
-      .and('have.text', 'Jutland office ')
+      .and('have.value', 'Mailing address,Jutland office')
   })
 
-  it('should render the component and select first address and show it as tag then remove it', () => {
-    cy.get('@contactFixture').then((contact:Contact) => {
+  it('should render the component and select first address and show it then remove it', () => {
+    cy.get('@contactFixture').then((contact: Contact) => {
       cy.get('@rolesFixture').then((roles) => {
         cy.get('@addressesFixture').then((addresses) => {
           cy.mount(ContactGroupComponent, {
@@ -222,35 +176,36 @@ describe('<ContactGroupComponent />', () => {
               id: 0,
               modelValue: {
                 ...contact,
-                addresses: [addresses[0], addresses[1]]
+                addresses: [addresses[0], addresses[1]],
               },
               enabled: true,
               roleList: roles,
               addressList: addresses,
-              validations: []
-            }
+              validations: [],
+            },
           })
         })
       })
     })
 
-    cy.get('#address_0')
-      .should('be.visible')
-      .and('have.value', '')
+    cy.get('#addressname_0').should('be.visible').and('have.value', '')
 
-    cy.get('#address_0')
+    cy.get('#addressname_0')
       .click()
-      .find('[data-item="00"]')
+      .find('cds-multi-select-item[data-value="Mailing address"]')
+      .should('exist')
+      .and('be.visible')
       .click()
 
-    cy.get('bx-tag#tag_address_0_0.bx-tag')
-      .should('be.visible')
-      .and('have.text', 'Mailing address ')
-      .find('svg')
+    cy.get('#addressname_0').should('be.visible').and('have.value', 'Mailing address')
+
+    cy.get('#addressname_0')
+      .click()
+      .find('cds-multi-select-item[data-value="Mailing address"]')
+      .should('exist')
+      .and('be.visible')
       .click()
 
-    cy.get('div.bx-tag-box')
-      .should('not.be.visible')
-      .and('have.text', '')
+    cy.get('#addressname_0').should('be.visible').and('have.value', '')
   })
 })

From 5927497c5ecfce87d5b2104f6e95416d2eeba5d8 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 5 Sep 2023 07:05:24 -0700
Subject: [PATCH 080/313] test: fixing e2e tests

---
 frontend/cypress/e2e/FormGeneral.cy.ts | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/frontend/cypress/e2e/FormGeneral.cy.ts b/frontend/cypress/e2e/FormGeneral.cy.ts
index dc96306681..699e0ce5cd 100644
--- a/frontend/cypress/e2e/FormGeneral.cy.ts
+++ b/frontend/cypress/e2e/FormGeneral.cy.ts
@@ -2,22 +2,19 @@
 describe('General Form', () => {
   beforeEach(() => {
     cy.intercept('http://localhost:8080/api/clients/name/*', {
-      fixture: 'business.json'
+      fixture: 'business.json',
     }).as('searchCompany')
 
     cy.intercept('GET', '/api/clients/XX9016140', {
-      fixture: 'example.json'
+      fixture: 'example.json',
     }).as('selectCompany')
   })
 
   it('should render the component', () => {
     cy.visit('/')
-    cy.get('#landing-title').should('contain', 'Welcome to CLIENT')
+    cy.get('#landing-title').should('contain', 'Client Management System')
 
-    cy.get('#landing-subtitle').should(
-      'contain',
-      "The Ministry of Forests' client management system"
-    )
+    cy.get('#landing-subtitle').should('contain', 'Create and manage client accounts')
   })
 
   it('should render the form', () => {
@@ -26,19 +23,19 @@ describe('General Form', () => {
 
     cy.login('uattest@forest.client', 'Uat Test', 'bcsc')
 
-    cy.get('bx-form-item > #business').should('not.exist')
+    cy.get('#business').should('not.exist')
 
-    cy.get('.display-block-wrapper-info').should('not.be.visible')
+    cy.get('cds-inline-notification').should('not.exist')
 
     cy.get(
-      '[label-text="I have a BC registered business (corporation, sole proprietorship, society, etc.)"]'
+      '[label-text="I have a BC registered business (corporation, sole proprietorship, society, etc.)"]',
     )
       .should('be.visible')
       .click()
 
-    cy.get('.display-block-wrapper-info').should('be.visible')
+    cy.get('cds-inline-notification').should('be.visible')
 
-    cy.get('bx-form-item > #business')
+    cy.get('#business')
       .should('be.visible')
       .shadow()
       .find('input')
@@ -46,8 +43,7 @@ describe('General Form', () => {
       .type('Valid Company')
     cy.wait('@searchCompany')
 
-    cy.get('div.autocomplete-items-cell[data-id="XX9016140"]')
-      .click()
+    cy.get('cds-combo-box-item[data-id="XX9016140"]').click()
 
     cy.wait('@selectCompany')
 

From 44bb071e19371c1bfa96e647f317caca96d74da5 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 5 Sep 2023 07:40:51 -0700
Subject: [PATCH 081/313] fix: fixing landing page

---
 frontend/src/pages/LandingPage.vue | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/frontend/src/pages/LandingPage.vue b/frontend/src/pages/LandingPage.vue
index ed3bfd469f..ec48e5856f 100644
--- a/frontend/src/pages/LandingPage.vue
+++ b/frontend/src/pages/LandingPage.vue
@@ -1,9 +1,15 @@
 <script setup lang="ts">
+// Carbon
+import '@carbon/web-components/es/components/button/index';
+// Composables
 import { useRouter } from 'vue-router'
-import login16 from '@carbon/icons-vue/es/login/16'
+// Constants
 import { backendUrl } from '@/CoreConstants'
+// Assets
 import Seeding from '@/assets/images/seeding.png'
 import logo from '@/assets/images/bc-gov-logo.png'
+// @ts-ignore
+import login16 from '@carbon/icons-vue/es/login/16'
 
 // extract the querystring parameters from the URL
 const router = useRouter()
@@ -28,7 +34,7 @@ if (query.ref && query.ref === 'external') {
         </h2>
         <div class="spacing"></div>
         <div class="form-footer-group-buttons">
-          <bx-btn
+          <cds-button
             kind="primary"
             iconLayout=""
             class="landing-button"
@@ -36,9 +42,9 @@ if (query.ref && query.ref === 'external') {
           >
             <span>Login with IDIR</span>
             <login16 slot="icon" />
-          </bx-btn>
+          </cds-button>
           
-          <bx-btn
+          <cds-button
             v-if="$features.BCSC_LOGIN"
             kind="primary"
             iconLayout=""
@@ -47,9 +53,9 @@ if (query.ref && query.ref === 'external') {
           >
             <span>Login with BC Services Card</span>
             <login16 slot="icon" />
-          </bx-btn>
+          </cds-button>
           
-          <bx-btn
+          <cds-button
             v-if="$features.BCEID_LOGIN"
             kind="primary"
             iconLayout=""
@@ -58,7 +64,7 @@ if (query.ref && query.ref === 'external') {
           >
             <span>Login with BCeID</span>
             <login16 slot="icon" />
-          </bx-btn>
+          </cds-button>
         
         </div>
       </div>

From 6f7cea8e7650ac9a44806fe45ef8441e83d1437a Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Tue, 5 Sep 2023 07:44:35 -0700
Subject: [PATCH 082/313] fix: fixing versioning

---
 frontend/package-lock.json | 18 +++++++++---------
 frontend/package.json      |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c83b233141..1737f9688b 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -37,7 +37,7 @@
         "@vue/eslint-config-typescript": "^11.0.0",
         "@vue/test-utils": "^2.4.0",
         "@vue/tsconfig": "^0.1.3",
-        "cypress": "^12.17.4",
+        "cypress": "^13.1.0",
         "eslint": "^8.48.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-config-standard": "^17.1.0",
@@ -2119,9 +2119,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "2.88.12",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-2.88.12.tgz",
-      "integrity": "sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz",
+      "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -5825,13 +5825,13 @@
       "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "node_modules/cypress": {
-      "version": "12.17.4",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-12.17.4.tgz",
-      "integrity": "sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==",
+      "version": "13.1.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz",
+      "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
-        "@cypress/request": "2.88.12",
+        "@cypress/request": "^3.0.0",
         "@cypress/xvfb": "^1.2.4",
         "@types/node": "^16.18.39",
         "@types/sinonjs__fake-timers": "8.1.1",
@@ -5879,7 +5879,7 @@
         "cypress": "bin/cypress"
       },
       "engines": {
-        "node": "^14.0.0 || ^16.0.0 || >=18.0.0"
+        "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
       }
     },
     "node_modules/cypress/node_modules/@types/node": {
diff --git a/frontend/package.json b/frontend/package.json
index 49999d5470..b820039e03 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -70,7 +70,7 @@
     "@vue/eslint-config-typescript": "^11.0.0",
     "@vue/test-utils": "^2.4.0",
     "@vue/tsconfig": "^0.1.3",
-    "cypress": "^12.17.4",
+    "cypress": "^13.1.0",
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard": "^17.1.0",

From ddfd5d27364a1dd75e967cf9ada9c34a8349740b Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 6 Sep 2023 15:49:38 -0700
Subject: [PATCH 083/313] Created BCSC card rout

---
 .../pages/ApplyClientNumberWithBcscPage.vue   |  6 +++++
 frontend/src/routes.ts                        | 24 +++++++++++++++++--
 frontend/stub/mappings/fam.json               |  2 +-
 3 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 frontend/src/pages/ApplyClientNumberWithBcscPage.vue

diff --git a/frontend/src/pages/ApplyClientNumberWithBcscPage.vue b/frontend/src/pages/ApplyClientNumberWithBcscPage.vue
new file mode 100644
index 0000000000..498ed2824a
--- /dev/null
+++ b/frontend/src/pages/ApplyClientNumberWithBcscPage.vue
@@ -0,0 +1,6 @@
+<template>
+    <div class="bx--content">
+      <h1>Test</h1>
+    </div>
+  </template>
+  
\ No newline at end of file
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index 517ac0c8f2..eb24ef6be5 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -2,6 +2,7 @@ import { createRouter, createWebHistory, type RouteRecordRaw } from 'vue-router'
 
 import ReviewApplicationPage from '@/pages/ReviewApplicationPage.vue'
 import ApplyClientNumber from '@/pages/ApplyClientNumberPage.vue'
+import ApplyClientNumberBcscPage from '@/pages/ApplyClientNumberWithBcscPage.vue'
 import FormSubmittedPage from '@/pages/FormSubmittedPage.vue'
 import UserLoadingPage from '@/pages/UserLoadingPage.vue'
 import LandingPage from '@/pages/LandingPage.vue'
@@ -41,9 +42,28 @@ const routes: RouteRecordRaw[] = [
       hideHeader: false,
       requireAuth: true,
       showLoggedIn: true,
-      visibleTo: ['bceidbusiness', 'bcsc'],
+      visibleTo: ['bceidbusiness'],
       redirectTo: {
-        idir: 'internal'
+        idir: 'internal',
+        bcsc: 'bcsc-form'
+      }
+    }
+  },
+  {
+    path: '/new-client-bcsc',
+    alias: '/',
+    name: 'bcsc-form',
+    component: ApplyClientNumberBcscPage,
+    props: true,
+    meta: {
+      format: 'screen',
+      hideHeader: false,
+      requireAuth: true,
+      showLoggedIn: true,
+      visibleTo: ['bcsc'],
+      redirectTo: {
+        idir: 'internal',
+        bceidbusiness: 'form'
       }
     }
   },
diff --git a/frontend/stub/mappings/fam.json b/frontend/stub/mappings/fam.json
index 7d9850aadd..e4a547c06c 100644
--- a/frontend/stub/mappings/fam.json
+++ b/frontend/stub/mappings/fam.json
@@ -61,7 +61,7 @@
         "headers":{
           "Location": "http://{{request.host}}:3000/dashboard",
           "Set-Cookie": [
-            "idToken=eyJhbGciOiJIUzI1NiJ9.eyJjdXN0b206aWRwX3VzZXJfaWQiOiJ1YXR0ZXN0IiwiY3VzdG9tOmlkcF9uYW1lIjoiYmNzYyIsImN1c3RvbTppZHBfZGlzcGxheV9uYW1lIjoiVWF0IFRlc3QiLCJnaXZlbl9uYW1lIjoiVWF0IiwiZmFtaWx5X25hbWUiOiJUZXN0IiwiZW1haWwiOiJ1YXR0ZXN0QHRlc3QubG9jYWwiLCJpZHBfYnVzaW5lc3NfbmFtZSI6IkF1dG9tYXRlZCBUZXN0In0.WxwJhq-wCTt-k2YL0ZXw83jWQ9JGotH4jt84gZM7VzQ; sameSite=Lax; path=/; Expires={{now offset='10 years' format='EEE, d MMM yyyy HH:mm:ss'}} GMT; domain={{request.host}}"
+            "idToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6InVhdHRlc3RAdGVzdC5sb2NhbCIsImN1c3RvbTppZHBfdXNlcl9pZCI6InVhdHRlc3QiLCJjdXN0b206aWRwX25hbWUiOiJVYXQgVGVzdCIsImdpdmVuX25hbWUiOiJKYXZhSW5Vc2UiLCJmYW1pbHlfbmFtZSI6IkFkbWluIiwiYWRkcmVzcyI6Ijc3NyBGYWtlIFN0cmVldCIsImV4cGlyZXNfaW4iOiIyMDMzLTA5LTA2VDE1OjUwOjMwLjY3NFoifQ.8ujoIOufQ0jAKXdxQAt56pV_e6SqDwk4coZKip8YU2Y; sameSite=Lax; path=/; Expires={{now offset='10 years' format='EEE, d MMM yyyy HH:mm:ss'}} GMT; domain={{request.host}}"
           ]
         }
       }

From ed1cbfa8e22b4172cb45344ec0fdd9236fc762a5 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 09:54:15 -0700
Subject: [PATCH 084/313] chore: fixing some route configs

---
 frontend/src/routes.ts | 49 +++++++++++++++++++++---------------------
 1 file changed, 24 insertions(+), 25 deletions(-)

diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index eb24ef6be5..9c5549a2b7 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -27,9 +27,9 @@ const routes: RouteRecordRaw[] = [
       redirectTo: {
         idir: 'internal',
         bceidbusiness: 'form',
-        bcsc: 'form'
-      }
-    }
+        bcsc: 'bcsc-form',
+      },
+    },
   },
   {
     path: '/new-client',
@@ -45,9 +45,9 @@ const routes: RouteRecordRaw[] = [
       visibleTo: ['bceidbusiness'],
       redirectTo: {
         idir: 'internal',
-        bcsc: 'bcsc-form'
-      }
-    }
+        bcsc: 'bcsc-form',
+      },
+    },
   },
   {
     path: '/new-client-bcsc',
@@ -63,9 +63,9 @@ const routes: RouteRecordRaw[] = [
       visibleTo: ['bcsc'],
       redirectTo: {
         idir: 'internal',
-        bceidbusiness: 'form'
-      }
-    }
+        bceidbusiness: 'form',
+      },
+    },
   },
   {
     path: '/form-submitted',
@@ -79,9 +79,9 @@ const routes: RouteRecordRaw[] = [
       showLoggedIn: true,
       visibleTo: ['bceidbusiness', 'bcsc'],
       redirectTo: {
-        idir: 'internal'
-      }
-    }
+        idir: 'internal',
+      },
+    },
   },
   {
     path: '/submissions',
@@ -96,9 +96,9 @@ const routes: RouteRecordRaw[] = [
       visibleTo: ['idir'],
       redirectTo: {
         bceidbusiness: 'form',
-        bcsc: 'form'
-      }
-    }
+        bcsc: 'form',
+      },
+    },
   },
   {
     path: '/dashboard',
@@ -114,9 +114,9 @@ const routes: RouteRecordRaw[] = [
       redirectTo: {
         idir: 'internal',
         bceidbusiness: 'form',
-        bcsc: 'form'
-      }
-    }
+        bcsc: 'bcsc-form',
+      },
+    },
   },
   {
     path: '/error',
@@ -128,8 +128,8 @@ const routes: RouteRecordRaw[] = [
       hideHeader: true,
       requireAuth: false,
       showLoggedIn: true,
-      visibleTo: ['idir', 'bceidbusiness', 'bcsc']
-    }
+      visibleTo: ['idir', 'bceidbusiness', 'bcsc'],
+    },
   },
   {
     path: '/:pathMatch(.*)*',
@@ -141,9 +141,9 @@ const routes: RouteRecordRaw[] = [
       hideHeader: true,
       requireAuth: false,
       showLoggedIn: true,
-      visibleTo: ['idir', 'bceidbusiness', 'bcsc']
-    }
-  }
+      visibleTo: ['idir', 'bceidbusiness', 'bcsc'],
+    },
+  },
 ]
 
 if (nodeEnv === 'openshift-dev') {
@@ -158,12 +158,11 @@ if (nodeEnv === 'openshift-dev') {
 
 const router = createRouter({
   history: createWebHistory(),
-  routes
+  routes,
 })
 
 router.beforeEach(async (to, from, next) => {
   const user = ForestClientUserSession.loadDetails()
-
   // Page requires auth
   if (to.meta.requireAuth) {
     // User is logged in

From 3f5b5ffcca4f778b0d95a1ace505928ec9ccd198 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 09:59:27 -0700
Subject: [PATCH 085/313] chore: fixing logout url

---
 .github/workflows/pr-open.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pr-open.yml b/.github/workflows/pr-open.yml
index 1db694cedf..af6988d425 100644
--- a/.github/workflows/pr-open.yml
+++ b/.github/workflows/pr-open.yml
@@ -171,7 +171,7 @@ jobs:
             -p COGNITO_DOMAIN=${{ secrets.COGNITO_DOMAIN }}
             -p COGNITO_ENVIRONMENT=DEV
             -p COGNITO_REDIRECT_URI=https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }}/dashboard
-            -p COGNITO_LOGOUT_URI=https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }}/
+            -p COGNITO_LOGOUT_URI=https://${{ env.PREFIX }}-frontend.${{ env.DOMAIN }}
 
       - name: Deploy Database
         uses: bcgov-nr/action-deployer-openshift@v1.0.3

From c6a002550a039ecb5a97d1eccbc986e3dc0d03fd Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 7 Sep 2023 10:20:58 -0700
Subject: [PATCH 086/313] fix: Fixed cookie for BCSC

---
 frontend/stub/mappings/fam.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/stub/mappings/fam.json b/frontend/stub/mappings/fam.json
index e4a547c06c..bcc2be8541 100644
--- a/frontend/stub/mappings/fam.json
+++ b/frontend/stub/mappings/fam.json
@@ -61,7 +61,7 @@
         "headers":{
           "Location": "http://{{request.host}}:3000/dashboard",
           "Set-Cookie": [
-            "idToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJlbWFpbCI6InVhdHRlc3RAdGVzdC5sb2NhbCIsImN1c3RvbTppZHBfdXNlcl9pZCI6InVhdHRlc3QiLCJjdXN0b206aWRwX25hbWUiOiJVYXQgVGVzdCIsImdpdmVuX25hbWUiOiJKYXZhSW5Vc2UiLCJmYW1pbHlfbmFtZSI6IkFkbWluIiwiYWRkcmVzcyI6Ijc3NyBGYWtlIFN0cmVldCIsImV4cGlyZXNfaW4iOiIyMDMzLTA5LTA2VDE1OjUwOjMwLjY3NFoifQ.8ujoIOufQ0jAKXdxQAt56pV_e6SqDwk4coZKip8YU2Y; sameSite=Lax; path=/; Expires={{now offset='10 years' format='EEE, d MMM yyyy HH:mm:ss'}} GMT; domain={{request.host}}"
+            "idToken=eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxMTJmNGY4Ny01NTk0LTRlMDAtYmY2NC00MzllMGEwZWYyMGYiLCJjdXN0b206Z2l2ZW5fbmFtZXMiOiJHSVZFTk9ORSBHSVZFTlRXTyIsImJpcnRoZGF0ZSI6IjE5ODYtMTEtMTIiLCJnZW5kZXIiOiJ1bmtub3duIiwiY3VzdG9tOmlkcF91c2VyX2lkIjoiTkE1VENQR01JR1VGVkNTUzZTQU8zVElEQk1BSFhMM0YiLCJjdXN0b206aWRwX2Rpc3BsYXlfbmFtZSI6IkdJVkVOT05FIFNVUk5BTUUiLCJlbWFpbCI6IkZBTTFAdGVzdC5jb20iLCJhZGRyZXNzIjp7ImZvcm1hdHRlZCI6IntcInN0cmVldF9hZGRyZXNzXCI6XCI0MDAwIFNFWU1PVVIgUExBQ0VcIixcImNvdW50cnlcIjpcIkNBXCIsXCJsb2NhbGl0eVwiOlwiVklDVE9SSUFcIixcInJlZ2lvblwiOlwiQkNcIixcInBvc3RhbF9jb2RlXCI6XCJWOFogMUM4XCJ9In0sImN1c3RvbTppZHBfbmFtZSI6ImNhLmJjLmdvdi5mbG5yLmZhbS5kZXYiLCJnaXZlbl9uYW1lIjoiR0lWRU5PTkUiLCJmYW1pbHlfbmFtZSI6IlNVUk5BTUUifQ.-HoDDRB3YYltXrd90x1x-pMeHGr9VechvcpAbDos23E; sameSite=Lax; path=/; Expires={{now offset='10 years' format='EEE, d MMM yyyy HH:mm:ss'}} GMT; domain={{request.host}}"
           ]
         }
       }

From f8948c6c8158e32f290ad9fd61a40799bd60bb41 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 11:37:13 -0700
Subject: [PATCH 087/313] fix: fixing landing page style

---
 frontend/src/App.vue                   |   2 +-
 frontend/src/assets/styles/global.scss |  15 ++++
 frontend/src/pages/LandingPage.vue     | 119 +++++++++++++------------
 frontend/src/routes.ts                 |  10 ++-
 4 files changed, 89 insertions(+), 57 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 5ff28152a1..e1c1f2e45f 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -61,7 +61,7 @@ toastBus.on(openToast)
     <main-header-component v-if="!$route.meta.hideHeader"></main-header-component>
   </div>
   <div :class="{[`${$route.meta.format}`]:true}">
-    <div class="content">
+    <div :class="$route.meta.style">
     <router-view></router-view>
     </div>
   </div>
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 2ff6ae815c..b9252fcde3 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -232,6 +232,10 @@ hr {
   margin: 0rem;
   padding-bottom: 0px;
   display: flex;
+  align-items: stretch;
+  height: 100vh;
+  width: 100vw;
+  overflow: hidden;
   background: var(--light-theme-background-background, #fff);
 }
 .screen {
@@ -403,6 +407,17 @@ hr {
   gap: 3rem;
 }
 
+.content-landing {
+  margin: 0px;
+  margin-left: 2.5rem;
+  padding-bottom: 0px;
+  display: flex;
+  align-items: stretch;
+  height: 100vh;
+  width: 100vw;
+  
+}
+
 .form-header {
   display: flex;
   flex-direction: column;
diff --git a/frontend/src/pages/LandingPage.vue b/frontend/src/pages/LandingPage.vue
index ec48e5856f..5ffd136f4a 100644
--- a/frontend/src/pages/LandingPage.vue
+++ b/frontend/src/pages/LandingPage.vue
@@ -20,67 +20,76 @@ if (query.ref && query.ref === 'external') {
 }
 </script>
 
-<template>
-  <div class="full-width">
-    <div class="row bx--row landing-grid">
-      <div class="bx--col-sm-8 bx--col-md-10 bx--col-lg-10">
+<template>  
+  <div class="login-content">
 
-        <img :src="logo" alt="Government of British Columbia Logo" width="160" class="logo" />
-        
-        <h1 id="landing-title" class="landing-title">Client Management System</h1>
-        
-        <h2 id="landing-subtitle" class="landing-subtitle">
-          Create and manage client accounts
-        </h2>
-        <div class="spacing"></div>
-        <div class="form-footer-group-buttons">
-          <cds-button
-            kind="primary"
-            iconLayout=""
-            class="landing-button"
-            :href="$backend+'/login?code=idir'"
-          >
-            <span>Login with IDIR</span>
-            <login16 slot="icon" />
-          </cds-button>
-          
-          <cds-button
-            v-if="$features.BCSC_LOGIN"
-            kind="primary"
-            iconLayout=""
-            class="landing-button"
-            :href="$backend+'/login?code=bcsc'"
-          >
-            <span>Login with BC Services Card</span>
-            <login16 slot="icon" />
-          </cds-button>
-          
-          <cds-button
-            v-if="$features.BCEID_LOGIN"
-            kind="primary"
-            iconLayout=""
-            class="landing-button"
-            :href="$backend+'/login?code=bceidbusiness'"
-          >
-            <span>Login with BCeID</span>
-            <login16 slot="icon" />
-          </cds-button>
-        
-        </div>
-      </div>
-      
-      <div class="bx--col-sm-8 bx--col-md-6 bx--col-lg-6 landing-img-column">
-        <img
-          :src="Seeding"
-          alt="Small green seedling on the dirt and watered"
-          class="landing-img"
-        />
-      </div>
+    <img 
+      :src="logo" 
+      alt="Government of British Columbia Logo" 
+      />
 
+    <h1 id="landing-title" class="landing-title">Client Management System</h1>
+    
+    <h2 id="landing-subtitle" class="landing-subtitle">Create and manage client accounts</h2>
+  
+    <div class="spacing"></div>
+  
+    <div class="form-footer-group-buttons">
+    <cds-button
+      kind="primary"
+      iconLayout=""
+      class="landing-button"
+      :href="$backend+'/login?code=idir'"
+    >
+      <span>Log in with IDIR</span>
+      <login16 slot="icon" />
+    </cds-button>
+    <cds-button
+      v-if="$features.BCSC_LOGIN"
+      kind="primary"
+      iconLayout=""
+      class="landing-button"
+      :href="$backend+'/login?code=bcsc'"
+    >
+      <span>Log in with BC Services Card</span>
+      <login16 slot="icon" />
+    </cds-button>
+    <cds-button
+      v-if="$features.BCEID_LOGIN"
+      kind="primary"
+      iconLayout=""
+      class="landing-button"
+      :href="$backend+'/login?code=bceidbusiness'"
+    >
+      <span>Log in with BCeID</span>
+      <login16 slot="icon" />
+    </cds-button>
     </div>
   </div>
+
+  <div class="login-content">
+    <img
+      :src="Seeding"
+      alt="Small green seedling on the dirt and watered"
+    />
+  </div>
 </template>
 
 <style lang="scss">
 @import '@bcgov-nr/nr-fsa-theme/style-sheets/landing-page-components-overrides.scss';
+
+.login-content:first-child{
+  padding-top: 3rem;
+  width: 55vw;
+}
+.login-content:last-child {  
+  width: 45vw;
+}
+.login-content:first-child img {
+  width: 10.5rem;
+}
+.login-content:last-child img {
+  width: 100%;
+  object-fit: cover;
+}
 </style>
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index 9c5549a2b7..9d1849fca5 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -29,6 +29,7 @@ const routes: RouteRecordRaw[] = [
         bceidbusiness: 'form',
         bcsc: 'bcsc-form',
       },
+      style: 'content-landing',
     },
   },
   {
@@ -47,6 +48,7 @@ const routes: RouteRecordRaw[] = [
         idir: 'internal',
         bcsc: 'bcsc-form',
       },
+      style: 'content',
     },
   },
   {
@@ -65,6 +67,7 @@ const routes: RouteRecordRaw[] = [
         idir: 'internal',
         bceidbusiness: 'form',
       },
+      style: 'content',
     },
   },
   {
@@ -81,6 +84,7 @@ const routes: RouteRecordRaw[] = [
       redirectTo: {
         idir: 'internal',
       },
+      style: 'content',
     },
   },
   {
@@ -98,6 +102,7 @@ const routes: RouteRecordRaw[] = [
         bceidbusiness: 'form',
         bcsc: 'form',
       },
+      style: 'content',
     },
   },
   {
@@ -106,7 +111,7 @@ const routes: RouteRecordRaw[] = [
     component: UserLoadingPage,
     props: true,
     meta: {
-      format: 'full',
+      format: 'full-centered',
       hideHeader: true,
       requireAuth: false,
       showLoggedIn: false,
@@ -116,6 +121,7 @@ const routes: RouteRecordRaw[] = [
         bceidbusiness: 'form',
         bcsc: 'bcsc-form',
       },
+      style: 'content',
     },
   },
   {
@@ -130,6 +136,7 @@ const routes: RouteRecordRaw[] = [
       showLoggedIn: true,
       visibleTo: ['idir', 'bceidbusiness', 'bcsc'],
     },
+    style: 'content',
   },
   {
     path: '/:pathMatch(.*)*',
@@ -143,6 +150,7 @@ const routes: RouteRecordRaw[] = [
       showLoggedIn: true,
       visibleTo: ['idir', 'bceidbusiness', 'bcsc'],
     },
+    style: 'content',
   },
 ]
 

From c1512bc10dd1f0205bd8054b6512567ba95c648e Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 11:37:29 -0700
Subject: [PATCH 088/313] chore: updating stubs to have better info

---
 .../stub/__files/response-autocomplete.json   | 14 ++++++-------
 .../stub/__files/response-details-FM.json     |  2 +-
 .../stub/__files/response-details-JJ.json     |  2 +-
 .../stub/__files/response-details-UU.json     | 21 +++++++++++++++++--
 .../stub/__files/response-details-XX.json     |  4 ++--
 .../stub/__files/response-details-YY.json     |  2 +-
 6 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/frontend/stub/__files/response-autocomplete.json b/frontend/stub/__files/response-autocomplete.json
index 724128cdbb..8a8799677e 100644
--- a/frontend/stub/__files/response-autocomplete.json
+++ b/frontend/stub/__files/response-autocomplete.json
@@ -1,19 +1,19 @@
 [
   {
     "code": "XX9016140",
-    "name": "Totally Valid Company",
+    "name": "Pacific Lumber Association",
     "status": "ACTIVE",
     "legalType": "SP"
   },
   {
     "code": "XX9753423",
-    "name": "Forest of Forests Ltd",
+    "name": "Pacific Forests Ltd",
     "status": "ACTIVE",
     "legalType": "SP"
   },
   {
     "code": "XX7944564",
-    "name": "Lumber & Lumber Inc",
+    "name": "Starfire Pacific Inc",
     "status": "ACTIVE",
     "legalType": "SP"
   },
@@ -25,25 +25,25 @@
   },
   {
     "code": "JJ3478189",
-    "name": "Dum-Gondor Cultural Association of Middle Earth",
+    "name": "Pacific Cultural Association",
     "status": "ACTIVE",
     "legalType": "SP"
   },
   {
     "code": "ZZ8201962",
-    "name": "Totally Duplicated Company",
+    "name": "Edgar Paciolli",
     "status": "ACTIVE",
     "legalType": "SP"
   },
   {
     "code": "YY5199142",
-    "name": "Totally Shady Company",
+    "name": "Powel of the Pacific",
     "status": "ACTIVE",
     "legalType": "SP"
   },
   {
     "code":"FM1234567",
-    "name":"The Great Fake Forest Company",
+    "name":"The Great Pacific  Forest Company",
     "status":"ACTIVE",
     "legalType":"SP"
   }
diff --git a/frontend/stub/__files/response-details-FM.json b/frontend/stub/__files/response-details-FM.json
index 5a6cc1f380..d4b60b22f6 100644
--- a/frontend/stub/__files/response-details-FM.json
+++ b/frontend/stub/__files/response-details-FM.json
@@ -1,5 +1,5 @@
 {
-  "name": "The Great Fake Forest Company",
+  "name": "The Great Pacific  Forest Company",
   "id": "{{request.path.[2]}}",
   "goodStanding": true,
   "addresses": [
diff --git a/frontend/stub/__files/response-details-JJ.json b/frontend/stub/__files/response-details-JJ.json
index 7c7d70511e..f4004f8664 100644
--- a/frontend/stub/__files/response-details-JJ.json
+++ b/frontend/stub/__files/response-details-JJ.json
@@ -1,5 +1,5 @@
 {
-  "name": "Dum-Gondor Cultural Association of Middle Earth",
+  "name": "Pacific Cultural Association",
   "id": "{{request.path.[2]}}",
   "goodStanding": true,
   "addresses": null,
diff --git a/frontend/stub/__files/response-details-UU.json b/frontend/stub/__files/response-details-UU.json
index 96e9558d88..ae290867d5 100644
--- a/frontend/stub/__files/response-details-UU.json
+++ b/frontend/stub/__files/response-details-UU.json
@@ -1,5 +1,5 @@
 {
-  "name": "Ministry of Forests, Lands and Natural Resource Operations",
+  "name": "Pacific Operations",
   "id": "{{request.path.[2]}}",
   "goodStanding": true,
   "addresses": [
@@ -43,7 +43,24 @@
       "firstName": "Jhon",
       "lastName": "Wick",
       "phoneNumber": "(111) 222-3344",
-      "email": "babayaga@theguild.ca",
+      "email": "jwick@theguild.ca",
+      "index": 0,
+      "locationNames": [
+        {
+          "value": "0",
+          "text": "Mailing address"
+        }
+      ]
+    },
+    {
+      "contactType": {
+        "value": "P",
+        "text": "Person"
+      },
+      "firstName": "James",
+      "lastName": "Kirk",
+      "phoneNumber": "(111) 332-3344",
+      "email": "jamestkirk@fleet.ca",
       "index": 0,
       "locationNames": [
         {
diff --git a/frontend/stub/__files/response-details-XX.json b/frontend/stub/__files/response-details-XX.json
index 18e5cbaccb..3a0d9d6a56 100644
--- a/frontend/stub/__files/response-details-XX.json
+++ b/frontend/stub/__files/response-details-XX.json
@@ -1,5 +1,5 @@
 {
-  "name": "The Good Company",
+  "name": "Pacific Lumber Association",
   "id": "{{request.path.[2]}}",
   "goodStanding": true,
   "addresses": [
@@ -13,7 +13,7 @@
         "value": "BC",
         "text": "British Columbia"
       },
-      "city": "Fakest City",
+      "city": "Victoria",
       "postalCode": "A0A0A0",
       "index": 0,
       "locationName": "Mailing address"
diff --git a/frontend/stub/__files/response-details-YY.json b/frontend/stub/__files/response-details-YY.json
index ea0b1c0dbb..3f14923927 100644
--- a/frontend/stub/__files/response-details-YY.json
+++ b/frontend/stub/__files/response-details-YY.json
@@ -1,5 +1,5 @@
 {
-  "name": "The Shady Company",
+  "name": "Powel of the Pacific",
   "id": "{{request.path.[2]}}",
   "goodStanding": false,
   "addresses": [

From 66d29fe7744929acd33a3f387fd6d4e854911330 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 13:56:02 -0700
Subject: [PATCH 089/313] chore: renaming some files

---
 ...ntNumberWithBcscPage.vue => FormBCSCPage.vue} |  0
 ...plyClientNumberPage.vue => FormBCeIDPage.vue} |  0
 frontend/src/routes.ts                           | 16 ++++++++++------
 3 files changed, 10 insertions(+), 6 deletions(-)
 rename frontend/src/pages/{ApplyClientNumberWithBcscPage.vue => FormBCSCPage.vue} (100%)
 rename frontend/src/pages/{ApplyClientNumberPage.vue => FormBCeIDPage.vue} (100%)

diff --git a/frontend/src/pages/ApplyClientNumberWithBcscPage.vue b/frontend/src/pages/FormBCSCPage.vue
similarity index 100%
rename from frontend/src/pages/ApplyClientNumberWithBcscPage.vue
rename to frontend/src/pages/FormBCSCPage.vue
diff --git a/frontend/src/pages/ApplyClientNumberPage.vue b/frontend/src/pages/FormBCeIDPage.vue
similarity index 100%
rename from frontend/src/pages/ApplyClientNumberPage.vue
rename to frontend/src/pages/FormBCeIDPage.vue
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index 9d1849fca5..b3ec389818 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -1,8 +1,11 @@
-import { createRouter, createWebHistory, type RouteRecordRaw } from 'vue-router'
+/**
+ * Router configuration for the application.
+ */
+import { createRouter, createWebHistory } from 'vue-router'
 
 import ReviewApplicationPage from '@/pages/ReviewApplicationPage.vue'
-import ApplyClientNumber from '@/pages/ApplyClientNumberPage.vue'
-import ApplyClientNumberBcscPage from '@/pages/ApplyClientNumberWithBcscPage.vue'
+import BCeIDForm from '@/pages/FormBCeIDPage.vue'
+import BCSCForm from '@/pages/FormBCSCPage.vue'
 import FormSubmittedPage from '@/pages/FormSubmittedPage.vue'
 import UserLoadingPage from '@/pages/UserLoadingPage.vue'
 import LandingPage from '@/pages/LandingPage.vue'
@@ -12,7 +15,7 @@ import ForestClientUserSession from '@/helpers/ForestClientUserSession'
 
 import { nodeEnv } from '@/CoreConstants'
 
-const routes: RouteRecordRaw[] = [
+const routes = [
   {
     path: '/landing',
     name: 'home',
@@ -36,7 +39,7 @@ const routes: RouteRecordRaw[] = [
     path: '/new-client',
     alias: '/',
     name: 'form',
-    component: ApplyClientNumber,
+    component: BCeIDForm,
     props: true,
     meta: {
       format: 'screen',
@@ -55,7 +58,7 @@ const routes: RouteRecordRaw[] = [
     path: '/new-client-bcsc',
     alias: '/',
     name: 'bcsc-form',
-    component: ApplyClientNumberBcscPage,
+    component: BCSCForm,
     props: true,
     meta: {
       format: 'screen',
@@ -204,5 +207,6 @@ declare module 'vue-router' {
     showLoggedIn: boolean
     visibleTo: Array<string>
     redirectTo?: Record<string, string>
+    style: string
   }
 }

From b8ddd9f8c46ae37ebffc90b898576a9199f330e1 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 13:56:30 -0700
Subject: [PATCH 090/313] chore: changing project configuration

---
 .../.devcontainer/frontend.code-workspace     |  2 +-
 frontend/.eslintrc.js                         | 11 +--
 frontend/package-lock.json                    | 84 +++++++++----------
 frontend/tsconfig.json                        |  4 +
 4 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/frontend/.devcontainer/frontend.code-workspace b/frontend/.devcontainer/frontend.code-workspace
index 9ee6ecedc6..bbbd72a475 100644
--- a/frontend/.devcontainer/frontend.code-workspace
+++ b/frontend/.devcontainer/frontend.code-workspace
@@ -23,7 +23,6 @@
 			"vue"
 		],
 		"prettier.requireConfig": true,
-		
 		"workbench.tree.indent": 20,
 		"workbench.iconTheme": "material-icon-theme",
 		"[vue]": {
@@ -36,5 +35,6 @@
 			"editor.defaultFormatter": "redhat.vscode-xml"
 		},
 		"typescript.tsdk": "node_modules/typescript/lib",
+		"eslint.ignoreUntitled": true,
 	}
 }
\ No newline at end of file
diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index 3239935012..0728235ace 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -33,17 +33,18 @@ module.exports = {
   ],
   parser: '@typescript-eslint/parser',
   parserOptions: {
-    ecmaVersion: 'latest',
+    ecmaVersion: '11',
     sourceType: 'module',
   },
-  plugins: ['@typescript-eslint', 'prettier'],
+  plugins: ['@typescript-eslint', 'prettier', 'vue'],
   rules: {
-    'prettier/prettier': 'error',
-    '@typescript-eslint/explicit-module-boundary-types': 'error',
-    '@typescript-eslint/no-unused-vars': 'error',
     'vue/no-multiple-template-root': 'error',
     'vue/no-v-html': 'error',
     'vue/require-prop-types': 'error',
+    'prettier/prettier': 'error',
+    'import/extensions': ['error', 'always', { js: 'never', ts: 'never', vue: 'never' }],
+    '@typescript-eslint/explicit-module-boundary-types': 'error',
+    '@typescript-eslint/no-unused-vars': 'error',
     '@typescript-eslint/no-explicit-any': 'off',
   },
   overrides: [
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 1737f9688b..45900a19dd 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -3186,16 +3186,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.5.0.tgz",
-      "integrity": "sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.6.0.tgz",
+      "integrity": "sha512-CW9YDGTQnNYMIo5lMeuiIG08p4E0cXrXTbcZ2saT/ETE7dWUrNxlijsQeU04qAAKkILiLzdQz+cGFxCJjaZUmA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.5.0",
-        "@typescript-eslint/type-utils": "6.5.0",
-        "@typescript-eslint/utils": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0",
+        "@typescript-eslint/scope-manager": "6.6.0",
+        "@typescript-eslint/type-utils": "6.6.0",
+        "@typescript-eslint/utils": "6.6.0",
+        "@typescript-eslint/visitor-keys": "6.6.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -3254,15 +3254,15 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.5.0.tgz",
-      "integrity": "sha512-LMAVtR5GN8nY0G0BadkG0XIe4AcNMeyEy3DyhKGAh9k4pLSMBO7rF29JvDBpZGCmp5Pgz5RLHP6eCpSYZJQDuQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.6.0.tgz",
+      "integrity": "sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.5.0",
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/typescript-estree": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0",
+        "@typescript-eslint/scope-manager": "6.6.0",
+        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/typescript-estree": "6.6.0",
+        "@typescript-eslint/visitor-keys": "6.6.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3282,13 +3282,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz",
-      "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz",
+      "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0"
+        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/visitor-keys": "6.6.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -3299,13 +3299,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.5.0.tgz",
-      "integrity": "sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.6.0.tgz",
+      "integrity": "sha512-8m16fwAcEnQc69IpeDyokNO+D5spo0w1jepWWY2Q6y5ZKNuj5EhVQXjtVAeDDqvW6Yg7dhclbsz6rTtOvcwpHg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.5.0",
-        "@typescript-eslint/utils": "6.5.0",
+        "@typescript-eslint/typescript-estree": "6.6.0",
+        "@typescript-eslint/utils": "6.6.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -3326,9 +3326,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz",
-      "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.6.0.tgz",
+      "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -3339,13 +3339,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz",
-      "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz",
+      "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/visitor-keys": "6.5.0",
+        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/visitor-keys": "6.6.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -3419,17 +3419,17 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz",
-      "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.6.0.tgz",
+      "integrity": "sha512-mPHFoNa2bPIWWglWYdR0QfY9GN0CfvvXX1Sv6DlSTive3jlMTUy+an67//Gysc+0Me9pjitrq0LJp0nGtLgftw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.5.0",
-        "@typescript-eslint/types": "6.5.0",
-        "@typescript-eslint/typescript-estree": "6.5.0",
+        "@typescript-eslint/scope-manager": "6.6.0",
+        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/typescript-estree": "6.6.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -3477,12 +3477,12 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.5.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz",
-      "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz",
+      "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.5.0",
+        "@typescript-eslint/types": "6.6.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index 32357f7045..6a417143ae 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -15,6 +15,10 @@
     }
   ],
   "compilerOptions": {
+    "paths": {
+      "@/*": ["./src/*"]
+    },
+    "composite": true,
     "moduleResolution": "node",
     "module": "es2020"
   }

From b87d765894d00c5499f7cc00c35186f9a6fb1dc8 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 14:34:05 -0700
Subject: [PATCH 091/313] fix: fixing address autocomplete whitespaces

---
 .../java/ca/bc/gov/app/service/client/ClientAddressService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java b/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
index ab827897b6..1f6875af96 100644
--- a/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
+++ b/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
@@ -97,7 +97,7 @@ public Flux<ClientNameCodeDto> findPossibleAddresses(
             .filter(address -> "Retrieve" .equalsIgnoreCase(address.next()))
             .map(address -> new ClientNameCodeDto(
                     address.id(),
-                    String.format("%s %s", address.text(), address.description())
+                    String.format("%s %s", address.text().trim(), address.description().trim())
                 )
             );
   }

From c31540e6ea4edc0bcd84cd2824e2a6441afd814d Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 14:49:55 -0700
Subject: [PATCH 092/313] fix(FSADT1-869): fixing spacing on message

---
 frontend/src/pages/applyform/ContactWizardStep.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index de7d1a3632..444ba2855a 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -101,7 +101,7 @@ emit('valid', false)
 
 const handleRemove = (index: number) => {
   const selectedContact = formData.location.contacts[index].firstName.length !== 0
-    ? formData.location.contacts[index].firstName + formData.location.contacts[index].lastName
+    ? `${formData.location.contacts[index].firstName} ${formData.location.contacts[index].lastName}`
     : 'Contact #' + index;
   bus.emit({
     message: selectedContact,

From 966b6879f1c589d27e5fbeedaa749a4997c09464 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 14:58:38 -0700
Subject: [PATCH 093/313] chore(FSADT1-871): removing tooltip from next

---
 frontend/src/pages/FormBCeIDPage.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 05ef772407..55a4750edb 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -232,6 +232,10 @@ const goToStep = (index: number) => {
   if (checkStepValidity(index)) currentTab.value = index;
 };
 
+const goToStep2 = (index: number) => {
+  console.log(index,'bling')
+}
+
 const onNext = () => {
   if (currentTab.value + 1 < progressData.length) {
     if (checkStepValidity(currentTab.value)) {
@@ -314,6 +318,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
           :secondary-label="item.subtitle"
           :state="item.step <= currentTab ? item.step < currentTab ? 'complete' : 'current' : 'incomplete'"
           :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"
+          v-on:click="goToStep2(item.step)"
           >
           <span class="cds--progress-label">{{ item.title }}</span>
         </cds-progress-step>
@@ -460,9 +465,6 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
           v-on:click="onNext"
           :disabled="progressData[currentTab].valid === false"
           data-test="wizard-next-button"
-          tooltip-position="top"
-          tooltip-text="All fields must be filled out correctly"
-          :open-tooltip="progressData[currentTab].valid === false"
           >
           <span>Next</span>
           <ArrowRight16 slot="icon" />

From 7cb3b58e6b6930e6b51fdbbfb761f93d0dbfc6bb Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 16:24:29 -0700
Subject: [PATCH 094/313] fix: fixing address autocomplete info

---
 .../grouping/AddressGroupComponent.vue        | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 2f2eae8c5f..4c01afb007 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -117,17 +117,17 @@ const postalCodeValidators = computed(() => {
     case 'CA':
       return [
       ...getValidations('location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'),
-        submissionValidation(`location.adresses[${props.id}].postalCode`)
+        submissionValidation(`location.addresses[${props.id}].postalCode`)
       ]
     case 'US':
       return [
       ...getValidations('location.addresses.*.postalCode(location.addresses.*.country.text === "US")'),
-        submissionValidation(`location.adresses[${props.id}].postalCode`)
+        submissionValidation(`location.addresses[${props.id}].postalCode`)
       ]
     default:
       return [
         ...getValidations('location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")'),
-        submissionValidation(`location.adresses[${props.id}].postalCode`)
+        submissionValidation(`location.addresses[${props.id}].postalCode`)
       ]
   }
 })
@@ -216,6 +216,9 @@ watch([detailsData], () => {
     if(!selectedValue.postalCode) postalCodeShowHint.value = true
     else postalCodeShowHint.value = false
     addressControl.value = true
+    //Why is this here? Because Address response differs from the street address value
+    //addressControl is responsible for giving an empty list instead of the AC value
+    setTimeout(() => (addressControl.value = false), 200)
   }
 })
 
@@ -235,8 +238,8 @@ onMounted(() =>{
     v-model="selectedValue.locationName"
     :enabled="true"
     :validations="[
-      ...getValidations('location.adresses.*.locationName'),
-      submissionValidation(`location.adresses[${id}].locationName`)
+      ...getValidations('location.addresses.*.locationName'),
+      submissionValidation(`location.addresses[${id}].locationName`)
     ]"
     :error-message="nameError"
     @empty="validation.locationName = !$event"
@@ -250,7 +253,7 @@ onMounted(() =>{
     tip=""
     :enabled="true"
     :model-value="countryList"
-    :validations="[...getValidations('location.addresses.country.text'),submissionValidation(`location.adresses[${id}].country`)]"
+    :validations="[...getValidations('location.addresses.country.text'),submissionValidation(`location.addresses[${id}].country`)]"
     :error-message="addressError"
     @update:selected-value="updateStateProvince($event, 'country')"
     @update:model-value="resetProvinceOnChange"
@@ -272,8 +275,8 @@ onMounted(() =>{
       v-model="selectedValue.streetAddress"
       :contents="addressControl ? [] : content"
       :validations="[
-        ...getValidations('location.adresses.*.streetAddress'),
-        submissionValidation(`location.adresses[${id}].streetAddress`)
+        ...getValidations('location.addresses.*.streetAddress'),
+        submissionValidation(`location.addresses[${id}].streetAddress`)
       ]"
       :loading="loading"
       @update:selected-value="autoCompleteResult = $event"
@@ -295,8 +298,8 @@ onMounted(() =>{
     :enabled="true"
     :error-message="addressError"
     :validations="[
-      ...getValidations('location.adresses.*.city'),
-      submissionValidation(`location.adresses[${id}].city`)
+      ...getValidations('location.addresses.*.city'),
+      submissionValidation(`location.addresses[${id}].city`)
     ]"
     @empty="validation.city = !$event"
   />
@@ -316,7 +319,7 @@ onMounted(() =>{
       :model-value="content"
       :enabled="true"
       tip=""
-      :validations="[...getValidations('location.addresses.*.province.text'),submissionValidation(`location.adresses[${id}].province`)]"
+      :validations="[...getValidations('location.addresses.*.province.text'),submissionValidation(`location.addresses[${id}].province`)]"
       :error-message="addressError"
       @update:selected-value="updateStateProvince($event, 'province')"
       @empty="validation.province = !$event"

From 94bb37a906a14f6023b588a91d88c5ed6e404fd6 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 16:24:56 -0700
Subject: [PATCH 095/313] chore: adding config to workspace

---
 frontend/.devcontainer/frontend.code-workspace | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/.devcontainer/frontend.code-workspace b/frontend/.devcontainer/frontend.code-workspace
index bbbd72a475..f8a17c084f 100644
--- a/frontend/.devcontainer/frontend.code-workspace
+++ b/frontend/.devcontainer/frontend.code-workspace
@@ -36,5 +36,8 @@
 		},
 		"typescript.tsdk": "node_modules/typescript/lib",
 		"eslint.ignoreUntitled": true,
+		"eslint.options": {
+			"configFile": "./.eslintrc.js"
+		}
 	}
 }
\ No newline at end of file

From 9963acded4ecd213aaf2a815159c1883e7ad676a Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 17:11:02 -0700
Subject: [PATCH 096/313] fix(FSADT1-862): adding global notification for
 errors

---
 .../validators/ExternalFormValidations.ts     | 36 +++++++++++++++----
 .../validators/SubmissionValidators.ts        |  5 +++
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
index 8b3cf2e05f..7e2a0a91a1 100644
--- a/frontend/src/helpers/validators/ExternalFormValidations.ts
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -1,3 +1,5 @@
+import { useEventBus } from '@vueuse/core'
+
 import {
   isNotEmpty,
   isEmail,
@@ -12,6 +14,11 @@ import {
 } from '@/helpers/validators/GlobalValidators'
 
 import type { FormDataDto } from '@/dto/ApplyClientNumberDto'
+import type { ValidationMessageType } from '@/dto/CommonTypesDto'
+
+const errorBus = useEventBus<ValidationMessageType[]>(
+  'submission-error-notification'
+)
 
 // We declare here a collection of all validations for every field in the form
 const globalValidations: Record<string, ((value: string) => string)[]> = {}
@@ -136,7 +143,7 @@ export const getValidations = (key: string): ((value: string) => string)[] =>
   globalValidations[key] || []
 
 // This function will run the validators and return the errors
-export const validate = (keys: string[], target: FormDataDto): boolean => {
+export const validate = (keys: string[], target: FormDataDto, notify: boolean = false): boolean => {
   // For every received key we get the validations and run them
   return keys.every((key) => {
     // First we get all validators for that field
@@ -152,9 +159,18 @@ export const validate = (keys: string[], target: FormDataDto): boolean => {
       // We define a function that will run the validation if the condition is true
       const buildEval = (condition: string) =>
         condition === 'true' ? 'true' : `target.${condition}`
-      const runValidation = (item: any, condition: string) =>
+      const runValidation = (item: any, condition: string,fieldId: string = fieldKey) : string =>{
         // eslint-disable-next-line no-eval
-        eval(condition) ? validation(item) === '' : true
+        if(eval(condition)){
+          const validationResponse = validation(item)
+          if(notify && validationResponse){            
+            errorBus.emit([{fieldId,errorMsg:validationResponse}])
+          }
+          return validationResponse
+         }else{ 
+          return ''
+         }
+      }
       // If the field value is an array we run the validation for every item in the array
       if (Array.isArray(fieldValue)) {
         return fieldValue.every((item: any, index: number) => {
@@ -162,15 +178,23 @@ export const validate = (keys: string[], target: FormDataDto): boolean => {
           if (Array.isArray(item)) {
             if (item.length === 0) item.push('')
             return item.every((subItem: any) =>
-              runValidation(subItem, buildEval(fieldCondition.replace('.*.', `[${index}].`))),
+              runValidation(
+                subItem, 
+                buildEval(fieldCondition.replace('.*.', `[${index}].`)),
+                fieldKey.replace('.*.', `[${index}].`)
+              )  === '',
             )
           }
           // If it is not an array here, just validate it
-          return runValidation(item, buildEval(fieldCondition.replace('.*.', `[${index}].`)))
+          return runValidation(
+            item, 
+            buildEval(fieldCondition.replace('.*.', `[${index}].`)),
+            fieldKey.replace('.*.', `[${index}].`)
+            )  === ''
         })
       }
       // If the field value is not an array we run the validation for the field
-      return runValidation(fieldValue, fieldCondition)
+      return runValidation(fieldValue, fieldCondition) === ''
     })
   })
 }
diff --git a/frontend/src/helpers/validators/SubmissionValidators.ts b/frontend/src/helpers/validators/SubmissionValidators.ts
index 8be6e78f50..68226a7eca 100644
--- a/frontend/src/helpers/validators/SubmissionValidators.ts
+++ b/frontend/src/helpers/validators/SubmissionValidators.ts
@@ -27,6 +27,10 @@ import type { ValidationMessageType } from '@/dto/CommonTypesDto'
 const errorBus = useEventBus<ValidationMessageType[]>(
   'submission-error-notification'
 )
+/**
+ * Event bus for revalidating the submission.
+ */
+const revalidateBus = useEventBus<void>('revalidate-bus')
 
 /**
  * Array of submission validators.
@@ -38,6 +42,7 @@ let submissionValidators : any = []
  * When an error is received, update the submission validators array.
  */
 errorBus.on((errors) => {
+  revalidateBus.emit()
   submissionValidators = errors.map((error) => {
     return { ...error, originalValue: '' }
   })

From 674484514d783583b48c27c88df66285d4666b28 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 17:14:31 -0700
Subject: [PATCH 097/313] fix: fixing progress indicator navigation

---
 frontend/src/pages/FormBCeIDPage.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 55a4750edb..0fafff9205 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -212,7 +212,7 @@ const stateIcon = (index: number) => {
 const checkStepValidity = (stepNumber: number): boolean => {
   progressData.forEach((step: any) => {
     if (step.step <= stepNumber) {
-      step.valid = validate(step.fields, formData);
+      step.valid = validate(step.fields, formData, true);
     }
   });
   return progressData[stepNumber].valid;
@@ -229,12 +229,9 @@ const endAndLogOut = ref<boolean>(false);
 const mailAndLogOut = ref<boolean>(false);
 
 const goToStep = (index: number) => {
-  if (checkStepValidity(index)) currentTab.value = index;
+  if (index <= currentTab.value && checkStepValidity(index)) currentTab.value = index;
 };
 
-const goToStep2 = (index: number) => {
-  console.log(index,'bling')
-}
 
 const onNext = () => {
   if (currentTab.value + 1 < progressData.length) {
@@ -318,7 +315,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
           :secondary-label="item.subtitle"
           :state="item.step <= currentTab ? item.step < currentTab ? 'complete' : 'current' : 'incomplete'"
           :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"
-          v-on:click="goToStep2(item.step)"
+          v-on:click="goToStep(item.step)"
           >
           <span class="cds--progress-label">{{ item.title }}</span>
         </cds-progress-step>

From b026d22918f5dc846d979d5a425d953d827cce83 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 17:17:59 -0700
Subject: [PATCH 098/313] fix(FSADT1-863): trimming whitespace on address

---
 frontend/src/components/grouping/AddressGroupComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 4c01afb007..41b6db113b 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -209,7 +209,7 @@ watch([autoCompleteResult], () => {
 
 watch([detailsData], () => {
   if (detailsData.value) {
-    selectedValue.streetAddress = detailsData.value.streetAddress
+    selectedValue.streetAddress = detailsData.value.streetAddress.trim()
     selectedValue.city = detailsData.value.city
     selectedValue.province = detailsData.value.province
     selectedValue.postalCode = detailsData.value.postalCode.replace(/\s/g, '')

From 907dc9dbc0d8ddc93fd7903df7f720233e329830 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 17:20:36 -0700
Subject: [PATCH 099/313] fix(FSADT1-863): fixing address details whitespace

---
 .../java/ca/bc/gov/app/service/client/ClientAddressService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java b/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
index 1f6875af96..9b63e75569 100644
--- a/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
+++ b/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
@@ -137,7 +137,7 @@ public Mono<ClientAddressDto> getAddress(String addressId) {
                 new ClientAddressDto(
                     String.format("%s %s %s %s %s", address.line1(), address.line2(),
                         address.line3(), address.line4(), address.line5()
-                    ),
+                    ).trim(),
                     new ClientValueTextDto(address.countryIso2(), address.countryName()),
                     new ClientValueTextDto(address.province(), address.provinceName()),
                     address.city(),

From ab7b5f37ffd9f291dab6515986a359c5dc0e5c2b Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 17:26:12 -0700
Subject: [PATCH 100/313] fix(FSADT1-870): limiting the amount of
 contact/address

---
 frontend/src/pages/applyform/AddressWizardStep.vue | 1 +
 frontend/src/pages/applyform/ContactWizardStep.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/src/pages/applyform/AddressWizardStep.vue b/frontend/src/pages/applyform/AddressWizardStep.vue
index 46314d8f81..a935878f9f 100644
--- a/frontend/src/pages/applyform/AddressWizardStep.vue
+++ b/frontend/src/pages/applyform/AddressWizardStep.vue
@@ -149,6 +149,7 @@ If you’d like to include another address, for example a seed orchard or if you
 <cds-button
     kind="tertiary"
     @click.prevent="addAddress"
+    v-if="formData.location.addresses.length < 6"
   >
     <span>Add another address</span>
     <Add16 slot="icon" />
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index 444ba2855a..994e7c3016 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -158,6 +158,7 @@ onMounted(() => setFocusedComponent('addressname_0',800))
   <cds-button
     kind="tertiary"
     @click.prevent="addContact"
+    v-if="formData.location.contacts.length < 6"
   >
     <span>Add another contact</span>
     <Add16 slot="icon" />

From abcb0d466b477988dd30d3272ccc8d2510327fd1 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Thu, 7 Sep 2023 17:27:23 -0700
Subject: [PATCH 101/313] fix: fixing contact/address size

---
 frontend/src/pages/applyform/AddressWizardStep.vue | 2 +-
 frontend/src/pages/applyform/ContactWizardStep.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/applyform/AddressWizardStep.vue b/frontend/src/pages/applyform/AddressWizardStep.vue
index a935878f9f..dab20fe0a3 100644
--- a/frontend/src/pages/applyform/AddressWizardStep.vue
+++ b/frontend/src/pages/applyform/AddressWizardStep.vue
@@ -149,7 +149,7 @@ If you’d like to include another address, for example a seed orchard or if you
 <cds-button
     kind="tertiary"
     @click.prevent="addAddress"
-    v-if="formData.location.addresses.length < 6"
+    v-if="formData.location.addresses.length < 5"
   >
     <span>Add another address</span>
     <Add16 slot="icon" />
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index 994e7c3016..a873336eec 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -158,7 +158,7 @@ onMounted(() => setFocusedComponent('addressname_0',800))
   <cds-button
     kind="tertiary"
     @click.prevent="addContact"
-    v-if="formData.location.contacts.length < 6"
+    v-if="formData.location.contacts.length < 5"
   >
     <span>Add another contact</span>
     <Add16 slot="icon" />

From b7fc3a2f8a203e70bc9ee453d4d4e2b7983cd93b Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Fri, 8 Sep 2023 07:39:30 -0700
Subject: [PATCH 102/313] fix: fixing progress state when error

---
 frontend/src/pages/FormBCeIDPage.vue | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 0fafff9205..eb0c58e6d9 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -38,13 +38,11 @@ import LogOut16 from "@carbon/icons-vue/es/logout/16";
 import Check16 from "@carbon/icons-vue/es/checkmark/16";
 import { isContainedIn } from "@/helpers/validators/GlobalValidators";
 
-const errorBus = useEventBus<ValidationMessageType[]>(
-  "submission-error-notification"
-);
+const errorBus = useEventBus<ValidationMessageType[]>("submission-error-notification");
 const generalErrorBus = useEventBus<string>("general-error-notification");
-const exitBus =
-  useEventBus<Record<string, boolean | null>>("exit-notification");
+const exitBus = useEventBus<Record<string, boolean | null>>("exit-notification");
 const toastBus = useEventBus<ModalNotification>("toast-notification");
+const navigationBus = useEventBus<boolean>('navigation-notification')
 
 const router = useRouter();
 const { setScrollPoint } = useFocus();
@@ -254,19 +252,6 @@ const onBack = () => {
 const validateStep = (valid: boolean) => {
   progressData[currentTab.value].valid = valid;
 };
-const saveChange = () => {
-  if (checkStepValidity(currentTab.value)) {
-    toastBus.emit({
-      message: `“${progressData[currentTab.value].title
-        }” changes were saved successfully.`,
-      kind: "Success",
-      toastTitle: "",
-      active: true,
-      handler: () => { },
-    });
-    goToStep(3);
-  }
-};
 
 const processAndLogOut = () => {
   if (mailAndLogOut.value) {
@@ -298,6 +283,8 @@ exitBus.on((event: Record<string, boolean | null>) => {
   mailAndLogOut.value = event.duplicated ? event.duplicated : false;
 });
 
+navigationBus.on((event: boolean) => ([1,2,3].forEach((index: number) => progressData[index].enabled = event)));
+
 const globalErrorMessage = ref<string>("");
 generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
 </script>
@@ -316,6 +303,7 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
           :state="item.step <= currentTab ? item.step < currentTab ? 'complete' : 'current' : 'incomplete'"
           :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"
           v-on:click="goToStep(item.step)"
+          :disabled="item.enabled === false"
           >
           <span class="cds--progress-label">{{ item.title }}</span>
         </cds-progress-step>

From 4064891f6af9cd1aad0ebe9506ad71a0f2f2b593 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 11 Sep 2023 10:02:57 -0700
Subject: [PATCH 103/313] fix: fixing error notification

Fixing error notification below progress indication.
---
 frontend/components.d.ts                      |   1 +
 frontend/src/assets/styles/global.scss        |   9 +
 .../components/forms/RadioInputComponent.vue  |   5 +-
 .../ErrorNotificationGroupingComponent.vue    | 129 ++++++++++++++
 frontend/src/dto/CommonTypesDto.ts            |   8 +
 .../validators/ExternalFormValidations.ts     |  57 ++++++-
 .../validators/SubmissionValidators.ts        |  23 +--
 frontend/src/pages/FormBCeIDPage.vue          | 160 +++++++++---------
 .../BusinessInformationWizardStep.vue         |   9 +-
 .../src/pages/applyform/ContactWizardStep.vue |   4 +-
 .../stub/__files/response-autocomplete.json   |  16 +-
 .../stub/__files/response-details-FM.json     |   4 +-
 .../stub/__files/response-details-JJ.json     |   2 +-
 frontend/stub/mappings/backend.json           |  15 +-
 14 files changed, 330 insertions(+), 112 deletions(-)
 create mode 100644 frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue

diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 237f6305dd..4ab013aef2 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -15,6 +15,7 @@ declare module '@vue/runtime-core' {
     DataFetcher: typeof import('./src/components/DataFetcher.vue')['default']
     DisplayBlockComponent: typeof import('./src/components/visuals/DisplayBlockComponent.vue')['default']
     DropdownInputComponent: typeof import('./src/components/forms/DropdownInputComponent.vue')['default']
+    ErrorNotificationGroupingComponent: typeof import('./src/components/grouping/ErrorNotificationGroupingComponent.vue')['default']
     MainHeaderComponent: typeof import('./src/components/MainHeaderComponent.vue')['default']
     MultiselectInputComponent: typeof import('./src/components/forms/MultiselectInputComponent.vue')['default']
     NoteComponent: typeof import('./src/components/NoteComponent.vue')['default']
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index b9252fcde3..d0f0172626 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -80,6 +80,15 @@ cds-button span {
 
 cds-inline-notification::part(div), cds-inline-notification, .cds--inline-notification {
   max-width: 100%;
+  border-radius: 0.25rem;
+}
+cds-actionable-notification::part(div), cds-actionable-notification, .cds--actionable-notification {
+  max-width: 100%;
+  border-radius: 0.25rem;
+}
+
+.top-notification {
+  margin-top: 3rem;
 }
 
 * {
diff --git a/frontend/src/components/forms/RadioInputComponent.vue b/frontend/src/components/forms/RadioInputComponent.vue
index f7a4a56f7c..80eeca7251 100644
--- a/frontend/src/components/forms/RadioInputComponent.vue
+++ b/frontend/src/components/forms/RadioInputComponent.vue
@@ -65,9 +65,8 @@ watch(selectedValue, () => {
   emit('empty', isEmpty(selectedValue))
 })
 
-const updateSelectedValue = (event: any) =>
-  (selectedValue.value = event.detail.value)
-  revalidateBus.on(() => validateInput())
+const updateSelectedValue = (event: any) => (selectedValue.value = event.detail.value)
+revalidateBus.on(() => validateInput())
 </script>
 
 <template>
diff --git a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
new file mode 100644
index 0000000000..913482535a
--- /dev/null
+++ b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
@@ -0,0 +1,129 @@
+<script setup lang="ts">
+import { ref } from 'vue'
+// Carbon
+import '@carbon/web-components/es/components/notification/index';
+// Composables
+import { useEventBus } from "@vueuse/core";
+// Types
+import type { ValidationMessageType, ProgressNotification } from '@/dto/CommonTypesDto'
+
+// Define the bus to receive the global error messages and one to send the progress indicator messages
+const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
+const progressIndicatorBus = useEventBus<ProgressNotification>('progress-indicator-bus')
+const errorBus = useEventBus<ValidationMessageType[]>('submission-error-notification')
+
+// Define the global error message
+const globalErrorMessage = ref<ValidationMessageType|undefined>(undefined);
+
+// Handle the global error message, including filtering unsatisfactory messages
+const handleErrorMessage = (event: ValidationMessageType|undefined, payload?:any) => {  
+  
+  // Handling incorrect client type selection
+  if(event && event.fieldId === 'businessInformation.clientType'){
+    // Show as inline notification
+    globalErrorMessage.value = {fieldId: 'server.validation.error', errorMsg: 'Individuals cannot be selected. Please select a different client.'};
+    // Emit back to the form so it can be displayed as a field error
+    errorBus.emit([{fieldId: 'businessInformation.businessName', errorMsg: 'Individuals cannot be selected. Please select a different client.'}]);
+    // Make step 1 with error
+    progressIndicatorBus.emit({ kind: 'error', value: [0]})
+
+    // Handling address without association
+  } else if(event && event.fieldId.startsWith('location.addresses[') && event.fieldId.endsWith('].locationName')){
+    if(payload){
+      // Show as inline notification
+      globalErrorMessage.value = { fieldId: 'missing.address.assigned', errorMsg: payload };
+      // Emit back to the form so it can be displayed as a field error
+      errorBus.emit([
+        {fieldId: event.fieldId, errorMsg: 'You must associate a contact with this address or remove it'},
+        {fieldId: event.fieldId.replace('locationName','country'), errorMsg: 'You must associate a contact with this address or remove it'},
+        {fieldId: event.fieldId.replace('locationName','streetAddress'), errorMsg: 'You must associate a contact with this address or remove it'},
+        {fieldId: event.fieldId.replace('locationName','city'), errorMsg: 'You must associate a contact with this address or remove it'},
+        {fieldId: event.fieldId.replace('locationName','province'), errorMsg: 'You must associate a contact with this address or remove it'},
+        {fieldId: event.fieldId.replace('locationName','postalCode'), errorMsg: 'You must associate a contact with this address or remove it'}
+      ]);
+      // Make step 2 with error
+      progressIndicatorBus.emit({ kind: 'error', value: [1,2]})
+    }
+  } else { 
+    globalErrorMessage.value = event; 
+  }
+}
+
+
+// Watch for changes in the global error message bus
+notificationBus.on(handleErrorMessage);
+
+// Send a message to the progress indicator bus to navigate to a step
+const goToStep = (step: number) => {
+  progressIndicatorBus.emit({ kind: 'navigate', value: step})
+}
+
+</script>
+<template>
+  <div class="top-notification" v-if="globalErrorMessage?.fieldId">
+
+    <cds-inline-notification
+        v-if="globalErrorMessage?.fieldId === 'missing.info'"
+        v-shadow="true"
+        low-contrast="true"
+        hide-close-button="true"
+        open="true"
+        kind="error"
+        title="Missing information:"
+        subtitle="You can't go to the next step before filling all fields correctly."
+      >
+    </cds-inline-notification>
+
+    <cds-inline-notification
+      v-if="globalErrorMessage?.fieldId === 'missing.contact.assigned'"
+      v-shadow="true"
+      low-contrast="true"
+      hide-close-button="true"
+      open="true"
+      kind="error"
+      title="Assigned contact required:">
+    <span>You must associate "{{ globalErrorMessage.errorMsg }}" address with an existing contact or <a href="#" @click="goToStep(2)">add a new contact</a> before submitting the application again.</span>
+    </cds-inline-notification>
+
+    <cds-actionable-notification
+      v-if="globalErrorMessage?.fieldId === 'missing.section.assigned'"
+      v-shadow="true"
+      low-contrast="true"
+      hide-close-button="true"
+      open="true"
+      kind="error"
+      title="Your application could not be submitted:"      
+    >    
+    <div v-if="globalErrorMessage.errorMsg">
+      Review the "{{ globalErrorMessage.errorMsg }}" before submitting the application again.
+    </div>
+    <div v-else>
+      Review the information in the sections below before submitting the application again.
+    </div>
+    </cds-actionable-notification>
+
+    <cds-actionable-notification
+      v-if="globalErrorMessage?.fieldId === 'server.validation.error'"
+      v-shadow="true"
+      low-contrast="true"
+      hide-close-button="true"
+      open="true"
+      kind="error"
+      title="Your application could not be submitted:"      
+    >    
+    <div>{{ globalErrorMessage.errorMsg }}</div>    
+  </cds-actionable-notification>
+
+  <cds-inline-notification
+    v-if="globalErrorMessage?.fieldId === 'missing.address.assigned'"
+    v-shadow="true"
+    low-contrast="true"
+    hide-close-button="true"
+    open="true"
+    kind="error"
+    title="Address without a contact:"
+  >    
+    <div>Looks like "{{ globalErrorMessage.errorMsg }}" doesn’t have a contact. You must associate it with an existing contact or add a new contact before submitting the application again.</div>    
+  </cds-inline-notification>
+  </div>
+</template>
\ No newline at end of file
diff --git a/frontend/src/dto/CommonTypesDto.ts b/frontend/src/dto/CommonTypesDto.ts
index 6ce5a43ba3..ae82b9ff64 100644
--- a/frontend/src/dto/CommonTypesDto.ts
+++ b/frontend/src/dto/CommonTypesDto.ts
@@ -20,6 +20,7 @@ export interface BusinessSearchResult {
 export interface ValidationMessageType {
   fieldId: string
   errorMsg: string
+  originalValue?: string
 }
 
 export const isEmpty = (receivedValue: any): boolean => {
@@ -65,3 +66,10 @@ export interface SessionProperties {
   isLoggedIn: () => boolean
   loadDetails: () => Submitter | undefined
 }
+
+type ProgressNotificationKind = 'disabled' | 'error' | 'navigate'
+
+export interface ProgressNotification {
+  kind: ProgressNotificationKind
+  value?: number | number[] | boolean
+}
\ No newline at end of file
diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
index 7e2a0a91a1..270c063035 100644
--- a/frontend/src/helpers/validators/ExternalFormValidations.ts
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -19,6 +19,7 @@ import type { ValidationMessageType } from '@/dto/CommonTypesDto'
 const errorBus = useEventBus<ValidationMessageType[]>(
   'submission-error-notification'
 )
+const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
 
 // We declare here a collection of all validations for every field in the form
 const globalValidations: Record<string, ((value: string) => string)[]> = {}
@@ -27,6 +28,9 @@ const globalValidations: Record<string, ((value: string) => string)[]> = {}
 globalValidations['businessInformation.businessName'] = [
   isNotEmpty('Business Name cannot be empty'),
 ]
+globalValidations['businessInformation.clientType'] = [
+isNot('I','Individuals cannot be selected. Please select a different client.')
+]
 
 // Step 2: Addresses
 globalValidations['location.addresses.*.locationName'] = [
@@ -167,9 +171,9 @@ export const validate = (keys: string[], target: FormDataDto, notify: boolean =
             errorBus.emit([{fieldId,errorMsg:validationResponse}])
           }
           return validationResponse
-         }else{ 
+        }else{ 
           return ''
-         }
+        }
       }
       // If the field value is an array we run the validation for every item in the array
       if (Array.isArray(fieldValue)) {
@@ -199,6 +203,55 @@ export const validate = (keys: string[], target: FormDataDto, notify: boolean =
   })
 }
 
+// This function will run the validators and return the errors
+export const runValidation = (key: string, target: FormDataDto, validation: (value: string) => string, notify: boolean = false): boolean => {
+  // We split the field key and the condition if it has one
+  const [fieldKey, fieldCondition] = key.includes('(')
+    ? key.replace(')', '').split('(')
+    : [key, 'true']
+  // We then load the field value
+  const fieldValue = getField(fieldKey, target)
+  // We define a function that will run the validation if the condition is true
+  const buildEval = (condition: string) =>
+    condition === 'true' ? 'true' : `target.${condition}`
+  const executeValidation = (item: any, condition: string,fieldId: string = fieldKey) : string =>{
+    // eslint-disable-next-line no-eval
+    if(eval(condition)){
+      const validationResponse = validation(item)
+      if(notify && validationResponse){
+        notificationBus.emit({fieldId,errorMsg:validationResponse}, item)
+      }
+      return validationResponse
+    }else{ 
+      return ''
+    }
+  }
+  // If the field value is an array we run the validation for every item in the array
+  if (Array.isArray(fieldValue)) {
+    return fieldValue.every((item: any, index: number) => {
+      // And sometimes we can end up with another array inside, that's life
+      if (Array.isArray(item)) {
+        if (item.length === 0) item.push('')
+        return item.every((subItem: any) =>
+          executeValidation(
+            subItem, 
+            buildEval(fieldCondition.replace('.*.', `[${index}].`)),
+            fieldKey.replace('.*.', `[${index}].`)
+          )  === '',
+        )
+      }
+      // If it is not an array here, just validate it
+      return executeValidation(
+        item, 
+        buildEval(fieldCondition.replace('.*.', `[${index}].`)),
+        fieldKey.replace('.*.', `[${index}].`)
+        )  === ''
+    })
+  }
+  // If the field value is not an array we run the validation for the field
+  return executeValidation(fieldValue, fieldCondition) === ''  
+}
+
 export const addValidation = (key: string, validation: (value: string) => string): void => {
   if (!globalValidations[key]) globalValidations[key] = []
   globalValidations[key].push(validation)
diff --git a/frontend/src/helpers/validators/SubmissionValidators.ts b/frontend/src/helpers/validators/SubmissionValidators.ts
index 68226a7eca..f64e53ef84 100644
--- a/frontend/src/helpers/validators/SubmissionValidators.ts
+++ b/frontend/src/helpers/validators/SubmissionValidators.ts
@@ -24,28 +24,33 @@ import type { ValidationMessageType } from '@/dto/CommonTypesDto'
 /**
  * Event bus for submission error notifications.
  */
-const errorBus = useEventBus<ValidationMessageType[]>(
-  'submission-error-notification'
-)
+const errorBus = useEventBus<ValidationMessageType[]>('submission-error-notification')
+
 /**
  * Event bus for revalidating the submission.
  */
 const revalidateBus = useEventBus<void>('revalidate-bus')
 
+/**
+ * Event bus for error notifications bar.
+ */
+const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
+
 /**
  * Array of submission validators.
  */
-let submissionValidators : any = []
+let submissionValidators : ValidationMessageType[] = []
 
 /**
  * Register a listener for submission errors on the error bus.
  * When an error is received, update the submission validators array.
  */
 errorBus.on((errors) => {
-  revalidateBus.emit()
-  submissionValidators = errors.map((error) => {
+  submissionValidators = errors.map((error: ValidationMessageType) => {
+    notificationBus.emit(error)
     return { ...error, originalValue: '' }
   })
+  revalidateBus.emit()
 })
 
 /**
@@ -55,7 +60,7 @@ errorBus.on((errors) => {
  * @param value - The new value for the validator's originalValue property.
  */
 const updateValidators = (fieldId: string, value: string): void => {
-  submissionValidators = submissionValidators.map((validator : any) => {
+  submissionValidators = submissionValidators.map((validator : ValidationMessageType) => {
     if (validator.fieldId === fieldId) {
       return { ...validator, originalValue: value }
     }
@@ -73,9 +78,7 @@ export const submissionValidation = (
   fieldName: string
 ): ((value: string) => string) => {
   return (value: string) => {
-    const foundError = submissionValidators.find(
-      (validator: any) => validator.fieldId === fieldName
-    )
+    const foundError = submissionValidators.find((validator: ValidationMessageType) => validator.fieldId === fieldName)
     if (
       foundError &&
       (foundError.originalValue === value || foundError.originalValue === '')
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index eb0c58e6d9..63fec681a2 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -19,7 +19,8 @@ import { newFormDataDto } from "@/dto/ApplyClientNumberDto";
 import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
 import type {
   ValidationMessageType,
-  ModalNotification,
+  ProgressNotification,
+  CodeDescrType,
 } from "@/dto/CommonTypesDto";
 // Imported User session
 import ForestClientUserSession from "@/helpers/ForestClientUserSession";
@@ -27,22 +28,22 @@ import ForestClientUserSession from "@/helpers/ForestClientUserSession";
 import {
   addValidation,
   validate,
+  runValidation,
 } from "@/helpers/validators/ExternalFormValidations";
 // @ts-ignore
 import ArrowRight16 from "@carbon/icons-vue/es/arrow--right/16";
 // @ts-ignore
-import Save16 from "@carbon/icons-vue/es/save/16";
-// @ts-ignore
 import LogOut16 from "@carbon/icons-vue/es/logout/16";
 // @ts-ignore
 import Check16 from "@carbon/icons-vue/es/checkmark/16";
 import { isContainedIn } from "@/helpers/validators/GlobalValidators";
 
-const errorBus = useEventBus<ValidationMessageType[]>("submission-error-notification");
-const generalErrorBus = useEventBus<string>("general-error-notification");
-const exitBus = useEventBus<Record<string, boolean | null>>("exit-notification");
-const toastBus = useEventBus<ModalNotification>("toast-notification");
-const navigationBus = useEventBus<boolean>('navigation-notification')
+const errorBus = useEventBus<ValidationMessageType[]>("submission-error-notification")
+const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification")
+const exitBus = useEventBus<Record<string, boolean | null>>("exit-notification")
+const revalidateBus = useEventBus<void>('revalidate-bus')
+const progressIndicatorBus = useEventBus<ProgressNotification>('progress-indicator-bus')
+
 
 const router = useRouter();
 const { setScrollPoint } = useFocus();
@@ -74,6 +75,14 @@ const locations = computed(() =>
   formData.location.addresses.map((address: any) => address.locationName)
 );
 
+const associatedLocations = computed(() => (formData
+  .location
+  .contacts
+  .map((contact:Contact) => contact.locationNames)
+  .map((locationNames: CodeDescrType[]) => locationNames.map((locationName: CodeDescrType) => locationName.text))
+  .reduce((accumulator: string[], current: string[]) => accumulator.concat(current), [])
+))
+
 const { response, error, fetch } = usePost(
   "/api/clients/submissions",
   toRef(formData).value,
@@ -93,31 +102,12 @@ watch([response], () => {
   }
 });
 
-watch([error], () => {
-  if (error.response?.status === 400) {
-    const validationErrors: ValidationMessageType[] = error.response
-      ?.data as ValidationMessageType[];
-    const fieldIds = [
-      "businessInformation.businessType",
-      "businessInformation.legalType",
-      "businessInformation.clientType",
-    ];
-
-    const matchingFields = validationErrors.find((item) =>
-      fieldIds.includes(item.fieldId)
-    );
-    if (matchingFields) {
-      generalErrorBus.emit(
-        `There was an error submitting your application. ${matchingFields.errorMsg}`
-      );
-      setScrollPoint("top");
-    }
-  } else {
-    generalErrorBus.emit(
-      `There was an error submitting your application. ${error.response?.data}`
-    );
+watch([error], () => {  
+  const validationErrors: ValidationMessageType[] = error.value.response
+    ?.data as ValidationMessageType[];
+  
+    validationErrors.forEach((errorItem: ValidationMessageType) => notificationBus.emit(errorItem));
     setScrollPoint("top");
-  }
 });
 
 addValidation('location.contacts.*.locationNames.*.text', isContainedIn(locations))
@@ -128,7 +118,7 @@ const progressData = reactive([
     title: "Business Information",
     subtitle: "Step 1",
     kind: "current",
-    enabled: true,
+    disabled: false,
     valid: false,
     step: 0,
     fields: [
@@ -136,12 +126,13 @@ const progressData = reactive([
       "businessInformation.businessName",
       "businessInformation.clientType",
     ],
+    extraValidations: [],
   },
   {
     title: "Address",
     subtitle: "Step 2",
-    kind: "queued",
-    enabled: true,
+    kind: "incomplete",
+    disabled: false,
     valid: false,
     step: 1,
     fields: [
@@ -154,12 +145,13 @@ const progressData = reactive([
       'location.addresses.*.postalCode(location.addresses.*.country.text === "US")',
       'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")',
     ],
+    extraValidations: [],
   },
   {
     title: "Contacts",
     subtitle: "Step 3",
-    kind: "queued",
-    enabled: true,
+    kind: "incomplete",
+    disabled: false,
     valid: false,
     step: 2,
     fields: [
@@ -170,12 +162,16 @@ const progressData = reactive([
       "location.contacts.*.email",
       "location.contacts.*.phoneNumber",
     ],
+    extraValidations: [{
+      field: 'location.addresses.*.locationName', validation: isContainedIn(associatedLocations,'Looks like “${item}” doesn’t have a contact. You must associate it with an existing contact or add a new contact before submitting the application again.')
+    }
+    ],
   },
   {
     title: "Review",
     subtitle: "Step 4",
-    kind: "queued",
-    enabled: true,
+    kind: "incomplete",
+    disabled: false,
     valid: false,
     step: 3,
     fields: [
@@ -196,58 +192,62 @@ const progressData = reactive([
       "location.contacts.*.email",
       "location.contacts.*.phoneNumber",
     ],
+    extraValidations: [],
   },
 ]);
 
 const currentTab = ref(0);
 
-const stateIcon = (index: number) => {
-  if (currentTab.value == index) return 'current'
-  if (currentTab.value > index || progressData[index].valid) return 'complete'
-  return 'incomplete'
-}
-
 const checkStepValidity = (stepNumber: number): boolean => {
   progressData.forEach((step: any) => {
     if (step.step <= stepNumber) {
       step.valid = validate(step.fields, formData, true);
     }
   });
+
+  if(!progressData[stepNumber]
+    .extraValidations
+    .every((validation: any) => runValidation(validation.field, formData, validation.validation, true))
+  )
+    return false;
+  
   return progressData[stepNumber].valid;
 };
 
 const isLast = computed(() => currentTab.value === progressData.length - 1);
 const isFirst = computed(() => currentTab.value === 0);
-const isCurrentValid = computed(() => progressData[currentTab.value].valid);
-const isNextAvailable = computed(() => !isCurrentValid.value || isLast.value);
-const isFormValid = computed(() =>
-  progressData.every((entry: any) => entry.valid)
-);
 const endAndLogOut = ref<boolean>(false);
 const mailAndLogOut = ref<boolean>(false);
 
-const goToStep = (index: number) => {
-  if (index <= currentTab.value && checkStepValidity(index)) currentTab.value = index;
+const goToStep = (index: number, skipCheck: boolean = false) => {
+  if (skipCheck || (index <= currentTab.value && checkStepValidity(index))) currentTab.value = index;
+  else notificationBus.emit({ fieldId: 'missing.info', errorMsg: '' });
+  revalidateBus.emit()
 };
 
 
 const onNext = () => {
+  notificationBus.emit(undefined);
   if (currentTab.value + 1 < progressData.length) {
     if (checkStepValidity(currentTab.value)) {
       currentTab.value++;
-      progressData[currentTab.value - 1].kind = stateIcon(currentTab.value - 1);
-      progressData[currentTab.value].kind = stateIcon(currentTab.value);
-      setScrollPoint("top");
+      progressData[currentTab.value - 1].kind = 'complete';
+      progressData[currentTab.value].kind = 'current';
+      setTimeout(revalidateBus.emit, 1000)
     }
+    setScrollPoint("top");
   }
+  
 };
 const onBack = () => {
   if (currentTab.value - 1 >= 0) {
     currentTab.value--;
-    progressData[currentTab.value + 1].kind = stateIcon(currentTab.value + 1);
-    progressData[currentTab.value].kind = stateIcon(currentTab.value);
-    setScrollPoint("top");
+    progressData[currentTab.value + 1].kind = 'incomplete';
+    progressData[currentTab.value].kind = 'current';
+    setScrollPoint("top");    
+    setTimeout(revalidateBus.emit, 1000)
   }
+  
 };
 const validateStep = (valid: boolean) => {
   progressData[currentTab.value].valid = valid;
@@ -272,7 +272,7 @@ const processAndLogOut = () => {
 
 const submit = () => {
   errorBus.emit([]);
-  generalErrorBus.emit("");
+  notificationBus.emit(undefined);
   if (checkStepValidity(currentTab.value)) {
     fetch();
   }
@@ -283,10 +283,18 @@ exitBus.on((event: Record<string, boolean | null>) => {
   mailAndLogOut.value = event.duplicated ? event.duplicated : false;
 });
 
-navigationBus.on((event: boolean) => ([1,2,3].forEach((index: number) => progressData[index].enabled = event)));
+progressIndicatorBus.on((event: ProgressNotification) => {  
+  if(event.kind === 'disabled') ([1,2,3].forEach((index: number) => progressData[index].disabled = event.value as boolean))
+  if(event.kind === 'navigate') goToStep(event.value as number, true)
+  if(event.kind === 'error'){ 
+    (event.value as number[]).forEach((index: number) => {
+      progressData[index].valid = false
+      progressData[index].kind = 'invalid'
+    })
+  }
+});
 
-const globalErrorMessage = ref<string>("");
-generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
+const reEval = () => (revalidateBus.emit())
 </script>
 
 <template>
@@ -300,29 +308,17 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
           v-for="item in progressData"
           :key="item.step"
           :secondary-label="item.subtitle"
-          :state="item.step <= currentTab ? item.step < currentTab ? 'complete' : 'current' : 'incomplete'"
+          :state="item.kind"
           :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"
           v-on:click="goToStep(item.step)"
-          :disabled="item.enabled === false"
+          :disabled="item.disabled"
           >
           <span class="cds--progress-label">{{ item.title }}</span>
         </cds-progress-step>
-      </cds-progress-indicator>
-      <cds-inline-notification
-      v-if="globalErrorMessage"
-      v-shadow="true"
-      low-contrast="true"
-      hide-close-button="true"
-      open="true"
-      kind="error"
-      title="Your application could not be submitted"
-      :subtitle="globalErrorMessage"
-    >
-    </cds-inline-notification>
+      </cds-progress-indicator>      
+    <error-notification-grouping-component />
   </div>
 
-
-
   <div class="form-steps">
 
     <div v-if="currentTab == 0" class="form-steps-01">
@@ -480,6 +476,14 @@ generalErrorBus.on((event: string) => (globalErrorMessage.value = event));
           <LogOut16 slot="icon" />
         </cds-button>
 
+        <cds-button
+            kind="tertiary"
+            size="lg"            
+            v-on:click="reEval"            
+          >
+          <span>Eval</span>
+        </cds-button>
+
         </div>
       </div>
     
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index a5b4f45c99..cb754c90c3 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -7,7 +7,7 @@ import '@carbon/web-components/es/components/notification/index';
 import { useEventBus } from '@vueuse/core'
 import { useFetchTo } from '@/composables/useFetch'
 // Importing types
-import type { BusinessSearchResult} from '@/dto/CommonTypesDto'
+import type { BusinessSearchResult, ProgressNotification } from '@/dto/CommonTypesDto'
 import { ClientTypeEnum } from '@/dto/CommonTypesDto'
 import type {
   FormDataDto,
@@ -30,7 +30,7 @@ const emit = defineEmits<{
 }>()
 
 //Defining the event bus to send notifications up
-const navigationBus = useEventBus<boolean>('navigation-notification')
+const progressIndicatorBus = useEventBus<ProgressNotification>('progress-indicator-bus')
 const exitBus = useEventBus<Record<string, boolean | null>>('exit-notification')
 const generalErrorBus = useEventBus<string>('general-error-notification')
 
@@ -87,10 +87,10 @@ const toggleErrorMessages = (
   showDuplicatedError.value = duplicated ?? false
 
   if (goodStanding || duplicated) {
-    navigationBus.emit(false)
+    progressIndicatorBus.emit({kind: 'disabled', value: true})
     exitBus.emit({ goodStanding, duplicated })
   } else {
-    navigationBus.emit(true)
+    progressIndicatorBus.emit({kind: 'disabled', value: false})
     exitBus.emit({ goodStanding: false, duplicated: false })
   }
 }
@@ -226,7 +226,6 @@ watch([selectedOption], () => {
       :contents="content"
       :validations="[
         ...getValidations('businessInformation.businessName'),
-        ...getValidations('businessInformation.clientType'),
         submissionValidation('businessInformation.businessName'),
         submissionValidation('businessInformation.clientType')
         ]"
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index a873336eec..4cb1bba7a3 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -152,8 +152,8 @@ onMounted(() => setFocusedComponent('addressname_0',800))
   </div>
 
   <span class="body-01">
-              To add another contact to the account, select "Add another
-              contact" button below.</span>
+    To add another contact to the account, select "Add another contact" button below.
+  </span>
 
   <cds-button
     kind="tertiary"
diff --git a/frontend/stub/__files/response-autocomplete.json b/frontend/stub/__files/response-autocomplete.json
index 8a8799677e..a0a81e88a3 100644
--- a/frontend/stub/__files/response-autocomplete.json
+++ b/frontend/stub/__files/response-autocomplete.json
@@ -3,48 +3,48 @@
     "code": "XX9016140",
     "name": "Pacific Lumber Association",
     "status": "ACTIVE",
-    "legalType": "SP"
+    "legalType": "GP"
   },
   {
     "code": "XX9753423",
     "name": "Pacific Forests Ltd",
     "status": "ACTIVE",
-    "legalType": "SP"
+    "legalType": "GP"
   },
   {
     "code": "XX7944564",
     "name": "Starfire Pacific Inc",
     "status": "ACTIVE",
-    "legalType": "SP"
+    "legalType": "GP"
   },
   {
     "code": "UU2648185",
     "name": "{{request.path.[3]}}",
     "status": "ACTIVE",
-    "legalType": "SP"
+    "legalType": "GP"
   },
   {
     "code": "JJ3478189",
     "name": "Pacific Cultural Association",
     "status": "ACTIVE",
-    "legalType": "SP"
+    "legalType": "GP"
   },
   {
     "code": "ZZ8201962",
     "name": "Edgar Paciolli",
     "status": "ACTIVE",
-    "legalType": "SP"
+    "legalType": "GP"
   },
   {
     "code": "YY5199142",
     "name": "Powel of the Pacific",
     "status": "ACTIVE",
-    "legalType": "SP"
+    "legalType": "GP"
   },
   {
     "code":"FM1234567",
     "name":"The Great Pacific  Forest Company",
     "status":"ACTIVE",
-    "legalType":"SP"
+    "legalType": "SP"
   }
 ]
diff --git a/frontend/stub/__files/response-details-FM.json b/frontend/stub/__files/response-details-FM.json
index d4b60b22f6..6083227791 100644
--- a/frontend/stub/__files/response-details-FM.json
+++ b/frontend/stub/__files/response-details-FM.json
@@ -22,8 +22,8 @@
   "contacts": [
     {
       "contactType": {
-        "value": "person",
-        "text": "person"
+        "value": "P",
+        "text": "Person"
       },
       "firstName": "Jhon",
       "lastName": "Wick",
diff --git a/frontend/stub/__files/response-details-JJ.json b/frontend/stub/__files/response-details-JJ.json
index f4004f8664..cd4cf092df 100644
--- a/frontend/stub/__files/response-details-JJ.json
+++ b/frontend/stub/__files/response-details-JJ.json
@@ -16,7 +16,7 @@
       "index": 0,
       "locationNames": [
         {
-          "value": "00",
+          "value": "0",
           "text": "Mailing address"
         }
       ]
diff --git a/frontend/stub/mappings/backend.json b/frontend/stub/mappings/backend.json
index af325afd3f..192a1cd4b4 100644
--- a/frontend/stub/mappings/backend.json
+++ b/frontend/stub/mappings/backend.json
@@ -1,6 +1,7 @@
 {
   "mappings": [
     {
+      "name":"Autocomplete BC Registry",
       "request": {
         "urlPattern": "/api/clients/name/(.*)",
         "method": "GET"
@@ -12,6 +13,7 @@
       }
     },
     {
+      "name":"BC Registry Details OK",
       "request": {
         "urlPattern": "/api/clients/(XX|YY|UU|JJ|FM)(.*)",
         "method": "GET"
@@ -24,18 +26,20 @@
       }
     },
     {
+      "name":"BC Registry Details Duplicated",
       "request": {
         "urlPattern": "/api/clients/ZZ(.*)",
         "method": "GET"
       },
       "response": {
         "status": 409,
-        "body": "The Dupped Company already exists with the Incorporation number {{request.path.[2]}} and client number 999999",
+        "body": "The Edgar Paciolli already exists with the Incorporation number {{request.path.[2]}} and client number 999999",
         "transformers": ["response-template"]
       }
     },
 
     {
+      "name":"Country Codes",
       "request": {
         "url": "/api/clients/activeCountryCodes?page=0&size=250",
         "method": "GET"
@@ -46,6 +50,7 @@
       }
     },
     {
+      "name":"Province Codes",
       "request": {
         "urlPattern": "/api/clients/activeCountryCodes/(.*)?page=0&size=250",
         "method": "GET"
@@ -58,6 +63,7 @@
     },
 
     {
+      "name":"Contact Type Codes",
       "request": {
         "url": "/api/clients/activeContactTypeCodes?page=0&size=250",
         "method": "GET"
@@ -69,6 +75,7 @@
     },
 
     {
+      "name":"Submission Success for XX",
       "request": {
         "url": "/api/clients/submissions",
         "method": "POST",
@@ -90,6 +97,7 @@
       }
     },
     {
+      "name":"Submission Error for UU",
       "request": {
         "url": "/api/clients/submissions",
         "method": "POST",
@@ -108,6 +116,7 @@
       }
     },
     {
+      "name":"Send email for ZZ",
       "request": {
         "url": "/api/clients/mail",
         "method": "POST",
@@ -125,6 +134,7 @@
       }
     },
     {
+      "name":"Submission Error for FM1234567",
       "request": {
         "url": "/api/clients/submissions",
         "method": "POST",
@@ -144,6 +154,7 @@
     },
 
     {
+      "name":"Autocompete Canada Post",
       "request": {
         "urlPath": "/api/clients/addresses",
         "method": "GET",
@@ -165,6 +176,7 @@
       }
     },
     {
+      "name":"Canada Post details for AA",
       "request": {
         "url": "/api/clients/addresses/AA",
         "method": "GET"
@@ -177,6 +189,7 @@
       }
     },
     {
+      "name":"Canada Post error details for BB",
       "request": {
         "url": "/api/clients/addresses/BB",
         "method": "GET"

From 12737728012671b703210dea52485f555750423e Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 11 Sep 2023 10:04:55 -0700
Subject: [PATCH 104/313] fix: fixing dropdown

---
 frontend/src/components/forms/DropdownInputComponent.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index b00f62ddb6..8ed74849bc 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -80,6 +80,10 @@ const validateInput = (newValue: any) => {
 
 watch(inputList,() => (selectedValue.value = props.initialValue))
 
+const selectItem = (event:any) => {  
+  selectedValue.value = event?.detail?.item?.getAttribute('data-id')
+}
+
 revalidateBus.on(() => validateInput(selectedValue.value))
 </script>
 
@@ -94,7 +98,7 @@ revalidateBus.on(() => validateInput(selectedValue.value))
       :value="selectedValue"
       :invalid="error ? true : false"
       :invalid-text="error"
-      @cds-combo-box-selected="(event:any) => selectedValue = event.detail.item.getAttribute('data-id')"
+      @cds-combo-box-selected="selectItem"
       :data-focus="id"
       :data-scroll="id">
       <cds-combo-box-item 

From 0e70efd3021e572fde79ddf537b53ae3ddbbc207 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 11 Sep 2023 10:16:16 -0700
Subject: [PATCH 105/313] fix: fixing multi select

---
 .../forms/DropdownInputComponent.vue          | 29 +++++++--------
 .../forms/MultiselectInputComponent.vue       | 35 ++++++++++---------
 frontend/src/pages/FormBCeIDPage.vue          |  8 -----
 3 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index 8ed74849bc..43d641a4b9 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -32,13 +32,6 @@ const error = ref<string | undefined>(props.errorMessage || '')
 
 const revalidateBus = useEventBus<void>('revalidate-bus')
 
-//We watch for error changes to emit events
-watch(error, () => emit('error', error.value))
-watch(
-  () => props.errorMessage,
-  () => (error.value = props.errorMessage)
-)
-
 //We set it as a separated ref due to props not being updatable
 const selectedValue = ref(props.initialValue)
 // This is to make the input list contains the selected value to show when component render
@@ -58,11 +51,6 @@ const emitValueChange = (newValue: string): void => {
   emit('update:selectedValue', reference)
   emit('empty', isEmpty(newValue))
 }
-//Watch for changes on the input
-watch([selectedValue], () => {
-  validateInput(selectedValue.value)
-  emitValueChange(selectedValue.value)
-})
 
 //We call all the validations
 const validateInput = (newValue: any) => {
@@ -78,12 +66,25 @@ const validateInput = (newValue: any) => {
   }
 }
 
-watch(inputList,() => (selectedValue.value = props.initialValue))
-
 const selectItem = (event:any) => {  
   selectedValue.value = event?.detail?.item?.getAttribute('data-id')
 }
 
+//Watch for changes on the input
+watch([selectedValue], () => {
+  validateInput(selectedValue.value)
+  emitValueChange(selectedValue.value)
+})
+
+watch(inputList,() => (selectedValue.value = props.initialValue))
+
+//We watch for error changes to emit events
+watch(error, () => emit('error', error.value))
+watch(
+  () => props.errorMessage,
+  () => (error.value = props.errorMessage)
+)
+
 revalidateBus.on(() => validateInput(selectedValue.value))
 </script>
 
diff --git a/frontend/src/components/forms/MultiselectInputComponent.vue b/frontend/src/components/forms/MultiselectInputComponent.vue
index a26fa27df0..aedce8f6e4 100644
--- a/frontend/src/components/forms/MultiselectInputComponent.vue
+++ b/frontend/src/components/forms/MultiselectInputComponent.vue
@@ -7,6 +7,7 @@ import '@carbon/web-components/es/components/tag/index';
 import { useEventBus } from '@vueuse/core'
 // Types
 import type {  CodeNameType } from '@/dto/CommonTypesDto'
+import { isEmpty } from '@/dto/CommonTypesDto'
 
 //Define the input properties for this component
 const props = defineProps<{
@@ -33,24 +34,15 @@ const error = ref<string | undefined>(props.errorMessage || '')
 
 const revalidateBus = useEventBus<void>('revalidate-bus')
 
-//We watch for error changes to emit events
-watch(error, () => emit('error', error.value))
-watch(
-  () => props.errorMessage,
-  () => (error.value = props.errorMessage)
-)
-
 //We set it as a separated ref due to props not being updatable
 const selectedValue = ref(props.initialValue)
+// This is to make the input list contains the selected value to show when component render
 const inputList = computed<Array<CodeNameType>>(() =>
   ((!props.modelValue || props.modelValue.length === 0) ? [{name: props.initialValue, code: '',status:'',legalType:''}] : props.modelValue)
 )
 
 //We set the value prop as a reference for update reason
-emit('empty', props.selectedValues ? props.initialValue.length === 0 : true)
-
-//Watch for changes on the input
-watch([selectedValue], () => validateInput(selectedValue.value))
+emit('empty', props.selectedValues ? props.selectedValues.length === 0 : true)
 
 //Controls the selected values
 const items = ref<string[]>([])
@@ -75,10 +67,6 @@ const validateInput = (newValue: any) => {
         .shift() ?? props.errorMessage
   }
 }
-watch(
-  () => props.modelValue,
-  () => (selectedValue.value = props.initialValue)
-)
 
 const emitChange = () => {
   const reference = props.modelValue.filter((entry) =>
@@ -104,9 +92,24 @@ const selectItems = (event:any) => {
   items.value = contentValue.split(',').filter((value:string) => value)
 }
 
+props.selectedValues?.forEach((value: string) => addFromSelection(value))
+
 watch([items], () => emitChange())
 
-props.selectedValues?.forEach((value: string) => addFromSelection(value))
+watch(
+  () => props.modelValue,
+  () => (selectedValue.value = props.initialValue)
+)
+
+watch([selectedValue], () => validateInput(selectedValue.value))
+
+//We watch for error changes to emit events
+watch(error, () => emit('error', error.value))
+watch(
+  () => props.errorMessage,
+  () => (error.value = props.errorMessage)
+)
+
 validateInput(selectedValue.value)
 revalidateBus.on(() => validateInput(selectedValue.value))
 </script>
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 63fec681a2..1d49d1be4c 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -476,14 +476,6 @@ const reEval = () => (revalidateBus.emit())
           <LogOut16 slot="icon" />
         </cds-button>
 
-        <cds-button
-            kind="tertiary"
-            size="lg"            
-            v-on:click="reEval"            
-          >
-          <span>Eval</span>
-        </cds-button>
-
         </div>
       </div>
     

From 1e4bbb23ac2e579d9925d8c9e06dc88c2524fc92 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 11 Sep 2023 12:14:54 -0700
Subject: [PATCH 106/313] chore: updating stubs to add more addresses

---
 frontend/stub/__files/.gitkeep                |  0
 .../stub/__files/response-address-A3F0B5.json |  1 +
 .../stub/__files/response-address-B4X9S7.json |  1 +
 .../stub/__files/response-address-B5V6L4.json |  1 +
 .../stub/__files/response-address-C2L3W7.json |  1 +
 .../stub/__files/response-address-C5T3I9.json |  1 +
 .../stub/__files/response-address-E2A9U5.json |  1 +
 .../stub/__files/response-address-F2L6B3.json |  1 +
 .../stub/__files/response-address-F8P0K6.json |  1 +
 .../stub/__files/response-address-G3F6J5.json |  1 +
 .../stub/__files/response-address-G4C8E2.json |  1 +
 .../stub/__files/response-address-I1R9Y6.json |  1 +
 .../stub/__files/response-address-M2W5E5.json |  1 +
 .../stub/__files/response-address-P0Y9A3.json |  1 +
 .../stub/__files/response-address-P5Q7S4.json |  1 +
 .../stub/__files/response-address-R0K7W4.json |  1 +
 .../stub/__files/response-address-T7R2X0.json |  1 +
 .../stub/__files/response-address-U2E6Y1.json |  1 +
 .../stub/__files/response-address-U3H8X8.json |  1 +
 .../stub/__files/response-address-U4Y1G4.json |  1 +
 .../stub/__files/response-address-V8V8V8.json |  1 +
 .../stub/__files/response-address-X4I6G7.json |  1 +
 .../stub/__files/response-address-detail.json |  9 --
 .../stub/__files/response-address-search.json | 86 ++++++++++++++++++-
 frontend/stub/mappings/backend.json           | 10 +--
 25 files changed, 109 insertions(+), 17 deletions(-)
 delete mode 100644 frontend/stub/__files/.gitkeep
 create mode 100644 frontend/stub/__files/response-address-A3F0B5.json
 create mode 100644 frontend/stub/__files/response-address-B4X9S7.json
 create mode 100644 frontend/stub/__files/response-address-B5V6L4.json
 create mode 100644 frontend/stub/__files/response-address-C2L3W7.json
 create mode 100644 frontend/stub/__files/response-address-C5T3I9.json
 create mode 100644 frontend/stub/__files/response-address-E2A9U5.json
 create mode 100644 frontend/stub/__files/response-address-F2L6B3.json
 create mode 100644 frontend/stub/__files/response-address-F8P0K6.json
 create mode 100644 frontend/stub/__files/response-address-G3F6J5.json
 create mode 100644 frontend/stub/__files/response-address-G4C8E2.json
 create mode 100644 frontend/stub/__files/response-address-I1R9Y6.json
 create mode 100644 frontend/stub/__files/response-address-M2W5E5.json
 create mode 100644 frontend/stub/__files/response-address-P0Y9A3.json
 create mode 100644 frontend/stub/__files/response-address-P5Q7S4.json
 create mode 100644 frontend/stub/__files/response-address-R0K7W4.json
 create mode 100644 frontend/stub/__files/response-address-T7R2X0.json
 create mode 100644 frontend/stub/__files/response-address-U2E6Y1.json
 create mode 100644 frontend/stub/__files/response-address-U3H8X8.json
 create mode 100644 frontend/stub/__files/response-address-U4Y1G4.json
 create mode 100644 frontend/stub/__files/response-address-V8V8V8.json
 create mode 100644 frontend/stub/__files/response-address-X4I6G7.json
 delete mode 100644 frontend/stub/__files/response-address-detail.json

diff --git a/frontend/stub/__files/.gitkeep b/frontend/stub/__files/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/frontend/stub/__files/response-address-A3F0B5.json b/frontend/stub/__files/response-address-A3F0B5.json
new file mode 100644
index 0000000000..99b7b48852
--- /dev/null
+++ b/frontend/stub/__files/response-address-A3F0B5.json
@@ -0,0 +1 @@
+{"streetAddress":"3085 Lake of Bays Road","country":{"value":"CA","text":"Canada"},"province":{"value":"AB","text":"Alberta"},"city":"Winfield","postalCode":"A3F0B5","index":3,"locationName":null}
diff --git a/frontend/stub/__files/response-address-B4X9S7.json b/frontend/stub/__files/response-address-B4X9S7.json
new file mode 100644
index 0000000000..31a77be50f
--- /dev/null
+++ b/frontend/stub/__files/response-address-B4X9S7.json
@@ -0,0 +1 @@
+{"streetAddress":"2548 36th Ave","country":{"value":"CA","text":"Canada"},"province":{"value":"NU","text":"Nunavut"},"city":"Minto","postalCode":"B4X9S7","index":19,"locationName":null}
diff --git a/frontend/stub/__files/response-address-B5V6L4.json b/frontend/stub/__files/response-address-B5V6L4.json
new file mode 100644
index 0000000000..523e8a1340
--- /dev/null
+++ b/frontend/stub/__files/response-address-B5V6L4.json
@@ -0,0 +1 @@
+{"streetAddress":"9084 Concession Road 6","country":{"value":"CA","text":"Canada"},"province":{"value":"QC","text":"Québec"},"city":"Charlottetown","postalCode":"B5V6L4","index":21,"locationName":null}
diff --git a/frontend/stub/__files/response-address-C2L3W7.json b/frontend/stub/__files/response-address-C2L3W7.json
new file mode 100644
index 0000000000..d00c6ba18b
--- /dev/null
+++ b/frontend/stub/__files/response-address-C2L3W7.json
@@ -0,0 +1 @@
+{"streetAddress":"6870 Tecumseh Rd","country":{"value":"CA","text":"Canada"},"province":{"value":"NL","text":"Newfoundland and Labrador"},"city":"Lumsden","postalCode":"C2L3W7","index":10,"locationName":null}
diff --git a/frontend/stub/__files/response-address-C5T3I9.json b/frontend/stub/__files/response-address-C5T3I9.json
new file mode 100644
index 0000000000..f26dd0564d
--- /dev/null
+++ b/frontend/stub/__files/response-address-C5T3I9.json
@@ -0,0 +1 @@
+{"streetAddress":"8494 Pine Rd","country":{"value":"CA","text":"Canada"},"province":{"value":"QC","text":"Québec"},"city":"Trout Lake","postalCode":"C5T3I9","index":8,"locationName":null}
diff --git a/frontend/stub/__files/response-address-E2A9U5.json b/frontend/stub/__files/response-address-E2A9U5.json
new file mode 100644
index 0000000000..dcc65b0a81
--- /dev/null
+++ b/frontend/stub/__files/response-address-E2A9U5.json
@@ -0,0 +1 @@
+{"streetAddress":"7044 Dieppe Ave","country":{"value":"CA","text":"Canada"},"province":{"value":"ON","text":"Ontario"},"city":"Carleton","postalCode":"E2A9U5","index":18,"locationName":null}
diff --git a/frontend/stub/__files/response-address-F2L6B3.json b/frontend/stub/__files/response-address-F2L6B3.json
new file mode 100644
index 0000000000..2c18f8b4c5
--- /dev/null
+++ b/frontend/stub/__files/response-address-F2L6B3.json
@@ -0,0 +1 @@
+{"streetAddress":"7056 Lakeview Ave","country":{"value":"CA","text":"Canada"},"province":{"value":"QC","text":"Québec"},"city":"Grand Falls","postalCode":"F2L6B3","index":15,"locationName":null}
diff --git a/frontend/stub/__files/response-address-F8P0K6.json b/frontend/stub/__files/response-address-F8P0K6.json
new file mode 100644
index 0000000000..be986c8e64
--- /dev/null
+++ b/frontend/stub/__files/response-address-F8P0K6.json
@@ -0,0 +1 @@
+{"streetAddress":"9060 Oak St","country":{"value":"CA","text":"Canada"},"province":{"value":"YT","text":"Yukon"},"city":"Georgetown","postalCode":"F8P0K6","index":6,"locationName":null}
diff --git a/frontend/stub/__files/response-address-G3F6J5.json b/frontend/stub/__files/response-address-G3F6J5.json
new file mode 100644
index 0000000000..c04f102a02
--- /dev/null
+++ b/frontend/stub/__files/response-address-G3F6J5.json
@@ -0,0 +1 @@
+{"streetAddress":"6163 Oak St","country":{"value":"CA","text":"Canada"},"province":{"value":"BC","text":"British Columbia"},"city":"Deer Lake","postalCode":"G3F6J5","index":16,"locationName":null}
diff --git a/frontend/stub/__files/response-address-G4C8E2.json b/frontend/stub/__files/response-address-G4C8E2.json
new file mode 100644
index 0000000000..00cf1966ea
--- /dev/null
+++ b/frontend/stub/__files/response-address-G4C8E2.json
@@ -0,0 +1 @@
+{"streetAddress":"4945 Disputed Rd","country":{"value":"CA","text":"Canada"},"province":{"value":"QC","text":"Québec"},"city":"Cumberland","postalCode":"G4C8E2","index":2,"locationName":null}
diff --git a/frontend/stub/__files/response-address-I1R9Y6.json b/frontend/stub/__files/response-address-I1R9Y6.json
new file mode 100644
index 0000000000..f9ea3b2ef0
--- /dev/null
+++ b/frontend/stub/__files/response-address-I1R9Y6.json
@@ -0,0 +1 @@
+{"streetAddress":"8803 Brock Rd","country":{"value":"CA","text":"Canada"},"province":{"value":"NT","text":"Northwest Territories"},"city":"Flatrock","postalCode":"I1R9Y6","index":17,"locationName":null}
diff --git a/frontend/stub/__files/response-address-M2W5E5.json b/frontend/stub/__files/response-address-M2W5E5.json
new file mode 100644
index 0000000000..88e57d33c2
--- /dev/null
+++ b/frontend/stub/__files/response-address-M2W5E5.json
@@ -0,0 +1 @@
+{"streetAddress":"3925 Dieppe Ave","country":{"value":"CA","text":"Canada"},"province":{"value":"NS","text":"Nova Scotia"},"city":"Lumsden","postalCode":"M2W5E5","index":5,"locationName":null}
diff --git a/frontend/stub/__files/response-address-P0Y9A3.json b/frontend/stub/__files/response-address-P0Y9A3.json
new file mode 100644
index 0000000000..99e8a072c7
--- /dev/null
+++ b/frontend/stub/__files/response-address-P0Y9A3.json
@@ -0,0 +1 @@
+{"streetAddress":"953 Peel St","country":{"value":"CA","text":"Canada"},"province":{"value":"YT","text":"Yukon"},"city":"St. Antoine","postalCode":"P0Y9A3","index":4,"locationName":null}
diff --git a/frontend/stub/__files/response-address-P5Q7S4.json b/frontend/stub/__files/response-address-P5Q7S4.json
new file mode 100644
index 0000000000..7bdcdda2f3
--- /dev/null
+++ b/frontend/stub/__files/response-address-P5Q7S4.json
@@ -0,0 +1 @@
+{"streetAddress":"547 Richmond Ave","country":{"value":"CA","text":"Canada"},"province":{"value":"SK","text":"Saskatchewan"},"city":"Hampton","postalCode":"P5Q7S4","index":20,"locationName":null}
diff --git a/frontend/stub/__files/response-address-R0K7W4.json b/frontend/stub/__files/response-address-R0K7W4.json
new file mode 100644
index 0000000000..ddcc6c119b
--- /dev/null
+++ b/frontend/stub/__files/response-address-R0K7W4.json
@@ -0,0 +1 @@
+{"streetAddress":"5376 Victoria Ave","country":{"value":"CA","text":"Canada"},"province":{"value":"NB","text":"New Brunswick"},"city":"Selkirk","postalCode":"R0K7W4","index":14,"locationName":null}
diff --git a/frontend/stub/__files/response-address-T7R2X0.json b/frontend/stub/__files/response-address-T7R2X0.json
new file mode 100644
index 0000000000..b5094475a3
--- /dev/null
+++ b/frontend/stub/__files/response-address-T7R2X0.json
@@ -0,0 +1 @@
+{"streetAddress":"8979 Pierre Ave","country":{"value":"CA","text":"Canada"},"province":{"value":"SK","text":"Saskatchewan"},"city":"Russell","postalCode":"T7R2X0","index":11,"locationName":null}
diff --git a/frontend/stub/__files/response-address-U2E6Y1.json b/frontend/stub/__files/response-address-U2E6Y1.json
new file mode 100644
index 0000000000..5124b44398
--- /dev/null
+++ b/frontend/stub/__files/response-address-U2E6Y1.json
@@ -0,0 +1 @@
+{"streetAddress":"1457 Bay Ave","country":{"value":"CA","text":"Canada"},"province":{"value":"PE","text":"Prince Edward Island"},"city":"Kingston","postalCode":"U2E6Y1","index":13,"locationName":null}
diff --git a/frontend/stub/__files/response-address-U3H8X8.json b/frontend/stub/__files/response-address-U3H8X8.json
new file mode 100644
index 0000000000..33c232907d
--- /dev/null
+++ b/frontend/stub/__files/response-address-U3H8X8.json
@@ -0,0 +1 @@
+{"streetAddress":"6493 Maple Ave","country":{"value":"CA","text":"Canada"},"province":{"value":"NB","text":"New Brunswick"},"city":"Russell","postalCode":"U3H8X8","index":9,"locationName":null}
diff --git a/frontend/stub/__files/response-address-U4Y1G4.json b/frontend/stub/__files/response-address-U4Y1G4.json
new file mode 100644
index 0000000000..98bd827846
--- /dev/null
+++ b/frontend/stub/__files/response-address-U4Y1G4.json
@@ -0,0 +1 @@
+{"streetAddress":"6750 College Ave","country":{"value":"CA","text":"Canada"},"province":{"value":"QC","text":"Québec"},"city":"Red Rock","postalCode":"U4Y1G4","index":7,"locationName":null}
diff --git a/frontend/stub/__files/response-address-V8V8V8.json b/frontend/stub/__files/response-address-V8V8V8.json
new file mode 100644
index 0000000000..a14ef94e26
--- /dev/null
+++ b/frontend/stub/__files/response-address-V8V8V8.json
@@ -0,0 +1 @@
+{"streetAddress":"1234 Nowhere St","country":{"value":"CA","text":"Canada"},"province":{"value":"BC","text":"British Columbia"},"city":"Victoria","postalCode":"V8V8V8","index":0,"locationName":null}
diff --git a/frontend/stub/__files/response-address-X4I6G7.json b/frontend/stub/__files/response-address-X4I6G7.json
new file mode 100644
index 0000000000..a0688cdeaf
--- /dev/null
+++ b/frontend/stub/__files/response-address-X4I6G7.json
@@ -0,0 +1 @@
+{"streetAddress":"6076 15th St","country":{"value":"CA","text":"Canada"},"province":{"value":"SK","text":"Saskatchewan"},"city":"Trout Lake","postalCode":"X4I6G7","index":12,"locationName":null}
diff --git a/frontend/stub/__files/response-address-detail.json b/frontend/stub/__files/response-address-detail.json
deleted file mode 100644
index c98925ee4e..0000000000
--- a/frontend/stub/__files/response-address-detail.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "streetAddress": "1234 Nowhere St",
-  "country": { "value": "CA", "text": "Canada" },
-  "province": { "value": "BC", "text": "British Columbia" },
-  "city": "Victoria",
-  "postalCode": "V8V 8V8",
-  "index": 0,
-  "locationName": null
-}
diff --git a/frontend/stub/__files/response-address-search.json b/frontend/stub/__files/response-address-search.json
index 1e5d8a2a56..ad40f4407b 100644
--- a/frontend/stub/__files/response-address-search.json
+++ b/frontend/stub/__files/response-address-search.json
@@ -1,10 +1,90 @@
 [
   {
-    "code": "AA",
+    "code": "V8V8V8",
     "name": "1234 Nowhere St Victoria, BC, V8V 8V8"
   },
   {
-    "code": "BB",
-    "name": "505 Fail St Victoria, BC, V8V 8V8"
+    "code": "F8F8F8",
+    "name": "505 Fail St Victoria, BC, F8F 8F8"
+  },
+  {
+    "code": "G4C8E2",
+    "name": "4945 Disputed Rd Cumberland, QC, G4C 8E2"
+  },
+  {
+    "code": "A3F0B5",
+    "name": "3085 Lake of Bays Road Winfield, AB, A3F 0B5"
+  },
+  {
+    "code": "P0Y9A3",
+    "name": "953 Peel St St. Antoine, YK, P0Y 9A3"
+  },
+  {
+    "code": "M2W5E5",
+    "name": "3925 Dieppe Ave Lumsden, NS, M2W 5E5"
+  },
+  {
+    "code": "F8P0K6",
+    "name": "9060 Oak St Georgetown, YK, F8P 0K6"
+  },
+  {
+    "code": "U4Y1G4",
+    "name": "6750 College Ave Red Rock, QC, U4Y 1G4"
+  },
+  {
+    "code": "C5T3I9",
+    "name": "8494 Pine Rd Trout Lake, QC, C5T 3I9"
+  },
+  {
+    "code": "U3H8X8",
+    "name": "6493 Maple Ave Russell, NB, U3H 8X8"
+  },
+  {
+    "code": "C2L3W7",
+    "name": "6870 Tecumseh Rd Lumsden, NL, C2L 3W7"
+  },
+  {
+    "code": "T7R2X0",
+    "name": "8979 Pierre Ave Russell, SK, T7R 2X0"
+  },
+  {
+    "code": "X4I6G7",
+    "name": "6076 15th St Trout Lake, SK, X4I 6G7"
+  },
+  {
+    "code": "U2E6Y1",
+    "name": "1457 Bay Ave Kingston, PE, U2E 6Y1"
+  },
+  {
+    "code": "R0K7W4",
+    "name": "5376 Victoria Ave Selkirk, NB, R0K 7W4"
+  },
+  {
+    "code": "F2L6B3",
+    "name": "7056 Lakeview Ave Grand Falls, QC, F2L 6B3"
+  },
+  {
+    "code": "G3F6J5",
+    "name": "6163 Oak St Deer Lake, BC, G3F 6J5"
+  },
+  {
+    "code": "I1R9Y6",
+    "name": "8803 Brock Rd Flatrock, NT, I1R 9Y6"
+  },
+  {
+    "code": "E2A9U5",
+    "name": "7044 Dieppe Ave Carleton, ON, E2A 9U5"
+  },
+  {
+    "code": "B4X9S7",
+    "name": "2548 36th Ave Minto, NU, B4X 9S7"
+  },
+  {
+    "code": "P5Q7S4",
+    "name": "547 Richmond Ave Hampton, SK, P5Q 7S4"
+  },
+  {
+    "code": "B5V6L4",
+    "name": "9084 Concession Road 6 Charlottetown, QC, B5V 6L4"
   }
 ]
diff --git a/frontend/stub/mappings/backend.json b/frontend/stub/mappings/backend.json
index 192a1cd4b4..d0680781ea 100644
--- a/frontend/stub/mappings/backend.json
+++ b/frontend/stub/mappings/backend.json
@@ -176,22 +176,22 @@
       }
     },
     {
-      "name":"Canada Post details for AA",
+      "name":"Canada Post details for success",
       "request": {
-        "url": "/api/clients/addresses/AA",
+        "urlPattern": "/api/clients/addresses/(.*)",
         "method": "GET"
       },
       "response": {
         "status": 200,
-        "bodyFileName": "response-address-detail.json",
+        "bodyFileName": "response-address-{{request.path.[3]}}.json",
         "transformers": ["response-template"],
         "fixedDelayMilliseconds": 2500
       }
     },
     {
-      "name":"Canada Post error details for BB",
+      "name":"Canada Post error details for F8F8F8",
       "request": {
-        "url": "/api/clients/addresses/BB",
+        "url": "/api/clients/addresses/F8F8F8",
         "method": "GET"
       },
       "response": {

From 1c852e13e99f1103aab501a6a4a60e069fd23b2d Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 11 Sep 2023 12:20:29 -0700
Subject: [PATCH 107/313] fix: fixing dropdown not changing when selection
 change

---
 frontend/src/components/forms/DropdownInputComponent.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index 43d641a4b9..c7689ca291 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -84,6 +84,10 @@ watch(
   () => props.errorMessage,
   () => (error.value = props.errorMessage)
 )
+watch(
+  () => props.initialValue,
+  () => (selectedValue.value = props.initialValue)
+)
 
 revalidateBus.on(() => validateInput(selectedValue.value))
 </script>

From 9344a5d85b2de1860bb992a45e4e9b1bc0a22bea Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 12 Sep 2023 17:27:35 -0300
Subject: [PATCH 108/313] feat: add formErrors variable

---
 frontend/src/helpers/validators/ExternalFormValidations.ts | 5 ++++-
 frontend/src/pages/FormBCeIDPage.vue                       | 4 +++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
index 270c063035..3af1200528 100644
--- a/frontend/src/helpers/validators/ExternalFormValidations.ts
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -204,7 +204,7 @@ export const validate = (keys: string[], target: FormDataDto, notify: boolean =
 }
 
 // This function will run the validators and return the errors
-export const runValidation = (key: string, target: FormDataDto, validation: (value: string) => string, notify: boolean = false): boolean => {
+export const runValidation = (key: string, target: FormDataDto, validation: (value: string) => string, notify: boolean = false, formErrors?: Record<string, string>): boolean => {
   // We split the field key and the condition if it has one
   const [fieldKey, fieldCondition] = key.includes('(')
     ? key.replace(')', '').split('(')
@@ -221,6 +221,9 @@ export const runValidation = (key: string, target: FormDataDto, validation: (val
       if(notify && validationResponse){
         notificationBus.emit({fieldId,errorMsg:validationResponse}, item)
       }
+      if(formErrors){
+        formErrors[fieldId] = validationResponse
+      }
       return validationResponse
     }else{ 
       return ''
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 1d49d1be4c..57f7b28c31 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -71,6 +71,8 @@ let formData = reactive<FormDataDto>({
   },
 });
 
+const formErrors = reactive<Record<string, string>>({})
+
 const locations = computed(() =>
   formData.location.addresses.map((address: any) => address.locationName)
 );
@@ -207,7 +209,7 @@ const checkStepValidity = (stepNumber: number): boolean => {
 
   if(!progressData[stepNumber]
     .extraValidations
-    .every((validation: any) => runValidation(validation.field, formData, validation.validation, true))
+    .every((validation: any) => runValidation(validation.field, formData, validation.validation, false, formErrors))
   )
     return false;
   

From 1ff802ecdf8b0a506518440d5f2ec1200e81a84e Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 13 Sep 2023 09:47:03 -0700
Subject: [PATCH 109/313] chore: redoing css changes - Part #1

---
 frontend/src/App.vue                   | 60 +++++++++++++-------------
 frontend/src/assets/styles/global.scss | 12 +++++-
 2 files changed, 40 insertions(+), 32 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index e1c1f2e45f..07a6e70ba6 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -68,38 +68,38 @@ toastBus.on(openToast)
 
   <div class="modals">
     
-  <cds-modal
-    id="modal-global"
-    size="sm"
-    :open="modalContent.active"
-    @cds-modal-closed="closeModal"
-  >
-    <cds-modal-header>
-      <cds-modal-close-button></cds-modal-close-button>
-      <cds-modal-heading
-        >Are you sure you want to delete "{{ modalContent.message }}" additional
-        {{ modalContent.kind }}?
-      </cds-modal-heading>
-    </cds-modal-header>
-    <cds-modal-body><p></p></cds-modal-body>
+    <cds-modal
+      id="modal-global"
+      size="sm"
+      :open="modalContent.active"
+      @cds-modal-closed="closeModal"
+    >
+      <cds-modal-header>
+        <cds-modal-close-button></cds-modal-close-button>
+        <cds-modal-heading
+          >Are you sure you want to delete "{{ modalContent.message }}" additional
+          {{ modalContent.kind }}?
+        </cds-modal-heading>
+      </cds-modal-header>
+      <cds-modal-body><p></p></cds-modal-body>
 
-    <cds-modal-footer>
-        <cds-modal-footer-button 
-          kind="secondary" 
-          data-modal-close>
-          Cancel
-        </cds-modal-footer-button>
-        
-        <cds-modal-footer-button 
-          kind="danger"
-          v-on:click="deleteContentModal">
-          Delete
-          <Delete16 slot="icon" />
-        </cds-modal-footer-button>
+      <cds-modal-footer>
+          <cds-modal-footer-button 
+            kind="secondary" 
+            data-modal-close>
+            Cancel
+          </cds-modal-footer-button>
+          
+          <cds-modal-footer-button 
+            kind="danger"
+            v-on:click="deleteContentModal">
+            Delete
+            <Delete16 slot="icon" />
+          </cds-modal-footer-button>
 
-      </cds-modal-footer>
-  </cds-modal>
-</div>
+        </cds-modal-footer>
+    </cds-modal>
+  </div>
 
   <cds-toast-notification
       v-if="toastContent.active"
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index d0f0172626..1b4e955da9 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -56,12 +56,15 @@
   --cds-button-tertiary: var(--border-subtle-02);
   --cds-button-tertiary-hover: var(--others-transparent-transparent);
 }
+
 .heading-buttons cds-button span {
   width:7rem;
 }
+
 cds-button::part(button) {
   border-radius: 0.25rem;
 }
+
 cds-button span {
   width:11rem;
 }
@@ -629,6 +632,7 @@ hr {
   align-items: flex-start;
   gap: 1rem;
 }
+
 .grouping-08 {
   display: flex;
   padding: 0.9rem 0rem;
@@ -697,8 +701,12 @@ hr {
   align-self: stretch;
 }
 
-bx-modal {
-  display: flex;
+cds-modal::part(dialog) {
+  border-radius: 0.5rem;
+}
+
+cds-modal-close-button::part(button)  {
+  border-radius: 0.5rem;
 }
 
 bx-modal-footer {

From 48c1646c5bd980fe1709d4bd310b619eeb56d23e Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 13 Sep 2023 15:14:48 -0300
Subject: [PATCH 110/313] feat: display address extra errors

---
 .../validators/ExternalFormValidations.ts     | 79 +++++++++++++------
 frontend/src/pages/FormBCeIDPage.vue          | 37 ++++++++-
 2 files changed, 89 insertions(+), 27 deletions(-)

diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
index 3af1200528..4c221622a5 100644
--- a/frontend/src/helpers/validators/ExternalFormValidations.ts
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -204,7 +204,14 @@ export const validate = (keys: string[], target: FormDataDto, notify: boolean =
 }
 
 // This function will run the validators and return the errors
-export const runValidation = (key: string, target: FormDataDto, validation: (value: string) => string, notify: boolean = false, formErrors?: Record<string, string>): boolean => {
+export const runValidation = (
+  key: string,
+  target: FormDataDto,
+  validation: (value: string) => string,
+  notify: boolean = false,
+  formErrors?: Record<string, ValidationMessageType>,
+  exhaustive = false,
+): boolean => {
   // We split the field key and the condition if it has one
   const [fieldKey, fieldCondition] = key.includes('(')
     ? key.replace(')', '').split('(')
@@ -212,47 +219,69 @@ export const runValidation = (key: string, target: FormDataDto, validation: (val
   // We then load the field value
   const fieldValue = getField(fieldKey, target)
   // We define a function that will run the validation if the condition is true
-  const buildEval = (condition: string) =>
-    condition === 'true' ? 'true' : `target.${condition}`
-  const executeValidation = (item: any, condition: string,fieldId: string = fieldKey) : string =>{
+  const buildEval = (condition: string) => (condition === 'true' ? 'true' : `target.${condition}`)
+  const executeValidation = (item: any, condition: string, fieldId: string = fieldKey): string => {
     // eslint-disable-next-line no-eval
-    if(eval(condition)){
+    if (eval(condition)) {
       const validationResponse = validation(item)
-      if(notify && validationResponse){
-        notificationBus.emit({fieldId,errorMsg:validationResponse}, item)
+      if (notify && validationResponse) {
+        notificationBus.emit({ fieldId, errorMsg: validationResponse }, item)
       }
-      if(formErrors){
-        formErrors[fieldId] = validationResponse
+      if (formErrors) {
+        formErrors[fieldId] = {
+          fieldId,
+          errorMsg: validationResponse,
+          originalValue: item,
+        }
       }
       return validationResponse
-    }else{ 
+    } else {
       return ''
     }
   }
   // If the field value is an array we run the validation for every item in the array
   if (Array.isArray(fieldValue)) {
-    return fieldValue.every((item: any, index: number) => {
+    let hasInvalidItem = false
+    for (let index = 0; index < fieldValue.length; index++) {
+      const item = fieldValue[index]
       // And sometimes we can end up with another array inside, that's life
       if (Array.isArray(item)) {
         if (item.length === 0) item.push('')
-        return item.every((subItem: any) =>
-          executeValidation(
-            subItem, 
-            buildEval(fieldCondition.replace('.*.', `[${index}].`)),
-            fieldKey.replace('.*.', `[${index}].`)
-          )  === '',
-        )
+        let hasInvalidSubItem = false
+        for (const subItem of item) {
+          const valid =
+            executeValidation(
+              subItem,
+              buildEval(fieldCondition.replace('.*.', `[${index}].`)),
+              fieldKey.replace('.*.', `[${index}].`),
+            ) === ''
+          if (!valid) {
+            hasInvalidSubItem = true
+            if (!exhaustive) {
+              break
+            }
+          }
+        }
+        return !hasInvalidSubItem
       }
       // If it is not an array here, just validate it
-      return executeValidation(
-        item, 
-        buildEval(fieldCondition.replace('.*.', `[${index}].`)),
-        fieldKey.replace('.*.', `[${index}].`)
-        )  === ''
-    })
+      const valid =
+        executeValidation(
+          item,
+          buildEval(fieldCondition.replace('.*.', `[${index}].`)),
+          fieldKey.replace('.*.', `[${index}].`),
+        ) === ''
+      if (!valid) {
+        hasInvalidItem = true
+        if (!exhaustive) {
+          break
+        }
+      }
+    }
+    return !hasInvalidItem
   }
   // If the field value is not an array we run the validation for the field
-  return executeValidation(fieldValue, fieldCondition) === ''  
+  return executeValidation(fieldValue, fieldCondition) === ''
 }
 
 export const addValidation = (key: string, validation: (value: string) => string): void => {
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 57f7b28c31..9bdb5f2099 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -71,7 +71,26 @@ let formData = reactive<FormDataDto>({
   },
 });
 
-const formErrors = reactive<Record<string, string>>({})
+const addressFieldStart = 'location.addresses['
+const addressFieldEnd = '].locationName'
+
+const ADDRESS_LOCATION_NAME_KEY = addressFieldStart + addressFieldEnd
+
+const rawExtraErrors = reactive<Record<string, ValidationMessageType>>({})
+const extraErrors = reactive<Record<string, any>>({
+  [ADDRESS_LOCATION_NAME_KEY]: []
+})
+
+watch(rawExtraErrors, () => {
+  const addressNameErrors: ValidationMessageType[] = []
+  for (const fieldId in rawExtraErrors) {
+    const message = rawExtraErrors[fieldId].errorMsg;
+    if(message && fieldId.startsWith(addressFieldStart) && fieldId.endsWith(addressFieldEnd)){
+      addressNameErrors.push(rawExtraErrors[fieldId])
+    }
+  }
+  extraErrors[ADDRESS_LOCATION_NAME_KEY] = addressNameErrors
+})
 
 const locations = computed(() =>
   formData.location.addresses.map((address: any) => address.locationName)
@@ -209,7 +228,7 @@ const checkStepValidity = (stepNumber: number): boolean => {
 
   if(!progressData[stepNumber]
     .extraValidations
-    .every((validation: any) => runValidation(validation.field, formData, validation.validation, false, formErrors))
+    .every((validation: any) => runValidation(validation.field, formData, validation.validation, false, rawExtraErrors, true))
   )
     return false;
   
@@ -319,6 +338,20 @@ const reEval = () => (revalidateBus.emit())
         </cds-progress-step>
       </cds-progress-indicator>      
     <error-notification-grouping-component />
+    <cds-inline-notification
+      v-for="item in (extraErrors[ADDRESS_LOCATION_NAME_KEY] as ValidationMessageType[])"
+      :key="item"
+      v-shadow="true"
+      low-contrast="true"
+      hide-close-button="true"
+      open="true"
+      kind="error"
+    >
+      <p class="body-compact-01">
+        <span class="heading-compact-01 heading-compact-01-dark">Assigned contact required:</span>
+        You must associate <span class="heading-compact-01 heading-compact-01-dark">“{{ item.originalValue }}”</span> address with an existing contact or <a href="#">add a new contact</a> before submitting the application again.
+      </p>
+    </cds-inline-notification>
   </div>
 
   <div class="form-steps">

From 6754aad3640498905efec6622eb740c7445615b4 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 13 Sep 2023 20:05:55 -0300
Subject: [PATCH 111/313] feat: move extra errors to the error component

---
 frontend/src/assets/styles/global.scss        |  3 ++
 .../ErrorNotificationGroupingComponent.vue    | 40 ++++++++++++++++---
 frontend/src/pages/FormBCeIDPage.vue          | 37 ++---------------
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index d0f0172626..61cae72023 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -89,6 +89,9 @@ cds-actionable-notification::part(div), cds-actionable-notification, .cds--actio
 
 .top-notification {
   margin-top: 3rem;
+  display: flex;
+  flex-direction: column;
+  gap: 1.5rem;
 }
 
 * {
diff --git a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
index 913482535a..5a1efdd52e 100644
--- a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
+++ b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 // Carbon
 import '@carbon/web-components/es/components/notification/index';
 // Composables
@@ -7,6 +7,31 @@ import { useEventBus } from "@vueuse/core";
 // Types
 import type { ValidationMessageType, ProgressNotification } from '@/dto/CommonTypesDto'
 
+const props = defineProps<{
+  extraErrors: Record<string, ValidationMessageType>
+}>()
+
+const aggregatedExtraErrors = computed<Record<string, string | string[]>>(() => {
+  console.log('extra', props.extraErrors)
+  const value = Object.keys(props.extraErrors).reduce<Record<string, string | string[]>>((aggregated, fieldId) => {
+    const genericKey = fieldId.replace(/\[\d+\]/, '.*')
+    const error = props.extraErrors[fieldId]
+    if(error.errorMsg){
+      if (genericKey !== fieldId) {
+        if (!aggregated[genericKey]) {
+          aggregated[genericKey] = []
+        }
+        (aggregated[genericKey] as string[]).push(error.originalValue as string)
+      } else {
+        aggregated[genericKey] = error.originalValue as string
+      }
+    }
+    return aggregated
+  }, {})
+  console.log(value)
+  return value
+})
+
 // Define the bus to receive the global error messages and one to send the progress indicator messages
 const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
 const progressIndicatorBus = useEventBus<ProgressNotification>('progress-indicator-bus')
@@ -60,7 +85,7 @@ const goToStep = (step: number) => {
 
 </script>
 <template>
-  <div class="top-notification" v-if="globalErrorMessage?.fieldId">
+  <div class="top-notification" v-if="globalErrorMessage?.fieldId || Object.values(aggregatedExtraErrors).length > 0">
 
     <cds-inline-notification
         v-if="globalErrorMessage?.fieldId === 'missing.info'"
@@ -115,15 +140,18 @@ const goToStep = (step: number) => {
   </cds-actionable-notification>
 
   <cds-inline-notification
-    v-if="globalErrorMessage?.fieldId === 'missing.address.assigned'"
+    v-for="item in aggregatedExtraErrors['location.addresses.*.locationName']"
+    :key="item"
     v-shadow="true"
     low-contrast="true"
     hide-close-button="true"
     open="true"
     kind="error"
-    title="Address without a contact:"
-  >    
-    <div>Looks like "{{ globalErrorMessage.errorMsg }}" doesn’t have a contact. You must associate it with an existing contact or add a new contact before submitting the application again.</div>    
+  >
+    <p class="body-compact-01">
+      <span class="heading-compact-01 heading-compact-01-dark">Assigned contact required:</span>
+      You must associate <span class="heading-compact-01 heading-compact-01-dark">“{{ item }}”</span> address with an existing contact or <a href="#">add a new contact</a> before submitting the application again.
+    </p>
   </cds-inline-notification>
   </div>
 </template>
\ No newline at end of file
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 9bdb5f2099..decff1720b 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -71,26 +71,7 @@ let formData = reactive<FormDataDto>({
   },
 });
 
-const addressFieldStart = 'location.addresses['
-const addressFieldEnd = '].locationName'
-
-const ADDRESS_LOCATION_NAME_KEY = addressFieldStart + addressFieldEnd
-
 const rawExtraErrors = reactive<Record<string, ValidationMessageType>>({})
-const extraErrors = reactive<Record<string, any>>({
-  [ADDRESS_LOCATION_NAME_KEY]: []
-})
-
-watch(rawExtraErrors, () => {
-  const addressNameErrors: ValidationMessageType[] = []
-  for (const fieldId in rawExtraErrors) {
-    const message = rawExtraErrors[fieldId].errorMsg;
-    if(message && fieldId.startsWith(addressFieldStart) && fieldId.endsWith(addressFieldEnd)){
-      addressNameErrors.push(rawExtraErrors[fieldId])
-    }
-  }
-  extraErrors[ADDRESS_LOCATION_NAME_KEY] = addressNameErrors
-})
 
 const locations = computed(() =>
   formData.location.addresses.map((address: any) => address.locationName)
@@ -337,21 +318,9 @@ const reEval = () => (revalidateBus.emit())
           <span class="cds--progress-label">{{ item.title }}</span>
         </cds-progress-step>
       </cds-progress-indicator>      
-    <error-notification-grouping-component />
-    <cds-inline-notification
-      v-for="item in (extraErrors[ADDRESS_LOCATION_NAME_KEY] as ValidationMessageType[])"
-      :key="item"
-      v-shadow="true"
-      low-contrast="true"
-      hide-close-button="true"
-      open="true"
-      kind="error"
-    >
-      <p class="body-compact-01">
-        <span class="heading-compact-01 heading-compact-01-dark">Assigned contact required:</span>
-        You must associate <span class="heading-compact-01 heading-compact-01-dark">“{{ item.originalValue }}”</span> address with an existing contact or <a href="#">add a new contact</a> before submitting the application again.
-      </p>
-    </cds-inline-notification>
+      <error-notification-grouping-component
+        :extra-errors="rawExtraErrors"
+      />
   </div>
 
   <div class="form-steps">

From b073c978f61a86615c86ee53b834965a415eb7d8 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 13 Sep 2023 18:43:55 -0700
Subject: [PATCH 112/313] chore: redoing css changes - Part #2

---
 frontend/src/App.vue                          |  6 +-
 frontend/src/assets/styles/global.scss        | 67 ++++++++++---------
 .../components/forms/TextInputComponent.vue   |  5 --
 3 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 07a6e70ba6..51525da3b6 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -85,13 +85,15 @@ toastBus.on(openToast)
 
       <cds-modal-footer>
           <cds-modal-footer-button 
-            kind="secondary" 
-            data-modal-close>
+            kind="secondary"
+            data-modal-close
+            class="cds--modal-close-btn">
             Cancel
           </cds-modal-footer-button>
           
           <cds-modal-footer-button 
             kind="danger"
+            class="cds--modal-submit-btn"
             v-on:click="deleteContentModal">
             Delete
             <Delete16 slot="icon" />
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 1b4e955da9..deea888784 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -68,13 +68,16 @@ cds-button::part(button) {
 cds-button span {
   width:11rem;
 }
+
 .step-active {
   --cds-border-subtle: var(--light-theme-miscellaneous-interactive);
 }
+
 .cds--progress-label {
   overflow: visible !important;
   
 }
+
 .cds--progress-label:hover {
   box-shadow: none !important;
   text-decoration: underline;
@@ -85,6 +88,7 @@ cds-inline-notification::part(div), cds-inline-notification, .cds--inline-notifi
   max-width: 100%;
   border-radius: 0.25rem;
 }
+
 cds-actionable-notification::part(div), cds-actionable-notification, .cds--actionable-notification {
   max-width: 100%;
   border-radius: 0.25rem;
@@ -705,27 +709,25 @@ cds-modal::part(dialog) {
   border-radius: 0.5rem;
 }
 
-cds-modal-close-button::part(button)  {
+cds-modal-close-button::part(button) {
   border-radius: 0.5rem;
 }
 
-bx-modal-footer {
-  align-self: stretch;
+cds-modal-footer {
+  padding: 3rem 1rem 1rem 1rem;
 }
 
-.modal-footer {
-  justify-content: center;
-  align-content: stretch;
-  padding: 1rem;
-  display: flex;
-  align-self: stretch;
-  flex-wrap: wrap;
-  gap: 0.5rem;
-  flex-grow: 1;
+cds-modal-footer-button::part(button) {
+  border-radius: 0.25rem;
+  height: 75%;
 }
 
-.bx--modal-btn {
-  flex-grow: 1;
+.cds--modal-close-btn {
+  margin-right: 0.25rem;
+}
+
+.cds--modal-submit-btn {
+  margin-left: 0.25rem;
 }
 
 /* Small (up to 320px) */
@@ -735,31 +737,30 @@ bx-modal-footer {
     top: 0.5rem;
   }
 
-  bx-modal::part(dialog) {
-    max-height: 21.25rem;
-    position: relative;
-    margin-bottom: 0;
-    margin-top: auto;
-  }
-
-  .bx--modal-btn-divider {
-    display: none;
+  cds-modal {
+    height: 100%;
+    width: 100%;
   }
 
-  bx-modal-footer {
-    height: 8rem;
-    padding: 0 1rem 0 1rem;
-    margin: 0;
+  cds-modal::part(dialog) {
+    max-height: 20.5rem;
+    margin-bottom: 0;
+    margin-top: auto;
+    position: relative;
   }
 
-  .bx--modal-btn {
-    height: 1.13rem !important;
-    position: absolute;
-    width: 90%;
+  .cds--modal-close-btn, .cds--modal-submit-btn {
+    margin: 0rem;
+    width: 100%;
   }
 
-  .bx--modal-btn2 {
-    bottom: 2.5rem;
+  cds-modal-footer {
+    display: flex;
+    padding: 0rem 1rem 1rem 1rem;
+    flex-direction: column;
+    align-items: flex-start;
+    gap: 1rem;
+    align-self: stretch;
   }
 
   .screen {
diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index be831e2f5d..09fdbf3e6d 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -103,9 +103,4 @@ watch(() => props.modelValue,() => selectedValue.value = props.modelValue)
 </template>
 
 <style scoped>
-.bx-input-disabled {
-  height: 2.5rem;
-  color: var(--light-theme-text-text-primary, #131315);
-  padding-top: 0.69rem;
-}
 </style>

From 37c8480fe4633c3f11e629ba130dd19bdd5df676 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 14 Sep 2023 13:41:36 -0300
Subject: [PATCH 113/313] feat: replace formErrors argument with notification
 approach

---
 .../ErrorNotificationGroupingComponent.vue    | 71 +++++++++----------
 .../validators/ExternalFormValidations.ts     | 11 +--
 frontend/src/pages/FormBCeIDPage.vue          |  6 +-
 3 files changed, 38 insertions(+), 50 deletions(-)

diff --git a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
index 5a1efdd52e..e5dd28aff3 100644
--- a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
+++ b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
@@ -1,35 +1,32 @@
 <script setup lang="ts">
-import { computed, ref } from 'vue'
+import { computed, reactive, ref, watch } from 'vue'
 // Carbon
 import '@carbon/web-components/es/components/notification/index';
 // Composables
 import { useEventBus } from "@vueuse/core";
 // Types
 import type { ValidationMessageType, ProgressNotification } from '@/dto/CommonTypesDto'
+import type { Address, FormDataDto } from '@/dto/ApplyClientNumberDto';
 
 const props = defineProps<{
-  extraErrors: Record<string, ValidationMessageType>
+  formData: FormDataDto
 }>()
 
-const aggregatedExtraErrors = computed<Record<string, string | string[]>>(() => {
-  console.log('extra', props.extraErrors)
-  const value = Object.keys(props.extraErrors).reduce<Record<string, string | string[]>>((aggregated, fieldId) => {
-    const genericKey = fieldId.replace(/\[\d+\]/, '.*')
-    const error = props.extraErrors[fieldId]
-    if(error.errorMsg){
-      if (genericKey !== fieldId) {
-        if (!aggregated[genericKey]) {
-          aggregated[genericKey] = []
-        }
-        (aggregated[genericKey] as string[]).push(error.originalValue as string)
-      } else {
-        aggregated[genericKey] = error.originalValue as string
-      }
+const nonAssociatedAddressList = reactive<string[]>([])
+
+const locations = computed(() =>
+  props.formData.location.addresses.map((address: Address) => address.locationName)
+);
+
+watch(locations, (locations) => {
+  // Iterates backwards to prevent issues after removing an item from the list
+  for (let index = nonAssociatedAddressList.length - 1; index >= 0; index--) {
+    const addressName = nonAssociatedAddressList[index];
+    if (!locations.includes(addressName)) { // The address does not exist anymore
+      // Remove it from the error list
+      nonAssociatedAddressList.splice(index, 1)
     }
-    return aggregated
-  }, {})
-  console.log(value)
-  return value
+  }
 })
 
 // Define the bus to receive the global error messages and one to send the progress indicator messages
@@ -55,22 +52,22 @@ const handleErrorMessage = (event: ValidationMessageType|undefined, payload?:any
     // Handling address without association
   } else if(event && event.fieldId.startsWith('location.addresses[') && event.fieldId.endsWith('].locationName')){
     if(payload){
-      // Show as inline notification
-      globalErrorMessage.value = { fieldId: 'missing.address.assigned', errorMsg: payload };
-      // Emit back to the form so it can be displayed as a field error
-      errorBus.emit([
-        {fieldId: event.fieldId, errorMsg: 'You must associate a contact with this address or remove it'},
-        {fieldId: event.fieldId.replace('locationName','country'), errorMsg: 'You must associate a contact with this address or remove it'},
-        {fieldId: event.fieldId.replace('locationName','streetAddress'), errorMsg: 'You must associate a contact with this address or remove it'},
-        {fieldId: event.fieldId.replace('locationName','city'), errorMsg: 'You must associate a contact with this address or remove it'},
-        {fieldId: event.fieldId.replace('locationName','province'), errorMsg: 'You must associate a contact with this address or remove it'},
-        {fieldId: event.fieldId.replace('locationName','postalCode'), errorMsg: 'You must associate a contact with this address or remove it'}
-      ]);
-      // Make step 2 with error
-      progressIndicatorBus.emit({ kind: 'error', value: [1,2]})
+      if(event.errorMsg){ // The address is missing association
+        const foundIndex = nonAssociatedAddressList.indexOf(payload)
+        if (foundIndex === -1) {
+          // Add it to the error list
+          nonAssociatedAddressList.push(payload)
+        }
+      } else { // The address is properly associated
+        const foundIndex = nonAssociatedAddressList.indexOf(payload)
+        if (foundIndex >= 0) {
+          // Remove it from the error list
+          nonAssociatedAddressList.splice(foundIndex, 1)
+        }
+      }
     }
-  } else { 
-    globalErrorMessage.value = event; 
+  } else {
+    globalErrorMessage.value = event;
   }
 }
 
@@ -85,7 +82,7 @@ const goToStep = (step: number) => {
 
 </script>
 <template>
-  <div class="top-notification" v-if="globalErrorMessage?.fieldId || Object.values(aggregatedExtraErrors).length > 0">
+  <div class="top-notification" v-if="globalErrorMessage?.fieldId || nonAssociatedAddressList.length > 0">
 
     <cds-inline-notification
         v-if="globalErrorMessage?.fieldId === 'missing.info'"
@@ -140,7 +137,7 @@ const goToStep = (step: number) => {
   </cds-actionable-notification>
 
   <cds-inline-notification
-    v-for="item in aggregatedExtraErrors['location.addresses.*.locationName']"
+    v-for="item in nonAssociatedAddressList"
     :key="item"
     v-shadow="true"
     low-contrast="true"
diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
index 4c221622a5..58bdb73923 100644
--- a/frontend/src/helpers/validators/ExternalFormValidations.ts
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -209,7 +209,6 @@ export const runValidation = (
   target: FormDataDto,
   validation: (value: string) => string,
   notify: boolean = false,
-  formErrors?: Record<string, ValidationMessageType>,
   exhaustive = false,
 ): boolean => {
   // We split the field key and the condition if it has one
@@ -224,16 +223,10 @@ export const runValidation = (
     // eslint-disable-next-line no-eval
     if (eval(condition)) {
       const validationResponse = validation(item)
-      if (notify && validationResponse) {
+      if (notify) {
+        // Note: also notifies when valid - errorMsg will be empty.
         notificationBus.emit({ fieldId, errorMsg: validationResponse }, item)
       }
-      if (formErrors) {
-        formErrors[fieldId] = {
-          fieldId,
-          errorMsg: validationResponse,
-          originalValue: item,
-        }
-      }
       return validationResponse
     } else {
       return ''
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index decff1720b..9fee55b882 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -71,8 +71,6 @@ let formData = reactive<FormDataDto>({
   },
 });
 
-const rawExtraErrors = reactive<Record<string, ValidationMessageType>>({})
-
 const locations = computed(() =>
   formData.location.addresses.map((address: any) => address.locationName)
 );
@@ -209,7 +207,7 @@ const checkStepValidity = (stepNumber: number): boolean => {
 
   if(!progressData[stepNumber]
     .extraValidations
-    .every((validation: any) => runValidation(validation.field, formData, validation.validation, false, rawExtraErrors, true))
+    .every((validation: any) => runValidation(validation.field, formData, validation.validation, true, true))
   )
     return false;
   
@@ -319,7 +317,7 @@ const reEval = () => (revalidateBus.emit())
         </cds-progress-step>
       </cds-progress-indicator>      
       <error-notification-grouping-component
-        :extra-errors="rawExtraErrors"
+        :form-data="formData"
       />
   </div>
 

From 5a022fbb0eff5809aa1c1fa5453fb76eaad8c822 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 11 Sep 2023 15:30:11 -0300
Subject: [PATCH 114/313] feat: scroll to new contact

---
 .../ErrorNotificationGroupingComponent.vue       |  2 +-
 frontend/src/pages/FormBCeIDPage.vue             | 15 ++++++++++++++-
 .../src/pages/applyform/ContactWizardStep.vue    | 16 +++++++++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
index e5dd28aff3..dec9ffafc6 100644
--- a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
+++ b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
@@ -147,7 +147,7 @@ const goToStep = (step: number) => {
   >
     <p class="body-compact-01">
       <span class="heading-compact-01 heading-compact-01-dark">Assigned contact required:</span>
-      You must associate <span class="heading-compact-01 heading-compact-01-dark">“{{ item }}”</span> address with an existing contact or <a href="#">add a new contact</a> before submitting the application again.
+      You must associate <span class="heading-compact-01 heading-compact-01-dark">“{{ item }}”</span> address with an existing contact or <a href="#" @click.prevent="scrollToNewContact">add a new contact</a> before submitting the application again.
     </p>
   </cds-inline-notification>
   </div>
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 9fee55b882..0585dcbaad 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -46,7 +46,7 @@ const progressIndicatorBus = useEventBus<ProgressNotification>('progress-indicat
 
 
 const router = useRouter();
-const { setScrollPoint } = useFocus();
+const { setScrollPoint, setFocusedComponent } = useFocus();
 const submitterInformation = ForestClientUserSession.user;
 const instance = getCurrentInstance();
 const session = instance?.appContext.config.globalProperties.$session;
@@ -295,6 +295,18 @@ progressIndicatorBus.on((event: ProgressNotification) => {
 });
 
 const reEval = () => (revalidateBus.emit())
+
+const contactWizardRef = ref<InstanceType<typeof ContactWizardStep> | null>(null)
+
+const scrollToNewContact = () => {
+  if (contactWizardRef.value) {
+    // Skip auto-focus so to do it only when scroll is done.
+    const index = contactWizardRef.value.addContact(false) - 1;
+    setScrollPoint(`additional-contact-${index}`, undefined, () => {
+      setFocusedComponent(`addressname_${index}`);
+    });
+  }
+}
 </script>
 
 <template>
@@ -396,6 +408,7 @@ const reEval = () => (revalidateBus.emit())
             v-model:data="formData"
             :active="currentTab == 2"
             @valid="validateStep"
+            ref="contactWizardRef"
           />
       </div>
     </div>
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/applyform/ContactWizardStep.vue
index 4cb1bba7a3..28378a7a76 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/applyform/ContactWizardStep.vue
@@ -68,8 +68,14 @@ const uniqueValues = isUniqueDescriptive()
 
 //New contact being added
 const otherContacts = computed(() => formData.location.contacts.slice(1))
-const addContact = () =>
-  formData.location.contacts.push(JSON.parse(JSON.stringify(emptyContact)))
+const addContact = (autoFocus = true) => {
+  const newLength = formData.location.contacts.push(JSON.parse(JSON.stringify(emptyContact)))
+  if (autoFocus) {
+    const focusIndex = newLength - 1;
+    setFocusedComponent(`addressname_${focusIndex}`);
+  }
+  return newLength;
+}
 
 const removeContact = (index: number) => () => {
     updateContact(undefined, index)
@@ -113,6 +119,10 @@ const handleRemove = (index: number) => {
 }
 
 onMounted(() => setFocusedComponent('addressname_0',800))
+
+defineExpose({
+  addContact
+})
 </script>
 
 <template>
@@ -132,7 +142,7 @@ onMounted(() => setFocusedComponent('addressname_0',800))
 
     <div  v-for="(contact, index) in otherContacts">
       <hr />
-      <div class="grouping-09">
+      <div class="grouping-09" :data-scroll="`additional-contact-${index + 1}`">
       <span class="heading-03">Additional contact</span>
     </div>
     <contact-group-component

From a5154815cc612da13a3e22c0fa19d731c7b82f11 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 11 Sep 2023 15:28:48 -0300
Subject: [PATCH 115/313] feat: add callback argument to useFocus

---
 frontend/src/composables/useFocus.ts | 52 +++++++++++++++++++++++++---
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/frontend/src/composables/useFocus.ts b/frontend/src/composables/useFocus.ts
index 1aaf8cbca1..59b63d346f 100644
--- a/frontend/src/composables/useFocus.ts
+++ b/frontend/src/composables/useFocus.ts
@@ -8,8 +8,16 @@ type OptionalElement = Element | HTMLElement | undefined
  * @returns two functions to set focus and scroll to a component
  */
 export const useFocus = (): {
-  setFocusedComponent: (componentName: string, time?: number) => Ref<OptionalElement>
-  setScrollPoint: (componentName: string, time?: number) => Ref<OptionalElement>
+  setFocusedComponent: (
+    componentName: string,
+    time?: number,
+    callback?: (refComponent: Ref<OptionalElement>) => void,
+  ) => Ref<OptionalElement>
+  setScrollPoint: (
+    componentName: string,
+    time?: number,
+    callback?: (refComponent: Ref<OptionalElement>) => void,
+  ) => Ref<OptionalElement>
 } => {
   // setActionOn is a function that execute the action on an a component
   const setActionOn = (
@@ -34,27 +42,61 @@ export const useFocus = (): {
     key: string,
     action: (target: Element | HTMLElement) => unknown,
     time: number = 100,
+    callback?: (refComponent: Ref<OptionalElement>) => void,
   ): Ref<OptionalElement> => {
     const refComponent = ref<OptionalElement>(undefined)
-    setTimeout(() => (refComponent.value = setActionOn(componentName, key, action)), time)
+    setTimeout(() => {
+      refComponent.value = setActionOn(componentName, key, action)
+      if (callback) {
+        const eventName = 'onscrollend' in window ? 'scrollend' : 'scroll'
+
+        const scrollEndListener = () => {
+          callback(refComponent)
+          document.removeEventListener(eventName, polyfilledListener)
+          console.log({ polyfilledListener })
+        }
+
+        let scrollEndTimer: NodeJS.Timeout
+
+        const polyfilledListener =
+          'onscrollend' in window
+            ? scrollEndListener
+            : () => {
+                clearTimeout(scrollEndTimer)
+                scrollEndTimer = setTimeout(scrollEndListener, 100)
+              }
+
+        document.addEventListener(eventName, polyfilledListener)
+      }
+    }, time)
     return refComponent
   }
 
   // Set the focus on a component with the data-focus attribute
-  const setFocusedComponent = (componentName: string, time: number = 100): Ref<OptionalElement> =>
+  const setFocusedComponent = (
+    componentName: string,
+    time: number = 100,
+    callback?: (refComponent: Ref<OptionalElement>) => void,
+  ): Ref<OptionalElement> =>
     execute(
       componentName,
       'data-focus',
       (element) => (element instanceof HTMLElement ? element.focus() : undefined),
       time,
+      callback,
     )
   // Scroll into view a component with the data-scroll attribute
-  const setScrollPoint = (componentName: string, time: number = 100): Ref<Element | undefined> =>
+  const setScrollPoint = (
+    componentName: string,
+    time: number = 100,
+    callback?: (refComponent: Ref<OptionalElement>) => void,
+  ): Ref<Element | undefined> =>
     execute(
       componentName,
       'data-scroll',
       (element) => element.scrollIntoView({ behavior: 'smooth', block: 'start' }),
       time,
+      callback,
     )
 
   return { setFocusedComponent, setScrollPoint }

From ee84729e9fc1d15c02e41b0750ca12edc18785e7 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 14 Sep 2023 15:32:05 -0300
Subject: [PATCH 116/313] feat: make the bindings to create and scroll to new
 contact

---
 .../components/grouping/ErrorNotificationGroupingComponent.vue   | 1 +
 frontend/src/pages/FormBCeIDPage.vue                             | 1 +
 2 files changed, 2 insertions(+)

diff --git a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
index dec9ffafc6..6765f0add1 100644
--- a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
+++ b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
@@ -10,6 +10,7 @@ import type { Address, FormDataDto } from '@/dto/ApplyClientNumberDto';
 
 const props = defineProps<{
   formData: FormDataDto
+  scrollToNewContact: () => void
 }>()
 
 const nonAssociatedAddressList = reactive<string[]>([])
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 0585dcbaad..22f9c99aba 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -330,6 +330,7 @@ const scrollToNewContact = () => {
       </cds-progress-indicator>      
       <error-notification-grouping-component
         :form-data="formData"
+        :scroll-to-new-contact="scrollToNewContact"
       />
   </div>
 

From 20ae6b69d23cbf9d298dc6481926e19e5a0d6451 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 14 Sep 2023 15:41:54 -0300
Subject: [PATCH 117/313] chore: minor adjusments on useFocus

---
 frontend/src/composables/useFocus.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/composables/useFocus.ts b/frontend/src/composables/useFocus.ts
index 59b63d346f..93b4e7efd3 100644
--- a/frontend/src/composables/useFocus.ts
+++ b/frontend/src/composables/useFocus.ts
@@ -48,18 +48,19 @@ export const useFocus = (): {
     setTimeout(() => {
       refComponent.value = setActionOn(componentName, key, action)
       if (callback) {
+        // We need to detect the end of the scrolling
+        // Use event 'scroll' if browser does not support 'scrollend'
         const eventName = 'onscrollend' in window ? 'scrollend' : 'scroll'
 
         const scrollEndListener = () => {
           callback(refComponent)
           document.removeEventListener(eventName, polyfilledListener)
-          console.log({ polyfilledListener })
         }
 
         let scrollEndTimer: NodeJS.Timeout
 
         const polyfilledListener =
-          'onscrollend' in window
+          eventName === 'scrollend'
             ? scrollEndListener
             : () => {
                 clearTimeout(scrollEndTimer)

From fd2decaacd551ae5a0b336377c1335422ca1f773 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 14 Sep 2023 16:17:05 -0700
Subject: [PATCH 118/313] chore: redoing css changes - Part #3

---
 frontend/src/assets/styles/global.scss       | 196 ++++---------------
 frontend/src/pages/ErrorPage.vue             |   2 +-
 frontend/src/pages/FormBCSCPage.vue          |   2 +-
 frontend/src/pages/FormSubmittedPage.vue     |   9 +-
 frontend/src/pages/NotFoundPage.vue          |   2 +-
 frontend/src/pages/ReviewApplicationPage.vue |   2 +-
 frontend/src/pages/UserLoadingPage.vue       |   2 +-
 7 files changed, 42 insertions(+), 173 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index deea888784..e2e9378f6f 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -1,5 +1,6 @@
 @use "sass:map";
-@use '@carbon/styles';
+@use "@carbon/styles";
+@use "@carbon/themes/scss/tokens";
 @use "@bcgov-nr/nr-fsa-theme/design-tokens/type-family.scss" as typeFamily;
 
 :root {
@@ -8,7 +9,7 @@
   --light-theme-button-button-secondary: #464648;
   --light-theme-button-button-tertiary: #005cb8;
   --cds-focus: #0073e6;
-  --light-theme-link-link-primary: #005CB8;
+  --light-theme-link-link-primary: #005cb8;
   --light-theme-link-link-primary-hover: #00478f;
   --light-theme-link-link-secondary: #00478f;
   --light-theme-link-link-secondary-hover: #00478f;
@@ -22,19 +23,18 @@
   --dark-theme-link-link-visited: #c59af1;
   --light-theme-support-support-info: #00478f;
   --light-theme-notifications-support-info-border: rgba(0, 102, 204, 1);
-  --light-theme-notifications-notification-info-background: #C2E0FF;
+  --light-theme-notifications-notification-info-background: #c2e0ff;
   --light-theme-background-background-inverse: #2d2d2f;
   --light-theme-text-text-primary: #131315;
   --border-subtle-02: #dfdfe1;
   --light-theme-tag-blue-background: #c2e0ff;
-  --light-theme-tag-blue-text:#00478f;
+  --light-theme-tag-blue-text: #00478f;
   --light-theme-focus: #0073e6;
-  --light-theme-miscellaneous-interactive:#0073E6;
+  --light-theme-miscellaneous-interactive: #0073e6;
 
   //Primary button
-  --cds-interactive-01: #0073E6;
-  --cds-active-primary: #0073E6;
-  --cds-hover-primary: #0066CC;
+  --cds-button-primary: #0073e6;
+  --cds-button-primary-hover: red;
 
   //Secondary button
   --cds-interactive-02: #464648;
@@ -42,9 +42,9 @@
   --cds-hover-secondary: #535355;
 
   //Tertiary button
-  --cds-interactive-03: #005CB8;
-  --cds-active-tertiary: #005CB8;
-  --cds-hover-tertiary: #0052A3;
+  --cds-interactive-03: #005cb8;
+  --cds-active-tertiary: #005cb8;
+  --cds-hover-tertiary: #0052a3;
 
   //Danger Ghost button
   --cds-danger-01: #e72000;
@@ -52,13 +52,13 @@
 }
 
 .heading-buttons {
-  --cds-text-inverse:var(--border-subtle-02);
+  --cds-text-inverse: var(--border-subtle-02);
   --cds-button-tertiary: var(--border-subtle-02);
   --cds-button-tertiary-hover: var(--others-transparent-transparent);
 }
 
 .heading-buttons cds-button span {
-  width:7rem;
+  width: 7rem;
 }
 
 cds-button::part(button) {
@@ -66,7 +66,7 @@ cds-button::part(button) {
 }
 
 cds-button span {
-  width:11rem;
+  width: 11rem;
 }
 
 .step-active {
@@ -75,7 +75,6 @@ cds-button span {
 
 .cds--progress-label {
   overflow: visible !important;
-  
 }
 
 .cds--progress-label:hover {
@@ -84,12 +83,16 @@ cds-button span {
   text-underline-offset: 0.325rem;
 }
 
-cds-inline-notification::part(div), cds-inline-notification, .cds--inline-notification {
+cds-inline-notification::part(div),
+cds-inline-notification,
+.cds--inline-notification {
   max-width: 100%;
   border-radius: 0.25rem;
 }
 
-cds-actionable-notification::part(div), cds-actionable-notification, .cds--actionable-notification {
+cds-actionable-notification::part(div),
+cds-actionable-notification,
+.cds--actionable-notification {
   max-width: 100%;
   border-radius: 0.25rem;
 }
@@ -120,7 +123,7 @@ a:visited {
 hr {
   display: block;
   border: 0;
-  border-top: 1px solid var(--border-subtle-02,#dfdfe1);
+  border-top: 1px solid var(--border-subtle-02, #dfdfe1);
   padding: 0;
   align-self: stretch;
   width: 100%;
@@ -154,82 +157,10 @@ hr {
   fill: var(--cds-hover-primary, #0353e9);
 }
 
-.bx--progress {
-  display: flex;
-  flex-direction: column;
-}
-
 .form-header-progress {
   display: flex;
 }
 
-.bx--progress-indicator {
-  flex-direction: row;
-  display: flex;
-  justify-content: space-between;
-  margin-bottom: 3rem;
-  margin-top: 1.5rem;
-}
-
-.bx--progress-step {
-  border-top: solid 0.125rem;
-  flex: 1;
-  display: flex;
-  padding: 0.625rem 1rem 0rem 0rem;
-  align-items: flex-start;
-  align-self: stretch;
-}
-
-.bx--progress-step-icon {
-  margin: 0.25rem 0.625rem 0 0;
-  flex-shrink: 0;
-}
-
-.bx--progress-step-text p a {
-  text-decoration: none;
-  color: var(--light-theme-text-text-primary, #131315);
-}
-.bx--progress-step-text p a:hover {
-  text-decoration: underline;
-  color: var(--light-theme-link-link-primary-hover, #00478f);
-  cursor: pointer;
-}
-.bx--progress-step-text p span {
-  color: var(--light-theme-text-text-primary, #131315);
-}
-
-.bx--progress-step-current {
-  border-color: var(--cds-interactive-01);
-}
-
-.bx--progress-step-queued {
-  border-color: #dfdfe1;
-}
-
-.bx--progress-step-error {
-  border-color: var(--cds-danger-01);
-}
-
-.bx--progress-step-complete {
-  border-color: var(--cds-interactive-01);
-}
-
-.bx--progress-step-icon-current {
-  color: var(--cds-interactive-01);
-}
-
-.bx--progress-step-icon-error {
-  color: var(--cds-danger-01);
-}
-
-.bx--progress-step-icon-complete {
-  color: var(--cds-interactive-01)
-}
-
-.bx--progress-step-icon-queued {
-  color: #dfdfe1;
-}
-
 /* Recreating the style */
 .spacing {
   padding: 1.5rem;
@@ -310,7 +241,7 @@ hr {
   color: var(--dark-theme-text-text-primary, #f3f3f5);
 
   /* Fixed heading styles/heading-compact-01 */
-  font-family:BC Sans, sans-serif;
+  font-family: BC Sans, sans-serif;
   font-size: 0.875rem;
   font-style: normal;
   font-weight: 700;
@@ -324,7 +255,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315) !important;
 
   /* Fixed heading styles/heading-02 */
-  font-family:BC Sans, sans-serif;
+  font-family: BC Sans, sans-serif;
   font-size: 1rem;
   font-style: normal;
   font-weight: 700;
@@ -334,7 +265,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315);
 
   /* Fixed heading styles/heading-03 */
-  font-family:BC Sans, sans-serif;
+  font-family: BC Sans, sans-serif;
   font-size: 1.25rem;
   font-style: normal;
   font-weight: 400;
@@ -344,7 +275,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315);
 
   /* Fixed heading styles/heading-04 */
-  font-family:BC Sans, sans-serif;
+  font-family: BC Sans, sans-serif;
   font-size: 1.75rem;
   font-style: normal;
   font-weight: 400;
@@ -354,7 +285,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315);
 
   /* Fixed heading styles/heading-05 */
-  font-family:BC Sans, sans-serif;
+  font-family: BC Sans, sans-serif;
   font-size: 2rem;
   font-style: normal;
   font-weight: 400;
@@ -365,7 +296,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315);
 
   /* Fluid styles/MAX/fluid-heading-05 */
-  font-family:BC Sans, sans-serif;
+  font-family: BC Sans, sans-serif;
   font-size: 3.75rem;
   font-style: normal;
   font-weight: 400;
@@ -376,7 +307,7 @@ hr {
   color: var(--light-theme-text-text-secondary, #606062);
 
   /* Fluid styles/MAX/fluid-paragraph-01 */
-  font-family:BC Sans, sans-serif;
+  font-family: BC Sans, sans-serif;
   font-size: 2rem;
   font-style: normal;
   font-weight: 400;
@@ -386,7 +317,7 @@ hr {
   color: var(--light-theme-text-text-secondary, #606062);
 
   /* Body styles/body-01 */
-  font-family:BC Sans, sans-serif;
+  font-family: BC Sans, sans-serif;
   font-size: 0.875rem;
   font-style: normal;
   font-weight: 400;
@@ -397,7 +328,7 @@ hr {
   color: var(--light-theme-text-text-secondary, #606062);
 
   /* Body styles/body-02 */
-  font-family:BC Sans, sans-serif;
+  font-family: BC Sans, sans-serif;
   font-size: 1rem;
   font-style: normal;
   font-weight: 400;
@@ -407,7 +338,7 @@ hr {
   color: var(--light-theme-text-text-primary, #131315);
 
   /* Body styles/body-compact-01 */
-  font-family:BC Sans, sans-serif;
+  font-family: BC Sans, sans-serif;
   font-size: 0.875rem;
   font-style: normal;
   font-weight: 400;
@@ -431,7 +362,6 @@ hr {
   align-items: stretch;
   height: 100vh;
   width: 100vw;
-  
 }
 
 .form-header {
@@ -654,13 +584,6 @@ hr {
   padding-bottom: 1.5rem;
 }
 
-.bx--btn-reset {
-  position: relative;
-  top: auto;
-  right: auto;
-  transform: inherit;
-}
-
 .label-01 {
   align-self: stretch;
   color: var(--light-theme-text-text-primary, #131315);
@@ -683,12 +606,6 @@ hr {
   border-radius: 0.25rem 0.25rem 0rem 0rem;
 }
 
-.bx-tag-box {
-  display: flex;
-  align-items: flex-start;
-  gap: 0.5rem;
-}
-
 .display-block-wrapper {
   display: flex;
   align-items: flex-start;
@@ -749,7 +666,8 @@ cds-modal-footer-button::part(button) {
     position: relative;
   }
 
-  .cds--modal-close-btn, .cds--modal-submit-btn {
+  .cds--modal-close-btn,
+  .cds--modal-submit-btn {
     margin: 0rem;
     width: 100%;
   }
@@ -796,22 +714,6 @@ cds-modal-footer-button::part(button) {
     flex-shrink: 0;
   }
 
-  .bx--btn-header {
-    width: 1.25rem;
-    height: 1.25rem;
-    border: none !important;
-  }
-
-  .bx--btn-header::part(button) {
-    width: 2.5rem;
-    border: none !important;
-    margin-right: 20rem !important;
-  }
-
-  .bx--btn-reset {
-    width: 2.5rem;
-  }
-
   .form-header {
     align-self: stretch;
   }
@@ -820,14 +722,6 @@ cds-modal-footer-button::part(button) {
     flex-direction: column;
   }
 
-  .bx--progress-step {
-    width: 18rem;
-  }
-
-  .bx--progress-step svg {
-    margin: 0.6rem;
-  }
-
   .form-steps {
     align-self: stretch;
     width: 18rem;
@@ -847,16 +741,6 @@ cds-modal-footer-button::part(button) {
     flex-direction: column-reverse;
     justify-content: flex-end;
   }
-
-  .bx--progress-indicator {
-    flex-direction: column;
-  }
-
-  .bx--progress-step {
-    border-top: none;
-    border-left: solid 0.125rem;
-    flex: none;
-  }
 }
 
 /* Medium (from 321px to 671px) */
@@ -886,22 +770,10 @@ cds-modal-footer-button::part(button) {
   .heading span:last-child {
     display: none;
   }
+
   .heading-space {
     width: 8.75rem;
   }
-  .bx--btn-header::part(button) {
-    width: 2.5rem;
-    border: none !important;
-    margin-right: 20rem !important;
-  }
-
-  .bx--btn-reset {
-    width: 2.5rem;
-  }
-
-  .bx--btn-header::part(button):hover {
-    background: var(--light-theme-background-background-brand, #0073e6);
-  }
 
   .form-header {
     align-self: stretch;
diff --git a/frontend/src/pages/ErrorPage.vue b/frontend/src/pages/ErrorPage.vue
index 9ed7e67acd..080255e80d 100644
--- a/frontend/src/pages/ErrorPage.vue
+++ b/frontend/src/pages/ErrorPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bx--content">
+  <div>
     <div>Something went wrong</div>
     <p>{{ errorCode }}</p>
   </div>
diff --git a/frontend/src/pages/FormBCSCPage.vue b/frontend/src/pages/FormBCSCPage.vue
index 498ed2824a..36e9b5fd2e 100644
--- a/frontend/src/pages/FormBCSCPage.vue
+++ b/frontend/src/pages/FormBCSCPage.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="bx--content">
+    <div>
       <h1>Test</h1>
     </div>
   </template>
diff --git a/frontend/src/pages/FormSubmittedPage.vue b/frontend/src/pages/FormSubmittedPage.vue
index ecbb82f964..f0642375a1 100644
--- a/frontend/src/pages/FormSubmittedPage.vue
+++ b/frontend/src/pages/FormSubmittedPage.vue
@@ -9,15 +9,12 @@
         We’ll send the client number to {{ submitterInformation?.email }} once
         we confirm the information you provided.
       </p>
-      <bx-btn
+      <cds-button
         kind="primary"
-        iconLayout=""
-        class="bx--btn"
         @click.prevent="newFormSubmission()"
-        size="field"
-      >
+        size="field">
         <span>Create another client</span>
-      </bx-btn>
+      </cds-button>
     </div>
   </div>
 </template>
diff --git a/frontend/src/pages/NotFoundPage.vue b/frontend/src/pages/NotFoundPage.vue
index 9979d5f789..627c6cd115 100644
--- a/frontend/src/pages/NotFoundPage.vue
+++ b/frontend/src/pages/NotFoundPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bx--content">
+  <div>
     <h1>404 - Not Found</h1>
   </div>
   <a href="/">Go Home</a>
diff --git a/frontend/src/pages/ReviewApplicationPage.vue b/frontend/src/pages/ReviewApplicationPage.vue
index d44760df5a..a2a407d3b2 100644
--- a/frontend/src/pages/ReviewApplicationPage.vue
+++ b/frontend/src/pages/ReviewApplicationPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bx--content">
+  <div>
     <div>Application lists</div>
   </div>
 </template>
diff --git a/frontend/src/pages/UserLoadingPage.vue b/frontend/src/pages/UserLoadingPage.vue
index 5e1916f1dc..563d003b18 100644
--- a/frontend/src/pages/UserLoadingPage.vue
+++ b/frontend/src/pages/UserLoadingPage.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="bx--content">
+  <div>
     <div class="waiting">
       <bx-loading type="small"> </bx-loading>
     </div>

From ffdaab41ba8c067b60355f96b1a3550541c76174 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 14 Sep 2023 16:31:43 -0700
Subject: [PATCH 119/313] chore: redoing css changes - Part #4

---
 frontend/src/assets/styles/global.scss | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index e2e9378f6f..d49a35e4df 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -1,6 +1,5 @@
 @use "sass:map";
 @use "@carbon/styles";
-@use "@carbon/themes/scss/tokens";
 @use "@bcgov-nr/nr-fsa-theme/design-tokens/type-family.scss" as typeFamily;
 
 :root {
@@ -32,23 +31,28 @@
   --light-theme-focus: #0073e6;
   --light-theme-miscellaneous-interactive: #0073e6;
 
+   //All buttons
+  --cds-button-disabled: #C6C6C8;
+
   //Primary button
   --cds-button-primary: #0073e6;
-  --cds-button-primary-hover: red;
+  --cds-button-primary-hover: #0066CC;
+  --cds-button-primary-active: #00478F;
 
   //Secondary button
-  --cds-interactive-02: #464648;
-  --cds-active-secondary: #464648;
-  --cds-hover-secondary: #535355;
+  --cds-button-secondary: #464648;
+  --cds-button-secondary-hover: #535355;
+  --cds-button-secondary-active: #606062;
 
   //Tertiary button
-  --cds-interactive-03: #005cb8;
-  --cds-active-tertiary: #005cb8;
-  --cds-hover-tertiary: #0052a3;
+  --cds-button-tertiary: #005cb8;
+  --cds-button-tertiary-hover: #0052a3;
+  --cds-button-tertiary-active: #00478F;
 
   //Danger Ghost button
-  --cds-danger-01: #e72000;
-  --cds-hover-danger: #b32001;
+  --cds-button-danger: #e72000;
+  --cds-button-danger-hover: #b32001;
+  --cds-button-danger-active: #801701;
 }
 
 .heading-buttons {

From 46cd71697dd1eef1f9b8164e04dbb88c64e66b29 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 14 Sep 2023 20:49:54 -0300
Subject: [PATCH 120/313] test: test the validation function and the error
 component

---
 ...ErrorNotificationGroupingComponent.spec.ts | 172 ++++++++++++++++++
 .../ExternalFormValidations.spec.ts           |  75 +++++++-
 2 files changed, 246 insertions(+), 1 deletion(-)
 create mode 100644 frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts

diff --git a/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts b/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts
new file mode 100644
index 0000000000..e216a1114d
--- /dev/null
+++ b/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts
@@ -0,0 +1,172 @@
+import { describe, it, expect, beforeEach } from 'vitest'
+
+import { VueWrapper, mount } from '@vue/test-utils'
+import ErrorNotificationGroupingComponent from '@/components/grouping/ErrorNotificationGroupingComponent.vue'
+import type { ValidationMessageType } from '@/dto/CommonTypesDto'
+import { useEventBus } from '@vueuse/core'
+import { nextTick } from 'vue'
+
+const formData = {
+  location: {
+    addresses: []
+  }
+}
+
+describe('Error Notification Grouping Component', () => {
+  it('renders no error by default', () => {
+    const wrapper = mount(ErrorNotificationGroupingComponent, {
+      props: {
+        formData,
+        scrollToNewContact: () => {}
+      },
+    })
+    expect(wrapper.find('cds-inline-notification').exists()).toBe(false)
+  })
+  describe('location.addresses.*.locationName', () => {
+    it('renders a notification when an error message arrives', async () => {
+      const wrapper = mount(ErrorNotificationGroupingComponent, {
+        props: {
+          formData,
+          scrollToNewContact: () => {}
+        },
+      })
+      const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
+      const locationName = 'My location'
+      notificationBus.emit({
+        fieldId: 'location.addresses[1].locationName',
+        errorMsg: 'This value is invalid!'
+      }, locationName)
+  
+      await nextTick()
+  
+      expect(wrapper.find('cds-inline-notification').exists()).toBe(true)
+      expect(wrapper.find('cds-inline-notification').text()).toContain(locationName)
+    })
+    it('renders as many notifications as the number of different error messages arrived', async () => {
+      const wrapper = mount(ErrorNotificationGroupingComponent, {
+        props: {
+          formData,
+          scrollToNewContact: () => {}
+        },
+      })
+      const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
+      const locationNames = ['Mailing address', 'My location 1', 'My location 2', 'My location 3']
+      notificationBus.emit({
+        fieldId: 'location.addresses[1].locationName',
+        errorMsg: 'This value is invalid!'
+      }, locationNames[1])
+      notificationBus.emit({
+        fieldId: 'location.addresses[2].locationName',
+        errorMsg: 'This value is invalid!'
+      }, locationNames[2])
+      notificationBus.emit({
+        fieldId: 'location.addresses[3].locationName',
+        errorMsg: 'This value is invalid!'
+      }, locationNames[3])
+  
+      await nextTick()
+  
+      const elements = wrapper.findAll('cds-inline-notification');
+      expect(elements).toHaveLength(3)
+      for (let index = 0; index < elements.length; index++) {
+        const element = elements[index];
+        expect(element.text()).toContain(locationNames[index + 1])
+      }
+    })
+    describe("when there are some rendered notifications initially", () => {
+      let wrapper: VueWrapper<any, any>
+      const locationNames = ['Mailing address', 'My location 1', 'My location 2', 'My location 3']
+      const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
+      beforeEach(async () => {
+        wrapper = mount(ErrorNotificationGroupingComponent, {
+          props: {
+            formData: {
+              location: {
+                addresses: locationNames.map(locationName => ({ locationName }))
+              }
+            },
+            scrollToNewContact: () => {}
+          },
+        })
+        notificationBus.emit({
+          fieldId: 'location.addresses[1].locationName',
+          errorMsg: 'This value is invalid!'
+        }, locationNames[1])
+        notificationBus.emit({
+          fieldId: 'location.addresses[2].locationName',
+          errorMsg: 'This value is invalid!'
+        }, locationNames[2])
+        notificationBus.emit({
+          fieldId: 'location.addresses[3].locationName',
+          errorMsg: 'This value is invalid!'
+        }, locationNames[3])
+    
+        await nextTick()
+    
+        const elements = wrapper.findAll('cds-inline-notification');
+        expect(elements).toHaveLength(3)
+      })
+      it("gets rid of a notification when an event for the corresponding item arrives with no error message", async () => {
+        notificationBus.emit({
+          fieldId: 'location.addresses[2].locationName',
+          errorMsg: '' // empty means valid
+        }, locationNames[2])
+    
+        await nextTick()
+    
+        const elements = wrapper.findAll('cds-inline-notification');
+        expect(elements).toHaveLength(2)
+        for (let index = 0; index < elements.length; index++) {
+          const element = elements[index];
+          // #2 was removed
+          expect(element.text()).not.toContain(locationNames[2])
+        }
+
+        // #1 and #3 were kept
+        expect(elements[0].text()).toContain(locationNames[1])
+        expect(elements[1].text()).toContain(locationNames[3])
+      })
+      it("gets rid of a notification when the corresponding location has been removed", async () => {
+        const newLocationNames = [...locationNames];
+        newLocationNames.splice(2, 1); // removing #2
+        await wrapper.setProps({
+          formData: {
+            location: {
+              addresses: newLocationNames.map(locationName => ({ locationName }))
+            }
+          },
+          scrollToNewContact: () => {}
+        })
+
+        await nextTick()
+    
+        const elements = wrapper.findAll('cds-inline-notification');
+        expect(elements).toHaveLength(2)
+        for (let index = 0; index < elements.length; index++) {
+          const element = elements[index];
+          // #2 was removed
+          expect(element.text()).not.toContain(locationNames[2])
+        }
+
+        // #1 and #3 were kept
+        expect(elements[0].text()).toContain(locationNames[1])
+        expect(elements[1].text()).toContain(locationNames[3])
+      })
+      it("does not duplicate notifications", async () => {
+        notificationBus.emit({
+          fieldId: 'location.addresses[2].locationName',
+          errorMsg: 'This value is invalid!'
+        }, locationNames[2])
+    
+        await nextTick()
+    
+        const elements = wrapper.findAll('cds-inline-notification');
+        expect(elements).toHaveLength(3) // still 3 notifications just like before
+        for (let index = 0; index < elements.length; index++) {
+          const element = elements[index];
+          expect(element.text()).toContain(locationNames[index + 1])
+        }
+      })
+    })
+  })
+})
diff --git a/frontend/tests/unittests/helpers/validators/ExternalFormValidations.spec.ts b/frontend/tests/unittests/helpers/validators/ExternalFormValidations.spec.ts
index ea04bd3d84..30fbb1d866 100644
--- a/frontend/tests/unittests/helpers/validators/ExternalFormValidations.spec.ts
+++ b/frontend/tests/unittests/helpers/validators/ExternalFormValidations.spec.ts
@@ -4,8 +4,11 @@ import {
   getField,
   getValidations,
   validate,
-  addValidation 
+  addValidation,
+  runValidation,
 } from '@/helpers/validators/ExternalFormValidations'
+import type { ValidationMessageType } from '@/dto/CommonTypesDto'
+import { useEventBus } from '@vueuse/core'
 
 describe('ExternalFormValidations.ts', () => {
 
@@ -35,6 +38,8 @@ describe('ExternalFormValidations.ts', () => {
     },
   }
 
+  const isGreaterThanZero = (value: number) => value > 0 ? '' : 'invalid'
+
   it('should get a list of functions for a field', () => {
     addValidation('test', () => '')
     expect(getValidations('test')).toEqual([expect.any(Function)])
@@ -75,4 +80,72 @@ describe('ExternalFormValidations.ts', () => {
   it('should return true for nested fields with conditions', () => {
     expect(validate(['location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'], formDataDto)).toBeTruthy()
   })
+  describe('runValidation', () => {
+    describe('when target is an array', () => {
+      it('should stop at the first error when exhaustive is false (default)', () => {
+        const target = {
+          foo: [10, 0, 5, 0, 2]
+        }
+        const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
+        let count = 0
+        notificationBus.on(() => {
+          count++
+        })
+        const result = runValidation('foo', target, isGreaterThanZero, true)
+        expect(result).toBe(false)
+        expect(count).toEqual(2)
+      })
+      it('should validate every item in the array regardless of finding any error when exhaustive is true', () => {
+        const target = {
+          foo: [10, 0, 5, 0, 2]
+        }
+        const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
+        let count = 0
+        notificationBus.on(() => {
+          count++
+        })
+        const result = runValidation('foo', target, isGreaterThanZero, true, true)
+        expect(result).toBe(false)
+        expect(count).toEqual(5)
+      })
+      it('should emit the notification regardless of being valid or invalid', () => {
+        const target = {
+          foo: [10, 0]
+        }
+        const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
+        let invalidCount = 0
+        let validCount = 0
+        notificationBus.on((event) => {
+          if (event.errorMsg) {
+            invalidCount++
+          } else {
+            validCount++
+          }
+        })
+        const result = runValidation('foo', target, isGreaterThanZero, true, true)
+        expect(result).toBe(false)
+        expect(invalidCount).toEqual(1)
+        expect(validCount).toEqual(1)
+      })
+      it('should return true when every item is valid', () => {
+        const target = {
+          foo: [10, 20, 30]
+        }
+        const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
+        let invalidCount = 0
+        let validCount = 0
+        notificationBus.on((event) => {
+          if (event.errorMsg) {
+            invalidCount++
+          } else {
+            validCount++
+          }
+        })
+        const result = runValidation('foo', target, isGreaterThanZero, true, true)
+        expect(result).toBe(true)
+        expect(invalidCount).toEqual(0)
+        expect(validCount).toEqual(3)
+      })
+    })
+  })
 })
\ No newline at end of file

From 0db574732c657f664918b1c585877f244df8624e Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 15 Sep 2023 10:22:04 -0300
Subject: [PATCH 121/313] fix: update contactType value on select

---
 .../components/grouping/ContactGroupComponent.vue    | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index 64c54d941b..40c57cf29c 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -93,6 +93,14 @@ const nameTypesToCodeDescr = (
 onMounted(() =>{
   setFocusedComponent(`address_${props.id}`,800)
 })
+
+const updateContactType = (
+  value: CodeNameType | undefined,
+) => {
+  if (value) {
+    selectedValue.contactType = { value: value.code, text: value.name }
+  }
+}
 </script>
 
 <template>
@@ -124,9 +132,7 @@ onMounted(() =>{
       ...getValidations('location.contacts.*.contactType.text'),
       submissionValidation(`location.contacts[${id}].contactType`)
     ]"
-    @update:selected-value="
-      selectedValue.contactType = nameTypeToCodeDescr($event)
-    "
+    @update:selected-value="updateContactType($event)"
     @empty="validation.contactType = !$event"
   />
 

From 172917ab1318cd9d78c652093f03648c62b89262 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 15 Sep 2023 10:30:46 -0300
Subject: [PATCH 122/313] test: ignore already valid location

---
 ...ErrorNotificationGroupingComponent.spec.ts | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts b/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts
index e216a1114d..7a7784399d 100644
--- a/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts
+++ b/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts
@@ -106,7 +106,7 @@ describe('Error Notification Grouping Component', () => {
         const elements = wrapper.findAll('cds-inline-notification');
         expect(elements).toHaveLength(3)
       })
-      it("gets rid of a notification when an event for the corresponding item arrives with no error message", async () => {
+      it("clears the notification when an event with no error message for the corresponding location arrives", async () => {
         notificationBus.emit({
           fieldId: 'location.addresses[2].locationName',
           errorMsg: '' // empty means valid
@@ -126,7 +126,7 @@ describe('Error Notification Grouping Component', () => {
         expect(elements[0].text()).toContain(locationNames[1])
         expect(elements[1].text()).toContain(locationNames[3])
       })
-      it("gets rid of a notification when the corresponding location has been removed", async () => {
+      it("clears the notification when the corresponding location has been removed", async () => {
         const newLocationNames = [...locationNames];
         newLocationNames.splice(2, 1); // removing #2
         await wrapper.setProps({
@@ -137,8 +137,6 @@ describe('Error Notification Grouping Component', () => {
           },
           scrollToNewContact: () => {}
         })
-
-        await nextTick()
     
         const elements = wrapper.findAll('cds-inline-notification');
         expect(elements).toHaveLength(2)
@@ -160,6 +158,21 @@ describe('Error Notification Grouping Component', () => {
     
         await nextTick()
     
+        const elements = wrapper.findAll('cds-inline-notification');
+        expect(elements).toHaveLength(3) // still 3 notifications just like before
+        for (let index = 0; index < elements.length; index++) {
+          const element = elements[index];
+          expect(element.text()).toContain(locationNames[index + 1])
+        }
+      })
+      it("ignores a valid event when the corresponding location was already valid", async () => {
+        notificationBus.emit({
+          fieldId: 'location.addresses[0].locationName',
+          errorMsg: ''
+        }, locationNames[0])
+    
+        await nextTick()
+    
         const elements = wrapper.findAll('cds-inline-notification');
         expect(elements).toHaveLength(3) // still 3 notifications just like before
         for (let index = 0; index < elements.length; index++) {

From 6e4dbc4542727ac2af2c57a29af099a4885c8bcf Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 15 Sep 2023 15:33:58 -0300
Subject: [PATCH 123/313] test: remove outdated test

---
 .../forms/MultiselectInputComponent.spec.ts   | 48 ++++++++-----------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts b/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
index aee0495ddb..1fa62efed8 100644
--- a/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
@@ -91,6 +91,26 @@ describe('MultiselectInputComponent', () => {
     expect(wrapper.emitted('empty')![1][0]).toBe(false)
   })
 
+  it('should emit not empty when selectedValues is not empty', async () => {
+    const wrapper = mount(MultiselectInputComponent, {
+      props: {
+        id: 'test',
+        label: 'test',
+        tip: '',
+        modelValue: [
+          { code: 'A', name: 'Value A' },
+          { code: 'B', name: 'Value B' }
+        ],
+        initialValue: '',
+        validations: [],
+        selectedValues: ['Value A']
+      }
+    })
+
+    expect(wrapper.emitted('empty')).toBeTruthy()
+    expect(wrapper.emitted('empty')![0][0]).toBe(false)
+  })
+
   it('should validate and emit error if required', async () => {
     const wrapper = mount(MultiselectInputComponent, {
       props: {
@@ -159,34 +179,6 @@ describe('MultiselectInputComponent', () => {
     expect(wrapper.emitted('error')![0][0]).toBe(undefined)
   })
 
-  it('should select and emit on initial values', async () => {
-    const wrapper = mount(MultiselectInputComponent, {
-      props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
-        modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
-        ],
-        initialValue: '',
-        validations: [],
-        selectedValues: ['Value A']
-      }
-    })
-
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual(['Value A'])
-
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual([
-      {
-        code: 'A',
-        name: 'Value A'
-      }
-    ])
-  })
-
   it('should remove selection', async () => {
     const wrapper = mount(MultiselectInputComponent, {
       props: {

From 2e8a899b382c69bde4a3b9a8cfbc147c871755c6 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 18 Sep 2023 13:45:29 -0300
Subject: [PATCH 124/313] feat: add parameter for the shadow directive

---
 frontend/src/helpers/CustomDirectives.ts | 31 +++++++++++++++++-------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/frontend/src/helpers/CustomDirectives.ts b/frontend/src/helpers/CustomDirectives.ts
index 089707a38f..73d4f41caa 100644
--- a/frontend/src/helpers/CustomDirectives.ts
+++ b/frontend/src/helpers/CustomDirectives.ts
@@ -13,24 +13,37 @@ export const masking = (shadowSelector: string) => (el: any, binding: any) => {
   }
 }
 
-const handleMutations = (mutationsList: any) => {
+const setPart = (nodes: HTMLCollection, currentLevel: number, maxLevel: number) => {
+  for (const node of nodes) {
+    if (node.nodeType === Node.ELEMENT_NODE) {
+      if (node.getAttribute('part')) continue
+
+      const partValues = [node.tagName.toLowerCase()]
+      if (node.className) {
+        partValues.push(node.className)
+        console.log(node.className)
+      }
+      node.setAttribute('part', partValues.join(' '))
+      if (currentLevel < maxLevel) {
+        setPart(node.children, currentLevel + 1, maxLevel)
+      }
+    }
+  }
+}
+
+const handleMutations = (maxLevel: number) => (mutationsList: any) => {
   for (const mutation of mutationsList) {
     if (mutation.type === 'childList') {
-      for (const node of mutation.addedNodes) {
-        if (node.nodeType === Node.ELEMENT_NODE) {
-          if (node.getAttribute('part')) return
-          node.setAttribute('part', node.tagName.toLowerCase())
-        }
-      }
+      setPart(mutation.addedNodes, 1, maxLevel)
     }
   }
 }
 
 export const shadowPart = {
-  mounted: (el: any) => {
+  mounted: (el: any, binding = { value: 1 }) => {
     if (el.shadowRoot) {
       if (!el.getAttribute('parting')) {
-        const observer = new MutationObserver(handleMutations)
+        const observer = new MutationObserver(handleMutations(binding.value))
         observer.observe(el.shadowRoot, { childList: true, subtree: true })
         el.setAttribute('parting', 'true')
       }

From 83dcfec58583bb1b267c32adb87a42dc6af5a214 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 18 Sep 2023 13:47:48 -0300
Subject: [PATCH 125/313] feat: display progress indicator vertically

Also adds some changes for displaying it horizontally.
---
 frontend/src/assets/styles/global.scss | 11 +++++------
 frontend/src/pages/FormBCeIDPage.vue   | 14 ++++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 164e970b75..86ef61c704 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -77,14 +77,13 @@ cds-button span {
   --cds-border-subtle: var(--light-theme-miscellaneous-interactive);
 }
 
-.cds--progress-label {
-  overflow: visible !important;
+cds-progress-step[vertical] {
+  width: fit-content;
 }
 
-.cds--progress-label:hover {
-  box-shadow: none !important;
-  text-decoration: underline;
-  text-underline-offset: 0.325rem;
+cds-progress-step::part(cds--progress-label) {
+  max-width: initial;
+  padding-right: 0.5rem;
 }
 
 cds-inline-notification::part(div),
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 22f9c99aba..5b16c21357 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -5,7 +5,7 @@ import '@carbon/web-components/es/components/button/index';
 import '@carbon/web-components/es/components/progress-indicator/index';
 import '@carbon/web-components/es/components/notification/index';
 // Composables
-import { useEventBus } from "@vueuse/core";
+import { useEventBus, useMediaQuery } from "@vueuse/core";
 import { useRouter } from "vue-router";
 import { useFocus } from "@/composables/useFocus";
 import { usePost } from "@/composables/useFetch";
@@ -307,6 +307,8 @@ const scrollToNewContact = () => {
     });
   }
 }
+
+const isSmallScreen = useMediaQuery('(max-width: 671px)')
 </script>
 
 <template>
@@ -315,19 +317,19 @@ const scrollToNewContact = () => {
       <span class="heading-05" data-scroll="top">New client application</span>
       <p class="body-01">All fields are mandatory</p>
     </div>
-    <cds-progress-indicator space-equally>
+      <cds-progress-indicator space-equally :vertical="isSmallScreen">
         <cds-progress-step 
           v-for="item in progressData"
           :key="item.step"
+          :label="item.title"
           :secondary-label="item.subtitle"
           :state="item.kind"
           :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"
           v-on:click="goToStep(item.step)"
           :disabled="item.disabled"
-          >
-          <span class="cds--progress-label">{{ item.title }}</span>
-        </cds-progress-step>
-      </cds-progress-indicator>      
+          v-shadow="3"
+          />
+      </cds-progress-indicator>
       <error-notification-grouping-component
         :form-data="formData"
         :scroll-to-new-contact="scrollToNewContact"

From 92defac64150259deff23a731971a7030e4489e2 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 18 Sep 2023 10:46:18 -0700
Subject: [PATCH 126/313] FSADT1-868: Allowed special characters. Done olnly in
 the Frontend as the Backend was already allowing special charactes.

---
 .../src/helpers/validators/ExternalFormValidations.ts    | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/ExternalFormValidations.ts
index 58bdb73923..8ea3805335 100644
--- a/frontend/src/helpers/validators/ExternalFormValidations.ts
+++ b/frontend/src/helpers/validators/ExternalFormValidations.ts
@@ -50,14 +50,11 @@ globalValidations['location.addresses.*.province.text'] = [isNotEmpty('You must
 globalValidations['location.addresses.*.city'] = [
   isNotEmpty('You must provide a city'),
   isMinSize(
-    'The city name must be between 3 and 50 characters and cannot contain special characters',
+    'The city name must be between 3 and 50 characters',
   )(3),
   isMaxSize(
-    'The city name must be between 3 and 50 characters and cannot contain special characters',
-  )(50),
-  isNoSpecialCharacters(
-    'The city name must be between 3 and 50 characters and cannot contain special characters',
-  ),
+    'The city name must be between 3 and 50 characters',
+  )(50)
 ]
 globalValidations['location.addresses.*.streetAddress'] = [
   isNotEmpty('Please provide a valid address or PO Box'),

From 079704314b9426ec1ecc9a782eae2a244f38925d Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 18 Sep 2023 16:14:06 -0300
Subject: [PATCH 127/313] test: add getMany command

---
 frontend/cypress/support/commands.ts  | 10 ++++++++++
 frontend/cypress/support/cypress.d.ts |  1 +
 2 files changed, 11 insertions(+)

diff --git a/frontend/cypress/support/commands.ts b/frontend/cypress/support/commands.ts
index ffe07c7a21..156f791c70 100644
--- a/frontend/cypress/support/commands.ts
+++ b/frontend/cypress/support/commands.ts
@@ -81,3 +81,13 @@ Cypress.Commands.add('logout', () => {
   cy.reload()
   cy.wait(1000)
 })
+
+Cypress.Commands.add('getMany', (names: string[]): Cypress.Chainable<any[]> => {
+  const values: any[] = []
+
+  for (const arg of names) {
+    cy.get(arg).then((value) => values.push(value))
+  }
+
+  return cy.wrap(values)
+})
diff --git a/frontend/cypress/support/cypress.d.ts b/frontend/cypress/support/cypress.d.ts
index 72c3b2b4bd..b61dee23c9 100644
--- a/frontend/cypress/support/cypress.d.ts
+++ b/frontend/cypress/support/cypress.d.ts
@@ -9,5 +9,6 @@ declare namespace Cypress {
       expireCookie(name: string): Chainable<void>;
       login(email: string, name: string, provider: string): Chainable<void>;
       logout(): Chainable<void>;
+      getMany(names: string[]): Chainable<any[]>;
   }
 }

From 3ccd028d2f95ea5593715968e4f69a99c1b93930 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 18 Sep 2023 16:14:41 -0300
Subject: [PATCH 128/313] test: add progress indicator tests

---
 frontend/cypress.config.ts             |  4 +-
 frontend/cypress/e2e/FormGeneral.cy.ts | 62 +++++++++++++++++++++++++-
 2 files changed, 64 insertions(+), 2 deletions(-)

diff --git a/frontend/cypress.config.ts b/frontend/cypress.config.ts
index 85158b5a80..0dcd544861 100644
--- a/frontend/cypress.config.ts
+++ b/frontend/cypress.config.ts
@@ -40,5 +40,7 @@ export default defineConfig({
     }
   },
 
-  retries: 2
+  retries: 0,
+
+  includeShadowDom: true
 })
diff --git a/frontend/cypress/e2e/FormGeneral.cy.ts b/frontend/cypress/e2e/FormGeneral.cy.ts
index 699e0ce5cd..1b50ad2b98 100644
--- a/frontend/cypress/e2e/FormGeneral.cy.ts
+++ b/frontend/cypress/e2e/FormGeneral.cy.ts
@@ -21,7 +21,7 @@ describe('General Form', () => {
     cy.visit('/')
     cy.wait(500)
 
-    cy.login('uattest@forest.client', 'Uat Test', 'bcsc')
+    cy.login('uattest@forest.client', 'Uat Test', 'bceidbusiness')
 
     cy.get('#business').should('not.exist')
 
@@ -51,4 +51,64 @@ describe('General Form', () => {
 
     cy.logout()
   })
+
+  describe('Progress Indicator', () => {
+    type Orientation = 'horizontal' | 'vertical'
+    beforeEach(() => {
+      cy.visit('/')
+      cy.wait(500)
+
+      cy.login('uattest@forest.client', 'Uat Test', 'bceidbusiness')
+    })
+    ;[
+      {
+        viewportWidth: 400,
+        orientation: 'vertical',
+      },
+      {
+        viewportWidth: 671,
+        orientation: 'vertical',
+      },
+      {
+        viewportWidth: 672,
+        orientation: 'horizontal',
+      },
+      {
+        viewportWidth: 1200,
+        orientation: 'horizontal',
+      },
+    ].forEach(({ viewportWidth, orientation }) => {
+      describe(`when viewport width is ${viewportWidth}`, () => {
+        before(() => {
+          const viewportHeight = 600
+          cy.viewport(viewportWidth, viewportHeight)
+        })
+        it(`should display steps ${orientation}ly`, () => {
+          cy.contains('Step 1').as('step1')
+          cy.contains('Step 2').as('step2')
+          cy.contains('Step 3').as('step3')
+          cy.contains('Step 4').as('step4')
+
+          cy.getMany(['@step1', '@step2', '@step3', '@step4']).then(([...elements]) => {
+            const rects = (elements as JQuery<HTMLElement>[]).map((el) => {
+              return el.get(0).getBoundingClientRect()
+            })
+            if (orientation === 'horizontal') {
+              expect(rects[0].top).to.eq(rects[1].top).and.eq(rects[2].top).and.eq(rects[3].top)
+
+              expect(rects[0].left).to.be.lessThan(rects[1].left)
+              expect(rects[1].left).to.be.lessThan(rects[2].left)
+              expect(rects[2].left).to.be.lessThan(rects[3].left)
+            } else {
+              expect(rects[0].left).to.eq(rects[1].left).and.eq(rects[2].left).and.eq(rects[3].left)
+
+              expect(rects[0].top).to.be.lessThan(rects[1].top)
+              expect(rects[1].top).to.be.lessThan(rects[2].top)
+              expect(rects[2].top).to.be.lessThan(rects[3].top)
+            }
+          })
+        })
+      })
+    })
+  })
 })

From 822ac353db17d31de9a2adf0d764acf26016da63 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 18 Sep 2023 15:54:40 -0700
Subject: [PATCH 129/313] fixed inline notification colors

---
 frontend/src/assets/styles/global.scss | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 86ef61c704..b93436086a 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -31,7 +31,7 @@
   --light-theme-focus: #0073e6;
   --light-theme-miscellaneous-interactive: #0073e6;
 
-   //All buttons
+  //Buttons
   --cds-button-disabled: #C6C6C8;
 
   //Primary button
@@ -53,6 +53,22 @@
   --cds-button-danger: #e72000;
   --cds-button-danger-hover: #b32001;
   --cds-button-danger-active: #801701;
+
+  --cds-notification-background-info: #C2E0FF;
+  --cds-support-info: #0066CC;
+
+  //Inline notifications
+  --cds-notification-background-info: #C2E0FF;
+  --cds-support-info: #0066CC;
+
+  --cds-notification-background-success: #CCE5CC;
+  --cds-support-success: #007B00;
+
+  --cds-notification-background-warning: #FFF3CC;
+  --cds-support-warning: #FFC300;
+
+  --cds-notification-background-error: #FFEAE5;
+  --cds-support-error: #E72000;
 }
 
 .heading-buttons {

From a2696469f4bba89f2aa968c62476f831be667d3f Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 18 Sep 2023 21:06:43 -0700
Subject: [PATCH 130/313] Removed wrong style

---
 frontend/src/assets/styles/global.scss | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index b93436086a..aa69bd0c07 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -57,7 +57,7 @@
   --cds-notification-background-info: #C2E0FF;
   --cds-support-info: #0066CC;
 
-  //Inline notifications
+  //Notifications
   --cds-notification-background-info: #C2E0FF;
   --cds-support-info: #0066CC;
 
@@ -165,9 +165,7 @@ hr {
   right: 1.5625rem;
   top: 5rem;
   border-radius: 0.25rem;
-  background: var(--light-theme-background-background-inverse, #2d2d2f);
   z-index: 999; /* Higher value to ensure it's on top */
-
   /* Light Theme/Shadows/Menu */
   box-shadow: 0px 2px 6px 0px rgba(0, 0, 0, 0.3);
 }

From b8d1986ab999977106976bb149187faaa2db883e Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 18 Sep 2023 21:38:06 -0700
Subject: [PATCH 131/313] Added property needed

---
 frontend/src/App.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 51525da3b6..0c6e0b64c1 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -110,6 +110,7 @@ toastBus.on(openToast)
       kind="success"
       :title="toastContent.toastTitle"
       subtitle=""
+      low-contrast="true"
     >
   </cds-toast-notification>
 </template>

From db23ce1bff81b1237e06e1969b9afc898228f8bc Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 19 Sep 2023 09:19:39 -0300
Subject: [PATCH 132/313] feat: show logout modal

---
 .../src/components/MainHeaderComponent.vue    | 40 ++++++++++++++++++-
 1 file changed, 38 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 7e2439d938..7687cad011 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -20,6 +20,8 @@ const isSmallScreen = computed(() => screenWidth.value <= 320);
 const isMediumScreen = computed(() => screenWidth.value <= 671);
 
 onMounted(() => window.addEventListener('resize', updateScreenWidth));
+
+const logoutModalActive = ref(false);
 </script>
 
 <template>
@@ -52,7 +54,7 @@ onMounted(() => window.addEventListener('resize', updateScreenWidth));
       data-id="logout-btn"
       kind="tertiary"
       size="sm"
-      @click.prevent="$session?.logOut"
+      @click.prevent="logoutModalActive = true"
     >
       <Logout16 slot="icon" />
     </cds-button>
@@ -61,10 +63,44 @@ onMounted(() => window.addEventListener('resize', updateScreenWidth));
       v-if="$session?.isLoggedIn() && (!isSmallScreen && !isMediumScreen)"
       data-id="logout-btn"
       kind="tertiary"
-      @click.prevent="$session?.logOut"
+      @click.prevent="logoutModalActive = true"
     >
       <span>Logout</span>
       <Logout16 slot="icon" />
     </cds-button>
   </div>
+
+  <cds-modal
+    id="logout-modal"
+    size="sm"
+    :open="logoutModalActive"
+    @cds-modal-closed="logoutModalActive = false"
+  >
+    <cds-modal-header>
+      <cds-modal-close-button></cds-modal-close-button>
+      <cds-modal-heading
+        >Are you sure you want to logout? Your data will not be saved.
+      </cds-modal-heading>
+    </cds-modal-header>
+    <cds-modal-body><p></p></cds-modal-body>
+
+    <cds-modal-footer>
+        <cds-modal-footer-button 
+          kind="secondary"
+          data-modal-close
+          class="cds--modal-close-btn">
+          Cancel
+        </cds-modal-footer-button>
+        
+        <cds-modal-footer-button 
+          kind="danger"
+          class="cds--modal-submit-btn"
+          v-on:click="$session?.logOut"
+        >
+          Logout
+          <Logout16 slot="icon" />
+        </cds-modal-footer-button>
+
+      </cds-modal-footer>
+  </cds-modal>
 </template>

From 346ac9462278fe515e43ef97f052fae8bf256e90 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 19 Sep 2023 09:41:39 -0300
Subject: [PATCH 133/313] refactor: unify code for the logout button in
 different sizes

---
 frontend/src/components/MainHeaderComponent.vue | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 7687cad011..e029adde23 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -50,22 +50,13 @@ const logoutModalActive = ref(false);
 
     <!-- Remember to add profile button here -->
     <cds-button
-      v-if="$session?.isLoggedIn() && (isSmallScreen || isMediumScreen)"
+      v-if="$session?.isLoggedIn()"
       data-id="logout-btn"
       kind="tertiary"
-      size="sm"
+      :size="(isSmallScreen || isMediumScreen) ? 'sm' : 'lg'"
       @click.prevent="logoutModalActive = true"
     >
-      <Logout16 slot="icon" />
-    </cds-button>
-
-    <cds-button
-      v-if="$session?.isLoggedIn() && (!isSmallScreen && !isMediumScreen)"
-      data-id="logout-btn"
-      kind="tertiary"
-      @click.prevent="logoutModalActive = true"
-    >
-      <span>Logout</span>
+      <span v-if="!isSmallScreen && !isMediumScreen">Logout</span>
       <Logout16 slot="icon" />
     </cds-button>
   </div>

From 6d3b6e6527e0cd31832735c20c04a6daf3308750 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 19 Sep 2023 11:19:08 -0300
Subject: [PATCH 134/313] feat: show help modal

---
 frontend/src/assets/styles/global.scss        |  7 ++++
 .../src/components/MainHeaderComponent.vue    | 36 +++++++++++++++++--
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index aa69bd0c07..fa157ec08b 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -72,15 +72,22 @@
 }
 
 .heading-buttons {
+  display: flex;
+  gap: 2.5rem;
   --cds-text-inverse: var(--border-subtle-02);
   --cds-button-tertiary: var(--border-subtle-02);
   --cds-button-tertiary-hover: var(--others-transparent-transparent);
+  --cds-link-primary: var(--border-subtle-02);
 }
 
 .heading-buttons cds-button span {
   width: 7rem;
 }
 
+.heading-buttons #help-btn span {
+  width: 9.5rem;
+}
+
 cds-button::part(button) {
   border-radius: 0.25rem;
 }
diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index e029adde23..8e06ca0839 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -6,6 +6,7 @@ import '@carbon/web-components/es/components/button/index';
 import { nodeEnv, appVersion } from '@/CoreConstants';
 // @ts-ignore
 import Logout16 from '@carbon/icons-vue/es/logout/16';
+import Help16 from '@carbon/icons-vue/es/help/16';
 
 const envPrefix = "openshift-";
 const env = ref(nodeEnv);
@@ -21,6 +22,7 @@ const isMediumScreen = computed(() => screenWidth.value <= 671);
 
 onMounted(() => window.addEventListener('resize', updateScreenWidth));
 
+const helpModalActive = ref(false);
 const logoutModalActive = ref(false);
 </script>
 
@@ -49,6 +51,17 @@ const logoutModalActive = ref(false);
   <div class="heading-buttons">
 
     <!-- Remember to add profile button here -->
+    
+    <cds-button
+      id="help-btn"
+      data-id="help-btn"
+      kind="ghost"
+      :size="(isSmallScreen || isMediumScreen) ? 'sm' : 'lg'"
+      @click.prevent="helpModalActive = true"
+    >
+      <span v-if="!isSmallScreen && !isMediumScreen">Help with application</span>
+      <Help16 slot="icon" />
+    </cds-button>
     <cds-button
       v-if="$session?.isLoggedIn()"
       data-id="logout-btn"
@@ -61,6 +74,25 @@ const logoutModalActive = ref(false);
     </cds-button>
   </div>
 
+  <cds-modal
+    id="help-modal"
+    size="sm"
+    :open="helpModalActive"
+    @cds-modal-closed="helpModalActive = false"
+  >
+    <cds-modal-header>
+      <cds-modal-close-button></cds-modal-close-button>
+      <cds-modal-heading>
+        Help with application
+      </cds-modal-heading>
+    </cds-modal-header>
+    <cds-modal-body>
+      <p>
+        Can’t proceed with your application? Let us know by emailing your issue to <a href='mailto:forhvap.cliadmin@gov.bc.ca'>forhvap.cliadmin@gov.bc.ca</a> and we’ll get back to you.
+      </p>
+    </cds-modal-body>
+  </cds-modal>
+
   <cds-modal
     id="logout-modal"
     size="sm"
@@ -69,8 +101,8 @@ const logoutModalActive = ref(false);
   >
     <cds-modal-header>
       <cds-modal-close-button></cds-modal-close-button>
-      <cds-modal-heading
-        >Are you sure you want to logout? Your data will not be saved.
+      <cds-modal-heading>
+        Are you sure you want to logout? Your data will not be saved.
       </cds-modal-heading>
     </cds-modal-header>
     <cds-modal-body><p></p></cds-modal-body>

From 7c80197519b2c95a269bb2e7e209273257238c10 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 19 Sep 2023 11:40:23 -0300
Subject: [PATCH 135/313] feat: use media query instead of outerWidth to
 determine screen size

---
 frontend/src/components/MainHeaderComponent.vue | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 8e06ca0839..923154dd53 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -1,11 +1,13 @@
 <script setup lang="ts">
-import { ref, computed, onMounted } from 'vue';
+import { ref } from 'vue';
+import { useMediaQuery } from '@vueuse/core';
 // Carbon
 import '@carbon/web-components/es/components/button/index';
 // Types
 import { nodeEnv, appVersion } from '@/CoreConstants';
 // @ts-ignore
 import Logout16 from '@carbon/icons-vue/es/logout/16';
+// @ts-ignore
 import Help16 from '@carbon/icons-vue/es/help/16';
 
 const envPrefix = "openshift-";
@@ -13,14 +15,8 @@ const env = ref(nodeEnv);
 env.value = env.value.slice(envPrefix.length);
 env.value = env.value.charAt(0).toUpperCase() + env.value.slice(1);
 
-const screenWidth = ref(window.outerWidth);
-const updateScreenWidth = () => (screenWidth.value = window.outerWidth);
-
-// Use computed property to determine if it's a small screen
-const isSmallScreen = computed(() => screenWidth.value <= 320);
-const isMediumScreen = computed(() => screenWidth.value <= 671);
-
-onMounted(() => window.addEventListener('resize', updateScreenWidth));
+const isSmallScreen = useMediaQuery('(max-width: 320px)')
+const isMediumScreen = useMediaQuery('(min-width: 321px) and (max-width: 671px)')
 
 const helpModalActive = ref(false);
 const logoutModalActive = ref(false);

From 827e496c20828a2809396f25cb8816120f14bc10 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 19 Sep 2023 09:30:09 -0700
Subject: [PATCH 136/313] Removed class that was causing issues with the logout
 button

---
 frontend/src/assets/styles/global.scss | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index fa157ec08b..4d6da17ed0 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -71,15 +71,6 @@
   --cds-support-error: #E72000;
 }
 
-.heading-buttons {
-  display: flex;
-  gap: 2.5rem;
-  --cds-text-inverse: var(--border-subtle-02);
-  --cds-button-tertiary: var(--border-subtle-02);
-  --cds-button-tertiary-hover: var(--others-transparent-transparent);
-  --cds-link-primary: var(--border-subtle-02);
-}
-
 .heading-buttons cds-button span {
   width: 7rem;
 }
@@ -340,6 +331,7 @@ hr {
   font-weight: 400;
   line-height: 2.5rem; /* 125% */
 }
+
 .body-01 {
   color: var(--light-theme-text-text-secondary, #606062);
 
@@ -602,6 +594,7 @@ hr {
   gap: 0.125rem;
   flex: 1 0 0;
 }
+
 .grouping-09 {
   align-self: stretch;
   display: flex;

From eab2a43c9e5942757361c4610ec28cb06274c516 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 19 Sep 2023 09:34:48 -0700
Subject: [PATCH 137/313] Revert "Removed class that was causing issues with
 the logout button"

This reverts commit 827e496c20828a2809396f25cb8816120f14bc10.
---
 frontend/src/assets/styles/global.scss | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 4d6da17ed0..fa157ec08b 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -71,6 +71,15 @@
   --cds-support-error: #E72000;
 }
 
+.heading-buttons {
+  display: flex;
+  gap: 2.5rem;
+  --cds-text-inverse: var(--border-subtle-02);
+  --cds-button-tertiary: var(--border-subtle-02);
+  --cds-button-tertiary-hover: var(--others-transparent-transparent);
+  --cds-link-primary: var(--border-subtle-02);
+}
+
 .heading-buttons cds-button span {
   width: 7rem;
 }
@@ -331,7 +340,6 @@ hr {
   font-weight: 400;
   line-height: 2.5rem; /* 125% */
 }
-
 .body-01 {
   color: var(--light-theme-text-text-secondary, #606062);
 
@@ -594,7 +602,6 @@ hr {
   gap: 0.125rem;
   flex: 1 0 0;
 }
-
 .grouping-09 {
   align-self: stretch;
   display: flex;

From 9ad4493272ae240b42c7c1aabea4de0423c5aeef Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 19 Sep 2023 12:50:24 -0700
Subject: [PATCH 138/313] Fixed logout button

---
 frontend/src/assets/styles/global.scss        | 23 ++++++++++++++-----
 .../src/components/MainHeaderComponent.vue    |  3 +++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index fa157ec08b..7b19de4b5a 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -49,7 +49,7 @@
   --cds-button-tertiary-hover: #0052a3;
   --cds-button-tertiary-active: #00478F;
 
-  //Danger Ghost button
+  //Danger button
   --cds-button-danger: #e72000;
   --cds-button-danger-hover: #b32001;
   --cds-button-danger-active: #801701;
@@ -74,10 +74,15 @@
 .heading-buttons {
   display: flex;
   gap: 2.5rem;
-  --cds-text-inverse: var(--border-subtle-02);
-  --cds-button-tertiary: var(--border-subtle-02);
-  --cds-button-tertiary-hover: var(--others-transparent-transparent);
-  --cds-link-primary: var(--border-subtle-02);
+}
+
+.cds--logout-btn::part(button) {
+  border-color: #FFFFFF;
+  color: #FFFFFF;
+}
+
+.cds--help-btn::part(button) {
+  color: #F3F3F5;
 }
 
 .heading-buttons cds-button span {
@@ -265,7 +270,7 @@ hr {
   background-blend-mode: multiply;
 }
 .heading-compact-01 {
-  color: var(--dark-theme-text-text-primary, #f3f3f5);
+  color: var(--dark-theme-text-text-primary, #F3F3F5);
 
   /* Fixed heading styles/heading-compact-01 */
   font-family: BC Sans, sans-serif;
@@ -664,6 +669,8 @@ cds-modal-footer {
 cds-modal-footer-button::part(button) {
   border-radius: 0.25rem;
   height: 75%;
+  margin-bottom: 0;
+  margin-top: auto;
 }
 
 .cds--modal-close-btn {
@@ -674,6 +681,10 @@ cds-modal-footer-button::part(button) {
   margin-left: 0.25rem;
 }
 
+cds-modal {
+  height: 100%;
+}
+
 /* Small (up to 320px) */
 @media screen and (max-width: 320px) {
   .wizard-head-toast {
diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 923154dd53..307ba6d060 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -52,16 +52,19 @@ const logoutModalActive = ref(false);
       id="help-btn"
       data-id="help-btn"
       kind="ghost"
+      class="cds--help-btn"
       :size="(isSmallScreen || isMediumScreen) ? 'sm' : 'lg'"
       @click.prevent="helpModalActive = true"
     >
       <span v-if="!isSmallScreen && !isMediumScreen">Help with application</span>
       <Help16 slot="icon" />
     </cds-button>
+
     <cds-button
       v-if="$session?.isLoggedIn()"
       data-id="logout-btn"
       kind="tertiary"
+      class="cds--logout-btn"
       :size="(isSmallScreen || isMediumScreen) ? 'sm' : 'lg'"
       @click.prevent="logoutModalActive = true"
     >

From 10fbe85752c9f6670fa7f5eae7c5eb1e63622e65 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 19 Sep 2023 18:40:16 -0300
Subject: [PATCH 139/313] feat: adjust header buttons

---
 frontend/src/assets/styles/global.scss        | 24 +++++++++++++++----
 .../src/components/MainHeaderComponent.vue    |  2 --
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 7b19de4b5a..21e5579389 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -20,6 +20,12 @@
   --dark-theme-link-link-secondary-hover: #005cb8;
   --dark-theme-link-link-inverse: #005cb8;
   --dark-theme-link-link-visited: #c59af1;
+  --dark-theme-focus-focus: #ffffff;
+  --dark-theme-button-button-tertiary: #ffffff;
+  --dark-theme-button-button-tertiary-active: #C6C6C8;
+  --dark-theme-background-background-hover: rgba(147, 147, 149, 0.16);
+  --dark-theme-background-background-active: rgba(147, 147, 149, 0.40);
+  --dark-theme-text-text-primary: #F3F3F5;
   --light-theme-support-support-info: #00478f;
   --light-theme-notifications-support-info-border: rgba(0, 102, 204, 1);
   --light-theme-notifications-notification-info-background: #c2e0ff;
@@ -74,15 +80,23 @@
 .heading-buttons {
   display: flex;
   gap: 2.5rem;
+  --cds-text-inverse: var(--light-theme-text-text-primary);
+  --cds-button-tertiary: var(--dark-theme-button-button-tertiary);
+  --cds-button-tertiary-hover: var(--dark-theme-focus-focus);
+  --cds-button-tertiary-active: var(--dark-theme-button-button-tertiary-active);
+  
+  --cds-link-primary: var(--border-subtle-02);
+  --cds-link-primary-hover: var(--dark-theme-link-link-primary-hover);
+  --cds-layer-hover: var(--dark-theme-background-background-hover);
+  --cds-background-active: var(--dark-theme-background-background-active);
 }
 
-.cds--logout-btn::part(button) {
-  border-color: #FFFFFF;
-  color: #FFFFFF;
+.heading-buttons cds-button[kind='tertiary']{
+  --cds-button-tertiary: var(--dark-theme-button-button-tertiary);
 }
 
-.cds--help-btn::part(button) {
-  color: #F3F3F5;
+.heading-buttons cds-button[kind='ghost']{
+  --cds-button-tertiary: var(--dark-theme-text-text-primary);
 }
 
 .heading-buttons cds-button span {
diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 307ba6d060..8a836c02b4 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -52,7 +52,6 @@ const logoutModalActive = ref(false);
       id="help-btn"
       data-id="help-btn"
       kind="ghost"
-      class="cds--help-btn"
       :size="(isSmallScreen || isMediumScreen) ? 'sm' : 'lg'"
       @click.prevent="helpModalActive = true"
     >
@@ -64,7 +63,6 @@ const logoutModalActive = ref(false);
       v-if="$session?.isLoggedIn()"
       data-id="logout-btn"
       kind="tertiary"
-      class="cds--logout-btn"
       :size="(isSmallScreen || isMediumScreen) ? 'sm' : 'lg'"
       @click.prevent="logoutModalActive = true"
     >

From 587ab63482cadf316549d4e5cc758a3f95126eda Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 19 Sep 2023 15:37:10 -0700
Subject: [PATCH 140/313] Fixed mask issue with the postal code

---
 frontend/src/components/grouping/AddressGroupComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 41b6db113b..20f1bc4291 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -334,7 +334,7 @@ onMounted(() =>{
     :enabled="true"
     :error-message="addressError"
     v-model="modelValue.postalCode"
-    :masked="postalCodeMask"
+    :mask="postalCodeMask"
     :validations="postalCodeValidators"
     @error="validation.postalCode = !$event"
     @empty="validation.postalCode = !$event"

From de745d96c75b52ffb44489d584183ee962d06a8f Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 20 Sep 2023 10:02:56 -0700
Subject: [PATCH 141/313] Renamed some files before refactoring code

---
 frontend/src/components/grouping/AddressGroupComponent.vue    | 2 +-
 frontend/src/components/grouping/ContactGroupComponent.vue    | 2 +-
 .../{ExternalFormValidations.ts => BCeIDFormValidations.ts}   | 0
 frontend/src/pages/FormBCeIDPage.vue                          | 2 +-
 .../src/pages/applyform/BusinessInformationWizardStep.vue     | 4 ++--
 ...alFormValidations.spec.ts => BCeIDFormValidations.spec.ts} | 0
 frontend/tsconfig.app.json                                    | 3 ++-
 7 files changed, 7 insertions(+), 6 deletions(-)
 rename frontend/src/helpers/validators/{ExternalFormValidations.ts => BCeIDFormValidations.ts} (100%)
 rename frontend/tests/unittests/helpers/validators/{ExternalFormValidations.spec.ts => BCeIDFormValidations.spec.ts} (100%)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 20f1bc4291..3ce4d0d476 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -10,7 +10,7 @@ import { useFocus } from '@/composables/useFocus'
 import type { CodeNameType, BusinessSearchResult } from '@/dto/CommonTypesDto'
 import type { Address } from '@/dto/ApplyClientNumberDto'
 // Validators
-import { getValidations } from '@/helpers/validators/ExternalFormValidations'
+import { getValidations } from '@/helpers/validators/BCeIDFormValidations'
 import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
 // @ts-ignore
 import Delete16 from '@carbon/icons-vue/es/trash-can/16'
diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index 40c57cf29c..ee93ca4282 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -8,7 +8,7 @@ import { useFocus } from '@/composables/useFocus'
 import type { CodeDescrType, CodeNameType } from '@/dto/CommonTypesDto'
 import type { Contact } from '@/dto/ApplyClientNumberDto'
 // Importing validatons
-import { getValidations } from '@/helpers/validators/ExternalFormValidations'
+import { getValidations } from '@/helpers/validators/BCeIDFormValidations'
 import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
 // @ts-ignore
 import Delete16 from '@carbon/icons-vue/es/trash-can/16'
diff --git a/frontend/src/helpers/validators/ExternalFormValidations.ts b/frontend/src/helpers/validators/BCeIDFormValidations.ts
similarity index 100%
rename from frontend/src/helpers/validators/ExternalFormValidations.ts
rename to frontend/src/helpers/validators/BCeIDFormValidations.ts
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 5b16c21357..625f5b9970 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -29,7 +29,7 @@ import {
   addValidation,
   validate,
   runValidation,
-} from "@/helpers/validators/ExternalFormValidations";
+} from "@/helpers/validators/BCeIDFormValidations";
 // @ts-ignore
 import ArrowRight16 from "@carbon/icons-vue/es/arrow--right/16";
 // @ts-ignore
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index cb754c90c3..e0867ac334 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -14,7 +14,7 @@ import type {
   ForestClientDetailsDto
 } from '@/dto/ApplyClientNumberDto'
 // Importing validators
-import { getValidations } from '@/helpers/validators/ExternalFormValidations'
+import { getValidations } from '@/helpers/validators/BCeIDFormValidations'
 import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
 // Importing helper functions
 import { retrieveClientType, exportAddress } from '@/helpers/DataConversors'
@@ -310,4 +310,4 @@ watch([selectedOption], () => {
     :validations="[]"
     :enabled="false"
   />
-</template>
\ No newline at end of file
+</template>
diff --git a/frontend/tests/unittests/helpers/validators/ExternalFormValidations.spec.ts b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
similarity index 100%
rename from frontend/tests/unittests/helpers/validators/ExternalFormValidations.spec.ts
rename to frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
diff --git a/frontend/tsconfig.app.json b/frontend/tsconfig.app.json
index c01982b05b..01400c18bc 100644
--- a/frontend/tsconfig.app.json
+++ b/frontend/tsconfig.app.json
@@ -10,6 +10,7 @@
     "paths": {
       "@/*": ["./src/*"]
     },
-    "types": ["unplugin-icons/types/vue"]
+    "types": ["unplugin-icons/types/vue"],
+    "ignoreDeprecations": "5.0" // To silence the deprecation warning
   }
 }

From 1e8e0349a8f265348e244210e7de0f8b54fd230a Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 20 Sep 2023 11:10:49 -0700
Subject: [PATCH 142/313] no message

---
 .../helpers/validators/BCeIDFormValidations.spec.ts         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
index 30fbb1d866..9a0c997d64 100644
--- a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
+++ b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
@@ -6,11 +6,11 @@ import {
   validate,
   addValidation,
   runValidation,
-} from '@/helpers/validators/ExternalFormValidations'
+} from '@/helpers/validators/BCeIDFormValidations'
 import type { ValidationMessageType } from '@/dto/CommonTypesDto'
 import { useEventBus } from '@vueuse/core'
 
-describe('ExternalFormValidations.ts', () => {
+describe('BCeIDFormValidations.ts', () => {
 
   const formDataDto = {
     businessInformation: {
@@ -148,4 +148,4 @@ describe('ExternalFormValidations.ts', () => {
       })
     })
   })
-})
\ No newline at end of file
+})

From c996da041c9284ce23797e0b6f206e6365e6639e Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 20 Sep 2023 12:53:52 -0700
Subject: [PATCH 143/313] Made code reviews

---
 .../validators/BCeIDFormValidations.ts        | 331 ++++++++++--------
 1 file changed, 180 insertions(+), 151 deletions(-)

diff --git a/frontend/src/helpers/validators/BCeIDFormValidations.ts b/frontend/src/helpers/validators/BCeIDFormValidations.ts
index 8ea3805335..8f4149bf10 100644
--- a/frontend/src/helpers/validators/BCeIDFormValidations.ts
+++ b/frontend/src/helpers/validators/BCeIDFormValidations.ts
@@ -1,4 +1,4 @@
-import { useEventBus } from '@vueuse/core'
+import { useEventBus } from "@vueuse/core";
 
 import {
   isNotEmpty,
@@ -11,114 +11,124 @@ import {
   isOnlyNumbers,
   isNoSpecialCharacters,
   isNot,
-} from '@/helpers/validators/GlobalValidators'
+} from "@/helpers/validators/GlobalValidators";
 
-import type { FormDataDto } from '@/dto/ApplyClientNumberDto'
-import type { ValidationMessageType } from '@/dto/CommonTypesDto'
+import type { FormDataDto } from "@/dto/ApplyClientNumberDto";
+import type { ValidationMessageType } from "@/dto/CommonTypesDto";
 
 const errorBus = useEventBus<ValidationMessageType[]>(
-  'submission-error-notification'
-)
-const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
+  "submission-error-notification"
+);
+const notificationBus = useEventBus<ValidationMessageType | undefined>(
+  "error-notification"
+);
 
 // We declare here a collection of all validations for every field in the form
-const globalValidations: Record<string, ((value: string) => string)[]> = {}
+const globalValidations: Record<string, ((value: string) => string)[]> = {};
 
 // Step 1: Business Information
-globalValidations['businessInformation.businessName'] = [
-  isNotEmpty('Business Name cannot be empty'),
-]
-globalValidations['businessInformation.clientType'] = [
-isNot('I','Individuals cannot be selected. Please select a different client.')
-]
+globalValidations["businessInformation.businessName"] = [
+  isNotEmpty("Business Name cannot be empty"),
+];
+globalValidations["businessInformation.clientType"] = [
+  isNot(
+    "I",
+    "Individuals cannot be selected. Please select a different client."
+  ),
+];
 
 // Step 2: Addresses
-globalValidations['location.addresses.*.locationName'] = [
-  isNotEmpty('You must provide a name for this location'),
+globalValidations["location.addresses.*.locationName"] = [
+  isNotEmpty("You must provide a name for this location"),
   isMinSize(
-    'The location name must be between 3 and 50 characters and cannot contain special characters',
+    "The location name must be between 3 and 50 characters and cannot contain special characters"
   )(3),
   isMaxSize(
-    'The location name must be between 3 and 50 characters and cannot contain special characters',
+    "The location name must be between 3 and 50 characters and cannot contain special characters"
   )(50),
   isNoSpecialCharacters(
-    'The location name must be between 3 and 50 characters and cannot contain special characters',
+    "The location name must be between 3 and 50 characters and cannot contain special characters"
   ),
-]
-globalValidations['location.addresses.*.country.text'] = [isNotEmpty('You must select a country')]
-globalValidations['location.addresses.*.province.text'] = [isNotEmpty('You must select a value')]
-globalValidations['location.addresses.*.city'] = [
-  isNotEmpty('You must provide a city'),
-  isMinSize(
-    'The city name must be between 3 and 50 characters',
-  )(3),
-  isMaxSize(
-    'The city name must be between 3 and 50 characters',
-  )(50)
-]
-globalValidations['location.addresses.*.streetAddress'] = [
-  isNotEmpty('Please provide a valid address or PO Box'),
-  isMinSize('The address must be between 5 and 50 characters')(5),
-  isMaxSize('The address must be between 5 and 50 characters')(50),
-]
-globalValidations['location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'] = [
-  isCanadianPostalCode,
-]
-globalValidations['location.addresses.*.postalCode(location.addresses.*.country.text === "US")'] = [
-  isUsZipCode,
-]
+];
+globalValidations["location.addresses.*.country.text"] = [
+  isNotEmpty("You must select a country"),
+];
+globalValidations["location.addresses.*.province.text"] = [
+  isNotEmpty("You must select a value"),
+];
+globalValidations["location.addresses.*.city"] = [
+  isNotEmpty("You must provide a city"),
+  isMinSize("The city name must be between 3 and 50 characters")(3),
+  isMaxSize("The city name must be between 3 and 50 characters")(50),
+];
+globalValidations["location.addresses.*.streetAddress"] = [
+  isNotEmpty("Please provide a valid address or PO Box"),
+  isMinSize("The address must be between 5 and 50 characters")(5),
+  isMaxSize("The address must be between 5 and 50 characters")(50),
+];
+globalValidations[
+  'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'
+] = [isCanadianPostalCode];
+globalValidations[
+  'location.addresses.*.postalCode(location.addresses.*.country.text === "US")'
+] = [isUsZipCode];
 globalValidations[
   'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && country.text !== "US")'
 ] = [
   isOnlyNumbers(
-    'Postal code should be composed of only numbers and should be between 5 and 10 characters',
+    "Postal code should be composed of only numbers and should be between 5 and 10 characters"
   ),
   isMinSize(
-    'Postal code should be composed of only numbers and should be between 5 and 10 characters',
+    "Postal code should be composed of only numbers and should be between 5 and 10 characters"
   )(5),
   isMaxSize(
-    'Postal code should be composed of only numbers and should be between 5 and 10 characters',
+    "Postal code should be composed of only numbers and should be between 5 and 10 characters"
   )(10),
-]
+];
 
 // Step 3: Contacts
 
-globalValidations['location.contacts.*.locationNames.*.text'] = [
-  isNotEmpty('You must select at least one location'),
-]
-globalValidations['location.contacts.*.contactType.text'] = [
-  isNotEmpty('You must select at least one contact type'),
-]
-globalValidations['location.contacts.*.firstName'] = [
-  isMinSize('Enter a name')(1),
-  isMaxSize('Enter a name')(25),
-  isNoSpecialCharacters('Enter a name'),
-]
-globalValidations['location.contacts.*.lastName'] = [
-  isMinSize('Enter a name')(1),
-  isMaxSize('Enter a name')(25),
-  isNoSpecialCharacters('Enter a name'),
-]
-globalValidations['location.contacts.*.email'] = [
-  isEmail('Please provide a valid email address'),
-  isMinSize('Please provide a valid email address')(6),
-  isMaxSize('Please provide a valid email address')(50),
-]
-globalValidations['location.contacts.*.phoneNumber'] = [
-  isPhoneNumber('Please provide a valid phone number'),
-  isMaxSize('Please provide a valid phone number')(15),
-  isMinSize('Please provide a valid phone number')(10),
-]
+globalValidations["location.contacts.*.locationNames.*.text"] = [
+  isNotEmpty("You must select at least one location"),
+];
+globalValidations["location.contacts.*.contactType.text"] = [
+  isNotEmpty("You must select at least one contact type"),
+];
+globalValidations["location.contacts.*.firstName"] = [
+  isMinSize("Enter a name")(1),
+  isMaxSize("Enter a name")(25),
+  isNoSpecialCharacters("Enter a name"),
+];
+globalValidations["location.contacts.*.lastName"] = [
+  isMinSize("Enter a name")(1),
+  isMaxSize("Enter a name")(25),
+  isNoSpecialCharacters("Enter a name"),
+];
+globalValidations["location.contacts.*.email"] = [
+  isEmail("Please provide a valid email address"),
+  isMinSize("Please provide a valid email address")(6),
+  isMaxSize("Please provide a valid email address")(50),
+];
+globalValidations["location.contacts.*.phoneNumber"] = [
+  isPhoneNumber("Please provide a valid phone number"),
+  isMaxSize("Please provide a valid phone number")(15),
+  isMinSize("Please provide a valid phone number")(10),
+];
 
 // Associate the field with the validators here
 
 // This function will extract the field value from the object
-export const getField = (path: string, value: FormDataDto): string | string[] => {
+export const getField = (
+  path: string,
+  value: FormDataDto
+): string | string[] => {
   // First we set is in a temporary variable
-  let temporaryValue: any = value
+  let temporaryValue: any = value;
   // We split the path by dots and iterate over it
-  path.split('.').forEach((key: string) => {
-    const fieldKey = key.includes('(') ? key.replace(')', '').split('(')[0] : key
+  path.split(".").forEach((key: string) => {
+    const fieldKey = key.includes("(")
+      ? key.replace(")", "").split("(")[0]
+      : key;
     // If the temporary value is not undefined we dig in
     if (temporaryValue[fieldKey] !== undefined) {
       // If the temporary value is an array we iterate over it
@@ -126,79 +136,90 @@ export const getField = (path: string, value: FormDataDto): string | string[] =>
         // Array fields are split by star to indicate that we want to iterate over the array
         // Due to that, we split the path by the star and get the second element containing the rest of the path
         temporaryValue = temporaryValue[fieldKey].map((item: any) =>
-          getField(path.split('.*.').slice(1).join('.*.'), item),
-        )
+          getField(path.split(".*.").slice(1).join(".*."), item)
+        );
         // if is not an array we just set the value
       } else {
-        temporaryValue = temporaryValue[fieldKey]
+        temporaryValue = temporaryValue[fieldKey];
       }
     }
-  })
+  });
 
   // At the end we return the value, keep in mind that the value can be an array if the field is an array
-  return temporaryValue
-}
+  return temporaryValue;
+};
 
 // This function will return all validators for the field
 export const getValidations = (key: string): ((value: string) => string)[] =>
-  globalValidations[key] || []
+  globalValidations[key] || [];
 
 // This function will run the validators and return the errors
-export const validate = (keys: string[], target: FormDataDto, notify: boolean = false): boolean => {
+export const validate = (
+  keys: string[],
+  target: FormDataDto,
+  notify: boolean = false
+): boolean => {
   // For every received key we get the validations and run them
   return keys.every((key) => {
     // First we get all validators for that field
-    const validations: ((value: string) => string)[] = getValidations(key)
+    const validations: ((value: string) => string)[] = getValidations(key);
     // We split the field key and the condition if it has one
-    const [fieldKey, fieldCondition] = key.includes('(')
-      ? key.replace(')', '').split('(')
-      : [key, 'true']
+    const [fieldKey, fieldCondition] = key.includes("(")
+      ? key.replace(")", "").split("(")
+      : [key, "true"];
     // For every validator we run it and check if the result is empty
     return validations.every((validation: (value: string) => string) => {
       // We then load the field value
-      const fieldValue = getField(fieldKey, target)
+      const fieldValue = getField(fieldKey, target);
       // We define a function that will run the validation if the condition is true
       const buildEval = (condition: string) =>
-        condition === 'true' ? 'true' : `target.${condition}`
-      const runValidation = (item: any, condition: string,fieldId: string = fieldKey) : string =>{
+        condition === "true" ? "true" : `target.${condition}`;
+      const runValidation = (
+        item: any,
+        condition: string,
+        fieldId: string = fieldKey
+      ): string => {
         // eslint-disable-next-line no-eval
-        if(eval(condition)){
-          const validationResponse = validation(item)
-          if(notify && validationResponse){            
-            errorBus.emit([{fieldId,errorMsg:validationResponse}])
+        if (eval(condition)) {
+          const validationResponse = validation(item);
+          if (notify && validationResponse) {
+            errorBus.emit([{ fieldId, errorMsg: validationResponse }]);
           }
-          return validationResponse
-        }else{ 
-          return ''
+          return validationResponse;
+        } else {
+          return "";
         }
-      }
+      };
       // If the field value is an array we run the validation for every item in the array
       if (Array.isArray(fieldValue)) {
         return fieldValue.every((item: any, index: number) => {
           // And sometimes we can end up with another array inside, that's life
           if (Array.isArray(item)) {
-            if (item.length === 0) item.push('')
-            return item.every((subItem: any) =>
-              runValidation(
-                subItem, 
-                buildEval(fieldCondition.replace('.*.', `[${index}].`)),
-                fieldKey.replace('.*.', `[${index}].`)
-              )  === '',
-            )
+            if (item.length === 0) item.push("");
+            return item.every(
+              (subItem: any) =>
+                runValidation(
+                  subItem,
+                  buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+                  fieldKey.replace(".*.", `[${index}].`)
+                ) === ""
+            );
           }
           // If it is not an array here, just validate it
-          return runValidation(
-            item, 
-            buildEval(fieldCondition.replace('.*.', `[${index}].`)),
-            fieldKey.replace('.*.', `[${index}].`)
-            )  === ''
-        })
+          return (
+            runValidation(
+              item,
+              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+              fieldKey.replace(".*.", `[${index}].`)
+            ) === ""
+          );
+        });
       }
       // If the field value is not an array we run the validation for the field
-      return runValidation(fieldValue, fieldCondition) === ''
-    })
-  })
-}
+      return runValidation(fieldValue, fieldCondition) === "";
+    });
+  });
+};
 
 // This function will run the validators and return the errors
 export const runValidation = (
@@ -206,75 +227,83 @@ export const runValidation = (
   target: FormDataDto,
   validation: (value: string) => string,
   notify: boolean = false,
-  exhaustive = false,
+  exhaustive = false
 ): boolean => {
   // We split the field key and the condition if it has one
-  const [fieldKey, fieldCondition] = key.includes('(')
-    ? key.replace(')', '').split('(')
-    : [key, 'true']
+  const [fieldKey, fieldCondition] = key.includes("(")
+    ? key.replace(")", "").split("(")
+    : [key, "true"];
   // We then load the field value
-  const fieldValue = getField(fieldKey, target)
+  const fieldValue = getField(fieldKey, target);
   // We define a function that will run the validation if the condition is true
-  const buildEval = (condition: string) => (condition === 'true' ? 'true' : `target.${condition}`)
-  const executeValidation = (item: any, condition: string, fieldId: string = fieldKey): string => {
+  const buildEval = (condition: string) =>
+    condition === "true" ? "true" : `target.${condition}`;
+  const executeValidation = (
+    item: any,
+    condition: string,
+    fieldId: string = fieldKey
+  ): string => {
     // eslint-disable-next-line no-eval
     if (eval(condition)) {
-      const validationResponse = validation(item)
+      const validationResponse = validation(item);
       if (notify) {
         // Note: also notifies when valid - errorMsg will be empty.
-        notificationBus.emit({ fieldId, errorMsg: validationResponse }, item)
+        notificationBus.emit({ fieldId, errorMsg: validationResponse }, item);
       }
-      return validationResponse
+      return validationResponse;
     } else {
-      return ''
+      return "";
     }
-  }
+  };
   // If the field value is an array we run the validation for every item in the array
   if (Array.isArray(fieldValue)) {
-    let hasInvalidItem = false
+    let hasInvalidItem = false;
     for (let index = 0; index < fieldValue.length; index++) {
-      const item = fieldValue[index]
+      const item = fieldValue[index];
       // And sometimes we can end up with another array inside, that's life
       if (Array.isArray(item)) {
-        if (item.length === 0) item.push('')
-        let hasInvalidSubItem = false
+        if (item.length === 0) item.push("");
+        let hasInvalidSubItem = false;
         for (const subItem of item) {
           const valid =
             executeValidation(
               subItem,
-              buildEval(fieldCondition.replace('.*.', `[${index}].`)),
-              fieldKey.replace('.*.', `[${index}].`),
-            ) === ''
+              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+              fieldKey.replace(".*.", `[${index}].`)
+            ) === "";
           if (!valid) {
-            hasInvalidSubItem = true
+            hasInvalidSubItem = true;
             if (!exhaustive) {
-              break
+              break;
             }
           }
         }
-        return !hasInvalidSubItem
+        return !hasInvalidSubItem;
       }
       // If it is not an array here, just validate it
       const valid =
         executeValidation(
           item,
-          buildEval(fieldCondition.replace('.*.', `[${index}].`)),
-          fieldKey.replace('.*.', `[${index}].`),
-        ) === ''
+          buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+          fieldKey.replace(".*.", `[${index}].`)
+        ) === "";
       if (!valid) {
-        hasInvalidItem = true
+        hasInvalidItem = true;
         if (!exhaustive) {
-          break
+          break;
         }
       }
     }
-    return !hasInvalidItem
+    return !hasInvalidItem;
   }
   // If the field value is not an array we run the validation for the field
-  return executeValidation(fieldValue, fieldCondition) === ''
-}
+  return executeValidation(fieldValue, fieldCondition) === "";
+};
 
-export const addValidation = (key: string, validation: (value: string) => string): void => {
-  if (!globalValidations[key]) globalValidations[key] = []
-  globalValidations[key].push(validation)
-}
+export const addValidation = (
+  key: string,
+  validation: (value: string) => string
+): void => {
+  if (!globalValidations[key]) globalValidations[key] = [];
+  globalValidations[key].push(validation);
+};

From 5b1a0af9cff30a6fbedaddc2e60f6b6fcacc64e3 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 20 Sep 2023 16:59:24 -0300
Subject: [PATCH 144/313] chore: remove console.log

---
 frontend/src/helpers/CustomDirectives.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/helpers/CustomDirectives.ts b/frontend/src/helpers/CustomDirectives.ts
index 73d4f41caa..803f9430f3 100644
--- a/frontend/src/helpers/CustomDirectives.ts
+++ b/frontend/src/helpers/CustomDirectives.ts
@@ -21,7 +21,6 @@ const setPart = (nodes: HTMLCollection, currentLevel: number, maxLevel: number)
       const partValues = [node.tagName.toLowerCase()]
       if (node.className) {
         partValues.push(node.className)
-        console.log(node.className)
       }
       node.setAttribute('part', partValues.join(' '))
       if (currentLevel < maxLevel) {

From 6381f4d39d49fd5b5f253189ebd4df4218baf387 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 20 Sep 2023 18:23:39 -0300
Subject: [PATCH 145/313] fix: prevent an older request from overwriting the
 results

---
 frontend/src/components/DataFetcher.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/DataFetcher.vue b/frontend/src/components/DataFetcher.vue
index 45b8f20418..c2233bc092 100644
--- a/frontend/src/components/DataFetcher.vue
+++ b/frontend/src/components/DataFetcher.vue
@@ -15,10 +15,12 @@ const props = defineProps<{
 //Set the initial value to the content
 const content = ref<any>(props.initValue)
 
+const response = ref<any>()
+
 const initialUrlValue = props.url
 const searchURL = computed(() => props.url)
 
-const { loading, error, fetch } = useFetchTo(searchURL, content, {
+const { loading, error, fetch } = useFetchTo(searchURL, response, {
   skip: true,
   ...props.params
 })
@@ -45,7 +47,14 @@ watch(
     if (
       calculateStringDifference(initialUrlValue, props.url) >= props.minLength
     ) {
-      fetch()
+      const fetchUrl = props.url
+      fetch().then(() => {
+        // Make sure the requested input is up-to-date with current user's input.
+        // This prevents an older request which took longer then the newest one from overwriting the results.
+        if (fetchUrl === props.url) {
+          content.value = response.value
+        }
+      })
     }
   }
 )

From b09a23b5b7600ccf2074af614360bd95f2d095ea Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 20 Sep 2023 14:37:56 -0700
Subject: [PATCH 146/313] Made requiered changes

---
 frontend/src/App.vue                   | 2 +-
 frontend/src/assets/styles/global.scss | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 0c6e0b64c1..60e1f65e5e 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -110,7 +110,7 @@ toastBus.on(openToast)
       kind="success"
       :title="toastContent.toastTitle"
       subtitle=""
-      low-contrast="true"
+      low-contrast="false"
     >
   </cds-toast-notification>
 </template>
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 21e5579389..0cce82fdf4 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -61,7 +61,7 @@
   --cds-button-danger-active: #801701;
 
   --cds-notification-background-info: #C2E0FF;
-  --cds-support-info: #0066CC;
+  --cds-support-info: #00478F;
 
   //Notifications
   --cds-notification-background-info: #C2E0FF;

From 00de69594e3c01bebae5827eafc71e9affd51187 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 20 Sep 2023 14:53:32 -0700
Subject: [PATCH 147/313] Removed repeatead code

---
 frontend/src/assets/styles/global.scss | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 0cce82fdf4..4dec0e3489 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -60,12 +60,9 @@
   --cds-button-danger-hover: #b32001;
   --cds-button-danger-active: #801701;
 
-  --cds-notification-background-info: #C2E0FF;
-  --cds-support-info: #00478F;
-
   //Notifications
   --cds-notification-background-info: #C2E0FF;
-  --cds-support-info: #0066CC;
+  --cds-support-info: #00478F;
 
   --cds-notification-background-success: #CCE5CC;
   --cds-support-success: #007B00;

From 5ec337d7dee9e2fd0a8c89575ea82728b64ec147 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 20 Sep 2023 15:50:55 -0700
Subject: [PATCH 148/313] Removed unneeded setting

---
 frontend/src/App.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 60e1f65e5e..51525da3b6 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -110,7 +110,6 @@ toastBus.on(openToast)
       kind="success"
       :title="toastContent.toastTitle"
       subtitle=""
-      low-contrast="false"
     >
   </cds-toast-notification>
 </template>

From 2b1df501d70a499b9b1c8d160f60de35b452faae Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 21 Sep 2023 10:20:42 -0300
Subject: [PATCH 149/313] fix: do not always block response from older request

It should be allowed when no newer request was yet responded.
---
 frontend/src/components/DataFetcher.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/DataFetcher.vue b/frontend/src/components/DataFetcher.vue
index c2233bc092..b6cc35563b 100644
--- a/frontend/src/components/DataFetcher.vue
+++ b/frontend/src/components/DataFetcher.vue
@@ -17,6 +17,8 @@ const content = ref<any>(props.initValue)
 
 const response = ref<any>()
 
+const lastUpdateRequestId = ref<number>(0)
+
 const initialUrlValue = props.url
 const searchURL = computed(() => props.url)
 
@@ -47,12 +49,12 @@ watch(
     if (
       calculateStringDifference(initialUrlValue, props.url) >= props.minLength
     ) {
-      const fetchUrl = props.url
+      const curRequestId = Date.now()
       fetch().then(() => {
-        // Make sure the requested input is up-to-date with current user's input.
-        // This prevents an older request which took longer then the newest one from overwriting the results.
-        if (fetchUrl === props.url) {
+        // Block the response from old request when a newer one was already responded.
+        if (curRequestId >= lastUpdateRequestId.value) {
           content.value = response.value
+          lastUpdateRequestId.value = curRequestId
         }
       })
     }

From c34ec0bb7f15770ad19e9265923f393b03b9fa13 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 21 Sep 2023 11:38:06 -0300
Subject: [PATCH 150/313] chore: use simple counter to generate requestId

---
 frontend/src/components/DataFetcher.vue                 | 9 ++++++++-
 frontend/tests/unittests/components/DataFetcher.spec.ts | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/DataFetcher.vue b/frontend/src/components/DataFetcher.vue
index b6cc35563b..0a57559acc 100644
--- a/frontend/src/components/DataFetcher.vue
+++ b/frontend/src/components/DataFetcher.vue
@@ -17,6 +17,8 @@ const content = ref<any>(props.initValue)
 
 const response = ref<any>()
 
+const requestCounter = ref<number>(0)
+
 const lastUpdateRequestId = ref<number>(0)
 
 const initialUrlValue = props.url
@@ -49,12 +51,17 @@ watch(
     if (
       calculateStringDifference(initialUrlValue, props.url) >= props.minLength
     ) {
-      const curRequestId = Date.now()
+      requestCounter.value++
+      const curRequestId = requestCounter.value
+      // const curUrl = props.url
       fetch().then(() => {
         // Block the response from old request when a newer one was already responded.
         if (curRequestId >= lastUpdateRequestId.value) {
           content.value = response.value
           lastUpdateRequestId.value = curRequestId
+          // console.log('yes')
+        } else {
+          // console.log('no', curUrl, curRequestId, lastUpdateRequestId.value)
         }
       })
     }
diff --git a/frontend/tests/unittests/components/DataFetcher.spec.ts b/frontend/tests/unittests/components/DataFetcher.spec.ts
index aeb684f5ab..71f38237c0 100644
--- a/frontend/tests/unittests/components/DataFetcher.spec.ts
+++ b/frontend/tests/unittests/components/DataFetcher.spec.ts
@@ -11,7 +11,7 @@ describe('DataFetcher', () => {
     error: ref({}),
     data: ref({ name: 'Loaded' }),
     loading: ref(false),
-    fetch: () => {
+    fetch: async () => {
       received.value = { name: 'Loaded' }
     }
   })

From 7609a6dae5fca7eaaed7b8a9b79e9d62b5f59de7 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 21 Sep 2023 11:56:55 -0300
Subject: [PATCH 151/313] fix: init fetching

---
 frontend/src/components/DataFetcher.vue                 | 4 +++-
 frontend/tests/unittests/components/DataFetcher.spec.ts | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/DataFetcher.vue b/frontend/src/components/DataFetcher.vue
index 0a57559acc..fa553e268a 100644
--- a/frontend/src/components/DataFetcher.vue
+++ b/frontend/src/components/DataFetcher.vue
@@ -41,7 +41,9 @@ const calculateStringDifference = (
 
 //If initial fetch is required, fetch
 if (props.initFetch) {
-  fetch()
+  fetch().then(() => {
+    content.value = response.value
+  })
 }
 
 //Watch for changes in the url, and if the difference is greater than the min length, fetch
diff --git a/frontend/tests/unittests/components/DataFetcher.spec.ts b/frontend/tests/unittests/components/DataFetcher.spec.ts
index 71f38237c0..c60105734e 100644
--- a/frontend/tests/unittests/components/DataFetcher.spec.ts
+++ b/frontend/tests/unittests/components/DataFetcher.spec.ts
@@ -1,6 +1,6 @@
 import { describe, it, expect, vi } from 'vitest'
 import { mount } from '@vue/test-utils'
-import { ref } from 'vue'
+import { nextTick, ref } from 'vue'
 import * as fetcher from '@/composables/useFetch'
 
 import DataFetcher from '@/components/DataFetcher.vue'
@@ -9,7 +9,7 @@ describe('DataFetcher', () => {
   const mockedFetchTo = (url: string, received: any, config: any = {}) => ({
     response: ref({}),
     error: ref({}),
-    data: ref({ name: 'Loaded' }),
+    data: received,
     loading: ref(false),
     fetch: async () => {
       received.value = { name: 'Loaded' }
@@ -57,6 +57,8 @@ describe('DataFetcher', () => {
       }
     })
 
+    await nextTick()
+
     expect(wrapper.html()).toBe('<div>slot content is Loaded</div>')
     expect(wrapper.find('div').text()).toBe('slot content is Loaded')
   })

From 45be34a63d28ae71d4ee8553d9634f8d8c1e0072 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 21 Sep 2023 12:00:57 -0300
Subject: [PATCH 152/313] test: fix test

---
 frontend/tests/unittests/components/DataFetcher.spec.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/tests/unittests/components/DataFetcher.spec.ts b/frontend/tests/unittests/components/DataFetcher.spec.ts
index c60105734e..ffe10014ea 100644
--- a/frontend/tests/unittests/components/DataFetcher.spec.ts
+++ b/frontend/tests/unittests/components/DataFetcher.spec.ts
@@ -82,6 +82,8 @@ describe('DataFetcher', () => {
 
     await wrapper.setProps({ url: '/api/data/changed' })
 
+    await nextTick()
+
     expect(wrapper.html()).toBe('<div>slot content is Loaded</div>')
     expect(wrapper.find('div').text()).toBe('slot content is Loaded')
   })

From 6992bf7a719f91e2178d0e4f67857d0b41efca43 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 21 Sep 2023 09:57:01 -0700
Subject: [PATCH 153/313] Fixed file

---
 frontend/package-lock.json | 3473 +++++++++++++++++++++++-------------
 1 file changed, 2241 insertions(+), 1232 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 7e434cd5dd..5e2a6906f7 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -70,16 +70,18 @@
     },
     "node_modules/@aashutoshrathi/word-wrap": {
       "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz",
+      "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/@ampproject/remapping": {
       "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz",
+      "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
         "@jridgewell/trace-mapping": "^0.3.9"
@@ -90,8 +92,9 @@
     },
     "node_modules/@antfu/install-pkg": {
       "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/@antfu/install-pkg/-/install-pkg-0.1.1.tgz",
+      "integrity": "sha512-LyB/8+bSfa0DFGC06zpCEfs89/XoWZwws5ygEa5D+Xsm3OfI+aXQ86VgVG7Acyef+rSZ5HE7J8rrxzrQeM3PjQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "execa": "^5.1.1",
         "find-up": "^5.0.0"
@@ -102,8 +105,9 @@
     },
     "node_modules/@antfu/install-pkg/node_modules/execa": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -124,8 +128,9 @@
     },
     "node_modules/@antfu/install-pkg/node_modules/get-stream": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -135,24 +140,27 @@
     },
     "node_modules/@antfu/install-pkg/node_modules/human-signals": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
     },
     "node_modules/@antfu/utils": {
       "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/@antfu/utils/-/utils-0.7.6.tgz",
+      "integrity": "sha512-pvFiLP2BeOKA/ZOS6jxx4XhKzdVLHDhGlFEaZ2flWWYf2xOqVniqpk38I04DFRyz+L0ASggl7SkItTc+ZLju4w==",
       "dev": true,
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
     "node_modules/@babel/code-frame": {
       "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz",
+      "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/highlight": "^7.22.13",
         "chalk": "^2.4.2"
@@ -163,16 +171,18 @@
     },
     "node_modules/@babel/compat-data": {
       "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
+      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz",
+      "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
         "@babel/code-frame": "^7.22.10",
@@ -200,8 +210,9 @@
     },
     "node_modules/@babel/generator": {
       "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
+      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.10",
         "@jridgewell/gen-mapping": "^0.3.2",
@@ -214,8 +225,9 @@
     },
     "node_modules/@babel/helper-annotate-as-pure": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz",
+      "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -226,8 +238,9 @@
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
       "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz",
+      "integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/types": "^7.22.10"
@@ -238,8 +251,9 @@
     },
     "node_modules/@babel/helper-compilation-targets": {
       "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
+      "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
         "@babel/helper-validator-option": "^7.22.5",
@@ -253,8 +267,9 @@
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz",
+      "integrity": "sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -276,8 +291,9 @@
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
       "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz",
+      "integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -293,8 +309,9 @@
     },
     "node_modules/@babel/helper-define-polyfill-provider": {
       "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz",
+      "integrity": "sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.6",
@@ -309,16 +326,18 @@
     },
     "node_modules/@babel/helper-environment-visitor": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-function-name": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz",
+      "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.22.5",
         "@babel/types": "^7.22.5"
@@ -329,8 +348,9 @@
     },
     "node_modules/@babel/helper-hoist-variables": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz",
+      "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -340,8 +360,9 @@
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
+      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -352,8 +373,9 @@
     },
     "node_modules/@babel/helper-module-imports": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -363,8 +385,9 @@
     },
     "node_modules/@babel/helper-module-transforms": {
       "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
+      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-module-imports": "^7.22.5",
@@ -381,8 +404,9 @@
     },
     "node_modules/@babel/helper-optimise-call-expression": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz",
+      "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -393,8 +417,9 @@
     },
     "node_modules/@babel/helper-plugin-utils": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz",
+      "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=6.9.0"
@@ -402,8 +427,9 @@
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
       "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
+      "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -419,8 +445,9 @@
     },
     "node_modules/@babel/helper-replace-supers": {
       "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
+      "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
@@ -436,8 +463,9 @@
     },
     "node_modules/@babel/helper-simple-access": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz",
+      "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -447,8 +475,9 @@
     },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz",
+      "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/types": "^7.22.5"
@@ -459,8 +488,9 @@
     },
     "node_modules/@babel/helper-split-export-declaration": {
       "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz",
+      "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.22.5"
       },
@@ -470,32 +500,36 @@
     },
     "node_modules/@babel/helper-string-parser": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz",
+      "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
       "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
+      "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-function-name": "^7.22.5",
@@ -508,8 +542,9 @@
     },
     "node_modules/@babel/helpers": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz",
+      "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.22.5",
         "@babel/traverse": "^7.22.11",
@@ -521,8 +556,9 @@
     },
     "node_modules/@babel/highlight": {
       "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz",
+      "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.22.5",
         "chalk": "^2.4.2",
@@ -534,7 +570,8 @@
     },
     "node_modules/@babel/parser": {
       "version": "7.22.13",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.13.tgz",
+      "integrity": "sha512-3l6+4YOvc9wx7VlCSw4yQfcBo01ECA8TicQfbnCPuCEpRQrf+gTUyGdxNw+pyTUyywp6JRD1w0YQs9TpBXYlkw==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -544,8 +581,9 @@
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
+      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -559,8 +597,9 @@
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -576,8 +615,9 @@
     },
     "node_modules/@babel/plugin-proposal-private-property-in-object": {
       "version": "7.21.0-placeholder-for-preset-env.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
+      "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=6.9.0"
@@ -588,8 +628,9 @@
     },
     "node_modules/@babel/plugin-syntax-async-generators": {
       "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -600,8 +641,9 @@
     },
     "node_modules/@babel/plugin-syntax-class-properties": {
       "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
@@ -612,8 +654,9 @@
     },
     "node_modules/@babel/plugin-syntax-class-static-block": {
       "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -627,8 +670,9 @@
     },
     "node_modules/@babel/plugin-syntax-dynamic-import": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz",
+      "integrity": "sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -639,8 +683,9 @@
     },
     "node_modules/@babel/plugin-syntax-export-namespace-from": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz",
+      "integrity": "sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.3"
@@ -651,8 +696,9 @@
     },
     "node_modules/@babel/plugin-syntax-import-assertions": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz",
+      "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -666,8 +712,9 @@
     },
     "node_modules/@babel/plugin-syntax-import-attributes": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz",
+      "integrity": "sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -681,8 +728,9 @@
     },
     "node_modules/@babel/plugin-syntax-import-meta": {
       "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -693,8 +741,9 @@
     },
     "node_modules/@babel/plugin-syntax-json-strings": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -705,8 +754,9 @@
     },
     "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
       "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -717,8 +767,9 @@
     },
     "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -729,8 +780,9 @@
     },
     "node_modules/@babel/plugin-syntax-numeric-separator": {
       "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
@@ -741,8 +793,9 @@
     },
     "node_modules/@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -753,8 +806,9 @@
     },
     "node_modules/@babel/plugin-syntax-optional-catch-binding": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -765,8 +819,9 @@
     },
     "node_modules/@babel/plugin-syntax-optional-chaining": {
       "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
@@ -777,8 +832,9 @@
     },
     "node_modules/@babel/plugin-syntax-private-property-in-object": {
       "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -792,8 +848,9 @@
     },
     "node_modules/@babel/plugin-syntax-top-level-await": {
       "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -807,8 +864,9 @@
     },
     "node_modules/@babel/plugin-syntax-unicode-sets-regex": {
       "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz",
+      "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.18.6",
@@ -823,8 +881,9 @@
     },
     "node_modules/@babel/plugin-transform-arrow-functions": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz",
+      "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -838,8 +897,9 @@
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.11.tgz",
+      "integrity": "sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-environment-visitor": "^7.22.5",
@@ -856,8 +916,9 @@
     },
     "node_modules/@babel/plugin-transform-async-to-generator": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz",
+      "integrity": "sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-module-imports": "^7.22.5",
@@ -873,8 +934,9 @@
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz",
+      "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -888,8 +950,9 @@
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
       "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
+      "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -903,8 +966,9 @@
     },
     "node_modules/@babel/plugin-transform-class-properties": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz",
+      "integrity": "sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.22.5",
@@ -919,8 +983,9 @@
     },
     "node_modules/@babel/plugin-transform-class-static-block": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz",
+      "integrity": "sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.22.11",
@@ -936,8 +1001,9 @@
     },
     "node_modules/@babel/plugin-transform-classes": {
       "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
+      "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -959,8 +1025,9 @@
     },
     "node_modules/@babel/plugin-transform-computed-properties": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz",
+      "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -975,8 +1042,9 @@
     },
     "node_modules/@babel/plugin-transform-destructuring": {
       "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
+      "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -990,8 +1058,9 @@
     },
     "node_modules/@babel/plugin-transform-dotall-regex": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz",
+      "integrity": "sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -1006,8 +1075,9 @@
     },
     "node_modules/@babel/plugin-transform-duplicate-keys": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz",
+      "integrity": "sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1021,8 +1091,9 @@
     },
     "node_modules/@babel/plugin-transform-dynamic-import": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz",
+      "integrity": "sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1037,8 +1108,9 @@
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz",
+      "integrity": "sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-builder-binary-assignment-operator-visitor": "^7.22.5",
@@ -1053,8 +1125,9 @@
     },
     "node_modules/@babel/plugin-transform-export-namespace-from": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz",
+      "integrity": "sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1069,8 +1142,9 @@
     },
     "node_modules/@babel/plugin-transform-for-of": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
+      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1084,8 +1158,9 @@
     },
     "node_modules/@babel/plugin-transform-function-name": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz",
+      "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-compilation-targets": "^7.22.5",
@@ -1101,8 +1176,9 @@
     },
     "node_modules/@babel/plugin-transform-json-strings": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz",
+      "integrity": "sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1117,8 +1193,9 @@
     },
     "node_modules/@babel/plugin-transform-literals": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz",
+      "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1132,8 +1209,9 @@
     },
     "node_modules/@babel/plugin-transform-logical-assignment-operators": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz",
+      "integrity": "sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1148,8 +1226,9 @@
     },
     "node_modules/@babel/plugin-transform-member-expression-literals": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz",
+      "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1163,8 +1242,9 @@
     },
     "node_modules/@babel/plugin-transform-modules-amd": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz",
+      "integrity": "sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-module-transforms": "^7.22.5",
@@ -1179,8 +1259,9 @@
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.11.tgz",
+      "integrity": "sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-module-transforms": "^7.22.9",
@@ -1196,8 +1277,9 @@
     },
     "node_modules/@babel/plugin-transform-modules-systemjs": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.11.tgz",
+      "integrity": "sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-hoist-variables": "^7.22.5",
@@ -1214,8 +1296,9 @@
     },
     "node_modules/@babel/plugin-transform-modules-umd": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz",
+      "integrity": "sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-module-transforms": "^7.22.5",
@@ -1230,8 +1313,9 @@
     },
     "node_modules/@babel/plugin-transform-named-capturing-groups-regex": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz",
+      "integrity": "sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -1246,8 +1330,9 @@
     },
     "node_modules/@babel/plugin-transform-new-target": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz",
+      "integrity": "sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1261,8 +1346,9 @@
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz",
+      "integrity": "sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1277,8 +1363,9 @@
     },
     "node_modules/@babel/plugin-transform-numeric-separator": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz",
+      "integrity": "sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1293,8 +1380,9 @@
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.11.tgz",
+      "integrity": "sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
@@ -1312,8 +1400,9 @@
     },
     "node_modules/@babel/plugin-transform-object-super": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz",
+      "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1328,8 +1417,9 @@
     },
     "node_modules/@babel/plugin-transform-optional-catch-binding": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz",
+      "integrity": "sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1344,8 +1434,9 @@
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
       "version": "7.22.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.12.tgz",
+      "integrity": "sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1361,8 +1452,9 @@
     },
     "node_modules/@babel/plugin-transform-parameters": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
+      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1376,8 +1468,9 @@
     },
     "node_modules/@babel/plugin-transform-private-methods": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz",
+      "integrity": "sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-create-class-features-plugin": "^7.22.5",
@@ -1392,8 +1485,9 @@
     },
     "node_modules/@babel/plugin-transform-private-property-in-object": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz",
+      "integrity": "sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -1410,8 +1504,9 @@
     },
     "node_modules/@babel/plugin-transform-property-literals": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz",
+      "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1425,8 +1520,9 @@
     },
     "node_modules/@babel/plugin-transform-regenerator": {
       "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz",
+      "integrity": "sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1441,8 +1537,9 @@
     },
     "node_modules/@babel/plugin-transform-reserved-words": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz",
+      "integrity": "sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1456,8 +1553,9 @@
     },
     "node_modules/@babel/plugin-transform-shorthand-properties": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz",
+      "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1471,8 +1569,9 @@
     },
     "node_modules/@babel/plugin-transform-spread": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz",
+      "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
@@ -1487,8 +1586,9 @@
     },
     "node_modules/@babel/plugin-transform-sticky-regex": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz",
+      "integrity": "sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1502,8 +1602,9 @@
     },
     "node_modules/@babel/plugin-transform-template-literals": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz",
+      "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1517,8 +1618,9 @@
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz",
+      "integrity": "sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1532,8 +1634,9 @@
     },
     "node_modules/@babel/plugin-transform-unicode-escapes": {
       "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz",
+      "integrity": "sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5"
@@ -1547,8 +1650,9 @@
     },
     "node_modules/@babel/plugin-transform-unicode-property-regex": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz",
+      "integrity": "sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -1563,8 +1667,9 @@
     },
     "node_modules/@babel/plugin-transform-unicode-regex": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz",
+      "integrity": "sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -1579,8 +1684,9 @@
     },
     "node_modules/@babel/plugin-transform-unicode-sets-regex": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz",
+      "integrity": "sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-create-regexp-features-plugin": "^7.22.5",
@@ -1595,8 +1701,9 @@
     },
     "node_modules/@babel/preset-env": {
       "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
+      "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
@@ -1689,8 +1796,9 @@
     },
     "node_modules/@babel/preset-modules": {
       "version": "0.1.6-no-external-plugins",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz",
+      "integrity": "sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
@@ -1703,13 +1811,15 @@
     },
     "node_modules/@babel/regjsgen": {
       "version": "0.8.0",
+      "resolved": "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz",
+      "integrity": "sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/@babel/runtime": {
       "version": "7.22.11",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.11.tgz",
+      "integrity": "sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -1719,8 +1829,9 @@
     },
     "node_modules/@babel/template": {
       "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
+      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.22.5",
         "@babel/parser": "^7.22.5",
@@ -1732,8 +1843,9 @@
     },
     "node_modules/@babel/traverse": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz",
+      "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.22.10",
         "@babel/generator": "^7.22.10",
@@ -1752,8 +1864,9 @@
     },
     "node_modules/@babel/types": {
       "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz",
+      "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
         "@babel/helper-validator-identifier": "^7.22.5",
@@ -1765,51 +1878,64 @@
     },
     "node_modules/@bcgov-nr/nr-fsa-theme": {
       "version": "1.1.5",
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/@bcgov-nr/nr-fsa-theme/-/nr-fsa-theme-1.1.5.tgz",
+      "integrity": "sha512-gQ7k76PXcTlWDOo6lrYNujgc5t7cY4r6gVS8m4bvkIbbgKQNux4kV5BuEtx616fubl61FZp+zDxRSMfrZz1Dog=="
     },
     "node_modules/@bcgov/bc-sans": {
       "version": "2.0.0",
-      "license": "SIL"
+      "resolved": "https://registry.npmjs.org/@bcgov/bc-sans/-/bc-sans-2.0.0.tgz",
+      "integrity": "sha512-hgCYDEwVWZ0t/yzmo802D1oF3hhzDjsjpgB82EZcDEiLPxjV2x9qALv4mBNKAiWDK4ezvBL1VrD99NnIbxG5Vw=="
     },
     "node_modules/@carbon/colors": {
       "version": "11.19.0",
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/@carbon/colors/-/colors-11.19.0.tgz",
+      "integrity": "sha512-cRDnv9GfktZo+p/t/Lsy2B3yvMbDI1Ht2ECU0rAikClQHVnOffz791Q4m2gy2STPdISnzjFSPmoRxGKLfYhLRA=="
     },
     "node_modules/@carbon/feature-flags": {
       "version": "0.16.0",
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/@carbon/feature-flags/-/feature-flags-0.16.0.tgz",
+      "integrity": "sha512-hCrfVZ6oVnPjjupelbvQX4D0i6GlZuKVverAf0LkOydXHrPjSyuEmg+czsylyCBg4r/hxtSTu91Tq6aqz/DsHg=="
     },
     "node_modules/@carbon/grid": {
       "version": "11.19.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@carbon/grid/-/grid-11.19.0.tgz",
+      "integrity": "sha512-Ie8C0yifTPOF58rhkeRhINJ6KPiTVbdJwPCE+aEWTpUrwGSnuqIYZ8zQBlYQtNGQX72TSfnGY0qijPmpnIwNsg==",
       "dependencies": {
         "@carbon/layout": "^11.19.0"
       }
     },
     "node_modules/@carbon/icon-helpers": {
       "version": "10.44.0",
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/@carbon/icon-helpers/-/icon-helpers-10.44.0.tgz",
+      "integrity": "sha512-8gvP8Qr2pNspIUPiQRQQUB9gdklLxfs7JDIz4a/PUzon7IcVielpl08blh2IjpbDr/cZSje5fwn3CAInCKNb1g=="
     },
-    "node_modules/@carbon/icons": {
-      "version": "11.26.0",
-      "resolved": "https://registry.npmjs.org/@carbon/icons/-/icons-11.26.0.tgz",
-      "integrity": "sha512-YRYSnbZ3yBkH7i/Ne7VOwaf8ytL+bLed5ZWyjsdpagJyvG3g1CXQRvEub2vvXGis089s1z42rgU4pgLoyKjwVw=="
+    "node_modules/@carbon/icons-vue": {
+      "version": "10.72.1",
+      "resolved": "https://registry.npmjs.org/@carbon/icons-vue/-/icons-vue-10.72.1.tgz",
+      "integrity": "sha512-GTqlqBC0b141HgkYzQwOKG/G9Fg1pfEFR3bvL0owewYkyR8GAapuc7T/KjROVz4BNhIKhsXTJDYWpxmvw2AcLQ==",
+      "dependencies": {
+        "@carbon/icon-helpers": "^10.43.1"
+      }
     },
     "node_modules/@carbon/layout": {
       "version": "11.19.0",
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/@carbon/layout/-/layout-11.19.0.tgz",
+      "integrity": "sha512-BI9ct+yVKrgL90l4nijMhj8dokXGBJu1Xtve9fz/lcveTyxxn7YvRu8mosGhCyw77KSU6vN2yRLJnQwqwqrLJQ=="
     },
     "node_modules/@carbon/motion": {
       "version": "11.15.0",
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/@carbon/motion/-/motion-11.15.0.tgz",
+      "integrity": "sha512-l7SIZMwTmv8BHPvDsQ26Y/dBLKnLGZUvD5bGcDppoUInUcKv2Dg4J0r5JONUsB2OagpBmbj/a5skcahzlaL1JQ=="
     },
     "node_modules/@carbon/pictograms": {
       "version": "12.22.0",
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/@carbon/pictograms/-/pictograms-12.22.0.tgz",
+      "integrity": "sha512-9hf/8v15CrxPhd8DGCqlpUdxlqPBcr/l4wKP/5q1TKqU77lSYKKPl8Erv/mTf9EM3HkUdy9iFr08aKGvoKaV7w=="
     },
     "node_modules/@carbon/styles": {
       "version": "1.36.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@carbon/styles/-/styles-1.36.0.tgz",
+      "integrity": "sha512-UKr0FdNT/QSJVfsrjn03zF364qP2XwOW6+/VaR7SijfEKR1qx9Z6MQbzNMR9OP5hvT/rr3pora1S7R3h6mtz3A==",
       "dependencies": {
         "@carbon/colors": "^11.19.0",
         "@carbon/feature-flags": "^0.16.0",
@@ -1831,7 +1957,8 @@
     },
     "node_modules/@carbon/themes": {
       "version": "11.24.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@carbon/themes/-/themes-11.24.0.tgz",
+      "integrity": "sha512-afVMSQ8by3yR4646UNwOmVGeyI8n0dIvehpuy4IUGQ52WXsRuveMY/F6KpATy0OadJR/C/7SZo2mqI7L8aTREA==",
       "dependencies": {
         "@carbon/colors": "^11.19.0",
         "@carbon/layout": "^11.19.0",
@@ -1841,7 +1968,8 @@
     },
     "node_modules/@carbon/type": {
       "version": "11.23.0",
-      "license": "Apache-2.0",
+      "resolved": "https://registry.npmjs.org/@carbon/type/-/type-11.23.0.tgz",
+      "integrity": "sha512-bp3D2q7Su03B2Re5CHt0OdNNmAbTOJaBgKgRKKdLP97F+M27y/kk9iOAFctC0pCgmQ2qSndWRTSb3zVg5TmiEw==",
       "dependencies": {
         "@carbon/grid": "^11.19.0",
         "@carbon/layout": "^11.19.0"
@@ -1861,8 +1989,9 @@
     },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz",
+      "integrity": "sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "engines": {
         "node": ">=0.1.90"
@@ -1870,8 +1999,9 @@
     },
     "node_modules/@cspotcode/source-map-support": {
       "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
+      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "0.3.9"
       },
@@ -1881,8 +2011,9 @@
     },
     "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
+      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.0.3",
         "@jridgewell/sourcemap-codec": "^1.4.10"
@@ -1890,8 +2021,9 @@
     },
     "node_modules/@cypress/code-coverage": {
       "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@cypress/code-coverage/-/code-coverage-3.11.0.tgz",
+      "integrity": "sha512-ihSO1s03gmLRE224oIjrbdG1ey63vw/UY+VSqQ5m/TKkAvyz6GIiniq6juk3AV/+0vQC1Eb4UWFu8ndtji4M1g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@cypress/webpack-preprocessor": "^5.11.0",
         "chalk": "4.1.2",
@@ -1926,8 +2058,9 @@
     },
     "node_modules/@cypress/code-coverage/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -1940,8 +2073,9 @@
     },
     "node_modules/@cypress/code-coverage/node_modules/chalk": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -1955,8 +2089,9 @@
     },
     "node_modules/@cypress/code-coverage/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -1966,29 +2101,33 @@
     },
     "node_modules/@cypress/code-coverage/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/@cypress/code-coverage/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@cypress/code-coverage/node_modules/istanbul-lib-coverage": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz",
+      "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@cypress/code-coverage/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -2044,7 +2183,6 @@
       "resolved": "https://registry.npmjs.org/@cypress/webpack-preprocessor/-/webpack-preprocessor-6.0.0.tgz",
       "integrity": "sha512-1AS1Et5CNPJii0+DdBZBS8e0hlM2BkBNmYRdZO4/16A3KS3em1sjPZtFw7jJF00m6DYAdB9iy6QW/lLZ2bN0gg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "bluebird": "3.7.1",
         "debug": "^4.3.4",
@@ -2059,8 +2197,9 @@
     },
     "node_modules/@cypress/xvfb": {
       "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz",
+      "integrity": "sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^3.1.0",
         "lodash.once": "^4.1.1"
@@ -2068,22 +2207,24 @@
     },
     "node_modules/@cypress/xvfb/node_modules/debug": {
       "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
-    "node_modules/@esbuild/darwin-arm64": {
+    "node_modules/@esbuild/win32-x64": {
       "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
+      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
       "cpu": [
-        "arm64"
+        "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
-        "darwin"
+        "win32"
       ],
       "engines": {
         "node": ">=12"
@@ -2091,8 +2232,9 @@
     },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "eslint-visitor-keys": "^3.3.0"
       },
@@ -2105,16 +2247,18 @@
     },
     "node_modules/@eslint-community/regexpp": {
       "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz",
+      "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/eslintrc": {
       "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -2135,8 +2279,9 @@
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
       "version": "13.21.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -2149,8 +2294,9 @@
     },
     "node_modules/@eslint/eslintrc/node_modules/type-fest": {
       "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -2160,29 +2306,33 @@
     },
     "node_modules/@eslint/js": {
       "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
+      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       }
     },
     "node_modules/@hapi/hoek": {
       "version": "9.3.0",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
+      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==",
+      "dev": true
     },
     "node_modules/@hapi/topo": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
+      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@hapi/hoek": "^9.0.0"
       }
     },
     "node_modules/@humanwhocodes/config-array": {
       "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
@@ -2194,8 +2344,9 @@
     },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
+      "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
       },
@@ -2206,25 +2357,29 @@
     },
     "node_modules/@humanwhocodes/object-schema": {
       "version": "1.2.1",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
+      "dev": true
     },
     "node_modules/@ibm/plex": {
       "version": "6.0.0-next.6",
-      "license": "OFL-1.1",
+      "resolved": "https://registry.npmjs.org/@ibm/plex/-/plex-6.0.0-next.6.tgz",
+      "integrity": "sha512-B3uGruTn2rS5gweynLmfSe7yCawSRsJguJJQHVQiqf4rh2RNgJFu8YLE2Zd/JHV0ZXoVMOslcXP2k3hMkxKEyA==",
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/@iconify/types": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz",
+      "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==",
+      "dev": true
     },
     "node_modules/@iconify/utils": {
       "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-2.1.9.tgz",
+      "integrity": "sha512-mo+A4n3MwLlWlg1SoSO+Dt6pOPWKElk9sSJ6ZpuzbB9OcjxN8RUWxU3ulPwB1nglErWKRam2x4BAohbYF7FiFA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@antfu/install-pkg": "^0.1.1",
         "@antfu/utils": "^0.7.5",
@@ -2236,8 +2391,9 @@
     },
     "node_modules/@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -2251,16 +2407,18 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": {
       "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -2271,8 +2429,9 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": {
       "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -2283,8 +2442,9 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -2294,8 +2454,9 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": {
       "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -2308,8 +2469,9 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -2319,16 +2481,18 @@
     },
     "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@istanbuljs/nyc-config-typescript": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/nyc-config-typescript/-/nyc-config-typescript-1.0.2.tgz",
+      "integrity": "sha512-iKGIyMoyJuFnJRSVTZ78POIRvNnwZaWIf8vG4ZS3rQq58MMDrqEX2nnzx0R28V2X8JvmKYiqY9FP2hlJsm8A0w==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2"
       },
@@ -2341,16 +2505,18 @@
     },
     "node_modules/@istanbuljs/schema": {
       "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/@jest/schemas": {
       "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
+      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@sinclair/typebox": "^0.27.8"
       },
@@ -2360,8 +2526,9 @@
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz",
+      "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/set-array": "^1.0.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -2373,24 +2540,27 @@
     },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz",
+      "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/set-array": {
       "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz",
+      "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/source-map": {
       "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.5.tgz",
+      "integrity": "sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.0",
@@ -2399,12 +2569,14 @@
     },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.4.15",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
+      "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.19",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz",
+      "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -2425,8 +2597,9 @@
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
+      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -2437,16 +2610,18 @@
     },
     "node_modules/@nodelib/fs.stat": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
+      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/@nodelib/fs.walk": {
       "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
+      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -2457,13 +2632,15 @@
     },
     "node_modules/@one-ini/wasm": {
       "version": "0.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz",
+      "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==",
+      "dev": true
     },
     "node_modules/@pkgr/utils": {
       "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/@pkgr/utils/-/utils-2.4.2.tgz",
+      "integrity": "sha512-POgTXhjrTfbTV63DiFXav4lBHiICLKKwDeaKn9Nphwj7WH6m0hMMCaJkMyRWjgtPFyRKRVoMXXjczsTQRDEhYw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "fast-glob": "^3.3.0",
@@ -2481,8 +2658,9 @@
     },
     "node_modules/@rollup/pluginutils": {
       "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.0.4.tgz",
+      "integrity": "sha512-0KJnIoRI8A+a1dqOYLxH8vBf8bphDmty5QvIm2hqm7oFCFYKCAZWWd2hXgMibaPsNDhI0AtpYfQZJG47pt/k4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0",
         "estree-walker": "^2.0.2",
@@ -2502,77 +2680,90 @@
     },
     "node_modules/@rushstack/eslint-patch": {
       "version": "1.3.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.3.3.tgz",
+      "integrity": "sha512-0xd7qez0AQ+MbHatZTlI1gu5vkG8r7MYRUJAHPAHJBmGLs16zpkrpAVLvjQKQOqaXPDUBwOiJzNc00znHSCVBw==",
+      "dev": true
     },
     "node_modules/@sideway/address": {
       "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.4.tgz",
+      "integrity": "sha512-7vwq+rOHVWjyXxVlR76Agnvhy8I9rpzjosTESvmhNeXOXdZZB15Fl+TI9x1SiHZH5Jv2wTGduSxFDIaq0m3DUw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@hapi/hoek": "^9.0.0"
       }
     },
     "node_modules/@sideway/formula": {
       "version": "3.0.1",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
+      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==",
+      "dev": true
     },
     "node_modules/@sideway/pinpoint": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
+      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==",
+      "dev": true
     },
     "node_modules/@sinclair/typebox": {
       "version": "0.27.8",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
+      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
+      "dev": true
     },
     "node_modules/@tootallnate/once": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+      "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 10"
       }
     },
     "node_modules/@tsconfig/node10": {
       "version": "1.0.9",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
+      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
+      "dev": true
     },
     "node_modules/@tsconfig/node12": {
       "version": "1.0.11",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
+      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
+      "dev": true
     },
     "node_modules/@tsconfig/node14": {
       "version": "1.0.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
+      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
+      "dev": true
     },
     "node_modules/@tsconfig/node16": {
       "version": "1.0.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.4.tgz",
+      "integrity": "sha512-vxhUy4J8lyeyinH7Azl1pdd43GJhZH/tP2weN8TntQblOY+A0XbT8DJk1/oCPuOOyg/Ja757rG0CgHcWC8OfMA==",
+      "dev": true
     },
     "node_modules/@types/chai": {
       "version": "4.3.5",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz",
+      "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==",
+      "dev": true
     },
     "node_modules/@types/chai-subset": {
       "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@types/chai-subset/-/chai-subset-1.3.3.tgz",
+      "integrity": "sha512-frBecisrNGz+F4T6bcc+NLeolfiojh5FxW2klu669+8BARtyQv2C/GkNW6FUodVe4BroGMP/wER/YDGc7rEllw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/chai": "*"
       }
     },
     "node_modules/@types/eslint": {
       "version": "8.44.2",
+      "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.2.tgz",
+      "integrity": "sha512-sdPRb9K6iL5XZOmBubg8yiFp5yS/JdUDQsq5e6h95km91MCYMuvp7mh1fjPEYUhvHepKpZOjnEaMBR4PxjWDzg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@types/estree": "*",
@@ -2581,8 +2772,9 @@
     },
     "node_modules/@types/eslint-scope": {
       "version": "3.7.4",
+      "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz",
+      "integrity": "sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@types/eslint": "*",
@@ -2591,13 +2783,15 @@
     },
     "node_modules/@types/estree": {
       "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.1.tgz",
+      "integrity": "sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA==",
+      "dev": true
     },
     "node_modules/@types/jsdom": {
       "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.2.tgz",
+      "integrity": "sha512-bGj+7TaCkOwkJfx7HtS9p22Ij0A2aKMuz8a1+owpkxa1wU/HUBy/WAXhdv90uDdVI9rSjGvUrXmLSeA9VP3JeA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "@types/tough-cookie": "*",
@@ -2606,43 +2800,51 @@
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.12",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
+      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
+      "dev": true
     },
     "node_modules/@types/json5": {
       "version": "0.0.29",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz",
+      "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==",
+      "dev": true
     },
     "node_modules/@types/node": {
       "version": "18.17.12",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.12.tgz",
+      "integrity": "sha512-d6xjC9fJ/nSnfDeU0AMDsaJyb1iHsqCSOdi84w4u+SlN/UgQdY5tRhpMzaFYsI4mnpvgTivEaQd0yOUhAtOnEQ==",
+      "dev": true
     },
     "node_modules/@types/q": {
       "version": "1.5.5",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
+      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
+      "dev": true
     },
     "node_modules/@types/semver": {
       "version": "7.5.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.1.tgz",
+      "integrity": "sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==",
+      "dev": true
     },
     "node_modules/@types/sinonjs__fake-timers": {
       "version": "8.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz",
+      "integrity": "sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==",
+      "dev": true
     },
     "node_modules/@types/sizzle": {
       "version": "2.3.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz",
+      "integrity": "sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==",
+      "dev": true
     },
     "node_modules/@types/tough-cookie": {
       "version": "4.0.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
+      "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
+      "dev": true
     },
     "node_modules/@types/trusted-types": {
       "version": "2.0.3",
@@ -2651,12 +2853,14 @@
     },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.17",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.17.tgz",
+      "integrity": "sha512-4p9vcSmxAayx72yn70joFoL44c9MO/0+iVEBIQXe3v2h2SiAsEIo/G5v6ObFWvNKRFjbrVadNf9LqEEZeQPzdA=="
     },
     "node_modules/@types/yauzl": {
       "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "dependencies": {
         "@types/node": "*"
@@ -2667,7 +2871,6 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.6.0.tgz",
       "integrity": "sha512-CW9YDGTQnNYMIo5lMeuiIG08p4E0cXrXTbcZ2saT/ETE7dWUrNxlijsQeU04qAAKkILiLzdQz+cGFxCJjaZUmA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
         "@typescript-eslint/scope-manager": "6.6.0",
@@ -2700,8 +2903,9 @@
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -2711,8 +2915,9 @@
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -2725,15 +2930,15 @@
     },
     "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/@typescript-eslint/parser": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.6.0.tgz",
       "integrity": "sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "@typescript-eslint/scope-manager": "6.6.0",
         "@typescript-eslint/types": "6.6.0",
@@ -2762,7 +2967,6 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz",
       "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "6.6.0",
         "@typescript-eslint/visitor-keys": "6.6.0"
@@ -2780,7 +2984,6 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.6.0.tgz",
       "integrity": "sha512-8m16fwAcEnQc69IpeDyokNO+D5spo0w1jepWWY2Q6y5ZKNuj5EhVQXjtVAeDDqvW6Yg7dhclbsz6rTtOvcwpHg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/typescript-estree": "6.6.0",
         "@typescript-eslint/utils": "6.6.0",
@@ -2808,7 +3011,6 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.6.0.tgz",
       "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
       },
@@ -2822,7 +3024,6 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz",
       "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "@typescript-eslint/types": "6.6.0",
         "@typescript-eslint/visitor-keys": "6.6.0",
@@ -2847,8 +3048,9 @@
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": {
       "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -2866,8 +3068,9 @@
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -2877,8 +3080,9 @@
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -2891,15 +3095,15 @@
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/@typescript-eslint/utils": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.6.0.tgz",
       "integrity": "sha512-mPHFoNa2bPIWWglWYdR0QfY9GN0CfvvXX1Sv6DlSTive3jlMTUy+an67//Gysc+0Me9pjitrq0LJp0nGtLgftw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
@@ -2922,8 +3126,9 @@
     },
     "node_modules/@typescript-eslint/utils/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -2933,8 +3138,9 @@
     },
     "node_modules/@typescript-eslint/utils/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -2947,15 +3153,15 @@
     },
     "node_modules/@typescript-eslint/utils/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/@typescript-eslint/visitor-keys": {
       "version": "6.6.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz",
       "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "6.6.0",
         "eslint-visitor-keys": "^3.4.1"
@@ -2970,8 +3176,9 @@
     },
     "node_modules/@vitejs/plugin-vue": {
       "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-4.3.4.tgz",
+      "integrity": "sha512-ciXNIHKPriERBisHFBvnTbfKa6r9SAesOYXeGDzgegcvy9Q4xdScSHAmKbNT0M3O0S9LKhIf5/G+UYG4NnnzYw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
@@ -2982,8 +3189,9 @@
     },
     "node_modules/@vitest/coverage-istanbul": {
       "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-0.34.3.tgz",
+      "integrity": "sha512-RdEGzydbbalyDLmmJ5Qm+T3Lrubw/U9iCnhzM2B1V57t4cVa1t6uyfIHdv68d1au4PRzkLhY7Xouwuhb7BeG+Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "istanbul-lib-coverage": "^3.2.0",
         "istanbul-lib-instrument": "^6.0.0",
@@ -3001,8 +3209,9 @@
     },
     "node_modules/@vitest/expect": {
       "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.3.tgz",
+      "integrity": "sha512-F8MTXZUYRBVsYL1uoIft1HHWhwDbSzwAU9Zgh8S6WFC3YgVb4AnFV2GXO3P5Em8FjEYaZtTnQYoNwwBrlOMXgg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@vitest/spy": "0.34.3",
         "@vitest/utils": "0.34.3",
@@ -3014,8 +3223,9 @@
     },
     "node_modules/@vitest/runner": {
       "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.3.tgz",
+      "integrity": "sha512-lYNq7N3vR57VMKMPLVvmJoiN4bqwzZ1euTW+XXYH5kzr3W/+xQG3b41xJn9ChJ3AhYOSoweu974S1V3qDcFESA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@vitest/utils": "0.34.3",
         "p-limit": "^4.0.0",
@@ -3027,8 +3237,9 @@
     },
     "node_modules/@vitest/runner/node_modules/p-limit": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^1.0.0"
       },
@@ -3041,8 +3252,9 @@
     },
     "node_modules/@vitest/runner/node_modules/yocto-queue": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12.20"
       },
@@ -3052,8 +3264,9 @@
     },
     "node_modules/@vitest/snapshot": {
       "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.3.tgz",
+      "integrity": "sha512-QyPaE15DQwbnIBp/yNJ8lbvXTZxS00kRly0kfFgAD5EYmCbYcA+1EEyRalc93M0gosL/xHeg3lKAClIXYpmUiQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "magic-string": "^0.30.1",
         "pathe": "^1.1.1",
@@ -3065,8 +3278,9 @@
     },
     "node_modules/@vitest/spy": {
       "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.3.tgz",
+      "integrity": "sha512-N1V0RFQ6AI7CPgzBq9kzjRdPIgThC340DGjdKdPSE8r86aUSmeliTUgkTqLSgtEwWWsGfBQ+UetZWhK0BgJmkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tinyspy": "^2.1.1"
       },
@@ -3076,8 +3290,9 @@
     },
     "node_modules/@vitest/utils": {
       "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.3.tgz",
+      "integrity": "sha512-kiSnzLG6m/tiT0XEl4U2H8JDBjFtwVlaE8I3QfGiMFR0QvnRDfYfdP3YvTBWM/6iJDAyaPY6yVQiCTUc7ZzTHA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "diff-sequences": "^29.4.3",
         "loupe": "^2.3.6",
@@ -3089,36 +3304,41 @@
     },
     "node_modules/@volar/language-core": {
       "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-1.10.1.tgz",
+      "integrity": "sha512-JnsM1mIPdfGPxmoOcK1c7HYAsL6YOv0TCJ4aW3AXPZN/Jb4R77epDyMZIVudSGjWMbvv/JfUa+rQ+dGKTmgwBA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@volar/source-map": "1.10.1"
       }
     },
     "node_modules/@volar/source-map": {
       "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/@volar/source-map/-/source-map-1.10.1.tgz",
+      "integrity": "sha512-3/S6KQbqa7pGC8CxPrg69qHLpOvkiPHGJtWPkI/1AXCsktkJ6gIk/5z4hyuMp8Anvs6eS/Kvp/GZa3ut3votKA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "muggle-string": "^0.3.1"
       }
     },
     "node_modules/@volar/typescript": {
       "version": "1.10.1",
+      "resolved": "https://registry.npmjs.org/@volar/typescript/-/typescript-1.10.1.tgz",
+      "integrity": "sha512-+iiO9yUSRHIYjlteT+QcdRq8b44qH19/eiUZtjNtuh6D9ailYM7DVR0zO2sEgJlvCaunw/CF9Ov2KooQBpR4VQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@volar/language-core": "1.10.1"
       }
     },
     "node_modules/@vscode/l10n": {
       "version": "0.0.16",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.16.tgz",
+      "integrity": "sha512-JT5CvrIYYCrmB+dCana8sUqJEcGB1ZDXNLMQ2+42bW995WmNoenijWMUdZfwmuQUTQcEVVIa2OecZzTYWUW9Cg==",
+      "dev": true
     },
     "node_modules/@vue/compiler-core": {
       "version": "3.3.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.3.4.tgz",
+      "integrity": "sha512-cquyDNvZ6jTbf/+x+AgM2Arrp6G4Dzbb0R64jiG804HRMfRiFXWI6kqUVqZ6ZR0bQhIoQjB4+2bhNtVwndW15g==",
       "dependencies": {
         "@babel/parser": "^7.21.3",
         "@vue/shared": "3.3.4",
@@ -3128,7 +3348,8 @@
     },
     "node_modules/@vue/compiler-dom": {
       "version": "3.3.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.3.4.tgz",
+      "integrity": "sha512-wyM+OjOVpuUukIq6p5+nwHYtj9cFroz9cwkfmP9O1nzH68BenTTv0u7/ndggT8cIQlnBeOo6sUT/gvHcIkLA5w==",
       "dependencies": {
         "@vue/compiler-core": "3.3.4",
         "@vue/shared": "3.3.4"
@@ -3136,7 +3357,8 @@
     },
     "node_modules/@vue/compiler-sfc": {
       "version": "3.3.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.3.4.tgz",
+      "integrity": "sha512-6y/d8uw+5TkCuzBkgLS0v3lSM3hJDntFEiUORM11pQ/hKvkhSKZrXW6i69UyXlJQisJxuUEJKAWEqWbWsLeNKQ==",
       "dependencies": {
         "@babel/parser": "^7.20.15",
         "@vue/compiler-core": "3.3.4",
@@ -3152,7 +3374,8 @@
     },
     "node_modules/@vue/compiler-ssr": {
       "version": "3.3.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.3.4.tgz",
+      "integrity": "sha512-m0v6oKpup2nMSehwA6Uuu+j+wEwcy7QmwMkVNVfrV9P2qE5KshC6RwOCq8fjGS/Eak/uNb8AaWekfiXxbBB6gQ==",
       "dependencies": {
         "@vue/compiler-dom": "3.3.4",
         "@vue/shared": "3.3.4"
@@ -3160,12 +3383,14 @@
     },
     "node_modules/@vue/devtools-api": {
       "version": "6.5.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-6.5.0.tgz",
+      "integrity": "sha512-o9KfBeaBmCKl10usN4crU53fYtC1r7jJwdGKjPT24t348rHxgfpZ0xL3Xm/gLUYnc0oTp8LAmrxOeLyu6tbk2Q=="
     },
     "node_modules/@vue/eslint-config-prettier": {
       "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/@vue/eslint-config-prettier/-/eslint-config-prettier-8.0.0.tgz",
+      "integrity": "sha512-55dPqtC4PM/yBjhAr+yEw6+7KzzdkBuLmnhBrDfp4I48+wy+Giqqj9yUr5T2uD/BkBROjjmqnLZmXRdOx/VtQg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "eslint-config-prettier": "^8.8.0",
         "eslint-plugin-prettier": "^5.0.0"
@@ -3177,8 +3402,9 @@
     },
     "node_modules/@vue/eslint-config-prettier/node_modules/eslint-config-prettier": {
       "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz",
+      "integrity": "sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -3188,8 +3414,9 @@
     },
     "node_modules/@vue/eslint-config-typescript": {
       "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.3.tgz",
+      "integrity": "sha512-dkt6W0PX6H/4Xuxg/BlFj5xHvksjpSlVjtkQCpaYJBIEuKj2hOVU7r+TIe+ysCwRYFz/lGqvklntRkCAibsbPw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/eslint-plugin": "^5.59.1",
         "@typescript-eslint/parser": "^5.59.1",
@@ -3211,8 +3438,9 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/eslint-plugin": {
       "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz",
+      "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.4.0",
         "@typescript-eslint/scope-manager": "5.62.0",
@@ -3244,8 +3472,9 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/parser": {
       "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz",
+      "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "@typescript-eslint/scope-manager": "5.62.0",
         "@typescript-eslint/types": "5.62.0",
@@ -3270,8 +3499,9 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/scope-manager": {
       "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz",
+      "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "@typescript-eslint/visitor-keys": "5.62.0"
@@ -3286,8 +3516,9 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/type-utils": {
       "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz",
+      "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/typescript-estree": "5.62.0",
         "@typescript-eslint/utils": "5.62.0",
@@ -3312,8 +3543,9 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/types": {
       "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz",
+      "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -3324,8 +3556,9 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/typescript-estree": {
       "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz",
+      "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "@typescript-eslint/visitor-keys": "5.62.0",
@@ -3350,8 +3583,9 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/utils": {
       "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz",
+      "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@types/json-schema": "^7.0.9",
@@ -3375,8 +3609,9 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/@typescript-eslint/visitor-keys": {
       "version": "5.62.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz",
+      "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "5.62.0",
         "eslint-visitor-keys": "^3.3.0"
@@ -3391,8 +3626,9 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/eslint-scope": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -3403,16 +3639,18 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/estraverse": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/globby": {
       "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -3430,8 +3668,9 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -3441,8 +3680,9 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -3455,13 +3695,15 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/tslib": {
       "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/tsutils": {
       "version": "3.21.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz",
+      "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tslib": "^1.8.1"
       },
@@ -3474,13 +3716,15 @@
     },
     "node_modules/@vue/eslint-config-typescript/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/@vue/language-core": {
       "version": "1.8.8",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.8.tgz",
+      "integrity": "sha512-i4KMTuPazf48yMdYoebTkgSOJdFraE4pQf0B+FTOFkbB+6hAfjrSou/UmYWRsWyZV6r4Rc6DDZdI39CJwL0rWw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@volar/language-core": "~1.10.0",
         "@volar/source-map": "~1.10.0",
@@ -3502,16 +3746,18 @@
     },
     "node_modules/@vue/language-core/node_modules/brace-expansion": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/@vue/language-core/node_modules/minimatch": {
       "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -3524,14 +3770,16 @@
     },
     "node_modules/@vue/reactivity": {
       "version": "3.3.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.3.4.tgz",
+      "integrity": "sha512-kLTDLwd0B1jG08NBF3R5rqULtv/f8x3rOFByTDz4J53ttIQEDmALqKqXY0J+XQeN0aV2FBxY8nJDf88yvOPAqQ==",
       "dependencies": {
         "@vue/shared": "3.3.4"
       }
     },
     "node_modules/@vue/reactivity-transform": {
       "version": "3.3.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity-transform/-/reactivity-transform-3.3.4.tgz",
+      "integrity": "sha512-MXgwjako4nu5WFLAjpBnCj/ieqcjE2aJBINUNQzkZQfzIZA4xn+0fV1tIYBJvvva3N3OvKGofRLvQIwEQPpaXw==",
       "dependencies": {
         "@babel/parser": "^7.20.15",
         "@vue/compiler-core": "3.3.4",
@@ -3542,7 +3790,8 @@
     },
     "node_modules/@vue/runtime-core": {
       "version": "3.3.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.3.4.tgz",
+      "integrity": "sha512-R+bqxMN6pWO7zGI4OMlmvePOdP2c93GsHFM/siJI7O2nxFRzj55pLwkpCedEY+bTMgp5miZ8CxfIZo3S+gFqvA==",
       "dependencies": {
         "@vue/reactivity": "3.3.4",
         "@vue/shared": "3.3.4"
@@ -3550,7 +3799,8 @@
     },
     "node_modules/@vue/runtime-dom": {
       "version": "3.3.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.3.4.tgz",
+      "integrity": "sha512-Aj5bTJ3u5sFsUckRghsNjVTtxZQ1OyMWCr5dZRAPijF/0Vy4xEoRCwLyHXcj4D0UFbJ4lbx3gPTgg06K/GnPnQ==",
       "dependencies": {
         "@vue/runtime-core": "3.3.4",
         "@vue/shared": "3.3.4",
@@ -3559,7 +3809,8 @@
     },
     "node_modules/@vue/server-renderer": {
       "version": "3.3.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.3.4.tgz",
+      "integrity": "sha512-Q6jDDzR23ViIb67v+vM1Dqntu+HUexQcsWKhhQa4ARVzxOY2HbC7QRW/ggkDBd5BU+uM1sV6XOAP0b216o34JQ==",
       "dependencies": {
         "@vue/compiler-ssr": "3.3.4",
         "@vue/shared": "3.3.4"
@@ -3570,12 +3821,14 @@
     },
     "node_modules/@vue/shared": {
       "version": "3.3.4",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.3.4.tgz",
+      "integrity": "sha512-7OjdcV8vQ74eiz1TZLzZP4JwqM5fA94K6yntPS5Z25r9HDuGNzaGdgvwKYq6S+MxwF0TFRwe50fIR/MYnakdkQ=="
     },
     "node_modules/@vue/test-utils": {
       "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@vue/test-utils/-/test-utils-2.4.1.tgz",
+      "integrity": "sha512-VO8nragneNzUZUah6kOjiFmD/gwRjUauG9DROh6oaOeFwX1cZRUNHhdeogE8635cISigXFTtGLUQWx5KCb0xeg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "js-beautify": "1.14.9",
         "vue-component-type-helpers": "1.8.4"
@@ -3592,8 +3845,9 @@
     },
     "node_modules/@vue/tsconfig": {
       "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@vue/tsconfig/-/tsconfig-0.1.3.tgz",
+      "integrity": "sha512-kQVsh8yyWPvHpb8gIc9l/HIDiiVUy1amynLNpCy8p+FoCiZXCo6fQos5/097MmnNZc9AtseDsCrfkhqCrJ8Olg==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "@types/node": "*"
       },
@@ -3605,8 +3859,9 @@
     },
     "node_modules/@vue/typescript": {
       "version": "1.8.8",
+      "resolved": "https://registry.npmjs.org/@vue/typescript/-/typescript-1.8.8.tgz",
+      "integrity": "sha512-jUnmMB6egu5wl342eaUH236v8tdcEPXXkPgj+eI/F6JwW/lb+yAU6U07ZbQ3MVabZRlupIlPESB7ajgAGixhow==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@volar/typescript": "~1.10.0",
         "@vue/language-core": "1.8.8"
@@ -3614,7 +3869,8 @@
     },
     "node_modules/@vueuse/core": {
       "version": "10.4.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-10.4.1.tgz",
+      "integrity": "sha512-DkHIfMIoSIBjMgRRvdIvxsyboRZQmImofLyOHADqiVbQVilP8VVHDhBX2ZqoItOgu7dWa8oXiNnScOdPLhdEXg==",
       "dependencies": {
         "@types/web-bluetooth": "^0.0.17",
         "@vueuse/metadata": "10.4.1",
@@ -3627,8 +3883,9 @@
     },
     "node_modules/@vueuse/core/node_modules/vue-demi": {
       "version": "0.14.6",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz",
+      "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==",
       "hasInstallScript": true,
-      "license": "MIT",
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
         "vue-demi-switch": "bin/vue-demi-switch.js"
@@ -3651,14 +3908,16 @@
     },
     "node_modules/@vueuse/metadata": {
       "version": "10.4.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-10.4.1.tgz",
+      "integrity": "sha512-2Sc8X+iVzeuMGHr6O2j4gv/zxvQGGOYETYXEc41h0iZXIRnRbJZGmY/QP8dvzqUelf8vg0p/yEA5VpCEu+WpZg==",
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
     "node_modules/@vueuse/shared": {
       "version": "10.4.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-10.4.1.tgz",
+      "integrity": "sha512-vz5hbAM4qA0lDKmcr2y3pPdU+2EVw/yzfRsBdu+6+USGa4PxqSQRYIUC9/NcT06y+ZgaTsyURw2I9qOFaaXHAg==",
       "dependencies": {
         "vue-demi": ">=0.14.5"
       },
@@ -3668,8 +3927,9 @@
     },
     "node_modules/@vueuse/shared/node_modules/vue-demi": {
       "version": "0.14.6",
+      "resolved": "https://registry.npmjs.org/vue-demi/-/vue-demi-0.14.6.tgz",
+      "integrity": "sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==",
       "hasInstallScript": true,
-      "license": "MIT",
       "bin": {
         "vue-demi-fix": "bin/vue-demi-fix.js",
         "vue-demi-switch": "bin/vue-demi-switch.js"
@@ -3692,8 +3952,9 @@
     },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.6.tgz",
+      "integrity": "sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.11.6",
@@ -3702,26 +3963,30 @@
     },
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz",
+      "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz",
+      "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz",
+      "integrity": "sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz",
+      "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.11.6",
@@ -3731,14 +3996,16 @@
     },
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz",
+      "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz",
+      "integrity": "sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
@@ -3749,8 +4016,9 @@
     },
     "node_modules/@webassemblyjs/ieee754": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz",
+      "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
@@ -3758,8 +4026,9 @@
     },
     "node_modules/@webassemblyjs/leb128": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz",
+      "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "peer": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
@@ -3767,14 +4036,16 @@
     },
     "node_modules/@webassemblyjs/utf8": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz",
+      "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz",
+      "integrity": "sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
@@ -3789,8 +4060,9 @@
     },
     "node_modules/@webassemblyjs/wasm-gen": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz",
+      "integrity": "sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
@@ -3802,8 +4074,9 @@
     },
     "node_modules/@webassemblyjs/wasm-opt": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz",
+      "integrity": "sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
@@ -3814,8 +4087,9 @@
     },
     "node_modules/@webassemblyjs/wasm-parser": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz",
+      "integrity": "sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
@@ -3828,8 +4102,9 @@
     },
     "node_modules/@webassemblyjs/wast-printer": {
       "version": "1.11.6",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz",
+      "integrity": "sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.11.6",
@@ -3838,30 +4113,35 @@
     },
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "peer": true
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "peer": true
     },
     "node_modules/abab": {
       "version": "2.0.6",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "dev": true
     },
     "node_modules/abbrev": {
       "version": "1.1.1",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+      "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
+      "dev": true
     },
     "node_modules/acorn": {
       "version": "8.10.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz",
+      "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -3871,8 +4151,9 @@
     },
     "node_modules/acorn-import-assertions": {
       "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
+      "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "peerDependencies": {
         "acorn": "^8"
@@ -3880,24 +4161,27 @@
     },
     "node_modules/acorn-jsx": {
       "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
+      "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
     "node_modules/acorn-walk": {
       "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
+      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/agent-base": {
       "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "4"
       },
@@ -3907,8 +4191,9 @@
     },
     "node_modules/aggregate-error": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "clean-stack": "^2.0.0",
         "indent-string": "^4.0.0"
@@ -3919,8 +4204,9 @@
     },
     "node_modules/ajv": {
       "version": "6.12.6",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
+      "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -3934,8 +4220,9 @@
     },
     "node_modules/ajv-formats": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz",
+      "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "ajv": "^8.0.0"
@@ -3951,8 +4238,9 @@
     },
     "node_modules/ajv-formats/node_modules/ajv": {
       "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -3967,14 +4255,16 @@
     },
     "node_modules/ajv-formats/node_modules/json-schema-traverse": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/ajv-keywords": {
       "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "peerDependencies": {
         "ajv": "^6.9.1"
@@ -3982,16 +4272,18 @@
     },
     "node_modules/ansi-colors": {
       "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/ansi-escapes": {
       "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -4004,16 +4296,18 @@
     },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/ansi-styles": {
       "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^1.9.0"
       },
@@ -4023,8 +4317,9 @@
     },
     "node_modules/anymatch": {
       "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz",
+      "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "normalize-path": "^3.0.0",
         "picomatch": "^2.0.4"
@@ -4035,8 +4330,9 @@
     },
     "node_modules/append-transform": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz",
+      "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "default-require-extensions": "^3.0.0"
       },
@@ -4046,6 +4342,8 @@
     },
     "node_modules/arch": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz",
+      "integrity": "sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ==",
       "dev": true,
       "funding": [
         {
@@ -4060,28 +4358,31 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/archy": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz",
+      "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==",
+      "dev": true
     },
     "node_modules/arg": {
       "version": "5.0.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
+      "dev": true
     },
     "node_modules/argparse": {
       "version": "2.0.1",
-      "dev": true,
-      "license": "Python-2.0"
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "dev": true
     },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz",
+      "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "is-array-buffer": "^3.0.1"
@@ -4092,8 +4393,9 @@
     },
     "node_modules/array-includes": {
       "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -4110,16 +4412,18 @@
     },
     "node_modules/array-union": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/array.prototype.findlastindex": {
       "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -4136,8 +4440,9 @@
     },
     "node_modules/array.prototype.flat": {
       "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -4153,8 +4458,9 @@
     },
     "node_modules/array.prototype.flatmap": {
       "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -4170,8 +4476,9 @@
     },
     "node_modules/array.prototype.reduce": {
       "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
+      "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -4188,8 +4495,9 @@
     },
     "node_modules/arraybuffer.prototype.slice": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "call-bind": "^1.0.2",
@@ -4225,41 +4533,47 @@
     },
     "node_modules/assertion-error": {
       "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
+      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/astral-regex": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/async": {
       "version": "3.2.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz",
+      "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==",
+      "dev": true
     },
     "node_modules/asynckit": {
       "version": "0.4.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
     "node_modules/at-least-node": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+      "integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
     "node_modules/available-typed-arrays": {
       "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
+      "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4284,7 +4598,8 @@
     },
     "node_modules/axios": {
       "version": "1.5.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.0.tgz",
+      "integrity": "sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -4293,8 +4608,9 @@
     },
     "node_modules/babel-loader": {
       "version": "9.1.3",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz",
+      "integrity": "sha512-xG3ST4DglodGf8qSwv0MdeWLhrDsw/32QMdTO5T1ZIp9gQur0HkCyFs7Awskr10JKXFXwpAhiCuYX5oGXnRGbw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "find-cache-dir": "^4.0.0",
@@ -4310,8 +4626,9 @@
     },
     "node_modules/babel-plugin-polyfill-corejs2": {
       "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz",
+      "integrity": "sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.6",
@@ -4324,8 +4641,9 @@
     },
     "node_modules/babel-plugin-polyfill-corejs3": {
       "version": "0.8.3",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz",
+      "integrity": "sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.4.2",
@@ -4337,8 +4655,9 @@
     },
     "node_modules/babel-plugin-polyfill-regenerator": {
       "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz",
+      "integrity": "sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/helper-define-polyfill-provider": "^0.4.2"
@@ -4349,11 +4668,14 @@
     },
     "node_modules/balanced-match": {
       "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
     },
     "node_modules/base64-js": {
       "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
+      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
       "dev": true,
       "funding": [
         {
@@ -4368,8 +4690,7 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/bcrypt-pbkdf": {
       "version": "1.0.2",
@@ -4382,47 +4703,54 @@
     },
     "node_modules/big-integer": {
       "version": "1.6.51",
+      "resolved": "https://registry.npmjs.org/big-integer/-/big-integer-1.6.51.tgz",
+      "integrity": "sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg==",
       "dev": true,
-      "license": "Unlicense",
       "engines": {
         "node": ">=0.6"
       }
     },
     "node_modules/big.js": {
       "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/binary-extensions": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz",
+      "integrity": "sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/blob-util": {
       "version": "2.0.2",
-      "dev": true,
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz",
+      "integrity": "sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==",
+      "dev": true
     },
     "node_modules/bluebird": {
       "version": "3.7.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz",
+      "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==",
+      "dev": true
     },
     "node_modules/boolbase": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true
     },
     "node_modules/bplist-parser": {
       "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.2.0.tgz",
+      "integrity": "sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big-integer": "^1.6.44"
       },
@@ -4432,8 +4760,9 @@
     },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -4441,8 +4770,9 @@
     },
     "node_modules/braces": {
       "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
+      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "fill-range": "^7.0.1"
       },
@@ -4452,6 +4782,8 @@
     },
     "node_modules/browserslist": {
       "version": "4.21.10",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
+      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
       "dev": true,
       "funding": [
         {
@@ -4467,7 +4799,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "caniuse-lite": "^1.0.30001517",
         "electron-to-chromium": "^1.4.477",
@@ -4483,6 +4814,8 @@
     },
     "node_modules/buffer": {
       "version": "5.7.1",
+      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
+      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
       "dev": true,
       "funding": [
         {
@@ -4498,7 +4831,6 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "base64-js": "^1.3.1",
         "ieee754": "^1.1.13"
@@ -4506,29 +4838,33 @@
     },
     "node_modules/buffer-crc32": {
       "version": "0.2.13",
+      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
+      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/buffer-from": {
       "version": "1.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true
     },
     "node_modules/builtin-modules": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz",
+      "integrity": "sha512-wxXCdllwGhI2kCC0MnvTGYTMvnVZTvqgypkiTI8Pa5tcz2i6VqsqwYGgqwXji+4RgCzms6EajE4IxiUH6HH8nQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/builtins": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz",
+      "integrity": "sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "semver": "^7.0.0"
@@ -4536,8 +4872,9 @@
     },
     "node_modules/builtins/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "peer": true,
       "dependencies": {
         "yallist": "^4.0.0"
@@ -4548,8 +4885,9 @@
     },
     "node_modules/builtins/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "peer": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -4563,14 +4901,16 @@
     },
     "node_modules/builtins/node_modules/yallist": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true,
-      "license": "ISC",
       "peer": true
     },
     "node_modules/bundle-name": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-3.0.0.tgz",
+      "integrity": "sha512-PKA4BeSvBpQKQ8iPOGCSiell+N8P+Tf1DlwqmYhpe2gAhKPHn8EYOxVT+ShuGmhg8lN8XiSlS80yiExKXrURlw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "run-applescript": "^5.0.0"
       },
@@ -4583,24 +4923,27 @@
     },
     "node_modules/cac": {
       "version": "6.7.14",
+      "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+      "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/cachedir": {
       "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/cachedir/-/cachedir-2.4.0.tgz",
+      "integrity": "sha512-9EtFOZR8g22CL7BWjJ9BUx1+A/djkofnyW3aOXZORNW2kxoUpx2h+uN2cOqwPmFhnpVmxg+KW2OjOSgChTEvsQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/caching-transform": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
+      "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "hasha": "^5.0.0",
         "make-dir": "^3.0.0",
@@ -4613,8 +4956,9 @@
     },
     "node_modules/caching-transform/node_modules/make-dir": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
       },
@@ -4627,8 +4971,9 @@
     },
     "node_modules/call-bind": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+      "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.0.2"
@@ -4639,22 +4984,26 @@
     },
     "node_modules/callsites": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/camelcase": {
       "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001524",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001524.tgz",
+      "integrity": "sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==",
       "dev": true,
       "funding": [
         {
@@ -4669,8 +5018,7 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ],
-      "license": "CC-BY-4.0"
+      ]
     },
     "node_modules/caseless": {
       "version": "0.12.0",
@@ -4680,8 +5028,9 @@
     },
     "node_modules/chai": {
       "version": "4.3.8",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-4.3.8.tgz",
+      "integrity": "sha512-vX4YvVVtxlfSZ2VecZgFUTU5qPCYsobVI2O9FmwEXBhDigYGQA6jRXCycIs1yJnnWbZ6/+a2zNIF5DfVCcJBFQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "assertion-error": "^1.1.0",
         "check-error": "^1.0.2",
@@ -4697,8 +5046,9 @@
     },
     "node_modules/chalk": {
       "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^3.2.1",
         "escape-string-regexp": "^1.0.5",
@@ -4710,30 +5060,35 @@
     },
     "node_modules/character-parser": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
+      "integrity": "sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-regex": "^1.0.3"
       }
     },
     "node_modules/check-error": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz",
+      "integrity": "sha512-BrgHpW9NURQgzoNyjfq0Wu6VFO6D7IZEmJNdtgNqpzGG8RuNFHt2jQxWlAs4HMe119chBnv+34syEZtc6IhLtA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/check-more-types": {
       "version": "2.24.0",
+      "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
+      "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/chokidar": {
       "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz",
+      "integrity": "sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==",
       "devOptional": true,
       "funding": [
         {
@@ -4741,7 +5096,6 @@
           "url": "https://paulmillr.com/funding/"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "anymatch": "~3.1.2",
         "braces": "~3.0.2",
@@ -4760,8 +5114,9 @@
     },
     "node_modules/chokidar/node_modules/glob-parent": {
       "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "devOptional": true,
-      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -4771,8 +5126,9 @@
     },
     "node_modules/chrome-trace-event": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
+      "integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=6.0"
@@ -4780,6 +5136,8 @@
     },
     "node_modules/ci-info": {
       "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz",
+      "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==",
       "dev": true,
       "funding": [
         {
@@ -4787,23 +5145,24 @@
           "url": "https://github.com/sponsors/sibiraj-s"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/clean-stack": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/cli-cursor": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "restore-cursor": "^3.1.0"
       },
@@ -4813,8 +5172,9 @@
     },
     "node_modules/cli-table3": {
       "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz",
+      "integrity": "sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "string-width": "^4.2.0"
       },
@@ -4827,8 +5187,9 @@
     },
     "node_modules/cli-truncate": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "slice-ansi": "^3.0.0",
         "string-width": "^4.2.0"
@@ -4842,8 +5203,9 @@
     },
     "node_modules/cliui": {
       "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -4852,8 +5214,9 @@
     },
     "node_modules/coa": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/coa/-/coa-2.0.2.tgz",
+      "integrity": "sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/q": "^1.5.1",
         "chalk": "^2.4.1",
@@ -4865,7 +5228,8 @@
     },
     "node_modules/color": {
       "version": "4.2.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
+      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
       "dependencies": {
         "color-convert": "^2.0.1",
         "color-string": "^1.9.0"
@@ -4876,19 +5240,22 @@
     },
     "node_modules/color-convert": {
       "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "1.1.3"
       }
     },
     "node_modules/color-name": {
       "version": "1.1.3",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
     "node_modules/color-string": {
       "version": "1.9.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
       "dependencies": {
         "color-name": "^1.0.0",
         "simple-swizzle": "^0.2.2"
@@ -4896,7 +5263,8 @@
     },
     "node_modules/color/node_modules/color-convert": {
       "version": "2.0.1",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -4906,16 +5274,19 @@
     },
     "node_modules/color/node_modules/color-name": {
       "version": "1.1.4",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/colorette": {
       "version": "2.0.20",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true
     },
     "node_modules/combined-stream": {
       "version": "1.0.8",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dependencies": {
         "delayed-stream": "~1.0.0"
       },
@@ -4925,40 +5296,46 @@
     },
     "node_modules/commander": {
       "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/common-path-prefix": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz",
+      "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==",
       "dev": true,
-      "license": "ISC",
       "peer": true
     },
     "node_modules/common-tags": {
       "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz",
+      "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4.0.0"
       }
     },
     "node_modules/commondir": {
       "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==",
+      "dev": true
     },
     "node_modules/concat-map": {
       "version": "0.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "dev": true
     },
     "node_modules/config-chain": {
       "version": "1.1.13",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz",
+      "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ini": "^1.3.4",
         "proto-list": "~1.2.1"
@@ -4966,18 +5343,21 @@
     },
     "node_modules/config-chain/node_modules/ini": {
       "version": "1.3.8",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
+      "dev": true
     },
     "node_modules/convert-source-map": {
       "version": "1.9.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true
     },
     "node_modules/core-js-compat": {
       "version": "3.32.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.1.tgz",
+      "integrity": "sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "browserslist": "^4.21.10"
@@ -4989,18 +5369,21 @@
     },
     "node_modules/core-util-is": {
       "version": "1.0.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "dev": true
     },
     "node_modules/create-require": {
       "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
+      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
+      "dev": true
     },
     "node_modules/cross-spawn": {
       "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -5012,8 +5395,9 @@
     },
     "node_modules/css-select": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-2.1.0.tgz",
+      "integrity": "sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0",
         "css-what": "^3.2.1",
@@ -5023,21 +5407,24 @@
     },
     "node_modules/css-select-base-adapter": {
       "version": "0.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz",
+      "integrity": "sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==",
+      "dev": true
     },
     "node_modules/css-select/node_modules/nth-check": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+      "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "~1.0.0"
       }
     },
     "node_modules/css-tree": {
       "version": "1.0.0-alpha.37",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.37.tgz",
+      "integrity": "sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mdn-data": "2.0.4",
         "source-map": "^0.6.1"
@@ -5048,8 +5435,9 @@
     },
     "node_modules/css-what": {
       "version": "3.4.2",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.4.2.tgz",
+      "integrity": "sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">= 6"
       },
@@ -5059,8 +5447,9 @@
     },
     "node_modules/cssesc": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -5070,8 +5459,9 @@
     },
     "node_modules/csso": {
       "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "css-tree": "^1.1.2"
       },
@@ -5081,8 +5471,9 @@
     },
     "node_modules/csso/node_modules/css-tree": {
       "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mdn-data": "2.0.14",
         "source-map": "^0.6.1"
@@ -5093,13 +5484,15 @@
     },
     "node_modules/csso/node_modules/mdn-data": {
       "version": "2.0.14",
-      "dev": true,
-      "license": "CC0-1.0"
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==",
+      "dev": true
     },
     "node_modules/cssstyle": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-3.0.0.tgz",
+      "integrity": "sha512-N4u2ABATi3Qplzf0hWbVCdjenim8F3ojEXpBDF5hBpjzW182MjNGLqfmQ0SkSPeQ+V86ZXgeH8aXj6kayd4jgg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "rrweb-cssom": "^0.6.0"
       },
@@ -5109,7 +5502,8 @@
     },
     "node_modules/csstype": {
       "version": "3.1.2",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz",
+      "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "node_modules/cypress": {
       "version": "13.1.0",
@@ -5171,13 +5565,15 @@
     },
     "node_modules/cypress/node_modules/@types/node": {
       "version": "16.18.46",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.46.tgz",
+      "integrity": "sha512-Mnq3O9Xz52exs3mlxMcQuA7/9VFe/dXcrgAyfjLkABIqxXKOgBRjyazTxUbjsxDa4BP7hhPliyjVTP9RDP14xg==",
+      "dev": true
     },
     "node_modules/cypress/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -5190,13 +5586,15 @@
     },
     "node_modules/cypress/node_modules/bluebird": {
       "version": "3.7.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
     },
     "node_modules/cypress/node_modules/chalk": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -5210,8 +5608,9 @@
     },
     "node_modules/cypress/node_modules/chalk/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -5221,8 +5620,9 @@
     },
     "node_modules/cypress/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -5232,21 +5632,24 @@
     },
     "node_modules/cypress/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/cypress/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/cypress/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -5256,13 +5659,15 @@
     },
     "node_modules/cypress/node_modules/proxy-from-env": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
+      "integrity": "sha512-F2JHgJQ1iqwnHDcQjVBsq3n/uoaFL+iPW/eAeL7kVxy/2RrWaN4WroKjjvbsoRtv0ftelNyC01bjRhn/bhcf4A==",
+      "dev": true
     },
     "node_modules/cypress/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -5275,8 +5680,9 @@
     },
     "node_modules/cypress/node_modules/supports-color": {
       "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -5289,8 +5695,9 @@
     },
     "node_modules/cypress/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/dashdash": {
       "version": "1.14.1",
@@ -5306,8 +5713,9 @@
     },
     "node_modules/data-urls": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz",
+      "integrity": "sha512-/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.6",
         "whatwg-mimetype": "^3.0.0",
@@ -5319,18 +5727,21 @@
     },
     "node_modules/dayjs": {
       "version": "1.11.9",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.9.tgz",
+      "integrity": "sha512-QvzAURSbQ0pKdIye2txOzNaHmxtUBXerpY0FJsFXUMKbIZeFm5ht1LS/jFsrncjnmtv8HsG0W2g6c0zUjZWmpA==",
+      "dev": true
     },
     "node_modules/de-indent": {
       "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz",
+      "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==",
+      "dev": true
     },
     "node_modules/debug": {
       "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -5345,21 +5756,24 @@
     },
     "node_modules/decamelize": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/decimal.js": {
       "version": "10.4.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz",
+      "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==",
+      "dev": true
     },
     "node_modules/deep-eql": {
       "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
+      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "type-detect": "^4.0.0"
       },
@@ -5369,13 +5783,15 @@
     },
     "node_modules/deep-is": {
       "version": "0.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
     },
     "node_modules/default-browser": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz",
+      "integrity": "sha512-wX5pXO1+BrhMkSbROFsyxUm0i/cJEScyNhA4PPxc41ICuv05ZZB/MX28s8aZx6xjmatvebIapF6hLEKEcpneUA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "bundle-name": "^3.0.0",
         "default-browser-id": "^3.0.0",
@@ -5391,8 +5807,9 @@
     },
     "node_modules/default-browser-id": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-3.0.0.tgz",
+      "integrity": "sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "bplist-parser": "^0.2.0",
         "untildify": "^4.0.0"
@@ -5406,8 +5823,9 @@
     },
     "node_modules/default-browser/node_modules/execa": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-7.2.0.tgz",
+      "integrity": "sha512-UduyVP7TLB5IcAQl+OzLyLcS/l32W/GLg+AhHJ+ow40FOk2U3SAllPwR44v4vmdFwIWqpdwxxpQbF1n5ta9seA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.1",
@@ -5428,8 +5846,9 @@
     },
     "node_modules/default-browser/node_modules/get-stream": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -5439,16 +5858,18 @@
     },
     "node_modules/default-browser/node_modules/human-signals": {
       "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-4.3.1.tgz",
+      "integrity": "sha512-nZXjEF2nbo7lIw3mgYjItAfgQXog3OjJogSbKa2CQIIvSGWcKgeJnQlNXip6NglNzYH45nSRiEVimMvYL8DDqQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=14.18.0"
       }
     },
     "node_modules/default-browser/node_modules/is-stream": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz",
+      "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
@@ -5458,8 +5879,9 @@
     },
     "node_modules/default-browser/node_modules/mimic-fn": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz",
+      "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -5469,8 +5891,9 @@
     },
     "node_modules/default-browser/node_modules/npm-run-path": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.1.0.tgz",
+      "integrity": "sha512-sJOdmRGrY2sjNTRMbSvluQqg+8X7ZK61yvzBEIDhz4f8z1TZFYABsqjjCBd/0PUNE9M6QDgHJXQkGUEm7Q+l9Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-key": "^4.0.0"
       },
@@ -5483,8 +5906,9 @@
     },
     "node_modules/default-browser/node_modules/onetime": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz",
+      "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^4.0.0"
       },
@@ -5497,8 +5921,9 @@
     },
     "node_modules/default-browser/node_modules/path-key": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz",
+      "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -5508,8 +5933,9 @@
     },
     "node_modules/default-browser/node_modules/strip-final-newline": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz",
+      "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -5519,8 +5945,9 @@
     },
     "node_modules/default-require-extensions": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz",
+      "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "strip-bom": "^4.0.0"
       },
@@ -5533,8 +5960,9 @@
     },
     "node_modules/define-lazy-prop": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
+      "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -5544,8 +5972,9 @@
     },
     "node_modules/define-properties": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
@@ -5559,31 +5988,35 @@
     },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "engines": {
         "node": ">=0.4.0"
       }
     },
     "node_modules/diff": {
       "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.3.1"
       }
     },
     "node_modules/diff-sequences": {
       "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/dir-glob": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-type": "^4.0.0"
       },
@@ -5593,8 +6026,9 @@
     },
     "node_modules/doctrine": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+      "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -5604,8 +6038,9 @@
     },
     "node_modules/dom-serializer": {
       "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz",
+      "integrity": "sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "domelementtype": "^2.0.1",
         "entities": "^2.0.0"
@@ -5613,32 +6048,36 @@
     },
     "node_modules/dom-serializer/node_modules/domelementtype": {
       "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
       "dev": true,
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/fb55"
         }
-      ],
-      "license": "BSD-2-Clause"
+      ]
     },
     "node_modules/dom-serializer/node_modules/entities": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "funding": {
         "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
     "node_modules/domelementtype": {
       "version": "1.3.1",
-      "dev": true,
-      "license": "BSD-2-Clause"
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz",
+      "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==",
+      "dev": true
     },
     "node_modules/domexception": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "webidl-conversions": "^7.0.0"
       },
@@ -5648,8 +6087,9 @@
     },
     "node_modules/domutils": {
       "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz",
+      "integrity": "sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "dom-serializer": "0",
         "domelementtype": "1"
@@ -5657,7 +6097,8 @@
     },
     "node_modules/dotenv": {
       "version": "16.3.1",
-      "license": "BSD-2-Clause",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz",
+      "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==",
       "engines": {
         "node": ">=12"
       },
@@ -5667,8 +6108,9 @@
     },
     "node_modules/duplexer": {
       "version": "0.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
+      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
+      "dev": true
     },
     "node_modules/ecc-jsbn": {
       "version": "0.1.2",
@@ -5682,8 +6124,9 @@
     },
     "node_modules/editorconfig": {
       "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz",
+      "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@one-ini/wasm": "0.1.1",
         "commander": "^10.0.0",
@@ -5699,24 +6142,27 @@
     },
     "node_modules/editorconfig/node_modules/brace-expansion": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/editorconfig/node_modules/commander": {
       "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz",
+      "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=14"
       }
     },
     "node_modules/editorconfig/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -5726,8 +6172,9 @@
     },
     "node_modules/editorconfig/node_modules/minimatch": {
       "version": "9.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz",
+      "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -5740,8 +6187,9 @@
     },
     "node_modules/editorconfig/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -5754,39 +6202,45 @@
     },
     "node_modules/editorconfig/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/electron-to-chromium": {
       "version": "1.4.504",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.504.tgz",
+      "integrity": "sha512-cSMwIAd8yUh54VwitVRVvHK66QqHWE39C3DRj8SWiXitEpVSY3wNPD9y1pxQtLIi4w3UdzF9klLsmuPshz09DQ==",
+      "dev": true
     },
     "node_modules/emoji-regex": {
       "version": "8.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
     },
     "node_modules/emojis-list": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/end-of-stream": {
       "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "once": "^1.4.0"
       }
     },
     "node_modules/enhanced-resolve": {
       "version": "5.15.0",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
+      "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -5798,8 +6252,9 @@
     },
     "node_modules/enquirer": {
       "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-colors": "^4.1.1",
         "strip-ansi": "^6.0.1"
@@ -5810,8 +6265,9 @@
     },
     "node_modules/entities": {
       "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
       },
@@ -5821,8 +6277,9 @@
     },
     "node_modules/es-abstract": {
       "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "arraybuffer.prototype.slice": "^1.0.1",
@@ -5873,19 +6330,22 @@
     },
     "node_modules/es-array-method-boxes-properly": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz",
+      "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==",
+      "dev": true
     },
     "node_modules/es-module-lexer": {
       "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/es-set-tostringtag": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz",
+      "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.1.3",
         "has": "^1.0.3",
@@ -5897,16 +6357,18 @@
     },
     "node_modules/es-shim-unscopables": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz",
+      "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has": "^1.0.3"
       }
     },
     "node_modules/es-to-primitive": {
       "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+      "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-callable": "^1.1.4",
         "is-date-object": "^1.0.1",
@@ -5921,14 +6383,16 @@
     },
     "node_modules/es6-error": {
       "version": "4.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
+      "dev": true
     },
     "node_modules/esbuild": {
       "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz",
+      "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -5962,24 +6426,27 @@
     },
     "node_modules/escalade": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+      "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/escape-string-regexp": {
       "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.8.0"
       }
     },
     "node_modules/eslint": {
       "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
+      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
@@ -6031,8 +6498,9 @@
     },
     "node_modules/eslint-config-prettier": {
       "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz",
+      "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
       },
@@ -6042,6 +6510,8 @@
     },
     "node_modules/eslint-config-standard": {
       "version": "17.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz",
+      "integrity": "sha512-IwHwmaBNtDK4zDHQukFDW5u/aTb8+meQWZvNFWkiGmbWjD6bqyuSSBxxXKkCftCUzc1zwCH2m/baCNDLGmuO5Q==",
       "dev": true,
       "funding": [
         {
@@ -6057,7 +6527,6 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": ">=12.0.0"
       },
@@ -6070,8 +6539,9 @@
     },
     "node_modules/eslint-import-resolver-node": {
       "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz",
+      "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7",
         "is-core-module": "^2.13.0",
@@ -6080,16 +6550,18 @@
     },
     "node_modules/eslint-import-resolver-node/node_modules/debug": {
       "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-module-utils": {
       "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
+      "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^3.2.7"
       },
@@ -6104,16 +6576,18 @@
     },
     "node_modules/eslint-module-utils/node_modules/debug": {
       "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-cypress": {
       "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.14.0.tgz",
+      "integrity": "sha512-eW6tv7iIg7xujleAJX4Ujm649Bf5jweqa4ObPEIuueYRyLZt7qXGWhCY/n4bfeFW/j6nQZwbIBHKZt6EKcL/cg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "globals": "^13.20.0"
       },
@@ -6123,8 +6597,9 @@
     },
     "node_modules/eslint-plugin-cypress/node_modules/globals": {
       "version": "13.21.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -6137,8 +6612,9 @@
     },
     "node_modules/eslint-plugin-cypress/node_modules/type-fest": {
       "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -6148,8 +6624,9 @@
     },
     "node_modules/eslint-plugin-es-x": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.2.0.tgz",
+      "integrity": "sha512-9dvv5CcvNjSJPqnS5uZkqb3xmbeqRLnvXKK7iI5+oK/yTusyc46zbBZKENGsOfojm/mKfszyZb+wNqNPAPeGXA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.1.2",
@@ -6167,8 +6644,9 @@
     },
     "node_modules/eslint-plugin-import": {
       "version": "2.28.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
+      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "array-includes": "^3.1.6",
         "array.prototype.findlastindex": "^1.2.2",
@@ -6197,16 +6675,18 @@
     },
     "node_modules/eslint-plugin-import/node_modules/debug": {
       "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ms": "^2.1.1"
       }
     },
     "node_modules/eslint-plugin-import/node_modules/doctrine": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "esutils": "^2.0.2"
       },
@@ -6216,8 +6696,9 @@
     },
     "node_modules/eslint-plugin-n": {
       "version": "16.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.0.2.tgz",
+      "integrity": "sha512-Y66uDfUNbBzypsr0kELWrIz+5skicECrLUqlWuXawNSLUq3ltGlCwu6phboYYOTSnoTdHgTLrc+5Ydo6KjzZog==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
@@ -6241,8 +6722,9 @@
     },
     "node_modules/eslint-plugin-n/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "peer": true,
       "dependencies": {
         "yallist": "^4.0.0"
@@ -6253,8 +6735,9 @@
     },
     "node_modules/eslint-plugin-n/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "peer": true,
       "dependencies": {
         "lru-cache": "^6.0.0"
@@ -6268,14 +6751,16 @@
     },
     "node_modules/eslint-plugin-n/node_modules/yallist": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
       "dev": true,
-      "license": "ISC",
       "peer": true
     },
     "node_modules/eslint-plugin-prettier": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.0.0.tgz",
+      "integrity": "sha512-AgaZCVuYDXHUGxj/ZGu1u8H8CYgDY3iG6w5kUFw4AzMVXzB7VvbKgYR4nATIN+OvUrghMbiDLeimVjVY5ilq3w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "prettier-linter-helpers": "^1.0.0",
         "synckit": "^0.8.5"
@@ -6302,8 +6787,9 @@
     },
     "node_modules/eslint-plugin-promise": {
       "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-6.1.1.tgz",
+      "integrity": "sha512-tjqWDwVZQo7UIPMeDReOpUgHCmCiH+ePnVT+5zVapL0uuHnegBUs2smM13CzOs2Xb5+MHMRFTs9v24yjba4Oig==",
       "dev": true,
-      "license": "ISC",
       "peer": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -6314,8 +6800,9 @@
     },
     "node_modules/eslint-plugin-vue": {
       "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.17.0.tgz",
+      "integrity": "sha512-r7Bp79pxQk9I5XDP0k2dpUC7Ots3OSWgvGZNu3BxmKK6Zg7NgVtcOB6OCna5Kb9oQwJPl5hq183WD0SY5tZtIQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "natural-compare": "^1.4.0",
@@ -6334,8 +6821,9 @@
     },
     "node_modules/eslint-plugin-vue/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -6345,8 +6833,9 @@
     },
     "node_modules/eslint-plugin-vue/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -6359,13 +6848,15 @@
     },
     "node_modules/eslint-plugin-vue/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/eslint-scope": {
       "version": "7.2.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
+      "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -6379,8 +6870,9 @@
     },
     "node_modules/eslint-visitor-keys": {
       "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -6390,8 +6882,9 @@
     },
     "node_modules/eslint/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -6404,8 +6897,9 @@
     },
     "node_modules/eslint/node_modules/chalk": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -6419,8 +6913,9 @@
     },
     "node_modules/eslint/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -6430,13 +6925,15 @@
     },
     "node_modules/eslint/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/eslint/node_modules/escape-string-regexp": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -6446,8 +6943,9 @@
     },
     "node_modules/eslint/node_modules/globals": {
       "version": "13.21.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.20.2"
       },
@@ -6460,16 +6958,18 @@
     },
     "node_modules/eslint/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/eslint/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -6479,8 +6979,9 @@
     },
     "node_modules/eslint/node_modules/type-fest": {
       "version": "0.20.2",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
+      "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -6490,8 +6991,9 @@
     },
     "node_modules/espree": {
       "version": "9.6.1",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
+      "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.9.0",
         "acorn-jsx": "^5.3.2",
@@ -6506,8 +7008,9 @@
     },
     "node_modules/esprima": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "bin": {
         "esparse": "bin/esparse.js",
         "esvalidate": "bin/esvalidate.js"
@@ -6518,8 +7021,9 @@
     },
     "node_modules/esquery": {
       "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz",
+      "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -6529,8 +7033,9 @@
     },
     "node_modules/esrecurse": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -6540,28 +7045,32 @@
     },
     "node_modules/estraverse": {
       "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
     },
     "node_modules/estree-walker": {
       "version": "2.0.2",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz",
+      "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w=="
     },
     "node_modules/esutils": {
       "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/event-stream": {
       "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "duplexer": "~0.1.1",
         "from": "~0",
@@ -6574,13 +7083,15 @@
     },
     "node_modules/eventemitter2": {
       "version": "6.4.7",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz",
+      "integrity": "sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==",
+      "dev": true
     },
     "node_modules/events": {
       "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=0.8.x"
@@ -6588,8 +7099,9 @@
     },
     "node_modules/execa": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "get-stream": "^5.0.0",
@@ -6610,8 +7122,9 @@
     },
     "node_modules/executable": {
       "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
+      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "pify": "^2.2.0"
       },
@@ -6627,8 +7140,9 @@
     },
     "node_modules/extract-zip": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
+      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "get-stream": "^5.1.0",
@@ -6655,18 +7169,21 @@
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+      "dev": true
     },
     "node_modules/fast-diff": {
       "version": "1.3.0",
-      "dev": true,
-      "license": "Apache-2.0"
+      "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz",
+      "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==",
+      "dev": true
     },
     "node_modules/fast-glob": {
       "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz",
+      "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
@@ -6680,8 +7197,9 @@
     },
     "node_modules/fast-glob/node_modules/glob-parent": {
       "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.1"
       },
@@ -6691,34 +7209,39 @@
     },
     "node_modules/fast-json-stable-stringify": {
       "version": "2.1.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
     },
     "node_modules/fastq": {
       "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz",
+      "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
     },
     "node_modules/fd-slicer": {
       "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
+      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "pend": "~1.2.0"
       }
     },
     "node_modules/figures": {
       "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "escape-string-regexp": "^1.0.5"
       },
@@ -6731,8 +7254,9 @@
     },
     "node_modules/file-entry-cache": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
+      "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "flat-cache": "^3.0.4"
       },
@@ -6742,8 +7266,9 @@
     },
     "node_modules/fill-range": {
       "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
+      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "to-regex-range": "^5.0.1"
       },
@@ -6753,8 +7278,9 @@
     },
     "node_modules/find-cache-dir": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-4.0.0.tgz",
+      "integrity": "sha512-9ZonPT4ZAK4a+1pUPVPZJapbi7O5qbbJPdYw/NOQWZZbVLdDTYM3A4R9z/DpAM08IDaFGsvPgiGZ82WEwUDWjg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "common-path-prefix": "^3.0.0",
@@ -6769,8 +7295,9 @@
     },
     "node_modules/find-up": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -6784,8 +7311,9 @@
     },
     "node_modules/flat-cache": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz",
+      "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.7",
         "keyv": "^4.5.3",
@@ -6802,18 +7330,20 @@
     },
     "node_modules/flatted": {
       "version": "3.2.7",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "dev": true
     },
     "node_modules/follow-redirects": {
       "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "funding": [
         {
           "type": "individual",
           "url": "https://github.com/sponsors/RubenVerborgh"
         }
       ],
-      "license": "MIT",
       "engines": {
         "node": ">=4.0"
       },
@@ -6825,16 +7355,18 @@
     },
     "node_modules/for-each": {
       "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
+      "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-callable": "^1.1.3"
       }
     },
     "node_modules/foreground-child": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz",
+      "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "signal-exit": "^3.0.2"
@@ -6854,7 +7386,8 @@
     },
     "node_modules/form-data": {
       "version": "4.0.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
+      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -6866,11 +7399,14 @@
     },
     "node_modules/from": {
       "version": "0.1.7",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+      "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
+      "dev": true
     },
     "node_modules/fromentries": {
       "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
+      "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
       "dev": true,
       "funding": [
         {
@@ -6885,13 +7421,13 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/fs-extra": {
       "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -6904,30 +7440,21 @@
     },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "ISC"
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "dev": true
     },
     "node_modules/function-bind": {
       "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
     },
     "node_modules/function.prototype.name": {
       "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz",
+      "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -6943,40 +7470,45 @@
     },
     "node_modules/functions-have-names": {
       "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
       "dev": true,
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/gensync": {
       "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": "6.* || 8.* || >= 10.*"
       }
     },
     "node_modules/get-func-name": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.0.tgz",
+      "integrity": "sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/get-intrinsic": {
       "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
+      "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -6989,16 +7521,18 @@
     },
     "node_modules/get-package-type": {
       "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
       }
     },
     "node_modules/get-stream": {
       "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "pump": "^3.0.0"
       },
@@ -7011,8 +7545,9 @@
     },
     "node_modules/get-symbol-description": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz",
+      "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.1.1"
@@ -7026,8 +7561,9 @@
     },
     "node_modules/getos": {
       "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
+      "integrity": "sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "async": "^3.2.0"
       }
@@ -7043,8 +7579,9 @@
     },
     "node_modules/glob": {
       "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -7061,8 +7598,9 @@
     },
     "node_modules/glob-parent": {
       "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -7072,22 +7610,25 @@
     },
     "node_modules/glob-to-regexp": {
       "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "peer": true
     },
     "node_modules/glob/node_modules/brace-expansion": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/glob/node_modules/minimatch": {
       "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -7097,8 +7638,9 @@
     },
     "node_modules/global-dirs": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz",
+      "integrity": "sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ini": "2.0.0"
       },
@@ -7111,16 +7653,18 @@
     },
     "node_modules/globals": {
       "version": "11.12.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/globalthis": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
+      "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "define-properties": "^1.1.3"
       },
@@ -7133,8 +7677,9 @@
     },
     "node_modules/globby": {
       "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+      "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "array-union": "^2.1.0",
         "dir-glob": "^3.0.1",
@@ -7152,8 +7697,9 @@
     },
     "node_modules/gopd": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
+      "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.1.3"
       },
@@ -7163,18 +7709,21 @@
     },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
+      "dev": true
     },
     "node_modules/graphemer": {
       "version": "1.4.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
     },
     "node_modules/has": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.1"
       },
@@ -7184,24 +7733,27 @@
     },
     "node_modules/has-bigints": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
+      "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==",
       "dev": true,
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/has-flag": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/has-property-descriptors": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+      "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.1.1"
       },
@@ -7211,8 +7763,9 @@
     },
     "node_modules/has-proto": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
+      "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -7222,8 +7775,9 @@
     },
     "node_modules/has-symbols": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+      "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -7233,8 +7787,9 @@
     },
     "node_modules/has-tostringtag": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+      "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.2"
       },
@@ -7247,8 +7802,9 @@
     },
     "node_modules/hasha": {
       "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
+      "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-stream": "^2.0.0",
         "type-fest": "^0.8.0"
@@ -7262,24 +7818,27 @@
     },
     "node_modules/hasha/node_modules/type-fest": {
       "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/he": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "he": "bin/he"
       }
     },
     "node_modules/html-encoding-sniffer": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "whatwg-encoding": "^2.0.0"
       },
@@ -7289,13 +7848,15 @@
     },
     "node_modules/html-escaper": {
       "version": "2.0.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true
     },
     "node_modules/http-proxy-agent": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@tootallnate/once": "2",
         "agent-base": "6",
@@ -7321,8 +7882,9 @@
     },
     "node_modules/https-proxy-agent": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "agent-base": "6",
         "debug": "4"
@@ -7333,16 +7895,18 @@
     },
     "node_modules/human-signals": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=8.12.0"
       }
     },
     "node_modules/iconv-lite": {
       "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
@@ -7352,6 +7916,8 @@
     },
     "node_modules/ieee754": {
       "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
       "dev": true,
       "funding": [
         {
@@ -7366,26 +7932,28 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "BSD-3-Clause"
+      ]
     },
     "node_modules/ignore": {
       "version": "5.2.4",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz",
+      "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/immutable": {
       "version": "4.3.4",
-      "devOptional": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
+      "integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==",
+      "devOptional": true
     },
     "node_modules/import-fresh": {
       "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
+      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -7399,24 +7967,27 @@
     },
     "node_modules/imurmurhash": {
       "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
     },
     "node_modules/indent-string": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/inflight": {
       "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "once": "^1.3.0",
         "wrappy": "1"
@@ -7424,21 +7995,24 @@
     },
     "node_modules/inherits": {
       "version": "2.0.4",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+      "dev": true
     },
     "node_modules/ini": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz",
+      "integrity": "sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/internal-slot": {
       "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz",
+      "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "get-intrinsic": "^1.2.0",
         "has": "^1.0.3",
@@ -7450,8 +8024,9 @@
     },
     "node_modules/is-array-buffer": {
       "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
+      "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.2.0",
@@ -7463,12 +8038,14 @@
     },
     "node_modules/is-arrayish": {
       "version": "0.3.2",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz",
+      "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
     },
     "node_modules/is-bigint": {
       "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz",
+      "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-bigints": "^1.0.1"
       },
@@ -7478,8 +8055,9 @@
     },
     "node_modules/is-binary-path": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "binary-extensions": "^2.0.0"
       },
@@ -7489,8 +8067,9 @@
     },
     "node_modules/is-boolean-object": {
       "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz",
+      "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -7504,8 +8083,9 @@
     },
     "node_modules/is-callable": {
       "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -7515,8 +8095,9 @@
     },
     "node_modules/is-ci": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz",
+      "integrity": "sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ci-info": "^3.2.0"
       },
@@ -7526,8 +8107,9 @@
     },
     "node_modules/is-core-module": {
       "version": "2.13.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz",
+      "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has": "^1.0.3"
       },
@@ -7537,8 +8119,9 @@
     },
     "node_modules/is-date-object": {
       "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
+      "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -7551,8 +8134,9 @@
     },
     "node_modules/is-docker": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz",
+      "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
@@ -7565,8 +8149,9 @@
     },
     "node_modules/is-expression": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz",
+      "integrity": "sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "acorn": "^7.1.1",
         "object-assign": "^4.1.1"
@@ -7574,8 +8159,9 @@
     },
     "node_modules/is-expression/node_modules/acorn": {
       "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -7585,24 +8171,27 @@
     },
     "node_modules/is-extglob": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-fullwidth-code-point": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/is-glob": {
       "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "is-extglob": "^2.1.1"
       },
@@ -7612,8 +8201,9 @@
     },
     "node_modules/is-inside-container": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz",
+      "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-docker": "^3.0.0"
       },
@@ -7629,8 +8219,9 @@
     },
     "node_modules/is-installed-globally": {
       "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz",
+      "integrity": "sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "global-dirs": "^3.0.0",
         "is-path-inside": "^3.0.2"
@@ -7644,8 +8235,9 @@
     },
     "node_modules/is-negative-zero": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz",
+      "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -7655,16 +8247,18 @@
     },
     "node_modules/is-number": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.12.0"
       }
     },
     "node_modules/is-number-object": {
       "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz",
+      "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -7677,21 +8271,24 @@
     },
     "node_modules/is-path-inside": {
       "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/is-potential-custom-element-name": {
       "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true
     },
     "node_modules/is-regex": {
       "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
+      "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-tostringtag": "^1.0.0"
@@ -7705,8 +8302,9 @@
     },
     "node_modules/is-shared-array-buffer": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz",
+      "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2"
       },
@@ -7716,8 +8314,9 @@
     },
     "node_modules/is-stream": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -7727,8 +8326,9 @@
     },
     "node_modules/is-string": {
       "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz",
+      "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-tostringtag": "^1.0.0"
       },
@@ -7741,8 +8341,9 @@
     },
     "node_modules/is-symbol": {
       "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz",
+      "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-symbols": "^1.0.2"
       },
@@ -7755,8 +8356,9 @@
     },
     "node_modules/is-typed-array": {
       "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
+      "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "which-typed-array": "^1.1.11"
       },
@@ -7769,13 +8371,15 @@
     },
     "node_modules/is-typedarray": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "dev": true
     },
     "node_modules/is-unicode-supported": {
       "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -7785,8 +8389,9 @@
     },
     "node_modules/is-weakref": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz",
+      "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2"
       },
@@ -7796,16 +8401,18 @@
     },
     "node_modules/is-windows": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/is-wsl": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-docker": "^2.0.0"
       },
@@ -7815,8 +8422,9 @@
     },
     "node_modules/is-wsl/node_modules/is-docker": {
       "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "is-docker": "cli.js"
       },
@@ -7829,13 +8437,15 @@
     },
     "node_modules/isarray": {
       "version": "2.0.5",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
     },
     "node_modules/isexe": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "dev": true
     },
     "node_modules/isstream": {
       "version": "0.1.2",
@@ -7845,16 +8455,18 @@
     },
     "node_modules/istanbul-lib-coverage": {
       "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz",
+      "integrity": "sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/istanbul-lib-hook": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz",
+      "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "append-transform": "^2.0.0"
       },
@@ -7864,8 +8476,9 @@
     },
     "node_modules/istanbul-lib-instrument": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.0.tgz",
+      "integrity": "sha512-x58orMzEVfzPUKqlbLd1hXCnySCxKdDKa6Rjg97CwuLLRI4g3FHTdnExu1OqffVFay6zeMW+T6/DowFLndWnIw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -7879,8 +8492,9 @@
     },
     "node_modules/istanbul-lib-instrument/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -7890,8 +8504,9 @@
     },
     "node_modules/istanbul-lib-instrument/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -7904,13 +8519,15 @@
     },
     "node_modules/istanbul-lib-instrument/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/istanbul-lib-processinfo": {
       "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz",
+      "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "archy": "^1.0.0",
         "cross-spawn": "^7.0.3",
@@ -7925,8 +8542,9 @@
     },
     "node_modules/istanbul-lib-processinfo/node_modules/p-map": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -7936,8 +8554,9 @@
     },
     "node_modules/istanbul-lib-report": {
       "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -7949,16 +8568,18 @@
     },
     "node_modules/istanbul-lib-report/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/istanbul-lib-report/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -7968,8 +8589,9 @@
     },
     "node_modules/istanbul-lib-source-maps": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -7981,8 +8603,9 @@
     },
     "node_modules/istanbul-reports": {
       "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz",
+      "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -7993,8 +8616,9 @@
     },
     "node_modules/jest-worker": {
       "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@types/node": "*",
@@ -8007,8 +8631,9 @@
     },
     "node_modules/jest-worker/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=8"
@@ -8016,8 +8641,9 @@
     },
     "node_modules/jest-worker/node_modules/supports-color": {
       "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
@@ -8031,8 +8657,9 @@
     },
     "node_modules/joi": {
       "version": "17.10.0",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.0.tgz",
+      "integrity": "sha512-hrazgRSlhzacZ69LdcKfhi3Vu13z2yFfoAzmEov3yFIJlatTdVGUW6vle1zjH8qkzdCn/qGw8rapjqsObbYXAg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@hapi/hoek": "^9.0.0",
         "@hapi/topo": "^5.0.0",
@@ -8043,8 +8670,9 @@
     },
     "node_modules/js-beautify": {
       "version": "1.14.9",
+      "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.14.9.tgz",
+      "integrity": "sha512-coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "config-chain": "^1.1.13",
         "editorconfig": "^1.0.3",
@@ -8065,12 +8693,12 @@
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
       "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
       "dev": true
-      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
+      "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -8086,8 +8714,9 @@
     },
     "node_modules/jsdom": {
       "version": "22.1.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz",
+      "integrity": "sha512-/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "abab": "^2.0.6",
         "cssstyle": "^3.0.0",
@@ -8127,8 +8756,9 @@
     },
     "node_modules/jsesc": {
       "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+      "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -8138,13 +8768,15 @@
     },
     "node_modules/json-buffer": {
       "version": "3.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
     },
     "node_modules/json-parse-even-better-errors": {
       "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/json-schema": {
@@ -8155,13 +8787,15 @@
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
     },
     "node_modules/json-stringify-safe": {
       "version": "5.0.1",
@@ -8171,8 +8805,9 @@
     },
     "node_modules/json5": {
       "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "json5": "lib/cli.js"
       },
@@ -8182,13 +8817,15 @@
     },
     "node_modules/jsonc-parser": {
       "version": "3.2.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz",
+      "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==",
+      "dev": true
     },
     "node_modules/jsonfile": {
       "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -8213,8 +8850,9 @@
     },
     "node_modules/keyv": {
       "version": "4.5.3",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz",
+      "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -8230,21 +8868,24 @@
     },
     "node_modules/kolorist": {
       "version": "1.8.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/kolorist/-/kolorist-1.8.0.tgz",
+      "integrity": "sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==",
+      "dev": true
     },
     "node_modules/lazy-ass": {
       "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
+      "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "> 0.8"
       }
     },
     "node_modules/lcov-result-merger": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/lcov-result-merger/-/lcov-result-merger-4.1.0.tgz",
+      "integrity": "sha512-31FISg2iX5I8oRY9MpIRoBvH+VYZ4D1799yFBlrupduhYoPuQEWOf6FeSvaNwIbNB/lJo5MpDPysOKvUOcgbwA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-glob": "^3.2.11",
         "through2": "^2.0.3",
@@ -8259,8 +8900,9 @@
     },
     "node_modules/levn": {
       "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -8271,8 +8913,9 @@
     },
     "node_modules/listr2": {
       "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
+      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cli-truncate": "^2.1.0",
         "colorette": "^2.0.16",
@@ -8325,8 +8968,9 @@
     },
     "node_modules/loader-runner": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=6.11.5"
@@ -8334,8 +8978,9 @@
     },
     "node_modules/loader-utils": {
       "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
+      "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "big.js": "^5.2.2",
         "emojis-list": "^3.0.0",
@@ -8347,8 +8992,9 @@
     },
     "node_modules/loader-utils/node_modules/json5": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -8358,8 +9004,9 @@
     },
     "node_modules/local-pkg": {
       "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.4.3.tgz",
+      "integrity": "sha512-SFppqq5p42fe2qcZQqqEOiVRXl+WCP1MdT6k7BDEW1j++sp5fIY+/fdRQitvKgB5BrBcmrs5m/L0v2FrU5MY1g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=14"
       },
@@ -8369,8 +9016,9 @@
     },
     "node_modules/locate-path": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -8383,12 +9031,14 @@
     },
     "node_modules/lodash": {
       "version": "4.17.21",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "dev": true
     },
     "node_modules/lodash-es": {
       "version": "4.17.21",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.21.tgz",
+      "integrity": "sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw=="
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
@@ -8399,23 +9049,27 @@
     },
     "node_modules/lodash.flattendeep": {
       "version": "4.4.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz",
+      "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==",
+      "dev": true
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
     },
     "node_modules/lodash.once": {
       "version": "4.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz",
+      "integrity": "sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==",
+      "dev": true
     },
     "node_modules/log-symbols": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "chalk": "^4.1.0",
         "is-unicode-supported": "^0.1.0"
@@ -8429,8 +9083,9 @@
     },
     "node_modules/log-symbols/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8443,8 +9098,9 @@
     },
     "node_modules/log-symbols/node_modules/chalk": {
       "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -8458,8 +9114,9 @@
     },
     "node_modules/log-symbols/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8469,21 +9126,24 @@
     },
     "node_modules/log-symbols/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/log-symbols/node_modules/has-flag": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/log-symbols/node_modules/supports-color": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8493,8 +9153,9 @@
     },
     "node_modules/log-update": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-escapes": "^4.3.0",
         "cli-cursor": "^3.1.0",
@@ -8510,8 +9171,9 @@
     },
     "node_modules/log-update/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8524,8 +9186,9 @@
     },
     "node_modules/log-update/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8535,13 +9198,15 @@
     },
     "node_modules/log-update/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/log-update/node_modules/slice-ansi": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -8556,8 +9221,9 @@
     },
     "node_modules/log-update/node_modules/wrap-ansi": {
       "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -8569,23 +9235,26 @@
     },
     "node_modules/loupe": {
       "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.6.tgz",
+      "integrity": "sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "get-func-name": "^2.0.0"
       }
     },
     "node_modules/lru-cache": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^3.0.2"
       }
     },
     "node_modules/magic-string": {
       "version": "0.30.3",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.3.tgz",
+      "integrity": "sha512-B7xGbll2fG/VjP+SWg4sX3JynwIU0mjoTc6MPpKNuIvftk6u6vqhDnk1R80b8C2GBR6ywqy+1DcKBrevBg+bmw==",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
       },
@@ -8595,8 +9264,9 @@
     },
     "node_modules/make-dir": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -8609,8 +9279,9 @@
     },
     "node_modules/make-dir/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -8620,8 +9291,9 @@
     },
     "node_modules/make-dir/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -8634,40 +9306,48 @@
     },
     "node_modules/make-dir/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/make-error": {
       "version": "1.3.6",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true
     },
     "node_modules/map-stream": {
       "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+      "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==",
       "dev": true
     },
     "node_modules/mdn-data": {
       "version": "2.0.4",
-      "dev": true,
-      "license": "CC0-1.0"
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.4.tgz",
+      "integrity": "sha512-iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA==",
+      "dev": true
     },
     "node_modules/merge-stream": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "dev": true
     },
     "node_modules/merge2": {
       "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
     },
     "node_modules/micromatch": {
       "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
+      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.2",
         "picomatch": "^2.3.1"
@@ -8678,14 +9358,16 @@
     },
     "node_modules/mime-db": {
       "version": "1.52.0",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
     "node_modules/mime-types": {
       "version": "2.1.35",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dependencies": {
         "mime-db": "1.52.0"
       },
@@ -8695,16 +9377,18 @@
     },
     "node_modules/mimic-fn": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/minimatch": {
       "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -8714,16 +9398,18 @@
     },
     "node_modules/minimist": {
       "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
       "dev": true,
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/mkdirp": {
       "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.6"
       },
@@ -8733,8 +9419,9 @@
     },
     "node_modules/mlly": {
       "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.1.tgz",
+      "integrity": "sha512-SCDs78Q2o09jiZiE2WziwVBEqXQ02XkGdUy45cbJf+BpYRIjArXRJ1Wbowxkb+NaM9DWvS3UC9GiO/6eqvQ/pg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "acorn": "^8.10.0",
         "pathe": "^1.1.1",
@@ -8744,23 +9431,26 @@
     },
     "node_modules/ms": {
       "version": "2.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+      "dev": true
     },
     "node_modules/muggle-string": {
       "version": "0.3.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.3.1.tgz",
+      "integrity": "sha512-ckmWDJjphvd/FvZawgygcUeQCxzvohjFO5RxTjj4eq8kw359gFF3E1brjfI+viLMxss5JrHTDRHZvu2/tuy0Qg==",
+      "dev": true
     },
     "node_modules/nanoid": {
       "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -8770,23 +9460,27 @@
     },
     "node_modules/natural-compare": {
       "version": "1.4.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true
     },
     "node_modules/natural-compare-lite": {
       "version": "1.4.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz",
+      "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==",
+      "dev": true
     },
     "node_modules/neo-async": {
       "version": "2.6.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==",
+      "dev": true
     },
     "node_modules/node-preload": {
       "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz",
+      "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "process-on-spawn": "^1.0.0"
       },
@@ -8796,13 +9490,15 @@
     },
     "node_modules/node-releases": {
       "version": "2.0.13",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
+      "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==",
+      "dev": true
     },
     "node_modules/nopt": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
+      "integrity": "sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "abbrev": "^1.0.0"
       },
@@ -8815,21 +9511,24 @@
     },
     "node_modules/normalize-path": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/npm-java-runner": {
       "version": "1.0.2",
-      "dev": true,
-      "license": "Apache 2"
+      "resolved": "https://registry.npmjs.org/npm-java-runner/-/npm-java-runner-1.0.2.tgz",
+      "integrity": "sha512-rbf77NAjOm9O1N/IOytA2sabV5uER03fnvNJVwSkQdqwhqsVM4E69Jchg8AdfoYatMY2GR/TmB5KXJY9G8LRYA==",
+      "dev": true
     },
     "node_modules/npm-run-path": {
       "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -8839,8 +9538,9 @@
     },
     "node_modules/nth-check": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "boolbase": "^1.0.0"
       },
@@ -8850,13 +9550,15 @@
     },
     "node_modules/nwsapi": {
       "version": "2.2.7",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz",
+      "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==",
+      "dev": true
     },
     "node_modules/nyc": {
       "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
+      "integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "@istanbuljs/load-nyc-config": "^1.0.0",
         "@istanbuljs/schema": "^0.1.2",
@@ -8895,8 +9597,9 @@
     },
     "node_modules/nyc/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -8909,8 +9612,9 @@
     },
     "node_modules/nyc/node_modules/cliui": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.0",
@@ -8919,8 +9623,9 @@
     },
     "node_modules/nyc/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -8930,13 +9635,15 @@
     },
     "node_modules/nyc/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/nyc/node_modules/find-cache-dir": {
       "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "commondir": "^1.0.1",
         "make-dir": "^3.0.2",
@@ -8951,8 +9658,9 @@
     },
     "node_modules/nyc/node_modules/find-up": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -8963,8 +9671,9 @@
     },
     "node_modules/nyc/node_modules/glob": {
       "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -8982,8 +9691,9 @@
     },
     "node_modules/nyc/node_modules/istanbul-lib-instrument": {
       "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.7.5",
         "@istanbuljs/schema": "^0.1.2",
@@ -8996,8 +9706,9 @@
     },
     "node_modules/nyc/node_modules/locate-path": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -9007,8 +9718,9 @@
     },
     "node_modules/nyc/node_modules/make-dir": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
       },
@@ -9021,8 +9733,9 @@
     },
     "node_modules/nyc/node_modules/p-limit": {
       "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -9035,8 +9748,9 @@
     },
     "node_modules/nyc/node_modules/p-locate": {
       "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -9046,8 +9760,9 @@
     },
     "node_modules/nyc/node_modules/p-map": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz",
+      "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -9057,8 +9772,9 @@
     },
     "node_modules/nyc/node_modules/pkg-dir": {
       "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -9068,16 +9784,18 @@
     },
     "node_modules/nyc/node_modules/resolve-from": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/nyc/node_modules/wrap-ansi": {
       "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -9089,13 +9807,15 @@
     },
     "node_modules/nyc/node_modules/y18n": {
       "version": "4.0.3",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true
     },
     "node_modules/nyc/node_modules/yargs": {
       "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cliui": "^6.0.0",
         "decamelize": "^1.2.0",
@@ -9115,8 +9835,9 @@
     },
     "node_modules/nyc/node_modules/yargs-parser": {
       "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.0.0",
         "decamelize": "^1.2.0"
@@ -9127,32 +9848,36 @@
     },
     "node_modules/object-assign": {
       "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/object-inspect": {
       "version": "1.12.3",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
+      "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==",
       "dev": true,
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/object-keys": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       }
     },
     "node_modules/object.assign": {
       "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz",
+      "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -9168,8 +9893,9 @@
     },
     "node_modules/object.fromentries": {
       "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz",
+      "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -9184,8 +9910,9 @@
     },
     "node_modules/object.getownpropertydescriptors": {
       "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz",
+      "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "array.prototype.reduce": "^1.0.5",
         "call-bind": "^1.0.2",
@@ -9202,8 +9929,9 @@
     },
     "node_modules/object.groupby": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz",
+      "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -9213,8 +9941,9 @@
     },
     "node_modules/object.values": {
       "version": "1.1.7",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz",
+      "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -9229,16 +9958,18 @@
     },
     "node_modules/once": {
       "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "wrappy": "1"
       }
     },
     "node_modules/onetime": {
       "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -9251,8 +9982,9 @@
     },
     "node_modules/open": {
       "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-9.1.0.tgz",
+      "integrity": "sha512-OS+QTnw1/4vrf+9hh1jc1jnYjzSG4ttTBB8UxOwAnInG3Uo4ssetzC1ihqaIHjLJnA5GGlRl6QlZXOTQhRBUvg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "default-browser": "^4.0.0",
         "define-lazy-prop": "^3.0.0",
@@ -9268,8 +10000,9 @@
     },
     "node_modules/optionator": {
       "version": "0.9.3",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz",
+      "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@aashutoshrathi/word-wrap": "^1.2.3",
         "deep-is": "^0.1.3",
@@ -9284,13 +10017,15 @@
     },
     "node_modules/ospath": {
       "version": "1.2.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz",
+      "integrity": "sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==",
+      "dev": true
     },
     "node_modules/p-limit": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -9303,8 +10038,9 @@
     },
     "node_modules/p-locate": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -9317,8 +10053,9 @@
     },
     "node_modules/p-map": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "aggregate-error": "^3.0.0"
       },
@@ -9331,16 +10068,18 @@
     },
     "node_modules/p-try": {
       "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/package-hash": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz",
+      "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "graceful-fs": "^4.1.15",
         "hasha": "^5.0.0",
@@ -9353,8 +10092,9 @@
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -9364,8 +10104,9 @@
     },
     "node_modules/parse5": {
       "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
+      "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "entities": "^4.4.0"
       },
@@ -9375,69 +10116,75 @@
     },
     "node_modules/path-exists": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path-is-absolute": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/path-key": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/path-parse": {
       "version": "1.0.7",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
     },
     "node_modules/path-type": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/pathe": {
       "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz",
+      "integrity": "sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q==",
+      "dev": true
     },
     "node_modules/pathval": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       }
     },
     "node_modules/pause-stream": {
       "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+      "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
       "dev": true,
-      "license": [
-        "MIT",
-        "Apache2"
-      ],
       "dependencies": {
         "through": "~2.3"
       }
     },
     "node_modules/pend": {
       "version": "1.2.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+      "dev": true
     },
     "node_modules/performance-now": {
       "version": "2.1.0",
@@ -9447,12 +10194,14 @@
     },
     "node_modules/picocolors": {
       "version": "1.0.0",
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "devOptional": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -9462,16 +10211,18 @@
     },
     "node_modules/pify": {
       "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/pkg-dir": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-7.0.0.tgz",
+      "integrity": "sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "find-up": "^6.3.0"
@@ -9485,8 +10236,9 @@
     },
     "node_modules/pkg-dir/node_modules/find-up": {
       "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-6.3.0.tgz",
+      "integrity": "sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "locate-path": "^7.1.0",
@@ -9501,8 +10253,9 @@
     },
     "node_modules/pkg-dir/node_modules/locate-path": {
       "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz",
+      "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "p-locate": "^6.0.0"
@@ -9516,8 +10269,9 @@
     },
     "node_modules/pkg-dir/node_modules/p-limit": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz",
+      "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "yocto-queue": "^1.0.0"
@@ -9531,8 +10285,9 @@
     },
     "node_modules/pkg-dir/node_modules/p-locate": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz",
+      "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "p-limit": "^4.0.0"
@@ -9546,8 +10301,9 @@
     },
     "node_modules/pkg-dir/node_modules/path-exists": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz",
+      "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
@@ -9555,8 +10311,9 @@
     },
     "node_modules/pkg-dir/node_modules/yocto-queue": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
+      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=12.20"
@@ -9567,8 +10324,9 @@
     },
     "node_modules/pkg-types": {
       "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
+      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "jsonc-parser": "^3.2.0",
         "mlly": "^1.2.0",
@@ -9577,6 +10335,8 @@
     },
     "node_modules/postcss": {
       "version": "8.4.28",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz",
+      "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==",
       "funding": [
         {
           "type": "opencollective",
@@ -9591,7 +10351,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.6",
         "picocolors": "^1.0.0",
@@ -9603,8 +10362,9 @@
     },
     "node_modules/postcss-selector-parser": {
       "version": "6.0.13",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz",
+      "integrity": "sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -9615,16 +10375,18 @@
     },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
+      "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/prettier": {
       "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
+      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "prettier": "bin/prettier.cjs"
       },
@@ -9637,8 +10399,9 @@
     },
     "node_modules/prettier-linter-helpers": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz",
+      "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-diff": "^1.1.2"
       },
@@ -9648,8 +10411,9 @@
     },
     "node_modules/pretty-bytes": {
       "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz",
+      "integrity": "sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -9659,8 +10423,9 @@
     },
     "node_modules/pretty-format": {
       "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.3.tgz",
+      "integrity": "sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@jest/schemas": "^29.6.3",
         "ansi-styles": "^5.0.0",
@@ -9672,8 +10437,9 @@
     },
     "node_modules/pretty-format/node_modules/ansi-styles": {
       "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
+      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -9683,21 +10449,24 @@
     },
     "node_modules/process": {
       "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.6.0"
       }
     },
     "node_modules/process-nextick-args": {
       "version": "2.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "dev": true
     },
     "node_modules/process-on-spawn": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.0.0.tgz",
+      "integrity": "sha512-1WsPDsUSMmZH5LeMLegqkPDrsGgsWwk1Exipy2hvB0o/F0ASzbpIctSCcZIK1ykJvtTJULEH+20WOFjMvGnCTg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fromentries": "^1.2.0"
       },
@@ -9707,17 +10476,20 @@
     },
     "node_modules/proto-list": {
       "version": "1.2.4",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==",
+      "dev": true
     },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
     "node_modules/ps-tree": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
+      "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "event-stream": "=3.3.4"
       },
@@ -9730,18 +10502,21 @@
     },
     "node_modules/psl": {
       "version": "1.9.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz",
+      "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==",
+      "dev": true
     },
     "node_modules/pug-error": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz",
+      "integrity": "sha512-sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ==",
+      "dev": true
     },
     "node_modules/pug-lexer": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz",
+      "integrity": "sha512-0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "character-parser": "^2.2.0",
         "is-expression": "^4.0.0",
@@ -9750,8 +10525,9 @@
     },
     "node_modules/pump": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -9759,16 +10535,18 @@
     },
     "node_modules/punycode": {
       "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz",
+      "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/q": {
       "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
+      "integrity": "sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.6.0",
         "teleport": ">=0.2.0"
@@ -9791,11 +10569,14 @@
     },
     "node_modules/querystringify": {
       "version": "2.2.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true
     },
     "node_modules/queue-microtask": {
       "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
+      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
       "dev": true,
       "funding": [
         {
@@ -9810,13 +10591,13 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/randombytes": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+      "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "safe-buffer": "^5.1.0"
@@ -9824,13 +10605,15 @@
     },
     "node_modules/react-is": {
       "version": "18.2.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
+      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
+      "dev": true
     },
     "node_modules/readable-stream": {
       "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -9843,18 +10626,21 @@
     },
     "node_modules/readable-stream/node_modules/isarray": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "dev": true
     },
     "node_modules/readable-stream/node_modules/safe-buffer": {
       "version": "5.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
     "node_modules/readdirp": {
       "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+      "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "picomatch": "^2.2.1"
       },
@@ -9864,14 +10650,16 @@
     },
     "node_modules/regenerate": {
       "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz",
+      "integrity": "sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/regenerate-unicode-properties": {
       "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "regenerate": "^1.4.2"
@@ -9882,12 +10670,14 @@
     },
     "node_modules/regenerator-runtime": {
       "version": "0.14.0",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz",
+      "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA=="
     },
     "node_modules/regenerator-transform": {
       "version": "0.15.2",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.2.tgz",
+      "integrity": "sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.8.4"
@@ -9895,8 +10685,9 @@
     },
     "node_modules/regexp.prototype.flags": {
       "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
@@ -9911,8 +10702,9 @@
     },
     "node_modules/regexpu-core": {
       "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz",
+      "integrity": "sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@babel/regjsgen": "^0.8.0",
@@ -9928,8 +10720,9 @@
     },
     "node_modules/regjsparser": {
       "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz",
+      "integrity": "sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "peer": true,
       "dependencies": {
         "jsesc": "~0.5.0"
@@ -9940,6 +10733,8 @@
     },
     "node_modules/regjsparser/node_modules/jsesc": {
       "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+      "integrity": "sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==",
       "dev": true,
       "peer": true,
       "bin": {
@@ -9948,8 +10743,9 @@
     },
     "node_modules/release-zalgo": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz",
+      "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "es6-error": "^4.0.1"
       },
@@ -9959,24 +10755,27 @@
     },
     "node_modules/request-progress": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz",
+      "integrity": "sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "throttleit": "^1.0.0"
       }
     },
     "node_modules/require-directory": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/require-from-string": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz",
+      "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=0.10.0"
@@ -9984,18 +10783,21 @@
     },
     "node_modules/require-main-filename": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true
     },
     "node_modules/requires-port": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true
     },
     "node_modules/resolve": {
       "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
@@ -10010,16 +10812,18 @@
     },
     "node_modules/resolve-from": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
@@ -10030,8 +10834,9 @@
     },
     "node_modules/reusify": {
       "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
+      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
@@ -10039,13 +10844,15 @@
     },
     "node_modules/rfdc": {
       "version": "1.3.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
+      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==",
+      "dev": true
     },
     "node_modules/rimraf": {
       "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -10058,8 +10865,9 @@
     },
     "node_modules/rimraf/node_modules/glob": {
       "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -10077,8 +10885,9 @@
     },
     "node_modules/rollup": {
       "version": "3.28.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.1.tgz",
+      "integrity": "sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "rollup": "dist/bin/rollup"
       },
@@ -10092,13 +10901,15 @@
     },
     "node_modules/rrweb-cssom": {
       "version": "0.6.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz",
+      "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==",
+      "dev": true
     },
     "node_modules/run-applescript": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-5.0.0.tgz",
+      "integrity": "sha512-XcT5rBksx1QdIhlFOCtgZkB99ZEouFZ1E2Kc2LHqNW13U3/74YGdkQRmThTwxy4QIyookibDKYZOPqX//6BlAg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "execa": "^5.0.0"
       },
@@ -10111,8 +10922,9 @@
     },
     "node_modules/run-applescript/node_modules/execa": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -10133,8 +10945,9 @@
     },
     "node_modules/run-applescript/node_modules/get-stream": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -10144,14 +10957,17 @@
     },
     "node_modules/run-applescript/node_modules/human-signals": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
     },
     "node_modules/run-parallel": {
       "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
+      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
       "dev": true,
       "funding": [
         {
@@ -10167,23 +10983,24 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
     },
     "node_modules/rxjs": {
       "version": "7.8.1",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz",
+      "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "tslib": "^2.1.0"
       }
     },
     "node_modules/safe-array-concat": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.2.0",
@@ -10199,6 +11016,8 @@
     },
     "node_modules/safe-buffer": {
       "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
       "dev": true,
       "funding": [
         {
@@ -10213,13 +11032,13 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/safe-regex-test": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz",
+      "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.1.3",
@@ -10231,13 +11050,15 @@
     },
     "node_modules/safer-buffer": {
       "version": "2.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
     },
     "node_modules/sass": {
       "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz",
+      "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
         "immutable": "^4.0.0",
@@ -10290,13 +11111,15 @@
     },
     "node_modules/sax": {
       "version": "1.2.4",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "dev": true
     },
     "node_modules/saxes": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz",
+      "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "xmlchars": "^2.2.0"
       },
@@ -10306,8 +11129,9 @@
     },
     "node_modules/schema-utils": {
       "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz",
+      "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@types/json-schema": "^7.0.9",
@@ -10325,8 +11149,9 @@
     },
     "node_modules/schema-utils/node_modules/ajv": {
       "version": "8.12.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.12.0.tgz",
+      "integrity": "sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
@@ -10341,8 +11166,9 @@
     },
     "node_modules/schema-utils/node_modules/ajv-keywords": {
       "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+      "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.3"
@@ -10353,22 +11179,25 @@
     },
     "node_modules/schema-utils/node_modules/json-schema-traverse": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/semver": {
       "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       }
     },
     "node_modules/serialize-javascript": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz",
+      "integrity": "sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "peer": true,
       "dependencies": {
         "randombytes": "^2.1.0"
@@ -10376,13 +11205,15 @@
     },
     "node_modules/set-blocking": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true
     },
     "node_modules/shebang-command": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+      "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -10392,16 +11223,18 @@
     },
     "node_modules/shebang-regex": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+      "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/side-channel": {
       "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+      "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.0",
         "get-intrinsic": "^1.0.2",
@@ -10413,33 +11246,38 @@
     },
     "node_modules/siginfo": {
       "version": "2.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
+      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==",
+      "dev": true
     },
     "node_modules/signal-exit": {
       "version": "3.0.7",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "dev": true
     },
     "node_modules/simple-swizzle": {
       "version": "0.2.2",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz",
+      "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==",
       "dependencies": {
         "is-arrayish": "^0.3.1"
       }
     },
     "node_modules/slash": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/slice-ansi": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "astral-regex": "^2.0.0",
@@ -10451,8 +11289,9 @@
     },
     "node_modules/slice-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -10465,8 +11304,9 @@
     },
     "node_modules/slice-ansi/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -10476,28 +11316,32 @@
     },
     "node_modules/slice-ansi/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/source-map": {
       "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/source-map-js": {
       "version": "1.0.2",
-      "license": "BSD-3-Clause",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/source-map-support": {
       "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -10505,8 +11349,9 @@
     },
     "node_modules/spawn-wrap": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz",
+      "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "foreground-child": "^2.0.0",
         "is-windows": "^1.0.2",
@@ -10521,8 +11366,9 @@
     },
     "node_modules/spawn-wrap/node_modules/make-dir": {
       "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "semver": "^6.0.0"
       },
@@ -10535,8 +11381,9 @@
     },
     "node_modules/split": {
       "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "through": "2"
       },
@@ -10546,8 +11393,9 @@
     },
     "node_modules/sprintf-js": {
       "version": "1.0.3",
-      "dev": true,
-      "license": "BSD-3-Clause"
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true
     },
     "node_modules/sshpk": {
       "version": "1.17.0",
@@ -10576,18 +11424,22 @@
     },
     "node_modules/stable": {
       "version": "0.1.8",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility",
+      "dev": true
     },
     "node_modules/stackback": {
       "version": "0.0.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
+      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==",
+      "dev": true
     },
     "node_modules/start-server-and-test": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.0.tgz",
+      "integrity": "sha512-UqKLw0mJbfrsG1jcRLTUlvuRi9sjNuUiDOLI42r7R5fA9dsFoywAy9DoLXNYys9B886E4RCKb+qM1Gzu96h7DQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "arg": "^5.0.2",
         "bluebird": "3.7.2",
@@ -10609,13 +11461,15 @@
     },
     "node_modules/start-server-and-test/node_modules/bluebird": {
       "version": "3.7.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==",
+      "dev": true
     },
     "node_modules/start-server-and-test/node_modules/execa": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -10636,8 +11490,9 @@
     },
     "node_modules/start-server-and-test/node_modules/get-stream": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -10647,42 +11502,48 @@
     },
     "node_modules/start-server-and-test/node_modules/human-signals": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
     },
     "node_modules/std-env": {
       "version": "3.4.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.4.3.tgz",
+      "integrity": "sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==",
+      "dev": true
     },
     "node_modules/stream-combiner": {
       "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "duplexer": "~0.1.1"
       }
     },
     "node_modules/string_decoder": {
       "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "safe-buffer": "~5.1.0"
       }
     },
     "node_modules/string_decoder/node_modules/safe-buffer": {
       "version": "5.1.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
     },
     "node_modules/string-width": {
       "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "emoji-regex": "^8.0.0",
         "is-fullwidth-code-point": "^3.0.0",
@@ -10694,8 +11555,9 @@
     },
     "node_modules/string.prototype.trim": {
       "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -10710,8 +11572,9 @@
     },
     "node_modules/string.prototype.trimend": {
       "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -10723,8 +11586,9 @@
     },
     "node_modules/string.prototype.trimstart": {
       "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.1.4",
@@ -10736,8 +11600,9 @@
     },
     "node_modules/strip-ansi": {
       "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-regex": "^5.0.1"
       },
@@ -10747,24 +11612,27 @@
     },
     "node_modules/strip-bom": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/strip-final-newline": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -10774,8 +11642,9 @@
     },
     "node_modules/strip-literal": {
       "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz",
+      "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "acorn": "^8.10.0"
       },
@@ -10785,8 +11654,9 @@
     },
     "node_modules/supports-color": {
       "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^3.0.0"
       },
@@ -10796,8 +11666,9 @@
     },
     "node_modules/supports-preserve-symlinks-flag": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -10807,8 +11678,9 @@
     },
     "node_modules/svg-to-vue": {
       "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/svg-to-vue/-/svg-to-vue-0.7.0.tgz",
+      "integrity": "sha512-Tg2nMmf3BQorYCAjxbtTkYyWPVSeox5AZUFvfy4MoWK/5tuQlnA/h3LAlTjV3sEvOC5FtUNovRSj3p784l4KOA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "svgo": "^1.3.2"
       },
@@ -10818,8 +11690,10 @@
     },
     "node_modules/svgo": {
       "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz",
+      "integrity": "sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==",
+      "deprecated": "This SVGO version is no longer supported. Upgrade to v2.x.x.",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "chalk": "^2.4.1",
         "coa": "^2.0.2",
@@ -10844,16 +11718,18 @@
     },
     "node_modules/svgo/node_modules/argparse": {
       "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
     "node_modules/svgo/node_modules/js-yaml": {
       "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -10864,13 +11740,15 @@
     },
     "node_modules/symbol-tree": {
       "version": "3.2.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true
     },
     "node_modules/synckit": {
       "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.8.5.tgz",
+      "integrity": "sha512-L1dapNV6vu2s/4Sputv8xGsCdAVlb5nRDMFU/E27D44l5U6cw1g0dGd45uLc+OXjNMmF4ntiMdCimzcjFKQI8Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@pkgr/utils": "^2.3.1",
         "tslib": "^2.5.0"
@@ -10884,8 +11762,9 @@
     },
     "node_modules/tapable": {
       "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
+      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=6"
@@ -10893,8 +11772,9 @@
     },
     "node_modules/terser": {
       "version": "5.19.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
+      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "peer": true,
       "dependencies": {
         "@jridgewell/source-map": "^0.3.3",
@@ -10911,8 +11791,9 @@
     },
     "node_modules/terser-webpack-plugin": {
       "version": "5.3.9",
+      "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz",
+      "integrity": "sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.17",
@@ -10945,8 +11826,9 @@
     },
     "node_modules/terser-webpack-plugin/node_modules/schema-utils": {
       "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -10963,14 +11845,16 @@
     },
     "node_modules/terser/node_modules/commander": {
       "version": "2.20.3",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true
     },
     "node_modules/test-exclude": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -10982,8 +11866,9 @@
     },
     "node_modules/test-exclude/node_modules/glob": {
       "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -11001,23 +11886,27 @@
     },
     "node_modules/text-table": {
       "version": "0.2.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "dev": true
     },
     "node_modules/throttleit": {
       "version": "1.0.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
+      "integrity": "sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==",
+      "dev": true
     },
     "node_modules/through": {
       "version": "2.3.8",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "dev": true
     },
     "node_modules/through2": {
       "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+      "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
@@ -11025,29 +11914,33 @@
     },
     "node_modules/tinybench": {
       "version": "2.5.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.0.tgz",
+      "integrity": "sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==",
+      "dev": true
     },
     "node_modules/tinypool": {
       "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.7.0.tgz",
+      "integrity": "sha512-zSYNUlYSMhJ6Zdou4cJwo/p7w5nmAH17GRfU/ui3ctvjXFErXXkruT4MWW6poDeXgCaIBlGLrfU6TbTXxyGMww==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/tinyspy": {
       "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.1.1.tgz",
+      "integrity": "sha512-XPJL2uSzcOyBMky6OFrusqWlzfFrXtE0hPuMgW8A2HmaqrPo4ZQHRN/V0QXN3FSjKxpsbRrFc5LI7KOwBsT1/w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
     },
     "node_modules/titleize": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/titleize/-/titleize-3.0.0.tgz",
+      "integrity": "sha512-KxVu8EYHDPBdUYdKZdKtU2aj2XfEx9AfjXxE/Aj0vT06w2icA09Vus1rh6eSu1y01akYg6BjIK/hxyLJINoMLQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -11057,8 +11950,9 @@
     },
     "node_modules/tmp": {
       "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
+      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "rimraf": "^3.0.0"
       },
@@ -11068,16 +11962,18 @@
     },
     "node_modules/to-fast-properties": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+      "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
+      "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "is-number": "^7.0.0"
       },
@@ -11087,8 +11983,9 @@
     },
     "node_modules/tough-cookie": {
       "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz",
+      "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "psl": "^1.1.33",
         "punycode": "^2.1.1",
@@ -11101,16 +11998,18 @@
     },
     "node_modules/tough-cookie/node_modules/universalify": {
       "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4.0.0"
       }
     },
     "node_modules/tr46": {
       "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz",
+      "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "punycode": "^2.3.0"
       },
@@ -11120,8 +12019,9 @@
     },
     "node_modules/ts-api-utils": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.2.tgz",
+      "integrity": "sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=16.13.0"
       },
@@ -11131,8 +12031,9 @@
     },
     "node_modules/ts-node": {
       "version": "10.9.1",
+      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
+      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@cspotcode/source-map-support": "^0.8.0",
         "@tsconfig/node10": "^1.0.7",
@@ -11173,13 +12074,15 @@
     },
     "node_modules/ts-node/node_modules/arg": {
       "version": "4.1.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
+      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
+      "dev": true
     },
     "node_modules/tsconfig-paths": {
       "version": "3.14.2",
+      "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz",
+      "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/json5": "^0.0.29",
         "json5": "^1.0.2",
@@ -11189,8 +12092,9 @@
     },
     "node_modules/tsconfig-paths/node_modules/json5": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "minimist": "^1.2.0"
       },
@@ -11200,21 +12104,25 @@
     },
     "node_modules/tsconfig-paths/node_modules/strip-bom": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+      "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/tslib": {
       "version": "2.6.2",
-      "dev": true,
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
+      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==",
+      "dev": true
     },
     "node_modules/tslint": {
       "version": "6.1.3",
+      "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz",
+      "integrity": "sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==",
+      "deprecated": "TSLint has been deprecated in favor of ESLint. Please see https://github.com/palantir/tslint/issues/4534 for more information.",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@babel/code-frame": "^7.0.0",
         "builtin-modules": "^1.1.1",
@@ -11242,21 +12150,24 @@
     },
     "node_modules/tslint/node_modules/argparse": {
       "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
     },
     "node_modules/tslint/node_modules/commander": {
       "version": "2.20.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+      "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
+      "dev": true
     },
     "node_modules/tslint/node_modules/glob": {
       "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -11274,8 +12185,9 @@
     },
     "node_modules/tslint/node_modules/js-yaml": {
       "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -11286,21 +12198,24 @@
     },
     "node_modules/tslint/node_modules/semver": {
       "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver"
       }
     },
     "node_modules/tslint/node_modules/tslib": {
       "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
     },
     "node_modules/tsutils": {
       "version": "2.29.0",
+      "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
+      "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tslib": "^1.8.1"
       },
@@ -11310,8 +12225,9 @@
     },
     "node_modules/tsutils/node_modules/tslib": {
       "version": "1.14.1",
-      "dev": true,
-      "license": "0BSD"
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "dev": true
     },
     "node_modules/tunnel-agent": {
       "version": "0.6.0",
@@ -11333,8 +12249,9 @@
     },
     "node_modules/type-check": {
       "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
+      "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -11344,16 +12261,18 @@
     },
     "node_modules/type-detect": {
       "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/type-fest": {
       "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
-      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -11363,8 +12282,9 @@
     },
     "node_modules/typed-array-buffer": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz",
+      "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "get-intrinsic": "^1.2.1",
@@ -11376,8 +12296,9 @@
     },
     "node_modules/typed-array-byte-length": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz",
+      "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
@@ -11393,8 +12314,9 @@
     },
     "node_modules/typed-array-byte-offset": {
       "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz",
+      "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
@@ -11411,8 +12333,9 @@
     },
     "node_modules/typed-array-length": {
       "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz",
+      "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "for-each": "^0.3.3",
@@ -11424,16 +12347,18 @@
     },
     "node_modules/typedarray-to-buffer": {
       "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-typedarray": "^1.0.0"
       }
     },
     "node_modules/typescript": {
       "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.1.6.tgz",
+      "integrity": "sha512-zaWCozRZ6DLEWAWFrVDz1H6FVXzUSfTy5FUMWsQlU8Ym5JP9eO4xkTIROFCQvhQf61z6O/G6ugw3SgAnvvm+HA==",
       "dev": true,
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -11444,13 +12369,15 @@
     },
     "node_modules/ufo": {
       "version": "1.3.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.3.0.tgz",
+      "integrity": "sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==",
+      "dev": true
     },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
+      "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "call-bind": "^1.0.2",
         "has-bigints": "^1.0.2",
@@ -11463,8 +12390,9 @@
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=4"
@@ -11472,8 +12400,9 @@
     },
     "node_modules/unicode-match-property-ecmascript": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz",
+      "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "unicode-canonical-property-names-ecmascript": "^2.0.0",
@@ -11485,8 +12414,9 @@
     },
     "node_modules/unicode-match-property-value-ecmascript": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=4"
@@ -11494,8 +12424,9 @@
     },
     "node_modules/unicode-property-aliases-ecmascript": {
       "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz",
+      "integrity": "sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "engines": {
         "node": ">=4"
@@ -11503,16 +12434,18 @@
     },
     "node_modules/universalify": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
+      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 10.0.0"
       }
     },
     "node_modules/unplugin": {
       "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.4.0.tgz",
+      "integrity": "sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "acorn": "^8.9.0",
         "chokidar": "^3.5.3",
@@ -11522,8 +12455,9 @@
     },
     "node_modules/unplugin-icons": {
       "version": "0.15.3",
+      "resolved": "https://registry.npmjs.org/unplugin-icons/-/unplugin-icons-0.15.3.tgz",
+      "integrity": "sha512-YWgJqv5AahrokeOnta8uX/m1damZA6Rf6zPClgHg2Fa/45iyOe3Lj+Wn/Ba+CSsq9yBffn17YfKfJNyWCNZPvw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@antfu/install-pkg": "^0.1.1",
         "@antfu/utils": "^0.7.2",
@@ -11559,8 +12493,9 @@
     },
     "node_modules/unplugin-vue-components": {
       "version": "0.24.1",
+      "resolved": "https://registry.npmjs.org/unplugin-vue-components/-/unplugin-vue-components-0.24.1.tgz",
+      "integrity": "sha512-T3A8HkZoIE1Cja95xNqolwza0yD5IVlgZZ1PVAGvVCx8xthmjsv38xWRCtHtwl+rvZyL9uif42SRkDGw9aCfMA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@antfu/utils": "^0.7.2",
         "@rollup/pluginutils": "^5.0.2",
@@ -11595,16 +12530,18 @@
     },
     "node_modules/unplugin-vue-components/node_modules/brace-expansion": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0"
       }
     },
     "node_modules/unplugin-vue-components/node_modules/minimatch": {
       "version": "7.4.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz",
+      "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -11617,19 +12554,23 @@
     },
     "node_modules/unquote": {
       "version": "1.1.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz",
+      "integrity": "sha512-vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg==",
+      "dev": true
     },
     "node_modules/untildify": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz",
+      "integrity": "sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/update-browserslist-db": {
       "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
       "dev": true,
       "funding": [
         {
@@ -11645,7 +12586,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "escalade": "^3.1.1",
         "picocolors": "^1.0.0"
@@ -11659,16 +12599,18 @@
     },
     "node_modules/uri-js": {
       "version": "4.4.1",
+      "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
+      "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
     },
     "node_modules/url-parse": {
       "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "querystringify": "^2.1.1",
         "requires-port": "^1.0.0"
@@ -11676,13 +12618,15 @@
     },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "dev": true
     },
     "node_modules/util.promisify": {
       "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
+      "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "define-properties": "^1.1.3",
         "es-abstract": "^1.17.2",
@@ -11695,16 +12639,18 @@
     },
     "node_modules/uuid": {
       "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
       }
     },
     "node_modules/v8-compile-cache-lib": {
       "version": "3.0.1",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
+      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
+      "dev": true
     },
     "node_modules/verror": {
       "version": "1.10.0",
@@ -11728,8 +12674,9 @@
     },
     "node_modules/vite": {
       "version": "4.4.9",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz",
+      "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "esbuild": "^0.18.10",
         "postcss": "^8.4.27",
@@ -11782,8 +12729,9 @@
     },
     "node_modules/vite-node": {
       "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.3.tgz",
+      "integrity": "sha512-+0TzJf1g0tYXj6tR2vEyiA42OPq68QkRZCu/ERSo2PtsDJfBpDyEfuKbRvLmZqi/CgC7SCBtyC+WjTGNMRIaig==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
         "debug": "^4.3.4",
@@ -11804,8 +12752,9 @@
     },
     "node_modules/vite-plugin-istanbul": {
       "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/vite-plugin-istanbul/-/vite-plugin-istanbul-5.0.0.tgz",
+      "integrity": "sha512-Tg9zDmm/u4SdEDFbEWHBz7mmFe7jhLRmArA2XCmw5yydEFCARU9r4TxqFFnBFWCL63D9A7XA7VELulOO5T5o/g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@istanbuljs/load-nyc-config": "^1.1.0",
         "espree": "^9.6.1",
@@ -11819,8 +12768,9 @@
     },
     "node_modules/vite-plugin-istanbul/node_modules/istanbul-lib-instrument": {
       "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/core": "^7.12.3",
         "@babel/parser": "^7.14.7",
@@ -11834,8 +12784,9 @@
     },
     "node_modules/vitest": {
       "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.3.tgz",
+      "integrity": "sha512-7+VA5Iw4S3USYk+qwPxHl8plCMhA5rtfwMjgoQXMT7rO5ldWcdsdo3U1QD289JgglGK4WeOzgoLTsGFu6VISyQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/chai": "^4.3.5",
         "@types/chai-subset": "^1.3.3",
@@ -11910,8 +12861,9 @@
     },
     "node_modules/vls": {
       "version": "0.8.5",
+      "resolved": "https://registry.npmjs.org/vls/-/vls-0.8.5.tgz",
+      "integrity": "sha512-61kbdO2COZWBMC4wq59QfDdev9ruXd0226f57DFJTFpFXv85S+qnHakQlAmbSYFFLGKcx95HB2UjnuQh4YRwFA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "eslint": "^8.34.0",
         "eslint-plugin-vue": "^9.9.0",
@@ -11929,8 +12881,9 @@
     },
     "node_modules/vls/node_modules/prettier": {
       "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "prettier": "bin-prettier.js"
       },
@@ -11943,8 +12896,9 @@
     },
     "node_modules/vls/node_modules/typescript": {
       "version": "4.9.5",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
+      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
       "dev": true,
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -11954,9 +12908,9 @@
       }
     },
     "node_modules/volar-service-vetur": {
-      "version": "0.0.13",
-      "resolved": "https://registry.npmjs.org/volar-service-vetur/-/volar-service-vetur-0.0.13.tgz",
-      "integrity": "sha512-1VVfl3u2kjVzcD2T1nGF0f25BZNHFmlkfri7CoFiHi0yEUot4Pk8ruVzTKlN+wXlM9AoJYt2Fo+HgfCqpuV2Ag==",
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/volar-service-vetur/-/volar-service-vetur-0.0.11.tgz",
+      "integrity": "sha512-ahjOhXZmIZESMLWKrmxyhZvyvC3niSm0gjmSnZquy+UXHPSqHW0I2JVMTCQ2gB26ZadE2D8Kao7UbcgphSB+8w==",
       "dev": true,
       "dependencies": {
         "vls": "^0.8.2",
@@ -11973,8 +12927,9 @@
     },
     "node_modules/vscode-html-languageservice": {
       "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.7.tgz",
+      "integrity": "sha512-jX+7/kUXrdOaRT8vqYR/jLxrGDib+Far8I7n/A6apuEl88k+mhIHZPwc6ezuLeiCKUCaLG4b0dqFwjVa7QL3/w==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.16",
         "vscode-languageserver-textdocument": "^1.0.8",
@@ -11984,22 +12939,26 @@
     },
     "node_modules/vscode-languageserver-textdocument": {
       "version": "1.0.8",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.8.tgz",
+      "integrity": "sha512-1bonkGqQs5/fxGT5UchTgjGVnfysL0O8v1AYMBjqTbWQTFn721zaPGDYFkOKtfDgFiSgXM3KwaG3FMGfW4Ed9Q==",
+      "dev": true
     },
     "node_modules/vscode-languageserver-types": {
       "version": "3.17.3",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz",
+      "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==",
+      "dev": true
     },
     "node_modules/vscode-uri": {
       "version": "3.0.7",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.7.tgz",
+      "integrity": "sha512-eOpPHogvorZRobNqJGhapa0JdwaxpjVvyBp0QIUMRMSf8ZAlqOdEquKuRmw9Qwu0qXtJIWqFtMkmvJjUZmMjVA==",
+      "dev": true
     },
     "node_modules/vue": {
       "version": "3.3.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.3.4.tgz",
+      "integrity": "sha512-VTyEYn3yvIeY1Py0WaYGZsXnz3y5UnGi62GjVEqvEGPl6nxbOrCXbVOTQWBEJUqAyTUk2uJ5JLVnYJ6ZzGbrSw==",
       "dependencies": {
         "@vue/compiler-dom": "3.3.4",
         "@vue/compiler-sfc": "3.3.4",
@@ -12010,13 +12969,15 @@
     },
     "node_modules/vue-component-type-helpers": {
       "version": "1.8.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/vue-component-type-helpers/-/vue-component-type-helpers-1.8.4.tgz",
+      "integrity": "sha512-6bnLkn8O0JJyiFSIF0EfCogzeqNXpnjJ0vW/SZzNHfe6sPx30lTtTXlE5TFs2qhJlAtDFybStVNpL73cPe3OMQ==",
+      "dev": true
     },
     "node_modules/vue-eslint-parser": {
       "version": "9.3.1",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.3.1.tgz",
+      "integrity": "sha512-Clr85iD2XFZ3lJ52/ppmUDG/spxQu6+MAeHXjjyI4I1NUYZ9xmenQp4N0oaHJhrA8OOxltCVxMRfANGa70vU0g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "debug": "^4.3.4",
         "eslint-scope": "^7.1.1",
@@ -12038,8 +12999,9 @@
     },
     "node_modules/vue-eslint-parser/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -12049,8 +13011,9 @@
     },
     "node_modules/vue-eslint-parser/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -12063,12 +13026,14 @@
     },
     "node_modules/vue-eslint-parser/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/vue-router": {
       "version": "4.2.4",
-      "license": "MIT",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.4.tgz",
+      "integrity": "sha512-9PISkmaCO02OzPVOMq2w82ilty6+xJmQrarYZDkjZBfl4RvYAlt4PKnEX21oW4KTtWfa9OuO/b3qk1Od3AEdCQ==",
       "dependencies": {
         "@vue/devtools-api": "^6.5.0"
       },
@@ -12081,8 +13046,9 @@
     },
     "node_modules/vue-svg-loader": {
       "version": "0.16.0",
+      "resolved": "https://registry.npmjs.org/vue-svg-loader/-/vue-svg-loader-0.16.0.tgz",
+      "integrity": "sha512-2RtFXlTCYWm8YAEO2qAOZ2SuIF2NvLutB5muc3KDYoZq5ZeCHf8ggzSan3ksbbca7CJ/Aw57ZnDF4B7W/AkGtw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "loader-utils": "^1.2.3",
         "svg-to-vue": "^0.7.0"
@@ -12093,8 +13059,9 @@
     },
     "node_modules/vue-template-compiler": {
       "version": "2.7.14",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.14.tgz",
+      "integrity": "sha512-zyA5Y3ArvVG0NacJDkkzJuPQDF8RFeRlzV2vLeSnhSpieO6LK2OVbdLPi5MPPs09Ii+gMO8nY4S3iKQxBxDmWQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "de-indent": "^1.0.2",
         "he": "^1.2.0"
@@ -12102,12 +13069,14 @@
     },
     "node_modules/vue-the-mask": {
       "version": "0.11.1",
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/vue-the-mask/-/vue-the-mask-0.11.1.tgz",
+      "integrity": "sha512-UquSfnSWejD0zAfcD+3jJ1chUAkOAyoxya9Lxh9acCRtrlmGcAIvd0cQYraWqKenbuZJUdum+S174atv2AuEHQ=="
     },
     "node_modules/vue-tsc": {
       "version": "1.8.8",
+      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.8.tgz",
+      "integrity": "sha512-bSydNFQsF7AMvwWsRXD7cBIXaNs/KSjvzWLymq/UtKE36697sboX4EccSHFVxvgdBlI1frYPc/VMKJNB7DFeDQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@vue/language-core": "1.8.8",
         "@vue/typescript": "1.8.8",
@@ -12122,8 +13091,9 @@
     },
     "node_modules/vue-tsc/node_modules/lru-cache": {
       "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "yallist": "^4.0.0"
       },
@@ -12133,8 +13103,9 @@
     },
     "node_modules/vue-tsc/node_modules/semver": {
       "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "lru-cache": "^6.0.0"
       },
@@ -12147,13 +13118,15 @@
     },
     "node_modules/vue-tsc/node_modules/yallist": {
       "version": "4.0.0",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
     },
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
+      "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "xml-name-validator": "^4.0.0"
       },
@@ -12163,8 +13136,9 @@
     },
     "node_modules/wait-on": {
       "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.0.1.tgz",
+      "integrity": "sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "axios": "^0.27.2",
         "joi": "^17.7.0",
@@ -12181,8 +13155,9 @@
     },
     "node_modules/wait-on/node_modules/axios": {
       "version": "0.27.2",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
+      "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.14.9",
         "form-data": "^4.0.0"
@@ -12190,8 +13165,9 @@
     },
     "node_modules/watchpack": {
       "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz",
+      "integrity": "sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
@@ -12203,16 +13179,18 @@
     },
     "node_modules/webidl-conversions": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/webpack": {
       "version": "5.88.2",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.88.2.tgz",
+      "integrity": "sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.3",
@@ -12258,21 +13236,24 @@
     },
     "node_modules/webpack-sources": {
       "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
+      "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.13.0"
       }
     },
     "node_modules/webpack-virtual-modules": {
       "version": "0.5.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.5.0.tgz",
+      "integrity": "sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==",
+      "dev": true
     },
     "node_modules/webpack/node_modules/eslint-scope": {
       "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
+      "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "peer": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
@@ -12284,8 +13265,9 @@
     },
     "node_modules/webpack/node_modules/estraverse": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+      "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "peer": true,
       "engines": {
         "node": ">=4.0"
@@ -12293,8 +13275,9 @@
     },
     "node_modules/webpack/node_modules/schema-utils": {
       "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz",
+      "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==",
       "dev": true,
-      "license": "MIT",
       "peer": true,
       "dependencies": {
         "@types/json-schema": "^7.0.8",
@@ -12311,8 +13294,9 @@
     },
     "node_modules/whatwg-encoding": {
       "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
+      "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "iconv-lite": "0.6.3"
       },
@@ -12322,16 +13306,18 @@
     },
     "node_modules/whatwg-mimetype": {
       "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
+      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/whatwg-url": {
       "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz",
+      "integrity": "sha512-Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "tr46": "^4.1.1",
         "webidl-conversions": "^7.0.0"
@@ -12342,8 +13328,9 @@
     },
     "node_modules/which": {
       "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -12356,8 +13343,9 @@
     },
     "node_modules/which-boxed-primitive": {
       "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz",
+      "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "is-bigint": "^1.0.1",
         "is-boolean-object": "^1.1.0",
@@ -12371,13 +13359,15 @@
     },
     "node_modules/which-module": {
       "version": "2.0.1",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+      "dev": true
     },
     "node_modules/which-typed-array": {
       "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
+      "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
@@ -12394,8 +13384,9 @@
     },
     "node_modules/why-is-node-running": {
       "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
+      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "siginfo": "^2.0.0",
         "stackback": "0.0.2"
@@ -12409,8 +13400,9 @@
     },
     "node_modules/wiremock": {
       "version": "2.35.0",
+      "resolved": "https://registry.npmjs.org/wiremock/-/wiremock-2.35.0.tgz",
+      "integrity": "sha512-SvbkyD9jZOvjwlPxwn+jLf0AIFXXYSTwHQwR9Qyvv3JVJeskdfeRFAuUUcCZ8MFCH1yRfqaLO35qmoShQ012OA==",
       "dev": true,
-      "license": "Apache 2",
       "dependencies": {
         "npm-java-runner": "^1.0.2"
       },
@@ -12420,8 +13412,9 @@
     },
     "node_modules/wrap-ansi": {
       "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.0.0",
         "string-width": "^4.1.0",
@@ -12436,8 +13429,9 @@
     },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
       "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-convert": "^2.0.1"
       },
@@ -12450,8 +13444,9 @@
     },
     "node_modules/wrap-ansi/node_modules/color-convert": {
       "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "color-name": "~1.1.4"
       },
@@ -12461,18 +13456,21 @@
     },
     "node_modules/wrap-ansi/node_modules/color-name": {
       "version": "1.1.4",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
     },
     "node_modules/wrappy": {
       "version": "1.0.2",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
+      "dev": true
     },
     "node_modules/write-file-atomic": {
       "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "is-typedarray": "^1.0.0",
@@ -12482,8 +13480,9 @@
     },
     "node_modules/ws": {
       "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10.0.0"
       },
@@ -12502,42 +13501,48 @@
     },
     "node_modules/xml-name-validator": {
       "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz",
+      "integrity": "sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=12"
       }
     },
     "node_modules/xmlchars": {
       "version": "2.2.0",
-      "dev": true,
-      "license": "MIT"
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true
     },
     "node_modules/xtend": {
       "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.4"
       }
     },
     "node_modules/y18n": {
       "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/yallist": {
       "version": "3.1.1",
-      "dev": true,
-      "license": "ISC"
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true
     },
     "node_modules/yargs": {
       "version": "16.2.0",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
+      "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "cliui": "^7.0.2",
         "escalade": "^3.1.1",
@@ -12553,16 +13558,18 @@
     },
     "node_modules/yargs-parser": {
       "version": "20.2.9",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
+      "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
       "dev": true,
-      "license": "ISC",
       "engines": {
         "node": ">=10"
       }
     },
     "node_modules/yauzl": {
       "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
+      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "buffer-crc32": "~0.2.3",
         "fd-slicer": "~1.1.0"
@@ -12570,16 +13577,18 @@
     },
     "node_modules/yn": {
       "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
+      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
     "node_modules/yocto-queue": {
       "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
+      "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },

From e230dc752c93a846364bc47b79f95e671c911965 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 21 Sep 2023 13:19:38 -0700
Subject: [PATCH 154/313] Added javadoc comment as per requested by SonarCloud

---
 .../ca/bc/gov/app/controller/client/ClientController.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
index be5cdc4c71..9342f7fa4a 100644
--- a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
+++ b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
@@ -77,6 +77,12 @@ public Flux<ClientNameCodeDto> listClientContactTypeCodes(
         .listClientContactTypeCodes(page, size);
   }
 
+  /**
+   * Retrieve a Flux of ClientLookUpDto objects by searching for clients with a specific name.
+   *
+   * @param name The name to search for.
+   * @return A Flux of ClientLookUpDto objects that match the given name.
+   */
   @GetMapping(value = "/name/{name}")
   public Flux<ClientLookUpDto> findByClientName(
       @PathVariable String name

From 1a32b112fe90c08265170b462643aa125fdc2448 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 21 Sep 2023 12:03:03 -0300
Subject: [PATCH 155/313] docs: improve comment

---
 frontend/src/components/DataFetcher.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/DataFetcher.vue b/frontend/src/components/DataFetcher.vue
index fa553e268a..1036c40ea5 100644
--- a/frontend/src/components/DataFetcher.vue
+++ b/frontend/src/components/DataFetcher.vue
@@ -57,7 +57,7 @@ watch(
       const curRequestId = requestCounter.value
       // const curUrl = props.url
       fetch().then(() => {
-        // Block the response from old request when a newer one was already responded.
+        // Discard the response from old request when a newer one was already responded.
         if (curRequestId >= lastUpdateRequestId.value) {
           content.value = response.value
           lastUpdateRequestId.value = curRequestId

From 94651cef90751d5a2e5fb445d0ca70295e861b3d Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 22 Sep 2023 09:37:46 -0300
Subject: [PATCH 156/313] feat: adjust header logo and buttons

---
 frontend/public/img/BCID_H_rgb_rev.svg        |  26 +++++
 frontend/public/img/logo-vertical 1.svg       |  61 +++++++++++
 frontend/public/img/logo1.svg                 | 101 ------------------
 frontend/src/assets/styles/global.scss        |   2 +-
 .../src/components/MainHeaderComponent.vue    |   9 +-
 5 files changed, 93 insertions(+), 106 deletions(-)
 create mode 100644 frontend/public/img/BCID_H_rgb_rev.svg
 create mode 100644 frontend/public/img/logo-vertical 1.svg
 delete mode 100644 frontend/public/img/logo1.svg

diff --git a/frontend/public/img/BCID_H_rgb_rev.svg b/frontend/public/img/BCID_H_rgb_rev.svg
new file mode 100644
index 0000000000..8b09cf137d
--- /dev/null
+++ b/frontend/public/img/BCID_H_rgb_rev.svg
@@ -0,0 +1,26 @@
+<svg width="121" height="32" viewBox="0 0 121 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="BCID_H_rgb_rev">
+<g id="g12">
+<path id="path14" d="M6.69801 26.7745C14.3022 26.7745 24.8211 31.0906 32.4536 31.0906C37.9001 31.0906 43.2148 29.6253 46.2398 27.4678C46.4511 26.2008 46.5628 24.8999 46.5628 23.5724C46.5628 10.6893 36.2022 0.245489 23.422 0.245489C10.6416 0.245489 0.28125 10.6893 0.28125 23.5724C0.28125 24.8845 0.390425 26.1706 0.597021 27.4239C1.43101 27.2682 4.26703 26.7745 6.69801 26.7745Z" fill="white"/>
+<path id="path16" d="M112.246 31.3456H58.7188V32H112.246V31.3456Z" fill="#EFA20F"/>
+<path id="path18" d="M61.4278 13.3697C61.4278 13.9026 61.4603 14.6573 61.7699 14.9831C62.0798 15.3235 62.5689 15.3974 63.0578 15.3974C64.5081 15.3974 65.6164 14.8056 65.6164 13.3254C65.6164 12.1561 64.9645 10.7943 62.3731 10.7943C61.4931 10.7943 61.4278 10.8831 61.4278 11.1791V13.3697ZM61.4278 9.93569C61.4278 10.3505 61.444 10.3798 62.2753 10.3505C63.9376 10.291 64.8342 9.84686 64.8342 8.45567C64.8342 7.00515 63.6441 6.45745 62.4059 6.45745C62.047 6.45745 61.8025 6.48711 61.6561 6.54627C61.4931 6.59069 61.4278 6.66494 61.4278 6.9309V9.93569ZM60.0913 7.96731C60.0913 6.87208 60.0147 6.58194 59.2814 6.52244L58.7712 6.48712C58.688 6.42058 58.7115 6.12393 58.7875 6.11707C59.6672 6.03802 60.7759 5.99875 62.2916 5.99875C63.3184 5.99875 64.2963 6.07265 65.03 6.41304C65.7307 6.72392 66.2686 7.31586 66.2686 8.2631C66.2686 9.329 65.5837 9.8767 64.6059 10.291C64.6059 10.439 64.7366 10.4836 64.9157 10.5129C65.7957 10.6612 67.0995 11.4011 67.0995 12.9849C67.0995 14.7019 65.698 15.8564 62.7642 15.8564C62.2916 15.8564 61.4931 15.8119 60.8084 15.8119C60.0913 15.8119 59.5372 15.8419 58.9342 15.8564C58.8364 15.8119 58.8037 15.5752 58.9015 15.4862L59.195 15.4418C60.0586 15.3086 60.0913 15.1458 60.0913 13.5918V7.96731Z" fill="white"/>
+<path id="path20" d="M78.4275 9.42403C78.4275 8.08394 78.3996 7.86907 77.5783 7.80597L77.2301 7.78059C77.1464 7.73001 77.1747 7.50246 77.258 7.46439C77.9541 7.4896 78.4275 7.50246 79.012 7.50246C79.5691 7.50246 80.0423 7.4896 80.7383 7.46439C80.8221 7.50246 80.8497 7.73001 80.7661 7.78059L80.4183 7.80597C79.5967 7.86907 79.5691 8.08394 79.5691 9.42403V13.9251C79.5691 15.2652 79.5967 15.4422 80.4183 15.5308L80.7661 15.5686C80.8497 15.6191 80.8221 15.8465 80.7383 15.8848C80.0423 15.8594 79.5691 15.8465 79.012 15.8465C78.4275 15.8465 77.9541 15.8594 77.258 15.8848C77.1747 15.8465 77.1464 15.6444 77.2301 15.5686L77.5783 15.5308C78.3996 15.4422 78.4275 15.2652 78.4275 13.9251V9.42403Z" fill="white"/>
+<path id="path22" d="M86.152 13.9505C86.152 15.2777 86.1778 15.4674 86.9346 15.5308L87.3519 15.5686C87.43 15.6191 87.4041 15.8465 87.326 15.8848C86.5825 15.8594 86.139 15.8465 85.617 15.8465C85.0954 15.8465 84.6388 15.8594 83.8043 15.8848C83.7259 15.8465 83.6997 15.632 83.8043 15.5686L84.2738 15.5308C85.0173 15.4674 85.0821 15.2777 85.0821 13.9505V8.29879C85.0821 7.90697 85.0821 7.89445 84.6911 7.89445H83.9737C83.4129 7.89445 82.6955 7.91966 82.3693 8.21049C82.0564 8.48862 81.9258 8.76676 81.7826 9.08279C81.6779 9.15858 81.4956 9.09531 81.4434 8.99413C81.6517 8.42552 81.8477 7.61632 81.9387 7.11063C81.9784 7.08543 82.1478 7.07257 82.1866 7.11063C82.265 7.51498 82.6955 7.50246 83.2957 7.50246H88.5779C89.2823 7.50246 89.3995 7.47725 89.5953 7.14853C89.6608 7.12315 89.8042 7.13584 89.8302 7.18625C89.6866 7.7048 89.5953 8.72886 89.6344 9.108C89.5823 9.20917 89.3607 9.20917 89.2955 9.13338C89.2564 8.81717 89.1651 8.34955 88.9693 8.21049C88.6694 7.99528 88.1739 7.89445 87.4563 7.89445H86.5303C86.139 7.89445 86.152 7.90697 86.152 8.32418V13.9505Z" fill="white"/>
+<path id="path24" d="M91.7418 9.42403C91.7418 8.08394 91.7139 7.86907 90.8926 7.80597L90.5444 7.78059C90.4611 7.73001 90.489 7.50246 90.5723 7.46439C91.2684 7.4896 91.7418 7.50246 92.3265 7.50246C92.8834 7.50246 93.3565 7.4896 94.0526 7.46439C94.1363 7.50246 94.1642 7.73001 94.0808 7.78059L93.7322 7.80597C92.911 7.86907 92.8834 8.08394 92.8834 9.42403V13.9251C92.8834 15.2652 92.911 15.4422 93.7322 15.5308L94.0808 15.5686C94.1642 15.6191 94.1363 15.8465 94.0526 15.8848C93.3565 15.8594 92.8834 15.8465 92.3265 15.8465C91.7418 15.8465 91.2684 15.8594 90.5723 15.8848C90.489 15.8465 90.4611 15.6444 90.5444 15.5686L90.8926 15.5308C91.7139 15.4422 91.7418 15.2652 91.7418 13.9251V9.42403Z" fill="white"/>
+<path id="path26" d="M97.9799 16.0139C96.7366 16.0139 95.9523 15.6852 95.6711 15.5463C95.4935 15.2682 95.3011 14.3705 95.2715 13.7763C95.3455 13.6877 95.5675 13.6625 95.6267 13.7382C95.8488 14.3832 96.4556 15.6219 98.1723 15.6219C99.4155 15.6219 100.022 14.9266 100.022 14.168C100.022 13.6119 99.8889 12.9925 98.8085 12.398L97.4028 11.6142C96.663 11.197 95.8044 10.4762 95.8044 9.43966C95.8044 8.23864 96.8994 7.26499 98.8235 7.26499C99.282 7.26499 99.8149 7.34095 100.2 7.42944C100.392 7.48002 100.599 7.50523 100.717 7.50523C100.851 7.80892 100.984 8.51677 100.984 9.04766C100.925 9.12363 100.688 9.16136 100.614 9.08573C100.422 8.47888 100.022 7.65716 98.6015 7.65716C97.151 7.65716 96.8404 8.47888 96.8404 9.06036C96.8404 9.79359 97.5506 10.325 98.0982 10.6155L99.2819 11.2475C100.214 11.7405 101.132 12.4738 101.132 13.6751C101.132 15.0658 99.9039 16.0139 97.9799 16.0139Z" fill="white"/>
+<path id="path28" d="M105.429 11.763C104.781 11.763 104.754 11.7882 104.754 12.1675V13.9505C104.754 15.2777 104.821 15.4549 105.577 15.5308L105.969 15.5686C106.049 15.6191 106.023 15.8465 105.941 15.8848C105.213 15.8594 104.754 15.8465 104.227 15.8465C103.647 15.8465 103.188 15.8719 102.662 15.8848C102.581 15.8465 102.554 15.6444 102.635 15.5686L102.864 15.5308C103.621 15.4043 103.647 15.2777 103.647 13.9505V9.39882C103.647 8.07125 103.553 7.85655 102.851 7.80597L102.5 7.78059C102.419 7.73001 102.446 7.50246 102.527 7.46439C103.188 7.47725 103.647 7.50246 104.227 7.50246C104.754 7.50246 105.213 7.4896 105.793 7.46439C105.874 7.50246 105.901 7.73001 105.82 7.78059L105.563 7.80597C104.781 7.88176 104.754 8.07125 104.754 9.39882V10.8528C104.754 11.2444 104.781 11.2573 105.429 11.2573H109.289C109.936 11.2573 109.963 11.2444 109.963 10.8528V9.39882C109.963 8.07125 109.936 7.88176 109.14 7.80597L108.884 7.78059C108.803 7.73001 108.83 7.50246 108.911 7.46439C109.532 7.4896 109.991 7.50246 110.544 7.50246C111.07 7.50246 111.529 7.4896 112.136 7.46439C112.217 7.50246 112.244 7.73001 112.163 7.78059L111.88 7.80597C111.097 7.88176 111.07 8.07125 111.07 9.39882V13.9505C111.07 15.2777 111.097 15.4422 111.88 15.5308L112.204 15.5686C112.285 15.6191 112.258 15.8465 112.177 15.8848C111.529 15.8594 111.07 15.8465 110.544 15.8465C109.991 15.8465 109.505 15.8594 108.911 15.8848C108.83 15.8465 108.803 15.6444 108.884 15.5686L109.14 15.5308C109.963 15.4043 109.963 15.2777 109.963 13.9505V12.1675C109.963 11.7882 109.936 11.763 109.289 11.763H105.429Z" fill="white"/>
+<path id="path30" d="M52.3661 18.6627C53.4754 17.7928 54.8884 17.3654 56.4689 17.3654C57.2893 17.3654 58.4442 17.5331 59.1587 17.7319C59.341 17.7775 59.4473 17.8082 59.5841 17.7928C59.5992 18.1439 59.6753 19.1052 59.7967 20.0365C59.7207 20.1434 59.4929 20.1588 59.3866 20.0674C59.1587 19.0293 58.4748 17.8385 56.2714 17.8385C53.9464 17.8385 51.9707 19.3192 51.9707 22.4789C51.9707 25.6843 53.992 27.4553 56.484 27.4553C58.4442 27.4553 59.3104 26.1728 59.66 25.2721C59.7665 25.1961 59.9946 25.2264 60.055 25.3335C59.9488 26.127 59.5537 27.1345 59.3257 27.4246C59.1434 27.4553 58.961 27.5161 58.7939 27.577C58.4595 27.6995 57.3654 27.9282 56.3929 27.9282C55.0252 27.9282 53.7184 27.6537 52.6092 26.9055C51.3934 26.0658 50.4512 24.6772 50.4512 22.7081C50.4512 21.0134 51.2112 19.5634 52.3661 18.6627Z" fill="white"/>
+<path id="path32" d="M68.6164 23.8658C68.6164 21.7796 67.6553 19.5291 65.1401 19.5291C63.7704 19.5291 61.9928 20.4268 61.9928 23.1958C61.9928 25.0668 62.9408 27.4944 65.5349 27.4944C67.1154 27.4944 68.6164 26.3565 68.6164 23.8658ZM60.6758 23.6002C60.6758 21.0716 62.6511 19.1373 65.364 19.1373C68.4058 19.1373 69.9334 21.2485 69.9334 23.4738C69.9334 26.0278 67.9055 27.8862 65.364 27.8862C62.4407 27.8862 60.6758 25.8758 60.6758 23.6002Z" fill="white"/>
+<path id="path34" d="M84.792 22.513C84.792 21.7292 84.7655 20.2751 84.5392 19.8961C84.4462 19.7442 84.207 19.6555 83.8748 19.6303L83.5426 19.6049C83.4628 19.5166 83.489 19.3523 83.5688 19.3014C84.0741 19.3266 84.5661 19.3395 85.0844 19.3395C85.6429 19.3395 86.0021 19.3266 86.4805 19.3019C86.5868 19.365 86.5735 19.5291 86.507 19.6049L86.1877 19.6303C85.8555 19.6555 85.6027 19.7694 85.5233 19.9338C85.3372 20.3508 85.3372 21.805 85.3372 22.513V23.9416C85.3372 25.0418 85.1509 26.2049 84.4067 26.9631C83.8348 27.5575 82.8511 27.8862 81.8673 27.8862C80.9499 27.8862 80.0327 27.7218 79.3812 27.1911C78.6764 26.6348 78.3442 25.7119 78.3442 24.2074V21.2233C78.3442 19.9086 78.3177 19.6936 77.5468 19.6303L77.2142 19.6049C77.1346 19.5543 77.1608 19.3396 77.2406 19.3014C77.9057 19.3266 78.3575 19.3395 78.8894 19.3395C79.4343 19.3395 79.8732 19.3266 80.5243 19.3019C80.6041 19.3396 80.631 19.5543 80.5514 19.6049L80.2321 19.6303C79.4608 19.6936 79.4343 19.9086 79.4343 21.2233V23.9544C79.4343 25.9899 80.0991 27.3301 82.133 27.3301C84.0607 27.3301 84.792 25.8885 84.792 23.9673V22.513Z" fill="white"/>
+<path id="path36" d="M101.45 25.5943C101.45 26.054 101.48 26.7051 101.759 26.9862C102.038 27.2799 102.479 27.3437 102.92 27.3437C104.228 27.3437 105.227 26.8329 105.227 25.5559C105.227 24.5471 104.639 23.3727 102.303 23.3727C101.509 23.3727 101.45 23.4488 101.45 23.7046V25.5943ZM101.45 22.6315C101.45 22.9894 101.465 23.0148 102.214 22.9894C103.713 22.9383 104.521 22.5552 104.521 21.3547C104.521 20.1033 103.449 19.6307 102.332 19.6307C102.009 19.6307 101.788 19.6562 101.656 19.7075C101.509 19.7457 101.45 19.8095 101.45 20.0393V22.6315ZM100.245 20.9334C100.245 19.9884 100.186 19.7457 99.5255 19.6948L99.0549 19.6487C99.0015 19.6 98.9729 19.3441 99.0696 19.3369C99.8633 19.2771 100.862 19.2351 102.229 19.2351C103.155 19.2351 104.036 19.2989 104.698 19.5923C105.33 19.8608 105.814 20.3715 105.814 21.1889C105.814 22.108 105.197 22.5808 104.316 22.9383C104.316 23.0661 104.433 23.1043 104.595 23.1298C105.389 23.2574 106.564 23.8962 106.564 25.2623C106.564 26.7434 105.3 27.7395 102.655 27.7395C102.229 27.7395 101.509 27.7013 100.892 27.7013C100.245 27.7013 99.7457 27.7266 99.2021 27.7395C99.1138 27.7013 99.0842 27.497 99.1726 27.4205L99.437 27.3821C100.216 27.2672 100.245 27.1266 100.245 25.786V20.9334Z" fill="white"/>
+<path id="path38" d="M71.2247 11.4142C70.9719 11.4142 70.4666 11.509 70.4666 11.1707V8.74566C70.4666 7.7974 70.4965 7.66176 71.6262 7.66176C72.9488 7.66176 73.7665 8.33892 73.7665 9.58539C73.7665 10.1273 73.5731 10.6285 73.0826 10.9671C72.5179 11.3602 71.9082 11.4142 71.2247 11.4142ZM76.2989 15.5687L75.9507 15.5384C75.8802 15.5308 75.8176 15.5219 75.7583 15.5121C75.249 15.4211 75.0448 14.9639 74.805 14.5397L73.6013 12.4264C73.3933 12.074 73.1704 11.6001 72.6946 11.5323C73.9283 11.3832 75.0433 10.6655 75.0433 9.43277C75.0433 8.00986 73.6459 7.37333 72.2338 7.37333C71.3867 7.37333 70.6145 7.39648 69.7523 7.39648C69.2768 7.39648 68.711 7.37333 68.2356 7.37333C67.9714 7.37333 67.9682 7.42769 67.9682 7.57654C67.9682 7.79654 68.0602 7.73498 68.3399 7.75075C69.3444 7.80768 69.3057 7.99665 69.3057 8.86347V14.4044C69.3057 15.1975 69.374 15.4341 68.5479 15.5089C68.5479 15.5089 68.4213 15.5219 68.3496 15.5296L67.9997 15.5658C67.916 15.6414 67.9442 15.8438 68.0275 15.8817C68.2136 15.8748 68.5437 15.8618 68.5437 15.8618C69.0007 15.8482 69.458 15.8131 69.9151 15.8131C70.3749 15.8131 70.8148 15.8486 71.2669 15.862V15.8625C71.4275 15.8674 71.5969 15.8731 71.7827 15.88C71.8664 15.8419 71.8943 15.6397 71.8106 15.5639L71.4583 15.5303C71.3867 15.5226 71.263 15.5115 71.263 15.5115C70.4291 15.4545 70.4802 15.2174 70.4802 14.4044V12.318C70.4802 12.1961 70.465 11.8712 70.5543 11.7762C70.6288 11.6946 70.7624 11.7083 70.8813 11.7083C72.0111 11.7083 71.996 11.8168 72.5312 12.7651L73.9878 15.4067C74.1067 15.6101 74.1957 15.8673 74.4933 15.8673H75.7586C75.918 15.8724 76.0859 15.8777 76.271 15.8848C76.3543 15.8467 76.3822 15.6444 76.2989 15.5687Z" fill="white"/>
+<path id="path40" d="M71.4986 21.2664C71.4986 19.939 71.471 19.7363 70.6021 19.6732L70.2569 19.648C70.1743 19.5973 70.2018 19.3701 70.2845 19.3318C71.0573 19.3572 71.5261 19.3697 72.078 19.3697C72.6162 19.3697 73.085 19.3572 73.7751 19.3323C73.8578 19.3701 73.8854 19.5973 73.8027 19.648L73.4715 19.6732C72.6577 19.7363 72.6298 19.939 72.6298 21.2664V25.6664C72.6298 26.4629 72.6713 26.7916 72.9195 27.0317C73.0714 27.1704 73.3335 27.3225 74.4232 27.3225C75.5961 27.3225 75.8858 27.2717 76.1068 27.1582C76.3825 27.0061 76.7413 26.5513 77.017 25.9062C77.1002 25.8435 77.362 25.8936 77.362 25.9822C77.362 26.1215 76.9755 27.4111 76.7825 27.7522C76.0792 27.727 74.7682 27.7141 73.3471 27.7141H72.078C71.4986 27.7141 71.0573 27.727 70.2845 27.7522C70.2018 27.7141 70.1743 27.5119 70.2569 27.4362L70.671 27.3985C71.471 27.3225 71.4986 27.1453 71.4986 25.8181V21.2664Z" fill="white"/>
+<path id="path42" d="M108.456 21.2915C108.456 19.9515 108.429 19.7363 107.63 19.6732L107.291 19.648C107.21 19.5973 107.237 19.3701 107.319 19.3318C107.996 19.3572 108.456 19.3697 109.025 19.3697C109.567 19.3697 110.027 19.3572 110.705 19.3323C110.786 19.3701 110.813 19.5973 110.732 19.648L110.393 19.6732C109.594 19.7363 109.567 19.9515 109.567 21.2915V25.7927C109.567 27.133 109.594 27.3098 110.393 27.3985L110.732 27.4362C110.813 27.4867 110.786 27.7141 110.705 27.7522C110.027 27.727 109.567 27.7141 109.025 27.7141C108.456 27.7141 107.996 27.727 107.319 27.7522C107.237 27.7141 107.21 27.5119 107.291 27.4362L107.63 27.3985C108.429 27.3098 108.456 27.133 108.456 25.7927V21.2915Z" fill="white"/>
+<path id="path44" d="M97.6317 27.3954C97.5623 27.3878 97.4323 27.3775 97.4323 27.3775C97.2898 27.3631 97.1615 27.3424 97.0601 27.2309C96.8844 27.0426 96.899 26.5062 96.899 26.2916V20.7516C96.899 20.51 96.8405 19.987 97.0164 19.7989C97.1044 19.7 97.287 19.6833 97.4498 19.6741V19.6734C97.5488 19.6659 97.5512 19.6655 97.638 19.6612L97.9862 19.6362C98.0695 19.5854 98.0416 19.3581 97.9583 19.32C97.7722 19.3265 97.6031 19.3241 97.4422 19.3291V19.3298H95.9624C95.8013 19.3298 95.6549 19.3298 95.5671 19.5042L92.5516 25.8356L89.888 19.7188C89.8001 19.5042 89.7858 19.3298 89.5073 19.3298H87.967C87.8066 19.3248 87.6295 19.3265 87.4434 19.32C87.3601 19.3581 87.3318 19.5854 87.4155 19.6362L87.7637 19.6612C87.8355 19.6671 87.9655 19.676 87.9655 19.676C88.5432 19.7134 88.579 19.8435 88.5265 20.4565L88.0726 26.3987C88.0332 26.9955 88.0007 27.3108 87.3806 27.3689C87.3806 27.3689 87.2497 27.3854 87.1777 27.3931L86.8298 27.4312C86.7461 27.5066 86.774 27.709 86.8577 27.7469C87.0411 27.74 87.3674 27.7304 87.3674 27.7304C87.6817 27.7148 88.0015 27.6867 88.3218 27.6867C88.6672 27.6867 89.013 27.7196 89.3588 27.7335V27.7342C89.5189 27.7391 89.6883 27.7448 89.8744 27.7513C89.9581 27.7134 89.986 27.5113 89.9023 27.4355L89.5544 27.3976C89.4628 27.3903 89.3602 27.3801 89.3602 27.3801C88.4654 27.3183 88.4853 26.6817 88.5411 25.9028L88.9657 20.3763H89.0685L91.9519 27.1771C91.9809 27.2709 92.0248 27.4319 92.1712 27.4319C92.3032 27.4319 92.3469 27.2846 92.3908 27.1903L95.6402 20.2148H95.7428V26.2916C95.7428 26.533 95.7721 27.0294 95.5232 27.217C95.3934 27.3146 94.9703 27.3732 94.9703 27.3732C94.9122 27.3825 94.8511 27.3911 94.7817 27.3985L94.4338 27.4362C94.3501 27.5119 94.378 27.7141 94.4617 27.7522C94.6451 27.7455 94.9703 27.7353 94.9703 27.7353C95.4422 27.722 95.9216 27.6867 96.4013 27.6867C96.7463 27.6867 97.4216 27.7198 97.4216 27.7198C97.5825 27.7247 97.7659 27.7424 97.952 27.7491C98.0357 27.7112 98.0636 27.509 97.9799 27.4334L97.6317 27.3954Z" fill="white"/>
+<path id="path46" d="M116.595 24.3002H114.967C114.91 24.3002 114.457 24.354 114.457 24.2199C114.457 24.1796 114.485 24.0992 114.499 24.0593L115.477 21.6195C115.505 21.5524 115.604 21.2172 115.717 21.2172C115.802 21.2172 115.915 21.5658 115.944 21.6195L116.907 23.8981C116.907 23.9252 117.006 24.1395 117.006 24.1932C117.006 24.3408 116.68 24.3002 116.595 24.3002ZM120.251 27.4297L120.205 27.3918C120.135 27.3845 120.073 27.3759 120.015 27.3662C119.473 27.2441 119.261 26.5856 119.061 26.1165L116.27 19.4573C116.242 19.3774 116.187 19.2051 116.076 19.2051C115.924 19.2051 115.883 19.3908 115.841 19.4968L113.175 26.1431C113.078 26.3951 112.829 27.0059 112.65 27.1911C112.512 27.3333 112.333 27.3603 112.142 27.3802C112.142 27.3802 111.991 27.3946 111.919 27.4025L111.591 27.4362C111.508 27.5119 111.536 27.7141 111.619 27.7522C111.805 27.7455 112.135 27.7335 112.135 27.7335C112.5 27.7283 112.865 27.6819 113.23 27.6819C113.537 27.6819 113.844 27.7148 114.151 27.7286C114.151 27.7286 114.481 27.7405 114.667 27.7476C114.75 27.7093 114.778 27.507 114.695 27.4313L114.347 27.3933C114.277 27.3861 114.158 27.3747 114.158 27.3747C113.837 27.3389 113.437 27.2812 113.437 26.9255C113.437 26.6868 113.548 26.4082 113.631 26.1959L114.045 25.2013C114.253 24.7239 114.169 24.6704 114.722 24.6704H116.601C117.265 24.6704 117.168 24.6704 117.458 25.3476L117.9 26.3552C117.969 26.5279 118.094 26.8197 118.094 27.0059C118.094 27.3389 117.733 27.3609 117.395 27.3897C117.395 27.3897 117.283 27.3991 117.186 27.4067L116.851 27.4312C116.768 27.5068 116.796 27.7091 116.88 27.7472C117.065 27.7405 117.395 27.727 117.395 27.727C117.788 27.7126 118.184 27.6819 118.564 27.6819C119.047 27.6819 119.532 27.715 120.015 27.7289V27.7283C120.174 27.7333 120.04 27.739 120.224 27.7457C120.307 27.7076 120.335 27.5054 120.251 27.4297Z" fill="white"/>
+<path id="path48" d="M38.3887 18.1753L39.3038 18.5579L41.3329 17.1312L38.3887 18.1753Z" fill="#EFA20F"/>
+<path id="path50" d="M4.29241 16.5819L1.8873 15.729L2.00791 15.4318L4.71647 16.3422L4.72817 16.3357L5.08557 16.1313L5.22829 16.0413L2.27455 14.7747L2.39941 14.4633L8.99176 17.1512L9.20916 17.0602L2.67112 13.8484L2.81691 13.5466L9.74534 16.7971L9.84111 16.7481L3.12324 12.9072L3.26118 12.6186L12.9622 17.9397C13.0417 17.7917 13.2081 17.5221 13.2934 17.3769C9.60517 13.8813 6.046 11.2567 6.046 11.2567C6.046 11.2567 9.70621 13.7277 14.2236 16.0248C14.3728 15.8372 14.4953 15.6865 14.6547 15.5083L6.37856 8.16361L6.60072 7.93366L13.2805 13.6723L7.09216 7.42523L7.32368 7.18345L14.2716 13.9522L7.80406 6.71617L8.0514 6.49119L14.029 12.9437L8.57312 6.01397L8.80804 5.7986L15.8015 14.3778C15.9823 14.2205 16.1326 14.1022 16.3217 13.9561C14.2062 9.34149 11.896 5.58751 11.896 5.58751C11.896 5.58751 14.3549 9.2362 17.6725 13.0572C17.8751 12.9423 18.0806 12.8319 18.2905 12.7283L18.2555 12.7052L13.3542 2.84525L13.6456 2.71596L17.7062 10.5591L14.2901 2.42993L14.5948 2.29344L18.5214 11.1928L15.2135 2.04137L15.5265 1.92631L18.6711 10.1661L16.1875 1.68058L16.4857 1.56981L19.7552 12.0944L19.7489 12.1222L19.757 12.1189C19.9744 12.0455 20.1956 11.9805 20.4179 11.9195C20.169 6.86433 19.4272 2.54002 19.4272 2.54002C19.4272 2.54002 20.3458 6.82626 21.9928 11.6055C22.2221 11.577 22.4529 11.553 22.6858 11.5371L22.6785 11.5261H22.7071L22.6906 11.5021L21.8104 0.509218L22.1285 0.499105L22.9787 9.30496L22.8326 0.477671L23.1653 0.466183L23.4991 10.2002L23.8325 0.466011L24.1659 0.477671L24.0194 9.30496L24.8698 0.499449L25.1877 0.509218L24.3076 11.5021L24.2913 11.5261H24.2959L24.2935 11.5297H24.3079C24.5355 11.5441 24.7613 11.5671 24.9855 11.5942C26.6301 6.81957 27.5471 2.54002 27.5471 2.54002C27.5471 2.54002 26.8075 6.85147 26.5574 11.8973C26.7822 11.9572 27.0042 12.0227 27.2231 12.0951L30.481 1.60719L30.7797 1.71796L28.2956 10.2035L31.4406 1.96369L31.7532 2.07892L28.4453 11.2301L32.3719 2.33065L32.6769 2.46715L29.2605 10.5965L33.3213 2.75334L33.6125 2.88246L28.7287 12.7074L28.737 12.7108C28.9383 12.8094 29.1354 12.9151 29.3304 13.024C32.6335 9.21493 35.0783 5.58751 35.0783 5.58751C35.0783 5.58751 32.7839 9.31559 30.6746 13.9079C30.8631 14.0514 31.0474 14.1996 31.2266 14.3536L38.1377 5.86753L38.3735 6.08308L32.9169 13.0128L38.895 6.56064L39.1419 6.78545L32.6742 14.0214L39.6222 7.25255L39.8539 7.49451L33.6656 13.7416L40.3452 8.00311L40.5674 8.23254L32.3925 15.4946L32.3971 15.4994C32.5398 15.6597 32.6772 15.8252 32.8121 15.9934C37.301 13.7054 40.9283 11.2567 40.9283 11.2567C40.9283 11.2567 37.4037 13.8556 33.7346 17.3263C33.8352 17.4956 33.9975 17.7842 34.0902 17.9585L43.6538 12.7093L43.7921 12.9982L36.1578 17.3628L44.0983 13.6378L44.2437 13.9396L36.8478 17.5727L36.9897 17.6226L44.5154 14.554L44.6404 14.8658L37.6453 17.8651L37.7761 17.9196L42.4374 16.3532L43.1399 15.859L43.3731 16.0383L44.907 15.5231L45.0276 15.8195L43.7006 16.2902L45.618 17.7653L46.2323 18.1105C43.7673 7.72291 34.4977 -6.67572e-05 23.4377 -6.67572e-05C12.1833 -6.67572e-05 2.78302 7.99659 0.519531 18.6604C0.548569 18.6462 0.576738 18.6328 0.605844 18.6184L0.886658 18.4901L1.05901 18.4092L4.29241 16.5819Z" fill="#EFA20F"/>
+<path id="path52" d="M0.387846 27.9243C0.387846 27.9243 3.84524 27.2282 6.73134 27.2282C14.3355 27.2282 24.8545 31.5444 32.4869 31.5444C38.0858 31.5444 43.5466 29.9962 46.5228 27.7389C46.7552 26.4034 46.8772 25.0299 46.8772 23.6272C46.8772 21.7276 46.6533 19.8809 46.2331 18.1108L43.0513 16.3221L39.3179 18.9613L36.8064 17.9755C35.9562 18.4086 30.7108 21.9447 30.7108 21.9447L28.6976 20.4756L26.5375 20.0444L23.6574 17.9306L20.3534 20.217C20.3534 20.217 16.6674 22.3746 16.5408 22.3746C16.4137 22.3746 12.0935 18.9222 12.0935 18.9222L10.1031 16.8084C9.76403 17.0241 8.41014 17.6504 8.41014 17.6504L8.34056 17.6689L7.03039 17.2604L5.43937 16.4097L0.606673 18.6187C0.577568 18.6331 0.549398 18.6465 0.520361 18.6607C0.1804 20.2621 0 21.9234 0 23.6272C0 25.0947 0.133756 26.5308 0.387846 27.9243Z" fill="#25346D"/>
+</g>
+</g>
+</svg>
diff --git a/frontend/public/img/logo-vertical 1.svg b/frontend/public/img/logo-vertical 1.svg
new file mode 100644
index 0000000000..628eaf884e
--- /dev/null
+++ b/frontend/public/img/logo-vertical 1.svg	
@@ -0,0 +1,61 @@
+<svg width="40" height="36" viewBox="0 0 40 36" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="logo-vertical 1" clip-path="url(#clip0_746_105172)">
+<g id="1.0---Login">
+<g id="gov_v_pos-(1)">
+<path id="Fill-1" fill-rule="evenodd" clip-rule="evenodd" d="M6.17438 25.4036C6.17438 25.7099 6.19258 26.1438 6.365 26.331C6.53753 26.5265 6.8098 26.5692 7.08207 26.5692C7.88967 26.5692 8.50677 26.229 8.50677 25.378C8.50677 24.7058 8.14374 23.9231 6.70084 23.9231C6.21078 23.9231 6.17438 23.9744 6.17438 24.1443V25.4036ZM6.17438 23.4295C6.17438 23.6679 6.18348 23.6849 6.64637 23.6679C7.57202 23.6338 8.0713 23.3786 8.0713 22.5789C8.0713 21.745 7.4087 21.4303 6.71904 21.4303C6.51933 21.4303 6.38319 21.4471 6.30153 21.4812C6.21078 21.5068 6.17438 21.5495 6.17438 21.7024V23.4295ZM5.43024 22.2982C5.43024 21.6686 5.3876 21.5016 4.97919 21.4677L4.6952 21.4471C4.64891 21.4089 4.66199 21.2385 4.7043 21.2346C5.19414 21.1891 5.81147 21.1665 6.65546 21.1665C7.22719 21.1665 7.77173 21.2089 8.18025 21.4047C8.57046 21.5833 8.8698 21.9236 8.8698 22.4683C8.8698 23.0808 8.48869 23.3957 7.94414 23.6338C7.94414 23.7189 8.01682 23.7446 8.11656 23.7614C8.60663 23.8467 9.33268 24.2718 9.33268 25.1823C9.33268 26.1695 8.55226 26.8332 6.91852 26.8332C6.65546 26.8332 6.21078 26.8074 5.82955 26.8074C5.43024 26.8074 5.12169 26.8248 4.78585 26.8332C4.73148 26.8074 4.71329 26.6714 4.76776 26.6201L4.93119 26.5946C5.41205 26.518 5.43024 26.4245 5.43024 25.5312V22.2982Z" fill="white"/>
+<path id="Fill-2" fill-rule="evenodd" clip-rule="evenodd" d="M16.0201 23.2528C16.0201 22.5101 16.0048 22.3909 15.5532 22.3559L15.3617 22.3418C15.3158 22.3138 15.3311 22.1878 15.3771 22.1665C15.7599 22.1807 16.0201 22.1878 16.3417 22.1878C16.6479 22.1878 16.9081 22.1807 17.291 22.1665C17.3369 22.1878 17.3522 22.3138 17.3062 22.3418L17.1148 22.3559C16.6632 22.3909 16.6479 22.5101 16.6479 23.2528V25.7473C16.6479 26.4898 16.6632 26.5879 17.1148 26.637L17.3062 26.6579C17.3522 26.686 17.3369 26.8119 17.291 26.8332C16.9081 26.819 16.6479 26.8119 16.3417 26.8119C16.0201 26.8119 15.7599 26.819 15.3771 26.8332C15.3311 26.8119 15.3158 26.7 15.3617 26.6579L15.5532 26.637C16.0048 26.5879 16.0201 26.4898 16.0201 25.7473V23.2528Z" fill="white"/>
+<path id="Fill-3" fill-rule="evenodd" clip-rule="evenodd" d="M20.2861 25.8072C20.2861 26.5112 20.3006 26.6117 20.7215 26.6454L20.9538 26.6654C20.9973 26.6923 20.9829 26.8129 20.9394 26.8332C20.5256 26.8196 20.279 26.8129 19.9885 26.8129C19.6982 26.8129 19.4442 26.8196 18.9798 26.8332C18.9362 26.8129 18.9217 26.6991 18.9798 26.6654L19.241 26.6454C19.6547 26.6117 19.691 26.5112 19.691 25.8072V22.8095C19.691 22.6016 19.691 22.5951 19.4732 22.5951H19.074C18.762 22.5951 18.3628 22.6083 18.1814 22.7625C18.0072 22.91 17.9347 23.0578 17.8549 23.2253C17.7967 23.2656 17.6952 23.232 17.666 23.1784C17.7822 22.8767 17.8911 22.4474 17.9418 22.1791C17.9638 22.1658 18.0581 22.1591 18.0798 22.1791C18.1234 22.3936 18.3628 22.3872 18.6968 22.3872H21.636C22.0279 22.3872 22.0933 22.3736 22.2022 22.1993C22.2384 22.1859 22.3182 22.1927 22.3327 22.2193C22.253 22.4944 22.2022 23.0375 22.2239 23.2389C22.1949 23.2925 22.0714 23.2925 22.0353 23.2522C22.0134 23.0843 21.9626 22.8363 21.8538 22.7625C21.6867 22.6484 21.4112 22.5951 21.0119 22.5951H20.4967C20.279 22.5951 20.2861 22.6016 20.2861 22.823V25.8072Z" fill="white"/>
+<path id="Fill-4" fill-rule="evenodd" clip-rule="evenodd" d="M23.352 23.2528C23.352 22.5101 23.3368 22.3909 22.8851 22.3559L22.6938 22.3418C22.6478 22.3138 22.6631 22.1878 22.709 22.1665C23.0918 22.1807 23.352 22.1878 23.6737 22.1878C23.9798 22.1878 24.2401 22.1807 24.623 22.1665C24.6689 22.1878 24.6842 22.3138 24.6383 22.3418L24.4467 22.3559C23.9952 22.3909 23.9798 22.5101 23.9798 23.2528V25.7473C23.9798 26.4898 23.9952 26.5879 24.4467 26.637L24.6383 26.6579C24.6842 26.686 24.6689 26.8119 24.623 26.8332C24.2401 26.819 23.9798 26.8119 23.6737 26.8119C23.352 26.8119 23.0918 26.819 22.709 26.8332C22.6631 26.8119 22.6478 26.7 22.6938 26.6579L22.8851 26.637C23.3368 26.5879 23.352 26.4898 23.352 25.7473V23.2528Z" fill="white"/>
+<path id="Fill-5" fill-rule="evenodd" clip-rule="evenodd" d="M26.8744 26.8332C26.1673 26.8332 25.7212 26.6577 25.5612 26.5838C25.46 26.4352 25.3508 25.9565 25.334 25.6394C25.376 25.5923 25.5023 25.579 25.5361 25.6193C25.6623 25.9633 26.0073 26.6238 26.9839 26.6238C27.691 26.6238 28.036 26.253 28.036 25.8486C28.036 25.5521 27.9604 25.2215 27.3457 24.9045L26.5462 24.4863C26.1252 24.264 25.637 23.8795 25.637 23.3265C25.637 22.6859 26.26 22.1665 27.3542 22.1665C27.6151 22.1665 27.9182 22.2072 28.137 22.2544C28.2465 22.2814 28.3642 22.2947 28.4316 22.2947C28.5075 22.4567 28.5833 22.8343 28.5833 23.1175C28.5495 23.1581 28.4149 23.1781 28.3728 23.1378C28.2634 22.8141 28.036 22.3758 27.2279 22.3758C26.4031 22.3758 26.2263 22.8141 26.2263 23.1242C26.2263 23.5155 26.6302 23.7987 26.9417 23.9537L27.6151 24.2909C28.1455 24.5538 28.6673 24.9448 28.6673 25.5855C28.6673 26.3273 27.9688 26.8332 26.8744 26.8332Z" fill="white"/>
+<path id="Fill-6" fill-rule="evenodd" clip-rule="evenodd" d="M31.0554 24.5488C30.681 24.5488 30.6653 24.563 30.6653 24.7732V25.7612C30.6653 26.4968 30.7044 26.595 31.1413 26.637L31.3675 26.6579C31.4144 26.686 31.3988 26.8119 31.352 26.8332C30.9306 26.819 30.6653 26.8119 30.3611 26.8119C30.0254 26.8119 29.7602 26.826 29.456 26.8332C29.4091 26.8119 29.3935 26.7 29.4404 26.6579L29.5729 26.637C30.01 26.567 30.0254 26.4968 30.0254 25.7612V23.2388C30.0254 22.503 29.9709 22.384 29.5651 22.3559L29.3622 22.3418C29.3155 22.3138 29.331 22.1878 29.3778 22.1665C29.7602 22.1737 30.0254 22.1878 30.3611 22.1878C30.6653 22.1878 30.9306 22.1807 31.2661 22.1665C31.3131 22.1878 31.3285 22.3138 31.2818 22.3418L31.1335 22.3559C30.681 22.398 30.6653 22.503 30.6653 23.2388V24.0444C30.6653 24.2616 30.681 24.2686 31.0554 24.2686H33.287C33.6615 24.2686 33.6772 24.2616 33.6772 24.0444V23.2388C33.6772 22.503 33.6615 22.398 33.2012 22.3559L33.0532 22.3418C33.006 22.3138 33.0217 22.1878 33.0686 22.1665C33.4276 22.1807 33.6929 22.1878 34.0127 22.1878C34.317 22.1878 34.5822 22.1807 34.9334 22.1665C34.9802 22.1878 34.9958 22.3138 34.949 22.3418L34.7851 22.3559C34.3327 22.398 34.317 22.503 34.317 23.2388V25.7612C34.317 26.4968 34.3327 26.5879 34.7851 26.637L34.9724 26.6579C35.0191 26.686 35.0037 26.8119 34.9569 26.8332C34.5822 26.819 34.317 26.8119 34.0127 26.8119C33.6929 26.8119 33.412 26.819 33.0686 26.8332C33.0217 26.8119 33.006 26.7 33.0532 26.6579L33.2012 26.637C33.6772 26.567 33.6772 26.4968 33.6772 25.7612V24.7732C33.6772 24.563 33.6615 24.5488 33.287 24.5488H31.0554Z" fill="white"/>
+<path id="Fill-7" fill-rule="evenodd" clip-rule="evenodd" d="M1.12969 28.5703C1.78432 28.0761 2.61816 27.8335 3.55057 27.8335C4.03479 27.8335 4.71618 27.9287 5.13761 28.0414C5.24523 28.0674 5.30802 28.0848 5.38864 28.076C5.39768 28.2754 5.44251 28.8216 5.51422 29.3508C5.46939 29.4113 5.33489 29.42 5.2721 29.3681C5.13761 28.7785 4.73413 28.102 3.43415 28.102C2.06223 28.102 0.8965 28.943 0.8965 30.7378C0.8965 32.5586 2.0891 33.5645 3.55949 33.5645C4.71618 33.5645 5.22727 32.836 5.43347 32.3244C5.49626 32.2813 5.63087 32.2986 5.66667 32.3593C5.604 32.8102 5.37081 33.3823 5.23631 33.5473C5.12869 33.5645 5.02108 33.5992 4.9225 33.6337C4.72509 33.7033 4.07962 33.8335 3.50586 33.8335C2.6989 33.8335 1.92773 33.6773 1.2731 33.2523C0.555808 32.7756 0 31.9866 0 30.8681C0 29.9055 0.44831 29.0819 1.12969 28.5703Z" fill="white"/>
+<path id="Fill-8" fill-rule="evenodd" clip-rule="evenodd" d="M10.5746 31.5356C10.5746 30.3436 10.0209 29.0574 8.57189 29.0574C7.78284 29.0574 6.75869 29.5703 6.75869 31.1527C6.75869 32.2219 7.30489 33.6094 8.79933 33.6094C9.70981 33.6094 10.5746 32.9592 10.5746 31.5356ZM6 31.3838C6 29.9389 7.13792 28.8335 8.70073 28.8335C10.4533 28.8335 11.3333 30.0399 11.3333 31.3116C11.3333 32.771 10.1651 33.8335 8.70073 33.8335C7.01673 33.8335 6 32.6844 6 31.3838Z" fill="white"/>
+<path id="Fill-9" fill-rule="evenodd" clip-rule="evenodd" d="M19.4549 30.9123C19.4549 30.4862 19.4417 29.6959 19.3293 29.4897C19.2832 29.4072 19.1643 29.359 18.9992 29.3452L18.8342 29.3315C18.7945 29.2832 18.8077 29.1941 18.8472 29.1665C19.0982 29.1803 19.3426 29.1872 19.6003 29.1872C19.8778 29.1872 20.0561 29.1803 20.294 29.1666C20.3466 29.2012 20.34 29.2903 20.3071 29.3315L20.1486 29.3452C19.9834 29.359 19.8578 29.421 19.8183 29.5104C19.7259 29.7371 19.7259 30.5275 19.7259 30.9123V31.6889C19.7259 32.2868 19.6333 32.9189 19.2635 33.3313C18.9794 33.6542 18.4906 33.8332 18.0018 33.8332C17.546 33.8332 17.0903 33.7436 16.7666 33.455C16.4165 33.1528 16.2513 32.651 16.2513 31.8332V30.2111C16.2513 29.4965 16.2381 29.3798 15.8552 29.3452L15.6899 29.3315C15.6504 29.3042 15.6635 29.1874 15.7031 29.1665C16.0334 29.1803 16.258 29.1872 16.5222 29.1872C16.793 29.1872 17.011 29.1803 17.3346 29.1666C17.3743 29.1874 17.3875 29.3042 17.3479 29.3315L17.1893 29.3452C16.8062 29.3798 16.793 29.4965 16.793 30.2111V31.6957C16.793 32.8021 17.1232 33.5308 18.1339 33.5308C19.0917 33.5308 19.4549 32.7471 19.4549 31.7026V30.9123Z" fill="white"/>
+<path id="Fill-10" fill-rule="evenodd" clip-rule="evenodd" d="M29.0675 32.6559C29.0675 32.908 29.0843 33.2655 29.2444 33.4198C29.4045 33.5808 29.6573 33.616 29.91 33.616C30.6596 33.616 31.2326 33.3355 31.2326 32.6349C31.2326 32.0813 30.8956 31.4369 29.556 31.4369C29.1012 31.4369 29.0675 31.4788 29.0675 31.6188V32.6559ZM29.0675 31.0302C29.0675 31.2264 29.076 31.2404 29.5055 31.2264C30.3649 31.1984 30.8283 30.9884 30.8283 30.3294C30.8283 29.6427 30.2133 29.3835 29.573 29.3835C29.3876 29.3835 29.2614 29.3977 29.1853 29.4256C29.1012 29.4467 29.0675 29.4816 29.0675 29.6078V31.0302ZM28.3766 30.0983C28.3766 29.5798 28.343 29.4467 27.9639 29.4187L27.6942 29.3935C27.6634 29.3667 27.6472 29.2262 27.7026 29.2222C28.1577 29.1896 28.7304 29.1665 29.5141 29.1665C30.0448 29.1665 30.5501 29.2015 30.9294 29.3624C31.2916 29.5097 31.5694 29.7899 31.5694 30.2384C31.5694 30.743 31.2157 31.0024 30.7103 31.1984C30.7103 31.2686 30.7774 31.2896 30.8703 31.3037C31.3253 31.3735 31.9993 31.7241 31.9993 32.4737C31.9993 33.2866 31.2747 33.8332 29.7581 33.8332C29.5141 33.8332 29.1012 33.8118 28.7473 33.8118C28.3766 33.8118 28.0904 33.8259 27.7784 33.8332C27.728 33.8118 27.711 33.6999 27.7615 33.6581L27.9133 33.637C28.3597 33.5738 28.3766 33.4968 28.3766 32.7611V30.0983Z" fill="white"/>
+<path id="Fill-11" fill-rule="evenodd" clip-rule="evenodd" d="M5 35.8333H35V35.5H5V35.8333Z" fill="#F3B229"/>
+<g id="Group-14">
+<g id="Mask group">
+<mask id="mask0_746_105172" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="5" y="0" width="30" height="15">
+<g id="Group">
+<path id="Vector" d="M34.5881 11.7619C33.0244 5.12303 27.0248 0.178711 19.8621 0.178711C12.5785 0.178711 6.49762 5.29097 5.06055 12.0989L8.25466 10.2917L10.0158 11.5152C10.0158 11.5152 11.0457 11.053 11.2625 10.917L12.536 12.2494C12.536 12.2494 15.3003 14.4247 15.3813 14.4247C15.4627 14.4247 17.8204 13.0651 17.8204 13.0651L19.9346 11.6239L21.777 12.9563L23.1589 13.2283L24.568 14.18C24.568 14.18 27.9828 11.923 28.5249 11.651C28.5249 11.651 30.0152 12.1951 30.1506 12.1678C30.2859 12.1406 32.6166 10.346 32.6166 10.346L34.5881 11.7619Z" fill="#FCBA19"/>
+</g>
+</mask>
+<g mask="url(#mask0_746_105172)">
+<path id="Fill-12" fill-rule="evenodd" clip-rule="evenodd" d="M34.5881 11.7619C33.0244 5.12303 27.0248 0.178711 19.8621 0.178711C12.5785 0.178711 6.49762 5.29097 5.06055 12.0989L8.25466 10.2917L10.0158 11.5152C10.0158 11.5152 11.0457 11.053 11.2625 10.917L12.536 12.2494C12.536 12.2494 15.3003 14.4247 15.3813 14.4247C15.4627 14.4247 17.8204 13.0651 17.8204 13.0651L19.9346 11.6239L21.777 12.9563L23.1589 13.2283L24.568 14.18C24.568 14.18 27.9828 11.923 28.5249 11.651C28.5249 11.651 30.0152 12.1951 30.1506 12.1678C30.2859 12.1406 32.6166 10.346 32.6166 10.346L34.5881 11.7619Z" fill="#FCBA19"/>
+</g>
+</g>
+</g>
+<g id="Group-38">
+<g id="Mask group_2">
+<mask id="mask1_746_105172" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="8" y="1" width="24" height="15">
+<g id="Group_2">
+<path id="Vector_2" d="M17.9586 13.6816L20.0955 12.1901L21.9577 13.569L23.3545 13.8505L24.7788 14.8355C24.7788 14.8355 26.332 13.7843 27.5201 13.0074C27.3148 12.4581 27.0522 11.9376 26.7391 11.454L31.8953 7.39551L26.4137 10.9884C25.9213 10.3348 25.3319 9.76078 24.6673 9.2884L27.8993 3.65423L24.2036 8.98294C23.5145 8.56313 22.7574 8.2474 21.9523 8.05758L22.8778 1.57129L21.4074 7.95012C21.0043 7.88529 20.5909 7.85118 20.1697 7.85118C19.7214 7.85118 19.2819 7.88996 18.854 7.9632L17.3805 1.57129L18.3088 8.07721C17.511 8.27403 16.7607 8.5942 16.079 9.01764L12.359 3.65423L15.6146 9.32917C14.9615 9.80224 14.3827 10.3745 13.899 11.0241L8.36328 7.39551L13.5729 11.4963C13.2729 11.9662 13.0199 12.4703 12.8209 13.0012C13.4648 13.5184 15.4249 15.0888 15.4933 15.0888C15.5756 15.0888 17.9586 13.6816 17.9586 13.6816Z" fill="white"/>
+</g>
+</mask>
+<g mask="url(#mask1_746_105172)">
+<path id="Fill-36" fill-rule="evenodd" clip-rule="evenodd" d="M17.9586 13.6816L20.0955 12.1901L21.9577 13.569L23.3545 13.8505L24.7788 14.8355C24.7788 14.8355 26.332 13.7843 27.5201 13.0074C27.3148 12.4581 27.0522 11.9376 26.7391 11.454L31.8953 7.39551L26.4137 10.9884C25.9213 10.3348 25.3319 9.76078 24.6673 9.2884L27.8993 3.65423L24.2036 8.98294C23.5145 8.56313 22.7574 8.2474 21.9523 8.05758L22.8778 1.57129L21.4074 7.95012C21.0043 7.88529 20.5909 7.85118 20.1697 7.85118C19.7214 7.85118 19.2819 7.88996 18.854 7.9632L17.3805 1.57129L18.3088 8.07721C17.511 8.27403 16.7607 8.5942 16.079 9.01764L12.359 3.65423L15.6146 9.32917C14.9615 9.80224 14.3827 10.3745 13.899 11.0241L8.36328 7.39551L13.5729 11.4963C13.2729 11.9662 13.0199 12.4703 12.8209 13.0012C13.4648 13.5184 15.4249 15.0888 15.4933 15.0888C15.5756 15.0888 17.9586 13.6816 17.9586 13.6816Z" fill="white"/>
+</g>
+</g>
+</g>
+<path id="Path-2" fill-rule="evenodd" clip-rule="evenodd" d="M20.6953 8.16667L21.334 0.5H21.25L20.4936 6.34127L20.6953 0.5H20.6113L20.1743 7.07143L19.939 0.5H19.855V6.34127L19.418 0.5H19.334L19.6533 8.16667H20.6953Z" fill="white"/>
+<path id="Path-2-Copy" fill-rule="evenodd" clip-rule="evenodd" d="M17.6514 8.81195L15.6294 1.3892L15.5504 1.41794L16.8376 7.16561L15.0292 1.60763L14.9503 1.63638L16.7872 7.96095L14.3186 1.86631L14.2396 1.89505L16.2374 7.38404L13.829 2.0445L13.75 2.07324L16.6722 9.16834L17.6514 8.81195Z" fill="white"/>
+<path id="Path-2-Copy-3" fill-rule="evenodd" clip-rule="evenodd" d="M15.2998 10.1216L10.3302 4.24887L10.2708 4.30829L13.8664 8.97348L9.87863 4.70047L9.81921 4.75989L14.1569 9.71558L9.34384 5.23526L9.28442 5.29468L13.4148 9.42508L8.97544 5.60366L8.91602 5.66309L14.563 10.8584L15.2998 10.1216Z" fill="white"/>
+<path id="Path-2-Copy-5" fill-rule="evenodd" clip-rule="evenodd" d="M24.7002 10.1216L29.6698 4.24887L29.7292 4.30829L26.1336 8.97348L30.1214 4.70047L30.1808 4.75989L25.8431 9.71558L30.6562 5.23526L30.7156 5.29468L26.5852 9.42508L31.0246 5.60367L31.084 5.66309L25.437 10.8584L24.7002 10.1216Z" fill="white"/>
+<path id="Path-2-Copy-4" fill-rule="evenodd" clip-rule="evenodd" d="M13.7266 11.6383L6.74068 8.41602L6.71194 8.49499L11.9423 11.2035L6.52225 9.01616L6.49351 9.09513L12.5192 11.7533L6.26358 9.72686L6.23484 9.80582L11.7238 11.8037L6.08538 10.2164L6.05664 10.2954L13.3702 12.6175L13.7266 11.6383Z" fill="white"/>
+<path id="Path-2-Copy-6" fill-rule="evenodd" clip-rule="evenodd" d="M26.0984 11.7479L32.771 8.63966L32.7998 8.71862L27.8081 11.3403L32.9895 9.2398L33.0182 9.31876L27.261 11.8792L33.2481 9.95049L33.2769 10.0295L28.0265 11.9404L33.4263 10.4401L33.4551 10.519L26.4548 12.7271L26.0984 11.7479Z" fill="white"/>
+<path id="Path-2-Copy-2" fill-rule="evenodd" clip-rule="evenodd" d="M22.6826 8.81195L24.7046 1.3892L24.7836 1.41794L23.4964 7.16561L25.3047 1.60764L25.3837 1.63638L23.5468 7.96095L26.0154 1.86631L26.0944 1.89505L24.0966 7.38404L26.505 2.0445L26.584 2.07324L23.6618 9.16834L22.6826 8.81195Z" fill="white"/>
+<path id="Fill-40" fill-rule="evenodd" clip-rule="evenodd" d="M11.8197 24.3821C11.6793 24.3821 11.3985 24.4343 11.3985 24.2486V22.9189C11.3985 22.399 11.4152 22.3247 12.0427 22.3247C12.7775 22.3247 13.2319 22.6959 13.2319 23.3793C13.2319 23.6763 13.1244 23.9512 12.852 24.137C12.5382 24.3524 12.1995 24.3821 11.8197 24.3821ZM14.6386 26.6599L14.4452 26.6432C14.4061 26.6391 14.3714 26.6342 14.3383 26.629C14.0553 26.579 13.9421 26.3282 13.8089 26.0957L13.1401 24.937C13.0246 24.7439 12.9006 24.4838 12.6363 24.4469C13.3217 24.3652 13.9412 23.9715 13.9412 23.2957C13.9412 22.5155 13.1648 22.1665 12.3803 22.1665C11.9097 22.1665 11.4807 22.1791 11.0017 22.1791C10.7375 22.1791 10.4233 22.1665 10.1591 22.1665C10.0123 22.1665 10.0105 22.1963 10.0105 22.2778C10.0105 22.3985 10.0617 22.3648 10.217 22.3734C10.775 22.4047 10.7535 22.5082 10.7535 22.9835V26.0214C10.7535 26.4564 10.7913 26.5862 10.3326 26.627C10.3326 26.627 10.2622 26.6342 10.2224 26.6384L10.028 26.6582C9.98158 26.6997 9.99713 26.8106 10.0435 26.8316C10.1468 26.8279 10.3302 26.8205 10.3302 26.8205C10.5841 26.8131 10.8382 26.7938 11.0921 26.7938C11.3476 26.7938 11.5921 26.8133 11.8432 26.8205V26.8209C11.9324 26.8237 12.0263 26.8267 12.1297 26.8305C12.1761 26.8097 12.1917 26.6987 12.1453 26.6573L11.9496 26.6389C11.9097 26.6347 11.841 26.6285 11.841 26.6285C11.3776 26.5972 11.406 26.4672 11.406 26.0214V24.8777C11.406 24.8107 11.3977 24.6325 11.4472 24.5807C11.4886 24.5358 11.5628 24.5433 11.6289 24.5433C12.2566 24.5433 12.2482 24.6028 12.5456 25.1226L13.3548 26.5712C13.4207 26.6827 13.4704 26.8237 13.6356 26.8237H14.3384C14.4271 26.8265 14.5205 26.8293 14.6231 26.8332C14.6696 26.8124 14.6851 26.7014 14.6386 26.6599Z" fill="white"/>
+<path id="Fill-41" fill-rule="evenodd" clip-rule="evenodd" d="M12.056 30.2387C12.056 29.5031 12.0406 29.391 11.5549 29.3558L11.3619 29.3418C11.3157 29.3137 11.3311 29.1878 11.3774 29.1665C11.8093 29.1805 12.0715 29.1875 12.38 29.1875C12.6807 29.1875 12.943 29.1805 13.3286 29.1667C13.3749 29.1878 13.3904 29.3137 13.3441 29.3418L13.159 29.3558C12.704 29.391 12.6885 29.5031 12.6885 30.2387V32.6773C12.6885 33.1186 12.7117 33.3007 12.8504 33.4338C12.9352 33.5108 13.0817 33.5951 13.6911 33.5951C14.3468 33.5951 14.5087 33.5672 14.6322 33.5042C14.7865 33.4199 14.9869 33.1676 15.1411 32.8103C15.1875 32.7754 15.334 32.8033 15.334 32.8523C15.334 32.9296 15.1179 33.6442 15.01 33.8332C14.6167 33.8192 13.8839 33.8123 13.0895 33.8123H12.38C12.056 33.8123 11.8093 33.8192 11.3774 33.8332C11.3311 33.8123 11.3157 33.7 11.3619 33.6581L11.5933 33.6372C12.0406 33.5951 12.056 33.497 12.056 32.7615V30.2387Z" fill="white"/>
+<path id="Fill-42" fill-rule="evenodd" clip-rule="evenodd" d="M33.02 30.2525C33.02 29.51 33.0048 29.391 32.553 29.3558L32.3617 29.3418C32.3159 29.3137 32.331 29.1878 32.3772 29.1665C32.7598 29.1805 33.02 29.1875 33.3417 29.1875C33.6479 29.1875 33.9081 29.1805 34.291 29.1667C34.3369 29.1878 34.3522 29.3137 34.3062 29.3418L34.1149 29.3558C33.6632 29.391 33.6479 29.51 33.6479 30.2525V32.7474C33.6479 33.4899 33.6632 33.5882 34.1149 33.6372L34.3062 33.6581C34.3522 33.6862 34.3369 33.8123 34.291 33.8332C33.9081 33.8192 33.6479 33.8123 33.3417 33.8123C33.02 33.8123 32.7598 33.8192 32.3772 33.8332C32.331 33.8123 32.3159 33.7 32.3617 33.6581L32.553 33.6372C33.0048 33.5882 33.02 33.4899 33.02 32.7474V30.2525Z" fill="white"/>
+<path id="Fill-43" fill-rule="evenodd" clip-rule="evenodd" d="M26.7718 33.6358C26.7325 33.6318 26.6595 33.6258 26.6595 33.6258C26.5791 33.6178 26.5071 33.6065 26.45 33.5448C26.3512 33.4406 26.3595 33.1438 26.3595 33.0251V29.9589C26.3595 29.8251 26.3266 29.5358 26.4253 29.4318C26.475 29.3768 26.5777 29.3678 26.6693 29.3624C26.7249 29.3582 26.7263 29.3579 26.7751 29.3554L26.9709 29.3416C27.018 29.3136 27.0023 29.1876 26.9552 29.1665C26.8506 29.1703 26.7555 29.1689 26.665 29.1717V29.1721H25.8324C25.7419 29.1721 25.6595 29.1721 25.6102 29.2686L23.9137 32.7726L22.415 29.3874C22.3655 29.2686 22.3573 29.1721 22.2008 29.1721H21.3342C21.2439 29.1694 21.1442 29.1703 21.0397 29.1665C20.9927 29.1876 20.9769 29.3136 21.0239 29.3416L21.2198 29.3554C21.2602 29.3588 21.3334 29.3636 21.3334 29.3636C21.6583 29.3844 21.6786 29.4562 21.649 29.7956L21.3938 33.0843C21.3714 33.4145 21.3531 33.589 21.0045 33.621C21.0045 33.621 20.9306 33.6303 20.8902 33.6346L20.6944 33.6555C20.6474 33.6973 20.6631 33.8094 20.7101 33.8303C20.8134 33.8268 20.9968 33.8212 20.9968 33.8212C21.1735 33.8128 21.3538 33.7971 21.5339 33.7971C21.7281 33.7971 21.9227 33.8151 22.1172 33.823C22.2074 33.8259 22.3027 33.829 22.4073 33.8329C22.4544 33.8119 22.47 33.7 22.4232 33.658L22.2272 33.6371C22.1758 33.633 22.118 33.6274 22.118 33.6274C21.6147 33.5933 21.6258 33.2407 21.6572 32.8099L21.8962 29.7512H21.9538L23.576 33.5149C23.5925 33.5668 23.6171 33.6561 23.6997 33.6561C23.7738 33.6561 23.7984 33.5744 23.8231 33.5222L25.6512 29.6618H25.709V33.0251C25.709 33.1584 25.7253 33.4333 25.5855 33.5374C25.5121 33.591 25.2744 33.6236 25.2744 33.6236C25.2417 33.6288 25.2072 33.6332 25.1683 33.6375L24.9724 33.6584C24.9254 33.7003 24.9411 33.8123 24.988 33.8332C25.0912 33.8296 25.2744 33.8237 25.2744 33.8237C25.5397 33.8166 25.8095 33.7971 26.0795 33.7971C26.2733 33.7971 26.6535 33.8154 26.6535 33.8154C26.7439 33.8181 26.847 33.8278 26.9517 33.8317C26.9988 33.8107 27.0145 33.6988 26.9675 33.6568L26.7718 33.6358Z" fill="white"/>
+<path id="Fill-44" fill-rule="evenodd" clip-rule="evenodd" d="M37.8847 31.9487H36.9551C36.9227 31.9487 36.6642 31.9778 36.6642 31.9047C36.6642 31.8827 36.6803 31.8388 36.6883 31.8171L37.2462 30.4846C37.2624 30.4481 37.3189 30.2653 37.3836 30.2653C37.4321 30.2653 37.4967 30.4554 37.5129 30.4846L38.0624 31.7291C38.0624 31.7436 38.1189 31.8606 38.1189 31.89C38.1189 31.9706 37.9332 31.9487 37.8847 31.9487ZM39.9713 33.6574L39.9446 33.6364C39.905 33.6323 39.8697 33.6277 39.8365 33.6226C39.5269 33.5559 39.406 33.1962 39.2919 32.9402L37.699 29.3042C37.6832 29.2607 37.6516 29.1665 37.5884 29.1665C37.5016 29.1665 37.478 29.268 37.4544 29.3258L35.9325 32.9549C35.8772 33.0922 35.7354 33.4255 35.6327 33.5268C35.5542 33.6045 35.4519 33.6194 35.3429 33.6301C35.3429 33.6301 35.257 33.6382 35.2159 33.6425L35.0289 33.6607C34.9811 33.7021 34.997 33.8126 35.0447 33.8332C35.1509 33.8297 35.3393 33.8232 35.3393 33.8232C35.5475 33.8204 35.7556 33.7951 35.9639 33.7951C36.1393 33.7951 36.3145 33.813 36.4898 33.8205C36.4898 33.8205 36.6779 33.827 36.784 33.8307C36.8317 33.81 36.8476 33.6995 36.8 33.6582L36.6013 33.6373C36.5618 33.6335 36.4934 33.627 36.4934 33.627C36.3105 33.6077 36.0824 33.576 36.0824 33.382C36.0824 33.2516 36.1454 33.0995 36.1927 32.9835L36.4292 32.4405C36.5476 32.1797 36.5003 32.1506 36.8156 32.1506H37.8881C38.2666 32.1506 38.2114 32.1506 38.3771 32.5202L38.6294 33.0705C38.6689 33.1647 38.7398 33.3243 38.7398 33.4255C38.7398 33.6075 38.5337 33.6196 38.3412 33.6354C38.3412 33.6354 38.2773 33.6406 38.222 33.6445L38.0309 33.658C37.9831 33.6993 37.9991 33.8098 38.0468 33.8305C38.1528 33.8269 38.3412 33.8195 38.3412 33.8195C38.5655 33.8116 38.7913 33.7951 39.0079 33.7951C39.2841 33.7951 39.5604 33.813 39.8366 33.8205C39.9272 33.8231 39.8505 33.8261 39.9553 33.8297C40.0029 33.8091 40.019 33.6986 39.9713 33.6574Z" fill="white"/>
+<path id="Fill-39" fill-rule="evenodd" clip-rule="evenodd" d="M34.5757 11.6045L32.6242 10.2203C32.6242 10.2203 30.2867 11.9973 30.1511 12.0244C30.0153 12.0513 28.5207 11.5127 28.5207 11.5127C27.977 11.7819 24.5524 14.0169 24.5524 14.0169L23.1392 13.0745L21.7533 12.8051L19.9055 11.4857L17.7852 12.9128C17.7852 12.9128 15.4208 14.2592 15.339 14.2592C15.2579 14.2592 12.4855 12.105 12.4855 12.105L11.2084 10.7856C10.991 10.9202 9.95807 11.3781 9.95807 11.3781L8.19185 10.1665L5.01039 11.9435C4.7856 12.9623 4.66602 14.0194 4.66602 15.1042C4.66602 16.0548 4.75789 16.9841 4.93185 17.885C6.26455 17.647 8.6949 17.3087 10.7055 17.5575C13.6406 17.9212 15.475 18.4057 18.5734 19.0924C21.6714 19.7791 23.9545 20.4253 27.2971 20.0618C30.4264 19.7216 32.6982 19.0978 34.7808 17.628C34.924 16.8076 34.9993 15.9646 34.9993 15.1042C34.9993 13.8986 34.8521 12.727 34.5757 11.6045Z" fill="#5475A7"/>
+</g>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_746_105172">
+<rect width="40" height="35.6667" fill="white" transform="translate(0 0.166504)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/frontend/public/img/logo1.svg b/frontend/public/img/logo1.svg
deleted file mode 100644
index 5bd735241d..0000000000
--- a/frontend/public/img/logo1.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="40" height="36" viewBox="0 0 40 36" fill="none">
-  <g clip-path="url(#clip0_2159_23730)">
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M6.17438 25.4031C6.17438 25.7094 6.19258 26.1433 6.365 26.3305C6.53753 26.526 6.8098 26.5688 7.08207 26.5688C7.88967 26.5688 8.50677 26.2285 8.50677 25.3776C8.50677 24.7053 8.14374 23.9227 6.70084 23.9227C6.21078 23.9227 6.17438 23.9739 6.17438 24.1439V25.4031ZM6.17438 23.429C6.17438 23.6674 6.18348 23.6844 6.64637 23.6674C7.57202 23.6333 8.0713 23.3781 8.0713 22.5784C8.0713 21.7445 7.4087 21.4298 6.71904 21.4298C6.51933 21.4298 6.38319 21.4466 6.30153 21.4807C6.21078 21.5063 6.17438 21.549 6.17438 21.7019V23.429ZM5.43024 22.2977C5.43024 21.6681 5.3876 21.5011 4.97919 21.4672L4.6952 21.4466C4.64891 21.4084 4.66199 21.238 4.7043 21.2341C5.19414 21.1886 5.81147 21.166 6.65546 21.166C7.22719 21.166 7.77173 21.2084 8.18025 21.4043C8.57046 21.5828 8.8698 21.9231 8.8698 22.4678C8.8698 23.0804 8.48869 23.3952 7.94414 23.6333C7.94414 23.7184 8.01682 23.7441 8.11656 23.7609C8.60663 23.8462 9.33268 24.2713 9.33268 25.1818C9.33268 26.169 8.55226 26.8327 6.91852 26.8327C6.65546 26.8327 6.21078 26.8069 5.82955 26.8069C5.43024 26.8069 5.12169 26.8243 4.78585 26.8327C4.73148 26.8069 4.71329 26.6709 4.76776 26.6196L4.93119 26.5941C5.41205 26.5175 5.43024 26.424 5.43024 25.5307V22.2977Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M16.0201 23.2523C16.0201 22.5096 16.0048 22.3905 15.5532 22.3554L15.3617 22.3413C15.3158 22.3133 15.3311 22.1874 15.3771 22.166C15.7599 22.1802 16.0201 22.1874 16.3417 22.1874C16.6479 22.1874 16.9081 22.1802 17.291 22.166C17.3369 22.1874 17.3522 22.3133 17.3062 22.3413L17.1148 22.3554C16.6632 22.3905 16.6479 22.5096 16.6479 23.2523V25.7468C16.6479 26.4893 16.6632 26.5874 17.1148 26.6365L17.3062 26.6574C17.3522 26.6855 17.3369 26.8115 17.291 26.8327C16.9081 26.8185 16.6479 26.8115 16.3417 26.8115C16.0201 26.8115 15.7599 26.8185 15.3771 26.8327C15.3311 26.8115 15.3158 26.6995 15.3617 26.6574L15.5532 26.6365C16.0048 26.5874 16.0201 26.4893 16.0201 25.7468V23.2523Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M20.2861 25.8067C20.2861 26.5107 20.3006 26.6112 20.7215 26.645L20.9538 26.6649C20.9973 26.6918 20.9829 26.8124 20.9394 26.8327C20.5256 26.8191 20.279 26.8124 19.9885 26.8124C19.6982 26.8124 19.4442 26.8191 18.9798 26.8327C18.9362 26.8124 18.9217 26.6986 18.9798 26.6649L19.241 26.645C19.6547 26.6112 19.691 26.5107 19.691 25.8067V22.809C19.691 22.6011 19.691 22.5946 19.4732 22.5946H19.074C18.762 22.5946 18.3628 22.6078 18.1814 22.762C18.0072 22.9095 17.9347 23.0573 17.8549 23.2248C17.7967 23.2651 17.6952 23.2315 17.666 23.1779C17.7822 22.8762 17.8911 22.4469 17.9418 22.1786C17.9638 22.1653 18.0581 22.1586 18.0798 22.1786C18.1234 22.3931 18.3628 22.3867 18.6968 22.3867H21.636C22.0279 22.3867 22.0933 22.3731 22.2022 22.1988C22.2384 22.1854 22.3182 22.1922 22.3327 22.2188C22.253 22.4939 22.2022 23.037 22.2239 23.2384C22.1949 23.292 22.0714 23.292 22.0353 23.2517C22.0134 23.0838 21.9626 22.8358 21.8538 22.762C21.6867 22.6479 21.4112 22.5946 21.0119 22.5946H20.4967C20.279 22.5946 20.2861 22.6011 20.2861 22.8225V25.8067Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M23.352 23.2523C23.352 22.5096 23.3368 22.3905 22.8851 22.3554L22.6938 22.3413C22.6478 22.3133 22.6631 22.1874 22.709 22.166C23.0918 22.1802 23.352 22.1874 23.6737 22.1874C23.9798 22.1874 24.2401 22.1802 24.623 22.166C24.6689 22.1874 24.6842 22.3133 24.6383 22.3413L24.4467 22.3554C23.9952 22.3905 23.9798 22.5096 23.9798 23.2523V25.7468C23.9798 26.4893 23.9952 26.5874 24.4467 26.6365L24.6383 26.6574C24.6842 26.6855 24.6689 26.8115 24.623 26.8327C24.2401 26.8185 23.9798 26.8115 23.6737 26.8115C23.352 26.8115 23.0918 26.8185 22.709 26.8327C22.6631 26.8115 22.6478 26.6995 22.6938 26.6574L22.8851 26.6365C23.3368 26.5874 23.352 26.4893 23.352 25.7468V23.2523Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M26.8744 26.8327C26.1673 26.8327 25.7212 26.6572 25.5612 26.5833C25.46 26.4347 25.3508 25.956 25.334 25.6389C25.376 25.5918 25.5023 25.5785 25.5361 25.6188C25.6623 25.9628 26.0073 26.6233 26.9839 26.6233C27.691 26.6233 28.036 26.2525 28.036 25.8481C28.036 25.5516 27.9604 25.221 27.3457 24.904L26.5462 24.4858C26.1252 24.2635 25.637 23.879 25.637 23.326C25.637 22.6854 26.26 22.166 27.3542 22.166C27.6151 22.166 27.9182 22.2068 28.137 22.2539C28.2465 22.2809 28.3642 22.2942 28.4316 22.2942C28.5075 22.4563 28.5833 22.8338 28.5833 23.117C28.5495 23.1576 28.4149 23.1776 28.3728 23.1373C28.2634 22.8136 28.036 22.3753 27.2279 22.3753C26.4031 22.3753 26.2263 22.8136 26.2263 23.1237C26.2263 23.515 26.6302 23.7982 26.9417 23.9532L27.6151 24.2904C28.1455 24.5533 28.6673 24.9443 28.6673 25.585C28.6673 26.3268 27.9688 26.8327 26.8744 26.8327Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M31.0554 24.5484C30.681 24.5484 30.6653 24.5625 30.6653 24.7727V25.7607C30.6653 26.4963 30.7044 26.5946 31.1413 26.6365L31.3675 26.6574C31.4144 26.6855 31.3988 26.8115 31.352 26.8327C30.9306 26.8185 30.6653 26.8115 30.3611 26.8115C30.0254 26.8115 29.7602 26.8255 29.456 26.8327C29.4091 26.8115 29.3935 26.6995 29.4404 26.6574L29.5729 26.6365C30.01 26.5665 30.0254 26.4963 30.0254 25.7607V23.2383C30.0254 22.5025 29.9709 22.3835 29.5651 22.3554L29.3622 22.3413C29.3155 22.3133 29.331 22.1874 29.3778 22.166C29.7602 22.1732 30.0254 22.1874 30.3611 22.1874C30.6653 22.1874 30.9306 22.1802 31.2661 22.166C31.3131 22.1874 31.3285 22.3133 31.2818 22.3413L31.1335 22.3554C30.681 22.3975 30.6653 22.5025 30.6653 23.2383V24.0439C30.6653 24.2612 30.681 24.2681 31.0554 24.2681H33.287C33.6615 24.2681 33.6772 24.2612 33.6772 24.0439V23.2383C33.6772 22.5025 33.6615 22.3975 33.2012 22.3554L33.0532 22.3413C33.006 22.3133 33.0217 22.1874 33.0686 22.166C33.4276 22.1802 33.6929 22.1874 34.0127 22.1874C34.317 22.1874 34.5822 22.1802 34.9334 22.166C34.9802 22.1874 34.9958 22.3133 34.949 22.3413L34.7851 22.3554C34.3327 22.3975 34.317 22.5025 34.317 23.2383V25.7607C34.317 26.4963 34.3327 26.5874 34.7851 26.6365L34.9724 26.6574C35.0191 26.6855 35.0037 26.8115 34.9569 26.8327C34.5822 26.8185 34.317 26.8115 34.0127 26.8115C33.6929 26.8115 33.412 26.8185 33.0686 26.8327C33.0217 26.8115 33.006 26.6995 33.0532 26.6574L33.2012 26.6365C33.6772 26.5665 33.6772 26.4963 33.6772 25.7607V24.7727C33.6772 24.5625 33.6615 24.5484 33.287 24.5484H31.0554Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M1.12969 28.5688C1.78432 28.0746 2.61816 27.832 3.55057 27.832C4.03479 27.832 4.71618 27.9272 5.13761 28.04C5.24523 28.0659 5.30802 28.0834 5.38864 28.0746C5.39768 28.274 5.44251 28.8201 5.51422 29.3493C5.46939 29.4098 5.33489 29.4186 5.2721 29.3666C5.13761 28.777 4.73413 28.1005 3.43415 28.1005C2.06223 28.1005 0.8965 28.9415 0.8965 30.7364C0.8965 32.5572 2.0891 33.563 3.55949 33.563C4.71618 33.563 5.22727 32.8346 5.43347 32.3229C5.49626 32.2799 5.63087 32.2972 5.66667 32.3579C5.604 32.8087 5.37081 33.3808 5.23631 33.5459C5.12869 33.563 5.02108 33.5978 4.9225 33.6323C4.72509 33.7019 4.07962 33.832 3.50586 33.832C2.6989 33.832 1.92773 33.6758 1.2731 33.2508C0.555808 32.7741 0 31.9852 0 30.8666C0 29.904 0.44831 29.0805 1.12969 28.5688Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M10.5746 31.5341C10.5746 30.3421 10.0209 29.0559 8.57189 29.0559C7.78284 29.0559 6.75869 29.5688 6.75869 31.1512C6.75869 32.2204 7.30489 33.6079 8.79933 33.6079C9.70981 33.6079 10.5746 32.9577 10.5746 31.5341ZM6 31.3823C6 29.9375 7.13792 28.832 8.70073 28.832C10.4533 28.832 11.3333 30.0384 11.3333 31.3101C11.3333 32.7696 10.1651 33.832 8.70073 33.832C7.01673 33.832 6 32.683 6 31.3823Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M19.4549 30.9118C19.4549 30.4857 19.4417 29.6954 19.3293 29.4892C19.2832 29.4067 19.1643 29.3585 18.9992 29.3447L18.8342 29.331C18.7945 29.2827 18.8077 29.1937 18.8472 29.166C19.0982 29.1798 19.3426 29.1867 19.6003 29.1867C19.8778 29.1867 20.0561 29.1798 20.294 29.1661C20.3466 29.2007 20.34 29.2898 20.3071 29.331L20.1486 29.3447C19.9834 29.3585 19.8578 29.4205 19.8183 29.5099C19.7259 29.7366 19.7259 30.527 19.7259 30.9118V31.6884C19.7259 32.2863 19.6333 32.9184 19.2635 33.3309C18.9794 33.6537 18.4906 33.8327 18.0018 33.8327C17.546 33.8327 17.0903 33.7431 16.7666 33.4545C16.4165 33.1523 16.2513 32.6505 16.2513 31.8327V30.2106C16.2513 29.4961 16.2381 29.3793 15.8552 29.3447L15.6899 29.331C15.6504 29.3037 15.6635 29.1869 15.7031 29.166C16.0334 29.1798 16.258 29.1867 16.5222 29.1867C16.793 29.1867 17.011 29.1798 17.3346 29.1661C17.3743 29.1869 17.3875 29.3037 17.3479 29.331L17.1893 29.3447C16.8062 29.3793 16.793 29.4961 16.793 30.2106V31.6952C16.793 32.8016 17.1232 33.5303 18.1339 33.5303C19.0917 33.5303 19.4549 32.7467 19.4549 31.7021V30.9118Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M29.0675 32.6555C29.0675 32.9075 29.0843 33.265 29.2444 33.4193C29.4045 33.5803 29.6573 33.6155 29.91 33.6155C30.6596 33.6155 31.2326 33.335 31.2326 32.6344C31.2326 32.0808 30.8956 31.4364 29.556 31.4364C29.1012 31.4364 29.0675 31.4783 29.0675 31.6183V32.6555ZM29.0675 31.0297C29.0675 31.2259 29.076 31.24 29.5055 31.2259C30.3649 31.1979 30.8283 30.9879 30.8283 30.3289C30.8283 29.6422 30.2133 29.383 29.573 29.383C29.3876 29.383 29.2614 29.3972 29.1853 29.4251C29.1012 29.4462 29.0675 29.4811 29.0675 29.6073V31.0297ZM28.3766 30.0979C28.3766 29.5793 28.343 29.4462 27.9639 29.4182L27.6942 29.393C27.6634 29.3662 27.6472 29.2257 27.7026 29.2217C28.1577 29.1891 28.7304 29.166 29.5141 29.166C30.0448 29.166 30.5501 29.201 30.9294 29.3619C31.2916 29.5092 31.5694 29.7894 31.5694 30.238C31.5694 30.7425 31.2157 31.0019 30.7103 31.1979C30.7103 31.2681 30.7774 31.2891 30.8703 31.3032C31.3253 31.373 31.9993 31.7236 31.9993 32.4732C31.9993 33.2861 31.2747 33.8327 29.7581 33.8327C29.5141 33.8327 29.1012 33.8113 28.7473 33.8113C28.3766 33.8113 28.0904 33.8255 27.7784 33.8327C27.728 33.8113 27.711 33.6994 27.7615 33.6576L27.9133 33.6366C28.3597 33.5733 28.3766 33.4963 28.3766 32.7606V30.0979Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd" d="M5 35.8314H35V35.498H5V35.8314Z" fill="#F3B229" />
-    <mask id="mask0_2159_23730" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="5" y="0"
-      width="30" height="15">
-      <path
-        d="M34.5881 11.7609C33.0244 5.12206 27.0248 0.177734 19.8621 0.177734C12.5785 0.177734 6.49762 5.28999 5.06055 12.0979L8.25466 10.2907L10.0158 11.5143C10.0158 11.5143 11.0457 11.052 11.2625 10.916L12.536 12.2484C12.536 12.2484 15.3003 14.4237 15.3813 14.4237C15.4627 14.4237 17.8204 13.0641 17.8204 13.0641L19.9346 11.623L21.777 12.9553L23.1589 13.2273L24.568 14.179C24.568 14.179 27.9828 11.922 28.5249 11.65C28.5249 11.65 30.0152 12.1941 30.1506 12.1668C30.2859 12.1396 32.6166 10.345 32.6166 10.345L34.5881 11.7609Z"
-        fill="#FCBA19" />
-    </mask>
-    <g mask="url(#mask0_2159_23730)">
-      <path fill-rule="evenodd" clip-rule="evenodd"
-        d="M34.5881 11.7609C33.0244 5.12206 27.0248 0.177734 19.8621 0.177734C12.5785 0.177734 6.49762 5.28999 5.06055 12.0979L8.25466 10.2907L10.0158 11.5143C10.0158 11.5143 11.0457 11.052 11.2625 10.916L12.536 12.2484C12.536 12.2484 15.3003 14.4237 15.3813 14.4237C15.4627 14.4237 17.8204 13.0641 17.8204 13.0641L19.9346 11.623L21.777 12.9553L23.1589 13.2273L24.568 14.179C24.568 14.179 27.9828 11.922 28.5249 11.65C28.5249 11.65 30.0152 12.1941 30.1506 12.1668C30.2859 12.1396 32.6166 10.345 32.6166 10.345L34.5881 11.7609Z"
-        fill="#FCBA19" />
-    </g>
-    <mask id="mask1_2159_23730" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="8" y="1"
-      width="24" height="15">
-      <path
-        d="M17.9586 13.6806L20.0955 12.1891L21.9577 13.568L23.3545 13.8495L24.7788 14.8346C24.7788 14.8346 26.332 13.7833 27.5201 13.0064C27.3148 12.4572 27.0522 11.9367 26.7391 11.4531L31.8953 7.39453L26.4137 10.9875C25.9213 10.3338 25.3319 9.7598 24.6673 9.28742L27.8993 3.65325L24.2036 8.98197C23.5145 8.56216 22.7574 8.24642 21.9523 8.05661L22.8778 1.57031L21.4074 7.94914C21.0043 7.88431 20.5909 7.8502 20.1697 7.8502C19.7214 7.8502 19.2819 7.88899 18.854 7.96222L17.3805 1.57031L18.3088 8.07623C17.511 8.27305 16.7607 8.59323 16.079 9.01666L12.359 3.65325L15.6146 9.32819C14.9615 9.80127 14.3827 10.3735 13.899 11.0231L8.36328 7.39453L13.5729 11.4953C13.2729 11.9653 13.0199 12.4693 12.8209 13.0002C13.4648 13.5174 15.4249 15.0878 15.4933 15.0878C15.5756 15.0878 17.9586 13.6806 17.9586 13.6806Z"
-        fill="white" />
-    </mask>
-    <g mask="url(#mask1_2159_23730)">
-      <path fill-rule="evenodd" clip-rule="evenodd"
-        d="M17.9586 13.6806L20.0955 12.1891L21.9577 13.568L23.3545 13.8495L24.7788 14.8346C24.7788 14.8346 26.332 13.7833 27.5201 13.0064C27.3148 12.4572 27.0522 11.9367 26.7391 11.4531L31.8953 7.39453L26.4137 10.9875C25.9213 10.3338 25.3319 9.7598 24.6673 9.28742L27.8993 3.65325L24.2036 8.98197C23.5145 8.56216 22.7574 8.24642 21.9523 8.05661L22.8778 1.57031L21.4074 7.94914C21.0043 7.88431 20.5909 7.8502 20.1697 7.8502C19.7214 7.8502 19.2819 7.88899 18.854 7.96222L17.3805 1.57031L18.3088 8.07623C17.511 8.27305 16.7607 8.59323 16.079 9.01666L12.359 3.65325L15.6146 9.32819C14.9615 9.80127 14.3827 10.3735 13.899 11.0231L8.36328 7.39453L13.5729 11.4953C13.2729 11.9653 13.0199 12.4693 12.8209 13.0002C13.4648 13.5174 15.4249 15.0878 15.4933 15.0878C15.5756 15.0878 17.9586 13.6806 17.9586 13.6806Z"
-        fill="white" />
-    </g>
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M20.6953 8.16471L21.334 0.498047H21.25L20.4936 6.33932L20.6953 0.498047H20.6113L20.1743 7.06948L19.939 0.498047H19.855V6.33932L19.418 0.498047H19.334L19.6533 8.16471H20.6953Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M17.6514 8.81097L15.6294 1.38823L15.5504 1.41697L16.8376 7.16464L15.0292 1.60666L14.9503 1.6354L16.7872 7.95998L14.3186 1.86533L14.2396 1.89407L16.2374 7.38307L13.829 2.04352L13.75 2.07227L16.6722 9.16736L17.6514 8.81097Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M15.2998 10.1206L10.3302 4.2479L10.2708 4.30732L13.8664 8.9725L9.87863 4.69949L9.81921 4.75891L14.1569 9.7146L9.34384 5.23428L9.28442 5.2937L13.4148 9.4241L8.97544 5.60269L8.91602 5.66211L14.563 10.8575L15.2998 10.1206Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M24.7002 10.1206L29.6698 4.2479L29.7292 4.30732L26.1336 8.97251L30.1214 4.69949L30.1808 4.75891L25.8431 9.7146L30.6562 5.23428L30.7156 5.2937L26.5852 9.4241L31.0246 5.60269L31.084 5.66211L25.437 10.8575L24.7002 10.1206Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M13.7266 11.6378L6.74068 8.41554L6.71194 8.4945L11.9423 11.203L6.52225 9.01568L6.49351 9.09464L12.5192 11.7528L6.26358 9.72637L6.23484 9.80533L11.7238 11.8032L6.08538 10.216L6.05664 10.2949L13.3702 12.617L13.7266 11.6378Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M26.0984 11.7465L32.771 8.63819L32.7998 8.71716L27.8081 11.3388L32.9895 9.23833L33.0182 9.3173L27.261 11.8778L33.2481 9.94903L33.2769 10.028L28.0265 11.939L33.4263 10.4386L33.4551 10.5176L26.4548 12.7257L26.0984 11.7465Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M22.6826 8.81097L24.7046 1.38823L24.7836 1.41697L23.4964 7.16464L25.3047 1.60666L25.3837 1.6354L23.5468 7.95998L26.0154 1.86533L26.0944 1.89407L24.0966 7.38307L26.505 2.04352L26.584 2.07227L23.6618 9.16736L22.6826 8.81097Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M11.8197 24.3816C11.6793 24.3816 11.3985 24.4338 11.3985 24.2481V22.9184C11.3985 22.3986 11.4152 22.3242 12.0427 22.3242C12.7775 22.3242 13.2319 22.6954 13.2319 23.3789C13.2319 23.6759 13.1244 23.9507 12.852 24.1365C12.5382 24.3519 12.1995 24.3816 11.8197 24.3816ZM14.6386 26.6594L14.4452 26.6427C14.4061 26.6386 14.3714 26.6337 14.3383 26.6285C14.0553 26.5785 13.9421 26.3277 13.8089 26.0952L13.1401 24.9366C13.0246 24.7434 12.9006 24.4833 12.6363 24.4464C13.3217 24.3647 13.9412 23.971 13.9412 23.2952C13.9412 22.5151 13.1648 22.166 12.3803 22.166C11.9097 22.166 11.4807 22.1787 11.0017 22.1787C10.7375 22.1787 10.4233 22.166 10.1591 22.166C10.0123 22.166 10.0105 22.1958 10.0105 22.2773C10.0105 22.398 10.0617 22.3644 10.217 22.3729C10.775 22.4042 10.7535 22.5077 10.7535 22.983V26.0209C10.7535 26.4559 10.7913 26.5857 10.3326 26.6266C10.3326 26.6266 10.2622 26.6337 10.2224 26.638L10.028 26.6577C9.98158 26.6993 9.99713 26.8101 10.0435 26.8311C10.1468 26.8274 10.3302 26.82 10.3302 26.82C10.5841 26.8126 10.8382 26.7933 11.0921 26.7933C11.3476 26.7933 11.5921 26.8128 11.8432 26.82V26.8204C11.9324 26.8232 12.0263 26.8262 12.1297 26.83C12.1761 26.8092 12.1917 26.6982 12.1453 26.6568L11.9496 26.6384C11.9097 26.6342 11.841 26.628 11.841 26.628C11.3776 26.5968 11.406 26.4667 11.406 26.0209V24.8772C11.406 24.8102 11.3977 24.632 11.4472 24.5802C11.4886 24.5354 11.5628 24.5428 11.6289 24.5428C12.2566 24.5428 12.2482 24.6023 12.5456 25.1221L13.3548 26.5707C13.4207 26.6822 13.4704 26.8232 13.6356 26.8232H14.3384C14.4271 26.826 14.5205 26.8288 14.6231 26.8327C14.6696 26.8119 14.6851 26.7009 14.6386 26.6594Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M12.056 30.2382C12.056 29.5026 12.0406 29.3905 11.5549 29.3553L11.3619 29.3413C11.3157 29.3132 11.3311 29.1874 11.3774 29.166C11.8093 29.1801 12.0715 29.187 12.38 29.187C12.6807 29.187 12.943 29.1801 13.3286 29.1662C13.3749 29.1874 13.3904 29.3132 13.3441 29.3413L13.159 29.3553C12.704 29.3905 12.6885 29.5026 12.6885 30.2382V32.6768C12.6885 33.1181 12.7117 33.3003 12.8504 33.4333C12.9352 33.5103 13.0817 33.5947 13.6911 33.5947C14.3468 33.5947 14.5087 33.5667 14.6322 33.5037C14.7865 33.4194 14.9869 33.1671 15.1411 32.8098C15.1875 32.7749 15.334 32.8029 15.334 32.8518C15.334 32.9291 15.1179 33.6437 15.01 33.8327C14.6167 33.8188 13.8839 33.8118 13.0895 33.8118H12.38C12.056 33.8118 11.8093 33.8188 11.3774 33.8327C11.3311 33.8118 11.3157 33.6995 11.3619 33.6576L11.5933 33.6368C12.0406 33.5947 12.056 33.4965 12.056 32.761V30.2382Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M33.02 30.252C33.02 29.5095 33.0048 29.3905 32.553 29.3553L32.3617 29.3413C32.3159 29.3132 32.331 29.1874 32.3772 29.166C32.7598 29.1801 33.02 29.187 33.3417 29.187C33.6479 29.187 33.9081 29.1801 34.291 29.1662C34.3369 29.1874 34.3522 29.3132 34.3062 29.3413L34.1149 29.3553C33.6632 29.3905 33.6479 29.5095 33.6479 30.252V32.7469C33.6479 33.4894 33.6632 33.5877 34.1149 33.6368L34.3062 33.6576C34.3522 33.6857 34.3369 33.8118 34.291 33.8327C33.9081 33.8188 33.6479 33.8118 33.3417 33.8118C33.02 33.8118 32.7598 33.8188 32.3772 33.8327C32.331 33.8118 32.3159 33.6995 32.3617 33.6576L32.553 33.6368C33.0048 33.5877 33.02 33.4894 33.02 32.7469V30.252Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M26.7718 33.6353C26.7325 33.6313 26.6595 33.6253 26.6595 33.6253C26.5791 33.6173 26.5071 33.606 26.45 33.5443C26.3512 33.4401 26.3595 33.1433 26.3595 33.0246V29.9584C26.3595 29.8246 26.3266 29.5353 26.4253 29.4313C26.475 29.3764 26.5777 29.3674 26.6693 29.3619C26.7249 29.3577 26.7263 29.3574 26.7751 29.3549L26.9709 29.3412C27.018 29.3131 27.0023 29.1871 26.9552 29.166C26.8506 29.1698 26.7555 29.1684 26.665 29.1713V29.1716H25.8324C25.7419 29.1716 25.6595 29.1716 25.6102 29.2681L23.9137 32.7721L22.415 29.387C22.3655 29.2681 22.3573 29.1716 22.2008 29.1716H21.3342C21.2439 29.1689 21.1442 29.1698 21.0397 29.166C20.9927 29.1871 20.9769 29.3131 21.0239 29.3412L21.2198 29.3549C21.2602 29.3584 21.3334 29.3631 21.3334 29.3631C21.6583 29.3839 21.6786 29.4557 21.649 29.7951L21.3938 33.0838C21.3714 33.414 21.3531 33.5885 21.0045 33.6205C21.0045 33.6205 20.9306 33.6299 20.8902 33.6341L20.6944 33.655C20.6474 33.6969 20.6631 33.8089 20.7101 33.8298C20.8134 33.8263 20.9968 33.8207 20.9968 33.8207C21.1735 33.8123 21.3538 33.7966 21.5339 33.7966C21.7281 33.7966 21.9227 33.8146 22.1172 33.8225C22.2074 33.8254 22.3027 33.8285 22.4073 33.8325C22.4544 33.8114 22.47 33.6995 22.4232 33.6575L22.2272 33.6366C22.1758 33.6325 22.118 33.6269 22.118 33.6269C21.6147 33.5928 21.6258 33.2402 21.6572 32.8094L21.8962 29.7507H21.9538L23.576 33.5144C23.5925 33.5663 23.6171 33.6556 23.6997 33.6556C23.7738 33.6556 23.7984 33.5739 23.8231 33.5217L25.6512 29.6613H25.709V33.0246C25.709 33.1579 25.7253 33.4328 25.5855 33.5369C25.5121 33.5905 25.2744 33.6231 25.2744 33.6231C25.2417 33.6283 25.2072 33.6327 25.1683 33.637L24.9724 33.6579C24.9254 33.6998 24.9411 33.8118 24.988 33.8327C25.0912 33.8292 25.2744 33.8232 25.2744 33.8232C25.5397 33.8162 25.8095 33.7966 26.0795 33.7966C26.2733 33.7966 26.6535 33.8149 26.6535 33.8149C26.7439 33.8176 26.847 33.8273 26.9517 33.8312C26.9988 33.8102 27.0145 33.6983 26.9675 33.6563L26.7718 33.6353Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M37.8847 31.9482H36.9551C36.9227 31.9482 36.6642 31.9773 36.6642 31.9042C36.6642 31.8822 36.6803 31.8383 36.6883 31.8166L37.2462 30.4841C37.2624 30.4476 37.3189 30.2648 37.3836 30.2648C37.4321 30.2648 37.4967 30.4549 37.5129 30.4841L38.0624 31.7286C38.0624 31.7431 38.1189 31.8601 38.1189 31.8895C38.1189 31.9702 37.9332 31.9482 37.8847 31.9482ZM39.9713 33.6569L39.9446 33.636C39.905 33.6318 39.8697 33.6272 39.8365 33.6221C39.5269 33.5555 39.406 33.1957 39.2919 32.9398L37.699 29.3037C37.6832 29.2602 37.6516 29.166 37.5884 29.166C37.5016 29.166 37.478 29.2675 37.4544 29.3253L35.9325 32.9544C35.8772 33.0917 35.7354 33.4251 35.6327 33.5263C35.5542 33.604 35.4519 33.6189 35.3429 33.6297C35.3429 33.6297 35.257 33.6378 35.2159 33.642L35.0289 33.6602C34.9811 33.7016 34.997 33.8121 35.0447 33.8327C35.1509 33.8292 35.3393 33.8227 35.3393 33.8227C35.5475 33.8199 35.7556 33.7946 35.9639 33.7946C36.1393 33.7946 36.3145 33.8126 36.4898 33.82C36.4898 33.82 36.6779 33.8265 36.784 33.8302C36.8317 33.8095 36.8476 33.699 36.8 33.6578L36.6013 33.6369C36.5618 33.633 36.4934 33.6265 36.4934 33.6265C36.3105 33.6072 36.0824 33.5755 36.0824 33.3816C36.0824 33.2511 36.1454 33.099 36.1927 32.983L36.4292 32.4401C36.5476 32.1792 36.5003 32.1501 36.8156 32.1501H37.8881C38.2666 32.1501 38.2114 32.1501 38.3771 32.5198L38.6294 33.07C38.6689 33.1642 38.7398 33.3238 38.7398 33.4251C38.7398 33.6071 38.5337 33.6191 38.3412 33.6349C38.3412 33.6349 38.2773 33.6401 38.222 33.644L38.0309 33.6575C37.9831 33.6988 37.9991 33.8093 38.0468 33.83C38.1528 33.8264 38.3412 33.819 38.3412 33.819C38.5655 33.8111 38.7913 33.7946 39.0079 33.7946C39.2841 33.7946 39.5604 33.8126 39.8366 33.82C39.9272 33.8226 39.8505 33.8256 39.9553 33.8292C40.0029 33.8086 40.019 33.6981 39.9713 33.6569Z"
-      fill="white" />
-    <path fill-rule="evenodd" clip-rule="evenodd"
-      d="M34.5757 11.604L32.6242 10.2198C32.6242 10.2198 30.2867 11.9968 30.1511 12.0239C30.0153 12.0508 28.5207 11.5122 28.5207 11.5122C27.977 11.7814 24.5524 14.0164 24.5524 14.0164L23.1392 13.074L21.7533 12.8046L19.9055 11.4852L17.7852 12.9123C17.7852 12.9123 15.4208 14.2587 15.339 14.2587C15.2579 14.2587 12.4855 12.1046 12.4855 12.1046L11.2084 10.7851C10.991 10.9198 9.95807 11.3776 9.95807 11.3776L8.19185 10.166L5.01039 11.9431C4.7856 12.9618 4.66602 14.019 4.66602 15.1037C4.66602 16.0543 4.75789 16.9836 4.93185 17.8845C6.26455 17.6465 8.6949 17.3082 10.7055 17.5571C13.6406 17.9207 15.475 18.4052 18.5734 19.0919C21.6714 19.7786 23.9545 20.4248 27.2971 20.0613C30.4264 19.7211 32.6982 19.0973 34.7808 17.6275C34.924 16.8071 34.9993 15.9641 34.9993 15.1037C34.9993 13.8981 34.8521 12.7265 34.5757 11.604Z"
-      fill="#5475A7" />
-  </g>
-  <defs>
-    <clipPath id="clip0_2159_23730">
-      <rect width="40" height="35.6667" fill="white" transform="translate(0 0.166016)" />
-    </clipPath>
-  </defs>
-</svg>
\ No newline at end of file
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 4dec0e3489..15a0268723 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -236,7 +236,7 @@ hr {
 }
 .headers {
   display: flex;
-  padding: 0.75rem 2.5rem;
+  padding: 0.25rem 2.5rem;
   align-items: center;
   flex: 1 0 0;
   align-self: stretch;
diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 8a836c02b4..bd955281b5 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -26,15 +26,16 @@ const logoutModalActive = ref(false);
 
   <a href="https://gov.bc.ca">
     <img
-      src="/img/logo1.svg"
+      src="/img/logo-vertical 1.svg"
       alt="Go to the Government of British Columbia website"
       v-if="isSmallScreen"
     />
     <img
-      src="/img/bc_for_logo.png"
+      src="/img/BCID_H_rgb_rev.svg"
       alt="Go to the Government of British Columbia website"
       v-else
     />
+    <logo />
   </a>
   <div class="heading">
     <span class="heading-compact-01" v-if="$session?.user?.provider !== 'idir'">Ministry of Forests</span>
@@ -52,7 +53,7 @@ const logoutModalActive = ref(false);
       id="help-btn"
       data-id="help-btn"
       kind="ghost"
-      :size="(isSmallScreen || isMediumScreen) ? 'sm' : 'lg'"
+      size="sm"
       @click.prevent="helpModalActive = true"
     >
       <span v-if="!isSmallScreen && !isMediumScreen">Help with application</span>
@@ -63,7 +64,7 @@ const logoutModalActive = ref(false);
       v-if="$session?.isLoggedIn()"
       data-id="logout-btn"
       kind="tertiary"
-      :size="(isSmallScreen || isMediumScreen) ? 'sm' : 'lg'"
+      size="sm"
       @click.prevent="logoutModalActive = true"
     >
       <span v-if="!isSmallScreen && !isMediumScreen">Logout</span>

From 88277effe248ed3fb16483716989d0583d3479fa Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 22 Sep 2023 12:00:56 -0300
Subject: [PATCH 157/313] feat: adjust header spaces and breakpoints

---
 frontend/src/assets/styles/global.scss        | 48 +++++--------------
 .../src/components/MainHeaderComponent.vue    |  4 +-
 2 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 15a0268723..d96edc169f 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -76,7 +76,7 @@
 
 .heading-buttons {
   display: flex;
-  gap: 2.5rem;
+  gap: 1.5rem;
   --cds-text-inverse: var(--light-theme-text-text-primary);
   --cds-button-tertiary: var(--dark-theme-button-button-tertiary);
   --cds-button-tertiary-hover: var(--dark-theme-focus-focus);
@@ -97,7 +97,7 @@
 }
 
 .heading-buttons cds-button span {
-  width: 7rem;
+  width: 5rem;
 }
 
 .heading-buttons #help-btn span {
@@ -236,7 +236,7 @@ hr {
 }
 .headers {
   display: flex;
-  padding: 0.25rem 2.5rem;
+  padding: 0.25rem 2rem;
   align-items: center;
   flex: 1 0 0;
   align-self: stretch;
@@ -696,8 +696,8 @@ cds-modal {
   height: 100%;
 }
 
-/* Small (up to 320px) */
-@media screen and (max-width: 320px) {
+/* Small (up to 671px) */
+@media screen and (max-width: 671px) {
   .wizard-head-toast {
     right: 0.5rem;
     top: 0.5rem;
@@ -746,14 +746,6 @@ cds-modal {
     width: 2.5rem;
   }
 
-  .heading {
-    width: 6.5rem;
-    padding: 1rem 0.5rem;
-    justify-content: center;
-    align-items: center;
-    flex-shrink: 0;
-  }
-
   .heading span:last-child {
     display: none;
   }
@@ -792,8 +784,8 @@ cds-modal {
   }
 }
 
-/* Medium (from 321px to 671px) */
-@media screen and (min-width: 321px) and (max-width: 671px) {
+/* Medium (from 672px to 1055px) */
+@media screen and (min-width: 672px) and (max-width: 1055px) {
   .form-header-title span {
     color: purple;
   }
@@ -805,21 +797,11 @@ cds-modal {
     align-items: center;
   }
 
-  .headers {
-    padding: 0rem 1rem;
-    gap: 1rem;
-    flex-shrink: 0;
-  }
-
   .heading {
     padding: 0.9375rem 2rem 0.9375rem 0.5rem;
     flex-shrink: 0;
   }
 
-  .heading span:last-child {
-    display: none;
-  }
-
   .heading-space {
     width: 8.75rem;
   }
@@ -829,15 +811,7 @@ cds-modal {
   }
 }
 
-/* Large (from 672px to 1055px) */
-@media screen and (min-width: 672px) and (max-width: 1055px) {
-  .screen {
-    margin: 2rem;
-    align-items: center;
-  }
-}
-
-/* X-Large (from 1057px to 1311px) */
+/* Large (from 1056px to 1311px) */
 @media screen and (min-width: 1056px) and (max-width: 1311px) {
   .screen {
     margin: 2rem;
@@ -845,7 +819,7 @@ cds-modal {
   }
 }
 
-/* XX-Large (from 1312px to 1583px) */
+/* X-Large (from 1312px to 1583px) */
 @media screen and (min-width: 1312px) and (max-width: 1583px) {
   .screen {
     margin: 2rem;
@@ -853,14 +827,14 @@ cds-modal {
   }
 }
 
-/* XXX-Large (from 1584px to 1783px) */
+/* XX-Large (from 1584px to 1783px) */
 @media screen and (min-width: 1584px) and (max-width: 1783px) {
   .form-steps {
     width: 50vw;
   }
 }
 
-/* Larger than XXX-Large (1784px and above) */
+/* XXX-Large (1784px and above) */
 @media screen and (min-width: 1784px) {
   .form-steps {
     width: 50vw;
diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index bd955281b5..37ffd1740a 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -15,8 +15,8 @@ const env = ref(nodeEnv);
 env.value = env.value.slice(envPrefix.length);
 env.value = env.value.charAt(0).toUpperCase() + env.value.slice(1);
 
-const isSmallScreen = useMediaQuery('(max-width: 320px)')
-const isMediumScreen = useMediaQuery('(min-width: 321px) and (max-width: 671px)')
+const isSmallScreen = useMediaQuery('(max-width: 671px)')
+const isMediumScreen = useMediaQuery('(min-width: 672px) and (max-width: 1055px)')
 
 const helpModalActive = ref(false);
 const logoutModalActive = ref(false);

From ec042ce0954a407a3ae76b692bf8f0ab7148a457 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 22 Sep 2023 12:02:43 -0300
Subject: [PATCH 158/313] chore: use date milliseconds as id

---
 frontend/src/components/DataFetcher.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/frontend/src/components/DataFetcher.vue b/frontend/src/components/DataFetcher.vue
index 1036c40ea5..7a5b15757e 100644
--- a/frontend/src/components/DataFetcher.vue
+++ b/frontend/src/components/DataFetcher.vue
@@ -17,8 +17,6 @@ const content = ref<any>(props.initValue)
 
 const response = ref<any>()
 
-const requestCounter = ref<number>(0)
-
 const lastUpdateRequestId = ref<number>(0)
 
 const initialUrlValue = props.url
@@ -53,8 +51,7 @@ watch(
     if (
       calculateStringDifference(initialUrlValue, props.url) >= props.minLength
     ) {
-      requestCounter.value++
-      const curRequestId = requestCounter.value
+      const curRequestId = Date.now()
       // const curUrl = props.url
       fetch().then(() => {
         // Discard the response from old request when a newer one was already responded.

From db6daad318fef223e0d8616c37de190eeb9e744a Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 22 Sep 2023 14:02:58 -0300
Subject: [PATCH 159/313] fix: fix build issue

---
 frontend/public/img/{logo-vertical 1.svg => logo-vertical1.svg} | 0
 frontend/src/components/MainHeaderComponent.vue                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename frontend/public/img/{logo-vertical 1.svg => logo-vertical1.svg} (100%)

diff --git a/frontend/public/img/logo-vertical 1.svg b/frontend/public/img/logo-vertical1.svg
similarity index 100%
rename from frontend/public/img/logo-vertical 1.svg
rename to frontend/public/img/logo-vertical1.svg
diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 37ffd1740a..66c6c1d2c3 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -26,7 +26,7 @@ const logoutModalActive = ref(false);
 
   <a href="https://gov.bc.ca">
     <img
-      src="/img/logo-vertical 1.svg"
+      src="/img/logo-vertical1.svg"
       alt="Go to the Government of British Columbia website"
       v-if="isSmallScreen"
     />

From 47cb3fa2277d6f18be26f79646222b170bd0ca3b Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 22 Sep 2023 14:42:05 -0300
Subject: [PATCH 160/313] fix: prevent error in the workflow

---
 .../components/components/grouping/AddressGroupComponent.cy.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index 0d969b3358..81eef64b5d 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -149,7 +149,7 @@ describe('<AddressGroupComponent />', () => {
       .and('have.value', 'Canada')
       .click()
       .find('cds-combo-box-item[data-id="US"]')
-      .click()
+      .click({ force: true }) // Prevent error in the workflow
       .and('have.value', 'United States of America')
 
     cy.wait('@getStates')

From 37688dc07293314cc9f26d8502a16524f568cee8 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 22 Sep 2023 15:58:41 -0300
Subject: [PATCH 161/313] fix: attempt to fix tests in the workflow

---
 frontend/package-lock.json | 1442 +++++++++++++++++++++++-------------
 frontend/package.json      |    2 +-
 frontend/vite.config.ts    |    2 +-
 3 files changed, 925 insertions(+), 521 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 5e2a6906f7..487c81914e 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -37,7 +37,7 @@
         "@vue/eslint-config-typescript": "^11.0.0",
         "@vue/test-utils": "^2.4.0",
         "@vue/tsconfig": "^0.1.3",
-        "cypress": "^13.1.0",
+        "cypress": "^13.2.0",
         "eslint": "^8.48.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-config-standard": "^17.1.0",
@@ -170,30 +170,30 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
-      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz",
+      "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz",
-      "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz",
+      "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.10",
-        "@babel/generator": "^7.22.10",
-        "@babel/helper-compilation-targets": "^7.22.10",
-        "@babel/helper-module-transforms": "^7.22.9",
-        "@babel/helpers": "^7.22.11",
-        "@babel/parser": "^7.22.11",
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.11",
-        "@babel/types": "^7.22.11",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.22.15",
+        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.22.20",
+        "@babel/helpers": "^7.22.15",
+        "@babel/parser": "^7.22.16",
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.22.20",
+        "@babel/types": "^7.22.19",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -209,12 +209,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
-      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz",
+      "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.10",
+        "@babel/types": "^7.22.15",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -237,26 +237,26 @@
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz",
-      "integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
+      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/types": "^7.22.10"
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
-      "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
+      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.15",
         "browserslist": "^4.21.9",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -266,16 +266,16 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz",
-      "integrity": "sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz",
+      "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.15",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-replace-supers": "^7.22.9",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
@@ -290,9 +290,9 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz",
-      "integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
+      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -325,9 +325,9 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
-      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
+      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -359,41 +359,41 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
-      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.15.tgz",
+      "integrity": "sha512-qLNsZbgrNh0fDQBCPocSL8guki1hcPvltGDv/NxvUoABwFq7GkKSu1nRXeJkVZc+wJvne2E0RKQz+2SQrz6eAA==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
-      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
+      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.5"
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
-      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz",
+      "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-module-imports": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-module-imports": "^7.22.15",
         "@babel/helper-simple-access": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.5"
+        "@babel/helper-validator-identifier": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -426,15 +426,15 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
-      "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
+      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-wrap-function": "^7.22.9"
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-wrap-function": "^7.22.20"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -444,14 +444,14 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
-      "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
+      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.5",
+        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/helper-member-expression-to-functions": "^7.22.15",
         "@babel/helper-optimise-call-expression": "^7.22.5"
       },
       "engines": {
@@ -508,59 +508,59 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
-      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
+      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
-      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
+      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
-      "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
+      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.5",
-        "@babel/types": "^7.22.10"
+        "@babel/template": "^7.22.15",
+        "@babel/types": "^7.22.19"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz",
-      "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz",
+      "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.22.5",
-        "@babel/traverse": "^7.22.11",
-        "@babel/types": "^7.22.11"
+        "@babel/template": "^7.22.15",
+        "@babel/traverse": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz",
-      "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
+      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.20",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
@@ -569,9 +569,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.13",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.13.tgz",
-      "integrity": "sha512-3l6+4YOvc9wx7VlCSw4yQfcBo01ECA8TicQfbnCPuCEpRQrf+gTUyGdxNw+pyTUyywp6JRD1w0YQs9TpBXYlkw==",
+      "version": "7.22.16",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz",
+      "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -580,9 +580,9 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
-      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
+      "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -596,15 +596,15 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
-      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
+      "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.5"
+        "@babel/plugin-transform-optional-chaining": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -896,9 +896,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.11.tgz",
-      "integrity": "sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz",
+      "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -949,9 +949,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
-      "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz",
+      "integrity": "sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -1000,19 +1000,19 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.22.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
-      "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
+      "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.6",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.5",
+        "@babel/helper-replace-supers": "^7.22.9",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       },
@@ -1041,9 +1041,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
-      "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz",
+      "integrity": "sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -1141,9 +1141,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
-      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
+      "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -1258,13 +1258,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.11.tgz",
-      "integrity": "sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz",
+      "integrity": "sha512-jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helper-module-transforms": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       },
@@ -1379,17 +1379,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.11.tgz",
-      "integrity": "sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz",
+      "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.10",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.22.5"
+        "@babel/plugin-transform-parameters": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1433,9 +1433,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.12",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.12.tgz",
-      "integrity": "sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz",
+      "integrity": "sha512-ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -1451,9 +1451,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
-      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
+      "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -1700,18 +1700,18 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.10",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
-      "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz",
+      "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.10",
+        "@babel/compat-data": "^7.22.20",
+        "@babel/helper-compilation-targets": "^7.22.15",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.5",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
+        "@babel/helper-validator-option": "^7.22.15",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -1732,41 +1732,41 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.10",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.15",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.22.10",
+        "@babel/plugin-transform-block-scoping": "^7.22.15",
         "@babel/plugin-transform-class-properties": "^7.22.5",
-        "@babel/plugin-transform-class-static-block": "^7.22.5",
-        "@babel/plugin-transform-classes": "^7.22.6",
+        "@babel/plugin-transform-class-static-block": "^7.22.11",
+        "@babel/plugin-transform-classes": "^7.22.15",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.22.10",
+        "@babel/plugin-transform-destructuring": "^7.22.15",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
         "@babel/plugin-transform-duplicate-keys": "^7.22.5",
-        "@babel/plugin-transform-dynamic-import": "^7.22.5",
+        "@babel/plugin-transform-dynamic-import": "^7.22.11",
         "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
-        "@babel/plugin-transform-for-of": "^7.22.5",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.11",
+        "@babel/plugin-transform-for-of": "^7.22.15",
         "@babel/plugin-transform-function-name": "^7.22.5",
-        "@babel/plugin-transform-json-strings": "^7.22.5",
+        "@babel/plugin-transform-json-strings": "^7.22.11",
         "@babel/plugin-transform-literals": "^7.22.5",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
         "@babel/plugin-transform-member-expression-literals": "^7.22.5",
         "@babel/plugin-transform-modules-amd": "^7.22.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
-        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.15",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.11",
         "@babel/plugin-transform-modules-umd": "^7.22.5",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
         "@babel/plugin-transform-new-target": "^7.22.5",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
-        "@babel/plugin-transform-numeric-separator": "^7.22.5",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
+        "@babel/plugin-transform-numeric-separator": "^7.22.11",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.15",
         "@babel/plugin-transform-object-super": "^7.22.5",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.10",
-        "@babel/plugin-transform-parameters": "^7.22.5",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
+        "@babel/plugin-transform-optional-chaining": "^7.22.15",
+        "@babel/plugin-transform-parameters": "^7.22.15",
         "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
         "@babel/plugin-transform-property-literals": "^7.22.5",
         "@babel/plugin-transform-regenerator": "^7.22.10",
         "@babel/plugin-transform-reserved-words": "^7.22.5",
@@ -1780,7 +1780,7 @@
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.22.10",
+        "@babel/types": "^7.22.19",
         "babel-plugin-polyfill-corejs2": "^0.4.5",
         "babel-plugin-polyfill-corejs3": "^0.8.3",
         "babel-plugin-polyfill-regenerator": "^0.5.2",
@@ -1817,9 +1817,9 @@
       "peer": true
     },
     "node_modules/@babel/runtime": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.11.tgz",
-      "integrity": "sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz",
+      "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -1828,33 +1828,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.5",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
-      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
+      "version": "7.22.15",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
+      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.5",
-        "@babel/parser": "^7.22.5",
-        "@babel/types": "^7.22.5"
+        "@babel/code-frame": "^7.22.13",
+        "@babel/parser": "^7.22.15",
+        "@babel/types": "^7.22.15"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz",
-      "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==",
+      "version": "7.22.20",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz",
+      "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.10",
-        "@babel/generator": "^7.22.10",
-        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/code-frame": "^7.22.13",
+        "@babel/generator": "^7.22.15",
+        "@babel/helper-environment-visitor": "^7.22.20",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.11",
-        "@babel/types": "^7.22.11",
+        "@babel/parser": "^7.22.16",
+        "@babel/types": "^7.22.19",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1863,13 +1863,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.11",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz",
-      "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==",
+      "version": "7.22.19",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz",
+      "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.5",
+        "@babel/helper-validator-identifier": "^7.22.19",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -1877,9 +1877,10 @@
       }
     },
     "node_modules/@bcgov-nr/nr-fsa-theme": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/@bcgov-nr/nr-fsa-theme/-/nr-fsa-theme-1.1.5.tgz",
-      "integrity": "sha512-gQ7k76PXcTlWDOo6lrYNujgc5t7cY4r6gVS8m4bvkIbbgKQNux4kV5BuEtx616fubl61FZp+zDxRSMfrZz1Dog=="
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/@bcgov-nr/nr-fsa-theme/-/nr-fsa-theme-1.2.0.tgz",
+      "integrity": "sha512-v5jv1eHp7CcG7tf3Pj+awS/WsWCMNWYCKxLQaBQc46c2nTo6roIFAJFtRNZhEMx8lFFyMrzmtMn2ESM0/I/DVQ==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
     },
     "node_modules/@bcgov/bc-sans": {
       "version": "2.0.0",
@@ -1897,9 +1898,9 @@
       "integrity": "sha512-hCrfVZ6oVnPjjupelbvQX4D0i6GlZuKVverAf0LkOydXHrPjSyuEmg+czsylyCBg4r/hxtSTu91Tq6aqz/DsHg=="
     },
     "node_modules/@carbon/grid": {
-      "version": "11.19.0",
-      "resolved": "https://registry.npmjs.org/@carbon/grid/-/grid-11.19.0.tgz",
-      "integrity": "sha512-Ie8C0yifTPOF58rhkeRhINJ6KPiTVbdJwPCE+aEWTpUrwGSnuqIYZ8zQBlYQtNGQX72TSfnGY0qijPmpnIwNsg==",
+      "version": "11.20.0",
+      "resolved": "https://registry.npmjs.org/@carbon/grid/-/grid-11.20.0.tgz",
+      "integrity": "sha512-YzF6NY6BNbiMI4wwF1oz0XAoiYFt5YoLovHwsHJBb/RFc1qPp94WFL1NoAprKX7I2c7V+ypAjmoTuXFACeL4Dg==",
       "dependencies": {
         "@carbon/layout": "^11.19.0"
       }
@@ -1928,22 +1929,22 @@
       "integrity": "sha512-l7SIZMwTmv8BHPvDsQ26Y/dBLKnLGZUvD5bGcDppoUInUcKv2Dg4J0r5JONUsB2OagpBmbj/a5skcahzlaL1JQ=="
     },
     "node_modules/@carbon/pictograms": {
-      "version": "12.22.0",
-      "resolved": "https://registry.npmjs.org/@carbon/pictograms/-/pictograms-12.22.0.tgz",
-      "integrity": "sha512-9hf/8v15CrxPhd8DGCqlpUdxlqPBcr/l4wKP/5q1TKqU77lSYKKPl8Erv/mTf9EM3HkUdy9iFr08aKGvoKaV7w=="
+      "version": "12.23.0",
+      "resolved": "https://registry.npmjs.org/@carbon/pictograms/-/pictograms-12.23.0.tgz",
+      "integrity": "sha512-BLsaj69Yk+AIvGoHsRBKxNYKI4nWCqxYAhJkIqv4spY9tM8GREpolJ/nLfUdglzToKqbPKOuDUNP5VI0M7RSvA=="
     },
     "node_modules/@carbon/styles": {
-      "version": "1.36.0",
-      "resolved": "https://registry.npmjs.org/@carbon/styles/-/styles-1.36.0.tgz",
-      "integrity": "sha512-UKr0FdNT/QSJVfsrjn03zF364qP2XwOW6+/VaR7SijfEKR1qx9Z6MQbzNMR9OP5hvT/rr3pora1S7R3h6mtz3A==",
+      "version": "1.38.0",
+      "resolved": "https://registry.npmjs.org/@carbon/styles/-/styles-1.38.0.tgz",
+      "integrity": "sha512-HS3kwwfrC/DAEYJmRBIPk8HsJh4F3XlOVG74lJwCGxXxKxj9wcE24e3MlaPOhAcR1Z4MtuTIXvDH581zsonv5A==",
       "dependencies": {
         "@carbon/colors": "^11.19.0",
         "@carbon/feature-flags": "^0.16.0",
-        "@carbon/grid": "^11.19.0",
+        "@carbon/grid": "^11.20.0",
         "@carbon/layout": "^11.19.0",
         "@carbon/motion": "^11.15.0",
-        "@carbon/themes": "^11.24.0",
-        "@carbon/type": "^11.23.0",
+        "@carbon/themes": "^11.25.0",
+        "@carbon/type": "^11.24.0",
         "@ibm/plex": "6.0.0-next.6"
       },
       "peerDependencies": {
@@ -1956,22 +1957,22 @@
       }
     },
     "node_modules/@carbon/themes": {
-      "version": "11.24.0",
-      "resolved": "https://registry.npmjs.org/@carbon/themes/-/themes-11.24.0.tgz",
-      "integrity": "sha512-afVMSQ8by3yR4646UNwOmVGeyI8n0dIvehpuy4IUGQ52WXsRuveMY/F6KpATy0OadJR/C/7SZo2mqI7L8aTREA==",
+      "version": "11.25.0",
+      "resolved": "https://registry.npmjs.org/@carbon/themes/-/themes-11.25.0.tgz",
+      "integrity": "sha512-SQ4RLJhjheE0eq9gL4TNmYMQAsVmwveZpAMHPB9bVARC3pRfUDy+s0+j57/vWtVlEs4j3f7HxVvNazW6ohTl8A==",
       "dependencies": {
         "@carbon/colors": "^11.19.0",
         "@carbon/layout": "^11.19.0",
-        "@carbon/type": "^11.23.0",
+        "@carbon/type": "^11.24.0",
         "color": "^4.0.0"
       }
     },
     "node_modules/@carbon/type": {
-      "version": "11.23.0",
-      "resolved": "https://registry.npmjs.org/@carbon/type/-/type-11.23.0.tgz",
-      "integrity": "sha512-bp3D2q7Su03B2Re5CHt0OdNNmAbTOJaBgKgRKKdLP97F+M27y/kk9iOAFctC0pCgmQ2qSndWRTSb3zVg5TmiEw==",
+      "version": "11.24.0",
+      "resolved": "https://registry.npmjs.org/@carbon/type/-/type-11.24.0.tgz",
+      "integrity": "sha512-X/UN/leNbwis5NdDzLPyy5AZXvgqSCM8uH/FOomCf5KTxAcpDOsY7jx5rax+zHE6HqgJWuFDfQPwnVMRBS4LfQ==",
       "dependencies": {
-        "@carbon/grid": "^11.19.0",
+        "@carbon/grid": "^11.20.0",
         "@carbon/layout": "^11.19.0"
       }
     },
@@ -2020,9 +2021,9 @@
       }
     },
     "node_modules/@cypress/code-coverage": {
-      "version": "3.11.0",
-      "resolved": "https://registry.npmjs.org/@cypress/code-coverage/-/code-coverage-3.11.0.tgz",
-      "integrity": "sha512-ihSO1s03gmLRE224oIjrbdG1ey63vw/UY+VSqQ5m/TKkAvyz6GIiniq6juk3AV/+0vQC1Eb4UWFu8ndtji4M1g==",
+      "version": "3.12.1",
+      "resolved": "https://registry.npmjs.org/@cypress/code-coverage/-/code-coverage-3.12.1.tgz",
+      "integrity": "sha512-4gSVkgcTo8NSWrOwLO0NxyvD2apIZFM/2k9sxdmP3eR3ko8tZVYrWfTdfxSXLDSkNnzVh+oXv7utaOLn+yemUg==",
       "dev": true,
       "dependencies": {
         "@cypress/webpack-preprocessor": "^5.11.0",
@@ -2036,7 +2037,11 @@
         "nyc": "15.1.0"
       },
       "peerDependencies": {
-        "cypress": "*"
+        "@babel/core": "^7.0.1",
+        "@babel/preset-env": "^7.0.0",
+        "babel-loader": "^8.3 || ^9",
+        "cypress": "*",
+        "webpack": "^4 || ^5"
       }
     },
     "node_modules/@cypress/code-coverage/node_modules/@cypress/webpack-preprocessor": {
@@ -2136,9 +2141,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz",
-      "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==",
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
+      "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -2154,7 +2159,7 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "~6.10.3",
+        "qs": "6.10.4",
         "safe-buffer": "^5.1.2",
         "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
@@ -2214,6 +2219,342 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
+      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
+      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
+      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
+      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
+      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
+      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
+      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
+      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
+      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
+      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
+      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
+      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
+      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
+      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
+      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
+      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
+      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
+      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
+      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "node_modules/@esbuild/win32-x64": {
       "version": "0.18.20",
       "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
@@ -2246,9 +2587,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.8.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz",
-      "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==",
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.1.tgz",
+      "integrity": "sha512-PWiOzLIUAjN/w5K17PoF4n6sKBw0gqLHPhywmYHP4t1VFQQVYeb1yWsJwnMVEMl3tUHME7X/SJPZLmtG7XBDxQ==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -2278,9 +2619,9 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.21.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
-      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
+      "version": "13.22.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz",
+      "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -2305,9 +2646,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
-      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
+      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2329,9 +2670,9 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
-      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
+      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -2376,9 +2717,9 @@
       "dev": true
     },
     "node_modules/@iconify/utils": {
-      "version": "2.1.9",
-      "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-2.1.9.tgz",
-      "integrity": "sha512-mo+A4n3MwLlWlg1SoSO+Dt6pOPWKElk9sSJ6ZpuzbB9OcjxN8RUWxU3ulPwB1nglErWKRam2x4BAohbYF7FiFA==",
+      "version": "2.1.10",
+      "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-2.1.10.tgz",
+      "integrity": "sha512-0/+5hxjzCZ9RoYpqxnOzbnpQyMdZRuHcMxPJeuX+x/aZkAAD/N4TajDjAPT7LpX+M0bfLExj/p0bbDkUfp0lrg==",
       "dev": true,
       "dependencies": {
         "@antfu/install-pkg": "^0.1.1",
@@ -2679,9 +3020,9 @@
       }
     },
     "node_modules/@rushstack/eslint-patch": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.3.3.tgz",
-      "integrity": "sha512-0xd7qez0AQ+MbHatZTlI1gu5vkG8r7MYRUJAHPAHJBmGLs16zpkrpAVLvjQKQOqaXPDUBwOiJzNc00znHSCVBw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.4.0.tgz",
+      "integrity": "sha512-cEjvTPU32OM9lUFegJagO0mRnIn+rbqrG89vV8/xLnLFX0DoR0r1oy5IlTga71Q7uT3Qus7qm7wgeiMT/+Irlg==",
       "dev": true
     },
     "node_modules/@sideway/address": {
@@ -2745,9 +3086,9 @@
       "dev": true
     },
     "node_modules/@types/chai": {
-      "version": "4.3.5",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz",
-      "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz",
+      "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==",
       "dev": true
     },
     "node_modules/@types/chai-subset": {
@@ -2788,9 +3129,9 @@
       "dev": true
     },
     "node_modules/@types/jsdom": {
-      "version": "21.1.2",
-      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.2.tgz",
-      "integrity": "sha512-bGj+7TaCkOwkJfx7HtS9p22Ij0A2aKMuz8a1+owpkxa1wU/HUBy/WAXhdv90uDdVI9rSjGvUrXmLSeA9VP3JeA==",
+      "version": "21.1.3",
+      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.3.tgz",
+      "integrity": "sha512-1zzqSP+iHJYV4lB3lZhNBa012pubABkj9yG/GuXuf6LZH1cSPIJBqFDrm5JX65HHt6VOnNYdTui/0ySerRbMgA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -2799,9 +3140,9 @@
       }
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.12",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
-      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
+      "version": "7.0.13",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
+      "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==",
       "dev": true
     },
     "node_modules/@types/json5": {
@@ -2811,21 +3152,21 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.17.12",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.12.tgz",
-      "integrity": "sha512-d6xjC9fJ/nSnfDeU0AMDsaJyb1iHsqCSOdi84w4u+SlN/UgQdY5tRhpMzaFYsI4mnpvgTivEaQd0yOUhAtOnEQ==",
+      "version": "18.17.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.18.tgz",
+      "integrity": "sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw==",
       "dev": true
     },
     "node_modules/@types/q": {
-      "version": "1.5.5",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
-      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
+      "version": "1.5.6",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.6.tgz",
+      "integrity": "sha512-IKjZ8RjTSwD4/YG+2gtj7BPFRB/lNbWKTiSj3M7U/TD2B7HfYCxvp2Zz6xA2WIY7pAuL1QOUPw8gQRbUrrq4fQ==",
       "dev": true
     },
     "node_modules/@types/semver": {
-      "version": "7.5.1",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.1.tgz",
-      "integrity": "sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==",
+      "version": "7.5.2",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.2.tgz",
+      "integrity": "sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==",
       "dev": true
     },
     "node_modules/@types/sinonjs__fake-timers": {
@@ -2841,15 +3182,15 @@
       "dev": true
     },
     "node_modules/@types/tough-cookie": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
-      "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.3.tgz",
+      "integrity": "sha512-THo502dA5PzG/sfQH+42Lw3fvmYkceefOspdCwpHRul8ik2Jv1K8I5OZz1AT3/rs46kwgMCe9bSBmDLYkkOMGg==",
       "dev": true
     },
     "node_modules/@types/trusted-types": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz",
-      "integrity": "sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g=="
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.4.tgz",
+      "integrity": "sha512-IDaobHimLQhjwsQ/NMwRVfa/yL7L/wriQPMhw1ZJall0KX6E1oxk29XMDeilW5qTIg5aoiqf5Udy8U/51aNoQQ=="
     },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.17",
@@ -2867,16 +3208,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.6.0.tgz",
-      "integrity": "sha512-CW9YDGTQnNYMIo5lMeuiIG08p4E0cXrXTbcZ2saT/ETE7dWUrNxlijsQeU04qAAKkILiLzdQz+cGFxCJjaZUmA==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.2.tgz",
+      "integrity": "sha512-ooaHxlmSgZTM6CHYAFRlifqh1OAr3PAQEwi7lhYhaegbnXrnh7CDcHmc3+ihhbQC7H0i4JF0psI5ehzkF6Yl6Q==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.6.0",
-        "@typescript-eslint/type-utils": "6.6.0",
-        "@typescript-eslint/utils": "6.6.0",
-        "@typescript-eslint/visitor-keys": "6.6.0",
+        "@typescript-eslint/scope-manager": "6.7.2",
+        "@typescript-eslint/type-utils": "6.7.2",
+        "@typescript-eslint/utils": "6.7.2",
+        "@typescript-eslint/visitor-keys": "6.7.2",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -2935,15 +3276,15 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.6.0.tgz",
-      "integrity": "sha512-setq5aJgUwtzGrhW177/i+DMLqBaJbdwGj2CPIVFFLE0NCliy5ujIdLHd2D1ysmlmsjdL2GWW+hR85neEfc12w==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.2.tgz",
+      "integrity": "sha512-KA3E4ox0ws+SPyxQf9iSI25R6b4Ne78ORhNHeVKrPQnoYsb9UhieoiRoJgrzgEeKGOXhcY1i8YtOeCHHTDa6Fw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.6.0",
-        "@typescript-eslint/types": "6.6.0",
-        "@typescript-eslint/typescript-estree": "6.6.0",
-        "@typescript-eslint/visitor-keys": "6.6.0",
+        "@typescript-eslint/scope-manager": "6.7.2",
+        "@typescript-eslint/types": "6.7.2",
+        "@typescript-eslint/typescript-estree": "6.7.2",
+        "@typescript-eslint/visitor-keys": "6.7.2",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2963,13 +3304,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz",
-      "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.2.tgz",
+      "integrity": "sha512-bgi6plgyZjEqapr7u2mhxGR6E8WCzKNUFWNh6fkpVe9+yzRZeYtDTbsIBzKbcxI+r1qVWt6VIoMSNZ4r2A+6Yw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.6.0",
-        "@typescript-eslint/visitor-keys": "6.6.0"
+        "@typescript-eslint/types": "6.7.2",
+        "@typescript-eslint/visitor-keys": "6.7.2"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -2980,13 +3321,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.6.0.tgz",
-      "integrity": "sha512-8m16fwAcEnQc69IpeDyokNO+D5spo0w1jepWWY2Q6y5ZKNuj5EhVQXjtVAeDDqvW6Yg7dhclbsz6rTtOvcwpHg==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.2.tgz",
+      "integrity": "sha512-36F4fOYIROYRl0qj95dYKx6kybddLtsbmPIYNK0OBeXv2j9L5nZ17j9jmfy+bIDHKQgn2EZX+cofsqi8NPATBQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.6.0",
-        "@typescript-eslint/utils": "6.6.0",
+        "@typescript-eslint/typescript-estree": "6.7.2",
+        "@typescript-eslint/utils": "6.7.2",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -3007,9 +3348,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.6.0.tgz",
-      "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.2.tgz",
+      "integrity": "sha512-flJYwMYgnUNDAN9/GAI3l8+wTmvTYdv64fcH8aoJK76Y+1FCZ08RtI5zDerM/FYT5DMkAc+19E4aLmd5KqdFyg==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -3020,13 +3361,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz",
-      "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.2.tgz",
+      "integrity": "sha512-kiJKVMLkoSciGyFU0TOY0fRxnp9qq1AzVOHNeN1+B9erKFCJ4Z8WdjAkKQPP+b1pWStGFqezMLltxO+308dJTQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.6.0",
-        "@typescript-eslint/visitor-keys": "6.6.0",
+        "@typescript-eslint/types": "6.7.2",
+        "@typescript-eslint/visitor-keys": "6.7.2",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -3100,17 +3441,17 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.6.0.tgz",
-      "integrity": "sha512-mPHFoNa2bPIWWglWYdR0QfY9GN0CfvvXX1Sv6DlSTive3jlMTUy+an67//Gysc+0Me9pjitrq0LJp0nGtLgftw==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.2.tgz",
+      "integrity": "sha512-ZCcBJug/TS6fXRTsoTkgnsvyWSiXwMNiPzBUani7hDidBdj1779qwM1FIAmpH4lvlOZNF3EScsxxuGifjpLSWQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.6.0",
-        "@typescript-eslint/types": "6.6.0",
-        "@typescript-eslint/typescript-estree": "6.6.0",
+        "@typescript-eslint/scope-manager": "6.7.2",
+        "@typescript-eslint/types": "6.7.2",
+        "@typescript-eslint/typescript-estree": "6.7.2",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -3158,12 +3499,12 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.6.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz",
-      "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==",
+      "version": "6.7.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.2.tgz",
+      "integrity": "sha512-uVw9VIMFBUTz8rIeaUT3fFe8xIUx8r4ywAdlQv1ifH+6acn/XF8Y6rwJ7XNmkNMDrTW+7+vxFFPIF40nJCVsMQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/types": "6.7.2",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -3188,9 +3529,9 @@
       }
     },
     "node_modules/@vitest/coverage-istanbul": {
-      "version": "0.34.3",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-0.34.3.tgz",
-      "integrity": "sha512-RdEGzydbbalyDLmmJ5Qm+T3Lrubw/U9iCnhzM2B1V57t4cVa1t6uyfIHdv68d1au4PRzkLhY7Xouwuhb7BeG+Q==",
+      "version": "0.34.5",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-0.34.5.tgz",
+      "integrity": "sha512-t07VrdRSRKw7QgOZ20i1bmstv9seUm7Fay8wVtswKHBlMmAAW3K5x+0u18O50mLuVl208Lx21tH/6O7W4BWR9Q==",
       "dev": true,
       "dependencies": {
         "istanbul-lib-coverage": "^3.2.0",
@@ -3198,6 +3539,7 @@
         "istanbul-lib-report": "^3.0.1",
         "istanbul-lib-source-maps": "^4.0.1",
         "istanbul-reports": "^3.1.5",
+        "picocolors": "^1.0.0",
         "test-exclude": "^6.0.0"
       },
       "funding": {
@@ -3208,13 +3550,13 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "0.34.3",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.3.tgz",
-      "integrity": "sha512-F8MTXZUYRBVsYL1uoIft1HHWhwDbSzwAU9Zgh8S6WFC3YgVb4AnFV2GXO3P5Em8FjEYaZtTnQYoNwwBrlOMXgg==",
+      "version": "0.34.5",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.5.tgz",
+      "integrity": "sha512-/3RBIV9XEH+nRpRMqDJBufKIOQaYUH2X6bt0rKSCW0MfKhXFLYsR5ivHifeajRSTsln0FwJbitxLKHSQz/Xwkw==",
       "dev": true,
       "dependencies": {
-        "@vitest/spy": "0.34.3",
-        "@vitest/utils": "0.34.3",
+        "@vitest/spy": "0.34.5",
+        "@vitest/utils": "0.34.5",
         "chai": "^4.3.7"
       },
       "funding": {
@@ -3222,12 +3564,12 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "0.34.3",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.3.tgz",
-      "integrity": "sha512-lYNq7N3vR57VMKMPLVvmJoiN4bqwzZ1euTW+XXYH5kzr3W/+xQG3b41xJn9ChJ3AhYOSoweu974S1V3qDcFESA==",
+      "version": "0.34.5",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.5.tgz",
+      "integrity": "sha512-RDEE3ViVvl7jFSCbnBRyYuu23XxmvRTSZWW6W4M7eC5dOsK75d5LIf6uhE5Fqf809DQ1+9ICZZNxhIolWHU4og==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "0.34.3",
+        "@vitest/utils": "0.34.5",
         "p-limit": "^4.0.0",
         "pathe": "^1.1.1"
       },
@@ -3263,9 +3605,9 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "0.34.3",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.3.tgz",
-      "integrity": "sha512-QyPaE15DQwbnIBp/yNJ8lbvXTZxS00kRly0kfFgAD5EYmCbYcA+1EEyRalc93M0gosL/xHeg3lKAClIXYpmUiQ==",
+      "version": "0.34.5",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.5.tgz",
+      "integrity": "sha512-+ikwSbhu6z2yOdtKmk/aeoDZ9QPm2g/ZO5rXT58RR9Vmu/kB2MamyDSx77dctqdZfP3Diqv4mbc/yw2kPT8rmA==",
       "dev": true,
       "dependencies": {
         "magic-string": "^0.30.1",
@@ -3277,9 +3619,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "0.34.3",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.3.tgz",
-      "integrity": "sha512-N1V0RFQ6AI7CPgzBq9kzjRdPIgThC340DGjdKdPSE8r86aUSmeliTUgkTqLSgtEwWWsGfBQ+UetZWhK0BgJmkQ==",
+      "version": "0.34.5",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.5.tgz",
+      "integrity": "sha512-epsicsfhvBjRjCMOC/3k00mP/TBGQy8/P0DxOFiWyLt55gnZ99dqCfCiAsKO17BWVjn4eZRIjKvcqNmSz8gvmg==",
       "dev": true,
       "dependencies": {
         "tinyspy": "^2.1.1"
@@ -3289,9 +3631,9 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "0.34.3",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.3.tgz",
-      "integrity": "sha512-kiSnzLG6m/tiT0XEl4U2H8JDBjFtwVlaE8I3QfGiMFR0QvnRDfYfdP3YvTBWM/6iJDAyaPY6yVQiCTUc7ZzTHA==",
+      "version": "0.34.5",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.5.tgz",
+      "integrity": "sha512-ur6CmmYQoeHMwmGb0v+qwkwN3yopZuZyf4xt1DBBSGBed8Hf9Gmbm/5dEWqgpLPdRx6Av6jcWXrjcKfkTzg/pw==",
       "dev": true,
       "dependencies": {
         "diff-sequences": "^29.4.3",
@@ -3721,9 +4063,9 @@
       "dev": true
     },
     "node_modules/@vue/language-core": {
-      "version": "1.8.8",
-      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.8.tgz",
-      "integrity": "sha512-i4KMTuPazf48yMdYoebTkgSOJdFraE4pQf0B+FTOFkbB+6hAfjrSou/UmYWRsWyZV6r4Rc6DDZdI39CJwL0rWw==",
+      "version": "1.8.13",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.13.tgz",
+      "integrity": "sha512-nata2fYBZAkl4QJrU+IcArJCMTHt1VP8ePL/Z7eUPC2AF+Cm7Qgo9ksNCPBzZRh1LYjCaSaqV7njqNogwpsMVg==",
       "dev": true,
       "dependencies": {
         "@volar/language-core": "~1.10.0",
@@ -3858,13 +4200,13 @@
       }
     },
     "node_modules/@vue/typescript": {
-      "version": "1.8.8",
-      "resolved": "https://registry.npmjs.org/@vue/typescript/-/typescript-1.8.8.tgz",
-      "integrity": "sha512-jUnmMB6egu5wl342eaUH236v8tdcEPXXkPgj+eI/F6JwW/lb+yAU6U07ZbQ3MVabZRlupIlPESB7ajgAGixhow==",
+      "version": "1.8.13",
+      "resolved": "https://registry.npmjs.org/@vue/typescript/-/typescript-1.8.13.tgz",
+      "integrity": "sha512-ALJjHFqQ3dgZVCI/ogAS/dZ7JEhIi1N0Em5I7uwabY1p9RDRK3odLsycMHyxZRjm5dLI15c07eeBloHiD2Otlg==",
       "dev": true,
       "dependencies": {
         "@volar/typescript": "~1.10.0",
-        "@vue/language-core": "1.8.8"
+        "@vue/language-core": "1.8.13"
       }
     },
     "node_modules/@vueuse/core": {
@@ -4392,15 +4734,15 @@
       }
     },
     "node_modules/array-includes": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
-      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
+      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
-        "get-intrinsic": "^1.1.3",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "get-intrinsic": "^1.2.1",
         "is-string": "^1.0.7"
       },
       "engines": {
@@ -4420,16 +4762,16 @@
       }
     },
     "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
-      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
+      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.1.3"
+        "get-intrinsic": "^1.2.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4439,14 +4781,14 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
-      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
+      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
@@ -4457,14 +4799,14 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
-      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
+      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
@@ -4475,14 +4817,14 @@
       }
     },
     "node_modules/array.prototype.reduce": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
-      "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz",
+      "integrity": "sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "es-array-method-boxes-properly": "^1.0.0",
         "is-string": "^1.0.7"
       },
@@ -4494,14 +4836,15 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
-      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
+      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
       "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
         "get-intrinsic": "^1.2.1",
         "is-array-buffer": "^3.0.2",
         "is-shared-array-buffer": "^1.0.2"
@@ -4781,9 +5124,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.21.10",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+      "version": "4.21.11",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.11.tgz",
+      "integrity": "sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==",
       "dev": true,
       "funding": [
         {
@@ -4800,10 +5143,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001517",
-        "electron-to-chromium": "^1.4.477",
+        "caniuse-lite": "^1.0.30001538",
+        "electron-to-chromium": "^1.4.526",
         "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.11"
+        "update-browserslist-db": "^1.0.13"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -5001,9 +5344,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001524",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001524.tgz",
-      "integrity": "sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==",
+      "version": "1.0.30001538",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
+      "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==",
       "dev": true,
       "funding": [
         {
@@ -5354,9 +5697,9 @@
       "dev": true
     },
     "node_modules/core-js-compat": {
-      "version": "3.32.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.1.tgz",
-      "integrity": "sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==",
+      "version": "3.32.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.2.tgz",
+      "integrity": "sha512-+GjlguTDINOijtVRUxrQOv3kfu9rl+qPNdX2LTbJ/ZyVTuxK+ksVSAGX1nHstu4hrv1En/uPTtWgq2gI5wt4AQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -5506,15 +5849,15 @@
       "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "node_modules/cypress": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz",
-      "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==",
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz",
+      "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
         "@cypress/request": "^3.0.0",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^16.18.39",
+        "@types/node": "^18.17.5",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
@@ -5563,12 +5906,6 @@
         "node": "^16.0.0 || ^18.0.0 || >=20.0.0"
       }
     },
-    "node_modules/cypress/node_modules/@types/node": {
-      "version": "16.18.46",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.46.tgz",
-      "integrity": "sha512-Mnq3O9Xz52exs3mlxMcQuA7/9VFe/dXcrgAyfjLkABIqxXKOgBRjyazTxUbjsxDa4BP7hhPliyjVTP9RDP14xg==",
-      "dev": true
-    },
     "node_modules/cypress/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
@@ -5958,6 +6295,20 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
+      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
+      "dev": true,
+      "dependencies": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/define-lazy-prop": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
@@ -5971,11 +6322,12 @@
       }
     },
     "node_modules/define-properties": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
-      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dev": true,
       "dependencies": {
+        "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
       },
@@ -6207,9 +6559,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.504",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.504.tgz",
-      "integrity": "sha512-cSMwIAd8yUh54VwitVRVvHK66QqHWE39C3DRj8SWiXitEpVSY3wNPD9y1pxQtLIi4w3UdzF9klLsmuPshz09DQ==",
+      "version": "1.4.527",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.527.tgz",
+      "integrity": "sha512-EafxEiEDzk2aLrdbtVczylHflHdHkNrpGNHIgDyA63sUQLQVS2ayj2hPw3RsVB42qkwURH+T2OxV7kGPUuYszA==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -6276,18 +6628,18 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.1",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
-      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
+      "version": "1.22.2",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz",
+      "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==",
       "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.1",
+        "arraybuffer.prototype.slice": "^1.0.2",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.5",
+        "function.prototype.name": "^1.1.6",
         "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
@@ -6303,23 +6655,23 @@
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.10",
+        "is-typed-array": "^1.1.12",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.0",
-        "safe-array-concat": "^1.0.0",
+        "regexp.prototype.flags": "^1.5.1",
+        "safe-array-concat": "^1.0.1",
         "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.7",
-        "string.prototype.trimend": "^1.0.6",
-        "string.prototype.trimstart": "^1.0.6",
+        "string.prototype.trim": "^1.2.8",
+        "string.prototype.trimend": "^1.0.7",
+        "string.prototype.trimstart": "^1.0.7",
         "typed-array-buffer": "^1.0.0",
         "typed-array-byte-length": "^1.0.0",
         "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.10"
+        "which-typed-array": "^1.1.11"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6335,9 +6687,9 @@
       "dev": true
     },
     "node_modules/es-module-lexer": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
-      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
+      "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==",
       "dev": true,
       "peer": true
     },
@@ -6443,16 +6795,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.48.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
-      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
+      "version": "8.49.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
+      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.48.0",
-        "@humanwhocodes/config-array": "^0.11.10",
+        "@eslint/js": "8.49.0",
+        "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.12.4",
@@ -6584,9 +6936,9 @@
       }
     },
     "node_modules/eslint-plugin-cypress": {
-      "version": "2.14.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.14.0.tgz",
-      "integrity": "sha512-eW6tv7iIg7xujleAJX4Ujm649Bf5jweqa4ObPEIuueYRyLZt7qXGWhCY/n4bfeFW/j6nQZwbIBHKZt6EKcL/cg==",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.15.1.tgz",
+      "integrity": "sha512-eLHLWP5Q+I4j2AWepYq0PgFEei9/s5LvjuSqWrxurkg1YZ8ltxdvMNmdSf0drnsNo57CTgYY/NIHHLRSWejR7w==",
       "dev": true,
       "dependencies": {
         "globals": "^13.20.0"
@@ -6596,9 +6948,9 @@
       }
     },
     "node_modules/eslint-plugin-cypress/node_modules/globals": {
-      "version": "13.21.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
-      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
+      "version": "13.22.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz",
+      "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -6695,15 +7047,16 @@
       }
     },
     "node_modules/eslint-plugin-n": {
-      "version": "16.0.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.0.2.tgz",
-      "integrity": "sha512-Y66uDfUNbBzypsr0kELWrIz+5skicECrLUqlWuXawNSLUq3ltGlCwu6phboYYOTSnoTdHgTLrc+5Ydo6KjzZog==",
+      "version": "16.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.1.0.tgz",
+      "integrity": "sha512-3wv/TooBst0N4ND+pnvffHuz9gNPmk/NkLwAxOt2JykTl/hcuECe6yhTtLJcZjIxtZwN+GX92ACp/QTLpHA3Hg==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "builtins": "^5.0.1",
         "eslint-plugin-es-x": "^7.1.0",
+        "get-tsconfig": "^4.7.0",
         "ignore": "^5.2.4",
         "is-core-module": "^2.12.1",
         "minimatch": "^3.1.2",
@@ -6942,9 +7295,9 @@
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.21.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
-      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
+      "version": "13.22.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz",
+      "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -7329,15 +7682,15 @@
       "integrity": "sha512-3ULSxbXmcMIRzer/2jLNweoqHpwDvsjEawO2FUd9UFR8uPwLM+LruZcPDpuZStcEgbQKhuFOfXo4nYdGladSNw=="
     },
     "node_modules/flatted": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
-      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
+      "version": "3.2.9",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
+      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
-      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
       "funding": [
         {
           "type": "individual",
@@ -7444,6 +7797,20 @@
       "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
       "dev": true
     },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
@@ -7559,6 +7926,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/get-tsconfig": {
+      "version": "4.7.2",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
+      "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
+      "dev": true,
+      "peer": true,
+      "dependencies": {
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+      }
+    },
     "node_modules/getos": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz",
@@ -8656,9 +9036,9 @@
       }
     },
     "node_modules/joi": {
-      "version": "17.10.0",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.0.tgz",
-      "integrity": "sha512-hrazgRSlhzacZ69LdcKfhi3Vu13z2yFfoAzmEov3yFIJlatTdVGUW6vle1zjH8qkzdCn/qGw8rapjqsObbYXAg==",
+      "version": "17.10.2",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.2.tgz",
+      "integrity": "sha512-hcVhjBxRNW/is3nNLdGLIjkgXetkeGc2wyhydhz8KumG23Aerk4HPjU5zaPAMRqXQFc0xNqXTC7+zQjxr0GlKA==",
       "dev": true,
       "dependencies": {
         "@hapi/hoek": "^9.0.0",
@@ -9418,9 +9798,9 @@
       }
     },
     "node_modules/mlly": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.1.tgz",
-      "integrity": "sha512-SCDs78Q2o09jiZiE2WziwVBEqXQ02XkGdUy45cbJf+BpYRIjArXRJ1Wbowxkb+NaM9DWvS3UC9GiO/6eqvQ/pg==",
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
+      "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.10.0",
@@ -9909,15 +10289,15 @@
       }
     },
     "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz",
-      "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz",
+      "integrity": "sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==",
       "dev": true,
       "dependencies": {
-        "array.prototype.reduce": "^1.0.5",
+        "array.prototype.reduce": "^1.0.6",
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "es-abstract": "^1.21.2",
+        "es-abstract": "^1.22.1",
         "safe-array-concat": "^1.0.0"
       },
       "engines": {
@@ -10334,9 +10714,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.28",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz",
-      "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==",
+      "version": "8.4.30",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
+      "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
       "funding": [
         {
           "type": "opencollective",
@@ -10422,9 +10802,9 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.3.tgz",
-      "integrity": "sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==",
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
+      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -10656,9 +11036,9 @@
       "peer": true
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
-      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
+      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -10684,14 +11064,14 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
-      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
+      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "functions-have-names": "^1.2.3"
+        "set-function-name": "^2.0.0"
       },
       "engines": {
         "node": ">= 0.4"
@@ -10794,9 +11174,9 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.4",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
-      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
+      "version": "1.22.6",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz",
+      "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==",
       "dev": true,
       "dependencies": {
         "is-core-module": "^2.13.0",
@@ -10819,6 +11199,16 @@
         "node": ">=4"
       }
     },
+    "node_modules/resolve-pkg-maps": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
+      "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
+      "dev": true,
+      "peer": true,
+      "funding": {
+        "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
+      }
+    },
     "node_modules/restore-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
@@ -10884,9 +11274,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "3.28.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.1.tgz",
-      "integrity": "sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==",
+      "version": "3.29.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.2.tgz",
+      "integrity": "sha512-CJouHoZ27v6siztc21eEQGo0kIcE5D1gVPA571ez0mMYb25LGYGKnVNXpEj5MGlepmDWGXNjDB5q7uNiPHC11A==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -10997,13 +11387,13 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
-      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
+      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.0",
+        "get-intrinsic": "^1.2.1",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
       },
@@ -11055,9 +11445,9 @@
       "dev": true
     },
     "node_modules/sass": {
-      "version": "1.66.1",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz",
-      "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==",
+      "version": "1.68.0",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz",
+      "integrity": "sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==",
       "devOptional": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -11209,6 +11599,20 @@
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
       "dev": true
     },
+    "node_modules/set-function-name": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
+      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.0.1",
+        "functions-have-names": "^1.2.3",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -11436,9 +11840,9 @@
       "dev": true
     },
     "node_modules/start-server-and-test": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.0.tgz",
-      "integrity": "sha512-UqKLw0mJbfrsG1jcRLTUlvuRi9sjNuUiDOLI42r7R5fA9dsFoywAy9DoLXNYys9B886E4RCKb+qM1Gzu96h7DQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.1.tgz",
+      "integrity": "sha512-8PFo4DLLLCDMuS51/BEEtE1m9CAXw1LNVtZSS1PzkYQh6Qf9JUwM4huYeSoUumaaoAyuwYBwCa9OsrcpMqcOdQ==",
       "dev": true,
       "dependencies": {
         "arg": "^5.0.2",
@@ -11456,7 +11860,7 @@
         "start-test": "src/bin/start.js"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=16"
       }
     },
     "node_modules/start-server-and-test/node_modules/bluebird": {
@@ -11554,14 +11958,14 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
-      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
+      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11571,28 +11975,28 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
-      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
+      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
-      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
+      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.1.4",
-        "es-abstract": "^1.20.4"
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -11771,9 +12175,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.19.2",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
-      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
+      "version": "5.20.0",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.20.0.tgz",
+      "integrity": "sha512-e56ETryaQDyebBwJIWYB2TT6f2EZ0fL0sW/JRXNMN26zZdKi2u/E/5my5lG6jNxym6qsrVXfFRmOdV42zlAgLQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -11913,9 +12317,9 @@
       }
     },
     "node_modules/tinybench": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.0.tgz",
-      "integrity": "sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==",
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz",
+      "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==",
       "dev": true
     },
     "node_modules/tinypool": {
@@ -12018,9 +12422,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.2.tgz",
-      "integrity": "sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
+      "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
       "dev": true,
       "engines": {
         "node": ">=16.13.0"
@@ -12442,12 +12846,12 @@
       }
     },
     "node_modules/unplugin": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.4.0.tgz",
-      "integrity": "sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.5.0.tgz",
+      "integrity": "sha512-9ZdRwbh/4gcm1JTOkp9lAkIDrtOyOxgHmY7cjuwI8L/2RTikMcVG25GsZwNAgRuap3iDw2jeq7eoqtAsz5rW3A==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.9.0",
+        "acorn": "^8.10.0",
         "chokidar": "^3.5.3",
         "webpack-sources": "^3.2.3",
         "webpack-virtual-modules": "^0.5.0"
@@ -12568,9 +12972,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+      "version": "1.0.13",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
       "dev": true,
       "funding": [
         {
@@ -12728,9 +13132,9 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "0.34.3",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.3.tgz",
-      "integrity": "sha512-+0TzJf1g0tYXj6tR2vEyiA42OPq68QkRZCu/ERSo2PtsDJfBpDyEfuKbRvLmZqi/CgC7SCBtyC+WjTGNMRIaig==",
+      "version": "0.34.5",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.5.tgz",
+      "integrity": "sha512-RNZ+DwbCvDoI5CbCSQSyRyzDTfFvFauvMs6Yq4ObJROKlIKuat1KgSX/Ako5rlDMfVCyMcpMRMTkJBxd6z8YRA==",
       "dev": true,
       "dependencies": {
         "cac": "^6.7.14",
@@ -12738,7 +13142,7 @@
         "mlly": "^1.4.0",
         "pathe": "^1.1.1",
         "picocolors": "^1.0.0",
-        "vite": "^3.0.0 || ^4.0.0"
+        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
       },
       "bin": {
         "vite-node": "vite-node.mjs"
@@ -12783,19 +13187,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "0.34.3",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.3.tgz",
-      "integrity": "sha512-7+VA5Iw4S3USYk+qwPxHl8plCMhA5rtfwMjgoQXMT7rO5ldWcdsdo3U1QD289JgglGK4WeOzgoLTsGFu6VISyQ==",
+      "version": "0.34.5",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.5.tgz",
+      "integrity": "sha512-CPI68mmnr2DThSB3frSuE5RLm9wo5wU4fbDrDwWQQB1CWgq9jQVoQwnQSzYAjdoBOPoH2UtXpOgHVge/uScfZg==",
       "dev": true,
       "dependencies": {
         "@types/chai": "^4.3.5",
         "@types/chai-subset": "^1.3.3",
         "@types/node": "*",
-        "@vitest/expect": "0.34.3",
-        "@vitest/runner": "0.34.3",
-        "@vitest/snapshot": "0.34.3",
-        "@vitest/spy": "0.34.3",
-        "@vitest/utils": "0.34.3",
+        "@vitest/expect": "0.34.5",
+        "@vitest/runner": "0.34.5",
+        "@vitest/snapshot": "0.34.5",
+        "@vitest/spy": "0.34.5",
+        "@vitest/utils": "0.34.5",
         "acorn": "^8.9.0",
         "acorn-walk": "^8.2.0",
         "cac": "^6.7.14",
@@ -12809,8 +13213,8 @@
         "strip-literal": "^1.0.1",
         "tinybench": "^2.5.0",
         "tinypool": "^0.7.0",
-        "vite": "^3.0.0 || ^4.0.0",
-        "vite-node": "0.34.3",
+        "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0",
+        "vite-node": "0.34.5",
         "why-is-node-running": "^2.2.2"
       },
       "bin": {
@@ -12908,9 +13312,9 @@
       }
     },
     "node_modules/volar-service-vetur": {
-      "version": "0.0.11",
-      "resolved": "https://registry.npmjs.org/volar-service-vetur/-/volar-service-vetur-0.0.11.tgz",
-      "integrity": "sha512-ahjOhXZmIZESMLWKrmxyhZvyvC3niSm0gjmSnZquy+UXHPSqHW0I2JVMTCQ2gB26ZadE2D8Kao7UbcgphSB+8w==",
+      "version": "0.0.13",
+      "resolved": "https://registry.npmjs.org/volar-service-vetur/-/volar-service-vetur-0.0.13.tgz",
+      "integrity": "sha512-1VVfl3u2kjVzcD2T1nGF0f25BZNHFmlkfri7CoFiHi0yEUot4Pk8ruVzTKlN+wXlM9AoJYt2Fo+HgfCqpuV2Ag==",
       "dev": true,
       "dependencies": {
         "vls": "^0.8.2",
@@ -12926,9 +13330,9 @@
       }
     },
     "node_modules/vscode-html-languageservice": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.7.tgz",
-      "integrity": "sha512-jX+7/kUXrdOaRT8vqYR/jLxrGDib+Far8I7n/A6apuEl88k+mhIHZPwc6ezuLeiCKUCaLG4b0dqFwjVa7QL3/w==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.1.0.tgz",
+      "integrity": "sha512-cGOu5+lrz+2dDXSGS15y24lDtPaML1T8K/SfqgFbLmCZ1btYOxceFieR+ybTS2es/A67kRc62m2cKFLUQPWG5g==",
       "dev": true,
       "dependencies": {
         "@vscode/l10n": "^0.0.16",
@@ -12944,9 +13348,9 @@
       "dev": true
     },
     "node_modules/vscode-languageserver-types": {
-      "version": "3.17.3",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz",
-      "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==",
+      "version": "3.17.4",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4.tgz",
+      "integrity": "sha512-9YXi5pA3XF2V+NUQg6g+lulNS0ncRCKASYdK3Cs7kiH9sVFXWq27prjkC/B8M/xJLRPPRSPCHVMuBTgRNFh2sQ==",
       "dev": true
     },
     "node_modules/vscode-uri": {
@@ -13031,9 +13435,9 @@
       "dev": true
     },
     "node_modules/vue-router": {
-      "version": "4.2.4",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.4.tgz",
-      "integrity": "sha512-9PISkmaCO02OzPVOMq2w82ilty6+xJmQrarYZDkjZBfl4RvYAlt4PKnEX21oW4KTtWfa9OuO/b3qk1Od3AEdCQ==",
+      "version": "4.2.5",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.5.tgz",
+      "integrity": "sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==",
       "dependencies": {
         "@vue/devtools-api": "^6.5.0"
       },
@@ -13073,13 +13477,13 @@
       "integrity": "sha512-UquSfnSWejD0zAfcD+3jJ1chUAkOAyoxya9Lxh9acCRtrlmGcAIvd0cQYraWqKenbuZJUdum+S174atv2AuEHQ=="
     },
     "node_modules/vue-tsc": {
-      "version": "1.8.8",
-      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.8.tgz",
-      "integrity": "sha512-bSydNFQsF7AMvwWsRXD7cBIXaNs/KSjvzWLymq/UtKE36697sboX4EccSHFVxvgdBlI1frYPc/VMKJNB7DFeDQ==",
+      "version": "1.8.13",
+      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.13.tgz",
+      "integrity": "sha512-Hl8zUXPVK2KzPtbXeMCN0CSFkwvD96YOtYt9KvJPG9W8QGcNpGk9KHwPuGMxA8blWXSIli7gtsoC+clICEVdVg==",
       "dev": true,
       "dependencies": {
-        "@vue/language-core": "1.8.8",
-        "@vue/typescript": "1.8.8",
+        "@vue/language-core": "1.8.13",
+        "@vue/typescript": "1.8.13",
         "semver": "^7.3.8"
       },
       "bin": {
@@ -13479,9 +13883,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.13.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
-      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
+      "version": "8.14.2",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
+      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
diff --git a/frontend/package.json b/frontend/package.json
index cd07414e26..49b1a31644 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -70,7 +70,7 @@
     "@vue/eslint-config-typescript": "^11.0.0",
     "@vue/test-utils": "^2.4.0",
     "@vue/tsconfig": "^0.1.3",
-    "cypress": "^13.1.0",
+    "cypress": "^13.2.0",
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard": "^17.1.0",
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index ff9553d57f..35c7889ab8 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -68,6 +68,6 @@ export default defineConfig(({ command, mode }) => {
       },
       environment: 'jsdom'
     },
-    optimizeDeps: true
+    optimizeDeps: false
   }
 })

From eafe95a1b69ca51bc3bb8d268f4addbd361b2318 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 22 Sep 2023 16:10:33 -0300
Subject: [PATCH 162/313] fix: remove package from optimizeDeps

As an attempt to prevent error in the workflow.
---
 frontend/vite.config.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
index 35c7889ab8..3de1275b16 100644
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -68,6 +68,8 @@ export default defineConfig(({ command, mode }) => {
       },
       environment: 'jsdom'
     },
-    optimizeDeps: false
+    optimizeDeps: {
+      exclude: ['@carbon/web-components'],
+    }
   }
 })

From 772b8b25f761ee5aa8816421b0828eecb5c0e0d9 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 22 Sep 2023 16:48:05 -0300
Subject: [PATCH 163/313] refactor: requested changes from review

---
 frontend/src/components/DataFetcher.vue | 44 ++++++++++++-------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/frontend/src/components/DataFetcher.vue b/frontend/src/components/DataFetcher.vue
index 7a5b15757e..b1fd33fee3 100644
--- a/frontend/src/components/DataFetcher.vue
+++ b/frontend/src/components/DataFetcher.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import { ref, watch, computed } from 'vue'
+import { ref, watch, computed } from 'vue';
 // Composables
-import { useFetchTo } from '@/composables/useFetch'
+import { useFetchTo } from '@/composables/useFetch';
 
 
 const props = defineProps<{
@@ -10,38 +10,38 @@ const props = defineProps<{
   minLength: number
   initValue: object
   initFetch?: boolean
-}>()
+}>();
 
 //Set the initial value to the content
-const content = ref<any>(props.initValue)
+const content = ref<any>(props.initValue);
 
-const response = ref<any>()
+const response = ref<any>();
 
-const lastUpdateRequestId = ref<number>(0)
+const lastUpdateRequestTime = ref<number>(0);
 
-const initialUrlValue = props.url
-const searchURL = computed(() => props.url)
+const initialUrlValue = props.url;
+const searchURL = computed(() => props.url);
 
 const { loading, error, fetch } = useFetchTo(searchURL, response, {
   skip: true,
   ...props.params
-})
+});
 
 const calculateStringDifference = (
   initial: string,
   current: string
 ): number => {
-  if (initial === current) return 0
+  if (initial === current) return 0;
   if (initial.length > current.length)
-    return calculateStringDifference(current, initial)
-  return current.replace(initial, '').length
+    return calculateStringDifference(current, initial);
+  return current.replace(initial, '').length;
 }
 
 //If initial fetch is required, fetch
 if (props.initFetch) {
   fetch().then(() => {
-    content.value = response.value
-  })
+    content.value = response.value;
+  });
 }
 
 //Watch for changes in the url, and if the difference is greater than the min length, fetch
@@ -51,18 +51,18 @@ watch(
     if (
       calculateStringDifference(initialUrlValue, props.url) >= props.minLength
     ) {
-      const curRequestId = Date.now()
-      // const curUrl = props.url
+      const curRequestTime = Date.now();
+      // const curUrl = props.url;
       fetch().then(() => {
         // Discard the response from old request when a newer one was already responded.
-        if (curRequestId >= lastUpdateRequestId.value) {
-          content.value = response.value
-          lastUpdateRequestId.value = curRequestId
-          // console.log('yes')
+        if (curRequestTime >= lastUpdateRequestTime.value) {
+          content.value = response.value;
+          lastUpdateRequestTime.value = curRequestTime;
+          // console.log('yes');
         } else {
-          // console.log('no', curUrl, curRequestId, lastUpdateRequestId.value)
+          // console.log('no', curUrl, curRequestId, lastUpdateRequestId.value);
         }
-      })
+      });
     }
   }
 )

From 897e901b855eb431ca6a8a35fa14e5b18eda565a Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Fri, 22 Sep 2023 13:09:10 -0700
Subject: [PATCH 164/313] Refactored code - Part #1

---
 .../grouping/AddressGroupComponent.vue        |   2 +-
 .../grouping/ContactGroupComponent.vue        |   2 +-
 .../validators/BCeIDFormValidations.ts        | 165 ++---------
 .../helpers/validators/GlobalValidators.ts    | 269 +++++++++++++-----
 frontend/src/pages/FormBCeIDPage.vue          |   6 +-
 .../BusinessInformationWizardStep.vue         |  30 +-
 6 files changed, 250 insertions(+), 224 deletions(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 3ce4d0d476..e73c9ca42d 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -10,7 +10,7 @@ import { useFocus } from '@/composables/useFocus'
 import type { CodeNameType, BusinessSearchResult } from '@/dto/CommonTypesDto'
 import type { Address } from '@/dto/ApplyClientNumberDto'
 // Validators
-import { getValidations } from '@/helpers/validators/BCeIDFormValidations'
+import { getValidations } from '@/helpers/validators/GlobalValidators'
 import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
 // @ts-ignore
 import Delete16 from '@carbon/icons-vue/es/trash-can/16'
diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index ee93ca4282..fa7ac50c80 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -8,7 +8,7 @@ import { useFocus } from '@/composables/useFocus'
 import type { CodeDescrType, CodeNameType } from '@/dto/CommonTypesDto'
 import type { Contact } from '@/dto/ApplyClientNumberDto'
 // Importing validatons
-import { getValidations } from '@/helpers/validators/BCeIDFormValidations'
+import { getValidations } from '@/helpers/validators/GlobalValidators'
 import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
 // @ts-ignore
 import Delete16 from '@carbon/icons-vue/es/trash-can/16'
diff --git a/frontend/src/helpers/validators/BCeIDFormValidations.ts b/frontend/src/helpers/validators/BCeIDFormValidations.ts
index 8f4149bf10..55021622be 100644
--- a/frontend/src/helpers/validators/BCeIDFormValidations.ts
+++ b/frontend/src/helpers/validators/BCeIDFormValidations.ts
@@ -11,6 +11,9 @@ import {
   isOnlyNumbers,
   isNoSpecialCharacters,
   isNot,
+  formFieldValidations,
+  getFieldValue,
+  getValidations
 } from "@/helpers/validators/GlobalValidators";
 
 import type { FormDataDto } from "@/dto/ApplyClientNumberDto";
@@ -19,18 +22,12 @@ import type { ValidationMessageType } from "@/dto/CommonTypesDto";
 const errorBus = useEventBus<ValidationMessageType[]>(
   "submission-error-notification"
 );
-const notificationBus = useEventBus<ValidationMessageType | undefined>(
-  "error-notification"
-);
-
-// We declare here a collection of all validations for every field in the form
-const globalValidations: Record<string, ((value: string) => string)[]> = {};
 
 // Step 1: Business Information
-globalValidations["businessInformation.businessName"] = [
+formFieldValidations["businessInformation.businessName"] = [
   isNotEmpty("Business Name cannot be empty"),
 ];
-globalValidations["businessInformation.clientType"] = [
+formFieldValidations["businessInformation.clientType"] = [
   isNot(
     "I",
     "Individuals cannot be selected. Please select a different client."
@@ -38,7 +35,7 @@ globalValidations["businessInformation.clientType"] = [
 ];
 
 // Step 2: Addresses
-globalValidations["location.addresses.*.locationName"] = [
+formFieldValidations["location.addresses.*.locationName"] = [
   isNotEmpty("You must provide a name for this location"),
   isMinSize(
     "The location name must be between 3 and 50 characters and cannot contain special characters"
@@ -50,29 +47,29 @@ globalValidations["location.addresses.*.locationName"] = [
     "The location name must be between 3 and 50 characters and cannot contain special characters"
   ),
 ];
-globalValidations["location.addresses.*.country.text"] = [
+formFieldValidations["location.addresses.*.country.text"] = [
   isNotEmpty("You must select a country"),
 ];
-globalValidations["location.addresses.*.province.text"] = [
+formFieldValidations["location.addresses.*.province.text"] = [
   isNotEmpty("You must select a value"),
 ];
-globalValidations["location.addresses.*.city"] = [
+formFieldValidations["location.addresses.*.city"] = [
   isNotEmpty("You must provide a city"),
   isMinSize("The city name must be between 3 and 50 characters")(3),
   isMaxSize("The city name must be between 3 and 50 characters")(50),
 ];
-globalValidations["location.addresses.*.streetAddress"] = [
+formFieldValidations["location.addresses.*.streetAddress"] = [
   isNotEmpty("Please provide a valid address or PO Box"),
   isMinSize("The address must be between 5 and 50 characters")(5),
   isMaxSize("The address must be between 5 and 50 characters")(50),
 ];
-globalValidations[
+formFieldValidations[
   'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'
 ] = [isCanadianPostalCode];
-globalValidations[
+formFieldValidations[
   'location.addresses.*.postalCode(location.addresses.*.country.text === "US")'
 ] = [isUsZipCode];
-globalValidations[
+formFieldValidations[
   'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && country.text !== "US")'
 ] = [
   isOnlyNumbers(
@@ -87,72 +84,33 @@ globalValidations[
 ];
 
 // Step 3: Contacts
-
-globalValidations["location.contacts.*.locationNames.*.text"] = [
+formFieldValidations["location.contacts.*.locationNames.*.text"] = [
   isNotEmpty("You must select at least one location"),
 ];
-globalValidations["location.contacts.*.contactType.text"] = [
+formFieldValidations["location.contacts.*.contactType.text"] = [
   isNotEmpty("You must select at least one contact type"),
 ];
-globalValidations["location.contacts.*.firstName"] = [
+formFieldValidations["location.contacts.*.firstName"] = [
   isMinSize("Enter a name")(1),
   isMaxSize("Enter a name")(25),
   isNoSpecialCharacters("Enter a name"),
 ];
-globalValidations["location.contacts.*.lastName"] = [
+formFieldValidations["location.contacts.*.lastName"] = [
   isMinSize("Enter a name")(1),
   isMaxSize("Enter a name")(25),
   isNoSpecialCharacters("Enter a name"),
 ];
-globalValidations["location.contacts.*.email"] = [
+formFieldValidations["location.contacts.*.email"] = [
   isEmail("Please provide a valid email address"),
   isMinSize("Please provide a valid email address")(6),
   isMaxSize("Please provide a valid email address")(50),
 ];
-globalValidations["location.contacts.*.phoneNumber"] = [
+formFieldValidations["location.contacts.*.phoneNumber"] = [
   isPhoneNumber("Please provide a valid phone number"),
   isMaxSize("Please provide a valid phone number")(15),
   isMinSize("Please provide a valid phone number")(10),
 ];
 
-// Associate the field with the validators here
-
-// This function will extract the field value from the object
-export const getField = (
-  path: string,
-  value: FormDataDto
-): string | string[] => {
-  // First we set is in a temporary variable
-  let temporaryValue: any = value;
-  // We split the path by dots and iterate over it
-  path.split(".").forEach((key: string) => {
-    const fieldKey = key.includes("(")
-      ? key.replace(")", "").split("(")[0]
-      : key;
-    // If the temporary value is not undefined we dig in
-    if (temporaryValue[fieldKey] !== undefined) {
-      // If the temporary value is an array we iterate over it
-      if (Array.isArray(temporaryValue[fieldKey])) {
-        // Array fields are split by star to indicate that we want to iterate over the array
-        // Due to that, we split the path by the star and get the second element containing the rest of the path
-        temporaryValue = temporaryValue[fieldKey].map((item: any) =>
-          getField(path.split(".*.").slice(1).join(".*."), item)
-        );
-        // if is not an array we just set the value
-      } else {
-        temporaryValue = temporaryValue[fieldKey];
-      }
-    }
-  });
-
-  // At the end we return the value, keep in mind that the value can be an array if the field is an array
-  return temporaryValue;
-};
-
-// This function will return all validators for the field
-export const getValidations = (key: string): ((value: string) => string)[] =>
-  globalValidations[key] || [];
-
 // This function will run the validators and return the errors
 export const validate = (
   keys: string[],
@@ -170,7 +128,7 @@ export const validate = (
     // For every validator we run it and check if the result is empty
     return validations.every((validation: (value: string) => string) => {
       // We then load the field value
-      const fieldValue = getField(fieldKey, target);
+      const fieldValue = getFieldValue(fieldKey, target);
       // We define a function that will run the validation if the condition is true
       const buildEval = (condition: string) =>
         condition === "true" ? "true" : `target.${condition}`;
@@ -221,89 +179,12 @@ export const validate = (
   });
 };
 
-// This function will run the validators and return the errors
-export const runValidation = (
-  key: string,
-  target: FormDataDto,
-  validation: (value: string) => string,
-  notify: boolean = false,
-  exhaustive = false
-): boolean => {
-  // We split the field key and the condition if it has one
-  const [fieldKey, fieldCondition] = key.includes("(")
-    ? key.replace(")", "").split("(")
-    : [key, "true"];
-  // We then load the field value
-  const fieldValue = getField(fieldKey, target);
-  // We define a function that will run the validation if the condition is true
-  const buildEval = (condition: string) =>
-    condition === "true" ? "true" : `target.${condition}`;
-  const executeValidation = (
-    item: any,
-    condition: string,
-    fieldId: string = fieldKey
-  ): string => {
-    // eslint-disable-next-line no-eval
-    if (eval(condition)) {
-      const validationResponse = validation(item);
-      if (notify) {
-        // Note: also notifies when valid - errorMsg will be empty.
-        notificationBus.emit({ fieldId, errorMsg: validationResponse }, item);
-      }
-      return validationResponse;
-    } else {
-      return "";
-    }
-  };
-  // If the field value is an array we run the validation for every item in the array
-  if (Array.isArray(fieldValue)) {
-    let hasInvalidItem = false;
-    for (let index = 0; index < fieldValue.length; index++) {
-      const item = fieldValue[index];
-      // And sometimes we can end up with another array inside, that's life
-      if (Array.isArray(item)) {
-        if (item.length === 0) item.push("");
-        let hasInvalidSubItem = false;
-        for (const subItem of item) {
-          const valid =
-            executeValidation(
-              subItem,
-              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
-              fieldKey.replace(".*.", `[${index}].`)
-            ) === "";
-          if (!valid) {
-            hasInvalidSubItem = true;
-            if (!exhaustive) {
-              break;
-            }
-          }
-        }
-        return !hasInvalidSubItem;
-      }
-      // If it is not an array here, just validate it
-      const valid =
-        executeValidation(
-          item,
-          buildEval(fieldCondition.replace(".*.", `[${index}].`)),
-          fieldKey.replace(".*.", `[${index}].`)
-        ) === "";
-      if (!valid) {
-        hasInvalidItem = true;
-        if (!exhaustive) {
-          break;
-        }
-      }
-    }
-    return !hasInvalidItem;
-  }
-  // If the field value is not an array we run the validation for the field
-  return executeValidation(fieldValue, fieldCondition) === "";
-};
+
 
 export const addValidation = (
   key: string,
   validation: (value: string) => string
 ): void => {
-  if (!globalValidations[key]) globalValidations[key] = [];
-  globalValidations[key].push(validation);
+  if (!formFieldValidations[key]) formFieldValidations[key] = [];
+  formFieldValidations[key].push(validation);
 };
diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index da40ab35e9..c3567da023 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -1,12 +1,18 @@
-import type { Ref } from 'vue'
+import type { Ref } from "vue";
+import { useEventBus } from "@vueuse/core";
+import type { ValidationMessageType } from "@/dto/CommonTypesDto";
 
 // Defines the used regular expressions
 // @sonar-ignore-next-line
-const emailRegex: RegExp = /^[^\s@]+@[^\s@]+\.[^\s@]+$/
-const specialCharacters: RegExp = /^[a-zA-Z0-9\sÀ-ÖØ-öø-ÿ]+$/
-const e164Regex: RegExp = /^((\+?[1-9]\d{1,14})|(\(\d{3}\) \d{3}-\d{4}))$/
-const canadianPostalCodeRegex: RegExp = /^(([A-Z]\d){3})$/i
-const usZipCodeRegex: RegExp = /^\d{5}(?:[-\s]\d{4})?$/
+const emailRegex: RegExp = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+const specialCharacters: RegExp = /^[a-zA-Z0-9\sÀ-ÖØ-öø-ÿ]+$/;
+const e164Regex: RegExp = /^((\+?[1-9]\d{1,14})|(\(\d{3}\) \d{3}-\d{4}))$/;
+const canadianPostalCodeRegex: RegExp = /^(([A-Z]\d){3})$/i;
+const usZipCodeRegex: RegExp = /^\d{5}(?:[-\s]\d{4})?$/;
+
+const notificationBus = useEventBus<ValidationMessageType | undefined>(
+  "error-notification"
+);
 
 /**
  * Checks if the value is not empty
@@ -19,11 +25,11 @@ const usZipCodeRegex: RegExp = /^\d{5}(?:[-\s]\d{4})?$/
  * isNotEmpty(' a ') // true
  **/
 export const isNotEmpty =
-  (message: string = 'This field is required') =>
+  (message: string = "This field is required") =>
   (value: string): string => {
-    if (value && value.trim().length > 0) return ''
-    return message
-  }
+    if (value && value.trim().length > 0) return "";
+    return message;
+  };
 
 /**
  * Checks if the value is an email
@@ -39,18 +45,18 @@ export const isNotEmpty =
  * isEmail('mail@mail.com') // true
  **/
 export const isEmail =
-  (message: string = 'This field must be a valid email') =>
+  (message: string = "This field must be a valid email") =>
   (value: string): string => {
-    if (isNotEmpty(message)(value) === '' && emailRegex.test(value)) return ''
-    return message
-  }
+    if (isNotEmpty(message)(value) === "" && emailRegex.test(value)) return "";
+    return message;
+  };
 
 export const isPhoneNumber =
-  (message: string = 'This field must be a valid phone number') =>
+  (message: string = "This field must be a valid phone number") =>
   (value: string): string => {
-    if (isNotEmpty(message)(value) === '' && e164Regex.test(value)) return ''
-    return message
-  }
+    if (isNotEmpty(message)(value) === "" && e164Regex.test(value)) return "";
+    return message;
+  };
 
 /**
  * Checks if the value is a canadian postal code
@@ -73,11 +79,12 @@ export const isPhoneNumber =
  **/
 export const isCanadianPostalCode = (
   value: string,
-  message: string = 'This field must be a valid Canadian postal code without spaces or dashes',
+  message: string = "This field must be a valid Canadian postal code without spaces or dashes"
 ): string => {
-  if (isNotEmpty(message)(value) === '' && canadianPostalCodeRegex.test(value)) return ''
-  return message
-}
+  if (isNotEmpty(message)(value) === "" && canadianPostalCodeRegex.test(value))
+    return "";
+  return message;
+};
 
 /**
  * Checks if the value is a US zip code
@@ -100,13 +107,13 @@ export const isCanadianPostalCode = (
  **/
 export const isUsZipCode = (
   value: string,
-  message: string = 'This field must be a valid US zip code',
+  message: string = "This field must be a valid US zip code"
 ): string => {
-  if (isNotEmpty(message)(value) === '' && usZipCodeRegex.test(value)) {
-    return ''
+  if (isNotEmpty(message)(value) === "" && usZipCodeRegex.test(value)) {
+    return "";
   }
-  return message
-}
+  return message;
+};
 
 /**
  * Checks if the value is not empty and has a maximum size
@@ -121,13 +128,14 @@ export const isUsZipCode = (
  * isMaxSize(5)('abcdef') // false
  **/
 export const isMaxSize =
-  (message: string = 'This field must be smaller') =>
+  (message: string = "This field must be smaller") =>
   (maxSize: number) => {
     return (value: string): string => {
-      if (isNotEmpty(message)(value) === '' && value.length <= maxSize) return ''
-      return message
-    }
-  }
+      if (isNotEmpty(message)(value) === "" && value.length <= maxSize)
+        return "";
+      return message;
+    };
+  };
 
 /**
  * Checks if the value is not empty and has a minimum size
@@ -142,13 +150,14 @@ export const isMaxSize =
  * isMinSize(5)('abcdef') // true
  **/
 export const isMinSize =
-  (message: string = 'This field must bigger') =>
+  (message: string = "This field must bigger") =>
   (minSize: number) => {
     return (value: string): string => {
-      if (isNotEmpty(message)(value) === '' && value.length >= minSize) return ''
-      return message
-    }
-  }
+      if (isNotEmpty(message)(value) === "" && value.length >= minSize)
+        return "";
+      return message;
+    };
+  };
 
 /**
  * Checks if the value is not empty and is composed of only numbers
@@ -163,11 +172,11 @@ export const isMinSize =
  * isOnlyNumbers('123a') // false
  **/
 export const isOnlyNumbers =
-  (message: string = 'This field must be composed of only numbers') =>
+  (message: string = "This field must be composed of only numbers") =>
   (value: string): string => {
-    if (isNotEmpty(message)(value) === '' && /^\d*$/.exec(value)) return ''
-    return message
-  }
+    if (isNotEmpty(message)(value) === "" && /^\d*$/.exec(value)) return "";
+    return message;
+  };
 
 /**
  * Check if value is unique in the group of entries
@@ -181,52 +190,180 @@ export const isOnlyNumbers =
  * isUnique.remove('key', 'field'); // true
  **/
 export const isUniqueDescriptive = (): {
-  add: (key: string, fieldId: string) => (value: string, message: string) => string
-  remove: (key: string, fieldId: string) => boolean
+  add: (
+    key: string,
+    fieldId: string
+  ) => (value: string, message: string) => string;
+  remove: (key: string, fieldId: string) => boolean;
 } => {
-  const record: Record<string, Record<string, string>> = {}
+  const record: Record<string, Record<string, string>> = {};
 
   const add =
     (key: string, fieldId: string) =>
-    (value: string, message: string = 'This value is already in use'): string => {
+    (
+      value: string,
+      message: string = "This value is already in use"
+    ): string => {
       // if the record contains the key and the fieldId is not the same as mine, check all the values, except the one if my fieldId to see if it includes my value
-      const fieldsToCheck = Object.keys(record[key] || {}).filter((field) => field !== fieldId)
+      const fieldsToCheck = Object.keys(record[key] || {}).filter(
+        (field) => field !== fieldId
+      );
       // Get all the values of the fields to check, except the one of my fieldId
-      const values = fieldsToCheck.map((field: string) => record[key][field])
-      record[key] = { ...record[key], [fieldId]: value }
+      const values = fieldsToCheck.map((field: string) => record[key][field]);
+      record[key] = { ...record[key], [fieldId]: value };
 
-      if (values.some((entry: string) => entry.toLowerCase() === value.toLowerCase())) {
-        return message
+      if (
+        values.some(
+          (entry: string) => entry.toLowerCase() === value.toLowerCase()
+        )
+      ) {
+        return message;
       }
 
-      return ''
-    }
+      return "";
+    };
 
-  const remove = (key: string, fieldId: string): boolean => delete record[key][fieldId]
+  const remove = (key: string, fieldId: string): boolean =>
+    delete record[key][fieldId];
 
   return {
     add,
     remove,
-  }
-}
+  };
+};
 
 export const isNoSpecialCharacters =
-  (message: string = 'No special characters allowed') =>
+  (message: string = "No special characters allowed") =>
   (value: string): string => {
-    if (specialCharacters.test(value)) return ''
-    return message
-  }
+    if (specialCharacters.test(value)) return "";
+    return message;
+  };
 
 export const isContainedIn =
-  (values: Ref<string[]>, message = 'No value selected') =>
+  (values: Ref<string[]>, message = "No value selected") =>
   (value: string): string => {
-    if (values.value.includes(value)) return ''
-    return message
-  }
+    if (values.value.includes(value)) return "";
+    return message;
+  };
 
 export const isNot =
-  (referenceValue: string, message = 'Value is not allowed') =>
+  (referenceValue: string, message = "Value is not allowed") =>
   (value: string): string => {
-    if (value !== referenceValue) return ''
-    return message
+    if (value !== referenceValue) return "";
+    return message;
+  };
+
+// This function will extract the field value from a DTO object
+export const getFieldValue = (path: string, value: any): string | string[] => {
+  // First we set is in a temporary variable
+  let temporaryValue: any = value;
+  // We split the path by dots and iterate over it
+  path.split(".").forEach((key: string) => {
+    const fieldKey = key.includes("(")
+      ? key.replace(")", "").split("(")[0]
+      : key;
+    // If the temporary value is not undefined we dig in
+    if (temporaryValue[fieldKey] !== undefined) {
+      // If the temporary value is an array we iterate over it
+      if (Array.isArray(temporaryValue[fieldKey])) {
+        // Array fields are split by star to indicate that we want to iterate over the array
+        // Due to that, we split the path by the star and get the second element containing the rest of the path
+        temporaryValue = temporaryValue[fieldKey].map((item: any) =>
+          getFieldValue(path.split(".*.").slice(1).join(".*."), item)
+        );
+        // if is not an array we just set the value
+      } else {
+        temporaryValue = temporaryValue[fieldKey];
+      }
+    }
+  });
+
+  // At the end we return the value, keep in mind that the value can be an array if the field is an array
+  return temporaryValue;
+};
+
+// We declare here a collection of all validations for every field in the form
+export const formFieldValidations: Record<string, ((value: string) => string)[]> = {};
+
+// This function will return all validators for the field
+export const getValidations = (key: string): ((value: string) => string)[] =>
+  formFieldValidations[key] || [];
+
+// This function will run the validators and return the errors
+export const runValidation = (
+  key: string,
+  target: any,
+  validation: (value: string) => string,
+  notify: boolean = false,
+  exhaustive = false
+): boolean => {
+  // We split the field key and the condition if it has one
+  const [fieldKey, fieldCondition] = key.includes("(")
+    ? key.replace(")", "").split("(")
+    : [key, "true"];
+  // We then load the field value
+  const fieldValue = getFieldValue(fieldKey, target);
+  // We define a function that will run the validation if the condition is true
+  const buildEval = (condition: string) =>
+    condition === "true" ? "true" : `target.${condition}`;
+  const executeValidation = (
+    item: any,
+    condition: string,
+    fieldId: string = fieldKey
+  ): string => {
+    // eslint-disable-next-line no-eval
+    if (eval(condition)) {
+      const validationResponse = validation(item);
+      if (notify) {
+        // Note: also notifies when valid - errorMsg will be empty.
+        notificationBus.emit({ fieldId, errorMsg: validationResponse }, item);
+      }
+      return validationResponse;
+    } else {
+      return "";
+    }
+  };
+  // If the field value is an array we run the validation for every item in the array
+  if (Array.isArray(fieldValue)) {
+    let hasInvalidItem = false;
+    for (let index = 0; index < fieldValue.length; index++) {
+      const item = fieldValue[index];
+      // And sometimes we can end up with another array inside, that's life
+      if (Array.isArray(item)) {
+        if (item.length === 0) item.push("");
+        let hasInvalidSubItem = false;
+        for (const subItem of item) {
+          const valid =
+            executeValidation(
+              subItem,
+              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+              fieldKey.replace(".*.", `[${index}].`)
+            ) === "";
+          if (!valid) {
+            hasInvalidSubItem = true;
+            if (!exhaustive) {
+              break;
+            }
+          }
+        }
+        return !hasInvalidSubItem;
+      }
+      // If it is not an array here, just validate it
+      const valid =
+        executeValidation(
+          item,
+          buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+          fieldKey.replace(".*.", `[${index}].`)
+        ) === "";
+      if (!valid) {
+        hasInvalidItem = true;
+        if (!exhaustive) {
+          break;
+        }
+      }
+    }
+    return !hasInvalidItem;
   }
+  // If the field value is not an array we run the validation for the field
+  return executeValidation(fieldValue, fieldCondition) === "";
+};
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 625f5b9970..224a336b8a 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -28,8 +28,12 @@ import ForestClientUserSession from "@/helpers/ForestClientUserSession";
 import {
   addValidation,
   validate,
-  runValidation,
 } from "@/helpers/validators/BCeIDFormValidations";
+
+import {
+  runValidation,
+} from "@/helpers/validators/GlobalValidators";
+
 // @ts-ignore
 import ArrowRight16 from "@carbon/icons-vue/es/arrow--right/16";
 // @ts-ignore
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index e0867ac334..3b11645d73 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -1,25 +1,29 @@
 <script setup lang="ts">
-import { watch, computed, ref, reactive } from 'vue'
+import { watch, computed, ref, reactive } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/inline-loading/index';
-import '@carbon/web-components/es/components/notification/index';
+import "@carbon/web-components/es/components/inline-loading/index";
+import "@carbon/web-components/es/components/notification/index";
 // Importing composables
-import { useEventBus } from '@vueuse/core'
-import { useFetchTo } from '@/composables/useFetch'
+import { useEventBus } from "@vueuse/core";
+import { useFetchTo } from "@/composables/useFetch";
 // Importing types
-import type { BusinessSearchResult, ProgressNotification } from '@/dto/CommonTypesDto'
-import { ClientTypeEnum } from '@/dto/CommonTypesDto'
+import type {
+  BusinessSearchResult,
+  ProgressNotification,
+} from "@/dto/CommonTypesDto";
+import { ClientTypeEnum } from "@/dto/CommonTypesDto";
 import type {
   FormDataDto,
-  ForestClientDetailsDto
-} from '@/dto/ApplyClientNumberDto'
+  ForestClientDetailsDto,
+} from "@/dto/ApplyClientNumberDto";
 // Importing validators
-import { getValidations } from '@/helpers/validators/BCeIDFormValidations'
-import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
+import { getValidations } from "@/helpers/validators/GlobalValidators";
+import { submissionValidation } from "@/helpers/validators/SubmissionValidators";
 // Importing helper functions
-import { retrieveClientType, exportAddress } from '@/helpers/DataConversors'
+import { retrieveClientType, exportAddress } from "@/helpers/DataConversors";
 // Importing session
-import ForestClientUserSession from '@/helpers/ForestClientUserSession'
+import ForestClientUserSession from "@/helpers/ForestClientUserSession";
+
 
 //Defining the props and emiter to reveice the data and emit an update
 const props = defineProps<{ data: FormDataDto; active: boolean }>()

From 8f43894d70e89ceb9222f08d29f63d4f453e61c8 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Fri, 22 Sep 2023 13:15:14 -0700
Subject: [PATCH 165/313] Made code reviews

---
 frontend/src/components/DataFetcher.vue | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/DataFetcher.vue b/frontend/src/components/DataFetcher.vue
index b1fd33fee3..15a6dd3b8b 100644
--- a/frontend/src/components/DataFetcher.vue
+++ b/frontend/src/components/DataFetcher.vue
@@ -1,15 +1,14 @@
 <script setup lang="ts">
-import { ref, watch, computed } from 'vue';
+import { ref, watch, computed } from "vue";
 // Composables
-import { useFetchTo } from '@/composables/useFetch';
-
+import { useFetchTo } from "@/composables/useFetch";
 
 const props = defineProps<{
-  url: string
-  params?: object
-  minLength: number
-  initValue: object
-  initFetch?: boolean
+  url: string;
+  params?: object;
+  minLength: number;
+  initValue: object;
+  initFetch?: boolean;
 }>();
 
 //Set the initial value to the content
@@ -24,7 +23,7 @@ const searchURL = computed(() => props.url);
 
 const { loading, error, fetch } = useFetchTo(searchURL, response, {
   skip: true,
-  ...props.params
+  ...props.params,
 });
 
 const calculateStringDifference = (
@@ -34,8 +33,8 @@ const calculateStringDifference = (
   if (initial === current) return 0;
   if (initial.length > current.length)
     return calculateStringDifference(current, initial);
-  return current.replace(initial, '').length;
-}
+  return current.replace(initial, "").length;
+};
 
 //If initial fetch is required, fetch
 if (props.initFetch) {
@@ -65,7 +64,7 @@ watch(
       });
     }
   }
-)
+);
 </script>
 <template>
   <slot :content="content" :loading="loading" :error="error"></slot>

From 6e32b64aebe40a18c297aec65169e20d49bc3b3c Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Fri, 22 Sep 2023 13:33:23 -0700
Subject: [PATCH 166/313] Formatted and beautified code

---
 .../validators/BCeIDFormValidations.spec.ts   | 310 +++++++++++-------
 1 file changed, 189 insertions(+), 121 deletions(-)

diff --git a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
index 9a0c997d64..9b343ed505 100644
--- a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
+++ b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
@@ -1,151 +1,219 @@
-import { describe, it, expect } from 'vitest'
+import { describe, it, expect } from "vitest";
 
-import { 
-  getField,
-  getValidations,
+import {
   validate,
   addValidation,
   runValidation,
-} from '@/helpers/validators/BCeIDFormValidations'
-import type { ValidationMessageType } from '@/dto/CommonTypesDto'
-import { useEventBus } from '@vueuse/core'
+} from "@/helpers/validators/BCeIDFormValidations";
+
+import {
+  getFieldValue,
+  getValidations,
+} from "@/helpers/validators/GlobalValidators";
 
-describe('BCeIDFormValidations.ts', () => {
+import type { ValidationMessageType } from "@/dto/CommonTypesDto";
+import { useEventBus } from "@vueuse/core";
 
+describe("BCeIDFormValidations.ts", () => {
   const formDataDto = {
     businessInformation: {
-      businessType: 'JJ',
-      legalType: '',
-      clientType: '',
-      incorporationNumber: '',
-      businessName: 'The Test Client Corp',
-      goodStandingInd: '',
+      businessType: "JJ",
+      legalType: "",
+      clientType: "",
+      incorporationNumber: "",
+      businessName: "The Test Client Corp",
+      goodStandingInd: "",
     },
     location: {
       addresses: [
         {
-          locationName: 'Mailing address',
-          streetAddress: '',
-          country: { value: 'CA', text: 'Canada' },
-          province: { value: '', text: '' },
-          city: '',
-          postalCode: 'A1A1A1',
+          locationName: "Mailing address",
+          streetAddress: "",
+          country: { value: "CA", text: "Canada" },
+          province: { value: "", text: "" },
+          city: "",
+          postalCode: "A1A1A1",
+        },
+      ],
+      contacts: [
+        {
+          locationNames: [{ text: "Mailing address", value: "0" }],
         },
       ],
-      contacts: [{
-        locationNames: [{text:'Mailing address', value:'0'}],
-      }],
     },
-  }
-
-  const isGreaterThanZero = (value: number) => value > 0 ? '' : 'invalid'
+  };
 
-  it('should get a list of functions for a field', () => {
-    addValidation('test', () => '')
-    expect(getValidations('test')).toEqual([expect.any(Function)])
-  })
-  it('should return an empty array for invalid fields', () => {
-    expect(getValidations('test2')).toEqual([])
-  })
-  it('should return the value of a simple field', () => {
-    expect(getField('businessInformation.businessType', formDataDto)).toEqual('JJ')
-  })
-  it('should return the value of a nested field', () => {
-    expect(getField('location.addresses.*.country.text', formDataDto)).toEqual(['Canada'])
-  })
-  it('should return the value of a nested field with a condition', () => {
-    expect(getField('location.addresses.*.postalCode(location.addresses.*.country.text === "CA")', formDataDto)).toEqual(['A1A1A1'])
-  })
-  it('should return the value of a nested field with a condition', () => {
-    expect(getField('location.addresses.*.postalCode(location.addresses.*.country.text === "US")', formDataDto)).toEqual(['A1A1A1'])
-  })
-  it('should return the value of a nested field within a nested field', () => {
-    expect(getField('location.contacts.*.locationNames.*.text', formDataDto)).toEqual([['Mailing address']])
-  })
-  it('should return true for a valid businessName', () => {
-    expect(validate(['businessInformation.businessName'], formDataDto)).toBeTruthy()
-  })
-  it('should return true for nested fields', () => {
-    expect(validate(['location.addresses.*.locationName'], formDataDto)).toBeTruthy()
-  })
-  it('should return true for nested fields with conditions', () => {
-    expect(validate(['location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'], formDataDto)).toBeTruthy()
-  })
-  it('should return true for nested fields withing nested fields', () => {
-    expect(validate(['location.contacts.*.locationNames.*.text'], formDataDto)).toBeTruthy()
-  })
-  it('should return true for fields with no validations', () => {
-    expect(validate(['businessInformation.businessType'], formDataDto)).toBeTruthy()
-  })
-  it('should return true for nested fields with conditions', () => {
-    expect(validate(['location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'], formDataDto)).toBeTruthy()
-  })
-  describe('runValidation', () => {
-    describe('when target is an array', () => {
-      it('should stop at the first error when exhaustive is false (default)', () => {
+  const isGreaterThanZero = (value: number) => (value > 0 ? "" : "invalid");
+  it("should get a list of functions for a field", () => {
+    addValidation("test", () => "");
+    expect(getValidations("test")).toEqual([expect.any(Function)]);
+  });
+  it("should return an empty array for invalid fields", () => {
+    expect(getValidations("test2")).toEqual([]);
+  });
+  it("should return the value of a simple field", () => {
+    expect(
+      getFieldValue("businessInformation.businessType", formDataDto)
+    ).toEqual("JJ");
+  });
+  it("should return the value of a nested field", () => {
+    expect(
+      getFieldValue("location.addresses.*.country.text", formDataDto)
+    ).toEqual(["Canada"]);
+  });
+  it("should return the value of a nested field with a condition", () => {
+    expect(
+      getFieldValue(
+        'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
+        formDataDto
+      )
+    ).toEqual(["A1A1A1"]);
+  });
+  it("should return the value of a nested field with a condition", () => {
+    expect(
+      getFieldValue(
+        'location.addresses.*.postalCode(location.addresses.*.country.text === "US")',
+        formDataDto
+      )
+    ).toEqual(["A1A1A1"]);
+  });
+  it("should return the value of a nested field within a nested field", () => {
+    expect(
+      getFieldValue("location.contacts.*.locationNames.*.text", formDataDto)
+    ).toEqual([["Mailing address"]]);
+  });
+  it("should return true for a valid businessName", () => {
+    expect(
+      validate(["businessInformation.businessName"], formDataDto)
+    ).toBeTruthy();
+  });
+  it("should return true for nested fields", () => {
+    expect(
+      validate(["location.addresses.*.locationName"], formDataDto)
+    ).toBeTruthy();
+  });
+  it("should return true for nested fields with conditions", () => {
+    expect(
+      validate(
+        [
+          'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
+        ],
+        formDataDto
+      )
+    ).toBeTruthy();
+  });
+  it("should return true for nested fields withing nested fields", () => {
+    expect(
+      validate(["location.contacts.*.locationNames.*.text"], formDataDto)
+    ).toBeTruthy();
+  });
+  it("should return true for fields with no validations", () => {
+    expect(
+      validate(["businessInformation.businessType"], formDataDto)
+    ).toBeTruthy();
+  });
+  it("should return true for nested fields with conditions", () => {
+    expect(
+      validate(
+        [
+          'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
+        ],
+        formDataDto
+      )
+    ).toBeTruthy();
+  });
+  describe("runValidation", () => {
+    describe("when target is an array", () => {
+      it("should stop at the first error when exhaustive is false (default)", () => {
         const target = {
-          foo: [10, 0, 5, 0, 2]
-        }
-        const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
-        let count = 0
+          foo: [10, 0, 5, 0, 2],
+        };
+        const notificationBus = useEventBus<ValidationMessageType | undefined>(
+          "error-notification"
+        );
+        let count = 0;
         notificationBus.on(() => {
-          count++
-        })
-        const result = runValidation('foo', target, isGreaterThanZero, true)
-        expect(result).toBe(false)
-        expect(count).toEqual(2)
-      })
-      it('should validate every item in the array regardless of finding any error when exhaustive is true', () => {
+          count++;
+        });
+        const result = runValidation("foo", target, isGreaterThanZero, true);
+        expect(result).toBe(false);
+        expect(count).toEqual(2);
+      });
+      it("should validate every item in the array regardless of finding any error when exhaustive is true", () => {
         const target = {
-          foo: [10, 0, 5, 0, 2]
-        }
-        const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
-        let count = 0
+          foo: [10, 0, 5, 0, 2],
+        };
+        const notificationBus = useEventBus<ValidationMessageType | undefined>(
+          "error-notification"
+        );
+        let count = 0;
         notificationBus.on(() => {
-          count++
-        })
-        const result = runValidation('foo', target, isGreaterThanZero, true, true)
-        expect(result).toBe(false)
-        expect(count).toEqual(5)
-      })
-      it('should emit the notification regardless of being valid or invalid', () => {
+          count++;
+        });
+        const result = runValidation(
+          "foo",
+          target,
+          isGreaterThanZero,
+          true,
+          true
+        );
+        expect(result).toBe(false);
+        expect(count).toEqual(5);
+      });
+      it("should emit the notification regardless of being valid or invalid", () => {
         const target = {
-          foo: [10, 0]
-        }
-        const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
-        let invalidCount = 0
-        let validCount = 0
+          foo: [10, 0],
+        };
+        const notificationBus = useEventBus<ValidationMessageType | undefined>(
+          "error-notification"
+        );
+        let invalidCount = 0;
+        let validCount = 0;
         notificationBus.on((event) => {
           if (event.errorMsg) {
-            invalidCount++
+            invalidCount++;
           } else {
-            validCount++
+            validCount++;
           }
-        })
-        const result = runValidation('foo', target, isGreaterThanZero, true, true)
-        expect(result).toBe(false)
-        expect(invalidCount).toEqual(1)
-        expect(validCount).toEqual(1)
-      })
-      it('should return true when every item is valid', () => {
+        });
+        const result = runValidation(
+          "foo",
+          target,
+          isGreaterThanZero,
+          true,
+          true
+        );
+        expect(result).toBe(false);
+        expect(invalidCount).toEqual(1);
+        expect(validCount).toEqual(1);
+      });
+      it("should return true when every item is valid", () => {
         const target = {
-          foo: [10, 20, 30]
-        }
-        const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
-        let invalidCount = 0
-        let validCount = 0
+          foo: [10, 20, 30],
+        };
+        const notificationBus = useEventBus<ValidationMessageType | undefined>(
+          "error-notification"
+        );
+        let invalidCount = 0;
+        let validCount = 0;
         notificationBus.on((event) => {
           if (event.errorMsg) {
-            invalidCount++
+            invalidCount++;
           } else {
-            validCount++
+            validCount++;
           }
-        })
-        const result = runValidation('foo', target, isGreaterThanZero, true, true)
-        expect(result).toBe(true)
-        expect(invalidCount).toEqual(0)
-        expect(validCount).toEqual(3)
-      })
-    })
-  })
-})
+        });
+        const result = runValidation(
+          "foo",
+          target,
+          isGreaterThanZero,
+          true,
+          true
+        );
+        expect(result).toBe(true);
+        expect(invalidCount).toEqual(0);
+        expect(validCount).toEqual(3);
+      });
+    });
+  });
+});

From a6ba5ecd41c1abb0edd50c292194f0a213e3810d Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 22 Sep 2023 18:07:53 -0300
Subject: [PATCH 167/313] style: small changes to code style

---
 frontend/src/components/DataFetcher.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/frontend/src/components/DataFetcher.vue b/frontend/src/components/DataFetcher.vue
index 15a6dd3b8b..5547fbc0c0 100644
--- a/frontend/src/components/DataFetcher.vue
+++ b/frontend/src/components/DataFetcher.vue
@@ -11,7 +11,7 @@ const props = defineProps<{
   initFetch?: boolean;
 }>();
 
-//Set the initial value to the content
+// Set the initial value to the content
 const content = ref<any>(props.initValue);
 
 const response = ref<any>();
@@ -36,20 +36,18 @@ const calculateStringDifference = (
   return current.replace(initial, "").length;
 };
 
-//If initial fetch is required, fetch
+// If initial fetch is required, fetch
 if (props.initFetch) {
   fetch().then(() => {
     content.value = response.value;
   });
 }
 
-//Watch for changes in the url, and if the difference is greater than the min length, fetch
+// Watch for changes in the url, and if the difference is greater than the min length, fetch
 watch(
   () => props.url,
   () => {
-    if (
-      calculateStringDifference(initialUrlValue, props.url) >= props.minLength
-    ) {
+    if (calculateStringDifference(initialUrlValue, props.url) >= props.minLength) {
       const curRequestTime = Date.now();
       // const curUrl = props.url;
       fetch().then(() => {
@@ -63,7 +61,7 @@ watch(
         }
       });
     }
-  }
+  },
 );
 </script>
 <template>

From 9b0579ae2451ab351ccf8ed136f7e92fdff2f75b Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 22 Sep 2023 18:09:22 -0300
Subject: [PATCH 168/313] chore: fix code linter

---
 frontend/.eslintrc.js      |  6 +++---
 frontend/package-lock.json | 32 +++++++++++++++++++++++++++-----
 frontend/package.json      |  3 ++-
 3 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/frontend/.eslintrc.js b/frontend/.eslintrc.js
index 0728235ace..41ee8fe6b9 100644
--- a/frontend/.eslintrc.js
+++ b/frontend/.eslintrc.js
@@ -31,14 +31,14 @@ module.exports = {
     '@vue/eslint-config-typescript/recommended',
     '@vue/eslint-config-prettier',
   ],
-  parser: '@typescript-eslint/parser',
+  parser: 'vue-eslint-parser',
   parserOptions: {
+    parser: '@typescript-eslint/parser',
     ecmaVersion: '11',
     sourceType: 'module',
   },
   plugins: ['@typescript-eslint', 'prettier', 'vue'],
   rules: {
-    'vue/no-multiple-template-root': 'error',
     'vue/no-v-html': 'error',
     'vue/require-prop-types': 'error',
     'prettier/prettier': 'error',
@@ -58,4 +58,4 @@ module.exports = {
     cy: 'readonly',
     Cypress: 'readonly',
   },
-}
+};
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 487c81914e..d8ef79332a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -30,7 +30,7 @@
         "@types/jsdom": "^21.1.0",
         "@types/node": "^18.14.2",
         "@typescript-eslint/eslint-plugin": "^6.5.0",
-        "@typescript-eslint/parser": "^6.5.0",
+        "@typescript-eslint/parser": "^6.7.2",
         "@vitejs/plugin-vue": "^4.0.0",
         "@vitest/coverage-istanbul": "^0.34.0",
         "@vue/eslint-config-prettier": "^8.0.0",
@@ -41,6 +41,7 @@
         "eslint": "^8.48.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-config-standard": "^17.1.0",
+        "eslint-import-resolver-typescript": "^3.6.1",
         "eslint-plugin-cypress": "^2.12.1",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-vue": "^9.17.0",
@@ -6593,7 +6594,6 @@
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz",
       "integrity": "sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "graceful-fs": "^4.2.4",
         "tapable": "^2.2.0"
@@ -6909,6 +6909,31 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/eslint-import-resolver-typescript": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.6.1.tgz",
+      "integrity": "sha512-xgdptdoi5W3niYeuQxKmzVDTATvLYqhpwmykwsh7f6HIOStGWEIL9iqZgQDF9u9OEzrRwR8no5q2VT+bjAujTg==",
+      "dev": true,
+      "dependencies": {
+        "debug": "^4.3.4",
+        "enhanced-resolve": "^5.12.0",
+        "eslint-module-utils": "^2.7.4",
+        "fast-glob": "^3.3.1",
+        "get-tsconfig": "^4.5.0",
+        "is-core-module": "^2.11.0",
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
+      },
+      "peerDependencies": {
+        "eslint": "*",
+        "eslint-plugin-import": "*"
+      }
+    },
     "node_modules/eslint-module-utils": {
       "version": "2.8.0",
       "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz",
@@ -7931,7 +7956,6 @@
       "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.2.tgz",
       "integrity": "sha512-wuMsz4leaj5hbGgg4IvDU0bqJagpftG5l5cXIAvo8uZrqn0NJqwtfupTN00VnkQJPcIRrxYrm1Ue24btpCha2A==",
       "dev": true,
-      "peer": true,
       "dependencies": {
         "resolve-pkg-maps": "^1.0.0"
       },
@@ -11204,7 +11228,6 @@
       "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz",
       "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==",
       "dev": true,
-      "peer": true,
       "funding": {
         "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1"
       }
@@ -12169,7 +12192,6 @@
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
       "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=6"
       }
diff --git a/frontend/package.json b/frontend/package.json
index 49b1a31644..d1b55506fb 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -63,7 +63,7 @@
     "@types/jsdom": "^21.1.0",
     "@types/node": "^18.14.2",
     "@typescript-eslint/eslint-plugin": "^6.5.0",
-    "@typescript-eslint/parser": "^6.5.0",
+    "@typescript-eslint/parser": "^6.7.2",
     "@vitejs/plugin-vue": "^4.0.0",
     "@vitest/coverage-istanbul": "^0.34.0",
     "@vue/eslint-config-prettier": "^8.0.0",
@@ -74,6 +74,7 @@
     "eslint": "^8.48.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-config-standard": "^17.1.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-cypress": "^2.12.1",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-vue": "^9.17.0",

From 9adba1ca9281f207417614d46b28ce1e5a1b5dea Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Fri, 22 Sep 2023 15:25:23 -0700
Subject: [PATCH 169/313] Refactored code - Part #1.1

---
 .../unittests/helpers/validators/BCeIDFormValidations.spec.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
index 9b343ed505..605e23df32 100644
--- a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
+++ b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
@@ -3,12 +3,12 @@ import { describe, it, expect } from "vitest";
 import {
   validate,
   addValidation,
-  runValidation,
 } from "@/helpers/validators/BCeIDFormValidations";
 
 import {
   getFieldValue,
   getValidations,
+  runValidation,
 } from "@/helpers/validators/GlobalValidators";
 
 import type { ValidationMessageType } from "@/dto/CommonTypesDto";

From 7c0e4190d73e45165991fdc5a235b6561c200b0f Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Fri, 22 Sep 2023 16:08:07 -0700
Subject: [PATCH 170/313] fix: Fixed sonarcloud security hotspot issue

---
 frontend/src/helpers/validators/GlobalValidators.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index c3567da023..b9bf2ade69 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -4,7 +4,7 @@ import type { ValidationMessageType } from "@/dto/CommonTypesDto";
 
 // Defines the used regular expressions
 // @sonar-ignore-next-line
-const emailRegex: RegExp = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+const emailRegex: RegExp = /^[a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/;
 const specialCharacters: RegExp = /^[a-zA-Z0-9\sÀ-ÖØ-öø-ÿ]+$/;
 const e164Regex: RegExp = /^((\+?[1-9]\d{1,14})|(\(\d{3}\) \d{3}-\d{4}))$/;
 const canadianPostalCodeRegex: RegExp = /^(([A-Z]\d){3})$/i;

From 7e4a196a2df246060204714478ec21e0a0d8fc66 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Fri, 22 Sep 2023 17:40:42 -0700
Subject: [PATCH 171/313] fix: Fixed security hotspot

---
 .../helpers/validators/GlobalValidators.ts    | 32 +++++++++++++------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index b9bf2ade69..6c37daa43d 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -283,7 +283,10 @@ export const getFieldValue = (path: string, value: any): string | string[] => {
 };
 
 // We declare here a collection of all validations for every field in the form
-export const formFieldValidations: Record<string, ((value: string) => string)[]> = {};
+export const formFieldValidations: Record<
+  string,
+  ((value: string) => string)[]
+> = {};
 
 // This function will return all validators for the field
 export const getValidations = (key: string): ((value: string) => string)[] =>
@@ -311,18 +314,29 @@ export const runValidation = (
     condition: string,
     fieldId: string = fieldKey
   ): string => {
-    // eslint-disable-next-line no-eval
-    if (eval(condition)) {
-      const validationResponse = validation(item);
-      if (notify) {
-        // Note: also notifies when valid - errorMsg will be empty.
-        notificationBus.emit({ fieldId, errorMsg: validationResponse }, item);
+    try {
+      const conditionFunction = new Function(
+        "item",
+        `return ${condition};`
+      );
+
+      if (conditionFunction(item)) {
+        const validationResponse = validation(item);
+        if (notify) {
+          // Note: also notifies when valid - errorMsg will be empty.
+          notificationBus.emit({ fieldId, errorMsg: validationResponse }, item);
+        }
+        return validationResponse;
+      } else {
+        return "";
       }
-      return validationResponse;
-    } else {
+    } catch (error) {
+      // Handle any potential errors in the condition evaluation
+      console.error("Error evaluating condition:", error);
       return "";
     }
   };
+
   // If the field value is an array we run the validation for every item in the array
   if (Array.isArray(fieldValue)) {
     let hasInvalidItem = false;

From 26098fbbdab722bf3804cbd3fe6ba6a49c08ba5b Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 25 Sep 2023 11:16:30 -0700
Subject: [PATCH 172/313] Refactored code - Part #2

---
 .../validators/BCeIDFormValidations.ts        | 78 -------------------
 .../helpers/validators/GlobalValidators.ts    | 73 +++++++++++++++++
 frontend/src/pages/FormBCeIDPage.vue          |  2 +-
 3 files changed, 74 insertions(+), 79 deletions(-)

diff --git a/frontend/src/helpers/validators/BCeIDFormValidations.ts b/frontend/src/helpers/validators/BCeIDFormValidations.ts
index 55021622be..525a1a2c30 100644
--- a/frontend/src/helpers/validators/BCeIDFormValidations.ts
+++ b/frontend/src/helpers/validators/BCeIDFormValidations.ts
@@ -12,16 +12,8 @@ import {
   isNoSpecialCharacters,
   isNot,
   formFieldValidations,
-  getFieldValue,
-  getValidations
 } from "@/helpers/validators/GlobalValidators";
 
-import type { FormDataDto } from "@/dto/ApplyClientNumberDto";
-import type { ValidationMessageType } from "@/dto/CommonTypesDto";
-
-const errorBus = useEventBus<ValidationMessageType[]>(
-  "submission-error-notification"
-);
 
 // Step 1: Business Information
 formFieldValidations["businessInformation.businessName"] = [
@@ -111,76 +103,6 @@ formFieldValidations["location.contacts.*.phoneNumber"] = [
   isMinSize("Please provide a valid phone number")(10),
 ];
 
-// This function will run the validators and return the errors
-export const validate = (
-  keys: string[],
-  target: FormDataDto,
-  notify: boolean = false
-): boolean => {
-  // For every received key we get the validations and run them
-  return keys.every((key) => {
-    // First we get all validators for that field
-    const validations: ((value: string) => string)[] = getValidations(key);
-    // We split the field key and the condition if it has one
-    const [fieldKey, fieldCondition] = key.includes("(")
-      ? key.replace(")", "").split("(")
-      : [key, "true"];
-    // For every validator we run it and check if the result is empty
-    return validations.every((validation: (value: string) => string) => {
-      // We then load the field value
-      const fieldValue = getFieldValue(fieldKey, target);
-      // We define a function that will run the validation if the condition is true
-      const buildEval = (condition: string) =>
-        condition === "true" ? "true" : `target.${condition}`;
-      const runValidation = (
-        item: any,
-        condition: string,
-        fieldId: string = fieldKey
-      ): string => {
-        // eslint-disable-next-line no-eval
-        if (eval(condition)) {
-          const validationResponse = validation(item);
-          if (notify && validationResponse) {
-            errorBus.emit([{ fieldId, errorMsg: validationResponse }]);
-          }
-          return validationResponse;
-        } else {
-          return "";
-        }
-      };
-      // If the field value is an array we run the validation for every item in the array
-      if (Array.isArray(fieldValue)) {
-        return fieldValue.every((item: any, index: number) => {
-          // And sometimes we can end up with another array inside, that's life
-          if (Array.isArray(item)) {
-            if (item.length === 0) item.push("");
-            return item.every(
-              (subItem: any) =>
-                runValidation(
-                  subItem,
-                  buildEval(fieldCondition.replace(".*.", `[${index}].`)),
-                  fieldKey.replace(".*.", `[${index}].`)
-                ) === ""
-            );
-          }
-          // If it is not an array here, just validate it
-          return (
-            runValidation(
-              item,
-              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
-              fieldKey.replace(".*.", `[${index}].`)
-            ) === ""
-          );
-        });
-      }
-      // If the field value is not an array we run the validation for the field
-      return runValidation(fieldValue, fieldCondition) === "";
-    });
-  });
-};
-
-
-
 export const addValidation = (
   key: string,
   validation: (value: string) => string
diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 6c37daa43d..83217bdb3e 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -14,6 +14,10 @@ const notificationBus = useEventBus<ValidationMessageType | undefined>(
   "error-notification"
 );
 
+const errorBus = useEventBus<ValidationMessageType[]>(
+  "submission-error-notification"
+);
+
 /**
  * Checks if the value is not empty
  * @param value - The value to check
@@ -381,3 +385,72 @@ export const runValidation = (
   // If the field value is not an array we run the validation for the field
   return executeValidation(fieldValue, fieldCondition) === "";
 };
+
+
+// This function will run the validators and return the errors
+export const validate = (
+  keys: string[],
+  target: any,
+  notify: boolean = false
+): boolean => {
+  // For every received key we get the validations and run them
+  return keys.every((key) => {
+    // First we get all validators for that field
+    const validations: ((value: string) => string)[] = getValidations(key);
+    // We split the field key and the condition if it has one
+    const [fieldKey, fieldCondition] = key.includes("(")
+      ? key.replace(")", "").split("(")
+      : [key, "true"];
+    // For every validator we run it and check if the result is empty
+    return validations.every((validation: (value: string) => string) => {
+      // We then load the field value
+      const fieldValue = getFieldValue(fieldKey, target);
+      // We define a function that will run the validation if the condition is true
+      const buildEval = (condition: string) =>
+        condition === "true" ? "true" : `target.${condition}`;
+      const runValidation = (
+        item: any,
+        condition: string,
+        fieldId: string = fieldKey
+      ): string => {
+        // eslint-disable-next-line no-eval
+        if (eval(condition)) {
+          const validationResponse = validation(item);
+          if (notify && validationResponse) {
+            errorBus.emit([{ fieldId, errorMsg: validationResponse }]);
+          }
+          return validationResponse;
+        } else {
+          return "";
+        }
+      };
+      // If the field value is an array we run the validation for every item in the array
+      if (Array.isArray(fieldValue)) {
+        return fieldValue.every((item: any, index: number) => {
+          // And sometimes we can end up with another array inside, that's life
+          if (Array.isArray(item)) {
+            if (item.length === 0) item.push("");
+            return item.every(
+              (subItem: any) =>
+                runValidation(
+                  subItem,
+                  buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+                  fieldKey.replace(".*.", `[${index}].`)
+                ) === ""
+            );
+          }
+          // If it is not an array here, just validate it
+          return (
+            runValidation(
+              item,
+              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+              fieldKey.replace(".*.", `[${index}].`)
+            ) === ""
+          );
+        });
+      }
+      // If the field value is not an array we run the validation for the field
+      return runValidation(fieldValue, fieldCondition) === "";
+    });
+  });
+};
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 224a336b8a..b120b9cc5c 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -27,11 +27,11 @@ import ForestClientUserSession from "@/helpers/ForestClientUserSession";
 // Imported global validations
 import {
   addValidation,
-  validate,
 } from "@/helpers/validators/BCeIDFormValidations";
 
 import {
   runValidation,
+  validate,
 } from "@/helpers/validators/GlobalValidators";
 
 // @ts-ignore

From 2e8fb2477eb5883539446955a17098a4206e8a6a Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 25 Sep 2023 11:25:41 -0700
Subject: [PATCH 173/313] Refactored code - Part #2.1

---
 .../unittests/helpers/validators/BCeIDFormValidations.spec.ts   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
index 605e23df32..2af78262bb 100644
--- a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
+++ b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
@@ -1,7 +1,6 @@
 import { describe, it, expect } from "vitest";
 
 import {
-  validate,
   addValidation,
 } from "@/helpers/validators/BCeIDFormValidations";
 
@@ -9,6 +8,7 @@ import {
   getFieldValue,
   getValidations,
   runValidation,
+  validate,
 } from "@/helpers/validators/GlobalValidators";
 
 import type { ValidationMessageType } from "@/dto/CommonTypesDto";

From b781223474ed8dbc5eb3089cc86cfe402eb15b6a Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 25 Sep 2023 15:58:18 -0300
Subject: [PATCH 174/313] fix: fix header small screen

---
 frontend/src/assets/styles/global.scss        | 19 ++++---------------
 .../src/components/MainHeaderComponent.vue    |  2 --
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index d96edc169f..af5261579c 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -76,6 +76,8 @@
 
 .heading-buttons {
   display: flex;
+  flex-grow: 1;
+  justify-content: flex-end;
   gap: 1.5rem;
   --cds-text-inverse: var(--light-theme-text-text-primary);
   --cds-button-tertiary: var(--dark-theme-button-button-tertiary);
@@ -249,14 +251,10 @@ hr {
 }
 .heading {
   display: flex;
-  padding: 0.9375rem 2rem 0.9375rem 0.5rem;
+  padding: 0.9375rem 0.5rem 0.9375rem 0.5rem;
   align-items: flex-start;
   gap: 0.1875rem;
 }
-.heading-space {
-  flex: 1 0 0;
-  align-self: stretch;
-}
 .heading-button-transparent {
   display: flex;
   width: 12.375rem;
@@ -750,11 +748,6 @@ cds-modal {
     display: none;
   }
 
-  .heading-space {
-    width: 2rem;
-    flex-shrink: 0;
-  }
-
   .form-header {
     align-self: stretch;
   }
@@ -798,14 +791,10 @@ cds-modal {
   }
 
   .heading {
-    padding: 0.9375rem 2rem 0.9375rem 0.5rem;
+    padding: 0.9375rem 0.5rem 0.9375rem 0.5rem;
     flex-shrink: 0;
   }
 
-  .heading-space {
-    width: 8.75rem;
-  }
-
   .form-header {
     align-self: stretch;
   }
diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 66c6c1d2c3..42fffe1b07 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -42,8 +42,6 @@ const logoutModalActive = ref(false);
     <span class="heading-compact-01" v-else>Client Management System</span>
     <span class="heading-compact-01" v-if="env !== 'Prod'">Env. {{ env }} - Rel. {{appVersion}}</span>
   </div>
-  
-  <div class="heading-space"></div>
 
   <div class="heading-buttons">
 

From c0d9592195791637c9f20040abe9ea148049ee6c Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 25 Sep 2023 16:15:18 -0300
Subject: [PATCH 175/313] fix: attempt to fix side effect in the workflow

---
 .../components/components/grouping/AddressGroupComponent.cy.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index 81eef64b5d..0d969b3358 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -149,7 +149,7 @@ describe('<AddressGroupComponent />', () => {
       .and('have.value', 'Canada')
       .click()
       .find('cds-combo-box-item[data-id="US"]')
-      .click({ force: true }) // Prevent error in the workflow
+      .click()
       .and('have.value', 'United States of America')
 
     cy.wait('@getStates')

From 66554f29932dbdac096bf7c21db9bb5521947893 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 25 Sep 2023 13:29:11 -0700
Subject: [PATCH 176/313] chore: submitting small changes

---
 frontend/package-lock.json                    | 1516 +++++++----------
 frontend/src/assets/styles/global.scss        |    1 +
 .../forms/AutoCompleteInputComponent.vue      |   46 +-
 .../forms/DropdownInputComponent.vue          |    2 +-
 frontend/stub/mappings/fam.json               |    2 +-
 5 files changed, 644 insertions(+), 923 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index d8ef79332a..d647fae8e1 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -171,30 +171,30 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.20.tgz",
-      "integrity": "sha512-BQYjKbpXjoXwFW5jGqiizJQQT/aC7pFm9Ok1OWssonuguICi264lbgMzRp2ZMmRSlfkX6DsWDDcsrctK8Rwfiw==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz",
+      "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.20.tgz",
-      "integrity": "sha512-Y6jd1ahLubuYweD/zJH+vvOY141v4f9igNQAQ+MBgq9JlHS2iTsZKn1aMsb3vGccZsXI16VzTBw52Xx0DWmtnA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz",
+      "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.22.15",
-        "@babel/helper-compilation-targets": "^7.22.15",
-        "@babel/helper-module-transforms": "^7.22.20",
-        "@babel/helpers": "^7.22.15",
-        "@babel/parser": "^7.22.16",
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.20",
-        "@babel/types": "^7.22.19",
+        "@babel/code-frame": "^7.22.10",
+        "@babel/generator": "^7.22.10",
+        "@babel/helper-compilation-targets": "^7.22.10",
+        "@babel/helper-module-transforms": "^7.22.9",
+        "@babel/helpers": "^7.22.11",
+        "@babel/parser": "^7.22.11",
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.11",
+        "@babel/types": "^7.22.11",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -210,12 +210,12 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.15.tgz",
-      "integrity": "sha512-Zu9oWARBqeVOW0dZOjXc3JObrzuqothQ3y/n1kUtrjCoCPLkXUwMvOo/F/TCfoHMbWIFlWwpZtkZVb9ga4U2pA==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz",
+      "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.15",
+        "@babel/types": "^7.22.10",
         "@jridgewell/gen-mapping": "^0.3.2",
         "@jridgewell/trace-mapping": "^0.3.17",
         "jsesc": "^2.5.1"
@@ -238,26 +238,26 @@
       }
     },
     "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.15.tgz",
-      "integrity": "sha512-QkBXwGgaoC2GtGZRoma6kv7Szfv06khvhFav67ZExau2RaXzy8MpHSMO2PNoP2XtmQphJQRHFfg77Bq731Yizw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz",
+      "integrity": "sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/types": "^7.22.10"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.15.tgz",
-      "integrity": "sha512-y6EEzULok0Qvz8yyLkCvVX+02ic+By2UdOhylwUOvOn9dvYc9mKICJuuU1n1XBI02YWsNsnrY1kc6DVbjcXbtw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz",
+      "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==",
       "dev": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-validator-option": "^7.22.15",
+        "@babel/helper-validator-option": "^7.22.5",
         "browserslist": "^4.21.9",
         "lru-cache": "^5.1.1",
         "semver": "^6.3.1"
@@ -267,16 +267,16 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-jKkwA59IXcvSaiK2UN45kKwSC9o+KuoXsBDvHvU/7BecYIp8GQ2UwrVvFgJASUT+hBnwJx6MhvMCuMzwZZ7jlg==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz",
+      "integrity": "sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-replace-supers": "^7.22.9",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
@@ -291,9 +291,9 @@
       }
     },
     "node_modules/@babel/helper-create-regexp-features-plugin": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.15.tgz",
-      "integrity": "sha512-29FkPLFjn4TPEa3RE7GpW+qbE8tlsu3jntNYNfcGsc49LphF1PQIiD+vMZ1z1xVOKt+93khA9tc2JBs3kBjA7w==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz",
+      "integrity": "sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -326,9 +326,9 @@
       }
     },
     "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz",
-      "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz",
+      "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
@@ -360,41 +360,41 @@
       }
     },
     "node_modules/@babel/helper-member-expression-to-functions": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.15.tgz",
-      "integrity": "sha512-qLNsZbgrNh0fDQBCPocSL8guki1hcPvltGDv/NxvUoABwFq7GkKSu1nRXeJkVZc+wJvne2E0RKQz+2SQrz6eAA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz",
+      "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-imports": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz",
-      "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz",
+      "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==",
       "dev": true,
       "dependencies": {
-        "@babel/types": "^7.22.15"
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-module-transforms": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.20.tgz",
-      "integrity": "sha512-dLT7JVWIUUxKOs1UnJUBR3S70YK+pKX6AbJgB2vMIvEkZkrfJDbYDJesnPshtKV4LhDOR3Oc5YULeDizRek+5A==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz",
+      "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-module-imports": "^7.22.15",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-module-imports": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/helper-validator-identifier": "^7.22.20"
+        "@babel/helper-validator-identifier": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -427,15 +427,15 @@
       }
     },
     "node_modules/@babel/helper-remap-async-to-generator": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.20.tgz",
-      "integrity": "sha512-pBGyV4uBqOns+0UvhsTO8qgl8hO89PmiDYv+/COyp1aeMcmfrfruz+/nCMFiYyFF/Knn0yfrC85ZzNFjembFTw==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz",
+      "integrity": "sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-wrap-function": "^7.22.20"
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-wrap-function": "^7.22.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -445,14 +445,14 @@
       }
     },
     "node_modules/@babel/helper-replace-supers": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz",
-      "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==",
+      "version": "7.22.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz",
+      "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/helper-environment-visitor": "^7.22.20",
-        "@babel/helper-member-expression-to-functions": "^7.22.15",
+        "@babel/helper-environment-visitor": "^7.22.5",
+        "@babel/helper-member-expression-to-functions": "^7.22.5",
         "@babel/helper-optimise-call-expression": "^7.22.5"
       },
       "engines": {
@@ -509,59 +509,59 @@
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz",
-      "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz",
+      "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-option": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.15.tgz",
-      "integrity": "sha512-bMn7RmyFjY/mdECUbgn9eoSY4vqvacUnS9i9vGAGttgFWesO6B4CYWA7XlpbWgBt71iv/hfbPlynohStqnu5hA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz",
+      "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==",
       "dev": true,
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-wrap-function": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.20.tgz",
-      "integrity": "sha512-pms/UwkOpnQe/PDAEdV/d7dVCoBbB+R4FvYoHGZz+4VPcg7RtYy2KP7S2lbuWM6FCSgob5wshfGESbC/hzNXZw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz",
+      "integrity": "sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/helper-function-name": "^7.22.5",
-        "@babel/template": "^7.22.15",
-        "@babel/types": "^7.22.19"
+        "@babel/template": "^7.22.5",
+        "@babel/types": "^7.22.10"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.15.tgz",
-      "integrity": "sha512-7pAjK0aSdxOwR+CcYAqgWOGy5dcfvzsTIfFTb2odQqW47MDfv14UaJDY6eng8ylM2EaeKXdxaSWESbkmaQHTmw==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz",
+      "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==",
       "dev": true,
       "dependencies": {
-        "@babel/template": "^7.22.15",
-        "@babel/traverse": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/template": "^7.22.5",
+        "@babel/traverse": "^7.22.11",
+        "@babel/types": "^7.22.11"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/highlight": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.20.tgz",
-      "integrity": "sha512-dkdMCN3py0+ksCgYmGG8jKeGA/8Tk+gJwSYYlFGxG5lmhfKNoAy004YpLxpS1W2J8m/EK2Ew+yOs9pVRwO89mg==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz",
+      "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==",
       "dev": true,
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.22.20",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "chalk": "^2.4.2",
         "js-tokens": "^4.0.0"
       },
@@ -570,9 +570,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.22.16",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.16.tgz",
-      "integrity": "sha512-+gPfKv8UWeKKeJTUxe59+OobVcrYHETCsORl61EmSkmgymguYk/X5bp7GuUIXaFsc6y++v8ZxPsLSSuujqDphA==",
+      "version": "7.22.13",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.13.tgz",
+      "integrity": "sha512-3l6+4YOvc9wx7VlCSw4yQfcBo01ECA8TicQfbnCPuCEpRQrf+gTUyGdxNw+pyTUyywp6JRD1w0YQs9TpBXYlkw==",
       "bin": {
         "parser": "bin/babel-parser.js"
       },
@@ -581,9 +581,9 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.15.tgz",
-      "integrity": "sha512-FB9iYlz7rURmRJyXRKEnalYPPdn87H5no108cyuQQyMwlpJ2SJtpIUBI27kdTin956pz+LPypkPVPUTlxOmrsg==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz",
+      "integrity": "sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -597,15 +597,15 @@
       }
     },
     "node_modules/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.15.tgz",
-      "integrity": "sha512-Hyph9LseGvAeeXzikV88bczhsrLrIZqDPxO+sSmAunMPaGrBGhfMWzCPYTtiW9t+HzSE2wtV8e5cc5P6r1xMDQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz",
+      "integrity": "sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5",
-        "@babel/plugin-transform-optional-chaining": "^7.22.15"
+        "@babel/plugin-transform-optional-chaining": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -897,9 +897,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-async-generator-functions": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.15.tgz",
-      "integrity": "sha512-jBm1Es25Y+tVoTi5rfd5t1KLmL8ogLKpXszboWOTTtGFGz2RKnQe2yn7HbZ+kb/B8N0FVSGQo874NSlOU1T4+w==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.11.tgz",
+      "integrity": "sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -950,9 +950,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.15.tgz",
-      "integrity": "sha512-G1czpdJBZCtngoK1sJgloLiOHUnkb/bLZwqVZD8kXmq0ZnVfTTWUcs9OWtp0mBtYJ+4LQY1fllqBkOIPhXmFmw==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz",
+      "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -1001,19 +1001,19 @@
       }
     },
     "node_modules/@babel/plugin-transform-classes": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.15.tgz",
-      "integrity": "sha512-VbbC3PGjBdE0wAWDdHM9G8Gm977pnYI0XpqMd6LrKISj8/DJXEsWqgRuTYaNE9Bv0JGhTZUzHDlMk18IpOuoqw==",
+      "version": "7.22.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz",
+      "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-compilation-targets": "^7.22.6",
         "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-optimise-call-expression": "^7.22.5",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-replace-supers": "^7.22.9",
+        "@babel/helper-replace-supers": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
         "globals": "^11.1.0"
       },
@@ -1042,9 +1042,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-destructuring": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.15.tgz",
-      "integrity": "sha512-HzG8sFl1ZVGTme74Nw+X01XsUTqERVQ6/RLHo3XjGRzm7XD6QTtfS3NJotVgCGy8BzkDqRjRBD8dAyJn5TuvSQ==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz",
+      "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -1142,9 +1142,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-for-of": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.15.tgz",
-      "integrity": "sha512-me6VGeHsx30+xh9fbDLLPi0J1HzmeIIyenoOQHuw2D4m2SAU3NrspX5XxJLBpqn5yrLzrlw2Iy3RA//Bx27iOA==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz",
+      "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -1259,13 +1259,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.15.tgz",
-      "integrity": "sha512-jWL4eh90w0HQOTKP2MoXXUpVxilxsB2Vl4ji69rSjS3EcZ/v4sBmn+A3NpepuJzBhOaEBbR7udonlHHn5DWidg==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.11.tgz",
+      "integrity": "sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.22.15",
+        "@babel/helper-module-transforms": "^7.22.9",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/helper-simple-access": "^7.22.5"
       },
@@ -1380,17 +1380,17 @@
       }
     },
     "node_modules/@babel/plugin-transform-object-rest-spread": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.15.tgz",
-      "integrity": "sha512-fEB+I1+gAmfAyxZcX1+ZUwLeAuuf8VIg67CTznZE0MqVFumWkh8xWtn58I4dxdVf080wn7gzWoF8vndOViJe9Q==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.11.tgz",
+      "integrity": "sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@babel/compat-data": "^7.22.9",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/helper-compilation-targets": "^7.22.10",
         "@babel/helper-plugin-utils": "^7.22.5",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.22.15"
+        "@babel/plugin-transform-parameters": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1434,9 +1434,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-optional-chaining": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.15.tgz",
-      "integrity": "sha512-ngQ2tBhq5vvSJw2Q2Z9i7ealNkpDMU0rGWnHPKqRZO0tzZ5tlaoz4hDvhXioOoaE0X2vfNss1djwg0DXlfu30A==",
+      "version": "7.22.12",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.12.tgz",
+      "integrity": "sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -1452,9 +1452,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-parameters": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.15.tgz",
-      "integrity": "sha512-hjk7qKIqhyzhhUvRT683TYQOFa/4cQKwQy7ALvTpODswN40MljzNDa0YldevS6tGbxwaEKVn502JmY0dP7qEtQ==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz",
+      "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -1701,18 +1701,18 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.20.tgz",
-      "integrity": "sha512-11MY04gGC4kSzlPHRfvVkNAZhUxOvm7DCJ37hPDnUENwe06npjIRAfInEMTGSb4LZK5ZgDFkv5hw0lGebHeTyg==",
+      "version": "7.22.10",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.22.10.tgz",
+      "integrity": "sha512-riHpLb1drNkpLlocmSyEg4oYJIQFeXAK/d7rI6mbD0XsvoTOOweXDmQPG/ErxsEhWk3rl3Q/3F6RFQlVFS8m0A==",
       "dev": true,
       "peer": true,
       "dependencies": {
-        "@babel/compat-data": "^7.22.20",
-        "@babel/helper-compilation-targets": "^7.22.15",
+        "@babel/compat-data": "^7.22.9",
+        "@babel/helper-compilation-targets": "^7.22.10",
         "@babel/helper-plugin-utils": "^7.22.5",
-        "@babel/helper-validator-option": "^7.22.15",
-        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.15",
-        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.15",
+        "@babel/helper-validator-option": "^7.22.5",
+        "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "^7.22.5",
+        "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.22.5",
         "@babel/plugin-proposal-private-property-in-object": "7.21.0-placeholder-for-preset-env.2",
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-class-properties": "^7.12.13",
@@ -1733,41 +1733,41 @@
         "@babel/plugin-syntax-top-level-await": "^7.14.5",
         "@babel/plugin-syntax-unicode-sets-regex": "^7.18.6",
         "@babel/plugin-transform-arrow-functions": "^7.22.5",
-        "@babel/plugin-transform-async-generator-functions": "^7.22.15",
+        "@babel/plugin-transform-async-generator-functions": "^7.22.10",
         "@babel/plugin-transform-async-to-generator": "^7.22.5",
         "@babel/plugin-transform-block-scoped-functions": "^7.22.5",
-        "@babel/plugin-transform-block-scoping": "^7.22.15",
+        "@babel/plugin-transform-block-scoping": "^7.22.10",
         "@babel/plugin-transform-class-properties": "^7.22.5",
-        "@babel/plugin-transform-class-static-block": "^7.22.11",
-        "@babel/plugin-transform-classes": "^7.22.15",
+        "@babel/plugin-transform-class-static-block": "^7.22.5",
+        "@babel/plugin-transform-classes": "^7.22.6",
         "@babel/plugin-transform-computed-properties": "^7.22.5",
-        "@babel/plugin-transform-destructuring": "^7.22.15",
+        "@babel/plugin-transform-destructuring": "^7.22.10",
         "@babel/plugin-transform-dotall-regex": "^7.22.5",
         "@babel/plugin-transform-duplicate-keys": "^7.22.5",
-        "@babel/plugin-transform-dynamic-import": "^7.22.11",
+        "@babel/plugin-transform-dynamic-import": "^7.22.5",
         "@babel/plugin-transform-exponentiation-operator": "^7.22.5",
-        "@babel/plugin-transform-export-namespace-from": "^7.22.11",
-        "@babel/plugin-transform-for-of": "^7.22.15",
+        "@babel/plugin-transform-export-namespace-from": "^7.22.5",
+        "@babel/plugin-transform-for-of": "^7.22.5",
         "@babel/plugin-transform-function-name": "^7.22.5",
-        "@babel/plugin-transform-json-strings": "^7.22.11",
+        "@babel/plugin-transform-json-strings": "^7.22.5",
         "@babel/plugin-transform-literals": "^7.22.5",
-        "@babel/plugin-transform-logical-assignment-operators": "^7.22.11",
+        "@babel/plugin-transform-logical-assignment-operators": "^7.22.5",
         "@babel/plugin-transform-member-expression-literals": "^7.22.5",
         "@babel/plugin-transform-modules-amd": "^7.22.5",
-        "@babel/plugin-transform-modules-commonjs": "^7.22.15",
-        "@babel/plugin-transform-modules-systemjs": "^7.22.11",
+        "@babel/plugin-transform-modules-commonjs": "^7.22.5",
+        "@babel/plugin-transform-modules-systemjs": "^7.22.5",
         "@babel/plugin-transform-modules-umd": "^7.22.5",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.22.5",
         "@babel/plugin-transform-new-target": "^7.22.5",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.11",
-        "@babel/plugin-transform-numeric-separator": "^7.22.11",
-        "@babel/plugin-transform-object-rest-spread": "^7.22.15",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.22.5",
+        "@babel/plugin-transform-numeric-separator": "^7.22.5",
+        "@babel/plugin-transform-object-rest-spread": "^7.22.5",
         "@babel/plugin-transform-object-super": "^7.22.5",
-        "@babel/plugin-transform-optional-catch-binding": "^7.22.11",
-        "@babel/plugin-transform-optional-chaining": "^7.22.15",
-        "@babel/plugin-transform-parameters": "^7.22.15",
+        "@babel/plugin-transform-optional-catch-binding": "^7.22.5",
+        "@babel/plugin-transform-optional-chaining": "^7.22.10",
+        "@babel/plugin-transform-parameters": "^7.22.5",
         "@babel/plugin-transform-private-methods": "^7.22.5",
-        "@babel/plugin-transform-private-property-in-object": "^7.22.11",
+        "@babel/plugin-transform-private-property-in-object": "^7.22.5",
         "@babel/plugin-transform-property-literals": "^7.22.5",
         "@babel/plugin-transform-regenerator": "^7.22.10",
         "@babel/plugin-transform-reserved-words": "^7.22.5",
@@ -1781,7 +1781,7 @@
         "@babel/plugin-transform-unicode-regex": "^7.22.5",
         "@babel/plugin-transform-unicode-sets-regex": "^7.22.5",
         "@babel/preset-modules": "0.1.6-no-external-plugins",
-        "@babel/types": "^7.22.19",
+        "@babel/types": "^7.22.10",
         "babel-plugin-polyfill-corejs2": "^0.4.5",
         "babel-plugin-polyfill-corejs3": "^0.8.3",
         "babel-plugin-polyfill-regenerator": "^0.5.2",
@@ -1818,9 +1818,9 @@
       "peer": true
     },
     "node_modules/@babel/runtime": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.15.tgz",
-      "integrity": "sha512-T0O+aa+4w0u06iNmapipJXMV4HoUir03hpx3/YqXXhu9xim3w+dVphjFWl1OH8NbZHw5Lbm9k45drDkgq2VNNA==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.11.tgz",
+      "integrity": "sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -1829,33 +1829,33 @@
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.22.15",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.15.tgz",
-      "integrity": "sha512-QPErUVm4uyJa60rkI73qneDacvdvzxshT3kksGqlGWYdOTIUOwJ7RDUL8sGqslY1uXWSL6xMFKEXDS3ox2uF0w==",
+      "version": "7.22.5",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz",
+      "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/parser": "^7.22.15",
-        "@babel/types": "^7.22.15"
+        "@babel/code-frame": "^7.22.5",
+        "@babel/parser": "^7.22.5",
+        "@babel/types": "^7.22.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.22.20",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.20.tgz",
-      "integrity": "sha512-eU260mPZbU7mZ0N+X10pxXhQFMGTeLb9eFS0mxehS8HZp9o1uSnFeWQuG1UPrlxgA7QoUzFhOnilHDp0AXCyHw==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz",
+      "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==",
       "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.22.13",
-        "@babel/generator": "^7.22.15",
-        "@babel/helper-environment-visitor": "^7.22.20",
+        "@babel/code-frame": "^7.22.10",
+        "@babel/generator": "^7.22.10",
+        "@babel/helper-environment-visitor": "^7.22.5",
         "@babel/helper-function-name": "^7.22.5",
         "@babel/helper-hoist-variables": "^7.22.5",
         "@babel/helper-split-export-declaration": "^7.22.6",
-        "@babel/parser": "^7.22.16",
-        "@babel/types": "^7.22.19",
+        "@babel/parser": "^7.22.11",
+        "@babel/types": "^7.22.11",
         "debug": "^4.1.0",
         "globals": "^11.1.0"
       },
@@ -1864,13 +1864,13 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.22.19",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.19.tgz",
-      "integrity": "sha512-P7LAw/LbojPzkgp5oznjE6tQEIWbp4PkkfrZDINTro9zgBRtI324/EYsiSI7lhPbpIQ+DCeR2NNmMWANGGfZsg==",
+      "version": "7.22.11",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz",
+      "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-string-parser": "^7.22.5",
-        "@babel/helper-validator-identifier": "^7.22.19",
+        "@babel/helper-validator-identifier": "^7.22.5",
         "to-fast-properties": "^2.0.0"
       },
       "engines": {
@@ -1878,10 +1878,9 @@
       }
     },
     "node_modules/@bcgov-nr/nr-fsa-theme": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@bcgov-nr/nr-fsa-theme/-/nr-fsa-theme-1.2.0.tgz",
-      "integrity": "sha512-v5jv1eHp7CcG7tf3Pj+awS/WsWCMNWYCKxLQaBQc46c2nTo6roIFAJFtRNZhEMx8lFFyMrzmtMn2ESM0/I/DVQ==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info."
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@bcgov-nr/nr-fsa-theme/-/nr-fsa-theme-1.1.5.tgz",
+      "integrity": "sha512-gQ7k76PXcTlWDOo6lrYNujgc5t7cY4r6gVS8m4bvkIbbgKQNux4kV5BuEtx616fubl61FZp+zDxRSMfrZz1Dog=="
     },
     "node_modules/@bcgov/bc-sans": {
       "version": "2.0.0",
@@ -1899,9 +1898,9 @@
       "integrity": "sha512-hCrfVZ6oVnPjjupelbvQX4D0i6GlZuKVverAf0LkOydXHrPjSyuEmg+czsylyCBg4r/hxtSTu91Tq6aqz/DsHg=="
     },
     "node_modules/@carbon/grid": {
-      "version": "11.20.0",
-      "resolved": "https://registry.npmjs.org/@carbon/grid/-/grid-11.20.0.tgz",
-      "integrity": "sha512-YzF6NY6BNbiMI4wwF1oz0XAoiYFt5YoLovHwsHJBb/RFc1qPp94WFL1NoAprKX7I2c7V+ypAjmoTuXFACeL4Dg==",
+      "version": "11.19.0",
+      "resolved": "https://registry.npmjs.org/@carbon/grid/-/grid-11.19.0.tgz",
+      "integrity": "sha512-Ie8C0yifTPOF58rhkeRhINJ6KPiTVbdJwPCE+aEWTpUrwGSnuqIYZ8zQBlYQtNGQX72TSfnGY0qijPmpnIwNsg==",
       "dependencies": {
         "@carbon/layout": "^11.19.0"
       }
@@ -1930,22 +1929,22 @@
       "integrity": "sha512-l7SIZMwTmv8BHPvDsQ26Y/dBLKnLGZUvD5bGcDppoUInUcKv2Dg4J0r5JONUsB2OagpBmbj/a5skcahzlaL1JQ=="
     },
     "node_modules/@carbon/pictograms": {
-      "version": "12.23.0",
-      "resolved": "https://registry.npmjs.org/@carbon/pictograms/-/pictograms-12.23.0.tgz",
-      "integrity": "sha512-BLsaj69Yk+AIvGoHsRBKxNYKI4nWCqxYAhJkIqv4spY9tM8GREpolJ/nLfUdglzToKqbPKOuDUNP5VI0M7RSvA=="
+      "version": "12.22.0",
+      "resolved": "https://registry.npmjs.org/@carbon/pictograms/-/pictograms-12.22.0.tgz",
+      "integrity": "sha512-9hf/8v15CrxPhd8DGCqlpUdxlqPBcr/l4wKP/5q1TKqU77lSYKKPl8Erv/mTf9EM3HkUdy9iFr08aKGvoKaV7w=="
     },
     "node_modules/@carbon/styles": {
-      "version": "1.38.0",
-      "resolved": "https://registry.npmjs.org/@carbon/styles/-/styles-1.38.0.tgz",
-      "integrity": "sha512-HS3kwwfrC/DAEYJmRBIPk8HsJh4F3XlOVG74lJwCGxXxKxj9wcE24e3MlaPOhAcR1Z4MtuTIXvDH581zsonv5A==",
+      "version": "1.36.0",
+      "resolved": "https://registry.npmjs.org/@carbon/styles/-/styles-1.36.0.tgz",
+      "integrity": "sha512-UKr0FdNT/QSJVfsrjn03zF364qP2XwOW6+/VaR7SijfEKR1qx9Z6MQbzNMR9OP5hvT/rr3pora1S7R3h6mtz3A==",
       "dependencies": {
         "@carbon/colors": "^11.19.0",
         "@carbon/feature-flags": "^0.16.0",
-        "@carbon/grid": "^11.20.0",
+        "@carbon/grid": "^11.19.0",
         "@carbon/layout": "^11.19.0",
         "@carbon/motion": "^11.15.0",
-        "@carbon/themes": "^11.25.0",
-        "@carbon/type": "^11.24.0",
+        "@carbon/themes": "^11.24.0",
+        "@carbon/type": "^11.23.0",
         "@ibm/plex": "6.0.0-next.6"
       },
       "peerDependencies": {
@@ -1958,22 +1957,22 @@
       }
     },
     "node_modules/@carbon/themes": {
-      "version": "11.25.0",
-      "resolved": "https://registry.npmjs.org/@carbon/themes/-/themes-11.25.0.tgz",
-      "integrity": "sha512-SQ4RLJhjheE0eq9gL4TNmYMQAsVmwveZpAMHPB9bVARC3pRfUDy+s0+j57/vWtVlEs4j3f7HxVvNazW6ohTl8A==",
+      "version": "11.24.0",
+      "resolved": "https://registry.npmjs.org/@carbon/themes/-/themes-11.24.0.tgz",
+      "integrity": "sha512-afVMSQ8by3yR4646UNwOmVGeyI8n0dIvehpuy4IUGQ52WXsRuveMY/F6KpATy0OadJR/C/7SZo2mqI7L8aTREA==",
       "dependencies": {
         "@carbon/colors": "^11.19.0",
         "@carbon/layout": "^11.19.0",
-        "@carbon/type": "^11.24.0",
+        "@carbon/type": "^11.23.0",
         "color": "^4.0.0"
       }
     },
     "node_modules/@carbon/type": {
-      "version": "11.24.0",
-      "resolved": "https://registry.npmjs.org/@carbon/type/-/type-11.24.0.tgz",
-      "integrity": "sha512-X/UN/leNbwis5NdDzLPyy5AZXvgqSCM8uH/FOomCf5KTxAcpDOsY7jx5rax+zHE6HqgJWuFDfQPwnVMRBS4LfQ==",
+      "version": "11.23.0",
+      "resolved": "https://registry.npmjs.org/@carbon/type/-/type-11.23.0.tgz",
+      "integrity": "sha512-bp3D2q7Su03B2Re5CHt0OdNNmAbTOJaBgKgRKKdLP97F+M27y/kk9iOAFctC0pCgmQ2qSndWRTSb3zVg5TmiEw==",
       "dependencies": {
-        "@carbon/grid": "^11.20.0",
+        "@carbon/grid": "^11.19.0",
         "@carbon/layout": "^11.19.0"
       }
     },
@@ -2022,9 +2021,9 @@
       }
     },
     "node_modules/@cypress/code-coverage": {
-      "version": "3.12.1",
-      "resolved": "https://registry.npmjs.org/@cypress/code-coverage/-/code-coverage-3.12.1.tgz",
-      "integrity": "sha512-4gSVkgcTo8NSWrOwLO0NxyvD2apIZFM/2k9sxdmP3eR3ko8tZVYrWfTdfxSXLDSkNnzVh+oXv7utaOLn+yemUg==",
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/@cypress/code-coverage/-/code-coverage-3.11.0.tgz",
+      "integrity": "sha512-ihSO1s03gmLRE224oIjrbdG1ey63vw/UY+VSqQ5m/TKkAvyz6GIiniq6juk3AV/+0vQC1Eb4UWFu8ndtji4M1g==",
       "dev": true,
       "dependencies": {
         "@cypress/webpack-preprocessor": "^5.11.0",
@@ -2038,11 +2037,7 @@
         "nyc": "15.1.0"
       },
       "peerDependencies": {
-        "@babel/core": "^7.0.1",
-        "@babel/preset-env": "^7.0.0",
-        "babel-loader": "^8.3 || ^9",
-        "cypress": "*",
-        "webpack": "^4 || ^5"
+        "cypress": "*"
       }
     },
     "node_modules/@cypress/code-coverage/node_modules/@cypress/webpack-preprocessor": {
@@ -2142,9 +2137,9 @@
       }
     },
     "node_modules/@cypress/request": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.1.tgz",
-      "integrity": "sha512-TWivJlJi8ZDx2wGOw1dbLuHJKUYX7bWySw377nlnGOW3hP9/MUKIsEdXT/YngWxVdgNCHRBmFlBipE+5/2ZZlQ==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@cypress/request/-/request-3.0.0.tgz",
+      "integrity": "sha512-GKFCqwZwMYmL3IBoNeR2MM1SnxRIGERsQOTWeQKoYBt2JLqcqiy7JXqO894FLrpjZYqGxW92MNwRH2BN56obdQ==",
       "dev": true,
       "dependencies": {
         "aws-sign2": "~0.7.0",
@@ -2160,7 +2155,7 @@
         "json-stringify-safe": "~5.0.1",
         "mime-types": "~2.1.19",
         "performance-now": "^2.1.0",
-        "qs": "6.10.4",
+        "qs": "~6.10.3",
         "safe-buffer": "^5.1.2",
         "tough-cookie": "^4.1.3",
         "tunnel-agent": "^0.6.0",
@@ -2220,54 +2215,6 @@
         "ms": "^2.1.1"
       }
     },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
-      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
-      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
-      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@esbuild/darwin-arm64": {
       "version": "0.18.20",
       "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
@@ -2284,294 +2231,6 @@
         "node": ">=12"
       }
     },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
-      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
-      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
-      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
-      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
-      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
-      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
-      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
-      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
-      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
-      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
-      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/linux-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz",
-      "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
-      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
-      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
-      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
-      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.18.20",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
-      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
@@ -2588,9 +2247,9 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.8.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.1.tgz",
-      "integrity": "sha512-PWiOzLIUAjN/w5K17PoF4n6sKBw0gqLHPhywmYHP4t1VFQQVYeb1yWsJwnMVEMl3tUHME7X/SJPZLmtG7XBDxQ==",
+      "version": "4.8.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz",
+      "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==",
       "dev": true,
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
@@ -2620,9 +2279,9 @@
       }
     },
     "node_modules/@eslint/eslintrc/node_modules/globals": {
-      "version": "13.22.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz",
-      "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==",
+      "version": "13.21.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -2647,9 +2306,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.49.0.tgz",
-      "integrity": "sha512-1S8uAY/MTJqVx0SC4epBq+N2yhuwtNwLbJYNZyhL2pO1ZVKn5HFXav5T41Ryzy9K9V7ZId2JB2oy/W4aCd9/2w==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz",
+      "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -2671,9 +2330,9 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
-      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz",
+      "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==",
       "dev": true,
       "dependencies": {
         "@humanwhocodes/object-schema": "^1.2.1",
@@ -2718,9 +2377,9 @@
       "dev": true
     },
     "node_modules/@iconify/utils": {
-      "version": "2.1.10",
-      "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-2.1.10.tgz",
-      "integrity": "sha512-0/+5hxjzCZ9RoYpqxnOzbnpQyMdZRuHcMxPJeuX+x/aZkAAD/N4TajDjAPT7LpX+M0bfLExj/p0bbDkUfp0lrg==",
+      "version": "2.1.9",
+      "resolved": "https://registry.npmjs.org/@iconify/utils/-/utils-2.1.9.tgz",
+      "integrity": "sha512-mo+A4n3MwLlWlg1SoSO+Dt6pOPWKElk9sSJ6ZpuzbB9OcjxN8RUWxU3ulPwB1nglErWKRam2x4BAohbYF7FiFA==",
       "dev": true,
       "dependencies": {
         "@antfu/install-pkg": "^0.1.1",
@@ -3021,9 +2680,9 @@
       }
     },
     "node_modules/@rushstack/eslint-patch": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.4.0.tgz",
-      "integrity": "sha512-cEjvTPU32OM9lUFegJagO0mRnIn+rbqrG89vV8/xLnLFX0DoR0r1oy5IlTga71Q7uT3Qus7qm7wgeiMT/+Irlg==",
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/@rushstack/eslint-patch/-/eslint-patch-1.3.3.tgz",
+      "integrity": "sha512-0xd7qez0AQ+MbHatZTlI1gu5vkG8r7MYRUJAHPAHJBmGLs16zpkrpAVLvjQKQOqaXPDUBwOiJzNc00znHSCVBw==",
       "dev": true
     },
     "node_modules/@sideway/address": {
@@ -3087,9 +2746,9 @@
       "dev": true
     },
     "node_modules/@types/chai": {
-      "version": "4.3.6",
-      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.6.tgz",
-      "integrity": "sha512-VOVRLM1mBxIRxydiViqPcKn6MIxZytrbMpd6RJLIWKxUNr3zux8no0Oc7kJx0WAPIitgZ0gkrDS+btlqQpubpw==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.5.tgz",
+      "integrity": "sha512-mEo1sAde+UCE6b2hxn332f1g1E8WfYRu6p5SvTKr2ZKC1f7gFJXk4h5PyGP9Dt6gCaG8y8XhwnXWC6Iy2cmBng==",
       "dev": true
     },
     "node_modules/@types/chai-subset": {
@@ -3130,9 +2789,9 @@
       "dev": true
     },
     "node_modules/@types/jsdom": {
-      "version": "21.1.3",
-      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.3.tgz",
-      "integrity": "sha512-1zzqSP+iHJYV4lB3lZhNBa012pubABkj9yG/GuXuf6LZH1cSPIJBqFDrm5JX65HHt6VOnNYdTui/0ySerRbMgA==",
+      "version": "21.1.2",
+      "resolved": "https://registry.npmjs.org/@types/jsdom/-/jsdom-21.1.2.tgz",
+      "integrity": "sha512-bGj+7TaCkOwkJfx7HtS9p22Ij0A2aKMuz8a1+owpkxa1wU/HUBy/WAXhdv90uDdVI9rSjGvUrXmLSeA9VP3JeA==",
       "dev": true,
       "dependencies": {
         "@types/node": "*",
@@ -3141,9 +2800,9 @@
       }
     },
     "node_modules/@types/json-schema": {
-      "version": "7.0.13",
-      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
-      "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==",
+      "version": "7.0.12",
+      "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz",
+      "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==",
       "dev": true
     },
     "node_modules/@types/json5": {
@@ -3153,21 +2812,21 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "18.17.18",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.18.tgz",
-      "integrity": "sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw==",
+      "version": "18.17.12",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.12.tgz",
+      "integrity": "sha512-d6xjC9fJ/nSnfDeU0AMDsaJyb1iHsqCSOdi84w4u+SlN/UgQdY5tRhpMzaFYsI4mnpvgTivEaQd0yOUhAtOnEQ==",
       "dev": true
     },
     "node_modules/@types/q": {
-      "version": "1.5.6",
-      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.6.tgz",
-      "integrity": "sha512-IKjZ8RjTSwD4/YG+2gtj7BPFRB/lNbWKTiSj3M7U/TD2B7HfYCxvp2Zz6xA2WIY7pAuL1QOUPw8gQRbUrrq4fQ==",
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.5.tgz",
+      "integrity": "sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ==",
       "dev": true
     },
     "node_modules/@types/semver": {
-      "version": "7.5.2",
-      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.2.tgz",
-      "integrity": "sha512-7aqorHYgdNO4DM36stTiGO3DvKoex9TQRwsJU6vMaFGyqpBA1MNZkz+PG3gaNUPpTAOYhT1WR7M1JyA3fbS9Cw==",
+      "version": "7.5.1",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.1.tgz",
+      "integrity": "sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==",
       "dev": true
     },
     "node_modules/@types/sinonjs__fake-timers": {
@@ -3183,15 +2842,15 @@
       "dev": true
     },
     "node_modules/@types/tough-cookie": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.3.tgz",
-      "integrity": "sha512-THo502dA5PzG/sfQH+42Lw3fvmYkceefOspdCwpHRul8ik2Jv1K8I5OZz1AT3/rs46kwgMCe9bSBmDLYkkOMGg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.2.tgz",
+      "integrity": "sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw==",
       "dev": true
     },
     "node_modules/@types/trusted-types": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.4.tgz",
-      "integrity": "sha512-IDaobHimLQhjwsQ/NMwRVfa/yL7L/wriQPMhw1ZJall0KX6E1oxk29XMDeilW5qTIg5aoiqf5Udy8U/51aNoQQ=="
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.3.tgz",
+      "integrity": "sha512-NfQ4gyz38SL8sDNrSixxU2Os1a5xcdFxipAFxYEuLUlvU2uDwS4NUpsImcf1//SlWItCVMMLiylsxbmNMToV/g=="
     },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.17",
@@ -3209,16 +2868,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.2.tgz",
-      "integrity": "sha512-ooaHxlmSgZTM6CHYAFRlifqh1OAr3PAQEwi7lhYhaegbnXrnh7CDcHmc3+ihhbQC7H0i4JF0psI5ehzkF6Yl6Q==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.6.0.tgz",
+      "integrity": "sha512-CW9YDGTQnNYMIo5lMeuiIG08p4E0cXrXTbcZ2saT/ETE7dWUrNxlijsQeU04qAAKkILiLzdQz+cGFxCJjaZUmA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.7.2",
-        "@typescript-eslint/type-utils": "6.7.2",
-        "@typescript-eslint/utils": "6.7.2",
-        "@typescript-eslint/visitor-keys": "6.7.2",
+        "@typescript-eslint/scope-manager": "6.6.0",
+        "@typescript-eslint/type-utils": "6.6.0",
+        "@typescript-eslint/utils": "6.6.0",
+        "@typescript-eslint/visitor-keys": "6.6.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -3277,15 +2936,15 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.2.tgz",
-      "integrity": "sha512-KA3E4ox0ws+SPyxQf9iSI25R6b4Ne78ORhNHeVKrPQnoYsb9UhieoiRoJgrzgEeKGOXhcY1i8YtOeCHHTDa6Fw==",
+      "version": "6.7.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.7.3.tgz",
+      "integrity": "sha512-TlutE+iep2o7R8Lf+yoer3zU6/0EAUc8QIBB3GYBc1KGz4c4TRm83xwXUZVPlZ6YCLss4r77jbu6j3sendJoiQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.7.2",
-        "@typescript-eslint/types": "6.7.2",
-        "@typescript-eslint/typescript-estree": "6.7.2",
-        "@typescript-eslint/visitor-keys": "6.7.2",
+        "@typescript-eslint/scope-manager": "6.7.3",
+        "@typescript-eslint/types": "6.7.3",
+        "@typescript-eslint/typescript-estree": "6.7.3",
+        "@typescript-eslint/visitor-keys": "6.7.3",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3304,14 +2963,141 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "6.7.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.3.tgz",
+      "integrity": "sha512-wOlo0QnEou9cHO2TdkJmzF7DFGvAKEnB82PuPNHpT8ZKKaZu6Bm63ugOTn9fXNJtvuDPanBc78lGUGGytJoVzQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.7.3",
+        "@typescript-eslint/visitor-keys": "6.7.3"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "6.7.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.3.tgz",
+      "integrity": "sha512-4g+de6roB2NFcfkZb439tigpAMnvEIg3rIjWQ+EM7IBaYt/CdJt6em9BJ4h4UpdgaBWdmx2iWsafHTrqmgIPNw==",
+      "dev": true,
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "6.7.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.3.tgz",
+      "integrity": "sha512-YLQ3tJoS4VxLFYHTw21oe1/vIZPRqAO91z6Uv0Ss2BKm/Ag7/RVQBcXTGcXhgJMdA4U+HrKuY5gWlJlvoaKZ5g==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.7.3",
+        "@typescript-eslint/visitor-keys": "6.7.3",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "6.7.3",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.3.tgz",
+      "integrity": "sha512-HEVXkU9IB+nk9o63CeICMHxFWbHWr3E1mpilIQBe9+7L/lH97rleFLVtYsfnWB+JVMaiFnEaxvknvmIzX+CqVg==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "6.7.3",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^16.0.0 || >=18.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dev": true,
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/semver": {
+      "version": "7.5.4",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz",
+      "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.7.2.tgz",
-      "integrity": "sha512-bgi6plgyZjEqapr7u2mhxGR6E8WCzKNUFWNh6fkpVe9+yzRZeYtDTbsIBzKbcxI+r1qVWt6VIoMSNZ4r2A+6Yw==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.6.0.tgz",
+      "integrity": "sha512-pT08u5W/GT4KjPUmEtc2kSYvrH8x89cVzkA0Sy2aaOUIw6YxOIjA8ilwLr/1fLjOedX1QAuBpG9XggWqIIfERw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.7.2",
-        "@typescript-eslint/visitor-keys": "6.7.2"
+        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/visitor-keys": "6.6.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -3322,13 +3108,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.7.2.tgz",
-      "integrity": "sha512-36F4fOYIROYRl0qj95dYKx6kybddLtsbmPIYNK0OBeXv2j9L5nZ17j9jmfy+bIDHKQgn2EZX+cofsqi8NPATBQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.6.0.tgz",
+      "integrity": "sha512-8m16fwAcEnQc69IpeDyokNO+D5spo0w1jepWWY2Q6y5ZKNuj5EhVQXjtVAeDDqvW6Yg7dhclbsz6rTtOvcwpHg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.7.2",
-        "@typescript-eslint/utils": "6.7.2",
+        "@typescript-eslint/typescript-estree": "6.6.0",
+        "@typescript-eslint/utils": "6.6.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -3349,9 +3135,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.7.2.tgz",
-      "integrity": "sha512-flJYwMYgnUNDAN9/GAI3l8+wTmvTYdv64fcH8aoJK76Y+1FCZ08RtI5zDerM/FYT5DMkAc+19E4aLmd5KqdFyg==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.6.0.tgz",
+      "integrity": "sha512-CB6QpJQ6BAHlJXdwUmiaXDBmTqIE2bzGTDLADgvqtHWuhfNP3rAOK7kAgRMAET5rDRr9Utt+qAzRBdu3AhR3sg==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -3362,13 +3148,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.2.tgz",
-      "integrity": "sha512-kiJKVMLkoSciGyFU0TOY0fRxnp9qq1AzVOHNeN1+B9erKFCJ4Z8WdjAkKQPP+b1pWStGFqezMLltxO+308dJTQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.6.0.tgz",
+      "integrity": "sha512-hMcTQ6Al8MP2E6JKBAaSxSVw5bDhdmbCEhGW/V8QXkb9oNsFkA4SBuOMYVPxD3jbtQ4R/vSODBsr76R6fP3tbA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.7.2",
-        "@typescript-eslint/visitor-keys": "6.7.2",
+        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/visitor-keys": "6.6.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -3442,17 +3228,17 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.7.2.tgz",
-      "integrity": "sha512-ZCcBJug/TS6fXRTsoTkgnsvyWSiXwMNiPzBUani7hDidBdj1779qwM1FIAmpH4lvlOZNF3EScsxxuGifjpLSWQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.6.0.tgz",
+      "integrity": "sha512-mPHFoNa2bPIWWglWYdR0QfY9GN0CfvvXX1Sv6DlSTive3jlMTUy+an67//Gysc+0Me9pjitrq0LJp0nGtLgftw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.7.2",
-        "@typescript-eslint/types": "6.7.2",
-        "@typescript-eslint/typescript-estree": "6.7.2",
+        "@typescript-eslint/scope-manager": "6.6.0",
+        "@typescript-eslint/types": "6.6.0",
+        "@typescript-eslint/typescript-estree": "6.6.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -3500,12 +3286,12 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.7.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.2.tgz",
-      "integrity": "sha512-uVw9VIMFBUTz8rIeaUT3fFe8xIUx8r4ywAdlQv1ifH+6acn/XF8Y6rwJ7XNmkNMDrTW+7+vxFFPIF40nJCVsMQ==",
+      "version": "6.6.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.6.0.tgz",
+      "integrity": "sha512-L61uJT26cMOfFQ+lMZKoJNbAEckLe539VhTxiGHrWl5XSKQgA0RTBZJW2HFPy5T0ZvPVSD93QsrTKDkfNwJGyQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.7.2",
+        "@typescript-eslint/types": "6.6.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -3530,9 +3316,9 @@
       }
     },
     "node_modules/@vitest/coverage-istanbul": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-0.34.5.tgz",
-      "integrity": "sha512-t07VrdRSRKw7QgOZ20i1bmstv9seUm7Fay8wVtswKHBlMmAAW3K5x+0u18O50mLuVl208Lx21tH/6O7W4BWR9Q==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-istanbul/-/coverage-istanbul-0.34.3.tgz",
+      "integrity": "sha512-RdEGzydbbalyDLmmJ5Qm+T3Lrubw/U9iCnhzM2B1V57t4cVa1t6uyfIHdv68d1au4PRzkLhY7Xouwuhb7BeG+Q==",
       "dev": true,
       "dependencies": {
         "istanbul-lib-coverage": "^3.2.0",
@@ -3540,7 +3326,6 @@
         "istanbul-lib-report": "^3.0.1",
         "istanbul-lib-source-maps": "^4.0.1",
         "istanbul-reports": "^3.1.5",
-        "picocolors": "^1.0.0",
         "test-exclude": "^6.0.0"
       },
       "funding": {
@@ -3551,13 +3336,13 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.5.tgz",
-      "integrity": "sha512-/3RBIV9XEH+nRpRMqDJBufKIOQaYUH2X6bt0rKSCW0MfKhXFLYsR5ivHifeajRSTsln0FwJbitxLKHSQz/Xwkw==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-0.34.3.tgz",
+      "integrity": "sha512-F8MTXZUYRBVsYL1uoIft1HHWhwDbSzwAU9Zgh8S6WFC3YgVb4AnFV2GXO3P5Em8FjEYaZtTnQYoNwwBrlOMXgg==",
       "dev": true,
       "dependencies": {
-        "@vitest/spy": "0.34.5",
-        "@vitest/utils": "0.34.5",
+        "@vitest/spy": "0.34.3",
+        "@vitest/utils": "0.34.3",
         "chai": "^4.3.7"
       },
       "funding": {
@@ -3565,12 +3350,12 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.5.tgz",
-      "integrity": "sha512-RDEE3ViVvl7jFSCbnBRyYuu23XxmvRTSZWW6W4M7eC5dOsK75d5LIf6uhE5Fqf809DQ1+9ICZZNxhIolWHU4og==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-0.34.3.tgz",
+      "integrity": "sha512-lYNq7N3vR57VMKMPLVvmJoiN4bqwzZ1euTW+XXYH5kzr3W/+xQG3b41xJn9ChJ3AhYOSoweu974S1V3qDcFESA==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "0.34.5",
+        "@vitest/utils": "0.34.3",
         "p-limit": "^4.0.0",
         "pathe": "^1.1.1"
       },
@@ -3606,9 +3391,9 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.5.tgz",
-      "integrity": "sha512-+ikwSbhu6z2yOdtKmk/aeoDZ9QPm2g/ZO5rXT58RR9Vmu/kB2MamyDSx77dctqdZfP3Diqv4mbc/yw2kPT8rmA==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-0.34.3.tgz",
+      "integrity": "sha512-QyPaE15DQwbnIBp/yNJ8lbvXTZxS00kRly0kfFgAD5EYmCbYcA+1EEyRalc93M0gosL/xHeg3lKAClIXYpmUiQ==",
       "dev": true,
       "dependencies": {
         "magic-string": "^0.30.1",
@@ -3620,9 +3405,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.5.tgz",
-      "integrity": "sha512-epsicsfhvBjRjCMOC/3k00mP/TBGQy8/P0DxOFiWyLt55gnZ99dqCfCiAsKO17BWVjn4eZRIjKvcqNmSz8gvmg==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-0.34.3.tgz",
+      "integrity": "sha512-N1V0RFQ6AI7CPgzBq9kzjRdPIgThC340DGjdKdPSE8r86aUSmeliTUgkTqLSgtEwWWsGfBQ+UetZWhK0BgJmkQ==",
       "dev": true,
       "dependencies": {
         "tinyspy": "^2.1.1"
@@ -3632,9 +3417,9 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.5.tgz",
-      "integrity": "sha512-ur6CmmYQoeHMwmGb0v+qwkwN3yopZuZyf4xt1DBBSGBed8Hf9Gmbm/5dEWqgpLPdRx6Av6jcWXrjcKfkTzg/pw==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-0.34.3.tgz",
+      "integrity": "sha512-kiSnzLG6m/tiT0XEl4U2H8JDBjFtwVlaE8I3QfGiMFR0QvnRDfYfdP3YvTBWM/6iJDAyaPY6yVQiCTUc7ZzTHA==",
       "dev": true,
       "dependencies": {
         "diff-sequences": "^29.4.3",
@@ -4064,9 +3849,9 @@
       "dev": true
     },
     "node_modules/@vue/language-core": {
-      "version": "1.8.13",
-      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.13.tgz",
-      "integrity": "sha512-nata2fYBZAkl4QJrU+IcArJCMTHt1VP8ePL/Z7eUPC2AF+Cm7Qgo9ksNCPBzZRh1LYjCaSaqV7njqNogwpsMVg==",
+      "version": "1.8.8",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.8.tgz",
+      "integrity": "sha512-i4KMTuPazf48yMdYoebTkgSOJdFraE4pQf0B+FTOFkbB+6hAfjrSou/UmYWRsWyZV6r4Rc6DDZdI39CJwL0rWw==",
       "dev": true,
       "dependencies": {
         "@volar/language-core": "~1.10.0",
@@ -4201,13 +3986,13 @@
       }
     },
     "node_modules/@vue/typescript": {
-      "version": "1.8.13",
-      "resolved": "https://registry.npmjs.org/@vue/typescript/-/typescript-1.8.13.tgz",
-      "integrity": "sha512-ALJjHFqQ3dgZVCI/ogAS/dZ7JEhIi1N0Em5I7uwabY1p9RDRK3odLsycMHyxZRjm5dLI15c07eeBloHiD2Otlg==",
+      "version": "1.8.8",
+      "resolved": "https://registry.npmjs.org/@vue/typescript/-/typescript-1.8.8.tgz",
+      "integrity": "sha512-jUnmMB6egu5wl342eaUH236v8tdcEPXXkPgj+eI/F6JwW/lb+yAU6U07ZbQ3MVabZRlupIlPESB7ajgAGixhow==",
       "dev": true,
       "dependencies": {
         "@volar/typescript": "~1.10.0",
-        "@vue/language-core": "1.8.13"
+        "@vue/language-core": "1.8.8"
       }
     },
     "node_modules/@vueuse/core": {
@@ -4735,15 +4520,15 @@
       }
     },
     "node_modules/array-includes": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz",
-      "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz",
+      "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "get-intrinsic": "^1.2.1",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
+        "get-intrinsic": "^1.1.3",
         "is-string": "^1.0.7"
       },
       "engines": {
@@ -4763,16 +4548,16 @@
       }
     },
     "node_modules/array.prototype.findlastindex": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz",
-      "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz",
+      "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
         "es-shim-unscopables": "^1.0.0",
-        "get-intrinsic": "^1.2.1"
+        "get-intrinsic": "^1.1.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -4782,14 +4567,14 @@
       }
     },
     "node_modules/array.prototype.flat": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz",
-      "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz",
+      "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
         "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
@@ -4800,14 +4585,14 @@
       }
     },
     "node_modules/array.prototype.flatmap": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz",
-      "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz",
+      "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
         "es-shim-unscopables": "^1.0.0"
       },
       "engines": {
@@ -4818,14 +4603,14 @@
       }
     },
     "node_modules/array.prototype.reduce": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz",
-      "integrity": "sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz",
+      "integrity": "sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4",
         "es-array-method-boxes-properly": "^1.0.0",
         "is-string": "^1.0.7"
       },
@@ -4837,15 +4622,14 @@
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.2.tgz",
-      "integrity": "sha512-yMBKppFur/fbHu9/6USUe03bZ4knMYiwFBcyiaXB8Go0qNehwX6inYPzK9U0NeQvGxKthcmHcaR8P5MStSRBAw==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz",
+      "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==",
       "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
         "get-intrinsic": "^1.2.1",
         "is-array-buffer": "^3.0.2",
         "is-shared-array-buffer": "^1.0.2"
@@ -5125,9 +4909,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.21.11",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.11.tgz",
-      "integrity": "sha512-xn1UXOKUz7DjdGlg9RrUr0GGiWzI97UQJnugHtH0OLDfJB7jMgoIkYvRIEO1l9EeEERVqeqLYOcFBW9ldjypbQ==",
+      "version": "4.21.10",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
+      "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
       "dev": true,
       "funding": [
         {
@@ -5144,10 +4928,10 @@
         }
       ],
       "dependencies": {
-        "caniuse-lite": "^1.0.30001538",
-        "electron-to-chromium": "^1.4.526",
+        "caniuse-lite": "^1.0.30001517",
+        "electron-to-chromium": "^1.4.477",
         "node-releases": "^2.0.13",
-        "update-browserslist-db": "^1.0.13"
+        "update-browserslist-db": "^1.0.11"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -5345,9 +5129,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001538",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
-      "integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==",
+      "version": "1.0.30001524",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001524.tgz",
+      "integrity": "sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==",
       "dev": true,
       "funding": [
         {
@@ -5698,9 +5482,9 @@
       "dev": true
     },
     "node_modules/core-js-compat": {
-      "version": "3.32.2",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.2.tgz",
-      "integrity": "sha512-+GjlguTDINOijtVRUxrQOv3kfu9rl+qPNdX2LTbJ/ZyVTuxK+ksVSAGX1nHstu4hrv1En/uPTtWgq2gI5wt4AQ==",
+      "version": "3.32.1",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.32.1.tgz",
+      "integrity": "sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -6296,20 +6080,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/define-data-property": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.0.tgz",
-      "integrity": "sha512-UzGwzcjyv3OtAvolTj1GoyNYzfFR+iqbGjcnBEENZVCpM4/Ng1yhGNvS3lR/xDS74Tb2wGG9WzNSNIOS9UVb2g==",
-      "dev": true,
-      "dependencies": {
-        "get-intrinsic": "^1.2.1",
-        "gopd": "^1.0.1",
-        "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/define-lazy-prop": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
@@ -6323,12 +6093,11 @@
       }
     },
     "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
+      "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
       "dev": true,
       "dependencies": {
-        "define-data-property": "^1.0.1",
         "has-property-descriptors": "^1.0.0",
         "object-keys": "^1.1.1"
       },
@@ -6560,9 +6329,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.4.527",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.527.tgz",
-      "integrity": "sha512-EafxEiEDzk2aLrdbtVczylHflHdHkNrpGNHIgDyA63sUQLQVS2ayj2hPw3RsVB42qkwURH+T2OxV7kGPUuYszA==",
+      "version": "1.4.504",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.504.tgz",
+      "integrity": "sha512-cSMwIAd8yUh54VwitVRVvHK66QqHWE39C3DRj8SWiXitEpVSY3wNPD9y1pxQtLIi4w3UdzF9klLsmuPshz09DQ==",
       "dev": true
     },
     "node_modules/emoji-regex": {
@@ -6628,18 +6397,18 @@
       }
     },
     "node_modules/es-abstract": {
-      "version": "1.22.2",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.2.tgz",
-      "integrity": "sha512-YoxfFcDmhjOgWPWsV13+2RNjq1F6UQnfs+8TftwNqtzlmFzEXvlUwdrNrYeaizfjQzRMxkZ6ElWMOJIFKdVqwA==",
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz",
+      "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==",
       "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.0",
-        "arraybuffer.prototype.slice": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.1",
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",
         "es-set-tostringtag": "^2.0.1",
         "es-to-primitive": "^1.2.1",
-        "function.prototype.name": "^1.1.6",
+        "function.prototype.name": "^1.1.5",
         "get-intrinsic": "^1.2.1",
         "get-symbol-description": "^1.0.0",
         "globalthis": "^1.0.3",
@@ -6655,23 +6424,23 @@
         "is-regex": "^1.1.4",
         "is-shared-array-buffer": "^1.0.2",
         "is-string": "^1.0.7",
-        "is-typed-array": "^1.1.12",
+        "is-typed-array": "^1.1.10",
         "is-weakref": "^1.0.2",
         "object-inspect": "^1.12.3",
         "object-keys": "^1.1.1",
         "object.assign": "^4.1.4",
-        "regexp.prototype.flags": "^1.5.1",
-        "safe-array-concat": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.0",
+        "safe-array-concat": "^1.0.0",
         "safe-regex-test": "^1.0.0",
-        "string.prototype.trim": "^1.2.8",
-        "string.prototype.trimend": "^1.0.7",
-        "string.prototype.trimstart": "^1.0.7",
+        "string.prototype.trim": "^1.2.7",
+        "string.prototype.trimend": "^1.0.6",
+        "string.prototype.trimstart": "^1.0.6",
         "typed-array-buffer": "^1.0.0",
         "typed-array-byte-length": "^1.0.0",
         "typed-array-byte-offset": "^1.0.0",
         "typed-array-length": "^1.0.4",
         "unbox-primitive": "^1.0.2",
-        "which-typed-array": "^1.1.11"
+        "which-typed-array": "^1.1.10"
       },
       "engines": {
         "node": ">= 0.4"
@@ -6687,9 +6456,9 @@
       "dev": true
     },
     "node_modules/es-module-lexer": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.1.tgz",
-      "integrity": "sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.3.0.tgz",
+      "integrity": "sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA==",
       "dev": true,
       "peer": true
     },
@@ -6795,16 +6564,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.49.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.49.0.tgz",
-      "integrity": "sha512-jw03ENfm6VJI0jA9U+8H5zfl5b+FvuU3YYvZRdZHOlU2ggJkxrlkJH4HcDrZpj6YwD8kuYqvQM8LyesoazrSOQ==",
+      "version": "8.48.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz",
+      "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.49.0",
-        "@humanwhocodes/config-array": "^0.11.11",
+        "@eslint/js": "8.48.0",
+        "@humanwhocodes/config-array": "^0.11.10",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "ajv": "^6.12.4",
@@ -6961,9 +6730,9 @@
       }
     },
     "node_modules/eslint-plugin-cypress": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.15.1.tgz",
-      "integrity": "sha512-eLHLWP5Q+I4j2AWepYq0PgFEei9/s5LvjuSqWrxurkg1YZ8ltxdvMNmdSf0drnsNo57CTgYY/NIHHLRSWejR7w==",
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-cypress/-/eslint-plugin-cypress-2.14.0.tgz",
+      "integrity": "sha512-eW6tv7iIg7xujleAJX4Ujm649Bf5jweqa4ObPEIuueYRyLZt7qXGWhCY/n4bfeFW/j6nQZwbIBHKZt6EKcL/cg==",
       "dev": true,
       "dependencies": {
         "globals": "^13.20.0"
@@ -6973,9 +6742,9 @@
       }
     },
     "node_modules/eslint-plugin-cypress/node_modules/globals": {
-      "version": "13.22.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz",
-      "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==",
+      "version": "13.21.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -7072,16 +6841,15 @@
       }
     },
     "node_modules/eslint-plugin-n": {
-      "version": "16.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.1.0.tgz",
-      "integrity": "sha512-3wv/TooBst0N4ND+pnvffHuz9gNPmk/NkLwAxOt2JykTl/hcuECe6yhTtLJcZjIxtZwN+GX92ACp/QTLpHA3Hg==",
+      "version": "16.0.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.0.2.tgz",
+      "integrity": "sha512-Y66uDfUNbBzypsr0kELWrIz+5skicECrLUqlWuXawNSLUq3ltGlCwu6phboYYOTSnoTdHgTLrc+5Ydo6KjzZog==",
       "dev": true,
       "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "builtins": "^5.0.1",
         "eslint-plugin-es-x": "^7.1.0",
-        "get-tsconfig": "^4.7.0",
         "ignore": "^5.2.4",
         "is-core-module": "^2.12.1",
         "minimatch": "^3.1.2",
@@ -7320,9 +7088,9 @@
       }
     },
     "node_modules/eslint/node_modules/globals": {
-      "version": "13.22.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-13.22.0.tgz",
-      "integrity": "sha512-H1Ddc/PbZHTDVJSnj8kWptIRSD6AM3pK+mKytuIVF4uoBV7rshFlhhvA58ceJ5wp3Er58w6zj7bykMpYXt3ETw==",
+      "version": "13.21.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz",
+      "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==",
       "dev": true,
       "dependencies": {
         "type-fest": "^0.20.2"
@@ -7707,15 +7475,15 @@
       "integrity": "sha512-3ULSxbXmcMIRzer/2jLNweoqHpwDvsjEawO2FUd9UFR8uPwLM+LruZcPDpuZStcEgbQKhuFOfXo4nYdGladSNw=="
     },
     "node_modules/flatted": {
-      "version": "3.2.9",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",
-      "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz",
+      "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==",
       "dev": true
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.3",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
-      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
+      "version": "1.15.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
+      "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
       "funding": [
         {
           "type": "individual",
@@ -9060,9 +8828,9 @@
       }
     },
     "node_modules/joi": {
-      "version": "17.10.2",
-      "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.2.tgz",
-      "integrity": "sha512-hcVhjBxRNW/is3nNLdGLIjkgXetkeGc2wyhydhz8KumG23Aerk4HPjU5zaPAMRqXQFc0xNqXTC7+zQjxr0GlKA==",
+      "version": "17.10.0",
+      "resolved": "https://registry.npmjs.org/joi/-/joi-17.10.0.tgz",
+      "integrity": "sha512-hrazgRSlhzacZ69LdcKfhi3Vu13z2yFfoAzmEov3yFIJlatTdVGUW6vle1zjH8qkzdCn/qGw8rapjqsObbYXAg==",
       "dev": true,
       "dependencies": {
         "@hapi/hoek": "^9.0.0",
@@ -9822,9 +9590,9 @@
       }
     },
     "node_modules/mlly": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.2.tgz",
-      "integrity": "sha512-i/Ykufi2t1EZ6NaPLdfnZk2AX8cs0d+mTzVKuPfqPKPatxLApaBoxJQ9x1/uckXtrS/U5oisPMDkNs0yQTaBRg==",
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.4.1.tgz",
+      "integrity": "sha512-SCDs78Q2o09jiZiE2WziwVBEqXQ02XkGdUy45cbJf+BpYRIjArXRJ1Wbowxkb+NaM9DWvS3UC9GiO/6eqvQ/pg==",
       "dev": true,
       "dependencies": {
         "acorn": "^8.10.0",
@@ -10313,15 +10081,15 @@
       }
     },
     "node_modules/object.getownpropertydescriptors": {
-      "version": "2.1.7",
-      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz",
-      "integrity": "sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz",
+      "integrity": "sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==",
       "dev": true,
       "dependencies": {
-        "array.prototype.reduce": "^1.0.6",
+        "array.prototype.reduce": "^1.0.5",
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
+        "es-abstract": "^1.21.2",
         "safe-array-concat": "^1.0.0"
       },
       "engines": {
@@ -10738,9 +10506,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.30",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.30.tgz",
-      "integrity": "sha512-7ZEao1g4kd68l97aWG/etQKPKq07us0ieSZ2TnFDk11i0ZfDW2AwKHYU8qv4MZKqN2fdBfg+7q0ES06UA73C1g==",
+      "version": "8.4.28",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz",
+      "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==",
       "funding": [
         {
           "type": "opencollective",
@@ -10826,9 +10594,9 @@
       }
     },
     "node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.6.3.tgz",
+      "integrity": "sha512-ZsBgjVhFAj5KeK+nHfF1305/By3lechHQSMWCTl8iHSbfOm2TN5nHEtFc/+W7fAyUeCs2n5iow72gld4gW0xDw==",
       "dev": true,
       "dependencies": {
         "@jest/schemas": "^29.6.3",
@@ -11060,9 +10828,9 @@
       "peer": true
     },
     "node_modules/regenerate-unicode-properties": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.1.tgz",
-      "integrity": "sha512-X007RyZLsCJVVrjgEFVpLUTZwyOZk3oiL75ZcuYjlIWd6rNJtOjkBwQc5AsRrpbKVkxN6sklw/k/9m2jJYOf8Q==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-10.1.0.tgz",
+      "integrity": "sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -11088,14 +10856,14 @@
       }
     },
     "node_modules/regexp.prototype.flags": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.1.tgz",
-      "integrity": "sha512-sy6TXMN+hnP/wMy+ISxg3krXx7BAtWVO4UouuCN/ziM9UEne0euamVNafDfvC83bRNr95y0V5iijeDQFUNpvrg==",
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz",
+      "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
         "define-properties": "^1.2.0",
-        "set-function-name": "^2.0.0"
+        "functions-have-names": "^1.2.3"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11198,9 +10966,9 @@
       "dev": true
     },
     "node_modules/resolve": {
-      "version": "1.22.6",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.6.tgz",
-      "integrity": "sha512-njhxM7mV12JfufShqGy3Rz8j11RPdLy4xi15UurGJeoHLfJpVXKdh3ueuOqbYUcDZnffr6X739JBo5LzyahEsw==",
+      "version": "1.22.4",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz",
+      "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==",
       "dev": true,
       "dependencies": {
         "is-core-module": "^2.13.0",
@@ -11297,9 +11065,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "3.29.2",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.2.tgz",
-      "integrity": "sha512-CJouHoZ27v6siztc21eEQGo0kIcE5D1gVPA571ez0mMYb25LGYGKnVNXpEj5MGlepmDWGXNjDB5q7uNiPHC11A==",
+      "version": "3.28.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.1.tgz",
+      "integrity": "sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -11410,13 +11178,13 @@
       }
     },
     "node_modules/safe-array-concat": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.1.tgz",
-      "integrity": "sha512-6XbUAseYE2KtOuGueyeobCySj9L4+66Tn6KQMOPQJrAJEowYKW/YR/MGJZl7FdydUdaFu4LYyDZjxf4/Nmo23Q==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz",
+      "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "get-intrinsic": "^1.2.1",
+        "get-intrinsic": "^1.2.0",
         "has-symbols": "^1.0.3",
         "isarray": "^2.0.5"
       },
@@ -11468,9 +11236,9 @@
       "dev": true
     },
     "node_modules/sass": {
-      "version": "1.68.0",
-      "resolved": "https://registry.npmjs.org/sass/-/sass-1.68.0.tgz",
-      "integrity": "sha512-Lmj9lM/fef0nQswm1J2HJcEsBUba4wgNx2fea6yJHODREoMFnwRpZydBnX/RjyXw2REIwdkbqE4hrTo4qfDBUA==",
+      "version": "1.66.1",
+      "resolved": "https://registry.npmjs.org/sass/-/sass-1.66.1.tgz",
+      "integrity": "sha512-50c+zTsZOJVgFfTgwwEzkjA3/QACgdNsKueWPyAR0mRINIvLAStVQBbPg14iuqEQ74NPDbXzJARJ/O4SI1zftA==",
       "devOptional": true,
       "dependencies": {
         "chokidar": ">=3.0.0 <4.0.0",
@@ -11622,20 +11390,6 @@
       "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
       "dev": true
     },
-    "node_modules/set-function-name": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz",
-      "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.0.1",
-        "functions-have-names": "^1.2.3",
-        "has-property-descriptors": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
     "node_modules/shebang-command": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
@@ -11863,9 +11617,9 @@
       "dev": true
     },
     "node_modules/start-server-and-test": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.1.tgz",
-      "integrity": "sha512-8PFo4DLLLCDMuS51/BEEtE1m9CAXw1LNVtZSS1PzkYQh6Qf9JUwM4huYeSoUumaaoAyuwYBwCa9OsrcpMqcOdQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.0.tgz",
+      "integrity": "sha512-UqKLw0mJbfrsG1jcRLTUlvuRi9sjNuUiDOLI42r7R5fA9dsFoywAy9DoLXNYys9B886E4RCKb+qM1Gzu96h7DQ==",
       "dev": true,
       "dependencies": {
         "arg": "^5.0.2",
@@ -11883,7 +11637,7 @@
         "start-test": "src/bin/start.js"
       },
       "engines": {
-        "node": ">=16"
+        "node": ">=6"
       }
     },
     "node_modules/start-server-and-test/node_modules/bluebird": {
@@ -11981,14 +11735,14 @@
       }
     },
     "node_modules/string.prototype.trim": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz",
-      "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==",
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz",
+      "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       },
       "engines": {
         "node": ">= 0.4"
@@ -11998,28 +11752,28 @@
       }
     },
     "node_modules/string.prototype.trimend": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz",
-      "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz",
+      "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
     "node_modules/string.prototype.trimstart": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz",
-      "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==",
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz",
+      "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==",
       "dev": true,
       "dependencies": {
         "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1"
+        "define-properties": "^1.1.4",
+        "es-abstract": "^1.20.4"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -12197,9 +11951,9 @@
       }
     },
     "node_modules/terser": {
-      "version": "5.20.0",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-5.20.0.tgz",
-      "integrity": "sha512-e56ETryaQDyebBwJIWYB2TT6f2EZ0fL0sW/JRXNMN26zZdKi2u/E/5my5lG6jNxym6qsrVXfFRmOdV42zlAgLQ==",
+      "version": "5.19.2",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz",
+      "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -12339,9 +12093,9 @@
       }
     },
     "node_modules/tinybench": {
-      "version": "2.5.1",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.1.tgz",
-      "integrity": "sha512-65NKvSuAVDP/n4CqH+a9w2kTlLReS9vhsAP06MWx+/89nMinJyB2icyl58RIcqCmIggpojIGeuJGhjU1aGMBSg==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.5.0.tgz",
+      "integrity": "sha512-kRwSG8Zx4tjF9ZiyH4bhaebu+EDz1BOx9hOigYHlUW4xxI/wKIUQUqo018UlU4ar6ATPBsaMrdbKZ+tmPdohFA==",
       "dev": true
     },
     "node_modules/tinypool": {
@@ -12444,9 +12198,9 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.3.tgz",
-      "integrity": "sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==",
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.2.tgz",
+      "integrity": "sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ==",
       "dev": true,
       "engines": {
         "node": ">=16.13.0"
@@ -12868,12 +12622,12 @@
       }
     },
     "node_modules/unplugin": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.5.0.tgz",
-      "integrity": "sha512-9ZdRwbh/4gcm1JTOkp9lAkIDrtOyOxgHmY7cjuwI8L/2RTikMcVG25GsZwNAgRuap3iDw2jeq7eoqtAsz5rW3A==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-1.4.0.tgz",
+      "integrity": "sha512-5x4eIEL6WgbzqGtF9UV8VEC/ehKptPXDS6L2b0mv4FRMkJxRtjaJfOWDd6a8+kYbqsjklix7yWP0N3SUepjXcg==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.10.0",
+        "acorn": "^8.9.0",
         "chokidar": "^3.5.3",
         "webpack-sources": "^3.2.3",
         "webpack-virtual-modules": "^0.5.0"
@@ -12994,9 +12748,9 @@
       }
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
-      "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
+      "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
       "dev": true,
       "funding": [
         {
@@ -13154,9 +12908,9 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.5.tgz",
-      "integrity": "sha512-RNZ+DwbCvDoI5CbCSQSyRyzDTfFvFauvMs6Yq4ObJROKlIKuat1KgSX/Ako5rlDMfVCyMcpMRMTkJBxd6z8YRA==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-0.34.3.tgz",
+      "integrity": "sha512-+0TzJf1g0tYXj6tR2vEyiA42OPq68QkRZCu/ERSo2PtsDJfBpDyEfuKbRvLmZqi/CgC7SCBtyC+WjTGNMRIaig==",
       "dev": true,
       "dependencies": {
         "cac": "^6.7.14",
@@ -13164,7 +12918,7 @@
         "mlly": "^1.4.0",
         "pathe": "^1.1.1",
         "picocolors": "^1.0.0",
-        "vite": "^3.0.0 || ^4.0.0 || ^5.0.0-0"
+        "vite": "^3.0.0 || ^4.0.0"
       },
       "bin": {
         "vite-node": "vite-node.mjs"
@@ -13209,19 +12963,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "0.34.5",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.5.tgz",
-      "integrity": "sha512-CPI68mmnr2DThSB3frSuE5RLm9wo5wU4fbDrDwWQQB1CWgq9jQVoQwnQSzYAjdoBOPoH2UtXpOgHVge/uScfZg==",
+      "version": "0.34.3",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-0.34.3.tgz",
+      "integrity": "sha512-7+VA5Iw4S3USYk+qwPxHl8plCMhA5rtfwMjgoQXMT7rO5ldWcdsdo3U1QD289JgglGK4WeOzgoLTsGFu6VISyQ==",
       "dev": true,
       "dependencies": {
         "@types/chai": "^4.3.5",
         "@types/chai-subset": "^1.3.3",
         "@types/node": "*",
-        "@vitest/expect": "0.34.5",
-        "@vitest/runner": "0.34.5",
-        "@vitest/snapshot": "0.34.5",
-        "@vitest/spy": "0.34.5",
-        "@vitest/utils": "0.34.5",
+        "@vitest/expect": "0.34.3",
+        "@vitest/runner": "0.34.3",
+        "@vitest/snapshot": "0.34.3",
+        "@vitest/spy": "0.34.3",
+        "@vitest/utils": "0.34.3",
         "acorn": "^8.9.0",
         "acorn-walk": "^8.2.0",
         "cac": "^6.7.14",
@@ -13235,8 +12989,8 @@
         "strip-literal": "^1.0.1",
         "tinybench": "^2.5.0",
         "tinypool": "^0.7.0",
-        "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0",
-        "vite-node": "0.34.5",
+        "vite": "^3.0.0 || ^4.0.0",
+        "vite-node": "0.34.3",
         "why-is-node-running": "^2.2.2"
       },
       "bin": {
@@ -13334,9 +13088,9 @@
       }
     },
     "node_modules/volar-service-vetur": {
-      "version": "0.0.13",
-      "resolved": "https://registry.npmjs.org/volar-service-vetur/-/volar-service-vetur-0.0.13.tgz",
-      "integrity": "sha512-1VVfl3u2kjVzcD2T1nGF0f25BZNHFmlkfri7CoFiHi0yEUot4Pk8ruVzTKlN+wXlM9AoJYt2Fo+HgfCqpuV2Ag==",
+      "version": "0.0.11",
+      "resolved": "https://registry.npmjs.org/volar-service-vetur/-/volar-service-vetur-0.0.11.tgz",
+      "integrity": "sha512-ahjOhXZmIZESMLWKrmxyhZvyvC3niSm0gjmSnZquy+UXHPSqHW0I2JVMTCQ2gB26ZadE2D8Kao7UbcgphSB+8w==",
       "dev": true,
       "dependencies": {
         "vls": "^0.8.2",
@@ -13352,9 +13106,9 @@
       }
     },
     "node_modules/vscode-html-languageservice": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.1.0.tgz",
-      "integrity": "sha512-cGOu5+lrz+2dDXSGS15y24lDtPaML1T8K/SfqgFbLmCZ1btYOxceFieR+ybTS2es/A67kRc62m2cKFLUQPWG5g==",
+      "version": "5.0.7",
+      "resolved": "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.0.7.tgz",
+      "integrity": "sha512-jX+7/kUXrdOaRT8vqYR/jLxrGDib+Far8I7n/A6apuEl88k+mhIHZPwc6ezuLeiCKUCaLG4b0dqFwjVa7QL3/w==",
       "dev": true,
       "dependencies": {
         "@vscode/l10n": "^0.0.16",
@@ -13370,9 +13124,9 @@
       "dev": true
     },
     "node_modules/vscode-languageserver-types": {
-      "version": "3.17.4",
-      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4.tgz",
-      "integrity": "sha512-9YXi5pA3XF2V+NUQg6g+lulNS0ncRCKASYdK3Cs7kiH9sVFXWq27prjkC/B8M/xJLRPPRSPCHVMuBTgRNFh2sQ==",
+      "version": "3.17.3",
+      "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.3.tgz",
+      "integrity": "sha512-SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==",
       "dev": true
     },
     "node_modules/vscode-uri": {
@@ -13457,9 +13211,9 @@
       "dev": true
     },
     "node_modules/vue-router": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.5.tgz",
-      "integrity": "sha512-DIUpKcyg4+PTQKfFPX88UWhlagBEBEfJ5A8XDXRJLUnZOvcpMF8o/dnL90vpVkGaPbjvXazV/rC1qBKrZlFugw==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-4.2.4.tgz",
+      "integrity": "sha512-9PISkmaCO02OzPVOMq2w82ilty6+xJmQrarYZDkjZBfl4RvYAlt4PKnEX21oW4KTtWfa9OuO/b3qk1Od3AEdCQ==",
       "dependencies": {
         "@vue/devtools-api": "^6.5.0"
       },
@@ -13499,13 +13253,13 @@
       "integrity": "sha512-UquSfnSWejD0zAfcD+3jJ1chUAkOAyoxya9Lxh9acCRtrlmGcAIvd0cQYraWqKenbuZJUdum+S174atv2AuEHQ=="
     },
     "node_modules/vue-tsc": {
-      "version": "1.8.13",
-      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.13.tgz",
-      "integrity": "sha512-Hl8zUXPVK2KzPtbXeMCN0CSFkwvD96YOtYt9KvJPG9W8QGcNpGk9KHwPuGMxA8blWXSIli7gtsoC+clICEVdVg==",
+      "version": "1.8.8",
+      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.8.tgz",
+      "integrity": "sha512-bSydNFQsF7AMvwWsRXD7cBIXaNs/KSjvzWLymq/UtKE36697sboX4EccSHFVxvgdBlI1frYPc/VMKJNB7DFeDQ==",
       "dev": true,
       "dependencies": {
-        "@vue/language-core": "1.8.13",
-        "@vue/typescript": "1.8.13",
+        "@vue/language-core": "1.8.8",
+        "@vue/typescript": "1.8.8",
         "semver": "^7.3.8"
       },
       "bin": {
@@ -13905,9 +13659,9 @@
       }
     },
     "node_modules/ws": {
-      "version": "8.14.2",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz",
-      "integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
+      "version": "8.13.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz",
+      "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==",
       "dev": true,
       "engines": {
         "node": ">=10.0.0"
diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index af5261579c..e02b8cf8d9 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -477,6 +477,7 @@ hr {
   display: flex;
   flex-direction: column;
   align-items: flex-start;
+  align-self: stretch;
   gap: 1.5rem;
 }
 
diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index d55162e1a1..be792ab516 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -87,7 +87,7 @@ const validateInput = (newValue: string) => {
 }
 
 const selectAutocompleteItem = (event: any) => {
-  emitValueChange(event.detail.item.getAttribute('data-id'))
+  emitValueChange(event?.detail?.item?.getAttribute('data-id'))
 }
 
 const onTyping = (event: any) => {
@@ -100,15 +100,15 @@ revalidateBus.on(() => validateInput(inputValue.value))
 watch(() => props.modelValue,() => inputValue.value = props.modelValue)
 </script>
 
-<template>
-  <div class="groupong-02">
+<template>  
+  <div class="grouping-02">
     <cds-combo-box
       :id="id"
-      :name="id"
+      :name="id"      
       :helper-text="tip"
       :title-text="label"
-      :value="inputValue"
-      filterable
+      :value="inputValue"      
+filterable
       :invalid="error ? true : false"
       :invalid-text="error"
       @cds-combo-box-selected="selectAutocompleteItem"
@@ -132,37 +132,3 @@ watch(() => props.modelValue,() => inputValue.value = props.modelValue)
   </div>
 </template>
 
-
-<style scoped>
-.autocomplete {
-  /*the container must be positioned relative:*/
-  position: relative;
-  display: inline-block;
-}
-.autocomplete-items {
-  border-bottom: none;
-  border-top: none;
-  z-index: 99;
-  left: 0;
-  right: 0;
-}
-.autocomplete-items-ct {
-  border: 1px solid #d4d4d4;
-  position: absolute;
-  padding: 10px;
-  cursor: pointer;
-  background-color: #fff;
-  border-bottom: 1px solid #d4d4d4;
-}
-
-.autocomplete-items-cell {
-  padding: 10px;
-  cursor: pointer;
-  background-color: #fff;
-  border-bottom: 1px solid #d4d4d4;
-}
-.autocomplete-items-cell:hover {
-  /*when hovering an item:*/
-  background-color: #e9e9e9;
-}
-</style>
diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index c7689ca291..18d472de94 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -102,7 +102,7 @@ revalidateBus.on(() => validateInput(selectedValue.value))
       :title-text="label"
       :value="selectedValue"
       :invalid="error ? true : false"
-      :invalid-text="error"
+      :invalidText="error"
       @cds-combo-box-selected="selectItem"
       :data-focus="id"
       :data-scroll="id">
diff --git a/frontend/stub/mappings/fam.json b/frontend/stub/mappings/fam.json
index bcc2be8541..8b7aea997c 100644
--- a/frontend/stub/mappings/fam.json
+++ b/frontend/stub/mappings/fam.json
@@ -39,7 +39,7 @@
         "headers":{
           "Location": "http://{{request.host}}:3000/dashboard",
           "Set-Cookie": [
-            "idToken=eyJhbGciOiJIUzI1NiJ9.eyJjdXN0b206aWRwX3VzZXJfaWQiOiJ1YXR0ZXN0IiwiY3VzdG9tOmlkcF9uYW1lIjoiYmNlaWRidXNpbmVzcyIsImN1c3RvbTppZHBfZGlzcGxheV9uYW1lIjoiVWF0IFRlc3QiLCJnaXZlbl9uYW1lIjoiVWF0IiwiZmFtaWx5X25hbWUiOiJUZXN0IiwiZW1haWwiOiJ1YXR0ZXN0QHRlc3QubG9jYWwiLCJpZHBfYnVzaW5lc3NfbmFtZSI6IkF1dG9tYXRlZCBUZXN0In0.mXHXgIY6uxZ2OymBIoPVNjz-tSLS3uiSTKGDig0bAa4; sameSite=Lax; path=/; Expires={{now offset='10 years' format='EEE, d MMM yyyy HH:mm:ss'}} GMT; domain={{request.host}}"
+            "idToken=eyJhbGciOiJIUzI1NiJ9.eyJjdXN0b206aWRwX3VzZXJfaWQiOiJ1YXR0ZXN0IiwiY3VzdG9tOmlkcF9uYW1lIjoiYmNlaWRidXNpbmVzcyIsImN1c3RvbTppZHBfYnVzaW5lc3NfaWQiOiJhdXRvbWF0aW9uaW5jIiwiY3VzdG9tOmlkcF9kaXNwbGF5X25hbWUiOiJVYXQgVGVzdCIsImdpdmVuX25hbWUiOiJVYXQiLCJmYW1pbHlfbmFtZSI6IlRlc3QiLCJlbWFpbCI6InVhdHRlc3RAdGVzdC5sb2NhbCIsImlkcF9idXNpbmVzc19uYW1lIjoiQXV0b21hdGlvbiBJbmMifQ.CnK36PCPazelpAAPNrcswWsi7TZkyU92I0kjll3geF0; sameSite=Lax; path=/; Expires={{now offset='10 years' format='EEE, d MMM yyyy HH:mm:ss'}} GMT; domain={{request.host}}"
           ]
         }
       }

From e46a35c7e878245d4a2950af9d898c896d77c389 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 25 Sep 2023 13:54:44 -0700
Subject: [PATCH 177/313] fix(FSADT1-884): fixing steps being enable

- adjusted the steps to be disable by default
- only enable if valid and only for the next step
---
 frontend/src/pages/FormBCeIDPage.vue | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index b120b9cc5c..ae695bdb49 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -136,7 +136,7 @@ const progressData = reactive([
     title: "Address",
     subtitle: "Step 2",
     kind: "incomplete",
-    disabled: false,
+    disabled: true,
     valid: false,
     step: 1,
     fields: [
@@ -155,7 +155,7 @@ const progressData = reactive([
     title: "Contacts",
     subtitle: "Step 3",
     kind: "incomplete",
-    disabled: false,
+    disabled: true,
     valid: false,
     step: 2,
     fields: [
@@ -175,7 +175,7 @@ const progressData = reactive([
     title: "Review",
     subtitle: "Step 4",
     kind: "incomplete",
-    disabled: false,
+    disabled: true,
     valid: false,
     step: 3,
     fields: [
@@ -214,7 +214,8 @@ const checkStepValidity = (stepNumber: number): boolean => {
     .every((validation: any) => runValidation(validation.field, formData, validation.validation, true, true))
   )
     return false;
-  
+
+
   return progressData[stepNumber].valid;
 };
 
@@ -255,6 +256,12 @@ const onBack = () => {
 };
 const validateStep = (valid: boolean) => {
   progressData[currentTab.value].valid = valid;
+  if(valid){
+    const nextStep = progressData.find((step: any) => step.step === currentTab.value+1)  
+    if(nextStep)
+      nextStep.disabled = false;
+  }
+  
 };
 
 const processAndLogOut = () => {
@@ -288,7 +295,11 @@ exitBus.on((event: Record<string, boolean | null>) => {
 });
 
 progressIndicatorBus.on((event: ProgressNotification) => {  
-  if(event.kind === 'disabled') ([1,2,3].forEach((index: number) => progressData[index].disabled = event.value as boolean))
+  if(event.kind === 'disabled') {        
+    [1,2,3]
+    .filter((index: number) => event.value || index < currentTab.value+1)
+    .forEach((index: number) => progressData[index].disabled = event.value as boolean)
+  }
   if(event.kind === 'navigate') goToStep(event.value as number, true)
   if(event.kind === 'error'){ 
     (event.value as number[]).forEach((index: number) => {

From 5e802e0ad9496bb6fe0fa0bfeb52a34ae1fc7c62 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 25 Sep 2023 13:55:34 -0700
Subject: [PATCH 178/313] chore: sorting import

---
 frontend/src/pages/FormBCeIDPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index ae695bdb49..ffd983512d 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -32,6 +32,7 @@ import {
 import {
   runValidation,
   validate,
+  isContainedIn
 } from "@/helpers/validators/GlobalValidators";
 
 // @ts-ignore
@@ -40,7 +41,6 @@ import ArrowRight16 from "@carbon/icons-vue/es/arrow--right/16";
 import LogOut16 from "@carbon/icons-vue/es/logout/16";
 // @ts-ignore
 import Check16 from "@carbon/icons-vue/es/checkmark/16";
-import { isContainedIn } from "@/helpers/validators/GlobalValidators";
 
 const errorBus = useEventBus<ValidationMessageType[]>("submission-error-notification")
 const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification")

From a61a2c6334a96798e64e7fb7f8e5987591b855a7 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 25 Sep 2023 14:00:03 -0700
Subject: [PATCH 179/313] fix(FSADT1-887): fixing typo on step 4

---
 frontend/src/pages/FormBCeIDPage.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index ffd983512d..4b11691f60 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -172,7 +172,7 @@ const progressData = reactive([
     ],
   },
   {
-    title: "Review",
+    title: "Review application",
     subtitle: "Step 4",
     kind: "incomplete",
     disabled: true,
@@ -436,7 +436,7 @@ const isSmallScreen = useMediaQuery('(max-width: 671px)')
 
       <div class="form-steps-section form-steps-section-04">
           <span class="heading-04" data-scroll="scroll-3">{{ progressData[3].title}}</span>
-          <span class="body-02">Review the content and make any changes by navigating through the steps above or using the "Edit" buttons in each section below.</span>
+          <span class="body-02">Review the content and make any changes by using the "Edit" buttons in each section below.</span>
 
         <review-wizard-step
             v-model:data="formData"

From 179e273c25e9fe5e55c4a62b8006dd6d6d9c6d2d Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 25 Sep 2023 14:10:33 -0700
Subject: [PATCH 180/313] fix(FSADT1-889): fixing font style

---
 .../src/pages/applyform/BusinessInformationWizardStep.vue     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index 3b11645d73..09bea34d83 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -247,7 +247,7 @@ watch([selectedOption], () => {
         title="If the name of your registered business does not appear in the list, follow these steps:">
         <div>
           <ol type="1" class="bulleted-list">
-            <li>
+            <li class="body-compact-01">
               Log into Manage Account in
               <a
                 href="https://www.bceid.ca/"
@@ -257,7 +257,7 @@ watch([selectedOption], () => {
               >
               to find your business name
             </li>
-            <li>
+            <li class="body-compact-01">
               If your name isn’t there, call BC Registry toll free at
               <a href="tel:18775261526">1-877-526-1526</a> or email them at
               <a href="mailto:BCRegistries@gov.bc.ca">BCRegistries@gov.bc.ca</a>.

From f7455fa7c21b6d73a3cfa044debbf4f5f892e51f Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 25 Sep 2023 14:34:46 -0700
Subject: [PATCH 181/313] fix: Fixed security hotspot and improved wording

---
 .../helpers/validators/GlobalValidators.ts    | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 83217bdb3e..2670864fb9 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -310,21 +310,33 @@ export const runValidation = (
     : [key, "true"];
   // We then load the field value
   const fieldValue = getFieldValue(fieldKey, target);
+
   // We define a function that will run the validation if the condition is true
   const buildEval = (condition: string) =>
     condition === "true" ? "true" : `target.${condition}`;
+
+  // We define a function to evaluate the condition safely
+  const evaluateCondition = (item: any, condition: string): boolean => {
+    if (condition === "true") {
+      return true;
+    }
+
+    try {
+      return eval(condition);
+    } catch (error) {
+      // Handle any potential errors in the condition evaluation
+      console.error("Error evaluating condition:", error);
+      return false;
+    }
+  };
+
   const executeValidation = (
     item: any,
     condition: string,
     fieldId: string = fieldKey
   ): string => {
     try {
-      const conditionFunction = new Function(
-        "item",
-        `return ${condition};`
-      );
-
-      if (conditionFunction(item)) {
+      if (evaluateCondition(item, condition)) {
         const validationResponse = validation(item);
         if (notify) {
           // Note: also notifies when valid - errorMsg will be empty.
@@ -336,7 +348,7 @@ export const runValidation = (
       }
     } catch (error) {
       // Handle any potential errors in the condition evaluation
-      console.error("Error evaluating condition:", error);
+      console.error("Error executing validation:", error);
       return "";
     }
   };

From 308997ca8b3f62d85853c7bd625b4ec362cc472a Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 25 Sep 2023 14:48:51 -0700
Subject: [PATCH 182/313] fix: Fixed security hotspot

---
 .../helpers/validators/GlobalValidators.ts    | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 2670864fb9..6581dbe944 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -316,18 +316,23 @@ export const runValidation = (
     condition === "true" ? "true" : `target.${condition}`;
 
   // We define a function to evaluate the condition safely
-  const evaluateCondition = (item: any, condition: string): boolean => {
+  const evaluateCondition = (condition: string, item: any): boolean => {
     if (condition === "true") {
       return true;
     }
 
-    try {
-      return eval(condition);
-    } catch (error) {
-      // Handle any potential errors in the condition evaluation
-      console.error("Error evaluating condition:", error);
-      return false;
+    if (typeof item === "object") {
+      const conditionFunction = new Function("item", `return ${condition};`);
+      try {
+        return conditionFunction(item);
+      } catch (error) {
+        // Handle any potential errors in the condition evaluation
+        console.error("Error evaluating condition:", error);
+        return false;
+      }
     }
+
+    return false;
   };
 
   const executeValidation = (
@@ -336,7 +341,7 @@ export const runValidation = (
     fieldId: string = fieldKey
   ): string => {
     try {
-      if (evaluateCondition(item, condition)) {
+      if (evaluateCondition(condition, item)) {
         const validationResponse = validation(item);
         if (notify) {
           // Note: also notifies when valid - errorMsg will be empty.
@@ -353,7 +358,7 @@ export const runValidation = (
     }
   };
 
-  // If the field value is an array we run the validation for every item in the array
+  // If the field value is an array, we run the validation for every item in the array
   if (Array.isArray(fieldValue)) {
     let hasInvalidItem = false;
     for (let index = 0; index < fieldValue.length; index++) {
@@ -394,7 +399,7 @@ export const runValidation = (
     }
     return !hasInvalidItem;
   }
-  // If the field value is not an array we run the validation for the field
+  // If the field value is not an array, we run the validation for the field
   return executeValidation(fieldValue, fieldCondition) === "";
 };
 

From 56b0de48846bccf9cc93b7557cf9302918c40170 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 25 Sep 2023 15:09:49 -0700
Subject: [PATCH 183/313] fix(FSADT1-888): fixing spacing between radio buttons

---
 frontend/src/assets/styles/global.scss                | 7 +++++++
 frontend/src/components/forms/RadioInputComponent.vue | 5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index e02b8cf8d9..494c68121a 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -141,6 +141,10 @@ cds-actionable-notification,
   border-radius: 0.25rem;
 }
 
+cds-radio-button:not(:last-child){
+  margin-bottom: 0.5rem;
+}
+
 .top-notification {
   margin-top: 3rem;
   display: flex;
@@ -830,3 +834,6 @@ cds-modal {
     width: 50vw;
   }
 }
+
+
+
diff --git a/frontend/src/components/forms/RadioInputComponent.vue b/frontend/src/components/forms/RadioInputComponent.vue
index 80eeca7251..816f02af76 100644
--- a/frontend/src/components/forms/RadioInputComponent.vue
+++ b/frontend/src/components/forms/RadioInputComponent.vue
@@ -79,14 +79,15 @@ revalidateBus.on(() => validateInput())
       :legend-text="label"
       :helper-text="tip"
       v-model="selectedValue"
+      
       :invalid="error ? true : false"
       :invalid-text="error"
-      @cds-radio-button-group-changed="updateSelectedValue"
-      class="grouping-01"
+      @cds-radio-button-group-changed="updateSelectedValue"      
       :data-focus="id"
       :data-scroll="id"
     >
       <cds-radio-button
+        v-shadow="1"
         v-for="option in modelValue"
         :key="id + 'rb' + option.value"
         :label-text="option.text"

From 7ccc5b817e58e5fcd45552409e49db1c24b98c37 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 25 Sep 2023 15:14:20 -0700
Subject: [PATCH 184/313] Trying a different approach to solve the security
 hotspot issue

---
 .../helpers/validators/GlobalValidators.ts    | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 6581dbe944..9f65c9c38b 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -311,28 +311,19 @@ export const runValidation = (
   // We then load the field value
   const fieldValue = getFieldValue(fieldKey, target);
 
-  // We define a function that will run the validation if the condition is true
-  const buildEval = (condition: string) =>
-    condition === "true" ? "true" : `target.${condition}`;
-
   // We define a function to evaluate the condition safely
   const evaluateCondition = (condition: string, item: any): boolean => {
     if (condition === "true") {
       return true;
     }
 
-    if (typeof item === "object") {
-      const conditionFunction = new Function("item", `return ${condition};`);
-      try {
-        return conditionFunction(item);
-      } catch (error) {
-        // Handle any potential errors in the condition evaluation
-        console.error("Error evaluating condition:", error);
-        return false;
-      }
+    try {
+      return eval(condition);
+    } 
+    catch (error) {
+      console.error("Error evaluating condition:", error);
+      return false;
     }
-
-    return false;
   };
 
   const executeValidation = (
@@ -371,7 +362,7 @@ export const runValidation = (
           const valid =
             executeValidation(
               subItem,
-              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+              fieldCondition.replace(".*.", `[${index}].`),
               fieldKey.replace(".*.", `[${index}].`)
             ) === "";
           if (!valid) {
@@ -387,7 +378,7 @@ export const runValidation = (
       const valid =
         executeValidation(
           item,
-          buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+          fieldCondition.replace(".*.", `[${index}].`),
           fieldKey.replace(".*.", `[${index}].`)
         ) === "";
       if (!valid) {

From f34029d10ca0899677912f00925ffd2eaef1077f Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 25 Sep 2023 15:31:51 -0700
Subject: [PATCH 185/313] fix(FSADT1-892): fixing submission page

---
 frontend/src/assets/styles/global.scss   | 29 +++++++++++---
 frontend/src/pages/FormSubmittedPage.vue | 50 ++++++++++++------------
 2 files changed, 50 insertions(+), 29 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 494c68121a..3f7970d8aa 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -72,6 +72,12 @@
 
   --cds-notification-background-error: #FFEAE5;
   --cds-support-error: #E72000;
+
+  --light-theme-background-background-selected: #93939533;
+}
+
+*, *::before, *::after {
+  box-sizing: unset;
 }
 
 .heading-buttons {
@@ -180,6 +186,13 @@ hr {
   width: 100%;
 }
 
+div#app {
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: stretch;
+}
+
 .bulleted-list {
   list-style: decimal;
   margin-left: 1.5rem;
@@ -203,7 +216,7 @@ hr {
   width: 414px;
   height: 414px;
   flex-grow: 1;
-  fill: var(--cds-hover-primary, #0353e9);
+  fill: var(--cds-button-primary, #0353e9);
 }
 
 .form-header-progress {
@@ -223,22 +236,23 @@ hr {
   padding: 8.125rem 13.375rem 15rem 2.5rem;
   align-items: center;
   background: var(--light-theme-layer-layer-02, #fff);
+  flex-grow: 1;
 }
 .full {
   margin: 0rem;
   padding-bottom: 0px;
   display: flex;
-  align-items: stretch;
-  height: 100vh;
-  width: 100vw;
-  overflow: hidden;
+  align-items: stretch;  
   background: var(--light-theme-background-background, #fff);
+  flex-grow: 1;
 }
 .screen {
   margin: 3rem 2.5rem 2.5rem 2.5rem;
   padding-bottom: 0px;
   display: flex;
+  align-items: stretch;  
   background: var(--light-theme-background-background, #fff);
+  flex-grow: 1;
 }
 .headers {
   display: flex;
@@ -417,6 +431,11 @@ hr {
 }
 .form-header-stretched {
   align-self: stretch;
+  width: 50%;
+}
+
+.form-header-stretched cds-button{
+  width: 15rem;
 }
 
 .form-header-title {
diff --git a/frontend/src/pages/FormSubmittedPage.vue b/frontend/src/pages/FormSubmittedPage.vue
index f0642375a1..76cca64886 100644
--- a/frontend/src/pages/FormSubmittedPage.vue
+++ b/frontend/src/pages/FormSubmittedPage.vue
@@ -1,31 +1,12 @@
-<template>
-  <div class="frame-03">
-    <SVG alt="Badge pictogram" class="submission-badge"></SVG>
-    <div ref="i"></div>
-    <div class="form-header form-header-stretched">
-      <h1>Application submitted!</h1>
-      <p>Your application for a client number has been submitted.</p>
-      <p>
-        We’ll send the client number to {{ submitterInformation?.email }} once
-        we confirm the information you provided.
-      </p>
-      <cds-button
-        kind="primary"
-        @click.prevent="newFormSubmission()"
-        size="field">
-        <span>Create another client</span>
-      </cds-button>
-    </div>
-  </div>
-</template>
-
 <script setup lang="ts">
 import { inject } from 'vue'
+// Composables
 import { useRouter } from 'vue-router'
-import badgePictogram from '@carbon/pictograms/es/badge'
-
-import type { Submitter } from '@/dto/CommonTypesDto'
 import useSvg from '@/composables/useSvg'
+// Types
+import type { Submitter } from '@/dto/CommonTypesDto'
+// @ts-ignore
+import badgePictogram from '@carbon/pictograms/es/badge'
 
 const submitterInformation = inject<Submitter>('submitterInformation')
 
@@ -37,3 +18,24 @@ const newFormSubmission = () => {
 
 const SVG = useSvg(badgePictogram)
 </script>
+
+<template>
+  <div class="frame-03">
+    <SVG alt="Badge pictogram" class="submission-badge"></SVG>    
+    <div class="form-header form-header-stretched">
+      <p class="fluid-heading-05">Application submitted!</p>
+      <p class="fluid-paragraph-01">Your application for a client number has been submitted.</p>
+      <p class="fluid-paragraph-01">
+        We’ll send the client number to {{ $session.user?.email }} once
+        we confirm the information you provided.
+      </p>
+      <cds-button
+        kind="primary"
+        @click.prevent="newFormSubmission()"
+        size="field">
+        <span>Create another client</span>
+      </cds-button>
+    </div>
+  </div>
+</template>
+

From 0f7d6f23a887ecd9cd4d97659cdcdeb5f303919f Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 25 Sep 2023 15:46:31 -0700
Subject: [PATCH 186/313] Trying a different approach to solve the security
 hotspot issue #2

---
 frontend/src/helpers/validators/GlobalValidators.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 9f65c9c38b..b2bb32834f 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -318,9 +318,8 @@ export const runValidation = (
     }
 
     try {
-      return eval(condition);
-    } 
-    catch (error) {
+      return Function('"use strict";return (' + condition + ')').call(target, item);
+    } catch (error) {
       console.error("Error evaluating condition:", error);
       return false;
     }
@@ -343,7 +342,6 @@ export const runValidation = (
         return "";
       }
     } catch (error) {
-      // Handle any potential errors in the condition evaluation
       console.error("Error executing validation:", error);
       return "";
     }

From 0f5b211d02f0f75cccd66d911f6b83531a50fd8b Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 25 Sep 2023 16:06:56 -0700
Subject: [PATCH 187/313] fix(FSADT1-894): fixing field spacing and width

---
 frontend/src/assets/styles/global.scss        | 31 ++++++++++---------
 .../src/pages/applyform/ReviewWizardStep.vue  |  2 +-
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 3f7970d8aa..ed4f7fedf9 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -198,10 +198,6 @@ div#app {
   margin-left: 1.5rem;
 }
 
-.bulleted-list li {
-  padding-bottom: 0.625rem;
-}
-
 .wizard-head-toast {
   position: fixed;
   right: 1.5625rem;
@@ -803,14 +799,11 @@ cds-modal {
 
 /* Medium (from 672px to 1055px) */
 @media screen and (min-width: 672px) and (max-width: 1055px) {
-  .form-header-title span {
-    color: purple;
-  }
 
   /* Lower range width is still a mess */
 
   .screen {
-    margin: 2rem;
+    margin: 2rem 2rem 0 2rem;
     align-items: center;
   }
 
@@ -827,30 +820,40 @@ cds-modal {
 /* Large (from 1056px to 1311px) */
 @media screen and (min-width: 1056px) and (max-width: 1311px) {
   .screen {
-    margin: 2rem;
+    margin: 2rem 2rem 0 2rem;
     align-items: center;
   }
+  .grouping-02, .grouping-03 {
+    width: 50.4375rem;
+  }
 }
 
 /* X-Large (from 1312px to 1583px) */
 @media screen and (min-width: 1312px) and (max-width: 1583px) {
   .screen {
-    margin: 2rem;
+    margin: 2rem 2rem 0 2rem;
     align-items: center;
   }
+  .grouping-02, .grouping-03 {
+    width: 50.4375rem;
+  }
 }
 
 /* XX-Large (from 1584px to 1783px) */
 @media screen and (min-width: 1584px) and (max-width: 1783px) {
-  .form-steps {
-    width: 50vw;
+  .grouping-02, .grouping-03 {
+    width: 50.4375rem;
   }
 }
 
 /* XXX-Large (1784px and above) */
 @media screen and (min-width: 1784px) {
-  .form-steps {
-    width: 50vw;
+  .screen {
+    margin: 2rem 7.75rem 0 2rem;
+    align-items: center;
+  }
+  .grouping-02, .grouping-03 {
+    width: 50.4375rem;
   }
 }
 
diff --git a/frontend/src/pages/applyform/ReviewWizardStep.vue b/frontend/src/pages/applyform/ReviewWizardStep.vue
index a8bd4aca4e..b1139406fb 100644
--- a/frontend/src/pages/applyform/ReviewWizardStep.vue
+++ b/frontend/src/pages/applyform/ReviewWizardStep.vue
@@ -44,7 +44,7 @@ onMounted(() => {
 <template>
   <div class="grouping-05">
     <label class="heading-03">Business information</label>
-    <div class="grouping-06">
+    <div class="grouping-01">
       <p class="heading-02">
         {{ formData.businessInformation.businessName }}
       </p>

From f6ec43092946ea0512db1f65adf1787844056dc8 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 25 Sep 2023 16:07:17 -0700
Subject: [PATCH 188/313] fix(FSADT1-891): fixing modal spacing

---
 frontend/src/App.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 51525da3b6..4203ddc944 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -81,7 +81,7 @@ toastBus.on(openToast)
           {{ modalContent.kind }}?
         </cds-modal-heading>
       </cds-modal-header>
-      <cds-modal-body><p></p></cds-modal-body>
+      
 
       <cds-modal-footer>
           <cds-modal-footer-button 

From 8ead99d39b1451d7fca8a42b11fe97d9dba5f2a3 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 25 Sep 2023 16:17:04 -0700
Subject: [PATCH 189/313] fix(FSADT1-889): fixing notification body content

---
 frontend/src/assets/styles/global.scss                     | 6 ++++--
 .../src/pages/applyform/BusinessInformationWizardStep.vue  | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index ed4f7fedf9..a34ca7714a 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -186,6 +186,10 @@ hr {
   width: 100%;
 }
 
+.cds--inline-notification-content{
+  width:100%;
+}
+
 div#app {
   height: 100vh;
   display: flex;
@@ -857,5 +861,3 @@ cds-modal {
   }
 }
 
-
-
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
index 09bea34d83..1d44d2bc4e 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
@@ -239,13 +239,14 @@ watch([selectedOption], () => {
     <cds-inline-loading status="active" v-if="showDetailsLoading">Loading client details...</cds-inline-loading>
     <div v-if="(showAutoCompleteInfo && selectedOption === ClientTypeEnum.R) || showGoodStandingError || showDuplicatedError">
       <cds-inline-notification
+        v-shadow="2"
         v-if="showAutoCompleteInfo && selectedOption === ClientTypeEnum.R"
         low-contrast="true"
         open="true"
         kind="info"
         hide-close-button="true"
         title="If the name of your registered business does not appear in the list, follow these steps:">
-        <div>
+        <div class="cds--inline-notification-content">
           <ol type="1" class="bulleted-list">
             <li class="body-compact-01">
               Log into Manage Account in
@@ -274,7 +275,7 @@ watch([selectedOption], () => {
         kind="error"
         title="Not in good standing with BC Registries"
       >
-        <p>
+        <p class="cds--inline-notification-content">
           Your request for a client number cannot go ahead because “{{
             formData.businessInformation.businessName
           }}” is not in good standing with BC Registries. Go to your
@@ -296,7 +297,7 @@ watch([selectedOption], () => {
         kind="error"
         title="Client already exists"
       >
-        <p>
+        <p  class="cds--inline-notification-content">
           Looks like “{{ formData.businessInformation.businessName }}” has a
           client number. Select the 'Receive email and logout' button below to
           have it sent to you at {{ formData.location.contacts[0].email }}

From e9d75259cdc548e88b6f8d04b42fb5416d3b6ba5 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Mon, 25 Sep 2023 16:24:17 -0700
Subject: [PATCH 190/313] fix(FSADT1-890): fixing component alignment

---
 frontend/src/assets/styles/global.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index a34ca7714a..d70d6d4a2f 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -151,6 +151,10 @@ cds-radio-button:not(:last-child){
   margin-bottom: 0.5rem;
 }
 
+cds-combo-box::part(trigger-button) {
+  padding: 0px 3rem 0px 0;
+}
+
 .top-notification {
   margin-top: 3rem;
   display: flex;

From d8d6ea296bff1641c5096735642ae679ca9e7c50 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 25 Sep 2023 20:40:13 -0700
Subject: [PATCH 191/313] fix: Fixed security hotspot

---
 frontend/src/helpers/validators/GlobalValidators.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index b2bb32834f..3ba9c4349f 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -315,12 +315,8 @@ export const runValidation = (
   const evaluateCondition = (condition: string, item: any): boolean => {
     if (condition === "true") {
       return true;
-    }
-
-    try {
-      return Function('"use strict";return (' + condition + ')').call(target, item);
-    } catch (error) {
-      console.error("Error evaluating condition:", error);
+    } else {
+      console.error("Unknown condition:", condition);
       return false;
     }
   };

From b5d5d9ef5c5f47589ada74771889605c9741cab1 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 25 Sep 2023 20:57:04 -0700
Subject: [PATCH 192/313] fix: Fixed security hotspot

---
 frontend/src/helpers/validators/GlobalValidators.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 3ba9c4349f..0f45e8c5bd 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -415,8 +415,7 @@ export const validate = (
         condition: string,
         fieldId: string = fieldKey
       ): string => {
-        // eslint-disable-next-line no-eval
-        if (eval(condition)) {
+        if (evaluateCondition(condition, item)) {
           const validationResponse = validation(item);
           if (notify && validationResponse) {
             errorBus.emit([{ fieldId, errorMsg: validationResponse }]);
@@ -426,6 +425,16 @@ export const validate = (
           return "";
         }
       };
+
+      const evaluateCondition = (condition: string, item: any): boolean => {
+        if (condition === "true") {
+          return true;
+        } else {
+          console.error("Unknown condition:", condition);
+          return false;
+        }
+      };
+
       // If the field value is an array we run the validation for every item in the array
       if (Array.isArray(fieldValue)) {
         return fieldValue.every((item: any, index: number) => {

From a717dce1aba8977d180263a6d456c13bb1f6e36b Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 25 Sep 2023 21:10:01 -0700
Subject: [PATCH 193/313] Made code reviews

---
 frontend/src/pages/FormBCeIDPage.vue | 137 +++++++++++++++------------
 1 file changed, 75 insertions(+), 62 deletions(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 4b11691f60..a3c1b21910 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
-import { reactive, watch, toRef, ref, getCurrentInstance, computed } from 'vue'
+import { reactive, watch, toRef, ref, getCurrentInstance, computed } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/button/index';
-import '@carbon/web-components/es/components/progress-indicator/index';
-import '@carbon/web-components/es/components/notification/index';
+import "@carbon/web-components/es/components/button/index";
+import "@carbon/web-components/es/components/progress-indicator/index";
+import "@carbon/web-components/es/components/notification/index";
 // Composables
 import { useEventBus, useMediaQuery } from "@vueuse/core";
 import { useRouter } from "vue-router";
@@ -25,14 +25,12 @@ import type {
 // Imported User session
 import ForestClientUserSession from "@/helpers/ForestClientUserSession";
 // Imported global validations
-import {
-  addValidation,
-} from "@/helpers/validators/BCeIDFormValidations";
+import { addValidation } from "@/helpers/validators/BCeIDFormValidations";
 
 import {
   runValidation,
   validate,
-  isContainedIn
+  isContainedIn,
 } from "@/helpers/validators/GlobalValidators";
 
 // @ts-ignore
@@ -42,12 +40,11 @@ import LogOut16 from "@carbon/icons-vue/es/logout/16";
 // @ts-ignore
 import Check16 from "@carbon/icons-vue/es/checkmark/16";
 
-const errorBus = useEventBus<ValidationMessageType[]>("submission-error-notification")
-const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification")
-const exitBus = useEventBus<Record<string, boolean | null>>("exit-notification")
-const revalidateBus = useEventBus<void>('revalidate-bus')
-const progressIndicatorBus = useEventBus<ProgressNotification>('progress-indicator-bus')
-
+const errorBus = useEventBus<ValidationMessageType[]>("submission-error-notification");
+const notificationBus = useEventBus<ValidationMessageType | undefined>("error-notification");
+const exitBus = useEventBus<Record<string, boolean | null>>("exit-notification");
+const revalidateBus = useEventBus<void>("revalidate-bus");
+const progressIndicatorBus = useEventBus<ProgressNotification>("progress-indicator-bus");
 
 const router = useRouter();
 const { setScrollPoint, setFocusedComponent } = useFocus();
@@ -79,13 +76,17 @@ const locations = computed(() =>
   formData.location.addresses.map((address: any) => address.locationName)
 );
 
-const associatedLocations = computed(() => (formData
-  .location
-  .contacts
-  .map((contact:Contact) => contact.locationNames)
-  .map((locationNames: CodeDescrType[]) => locationNames.map((locationName: CodeDescrType) => locationName.text))
-  .reduce((accumulator: string[], current: string[]) => accumulator.concat(current), [])
-))
+const associatedLocations = computed(() =>
+  formData.location.contacts
+    .map((contact: Contact) => contact.locationNames)
+    .map((locationNames: CodeDescrType[]) =>
+      locationNames.map((locationName: CodeDescrType) => locationName.text)
+    )
+    .reduce(
+      (accumulator: string[], current: string[]) => accumulator.concat(current),
+      []
+    )
+);
 
 const { response, error, fetch } = usePost(
   "/api/clients/submissions",
@@ -106,15 +107,20 @@ watch([response], () => {
   }
 });
 
-watch([error], () => {  
+watch([error], () => {
   const validationErrors: ValidationMessageType[] = error.value.response
     ?.data as ValidationMessageType[];
-  
-    validationErrors.forEach((errorItem: ValidationMessageType) => notificationBus.emit(errorItem));
-    setScrollPoint("top");
+
+  validationErrors.forEach((errorItem: ValidationMessageType) =>
+    notificationBus.emit(errorItem)
+  );
+  setScrollPoint("top");
 });
 
-addValidation('location.contacts.*.locationNames.*.text', isContainedIn(locations))
+addValidation(
+  "location.contacts.*.locationNames.*.text",
+  isContainedIn(locations)
+);
 
 // Tab system
 const progressData = reactive([
@@ -166,9 +172,14 @@ const progressData = reactive([
       "location.contacts.*.email",
       "location.contacts.*.phoneNumber",
     ],
-    extraValidations: [{
-      field: 'location.addresses.*.locationName', validation: isContainedIn(associatedLocations,'Looks like “${item}” doesn’t have a contact. You must associate it with an existing contact or add a new contact before submitting the application again.')
-    }
+    extraValidations: [
+      {
+        field: "location.addresses.*.locationName",
+        validation: isContainedIn(
+          associatedLocations,
+          "Looks like “${item}” doesn’t have a contact. You must associate it with an existing contact or add a new contact before submitting the application again."
+        ),
+      },
     ],
   },
   {
@@ -215,7 +226,6 @@ const checkStepValidity = (stepNumber: number): boolean => {
   )
     return false;
 
-
   return progressData[stepNumber].valid;
 };
 
@@ -225,43 +235,41 @@ const endAndLogOut = ref<boolean>(false);
 const mailAndLogOut = ref<boolean>(false);
 
 const goToStep = (index: number, skipCheck: boolean = false) => {
-  if (skipCheck || (index <= currentTab.value && checkStepValidity(index))) currentTab.value = index;
-  else notificationBus.emit({ fieldId: 'missing.info', errorMsg: '' });
-  revalidateBus.emit()
+  if (skipCheck || (index <= currentTab.value && checkStepValidity(index)))
+    currentTab.value = index;
+  else notificationBus.emit({ fieldId: "missing.info", errorMsg: "" });
+  revalidateBus.emit();
 };
 
-
 const onNext = () => {
   notificationBus.emit(undefined);
   if (currentTab.value + 1 < progressData.length) {
     if (checkStepValidity(currentTab.value)) {
       currentTab.value++;
-      progressData[currentTab.value - 1].kind = 'complete';
-      progressData[currentTab.value].kind = 'current';
-      setTimeout(revalidateBus.emit, 1000)
+      progressData[currentTab.value - 1].kind = "complete";
+      progressData[currentTab.value].kind = "current";
+      setTimeout(revalidateBus.emit, 1000);
     }
     setScrollPoint("top");
   }
-  
 };
 const onBack = () => {
   if (currentTab.value - 1 >= 0) {
     currentTab.value--;
-    progressData[currentTab.value + 1].kind = 'incomplete';
-    progressData[currentTab.value].kind = 'current';
-    setScrollPoint("top");    
-    setTimeout(revalidateBus.emit, 1000)
+    progressData[currentTab.value + 1].kind = "incomplete";
+    progressData[currentTab.value].kind = "current";
+    setScrollPoint("top");
+    setTimeout(revalidateBus.emit, 1000);
   }
-  
 };
 const validateStep = (valid: boolean) => {
   progressData[currentTab.value].valid = valid;
-  if(valid){
-    const nextStep = progressData.find((step: any) => step.step === currentTab.value+1)  
-    if(nextStep)
-      nextStep.disabled = false;
+  if (valid) {
+    const nextStep = progressData.find(
+      (step: any) => step.step === currentTab.value + 1
+    );
+    if (nextStep) nextStep.disabled = false;
   }
-  
 };
 
 const processAndLogOut = () => {
@@ -294,24 +302,29 @@ exitBus.on((event: Record<string, boolean | null>) => {
   mailAndLogOut.value = event.duplicated ? event.duplicated : false;
 });
 
-progressIndicatorBus.on((event: ProgressNotification) => {  
-  if(event.kind === 'disabled') {        
-    [1,2,3]
-    .filter((index: number) => event.value || index < currentTab.value+1)
-    .forEach((index: number) => progressData[index].disabled = event.value as boolean)
+progressIndicatorBus.on((event: ProgressNotification) => {
+  if (event.kind === "disabled") {
+    [1, 2, 3]
+      .filter((index: number) => event.value || index < currentTab.value + 1)
+      .forEach(
+        (index: number) =>
+          (progressData[index].disabled = event.value as boolean)
+      );
   }
-  if(event.kind === 'navigate') goToStep(event.value as number, true)
-  if(event.kind === 'error'){ 
+  if (event.kind === "navigate") goToStep(event.value as number, true);
+  if (event.kind === "error") {
     (event.value as number[]).forEach((index: number) => {
-      progressData[index].valid = false
-      progressData[index].kind = 'invalid'
-    })
+      progressData[index].valid = false;
+      progressData[index].kind = "invalid";
+    });
   }
 });
 
-const reEval = () => (revalidateBus.emit())
+const reEval = () => revalidateBus.emit();
 
-const contactWizardRef = ref<InstanceType<typeof ContactWizardStep> | null>(null)
+const contactWizardRef = ref<InstanceType<typeof ContactWizardStep> | null>(
+  null
+);
 
 const scrollToNewContact = () => {
   if (contactWizardRef.value) {
@@ -321,9 +334,9 @@ const scrollToNewContact = () => {
       setFocusedComponent(`addressname_${index}`);
     });
   }
-}
+};
 
-const isSmallScreen = useMediaQuery('(max-width: 671px)')
+const isSmallScreen = useMediaQuery("(max-width: 671px)");
 </script>
 
 <template>

From be85fe59e1ca9a96e92cc5d62df7eaff870c02ae Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 25 Sep 2023 21:12:15 -0700
Subject: [PATCH 194/313] Removed unused variable

---
 frontend/src/pages/FormBCeIDPage.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index a3c1b21910..1e7120a5cf 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -320,8 +320,6 @@ progressIndicatorBus.on((event: ProgressNotification) => {
   }
 });
 
-const reEval = () => revalidateBus.emit();
-
 const contactWizardRef = ref<InstanceType<typeof ContactWizardStep> | null>(
   null
 );

From 492550e994341cdadd858378f2254f391b050d14 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 25 Sep 2023 21:50:49 -0700
Subject: [PATCH 195/313] Refactored code and made code reviews

---
 .../main/resources/templates/approval.html    |  53 ------
 frontend/src/pages/FormBCeIDPage.vue          |   8 +-
 frontend/src/pages/FormSubmittedPage.vue      |  20 +--
 frontend/src/pages/LandingPage.vue            |  20 +--
 frontend/src/pages/UserLoadingPage.vue        |  17 +-
 .../AddressWizardStep.vue                     |  89 +++++-----
 .../BusinessInformationWizardStep.vue         | 166 +++++++++---------
 .../ContactWizardStep.vue                     | 127 +++++++-------
 .../ReviewWizardStep.vue                      |  42 ++---
 9 files changed, 251 insertions(+), 291 deletions(-)
 delete mode 100644 backend/src/main/resources/templates/approval.html
 rename frontend/src/pages/{applyform => bceidform}/AddressWizardStep.vue (62%)
 rename frontend/src/pages/{applyform => bceidform}/BusinessInformationWizardStep.vue (72%)
 rename frontend/src/pages/{applyform => bceidform}/ContactWizardStep.vue (57%)
 rename frontend/src/pages/{applyform => bceidform}/ReviewWizardStep.vue (79%)

diff --git a/backend/src/main/resources/templates/approval.html b/backend/src/main/resources/templates/approval.html
deleted file mode 100644
index 07badfaf18..0000000000
--- a/backend/src/main/resources/templates/approval.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE html>
-<html 
-	lang="en" 
-	xmlns="http://www.w3.org/1999/xhtml"
-	xmlns:v="urn:schemas-microsoft-com:vml"
-	xmlns:o="urn:schemas-microsoft-com:office:office">
-
-<#include "emailHead.html">
-
-<body 
-	width="100%"
-	style="margin: 0; padding: 0 !important; mso-line-height-rule: exactly;">
-
-	<div style="text-align: left;">
-
-		<#include "emailLogo.html">
-
-		<p>
-			Dear <b>${userName}</b>,
-		</p>
-		<div>&nbsp;</div>
-
-		<p>
-			Your application for a client number for <b>${business.name}</b> is approved.
-		</p>
-		<p>The client number is ${business.clientNumber}. Be sure to keep it for your records.</p>
-		<div>&nbsp;</div>
-		
-		<p>
-			Here is the information you submitted. If you need to update it, contact your district office.
-		</p>
-		<div>&nbsp;</div>
-		
-		TODO:
-		
-		<p>
-			If you need to contact us, email <a
-				href="mailto:FORHVAP.CLIADMIN@gov.bc.ca">FORHVAP.CLIADMIN@gov.bc.ca.</a>
-		</p>
-		<div>&nbsp;</div>
-		
-		<p>Thank you,</p>
-		<p>The Client Management Team</p>
-		<div>&nbsp;</div>
-		
-		<p>
-			<b>Please don’t respond to this email.</b> 
-			It’s from an account that’s not monitored for incoming emails.
-		</p>
-	</div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 1e7120a5cf..3e74e1018b 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -10,10 +10,10 @@ import { useRouter } from "vue-router";
 import { useFocus } from "@/composables/useFocus";
 import { usePost } from "@/composables/useFetch";
 // Imported Pages
-import BusinessInformationWizardStep from "@/pages/applyform/BusinessInformationWizardStep.vue";
-import AddressWizardStep from "@/pages/applyform/AddressWizardStep.vue";
-import ContactWizardStep from "@/pages/applyform/ContactWizardStep.vue";
-import ReviewWizardStep from "@/pages/applyform/ReviewWizardStep.vue";
+import BusinessInformationWizardStep from "@/pages/bceidform/BusinessInformationWizardStep.vue";
+import AddressWizardStep from "@/pages/bceidform/AddressWizardStep.vue";
+import ContactWizardStep from "@/pages/bceidform/ContactWizardStep.vue";
+import ReviewWizardStep from "@/pages/bceidform/ReviewWizardStep.vue";
 // Imported types
 import { newFormDataDto } from "@/dto/ApplyClientNumberDto";
 import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
diff --git a/frontend/src/pages/FormSubmittedPage.vue b/frontend/src/pages/FormSubmittedPage.vue
index 76cca64886..cd5c692a14 100644
--- a/frontend/src/pages/FormSubmittedPage.vue
+++ b/frontend/src/pages/FormSubmittedPage.vue
@@ -1,22 +1,22 @@
 <script setup lang="ts">
-import { inject } from 'vue'
+import { inject } from "vue";
 // Composables
-import { useRouter } from 'vue-router'
-import useSvg from '@/composables/useSvg'
+import { useRouter } from "vue-router";
+import useSvg from "@/composables/useSvg";
 // Types
-import type { Submitter } from '@/dto/CommonTypesDto'
+import type { Submitter } from "@/dto/CommonTypesDto";
 // @ts-ignore
-import badgePictogram from '@carbon/pictograms/es/badge'
+import badgePictogram from "@carbon/pictograms/es/badge";
 
-const submitterInformation = inject<Submitter>('submitterInformation')
+const submitterInformation = inject<Submitter>("submitterInformation");
 
-const router = useRouter()
+const router = useRouter();
 
 const newFormSubmission = () => {
-  router.push({ name: 'form' })
-}
+  router.push({ name: "form" });
+};
 
-const SVG = useSvg(badgePictogram)
+const SVG = useSvg(badgePictogram);
 </script>
 
 <template>
diff --git a/frontend/src/pages/LandingPage.vue b/frontend/src/pages/LandingPage.vue
index 5ffd136f4a..a89c1a82b5 100644
--- a/frontend/src/pages/LandingPage.vue
+++ b/frontend/src/pages/LandingPage.vue
@@ -1,22 +1,22 @@
 <script setup lang="ts">
 // Carbon
-import '@carbon/web-components/es/components/button/index';
+import "@carbon/web-components/es/components/button/index";
 // Composables
-import { useRouter } from 'vue-router'
+import { useRouter } from "vue-router";
 // Constants
-import { backendUrl } from '@/CoreConstants'
+import { backendUrl } from "@/CoreConstants";
 // Assets
-import Seeding from '@/assets/images/seeding.png'
-import logo from '@/assets/images/bc-gov-logo.png'
+import Seeding from "@/assets/images/seeding.png";
+import logo from "@/assets/images/bc-gov-logo.png";
 // @ts-ignore
-import login16 from '@carbon/icons-vue/es/login/16'
+import login16 from "@carbon/icons-vue/es/login/16";
 
 // extract the querystring parameters from the URL
-const router = useRouter()
-const { query } = router.currentRoute.value
+const router = useRouter();
+const { query } = router.currentRoute.value;
 // check if a querystring parameter called ref exists and if it has a value of external
-if (query.ref && query.ref === 'external') {
-  window.location.href = `${backendUrl}/login?code=bceidbusiness`
+if (query.ref && query.ref === "external") {
+  window.location.href = `${backendUrl}/login?code=bceidbusiness`;
 }
 </script>
 
diff --git a/frontend/src/pages/UserLoadingPage.vue b/frontend/src/pages/UserLoadingPage.vue
index 563d003b18..212730d776 100644
--- a/frontend/src/pages/UserLoadingPage.vue
+++ b/frontend/src/pages/UserLoadingPage.vue
@@ -7,18 +7,15 @@
 </template>
 
 <script setup lang="ts">
-import { useRouter } from 'vue-router'
-import { backendUrl } from '@/CoreConstants'
-const router = useRouter()
+import { useRouter } from "vue-router";
+import { backendUrl } from "@/CoreConstants";
+const router = useRouter();
 
-if(!router.currentRoute.value.query.code){
-  router.push({ name: 'error',query: { error: 'no_code' } })
-}else{
-  window.location.href = `${backendUrl}/callback?code=${router.currentRoute.value.query.code}`
+if (!router.currentRoute.value.query.code) {
+  router.push({ name: "error", query: { error: "no_code" } });
+} else {
+  window.location.href = `${backendUrl}/callback?code=${router.currentRoute.value.query.code}`;
 }
-
-
-
 </script>
 
 <style scoped>
diff --git a/frontend/src/pages/applyform/AddressWizardStep.vue b/frontend/src/pages/bceidform/AddressWizardStep.vue
similarity index 62%
rename from frontend/src/pages/applyform/AddressWizardStep.vue
rename to frontend/src/pages/bceidform/AddressWizardStep.vue
index dab20fe0a3..b9ac5a0bf9 100644
--- a/frontend/src/pages/applyform/AddressWizardStep.vue
+++ b/frontend/src/pages/bceidform/AddressWizardStep.vue
@@ -1,44 +1,42 @@
 <script setup lang="ts">
-import { watch, ref, computed, reactive, onMounted} from 'vue'
+import { watch, ref, computed, reactive, onMounted } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/button/index';
+import "@carbon/web-components/es/components/button/index";
 // Composables
-import { useEventBus } from '@vueuse/core'
-import { useFocus } from '@/composables/useFocus'
-import { useFetchTo } from '@/composables/useFetch'
+import { useEventBus } from "@vueuse/core";
+import { useFocus } from "@/composables/useFocus";
+import { useFetchTo } from "@/composables/useFetch";
 // Type
-import type { FormDataDto, Address } from '@/dto/ApplyClientNumberDto'
-import { emptyAddress } from '@/dto/ApplyClientNumberDto'
-import type { ModalNotification } from '@/dto/CommonTypesDto'
-import { isUniqueDescriptive } from '@/helpers/validators/GlobalValidators'
-
+import type { FormDataDto, Address } from "@/dto/ApplyClientNumberDto";
+import { emptyAddress } from "@/dto/ApplyClientNumberDto";
+import type { ModalNotification } from "@/dto/CommonTypesDto";
+import { isUniqueDescriptive } from "@/helpers/validators/GlobalValidators";
 
 // @ts-ignore
-import Add16 from '@carbon/icons-vue/es/add/16'
+import Add16 from "@carbon/icons-vue/es/add/16";
 
 //Defining the props and emitter to receive the data and emit an update
-const props = defineProps<{ data: FormDataDto; active: boolean }>()
+const props = defineProps<{ data: FormDataDto; active: boolean }>();
 
 const emit = defineEmits<{
-  (e: 'update:data', value: FormDataDto): void;
-  (e: 'valid', value: boolean): void;
-}>()
+  (e: "update:data", value: FormDataDto): void;
+  (e: "valid", value: boolean): void;
+}>();
 
 //Defining the event bus to send notifications up
-const bus = useEventBus<ModalNotification>('modal-notification');
+const bus = useEventBus<ModalNotification>("modal-notification");
 
 const { setFocusedComponent } = useFocus();
 
 //Set the prop as a ref, and then emit when it changes
 const formData = reactive<FormDataDto>(props.data);
 const revalidate = ref(false);
-watch([formData], () => emit('update:data', formData));
+watch([formData], () => emit("update:data", formData));
 
 const updateAddress = (value: Address | undefined, index: number) => {
-  if(index < formData.location.addresses.length){
-    if (value)
-      formData.location.addresses[index] = value;
-    else{
+  if (index < formData.location.addresses.length) {
+    if (value) formData.location.addresses[index] = value;
+    else {
       const addressesCopy: Address[] = [...formData.location.addresses];
       addressesCopy.splice(index, 1);
       formData.location.addresses = addressesCopy;
@@ -52,7 +50,7 @@ const countryList = ref([]);
 
 const fetch = () => {
   if (props.active)
-    useFetchTo('/api/clients/activeCountryCodes?page=0&size=250', countryList);
+    useFetchTo("/api/clients/activeCountryCodes?page=0&size=250", countryList);
 };
 
 watch(() => props.active, fetch);
@@ -64,51 +62,58 @@ const addAddress = () => formData.location.addresses.push(emptyAddress());
 
 //Validation
 const validation = reactive<Record<string, boolean>>({
-  0: false
+  0: false,
 });
 
-const checkValid = () =>{
+const checkValid = () => {
   const result = Object.values(validation).reduce(
     (accumulator: boolean, currentValue: boolean) =>
       accumulator && currentValue,
     true
   );
   return result;
-}
-watch([validation], () => emit('valid', checkValid()));
-emit('valid', false);
+};
+watch([validation], () => emit("valid", checkValid()));
+emit("valid", false);
 
 const updateValidState = (index: number, valid: boolean) => {
-   if (validation[index] !== valid) {
-     validation[index] = valid;
-   }
+  if (validation[index] !== valid) {
+    validation[index] = valid;
+  }
 };
 
 const uniqueValues = isUniqueDescriptive();
 
 const removeAddress = (index: number) => () => {
-  updateAddress(undefined, index)
+  updateAddress(undefined, index);
   delete validation[index];
-  uniqueValues.remove('Address',index+'')
-  uniqueValues.remove('Names',index+'')
-  bus.emit({ active: false, message: '', kind: '', toastTitle: '', handler: () => {} });
-  setFocusedComponent(`addr_addr_${index-1}`,200);
+  uniqueValues.remove("Address", index + "");
+  uniqueValues.remove("Names", index + "");
+  bus.emit({
+    active: false,
+    message: "",
+    kind: "",
+    toastTitle: "",
+    handler: () => {},
+  });
+  setFocusedComponent(`addr_addr_${index - 1}`, 200);
 };
 
 const handleRemove = (index: number) => {
-  const selectedAddress = formData.location.addresses[index].locationName.length !== 0
-    ? formData.location.addresses[index].locationName
-    : 'Address #' + index;
+  const selectedAddress =
+    formData.location.addresses[index].locationName.length !== 0
+      ? formData.location.addresses[index].locationName
+      : "Address #" + index;
   bus.emit({
     message: selectedAddress,
-    kind: 'address',
-    toastTitle: 'The additional address was deleted',
+    kind: "address",
+    toastTitle: "The additional address was deleted",
     handler: removeAddress(index),
-    active: true
+    active: true,
   });
 };
 
-onMounted(() => setFocusedComponent('addr_0',800))
+onMounted(() => setFocusedComponent("addr_0", 800));
 </script>
 
 <template>
diff --git a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
similarity index 72%
rename from frontend/src/pages/applyform/BusinessInformationWizardStep.vue
rename to frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
index 1d44d2bc4e..c9828c6157 100644
--- a/frontend/src/pages/applyform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
@@ -24,175 +24,179 @@ import { retrieveClientType, exportAddress } from "@/helpers/DataConversors";
 // Importing session
 import ForestClientUserSession from "@/helpers/ForestClientUserSession";
 
-
 //Defining the props and emiter to reveice the data and emit an update
-const props = defineProps<{ data: FormDataDto; active: boolean }>()
+const props = defineProps<{ data: FormDataDto; active: boolean }>();
 
 const emit = defineEmits<{
-  (e: 'update:data', value: FormDataDto): void
-  (e: 'valid', value: boolean): void
-}>()
+  (e: "update:data", value: FormDataDto): void;
+  (e: "valid", value: boolean): void;
+}>();
 
 //Defining the event bus to send notifications up
-const progressIndicatorBus = useEventBus<ProgressNotification>('progress-indicator-bus')
-const exitBus = useEventBus<Record<string, boolean | null>>('exit-notification')
-const generalErrorBus = useEventBus<string>('general-error-notification')
+const progressIndicatorBus = useEventBus<ProgressNotification>(
+  "progress-indicator-bus"
+);
+const exitBus =
+  useEventBus<Record<string, boolean | null>>("exit-notification");
+const generalErrorBus = useEventBus<string>("general-error-notification");
 
 //Set the prop as a ref, and then emit when it changes
-const formData = ref<FormDataDto>(props.data)
+const formData = ref<FormDataDto>(props.data);
 watch(
   () => formData.value,
-  () => emit('update:data', formData.value)
-)
+  () => emit("update:data", formData.value)
+);
 
 // -- Validation of the component --
 const validation = reactive<Record<string, boolean>>({
   businessType: !!formData.value.businessInformation.businessType,
-  business: !!formData.value.businessInformation.businessName
-})
+  business: !!formData.value.businessInformation.businessName,
+});
 
 const checkValid = () =>
   Object.values(validation).reduce(
     (accumulator: boolean, currentValue: boolean) =>
       accumulator && currentValue,
     true
-  )
+  );
 
-watch([validation], () => emit('valid', checkValid()))
-emit('valid', checkValid())
+watch([validation], () => emit("valid", checkValid()));
+emit("valid", checkValid());
 
 // -- Auto completion --
 const selectedOption = computed(() => {
   switch (formData.value.businessInformation.businessType) {
-    case 'R':
-      return ClientTypeEnum.R
-    case 'U':
-      return ClientTypeEnum.U
+    case "R":
+      return ClientTypeEnum.R;
+    case "U":
+      return ClientTypeEnum.U;
     default:
-      return ClientTypeEnum.Unknow
+      return ClientTypeEnum.Unknow;
   }
-})
+});
 
 const autoCompleteUrl = computed(
   () => `/api/clients/name/${formData.value.businessInformation.businessName}`
-)
+);
 
-const showAutoCompleteInfo = ref<boolean>(false)
-const showGoodStandingError = ref<boolean>(false)
-const showDuplicatedError = ref<boolean>(false)
-const showDetailsLoading = ref<boolean>(false)
-const detailsData = ref(null)
+const showAutoCompleteInfo = ref<boolean>(false);
+const showGoodStandingError = ref<boolean>(false);
+const showDuplicatedError = ref<boolean>(false);
+const showDetailsLoading = ref<boolean>(false);
+const detailsData = ref(null);
 
 const toggleErrorMessages = (
   goodStanding: boolean | null,
   duplicated: boolean | null
 ) => {
-  showGoodStandingError.value = goodStanding ?? false
-  showDuplicatedError.value = duplicated ?? false
+  showGoodStandingError.value = goodStanding ?? false;
+  showDuplicatedError.value = duplicated ?? false;
 
   if (goodStanding || duplicated) {
-    progressIndicatorBus.emit({kind: 'disabled', value: true})
-    exitBus.emit({ goodStanding, duplicated })
+    progressIndicatorBus.emit({ kind: "disabled", value: true });
+    exitBus.emit({ goodStanding, duplicated });
   } else {
-    progressIndicatorBus.emit({kind: 'disabled', value: false})
-    exitBus.emit({ goodStanding: false, duplicated: false })
+    progressIndicatorBus.emit({ kind: "disabled", value: false });
+    exitBus.emit({ goodStanding: false, duplicated: false });
   }
-}
+};
 
 //Using this as we have to handle the selected result to get
 //incorporation number and client type
-const autoCompleteResult = ref<BusinessSearchResult>()
+const autoCompleteResult = ref<BusinessSearchResult>();
 watch([autoCompleteResult], () => {
-
   // reset business validation state
-  validation.business = false
+  validation.business = false;
 
   if (autoCompleteResult.value) {
-    toggleErrorMessages(false, false)
+    toggleErrorMessages(false, false);
 
     formData.value.businessInformation.incorporationNumber =
-      autoCompleteResult.value.code
+      autoCompleteResult.value.code;
     formData.value.businessInformation.legalType =
-      autoCompleteResult.value.legalType
+      autoCompleteResult.value.legalType;
     formData.value.businessInformation.clientType = retrieveClientType(
       autoCompleteResult.value.legalType
-    )
-    showAutoCompleteInfo.value = false
+    );
+    showAutoCompleteInfo.value = false;
 
-    emit('update:data', formData.value)
+    emit("update:data", formData.value);
 
     const config = {
       headers: {
-        'x-user-email': formData.value.location.contacts[0].email,
-        'x-user-id': formData.value.location.contacts[0].firstName
-      }
-    }
+        "x-user-email": formData.value.location.contacts[0].email,
+        "x-user-id": formData.value.location.contacts[0].firstName,
+      },
+    };
 
     //Also, we will load the backend data to fill all the other information as well
     const { error, loading: detailsLoading } = useFetchTo(
       `/api/clients/${autoCompleteResult.value.code}`,
       detailsData,
       config
-    )
+    );
 
-    showDetailsLoading.value = true
+    showDetailsLoading.value = true;
     watch(error, () => {
       if (error.value.response?.status === 409) {
-        toggleErrorMessages(null, true)
-        return
+        toggleErrorMessages(null, true);
+        return;
       }
       if (error.value.response?.status === 404) {
-        toggleErrorMessages(null, null)
-        validation.business = true
-        emit('update:data', formData.value)
-        return
+        toggleErrorMessages(null, null);
+        validation.business = true;
+        emit("update:data", formData.value);
+        return;
       }
       // @ts-ignore
-      generalErrorBus.emit(error.value.response?.data.message)
-    })
+      generalErrorBus.emit(error.value.response?.data.message);
+    });
 
     watch(
       [detailsLoading],
       () => (showDetailsLoading.value = detailsLoading.value)
-    )
+    );
   }
-})
+});
 
 watch([detailsData], () => {
   if (detailsData.value) {
-    const forestClientDetails: ForestClientDetailsDto = detailsData.value
+    const forestClientDetails: ForestClientDetailsDto = detailsData.value;
     formData.value.location.contacts = [
       formData.value.location.contacts[0],
-      ...forestClientDetails.contacts
-    ]
-    formData.value.location.addresses = exportAddress(forestClientDetails.addresses)
+      ...forestClientDetails.contacts,
+    ];
+    formData.value.location.addresses = exportAddress(
+      forestClientDetails.addresses
+    );
     formData.value.businessInformation.goodStandingInd =
-      forestClientDetails.goodStanding ? 'Y' : 'N'
-    toggleErrorMessages(!forestClientDetails.goodStanding, null)
-    validation.business = forestClientDetails.goodStanding
+      forestClientDetails.goodStanding ? "Y" : "N";
+    toggleErrorMessages(!forestClientDetails.goodStanding, null);
+    validation.business = forestClientDetails.goodStanding;
 
-    emit('update:data', formData.value)
+    emit("update:data", formData.value);
   }
-})
+});
 
 // -- Unregistered Proprietorship
 watch([selectedOption], () => {
   if (selectedOption.value === ClientTypeEnum.U) {
-   
-    const fromName = `${ForestClientUserSession.user?.firstName} ${ForestClientUserSession.user?.lastName}`
+    const fromName = `${ForestClientUserSession.user?.firstName} ${ForestClientUserSession.user?.lastName}`;
 
-    formData.value.businessInformation.businessType = 'U'
-    formData.value.businessInformation.clientType = 'U'
-    formData.value.businessInformation.businessName =
-      ForestClientUserSession.user?.businessName ? ForestClientUserSession.user?.businessName :fromName
-    validation.business = true
-    emit('update:data', formData.value)
+    formData.value.businessInformation.businessType = "U";
+    formData.value.businessInformation.clientType = "U";
+    formData.value.businessInformation.businessName = ForestClientUserSession
+      .user?.businessName
+      ? ForestClientUserSession.user?.businessName
+      : fromName;
+    validation.business = true;
+    emit("update:data", formData.value);
   } else {
-    formData.value.businessInformation.businessName = ''
-    validation.business = false
-    showAutoCompleteInfo.value = true
+    formData.value.businessInformation.businessName = "";
+    validation.business = false;
+    showAutoCompleteInfo.value = true;
   }
-})
+});
 </script>
 
 <template>
diff --git a/frontend/src/pages/applyform/ContactWizardStep.vue b/frontend/src/pages/bceidform/ContactWizardStep.vue
similarity index 57%
rename from frontend/src/pages/applyform/ContactWizardStep.vue
rename to frontend/src/pages/bceidform/ContactWizardStep.vue
index 28378a7a76..f183b93d29 100644
--- a/frontend/src/pages/applyform/ContactWizardStep.vue
+++ b/frontend/src/pages/bceidform/ContactWizardStep.vue
@@ -1,128 +1,135 @@
 <script setup lang="ts">
-import { watch, ref, computed, reactive, onMounted } from 'vue'
+import { watch, ref, computed, reactive, onMounted } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/button/index';
+import "@carbon/web-components/es/components/button/index";
 // Composables
-import { useEventBus } from '@vueuse/core'
-import { useFetchTo } from '@/composables/useFetch'
-import { useFocus } from '@/composables/useFocus'
+import { useEventBus } from "@vueuse/core";
+import { useFetchTo } from "@/composables/useFetch";
+import { useFocus } from "@/composables/useFocus";
 // Type Imports
-import type { FormDataDto, Contact } from '@/dto/ApplyClientNumberDto'
-import { emptyContact } from '@/dto/ApplyClientNumberDto'
-import type { CodeNameType, ModalNotification } from '@/dto/CommonTypesDto'
+import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
+import { emptyContact } from "@/dto/ApplyClientNumberDto";
+import type { CodeNameType, ModalNotification } from "@/dto/CommonTypesDto";
 // Validators
-import { isUniqueDescriptive } from '@/helpers/validators/GlobalValidators'
+import { isUniqueDescriptive } from "@/helpers/validators/GlobalValidators";
 // @ts-ignore
-import Add16 from '@carbon/icons-vue/es/add/16'
-
+import Add16 from "@carbon/icons-vue/es/add/16";
 
 //Defining the props and emiter to reveice the data and emit an update
-const props = defineProps<{ data: FormDataDto; active: boolean }>()
+const props = defineProps<{ data: FormDataDto; active: boolean }>();
 
 const emit = defineEmits<{
-  (e: 'update:data', value: FormDataDto): void
-  (e: 'valid', value: boolean): void
-}>()
+  (e: "update:data", value: FormDataDto): void;
+  (e: "valid", value: boolean): void;
+}>();
 
 //Defining the event bus to send notifications up
-const bus = useEventBus<ModalNotification>('modal-notification')
+const bus = useEventBus<ModalNotification>("modal-notification");
 
 const { setFocusedComponent } = useFocus();
 
 //Set the prop as a ref, and then emit when it changes
-const formData = reactive<FormDataDto>(props.data)
-const revalidate = ref(false)
-watch([formData], () => emit('update:data', formData))
+const formData = reactive<FormDataDto>(props.data);
+const revalidate = ref(false);
+watch([formData], () => emit("update:data", formData));
 
 const updateContact = (value: Contact | undefined, index: number) => {
-  if (index < formData.location.contacts.length){
-    if(value)
-      formData.location.contacts[index] = value
-    else{
+  if (index < formData.location.contacts.length) {
+    if (value) formData.location.contacts[index] = value;
+    else {
       const contactCopy: Contact[] = [...formData.location.contacts];
       contactCopy.splice(index, 1);
       formData.location.contacts = contactCopy;
     }
   }
-  revalidate.value = !revalidate.value
-}
+  revalidate.value = !revalidate.value;
+};
 
 //Role related data
-const roleList = ref([])
+const roleList = ref([]);
 const fetch = () => {
   if (props.active)
-    useFetchTo('/api/clients/activeContactTypeCodes?page=0&size=250', roleList)
-}
+    useFetchTo("/api/clients/activeContactTypeCodes?page=0&size=250", roleList);
+};
 
-watch(() => props.active, fetch)
-fetch()
+watch(() => props.active, fetch);
+fetch();
 
 //Addresses Related data
 const addresses = computed<CodeNameType[]>(() =>
   formData.location.addresses.map((address, index) => {
-    return { code: index + '', name: address.locationName } as CodeNameType
+    return { code: index + "", name: address.locationName } as CodeNameType;
   })
-)
+);
 
-const uniqueValues = isUniqueDescriptive()
+const uniqueValues = isUniqueDescriptive();
 
 //New contact being added
-const otherContacts = computed(() => formData.location.contacts.slice(1))
+const otherContacts = computed(() => formData.location.contacts.slice(1));
 const addContact = (autoFocus = true) => {
-  const newLength = formData.location.contacts.push(JSON.parse(JSON.stringify(emptyContact)))
+  const newLength = formData.location.contacts.push(
+    JSON.parse(JSON.stringify(emptyContact))
+  );
   if (autoFocus) {
     const focusIndex = newLength - 1;
     setFocusedComponent(`addressname_${focusIndex}`);
   }
   return newLength;
-}
+};
 
 const removeContact = (index: number) => () => {
-    updateContact(undefined, index)
-    delete validation[index]
-    uniqueValues.remove('Name',index+'')
-    bus.emit({ active: false, message: '', kind: '', toastTitle: '', handler: () => {} })
-}
+  updateContact(undefined, index);
+  delete validation[index];
+  uniqueValues.remove("Name", index + "");
+  bus.emit({
+    active: false,
+    message: "",
+    kind: "",
+    toastTitle: "",
+    handler: () => {},
+  });
+};
 
 //Validation
 const validation = reactive<Record<string, boolean>>({
-  0: false
-})
+  0: false,
+});
 
 const updateValidState = (index: number, valid: boolean) => {
   if (validation[index] !== valid) {
-     validation[index] = valid;
-   }
-}
+    validation[index] = valid;
+  }
+};
 
 const checkValid = () =>
   Object.values(validation).reduce(
     (accumulator: boolean, currentValue: boolean) =>
       accumulator && currentValue,
     true
-  )
+  );
 
-watch([validation], () => emit('valid', checkValid()))
-emit('valid', false)
+watch([validation], () => emit("valid", checkValid()));
+emit("valid", false);
 
 const handleRemove = (index: number) => {
-  const selectedContact = formData.location.contacts[index].firstName.length !== 0
-    ? `${formData.location.contacts[index].firstName} ${formData.location.contacts[index].lastName}`
-    : 'Contact #' + index;
+  const selectedContact =
+    formData.location.contacts[index].firstName.length !== 0
+      ? `${formData.location.contacts[index].firstName} ${formData.location.contacts[index].lastName}`
+      : "Contact #" + index;
   bus.emit({
     message: selectedContact,
-    kind: 'Contact deleted',
-    toastTitle: 'The additional contact was deleted',
+    kind: "Contact deleted",
+    toastTitle: "The additional contact was deleted",
     handler: removeContact(index),
-    active: true
-  })
-}
+    active: true,
+  });
+};
 
-onMounted(() => setFocusedComponent('addressname_0',800))
+onMounted(() => setFocusedComponent("addressname_0", 800));
 
 defineExpose({
-  addContact
-})
+  addContact,
+});
 </script>
 
 <template>
diff --git a/frontend/src/pages/applyform/ReviewWizardStep.vue b/frontend/src/pages/bceidform/ReviewWizardStep.vue
similarity index 79%
rename from frontend/src/pages/applyform/ReviewWizardStep.vue
rename to frontend/src/pages/bceidform/ReviewWizardStep.vue
index b1139406fb..6421a38303 100644
--- a/frontend/src/pages/applyform/ReviewWizardStep.vue
+++ b/frontend/src/pages/bceidform/ReviewWizardStep.vue
@@ -1,44 +1,44 @@
 <script setup lang="ts">
-import { watch, ref, onMounted } from 'vue'
+import { watch, ref, onMounted } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/button/index';
+import "@carbon/web-components/es/components/button/index";
 // Composables
-import { useEventBus } from '@vueuse/core'
+import { useEventBus } from "@vueuse/core";
 // Types
-import type { FormDataDto } from '@/dto/ApplyClientNumberDto'
+import type { FormDataDto } from "@/dto/ApplyClientNumberDto";
 // @ts-ignore
-import Edit16 from '@carbon/icons-vue/es/edit/16'
+import Edit16 from "@carbon/icons-vue/es/edit/16";
 
 //Defining the props and emiter to reveice the data and emit an update
 const props = defineProps<{
-  data: FormDataDto
-  active: boolean
-  goToStep: Function
-}>()
+  data: FormDataDto;
+  active: boolean;
+  goToStep: Function;
+}>();
 
 const emit = defineEmits<{
-  (e: 'update:data', value: FormDataDto): void
-  (e: 'valid', value: boolean): void
-}>()
+  (e: "update:data", value: FormDataDto): void;
+  (e: "valid", value: boolean): void;
+}>();
 
-const revalidateBus = useEventBus<void>('revalidate-bus')
+const revalidateBus = useEventBus<void>("revalidate-bus");
 
 //Set the prop as a ref, and then emit when it changes
-const formData = ref<FormDataDto>(props.data)
-watch([formData], () => emit('update:data', formData.value))
+const formData = ref<FormDataDto>(props.data);
+watch([formData], () => emit("update:data", formData.value));
 
 //So far, hardcoded the value but should be coming from somewhere else
 const companyBusinessTypes: Record<string, string> = {
-  R: 'B.C. Registered Business - Corporation',
-  U: 'Sole Proprietorship'
-}
+  R: "B.C. Registered Business - Corporation",
+  U: "Sole Proprietorship",
+};
 
 //We emit valid here because there is nothing else to be done here apart from showing information
-emit('valid', true)
+emit("valid", true);
 
 onMounted(() => {
-  revalidateBus.emit()
-  })
+  revalidateBus.emit();
+});
 </script>
 
 <template>

From c6747a748c5195274eb2eab9507da2835055d160 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 26 Sep 2023 12:08:10 -0300
Subject: [PATCH 196/313] feat: adjust margins

---
 frontend/src/assets/styles/global.scss | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index d70d6d4a2f..dc3aeba341 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -757,7 +757,7 @@ cds-modal {
   }
 
   .screen {
-    margin: 1.5rem 1rem 1rem 1rem;
+    margin: 1.5rem 1rem 2.5rem 1rem;
     flex-direction: column;
     align-items: center;
   }
@@ -811,7 +811,7 @@ cds-modal {
   /* Lower range width is still a mess */
 
   .screen {
-    margin: 2rem 2rem 0 2rem;
+    margin: 2.5rem 2rem;
     align-items: center;
   }
 
@@ -828,7 +828,7 @@ cds-modal {
 /* Large (from 1056px to 1311px) */
 @media screen and (min-width: 1056px) and (max-width: 1311px) {
   .screen {
-    margin: 2rem 2rem 0 2rem;
+    margin: 2.5rem 2rem;
     align-items: center;
   }
   .grouping-02, .grouping-03 {
@@ -839,7 +839,7 @@ cds-modal {
 /* X-Large (from 1312px to 1583px) */
 @media screen and (min-width: 1312px) and (max-width: 1583px) {
   .screen {
-    margin: 2rem 2rem 0 2rem;
+    margin: 2.5rem 2rem;
     align-items: center;
   }
   .grouping-02, .grouping-03 {
@@ -849,6 +849,10 @@ cds-modal {
 
 /* XX-Large (from 1584px to 1783px) */
 @media screen and (min-width: 1584px) and (max-width: 1783px) {
+  .screen {
+    margin: 2.5rem 2rem;
+    align-items: center;
+  }
   .grouping-02, .grouping-03 {
     width: 50.4375rem;
   }
@@ -857,11 +861,10 @@ cds-modal {
 /* XXX-Large (1784px and above) */
 @media screen and (min-width: 1784px) {
   .screen {
-    margin: 2rem 7.75rem 0 2rem;
+    margin: 2.5rem 7.75rem;
     align-items: center;
   }
   .grouping-02, .grouping-03 {
     width: 50.4375rem;
   }
 }
-

From 859719f9b3bb417ad793950ef9bf1eebde8ea39b Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulushc@gmail.com>
Date: Tue, 26 Sep 2023 08:16:20 -0700
Subject: [PATCH 197/313] fix(FSADT1-884): removing navigation link

---
 frontend/src/pages/FormBCeIDPage.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 3e74e1018b..0aae9bfb8f 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -350,8 +350,7 @@ const isSmallScreen = useMediaQuery("(max-width: 671px)");
           :label="item.title"
           :secondary-label="item.subtitle"
           :state="item.kind"
-          :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"
-          v-on:click="goToStep(item.step)"
+          :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"          
           :disabled="item.disabled"
           v-shadow="3"
           />

From 799ac4aa0d2ac0b9c270fe70885aecf7e101a4e9 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 26 Sep 2023 11:50:53 -0700
Subject: [PATCH 198/313] Made code reviews

---
 .../grouping/ContactGroupComponent.vue        |  95 ++++++++--------
 .../ErrorNotificationGroupingComponent.vue    | 101 +++++++++++-------
 2 files changed, 111 insertions(+), 85 deletions(-)

diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index fa7ac50c80..5e628c4780 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -1,106 +1,103 @@
 <script setup lang="ts">
-import { reactive, watch, ref, onMounted } from 'vue'
+import { reactive, watch, ref, onMounted } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/button/index';
+import "@carbon/web-components/es/components/button/index";
 // Importing composables
-import { useFocus } from '@/composables/useFocus'
+import { useFocus } from "@/composables/useFocus";
 // Importing types
-import type { CodeDescrType, CodeNameType } from '@/dto/CommonTypesDto'
-import type { Contact } from '@/dto/ApplyClientNumberDto'
+import type { CodeDescrType, CodeNameType } from "@/dto/CommonTypesDto";
+import type { Contact } from "@/dto/ApplyClientNumberDto";
 // Importing validatons
-import { getValidations } from '@/helpers/validators/GlobalValidators'
-import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
+import { getValidations } from "@/helpers/validators/GlobalValidators";
+import { submissionValidation } from "@/helpers/validators/SubmissionValidators";
 // @ts-ignore
-import Delete16 from '@carbon/icons-vue/es/trash-can/16'
+import Delete16 from "@carbon/icons-vue/es/trash-can/16";
 
 //Define the input properties for this component
 const props = defineProps<{
-  id: number
-  modelValue: Contact
-  enabled?: boolean
-  roleList: Array<CodeNameType>
-  addressList: Array<CodeNameType>
-  validations: Array<Function>
-  revalidate?: boolean
-}>()
+  id: number;
+  modelValue: Contact;
+  enabled?: boolean;
+  roleList: Array<CodeNameType>;
+  addressList: Array<CodeNameType>;
+  validations: Array<Function>;
+  revalidate?: boolean;
+}>();
 
 //Events we emit during component lifecycle
 const emit = defineEmits<{
-  (e: 'valid', value: boolean): void
-  (e: 'update:model-value', value: Contact | undefined): void
-  (e: 'remove', value: number): void
-}>()
+  (e: "valid", value: boolean): void;
+  (e: "update:model-value", value: Contact | undefined): void;
+  (e: "remove", value: number): void;
+}>();
 
 const { setFocusedComponent } = useFocus();
-const noValidation = (value: string) => ''
+const noValidation = (value: string) => "";
 
 //We set it as a separated ref due to props not being updatable
-const selectedValue = reactive<Contact>(props.modelValue)
+const selectedValue = reactive<Contact>(props.modelValue);
 const validateData =
   props.validations.length === 0
     ? noValidation
-    : props.validations[0]('Name', props.id + '')
-const error = ref<string | undefined>('')
+    : props.validations[0]("Name", props.id + "");
+const error = ref<string | undefined>("");
 
 const uniquenessValidation = () => {
   error.value = validateData(
     `${selectedValue.firstName} ${selectedValue.lastName}`
-  )
-
-}
+  );
+};
 
 //Watch for changes on the input
 watch([selectedValue], () => {
-  uniquenessValidation()
-  emit('update:model-value', selectedValue)
-})
+  uniquenessValidation();
+  emit("update:model-value", selectedValue);
+});
 
 watch(
   () => props.revalidate,
   () => uniquenessValidation(),
   { immediate: true }
-)
+);
 
 //Validations
-const validation = reactive<Record<string, boolean>>({})
+const validation = reactive<Record<string, boolean>>({});
 
 const checkValid = () =>
   Object.values(validation).reduce(
     (accumulator: boolean, currentValue: boolean) =>
       accumulator && currentValue,
     true
-  )
+  );
 
-watch([validation], () => emit('valid', checkValid()))
-emit('valid', false)
+watch([validation], () => emit("valid", checkValid()));
+emit("valid", false);
 
 //Data conversion
 
 const nameTypeToCodeDescr = (
   value: CodeNameType | undefined
 ): CodeDescrType => {
-  if (value) return { value: value.code, text: value.name }
-  return { value: '', text: '' }
-}
+  if (value) return { value: value.code, text: value.name };
+  return { value: "", text: "" };
+};
 
 const nameTypesToCodeDescr = (
   values: CodeNameType[] | undefined
 ): CodeDescrType[] => {
-  if (values) return values.map(nameTypeToCodeDescr)
-  return []
-}
+  if (values) return values.map(nameTypeToCodeDescr);
+  return [];
+};
 
-onMounted(() =>{
-  setFocusedComponent(`address_${props.id}`,800)
-})
+onMounted(() => {
+  setFocusedComponent(`address_${props.id}`, 800);
+});
 
-const updateContactType = (
-  value: CodeNameType | undefined,
-) => {
+const updateContactType = (value: CodeNameType | undefined) => {
   if (value) {
-    selectedValue.contactType = { value: value.code, text: value.name }
+    selectedValue.contactType = { value: value.code, text: value.name };
   }
-}
+};
 </script>
 
 <template>
diff --git a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
index 6765f0add1..15c18e6dfb 100644
--- a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
+++ b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
@@ -1,87 +1,116 @@
 <script setup lang="ts">
-import { computed, reactive, ref, watch } from 'vue'
+import { computed, reactive, ref, watch } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/notification/index';
+import "@carbon/web-components/es/components/notification/index";
 // Composables
 import { useEventBus } from "@vueuse/core";
 // Types
-import type { ValidationMessageType, ProgressNotification } from '@/dto/CommonTypesDto'
-import type { Address, FormDataDto } from '@/dto/ApplyClientNumberDto';
+import type {
+  ValidationMessageType,
+  ProgressNotification,
+} from "@/dto/CommonTypesDto";
+import type { Address, FormDataDto } from "@/dto/ApplyClientNumberDto";
 
 const props = defineProps<{
-  formData: FormDataDto
-  scrollToNewContact: () => void
-}>()
+  formData: FormDataDto;
+  scrollToNewContact: () => void;
+}>();
 
-const nonAssociatedAddressList = reactive<string[]>([])
+const nonAssociatedAddressList = reactive<string[]>([]);
 
 const locations = computed(() =>
-  props.formData.location.addresses.map((address: Address) => address.locationName)
+  props.formData.location.addresses.map(
+    (address: Address) => address.locationName
+  )
 );
 
 watch(locations, (locations) => {
   // Iterates backwards to prevent issues after removing an item from the list
   for (let index = nonAssociatedAddressList.length - 1; index >= 0; index--) {
     const addressName = nonAssociatedAddressList[index];
-    if (!locations.includes(addressName)) { // The address does not exist anymore
+    if (!locations.includes(addressName)) {
+      // The address does not exist anymore
       // Remove it from the error list
-      nonAssociatedAddressList.splice(index, 1)
+      nonAssociatedAddressList.splice(index, 1);
     }
   }
-})
+});
 
 // Define the bus to receive the global error messages and one to send the progress indicator messages
-const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
-const progressIndicatorBus = useEventBus<ProgressNotification>('progress-indicator-bus')
-const errorBus = useEventBus<ValidationMessageType[]>('submission-error-notification')
+const notificationBus = useEventBus<ValidationMessageType | undefined>(
+  "error-notification"
+);
+const progressIndicatorBus = useEventBus<ProgressNotification>(
+  "progress-indicator-bus"
+);
+const errorBus = useEventBus<ValidationMessageType[]>(
+  "submission-error-notification"
+);
 
 // Define the global error message
-const globalErrorMessage = ref<ValidationMessageType|undefined>(undefined);
+const globalErrorMessage = ref<ValidationMessageType | undefined>(undefined);
 
 // Handle the global error message, including filtering unsatisfactory messages
-const handleErrorMessage = (event: ValidationMessageType|undefined, payload?:any) => {  
-  
+const handleErrorMessage = (
+  event: ValidationMessageType | undefined,
+  payload?: any
+) => {
   // Handling incorrect client type selection
-  if(event && event.fieldId === 'businessInformation.clientType'){
+  if (event && event.fieldId === "businessInformation.clientType") {
     // Show as inline notification
-    globalErrorMessage.value = {fieldId: 'server.validation.error', errorMsg: 'Individuals cannot be selected. Please select a different client.'};
+    globalErrorMessage.value = {
+      fieldId: "server.validation.error",
+      errorMsg:
+        "Individuals cannot be selected. Please select a different client.",
+    };
     // Emit back to the form so it can be displayed as a field error
-    errorBus.emit([{fieldId: 'businessInformation.businessName', errorMsg: 'Individuals cannot be selected. Please select a different client.'}]);
+    errorBus.emit([
+      {
+        fieldId: "businessInformation.businessName",
+        errorMsg:
+          "Individuals cannot be selected. Please select a different client.",
+      },
+    ]);
     // Make step 1 with error
-    progressIndicatorBus.emit({ kind: 'error', value: [0]})
+    progressIndicatorBus.emit({ kind: "error", value: [0] });
 
     // Handling address without association
-  } else if(event && event.fieldId.startsWith('location.addresses[') && event.fieldId.endsWith('].locationName')){
-    if(payload){
-      if(event.errorMsg){ // The address is missing association
-        const foundIndex = nonAssociatedAddressList.indexOf(payload)
+  } else if (
+    event &&
+    event.fieldId.startsWith("location.addresses[") &&
+    event.fieldId.endsWith("].locationName")
+  ) {
+    if (payload) {
+      if (event.errorMsg) {
+        // The address is missing association
+        const foundIndex = nonAssociatedAddressList.indexOf(payload);
         if (foundIndex === -1) {
           // Add it to the error list
-          nonAssociatedAddressList.push(payload)
+          nonAssociatedAddressList.push(payload);
         }
-      } else { // The address is properly associated
-        const foundIndex = nonAssociatedAddressList.indexOf(payload)
+      } else {
+        // The address is properly associated
+        const foundIndex = nonAssociatedAddressList.indexOf(payload);
         if (foundIndex >= 0) {
           // Remove it from the error list
-          nonAssociatedAddressList.splice(foundIndex, 1)
+          nonAssociatedAddressList.splice(foundIndex, 1);
         }
       }
     }
   } else {
     globalErrorMessage.value = event;
   }
-}
-
+};
 
 // Watch for changes in the global error message bus
 notificationBus.on(handleErrorMessage);
 
 // Send a message to the progress indicator bus to navigate to a step
 const goToStep = (step: number) => {
-  progressIndicatorBus.emit({ kind: 'navigate', value: step})
-}
-
+  progressIndicatorBus.emit({ kind: "navigate", value: step });
+};
 </script>
+
 <template>
   <div class="top-notification" v-if="globalErrorMessage?.fieldId || nonAssociatedAddressList.length > 0">
 
@@ -152,4 +181,4 @@ const goToStep = (step: number) => {
     </p>
   </cds-inline-notification>
   </div>
-</template>
\ No newline at end of file
+</template>

From 4906cdbde3152d7b60b204981d434bb94a541e11 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 26 Sep 2023 12:31:51 -0300
Subject: [PATCH 199/313] fix: header height

---
 frontend/src/assets/styles/global.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index dc3aeba341..7fb2082c26 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -262,7 +262,6 @@ div#app {
   display: flex;
   padding: 0.25rem 2rem;
   align-items: center;
-  flex: 1 0 0;
   align-self: stretch;
   gap: 1.5rem;
   background: var(--light-theme-background-background-brand, #0073e6);

From dba7b802e5d785feb7bac6068642f859f70d11dc Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 26 Sep 2023 16:01:16 -0300
Subject: [PATCH 200/313] chore: replace mock e-mail from .local to .com

---
 frontend/stub/mappings/fam.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/stub/mappings/fam.json b/frontend/stub/mappings/fam.json
index 8b7aea997c..bce7fff74e 100644
--- a/frontend/stub/mappings/fam.json
+++ b/frontend/stub/mappings/fam.json
@@ -7,17 +7,17 @@
         "method": "GET",
         "queryParameters": {
           "code": {
-              "equalTo": "idir"
+            "equalTo": "idir"
           }
-      }
+        }
       },
       "response": {
         "status": 302,
         "transformers": ["response-template"],
-        "headers":{
+        "headers": {
           "Location": "http://{{request.host}}:3000/dashboard",
           "Set-Cookie": [
-            "idToken=eyJhbGciOiJIUzI1NiJ9.eyJjdXN0b206aWRwX3VzZXJfaWQiOiJ1YXR0ZXN0IiwiY3VzdG9tOmlkcF9uYW1lIjoiaWRpciIsImN1c3RvbTppZHBfZGlzcGxheV9uYW1lIjoiVGVzdCwgVUFUIFdMUlM6RVgiLCJnaXZlbl9uYW1lIjoiVWF0IiwiZmFtaWx5X25hbWUiOiJUZXN0IiwiZW1haWwiOiJ1YXR0ZXN0QHRlc3QubG9jYWwiLCJpZHBfYnVzaW5lc3NfbmFtZSI6IkF1dG9tYXRlZCBUZXN0In0.yqveACSQ0YoIg5tKWK6MGKmP6ixmVZjn9OGnuDxw1ms; sameSite=Lax; path=/; Expires={{now offset='10 years' format='EEE, d MMM yyyy HH:mm:ss'}} GMT; domain={{request.host}}"
+            "idToken=eyJhbGciOiJIUzI1NiJ9.eyJjdXN0b206aWRwX3VzZXJfaWQiOiJ1YXR0ZXN0IiwiY3VzdG9tOmlkcF9uYW1lIjoiaWRpciIsImN1c3RvbTppZHBfZGlzcGxheV9uYW1lIjoiVGVzdCwgVUFUIFdMUlM6RVgiLCJnaXZlbl9uYW1lIjoiVWF0IiwiZmFtaWx5X25hbWUiOiJUZXN0IiwiZW1haWwiOiJ1YXR0ZXN0QHRlc3QuY29tIiwiaWRwX2J1c2luZXNzX25hbWUiOiJBdXRvbWF0ZWQgVGVzdCJ9.lzTcimHRjALlD2sNDH8nPqMnAHvt2j_vt-l1IuLJYcE; sameSite=Lax; path=/; Expires={{now offset='10 years' format='EEE, d MMM yyyy HH:mm:ss'}} GMT; domain={{request.host}}"
           ]
         }
       }
@@ -29,17 +29,17 @@
         "method": "GET",
         "queryParameters": {
           "code": {
-              "equalTo": "bceidbusiness"
+            "equalTo": "bceidbusiness"
           }
-      }
+        }
       },
       "response": {
         "status": 302,
         "transformers": ["response-template"],
-        "headers":{
+        "headers": {
           "Location": "http://{{request.host}}:3000/dashboard",
           "Set-Cookie": [
-            "idToken=eyJhbGciOiJIUzI1NiJ9.eyJjdXN0b206aWRwX3VzZXJfaWQiOiJ1YXR0ZXN0IiwiY3VzdG9tOmlkcF9uYW1lIjoiYmNlaWRidXNpbmVzcyIsImN1c3RvbTppZHBfYnVzaW5lc3NfaWQiOiJhdXRvbWF0aW9uaW5jIiwiY3VzdG9tOmlkcF9kaXNwbGF5X25hbWUiOiJVYXQgVGVzdCIsImdpdmVuX25hbWUiOiJVYXQiLCJmYW1pbHlfbmFtZSI6IlRlc3QiLCJlbWFpbCI6InVhdHRlc3RAdGVzdC5sb2NhbCIsImlkcF9idXNpbmVzc19uYW1lIjoiQXV0b21hdGlvbiBJbmMifQ.CnK36PCPazelpAAPNrcswWsi7TZkyU92I0kjll3geF0; sameSite=Lax; path=/; Expires={{now offset='10 years' format='EEE, d MMM yyyy HH:mm:ss'}} GMT; domain={{request.host}}"
+            "idToken=eyJhbGciOiJIUzI1NiJ9.eyJjdXN0b206aWRwX3VzZXJfaWQiOiJ1YXR0ZXN0IiwiY3VzdG9tOmlkcF9uYW1lIjoiYmNlaWRidXNpbmVzcyIsImN1c3RvbTppZHBfYnVzaW5lc3NfaWQiOiJhdXRvbWF0aW9uaW5jIiwiY3VzdG9tOmlkcF9kaXNwbGF5X25hbWUiOiJVYXQgVGVzdCIsImdpdmVuX25hbWUiOiJVYXQiLCJmYW1pbHlfbmFtZSI6IlRlc3QiLCJlbWFpbCI6InVhdHRlc3RAdGVzdC5jb20iLCJpZHBfYnVzaW5lc3NfbmFtZSI6IkF1dG9tYXRpb24gSW5jIn0.mTpv2AM65mnCRtqh8-kADPpSD48WTuHQ3OodCXtEQWk; sameSite=Lax; path=/; Expires={{now offset='10 years' format='EEE, d MMM yyyy HH:mm:ss'}} GMT; domain={{request.host}}"
           ]
         }
       }
@@ -51,14 +51,14 @@
         "method": "GET",
         "queryParameters": {
           "code": {
-              "equalTo": "bcsc"
+            "equalTo": "bcsc"
           }
-      }
+        }
       },
       "response": {
         "status": 302,
         "transformers": ["response-template"],
-        "headers":{
+        "headers": {
           "Location": "http://{{request.host}}:3000/dashboard",
           "Set-Cookie": [
             "idToken=eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxMTJmNGY4Ny01NTk0LTRlMDAtYmY2NC00MzllMGEwZWYyMGYiLCJjdXN0b206Z2l2ZW5fbmFtZXMiOiJHSVZFTk9ORSBHSVZFTlRXTyIsImJpcnRoZGF0ZSI6IjE5ODYtMTEtMTIiLCJnZW5kZXIiOiJ1bmtub3duIiwiY3VzdG9tOmlkcF91c2VyX2lkIjoiTkE1VENQR01JR1VGVkNTUzZTQU8zVElEQk1BSFhMM0YiLCJjdXN0b206aWRwX2Rpc3BsYXlfbmFtZSI6IkdJVkVOT05FIFNVUk5BTUUiLCJlbWFpbCI6IkZBTTFAdGVzdC5jb20iLCJhZGRyZXNzIjp7ImZvcm1hdHRlZCI6IntcInN0cmVldF9hZGRyZXNzXCI6XCI0MDAwIFNFWU1PVVIgUExBQ0VcIixcImNvdW50cnlcIjpcIkNBXCIsXCJsb2NhbGl0eVwiOlwiVklDVE9SSUFcIixcInJlZ2lvblwiOlwiQkNcIixcInBvc3RhbF9jb2RlXCI6XCJWOFogMUM4XCJ9In0sImN1c3RvbTppZHBfbmFtZSI6ImNhLmJjLmdvdi5mbG5yLmZhbS5kZXYiLCJnaXZlbl9uYW1lIjoiR0lWRU5PTkUiLCJmYW1pbHlfbmFtZSI6IlNVUk5BTUUifQ.-HoDDRB3YYltXrd90x1x-pMeHGr9VechvcpAbDos23E; sameSite=Lax; path=/; Expires={{now offset='10 years' format='EEE, d MMM yyyy HH:mm:ss'}} GMT; domain={{request.host}}"
@@ -75,7 +75,7 @@
       "response": {
         "status": 302,
         "transformers": ["response-template"],
-        "headers":{
+        "headers": {
           "Location": "http://{{request.host}}:3000/",
           "Set-Cookie": [
             "idToken=; sameSite=Lax; path=/; Expires=Thu, 01 Jan 1970 00:00:00 GMT; domain={{request.host}}"
@@ -90,14 +90,14 @@
         "method": "GET",
         "queryParameters": {
           "code": {
-              "matches": "(.*)"
+            "matches": "(.*)"
           }
-      }
+        }
       },
       "response": {
         "status": 302,
         "transformers": ["response-template"],
-        "headers":{
+        "headers": {
           "Location": "http://{{request.host}}:3000/"
         }
       }

From aa07412ed2dda6b5186d175f136445bf96fd7668 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 26 Sep 2023 16:07:52 -0300
Subject: [PATCH 201/313] fix: do not pre-validate current step

---
 frontend/src/pages/FormBCeIDPage.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 0aae9bfb8f..a7031407a3 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -248,7 +248,6 @@ const onNext = () => {
       currentTab.value++;
       progressData[currentTab.value - 1].kind = "complete";
       progressData[currentTab.value].kind = "current";
-      setTimeout(revalidateBus.emit, 1000);
     }
     setScrollPoint("top");
   }

From 42896f417db0d343d5213e858c0fc2ca82aef812 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 26 Sep 2023 16:22:46 -0300
Subject: [PATCH 202/313] feat: replace margin with padding

---
 frontend/src/assets/styles/global.scss | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 7fb2082c26..258a026861 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -251,8 +251,6 @@ div#app {
   flex-grow: 1;
 }
 .screen {
-  margin: 3rem 2.5rem 2.5rem 2.5rem;
-  padding-bottom: 0px;
   display: flex;
   align-items: stretch;  
   background: var(--light-theme-background-background, #fff);
@@ -756,7 +754,7 @@ cds-modal {
   }
 
   .screen {
-    margin: 1.5rem 1rem 2.5rem 1rem;
+    padding: 1.5rem 1rem 2.5rem 1rem;
     flex-direction: column;
     align-items: center;
   }
@@ -810,7 +808,7 @@ cds-modal {
   /* Lower range width is still a mess */
 
   .screen {
-    margin: 2.5rem 2rem;
+    padding: 2.5rem 2rem;
     align-items: center;
   }
 
@@ -827,7 +825,7 @@ cds-modal {
 /* Large (from 1056px to 1311px) */
 @media screen and (min-width: 1056px) and (max-width: 1311px) {
   .screen {
-    margin: 2.5rem 2rem;
+    padding: 2.5rem 2rem;
     align-items: center;
   }
   .grouping-02, .grouping-03 {
@@ -838,7 +836,7 @@ cds-modal {
 /* X-Large (from 1312px to 1583px) */
 @media screen and (min-width: 1312px) and (max-width: 1583px) {
   .screen {
-    margin: 2.5rem 2rem;
+    padding: 2.5rem 2rem;
     align-items: center;
   }
   .grouping-02, .grouping-03 {
@@ -849,7 +847,7 @@ cds-modal {
 /* XX-Large (from 1584px to 1783px) */
 @media screen and (min-width: 1584px) and (max-width: 1783px) {
   .screen {
-    margin: 2.5rem 2rem;
+    padding: 2.5rem 2rem;
     align-items: center;
   }
   .grouping-02, .grouping-03 {
@@ -860,7 +858,7 @@ cds-modal {
 /* XXX-Large (1784px and above) */
 @media screen and (min-width: 1784px) {
   .screen {
-    margin: 2.5rem 7.75rem;
+    padding: 2.5rem 7.75rem;
     align-items: center;
   }
   .grouping-02, .grouping-03 {

From d206f6ded45845c98e9198b0f8eb846e62b693a1 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 26 Sep 2023 15:20:47 -0700
Subject: [PATCH 203/313] FSADT1-899: Removed unneeded validation

---
 ...egisteredBusinessInformationValidator.java |  7 ------
 .../ErrorNotificationGroupingComponent.vue    | 22 +------------------
 .../validators/BCeIDFormValidations.ts        |  6 -----
 .../BusinessInformationWizardStep.vue         |  1 +
 4 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/backend/src/main/java/ca/bc/gov/app/validator/client/RegisteredBusinessInformationValidator.java b/backend/src/main/java/ca/bc/gov/app/validator/client/RegisteredBusinessInformationValidator.java
index 6dec9b349f..3ea571ad60 100644
--- a/backend/src/main/java/ca/bc/gov/app/validator/client/RegisteredBusinessInformationValidator.java
+++ b/backend/src/main/java/ca/bc/gov/app/validator/client/RegisteredBusinessInformationValidator.java
@@ -67,13 +67,6 @@ private void validateClientType(
       return;
     }
 
-    if (ClientTypeEnum.I.toString().equals(clientType)) {
-      errors.rejectValue(
-          clientTypeField,
-          String.format("%s value %s is not supported for registered businesses",
-              clientTypeField, clientType));
-    }
-
     if (legalType == null) {
       return;
     }
diff --git a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
index 15c18e6dfb..5cb2397886 100644
--- a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
+++ b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
@@ -55,27 +55,7 @@ const handleErrorMessage = (
   event: ValidationMessageType | undefined,
   payload?: any
 ) => {
-  // Handling incorrect client type selection
-  if (event && event.fieldId === "businessInformation.clientType") {
-    // Show as inline notification
-    globalErrorMessage.value = {
-      fieldId: "server.validation.error",
-      errorMsg:
-        "Individuals cannot be selected. Please select a different client.",
-    };
-    // Emit back to the form so it can be displayed as a field error
-    errorBus.emit([
-      {
-        fieldId: "businessInformation.businessName",
-        errorMsg:
-          "Individuals cannot be selected. Please select a different client.",
-      },
-    ]);
-    // Make step 1 with error
-    progressIndicatorBus.emit({ kind: "error", value: [0] });
-
-    // Handling address without association
-  } else if (
+  if (
     event &&
     event.fieldId.startsWith("location.addresses[") &&
     event.fieldId.endsWith("].locationName")
diff --git a/frontend/src/helpers/validators/BCeIDFormValidations.ts b/frontend/src/helpers/validators/BCeIDFormValidations.ts
index 525a1a2c30..0d2cde984d 100644
--- a/frontend/src/helpers/validators/BCeIDFormValidations.ts
+++ b/frontend/src/helpers/validators/BCeIDFormValidations.ts
@@ -19,12 +19,6 @@ import {
 formFieldValidations["businessInformation.businessName"] = [
   isNotEmpty("Business Name cannot be empty"),
 ];
-formFieldValidations["businessInformation.clientType"] = [
-  isNot(
-    "I",
-    "Individuals cannot be selected. Please select a different client."
-  ),
-];
 
 // Step 2: Addresses
 formFieldValidations["location.addresses.*.locationName"] = [
diff --git a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
index c9828c6157..72762b6083 100644
--- a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
@@ -240,6 +240,7 @@ watch([selectedOption], () => {
       :loading="loading"
       @update:selected-value="autoCompleteResult = $event"
     />
+
     <cds-inline-loading status="active" v-if="showDetailsLoading">Loading client details...</cds-inline-loading>
     <div v-if="(showAutoCompleteInfo && selectedOption === ClientTypeEnum.R) || showGoodStandingError || showDuplicatedError">
       <cds-inline-notification

From a5bbd718a834d4f4eb6e16dd3e7ff6a3cadb81b7 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 27 Sep 2023 08:17:49 -0700
Subject: [PATCH 204/313] ci: updating trivy to fix issues

---
 .github/workflows/unit-tests.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index b9477ed342..caea7e445b 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -146,7 +146,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Run Trivy vulnerability scanner in repo mode
-        uses: aquasecurity/trivy-action@0.10.0
+        uses: aquasecurity/trivy-action@0.12.0
         with:
           scan-type: "fs"
           format: "sarif"

From bbac146909bfeb9b65917f887cc81436ee017efc Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 27 Sep 2023 09:25:46 -0700
Subject: [PATCH 205/313] no message

---
 .../helpers/validators/GlobalValidators.ts    | 57 ++++++-------------
 1 file changed, 17 insertions(+), 40 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 0f45e8c5bd..4a8fa14a45 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -310,40 +310,27 @@ export const runValidation = (
     : [key, "true"];
   // We then load the field value
   const fieldValue = getFieldValue(fieldKey, target);
-
-  // We define a function to evaluate the condition safely
-  const evaluateCondition = (condition: string, item: any): boolean => {
-    if (condition === "true") {
-      return true;
-    } else {
-      console.error("Unknown condition:", condition);
-      return false;
-    }
-  };
-
+  // We define a function that will run the validation if the condition is true
+  const buildEval = (condition: string) =>
+    condition === "true" ? "true" : `target.${condition}`;
   const executeValidation = (
     item: any,
     condition: string,
     fieldId: string = fieldKey
   ): string => {
-    try {
-      if (evaluateCondition(condition, item)) {
-        const validationResponse = validation(item);
-        if (notify) {
-          // Note: also notifies when valid - errorMsg will be empty.
-          notificationBus.emit({ fieldId, errorMsg: validationResponse }, item);
-        }
-        return validationResponse;
-      } else {
-        return "";
+    // eslint-disable-next-line no-eval
+    if (eval(condition)) {
+      const validationResponse = validation(item);
+      if (notify) {
+        // Note: also notifies when valid - errorMsg will be empty.
+        notificationBus.emit({ fieldId, errorMsg: validationResponse }, item);
       }
-    } catch (error) {
-      console.error("Error executing validation:", error);
+      return validationResponse;
+    } else {
       return "";
     }
   };
-
-  // If the field value is an array, we run the validation for every item in the array
+  // If the field value is an array we run the validation for every item in the array
   if (Array.isArray(fieldValue)) {
     let hasInvalidItem = false;
     for (let index = 0; index < fieldValue.length; index++) {
@@ -356,7 +343,7 @@ export const runValidation = (
           const valid =
             executeValidation(
               subItem,
-              fieldCondition.replace(".*.", `[${index}].`),
+              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
               fieldKey.replace(".*.", `[${index}].`)
             ) === "";
           if (!valid) {
@@ -372,7 +359,7 @@ export const runValidation = (
       const valid =
         executeValidation(
           item,
-          fieldCondition.replace(".*.", `[${index}].`),
+          buildEval(fieldCondition.replace(".*.", `[${index}].`)),
           fieldKey.replace(".*.", `[${index}].`)
         ) === "";
       if (!valid) {
@@ -384,11 +371,10 @@ export const runValidation = (
     }
     return !hasInvalidItem;
   }
-  // If the field value is not an array, we run the validation for the field
+  // If the field value is not an array we run the validation for the field
   return executeValidation(fieldValue, fieldCondition) === "";
 };
 
-
 // This function will run the validators and return the errors
 export const validate = (
   keys: string[],
@@ -415,7 +401,8 @@ export const validate = (
         condition: string,
         fieldId: string = fieldKey
       ): string => {
-        if (evaluateCondition(condition, item)) {
+        // eslint-disable-next-line no-eval
+        if (eval(condition)) {
           const validationResponse = validation(item);
           if (notify && validationResponse) {
             errorBus.emit([{ fieldId, errorMsg: validationResponse }]);
@@ -425,16 +412,6 @@ export const validate = (
           return "";
         }
       };
-
-      const evaluateCondition = (condition: string, item: any): boolean => {
-        if (condition === "true") {
-          return true;
-        } else {
-          console.error("Unknown condition:", condition);
-          return false;
-        }
-      };
-
       // If the field value is an array we run the validation for every item in the array
       if (Array.isArray(fieldValue)) {
         return fieldValue.every((item: any, index: number) => {

From 78b1cd945e8f9814c6b14b81d16ab2a43bc5a321 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 27 Sep 2023 09:34:49 -0700
Subject: [PATCH 206/313] no message

---
 .../helpers/validators/GlobalValidators.ts    | 136 +++++++++---------
 1 file changed, 68 insertions(+), 68 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 4a8fa14a45..6d2079d2bc 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -296,6 +296,74 @@ export const formFieldValidations: Record<
 export const getValidations = (key: string): ((value: string) => string)[] =>
   formFieldValidations[key] || [];
 
+// This function will run the validators and return the errors
+export const validate = (
+  keys: string[],
+  target: any,
+  notify: boolean = false
+): boolean => {
+  // For every received key we get the validations and run them
+  return keys.every((key) => {
+    // First we get all validators for that field
+    const validations: ((value: string) => string)[] = getValidations(key);
+    // We split the field key and the condition if it has one
+    const [fieldKey, fieldCondition] = key.includes("(")
+      ? key.replace(")", "").split("(")
+      : [key, "true"];
+    // For every validator we run it and check if the result is empty
+    return validations.every((validation: (value: string) => string) => {
+      // We then load the field value
+      const fieldValue = getFieldValue(fieldKey, target);
+      // We define a function that will run the validation if the condition is true
+      const buildEval = (condition: string) =>
+        condition === "true" ? "true" : `target.${condition}`;
+      const runValidation = (
+        item: any,
+        condition: string,
+        fieldId: string = fieldKey
+      ): string => {
+        // eslint-disable-next-line no-eval
+        if (eval(condition)) {
+          const validationResponse = validation(item);
+          if (notify && validationResponse) {
+            errorBus.emit([{ fieldId, errorMsg: validationResponse }]);
+          }
+          return validationResponse;
+        } else {
+          return "";
+        }
+      };
+      // If the field value is an array we run the validation for every item in the array
+      if (Array.isArray(fieldValue)) {
+        return fieldValue.every((item: any, index: number) => {
+          // And sometimes we can end up with another array inside, that's life
+          if (Array.isArray(item)) {
+            if (item.length === 0) item.push("");
+            return item.every(
+              (subItem: any) =>
+                runValidation(
+                  subItem,
+                  buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+                  fieldKey.replace(".*.", `[${index}].`)
+                ) === ""
+            );
+          }
+          // If it is not an array here, just validate it
+          return (
+            runValidation(
+              item,
+              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+              fieldKey.replace(".*.", `[${index}].`)
+            ) === ""
+          );
+        });
+      }
+      // If the field value is not an array we run the validation for the field
+      return runValidation(fieldValue, fieldCondition) === "";
+    });
+  });
+};
+
 // This function will run the validators and return the errors
 export const runValidation = (
   key: string,
@@ -374,71 +442,3 @@ export const runValidation = (
   // If the field value is not an array we run the validation for the field
   return executeValidation(fieldValue, fieldCondition) === "";
 };
-
-// This function will run the validators and return the errors
-export const validate = (
-  keys: string[],
-  target: any,
-  notify: boolean = false
-): boolean => {
-  // For every received key we get the validations and run them
-  return keys.every((key) => {
-    // First we get all validators for that field
-    const validations: ((value: string) => string)[] = getValidations(key);
-    // We split the field key and the condition if it has one
-    const [fieldKey, fieldCondition] = key.includes("(")
-      ? key.replace(")", "").split("(")
-      : [key, "true"];
-    // For every validator we run it and check if the result is empty
-    return validations.every((validation: (value: string) => string) => {
-      // We then load the field value
-      const fieldValue = getFieldValue(fieldKey, target);
-      // We define a function that will run the validation if the condition is true
-      const buildEval = (condition: string) =>
-        condition === "true" ? "true" : `target.${condition}`;
-      const runValidation = (
-        item: any,
-        condition: string,
-        fieldId: string = fieldKey
-      ): string => {
-        // eslint-disable-next-line no-eval
-        if (eval(condition)) {
-          const validationResponse = validation(item);
-          if (notify && validationResponse) {
-            errorBus.emit([{ fieldId, errorMsg: validationResponse }]);
-          }
-          return validationResponse;
-        } else {
-          return "";
-        }
-      };
-      // If the field value is an array we run the validation for every item in the array
-      if (Array.isArray(fieldValue)) {
-        return fieldValue.every((item: any, index: number) => {
-          // And sometimes we can end up with another array inside, that's life
-          if (Array.isArray(item)) {
-            if (item.length === 0) item.push("");
-            return item.every(
-              (subItem: any) =>
-                runValidation(
-                  subItem,
-                  buildEval(fieldCondition.replace(".*.", `[${index}].`)),
-                  fieldKey.replace(".*.", `[${index}].`)
-                ) === ""
-            );
-          }
-          // If it is not an array here, just validate it
-          return (
-            runValidation(
-              item,
-              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
-              fieldKey.replace(".*.", `[${index}].`)
-            ) === ""
-          );
-        });
-      }
-      // If the field value is not an array we run the validation for the field
-      return runValidation(fieldValue, fieldCondition) === "";
-    });
-  });
-};

From e6061ce45fbbdc10ef8f182ac583531c0ad49c7e Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 27 Sep 2023 10:44:16 -0700
Subject: [PATCH 207/313] Tried to skip SonarCloud validation

---
 frontend/src/helpers/validators/GlobalValidators.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 6d2079d2bc..47226ccbd7 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -322,7 +322,7 @@ export const validate = (
         condition: string,
         fieldId: string = fieldKey
       ): string => {
-        // eslint-disable-next-line no-eval
+        // NOSONAR
         if (eval(condition)) {
           const validationResponse = validation(item);
           if (notify && validationResponse) {
@@ -386,7 +386,7 @@ export const runValidation = (
     condition: string,
     fieldId: string = fieldKey
   ): string => {
-    // eslint-disable-next-line no-eval
+    // NOSONAR
     if (eval(condition)) {
       const validationResponse = validation(item);
       if (notify) {

From ed6428565fe7d292b653b9921d5de67689f5e894 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 27 Sep 2023 10:50:49 -0700
Subject: [PATCH 208/313] Skipped SonarCloud validation

---
 frontend/src/helpers/validators/GlobalValidators.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 47226ccbd7..8f87e613a4 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -322,8 +322,7 @@ export const validate = (
         condition: string,
         fieldId: string = fieldKey
       ): string => {
-        // NOSONAR
-        if (eval(condition)) {
+        if (eval(condition)) { // NOSONAR
           const validationResponse = validation(item);
           if (notify && validationResponse) {
             errorBus.emit([{ fieldId, errorMsg: validationResponse }]);
@@ -386,8 +385,7 @@ export const runValidation = (
     condition: string,
     fieldId: string = fieldKey
   ): string => {
-    // NOSONAR
-    if (eval(condition)) {
+    if (eval(condition)) {// NOSONAR
       const validationResponse = validation(item);
       if (notify) {
         // Note: also notifies when valid - errorMsg will be empty.

From 75ddd3647719db9e2b43ffdf286552e4af431044 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 27 Sep 2023 10:58:45 -0700
Subject: [PATCH 209/313] chore: adding us address stub data

---
 .../stub/__files/response-address-21127.json  |  1 +
 .../stub/__files/response-address-30349.json  |  1 +
 .../stub/__files/response-address-31030.json  |  1 +
 .../stub/__files/response-address-31868.json  |  1 +
 .../stub/__files/response-address-35896.json  |  1 +
 .../stub/__files/response-address-44201.json  |  1 +
 .../stub/__files/response-address-47737.json  |  1 +
 .../stub/__files/response-address-59690.json  |  1 +
 .../stub/__files/response-address-62308.json  |  1 +
 .../stub/__files/response-address-63184.json  |  1 +
 .../stub/__files/response-address-63235.json  |  1 +
 .../stub/__files/response-address-68146.json  |  1 +
 .../stub/__files/response-address-69477.json  |  1 +
 .../stub/__files/response-address-71003.json  |  1 +
 .../stub/__files/response-address-71609.json  |  1 +
 .../stub/__files/response-address-78226.json  |  1 +
 .../stub/__files/response-address-79419.json  |  1 +
 .../stub/__files/response-address-85187.json  |  1 +
 .../stub/__files/response-address-86032.json  |  1 +
 .../stub/__files/response-address-93389.json  |  1 +
 ...h.json => response-address-search-CA.json} |  0
 .../__files/response-address-search-US.json   | 82 +++++++++++++++++++
 frontend/stub/mappings/backend.json           | 26 +++++-
 23 files changed, 126 insertions(+), 2 deletions(-)
 create mode 100644 frontend/stub/__files/response-address-21127.json
 create mode 100644 frontend/stub/__files/response-address-30349.json
 create mode 100644 frontend/stub/__files/response-address-31030.json
 create mode 100644 frontend/stub/__files/response-address-31868.json
 create mode 100644 frontend/stub/__files/response-address-35896.json
 create mode 100644 frontend/stub/__files/response-address-44201.json
 create mode 100644 frontend/stub/__files/response-address-47737.json
 create mode 100644 frontend/stub/__files/response-address-59690.json
 create mode 100644 frontend/stub/__files/response-address-62308.json
 create mode 100644 frontend/stub/__files/response-address-63184.json
 create mode 100644 frontend/stub/__files/response-address-63235.json
 create mode 100644 frontend/stub/__files/response-address-68146.json
 create mode 100644 frontend/stub/__files/response-address-69477.json
 create mode 100644 frontend/stub/__files/response-address-71003.json
 create mode 100644 frontend/stub/__files/response-address-71609.json
 create mode 100644 frontend/stub/__files/response-address-78226.json
 create mode 100644 frontend/stub/__files/response-address-79419.json
 create mode 100644 frontend/stub/__files/response-address-85187.json
 create mode 100644 frontend/stub/__files/response-address-86032.json
 create mode 100644 frontend/stub/__files/response-address-93389.json
 rename frontend/stub/__files/{response-address-search.json => response-address-search-CA.json} (100%)
 create mode 100644 frontend/stub/__files/response-address-search-US.json

diff --git a/frontend/stub/__files/response-address-21127.json b/frontend/stub/__files/response-address-21127.json
new file mode 100644
index 0000000000..19b30dd6f4
--- /dev/null
+++ b/frontend/stub/__files/response-address-21127.json
@@ -0,0 +1 @@
+{"streetAddress":"795 Poplar Dr","country":{"value":"US","text":"United States of America"},"province":{"value":"MD","text":"Maryland"},"city":"San Diego","postalCode":"21127","index":10,"locationName":null}
diff --git a/frontend/stub/__files/response-address-30349.json b/frontend/stub/__files/response-address-30349.json
new file mode 100644
index 0000000000..4124692629
--- /dev/null
+++ b/frontend/stub/__files/response-address-30349.json
@@ -0,0 +1 @@
+{"streetAddress":"5616 Frances Ct","country":{"value":"US","text":"United States of America"},"province":{"value":"AK","text":"Alaska"},"city":"Fargo","postalCode":"30349","index":8,"locationName":null}
diff --git a/frontend/stub/__files/response-address-31030.json b/frontend/stub/__files/response-address-31030.json
new file mode 100644
index 0000000000..6a7592d7f4
--- /dev/null
+++ b/frontend/stub/__files/response-address-31030.json
@@ -0,0 +1 @@
+{"streetAddress":"7161 Northaven Rd","country":{"value":"US","text":"United States of America"},"province":{"value":"IN","text":"Indiana"},"city":"Iowa Park","postalCode":"31030","index":14,"locationName":null}
diff --git a/frontend/stub/__files/response-address-31868.json b/frontend/stub/__files/response-address-31868.json
new file mode 100644
index 0000000000..6cb7bbe9c7
--- /dev/null
+++ b/frontend/stub/__files/response-address-31868.json
@@ -0,0 +1 @@
+{"streetAddress":"7095 Pockrus Page Rd","country":{"value":"US","text":"United States of America"},"province":{"value":"ID","text":"Idaho"},"city":"Dumas","postalCode":"31868","index":5,"locationName":null}
diff --git a/frontend/stub/__files/response-address-35896.json b/frontend/stub/__files/response-address-35896.json
new file mode 100644
index 0000000000..947b253770
--- /dev/null
+++ b/frontend/stub/__files/response-address-35896.json
@@ -0,0 +1 @@
+{"streetAddress":"6746 Robinson Rd","country":{"value":"US","text":"United States of America"},"province":{"value":"UT","text":"Utah"},"city":"Hartford","postalCode":"35896","index":11,"locationName":null}
diff --git a/frontend/stub/__files/response-address-44201.json b/frontend/stub/__files/response-address-44201.json
new file mode 100644
index 0000000000..39577a75ff
--- /dev/null
+++ b/frontend/stub/__files/response-address-44201.json
@@ -0,0 +1 @@
+{"streetAddress":"8167 Lovers Ln","country":{"value":"US","text":"United States of America"},"province":{"value":"OR","text":"Oregon"},"city":"Lakeland","postalCode":"44201","index":3,"locationName":null}
diff --git a/frontend/stub/__files/response-address-47737.json b/frontend/stub/__files/response-address-47737.json
new file mode 100644
index 0000000000..3e0d1d27b8
--- /dev/null
+++ b/frontend/stub/__files/response-address-47737.json
@@ -0,0 +1 @@
+{"streetAddress":"5964 N Stelling Rd","country":{"value":"US","text":"United States of America"},"province":{"value":"VT","text":"Vermont"},"city":"Las Cruces","postalCode":"47737","index":2,"locationName":null}
diff --git a/frontend/stub/__files/response-address-59690.json b/frontend/stub/__files/response-address-59690.json
new file mode 100644
index 0000000000..3e94d32161
--- /dev/null
+++ b/frontend/stub/__files/response-address-59690.json
@@ -0,0 +1 @@
+{"streetAddress":"1712 Fincher Rd","country":{"value":"US","text":"United States of America"},"province":{"value":"MT","text":"Montana"},"city":"Lewisville","postalCode":"59690","index":15,"locationName":null}
diff --git a/frontend/stub/__files/response-address-62308.json b/frontend/stub/__files/response-address-62308.json
new file mode 100644
index 0000000000..ed4a5fc72c
--- /dev/null
+++ b/frontend/stub/__files/response-address-62308.json
@@ -0,0 +1 @@
+{"streetAddress":"9471 Dane St","country":{"value":"US","text":"United States of America"},"province":{"value":"NM","text":"New Mexico"},"city":"Yakima","postalCode":"62308","index":13,"locationName":null}
diff --git a/frontend/stub/__files/response-address-63184.json b/frontend/stub/__files/response-address-63184.json
new file mode 100644
index 0000000000..26118edda9
--- /dev/null
+++ b/frontend/stub/__files/response-address-63184.json
@@ -0,0 +1 @@
+{"streetAddress":"8659 Cherry St","country":{"value":"US","text":"United States of America"},"province":{"value":"LA","text":"Louisiana"},"city":"Lubbock","postalCode":"63184","index":6,"locationName":null}
diff --git a/frontend/stub/__files/response-address-63235.json b/frontend/stub/__files/response-address-63235.json
new file mode 100644
index 0000000000..fde692cf96
--- /dev/null
+++ b/frontend/stub/__files/response-address-63235.json
@@ -0,0 +1 @@
+{"streetAddress":"4999 W Pecan St","country":{"value":"US","text":"United States of America"},"province":{"value":"HI","text":"Hawaii"},"city":"Topeka","postalCode":"63235","index":9,"locationName":null}
diff --git a/frontend/stub/__files/response-address-68146.json b/frontend/stub/__files/response-address-68146.json
new file mode 100644
index 0000000000..3852587a93
--- /dev/null
+++ b/frontend/stub/__files/response-address-68146.json
@@ -0,0 +1 @@
+{"streetAddress":"1249 W Sherman Dr","country":{"value":"US","text":"United States of America"},"province":{"value":"MA","text":"Massachusetts"},"city":"Reno","postalCode":"68146","index":18,"locationName":null}
diff --git a/frontend/stub/__files/response-address-69477.json b/frontend/stub/__files/response-address-69477.json
new file mode 100644
index 0000000000..d5b372b766
--- /dev/null
+++ b/frontend/stub/__files/response-address-69477.json
@@ -0,0 +1 @@
+{"streetAddress":"1631 Avondale Ave","country":{"value":"US","text":"United States of America"},"province":{"value":"MI","text":"Michigan"},"city":"Erie","postalCode":"69477","index":7,"locationName":null}
diff --git a/frontend/stub/__files/response-address-71003.json b/frontend/stub/__files/response-address-71003.json
new file mode 100644
index 0000000000..36abef744d
--- /dev/null
+++ b/frontend/stub/__files/response-address-71003.json
@@ -0,0 +1 @@
+{"streetAddress":"8523 Ranchview Dr","country":{"value":"US","text":"United States of America"},"province":{"value":"VT","text":"Vermont"},"city":"El Paso","postalCode":"71003","index":12,"locationName":null}
diff --git a/frontend/stub/__files/response-address-71609.json b/frontend/stub/__files/response-address-71609.json
new file mode 100644
index 0000000000..3bca13ec42
--- /dev/null
+++ b/frontend/stub/__files/response-address-71609.json
@@ -0,0 +1 @@
+{"streetAddress":"5469 Blossom Hill Rd","country":{"value":"US","text":"United States of America"},"province":{"value":"NJ","text":"New Jersey"},"city":"Provo","postalCode":"71609","index":0,"locationName":null}
diff --git a/frontend/stub/__files/response-address-78226.json b/frontend/stub/__files/response-address-78226.json
new file mode 100644
index 0000000000..903f841a91
--- /dev/null
+++ b/frontend/stub/__files/response-address-78226.json
@@ -0,0 +1 @@
+{"streetAddress":"852 Spring Hill Rd","country":{"value":"US","text":"United States of America"},"province":{"value":"MA","text":"Massachusetts"},"city":"Laredo","postalCode":"78226","index":1,"locationName":null}
diff --git a/frontend/stub/__files/response-address-79419.json b/frontend/stub/__files/response-address-79419.json
new file mode 100644
index 0000000000..b52b5f83da
--- /dev/null
+++ b/frontend/stub/__files/response-address-79419.json
@@ -0,0 +1 @@
+{"streetAddress":"3157 Nowlin Rd","country":{"value":"US","text":"United States of America"},"province":{"value":"NE","text":"Nebraska"},"city":"Anchorage","postalCode":"79419","index":16,"locationName":null}
diff --git a/frontend/stub/__files/response-address-85187.json b/frontend/stub/__files/response-address-85187.json
new file mode 100644
index 0000000000..d26dc79b61
--- /dev/null
+++ b/frontend/stub/__files/response-address-85187.json
@@ -0,0 +1 @@
+{"streetAddress":"3264 Dogwood Ave","country":{"value":"US","text":"United States of America"},"province":{"value":"NC","text":"North Carolina"},"city":"Jackson","postalCode":"85187","index":4,"locationName":null}
diff --git a/frontend/stub/__files/response-address-86032.json b/frontend/stub/__files/response-address-86032.json
new file mode 100644
index 0000000000..9c94d26127
--- /dev/null
+++ b/frontend/stub/__files/response-address-86032.json
@@ -0,0 +1 @@
+{"streetAddress":"6448 Elgin St","country":{"value":"US","text":"United States of America"},"province":{"value":"CO","text":"Colorado"},"city":"Hollywood","postalCode":"86032","index":17,"locationName":null}
diff --git a/frontend/stub/__files/response-address-93389.json b/frontend/stub/__files/response-address-93389.json
new file mode 100644
index 0000000000..f229537dcc
--- /dev/null
+++ b/frontend/stub/__files/response-address-93389.json
@@ -0,0 +1 @@
+{"streetAddress":"2550 E Center St","country":{"value":"US","text":"United States of America"},"province":{"value":"ND","text":"North Dakota"},"city":"Buffalo","postalCode":"93389","index":19,"locationName":null}
diff --git a/frontend/stub/__files/response-address-search.json b/frontend/stub/__files/response-address-search-CA.json
similarity index 100%
rename from frontend/stub/__files/response-address-search.json
rename to frontend/stub/__files/response-address-search-CA.json
diff --git a/frontend/stub/__files/response-address-search-US.json b/frontend/stub/__files/response-address-search-US.json
new file mode 100644
index 0000000000..be73edd6f3
--- /dev/null
+++ b/frontend/stub/__files/response-address-search-US.json
@@ -0,0 +1,82 @@
+[
+  {
+    "code": "71609",
+    "name": "5469 Blossom Hill Rd Provo, NJ, 71609"
+  },
+  {
+    "code": "78226",
+    "name": "852 Spring Hill Rd Laredo, MA, 78226"
+  },
+  {
+    "code": "47737",
+    "name": "5964 N Stelling Rd Las Cruces, VT, 47737"
+  },
+  {
+    "code": "44201",
+    "name": "8167 Lovers Ln Lakeland, OR, 44201"
+  },
+  {
+    "code": "85187",
+    "name": "3264 Dogwood Ave Jackson, NC, 85187"
+  },
+  {
+    "code": "31868",
+    "name": "7095 Pockrus Page Rd Dumas, ID, 31868"
+  },
+  {
+    "code": "63184",
+    "name": "8659 Cherry St Lubbock, LA, 63184"
+  },
+  {
+    "code": "69477",
+    "name": "1631 Avondale Ave Erie, MI, 69477"
+  },
+  {
+    "code": "30349",
+    "name": "5616 Frances Ct Fargo, AK, 30349"
+  },
+  {
+    "code": "63235",
+    "name": "4999 W Pecan St Topeka, HI, 63235"
+  },
+  {
+    "code": "21127",
+    "name": "795 Poplar Dr San Diego, MD, 21127"
+  },
+  {
+    "code": "35896",
+    "name": "6746 Robinson Rd Hartford, UT, 35896"
+  },
+  {
+    "code": "71003",
+    "name": "8523 Ranchview Dr El Paso, VT, 71003"
+  },
+  {
+    "code": "62308",
+    "name": "9471 Dane St Yakima, NM, 62308"
+  },
+  {
+    "code": "31030",
+    "name": "7161 Northaven Rd Iowa Park, IN, 31030"
+  },
+  {
+    "code": "59690",
+    "name": "1712 Fincher Rd Lewisville, MT, 59690"
+  },
+  {
+    "code": "79419",
+    "name": "3157 Nowlin Rd Anchorage, NE, 79419"
+  },
+  {
+    "code": "86032",
+    "name": "6448 Elgin St Hollywood, CO, 86032"
+  },
+  {
+    "code": "68146",
+    "name": "1249 W Sherman Dr Reno, MA, 68146"
+  },
+  {
+    "code": "93389",
+    "name": "2550 E Center St Buffalo, ND, 93389"
+  }
+]
\ No newline at end of file
diff --git a/frontend/stub/mappings/backend.json b/frontend/stub/mappings/backend.json
index d0680781ea..7c650621c9 100644
--- a/frontend/stub/mappings/backend.json
+++ b/frontend/stub/mappings/backend.json
@@ -154,7 +154,7 @@
     },
 
     {
-      "name":"Autocompete Canada Post",
+      "name":"Autocompete Canada Post Canada",
       "request": {
         "urlPath": "/api/clients/addresses",
         "method": "GET",
@@ -172,7 +172,29 @@
       },
       "response": {
         "status": 200,
-        "bodyFileName": "response-address-search.json"
+        "bodyFileName": "response-address-search-CA.json"
+      }
+    },
+    {
+      "name":"Autocompete Canada Post US",
+      "request": {
+        "urlPath": "/api/clients/addresses",
+        "method": "GET",
+        "queryParameters": {
+          "country": {
+            "equalTo": "US"
+          },
+          "maxSuggestions": {
+            "equalTo": "10"
+          },
+          "searchTerm": {
+            "matches": ".*"
+          }
+        }
+      },
+      "response": {
+        "status": 200,
+        "bodyFileName": "response-address-search-US.json"
       }
     },
     {

From 628a9bee92fd1c70dc3c176957badeabaea50ac2 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 27 Sep 2023 11:23:30 -0700
Subject: [PATCH 210/313] fix(FSADT1-884): fixing subtitle style

---
 frontend/src/assets/styles/global.scss | 4 ++++
 frontend/src/pages/FormBCeIDPage.vue   | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 258a026861..afba1a0ce4 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -194,6 +194,10 @@ hr {
   width:100%;
 }
 
+.text-disabled {
+  color:#939395;
+}
+
 div#app {
   height: 100vh;
   display: flex;
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index a7031407a3..68d2a6e2cb 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -352,7 +352,9 @@ const isSmallScreen = useMediaQuery("(max-width: 671px)");
           :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"          
           :disabled="item.disabled"
           v-shadow="3"
-          />
+          >
+          <span slot="secondary-label-text" class="cds--progress-optional" :class="{'text-disabled':item.disabled}">{{item.subtitle}}</span>
+          </cds-progress-step>
       </cds-progress-indicator>
       <error-notification-grouping-component
         :form-data="formData"

From 6b4ff8f47b355311d488f46ec7f5aa636f35c27d Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 27 Sep 2023 14:54:34 -0300
Subject: [PATCH 211/313] fix: autocomplete after changing country

---
 frontend/src/components/forms/AutoCompleteInputComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index be792ab516..b6f1104f92 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -53,7 +53,7 @@ let selectedValue: BusinessSearchResult | undefined = undefined
 
 //This function emits the events on update
 const emitValueChange = (newValue: string): void => {
-  selectedValue = props.contents.find((entry) => entry.code === newValue)
+  selectedValue = inputList.value.find((entry) => entry.code === newValue)
   emit('update:model-value', selectedValue?.name ?? newValue)
   emit('update:selected-value', selectedValue)
   emit('empty', isEmpty(selectedValue))

From 98bdf184fa6ef33e914a75127d455038d62370aa Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 27 Sep 2023 15:50:23 -0300
Subject: [PATCH 212/313] fix: fix subtitle style for vertical progress
 indicator

---
 frontend/src/assets/styles/global.scss | 8 ++++----
 frontend/src/pages/FormBCeIDPage.vue   | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index afba1a0ce4..485cec7172 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -133,6 +133,10 @@ cds-progress-step::part(cds--progress-label) {
   padding-right: 0.5rem;
 }
 
+cds-progress-step.step-inactive::part(cds--progress-optional) {
+  color:#939395;
+}
+
 cds-inline-notification::part(div),
 cds-inline-notification,
 .cds--inline-notification {
@@ -194,10 +198,6 @@ hr {
   width:100%;
 }
 
-.text-disabled {
-  color:#939395;
-}
-
 div#app {
   height: 100vh;
   display: flex;
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 68d2a6e2cb..db5924f85b 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -352,9 +352,7 @@ const isSmallScreen = useMediaQuery("(max-width: 671px)");
           :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"          
           :disabled="item.disabled"
           v-shadow="3"
-          >
-          <span slot="secondary-label-text" class="cds--progress-optional" :class="{'text-disabled':item.disabled}">{{item.subtitle}}</span>
-          </cds-progress-step>
+        />
       </cds-progress-indicator>
       <error-notification-grouping-component
         :form-data="formData"

From 10e9c7b6dba3a9a88f98482aead9afaf0c8178e2 Mon Sep 17 00:00:00 2001
From: Paulo Gomes da Cruz Junior <paulo.cruz@gov.bc.ca>
Date: Wed, 27 Sep 2023 12:20:09 -0700
Subject: [PATCH 213/313] fis(FSADT1-894): fixing style for inline and text

---
 frontend/src/pages/bceidform/AddressWizardStep.vue        | 8 +++++---
 .../src/pages/bceidform/BusinessInformationWizardStep.vue | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/frontend/src/pages/bceidform/AddressWizardStep.vue b/frontend/src/pages/bceidform/AddressWizardStep.vue
index b9ac5a0bf9..015eefb65c 100644
--- a/frontend/src/pages/bceidform/AddressWizardStep.vue
+++ b/frontend/src/pages/bceidform/AddressWizardStep.vue
@@ -148,9 +148,11 @@ onMounted(() => setFocusedComponent("addr_0", 800));
   </div>
 
 </div>
-<p class="body-01 heading-compact-01-dark">
-If you’d like to include another address, for example a seed orchard or if your street address is different from your mailing address, select the “Add another address” button below.
-</p>
+<div class="grouping-02">
+  <p class="body-01 heading-compact-01-dark">
+  If you’d like to include another address, for example a seed orchard or if your street address is different from your mailing address, select the “Add another address” button below.
+  </p>
+</div>
 <cds-button
     kind="tertiary"
     @click.prevent="addAddress"
diff --git a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
index 72762b6083..db33c16595 100644
--- a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
@@ -242,7 +242,9 @@ watch([selectedOption], () => {
     />
 
     <cds-inline-loading status="active" v-if="showDetailsLoading">Loading client details...</cds-inline-loading>
-    <div v-if="(showAutoCompleteInfo && selectedOption === ClientTypeEnum.R) || showGoodStandingError || showDuplicatedError">
+    <div
+      class="grouping-02"
+      v-if="(showAutoCompleteInfo && selectedOption === ClientTypeEnum.R) || showGoodStandingError || showDuplicatedError">
       <cds-inline-notification
         v-shadow="2"
         v-if="showAutoCompleteInfo && selectedOption === ClientTypeEnum.R"

From 4f3188bf74cbc85e7071199cb137624572fcab9a Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 27 Sep 2023 12:48:54 -0700
Subject: [PATCH 214/313] Made code reviews

---
 .../grouping/AddressGroupComponent.vue        | 226 +++++++++---------
 1 file changed, 117 insertions(+), 109 deletions(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index e73c9ca42d..7832919d4d 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -1,96 +1,95 @@
 <script setup lang="ts">
-import { reactive, watch, computed, ref, onMounted } from 'vue'
+import { reactive, watch, computed, ref, onMounted } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/button/index';
+import "@carbon/web-components/es/components/button/index";
 // Composables
-import { useEventBus } from '@vueuse/core'
-import { useFetchTo } from '@/composables/useFetch'
-import { useFocus } from '@/composables/useFocus'
+import { useEventBus } from "@vueuse/core";
+import { useFetchTo } from "@/composables/useFetch";
+import { useFocus } from "@/composables/useFocus";
 // Types
-import type { CodeNameType, BusinessSearchResult } from '@/dto/CommonTypesDto'
-import type { Address } from '@/dto/ApplyClientNumberDto'
+import type { CodeNameType, BusinessSearchResult } from "@/dto/CommonTypesDto";
+import type { Address } from "@/dto/ApplyClientNumberDto";
 // Validators
-import { getValidations } from '@/helpers/validators/GlobalValidators'
-import { submissionValidation } from '@/helpers/validators/SubmissionValidators'
+import { getValidations } from "@/helpers/validators/GlobalValidators";
+import { submissionValidation } from "@/helpers/validators/SubmissionValidators";
 // @ts-ignore
-import Delete16 from '@carbon/icons-vue/es/trash-can/16'
+import Delete16 from "@carbon/icons-vue/es/trash-can/16";
 
 //Define the input properties for this component
 const props = defineProps<{
-  id: number
-  modelValue: Address
-  countryList: Array<CodeNameType>
-  validations: Array<Function>
-  revalidate?: boolean
-}>()
+  id: number;
+  modelValue: Address;
+  countryList: Array<CodeNameType>;
+  validations: Array<Function>;
+  revalidate?: boolean;
+}>();
 
 //Events we emit during component lifecycle
 const emit = defineEmits<{
-  (e: 'valid', value: boolean): void
-  (e: 'update:model-value', value: Address | undefined): void
-  (e: 'remove', value: number): void
-}>()
+  (e: "valid", value: boolean): void;
+  (e: "update:model-value", value: Address | undefined): void;
+  (e: "remove", value: number): void;
+}>();
 
-const generalErrorBus = useEventBus<string>('general-error-notification')
+const generalErrorBus = useEventBus<string>("general-error-notification");
 const { setFocusedComponent } = useFocus();
 
-const noValidation = (value: string) => ''
+const noValidation = (value: string) => "";
 
 //We set it as a separated ref due to props not being updatable
-const selectedValue = reactive<Address>(props.modelValue)
+const selectedValue = reactive<Address>(props.modelValue);
 const validateAddressData =
   props.validations.length === 0
     ? noValidation
-    : props.validations[0]('Address', props.id + '')
+    : props.validations[0]("Address", props.id + "");
 const validateAddressNameData =
   props.validations.length === 0
     ? noValidation
-    : props.validations[0]('Names', props.id + '')
-const addressError = ref<string | undefined>('')
-const nameError = ref<string | undefined>('')
-const showDetailsLoading = ref<boolean>(false)
+    : props.validations[0]("Names", props.id + "");
+const addressError = ref<string | undefined>("");
+const nameError = ref<string | undefined>("");
+const showDetailsLoading = ref<boolean>(false);
 
 const uniquenessValidation = () => {
   addressError.value = validateAddressData(
     `${selectedValue.streetAddress} ${selectedValue.country.value} ${selectedValue.province.value} ${selectedValue.city} ${selectedValue.city} ${selectedValue.postalCode}`
-  )
-  nameError.value = validateAddressNameData(selectedValue.locationName)
-  
-}
+  );
+  nameError.value = validateAddressNameData(selectedValue.locationName);
+};
 
 //Watch for changes on the input
-watch([selectedValue], () =>{ 
-  uniquenessValidation()
-  emit('update:model-value', selectedValue)
-})
+watch([selectedValue], () => {
+  uniquenessValidation();
+  emit("update:model-value", selectedValue);
+});
 
 watch(
   () => props.revalidate,
   () => uniquenessValidation(),
   { immediate: true }
-)
+);
 
 const updateStateProvince = (
   value: CodeNameType | undefined,
   property: string
 ) => {
-  if (value && (property === 'country' || property === 'province')) {
-    selectedValue[property] = { value: value.code, text: value.name }
+  if (value && (property === "country" || property === "province")) {
+    selectedValue[property] = { value: value.code, text: value.name };
   }
-}
+};
 
 //Province related data
 const provinceUrl = computed(
   () =>
     `/api/clients/activeCountryCodes/${selectedValue.country.value}?page=0&size=250`
-)
+);
 
 const resetProvinceOnChange = (receivedCountry: any) => {
   if (selectedValue.country.value !== receivedCountry && receivedCountry)
-    selectedValue.province = { value: '', text: '' }
-}
+    selectedValue.province = { value: "", text: "" };
+};
 
-const addressControl = ref(false)
+const addressControl = ref(false);
 
 //Validations
 const validation = reactive<Record<string, boolean>>({
@@ -99,133 +98,142 @@ const validation = reactive<Record<string, boolean>>({
   country: false,
   province: false,
   city: false,
-  postalCode: false
-})
+  postalCode: false,
+});
 
 const checkValid = () =>
   Object.values(validation).reduce(
     (accumulator: boolean, currentValue: boolean) =>
       accumulator && currentValue,
     true
-  )
+  );
 
-watch([validation], () => emit('valid', checkValid()))
-emit('valid', false)
+watch([validation], () => emit("valid", checkValid()));
+emit("valid", false);
 
 const postalCodeValidators = computed(() => {
   switch (selectedValue.country.value) {
-    case 'CA':
+    case "CA":
       return [
-      ...getValidations('location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'),
-        submissionValidation(`location.addresses[${props.id}].postalCode`)
-      ]
-    case 'US':
+        ...getValidations(
+          'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'
+        ),
+        submissionValidation(`location.addresses[${props.id}].postalCode`),
+      ];
+    case "US":
       return [
-      ...getValidations('location.addresses.*.postalCode(location.addresses.*.country.text === "US")'),
-        submissionValidation(`location.addresses[${props.id}].postalCode`)
-      ]
+        ...getValidations(
+          'location.addresses.*.postalCode(location.addresses.*.country.text === "US")'
+        ),
+        submissionValidation(`location.addresses[${props.id}].postalCode`),
+      ];
     default:
       return [
-        ...getValidations('location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")'),
-        submissionValidation(`location.addresses[${props.id}].postalCode`)
-      ]
+        ...getValidations(
+          'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")'
+        ),
+        submissionValidation(`location.addresses[${props.id}].postalCode`),
+      ];
   }
-})
+});
 
 const postalCodeMask = computed(() => {
   switch (selectedValue.country.value) {
-    case 'CA':
-      return 'A#A#A#'
-    case 'US':
-      return ['#####','#####-####']
+    case "CA":
+      return "A#A#A#";
+    case "US":
+      return ["#####", "#####-####"];
     default:
-      return '##########'
+      return "##########";
   }
-})
+});
 
-const postalCodeShowHint = ref(false)
+const postalCodeShowHint = ref(false);
 
 const postalCodePlaceholder = computed(() => {
-  if(postalCodeShowHint.value) {
+  if (postalCodeShowHint.value) {
     switch (selectedValue.country.value) {
-      case 'CA':
-        return 'Use A1A1A1 format'
-      case 'US':
-        return 'Use 00000 or 00000-0000 format'
+      case "CA":
+        return "Use A1A1A1 format";
+      case "US":
+        return "Use 00000 or 00000-0000 format";
       default:
-        return 'Use 00000 format'
+        return "Use 00000 format";
     }
-  }else{
-    return ''
+  } else {
+    return "";
   }
-})
+});
 
 const provinceNaming = computed(() => {
   switch (selectedValue.country.value) {
-    case 'CA':
-      return 'Province or territory'
-    case 'US':
-      return 'State'
+    case "CA":
+      return "Province or territory";
+    case "US":
+      return "State";
     default:
-      return 'Province/territory or state'
+      return "Province/territory or state";
   }
-})
+});
 
 const postalCodeNaming = computed(() =>
-  selectedValue.country.value === 'US' ? 'Zip code' : 'Postal code'
-)
+  selectedValue.country.value === "US" ? "Zip code" : "Postal code"
+);
 
 const autoCompleteUrl = computed(
   () =>
     `/api/clients/addresses?country=${selectedValue.country.value}&maxSuggestions=10&searchTerm=${selectedValue.streetAddress}`
-)
-const autoCompleteResult = ref<BusinessSearchResult|undefined>({} as BusinessSearchResult)
-const detailsData = ref<Address | null>(null)
+);
+const autoCompleteResult = ref<BusinessSearchResult | undefined>(
+  {} as BusinessSearchResult
+);
+const detailsData = ref<Address | null>(null);
 
 watch([autoCompleteResult], () => {
-  addressControl.value = false
+  addressControl.value = false;
   if (autoCompleteResult.value) {
-    showDetailsLoading.value = true
+    showDetailsLoading.value = true;
     const { error, loading: detailsLoading } = useFetchTo(
       `/api/clients/addresses/${encodeURIComponent(
         autoCompleteResult.value.code
       )}`,
       detailsData,
       {}
-    )
+    );
 
     watch([error], () => {
       // @ts-ignore
-      generalErrorBus.emit(error.response?.data.message)
-      postalCodeShowHint.value = true
-    })
+      generalErrorBus.emit(error.response?.data.message);
+      postalCodeShowHint.value = true;
+    });
 
     watch(
       [detailsLoading],
       () => (showDetailsLoading.value = detailsLoading.value)
-    )
+    );
   }
-})
+});
 
 watch([detailsData], () => {
   if (detailsData.value) {
-    selectedValue.streetAddress = detailsData.value.streetAddress.trim()
-    selectedValue.city = detailsData.value.city
-    selectedValue.province = detailsData.value.province
-    selectedValue.postalCode = detailsData.value.postalCode.replace(/\s/g, '')
-    if(!selectedValue.postalCode) postalCodeShowHint.value = true
-    else postalCodeShowHint.value = false
-    addressControl.value = true
+    console.log(JSON.stringify(detailsData.value));
+    selectedValue.streetAddress = detailsData.value.streetAddress.trim();
+    selectedValue.city = detailsData.value.city;
+    selectedValue.province = detailsData.value.province;
+    selectedValue.postalCode = detailsData.value.postalCode.replace(/\s/g, "");
+    if (!selectedValue.postalCode) postalCodeShowHint.value = true;
+    else postalCodeShowHint.value = false;
+    addressControl.value = true;
     //Why is this here? Because Address response differs from the street address value
     //addressControl is responsible for giving an empty list instead of the AC value
-    setTimeout(() => (addressControl.value = false), 200)
+    setTimeout(() => (addressControl.value = false), 200);
   }
-})
+});
 
-onMounted(() =>{
-  if(props.id == 0) setFocusedComponent(`addr_${props.id}`,800)
-  else setFocusedComponent(`name_${props.id}`,200)
-})
+onMounted(() => {
+  if (props.id == 0) setFocusedComponent(`addr_${props.id}`, 800);
+  else setFocusedComponent(`name_${props.id}`, 200);
+});
 </script>
 
 <template>

From c4bba6f2f810e2c7121a033d549d74cb83726918 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 27 Sep 2023 14:37:36 -0700
Subject: [PATCH 215/313] FSADT1-879

---
 .../main/resources/templates/approval.html    | 39 +++++++++++++++++++
 .../main/resources/templates/revision.html    | 39 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 backend/src/main/resources/templates/approval.html
 create mode 100644 backend/src/main/resources/templates/revision.html

diff --git a/backend/src/main/resources/templates/approval.html b/backend/src/main/resources/templates/approval.html
new file mode 100644
index 0000000000..a468023a34
--- /dev/null
+++ b/backend/src/main/resources/templates/approval.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:v="urn:schemas-microsoft-com:vml"
+	xmlns:o="urn:schemas-microsoft-com:office:office">
+
+<#include "emailHead.html">
+
+<body width="100%"
+	style="margin: 0; padding: 0 !important; mso-line-height-rule: exactly;">
+
+	<div class="text" style="padding: 0 2.5em; text-align: left;">
+		
+		<#include "emailLogo.html">
+
+		<p>
+			Client Admin,
+		</p>
+		<div>&nbsp;</div>
+
+		<p>
+			An application for a client number for <b>${userName}</b> has been approved.
+		</p>
+		<p>
+			The client number is ${clientNumber}.
+		</p>
+		<div>&nbsp;</div>
+			
+		<p>Thank you,</p>
+		<p>The Client Management Team</p>
+		<div>&nbsp;</div>
+		
+		<p>
+			<b>Please don’t respond to this email.</b> 
+			It’s from an account that’s not monitored for incoming emails.
+		</p>
+	</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/backend/src/main/resources/templates/revision.html b/backend/src/main/resources/templates/revision.html
new file mode 100644
index 0000000000..300d0f5e83
--- /dev/null
+++ b/backend/src/main/resources/templates/revision.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:v="urn:schemas-microsoft-com:vml"
+	xmlns:o="urn:schemas-microsoft-com:office:office">
+
+<#include "emailHead.html">
+
+<body width="100%"
+	style="margin: 0; padding: 0 !important; mso-line-height-rule: exactly;">
+
+	<div class="text" style="padding: 0 2.5em; text-align: left;">
+		
+		<#include "emailLogo.html">
+
+		<p>
+			Client Admin,
+		</p>
+		<div>&nbsp;</div>
+
+		<p>
+			An application for a client number for <b>${userName}</b> needs your review.
+		</p>
+		<p>
+			Please review it in the Client Management System and decide if it should be accepted or rejected.
+		</p>
+		<div>&nbsp;</div>
+			
+		<p>Thank you,</p>
+		<p>The Client Management Team</p>
+		<div>&nbsp;</div>
+		
+		<p>
+			<b>Please don’t respond to this email.</b> 
+			It’s from an account that’s not monitored for incoming emails.
+		</p>
+	</div>
+
+</body>
+</html>
\ No newline at end of file

From 8169cbf1072043b9b23e475719b350f7162b1576 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 27 Sep 2023 14:57:38 -0700
Subject: [PATCH 216/313] - Made code reviews - Removed unused code

---
 frontend/src/pages/ErrorPage.vue         | 9 +++++----
 frontend/src/pages/FormSubmittedPage.vue | 7 +------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/frontend/src/pages/ErrorPage.vue b/frontend/src/pages/ErrorPage.vue
index 080255e80d..df8d1c1162 100644
--- a/frontend/src/pages/ErrorPage.vue
+++ b/frontend/src/pages/ErrorPage.vue
@@ -4,9 +4,10 @@
     <p>{{ errorCode }}</p>
   </div>
 </template>
+
 <script setup lang="ts">
-import {ref} from 'vue'
-import { useRouter } from 'vue-router'
-const router = useRouter()
-const errorCode = ref(router.currentRoute.value.query.error)
+import { ref } from "vue";
+import { useRouter } from "vue-router";
+const router = useRouter();
+const errorCode = ref(router.currentRoute.value.query.error);
 </script>
diff --git a/frontend/src/pages/FormSubmittedPage.vue b/frontend/src/pages/FormSubmittedPage.vue
index cd5c692a14..4b8d54d2d1 100644
--- a/frontend/src/pages/FormSubmittedPage.vue
+++ b/frontend/src/pages/FormSubmittedPage.vue
@@ -1,15 +1,11 @@
 <script setup lang="ts">
-import { inject } from "vue";
 // Composables
 import { useRouter } from "vue-router";
 import useSvg from "@/composables/useSvg";
-// Types
-import type { Submitter } from "@/dto/CommonTypesDto";
+
 // @ts-ignore
 import badgePictogram from "@carbon/pictograms/es/badge";
 
-const submitterInformation = inject<Submitter>("submitterInformation");
-
 const router = useRouter();
 
 const newFormSubmission = () => {
@@ -38,4 +34,3 @@ const SVG = useSvg(badgePictogram);
     </div>
   </div>
 </template>
-

From 29d4d87b8b9f27357e15784696b1e6fb15b3e2cb Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 27 Sep 2023 15:50:03 -0700
Subject: [PATCH 217/313] Made code reviews

---
 frontend/src/pages/FormBCeIDPage.vue          | 133 +++++++++---------
 .../src/pages/bceidform/ReviewWizardStep.vue  |  68 ++++-----
 .../pages/bceidform/RevieWizarStep.spec.ts    |  64 +++++++++
 3 files changed, 156 insertions(+), 109 deletions(-)
 create mode 100644 frontend/tests/unittests/pages/bceidform/RevieWizarStep.spec.ts

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index db5924f85b..e1350ed00b 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -342,22 +342,22 @@ const isSmallScreen = useMediaQuery("(max-width: 671px)");
       <span class="heading-05" data-scroll="top">New client application</span>
       <p class="body-01">All fields are mandatory</p>
     </div>
-      <cds-progress-indicator space-equally :vertical="isSmallScreen">
-        <cds-progress-step 
-          v-for="item in progressData"
-          :key="item.step"
-          :label="item.title"
-          :secondary-label="item.subtitle"
-          :state="item.kind"
-          :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"          
-          :disabled="item.disabled"
-          v-shadow="3"
-        />
-      </cds-progress-indicator>
-      <error-notification-grouping-component
-        :form-data="formData"
-        :scroll-to-new-contact="scrollToNewContact"
+    <cds-progress-indicator space-equally :vertical="isSmallScreen">
+      <cds-progress-step 
+        v-for="item in progressData"
+        :key="item.step"
+        :label="item.title"
+        :secondary-label="item.subtitle"
+        :state="item.kind"
+        :class="item.step <= currentTab ? 'step-active' : 'step-inactive'"          
+        :disabled="item.disabled"
+        v-shadow="3"
       />
+    </cds-progress-indicator>
+    <error-notification-grouping-component
+      :form-data="formData"
+      :scroll-to-new-contact="scrollToNewContact"
+    />
   </div>
 
   <div class="form-steps">
@@ -442,10 +442,11 @@ const isSmallScreen = useMediaQuery("(max-width: 671px)");
 
     <div v-if="currentTab == 3" class="form-steps-04">
 
-
       <div class="form-steps-section form-steps-section-04">
-          <span class="heading-04" data-scroll="scroll-3">{{ progressData[3].title}}</span>
-          <span class="body-02">Review the content and make any changes by using the "Edit" buttons in each section below.</span>
+        <span class="heading-04" data-scroll="scroll-3">{{ progressData[3].title}}</span>
+        <span class="body-02">
+          Review the content and make any changes by using the "Edit" buttons in each section below.
+        </span>
 
         <review-wizard-step
             v-model:data="formData"
@@ -464,59 +465,59 @@ const isSmallScreen = useMediaQuery("(max-width: 671px)");
     <div class="form-footer-group">
       <div class="form-footer-group-next">
 
-        <span class="body-compact-01" v-if="!isLast && !progressData[currentTab].valid"
-        >All fields must be filled out correctly to enable the "Next" button
-        below</span
-      >
-      <div class="form-footer-group-buttons">
-        <cds-button
-            v-if="!isFirst"
-            kind="secondary"
+        <span class="body-compact-01" 
+              v-if="!isLast && !progressData[currentTab].valid">
+          All fields must be filled out correctly to enable the "Next" button below
+        </span>
+        <div class="form-footer-group-buttons">
+          <cds-button
+              v-if="!isFirst"
+              kind="secondary"
+              size="lg"
+              :disabled="isFirst"
+              v-on:click="onBack"
+              data-test="wizard-back-button"
+            >
+            <span>Back</span>
+          </cds-button>
+
+          <cds-button
+            v-if="!isLast && !endAndLogOut && !mailAndLogOut"
+            id="nextBtn"
+            kind="primary"
             size="lg"
-            :disabled="isFirst"
-            v-on:click="onBack"
-            data-test="wizard-back-button"
-          >
-          <span>Back</span>
-        </cds-button>
-
-        <cds-button
-          v-if="!isLast && !endAndLogOut && !mailAndLogOut"
-          id="nextBtn"
-          kind="primary"
-          size="lg"
-          v-on:click="onNext"
-          :disabled="progressData[currentTab].valid === false"
-          data-test="wizard-next-button"
-          >
-          <span>Next</span>
-          <ArrowRight16 slot="icon" />
-        </cds-button>
+            v-on:click="onNext"
+            :disabled="progressData[currentTab].valid === false"
+            data-test="wizard-next-button"
+            >
+            <span>Next</span>
+            <ArrowRight16 slot="icon" />
+          </cds-button>
+
+          <cds-button
+            v-if="isLast && !endAndLogOut && !mailAndLogOut"
+              data-test="wizard-submit-button"
+              kind="primary"
+              size="lg"
+              @click.prevent="submit"
+            >
+            <span>Submit application</span>
+            <Check16 slot="icon" />
+          </cds-button>
 
-        <cds-button
-          v-if="isLast && !endAndLogOut && !mailAndLogOut"
-            data-test="wizard-submit-button"
+          <cds-button
+            data-test="wizard-logout-button"
             kind="primary"
             size="lg"
-            @click.prevent="submit"
+            v-show="!isLast && (endAndLogOut || mailAndLogOut)"
+            @click.prevent="processAndLogOut"
           >
-          <span>Submit application</span>
-          <Check16 slot="icon" />
-        </cds-button>
-
-        <cds-button
-          data-test="wizard-logout-button"
-          kind="primary"
-          size="lg"
-          v-show="!isLast && (endAndLogOut || mailAndLogOut)"
-          @click.prevent="processAndLogOut"
-        >
-          <span
-            >{{ endAndLogOut ? 'End application' : 'Receive email' }} and
-            logout</span
-          >
-          <LogOut16 slot="icon" />
-        </cds-button>
+            <span
+              >{{ endAndLogOut ? 'End application' : 'Receive email' }} and
+              logout</span
+            >
+            <LogOut16 slot="icon" />
+          </cds-button>
 
         </div>
       </div>
diff --git a/frontend/src/pages/bceidform/ReviewWizardStep.vue b/frontend/src/pages/bceidform/ReviewWizardStep.vue
index 6421a38303..fe858f63a8 100644
--- a/frontend/src/pages/bceidform/ReviewWizardStep.vue
+++ b/frontend/src/pages/bceidform/ReviewWizardStep.vue
@@ -49,57 +49,42 @@ onMounted(() => {
         {{ formData.businessInformation.businessName }}
       </p>
       <p class="body-compact-01">
-        {{
-          companyBusinessTypes[`${formData.businessInformation.businessType}`]
-        }}
+        {{ companyBusinessTypes[`${formData.businessInformation.businessType}`] }}
       </p>
     </div>
-<div class="grouping-06">
-    <cds-button
-      kind="tertiary"
-      @click.prevent="goToStep(0)"
-    >
-      <span>Edit business information</span>
-      <Edit16 slot="icon" />
-    </cds-button>
+    <div class="grouping-06">
+      <cds-button kind="tertiary" @click.prevent="goToStep(0)">
+        <span>Edit business information</span>
+        <Edit16 slot="icon" />
+      </cds-button>
     </div>
   </div>
-
   <div class="grouping-05">
     <label class="heading-03">Address</label>
-
-    <div
-      v-for="(address, index) in formData.location.addresses"
-      :key="address.locationName"
-      class="grouping-07"
-    >
-      <hr class="divider" v-if="index > 0"/>
+    <div v-for="(address, index) in formData.location.addresses" 
+        :key="address.locationName" 
+        class="grouping-07">
+      <hr class="divider" v-if="index > 0" />
       <span class="heading-02">{{ address.locationName }}</span>
       <span class="body-compact-01">{{ address.streetAddress }}</span>
       <span class="body-compact-01">{{ address.city }}, {{ address.province.text }}</span>
       <span class="body-compact-01">{{ address.country.text }}</span>
       <span class="body-compact-01">{{ address.postalCode }}</span>
     </div>
-<div class="grouping-06">
-    <cds-button
-      kind="tertiary"
-      @click.prevent="goToStep(1)"
-    >
-      <span>Edit address</span>
-      <Edit16 slot="icon" />
-    </cds-button>
+    <div class="grouping-06">
+      <cds-button kind="tertiary" @click.prevent="goToStep(1)">
+        <span>Edit address</span>
+        <Edit16 slot="icon" />
+      </cds-button>
     </div>
   </div>
-
   <div class="grouping-05">
     <label class="heading-03">Contacts</label>
-
-    <div
-      v-for="(contact, index) in formData.location.contacts"
-      :key="contact.email"
-      class="grouping-07"
-    >
-      <hr class="divider" v-if="index > 0"/>
+    <div v-for="(contact, index) in formData.location.contacts" 
+        :key="contact.email" 
+        class="grouping-07">
+      <hr class="divider" 
+          v-if="index > 0" />
       <span class="heading-02">{{ contact.firstName }} {{ contact.lastName }}</span>
       <span class="body-compact-01">
         {{ contact.locationNames.map((codeDesc) => codeDesc.text).join(', ') }}
@@ -108,14 +93,11 @@ onMounted(() => {
       <span class="body-compact-01">{{ contact.email }}</span>
       <span class="body-compact-01">{{ contact.phoneNumber }}</span>
     </div>
-<div class="grouping-06">
-    <cds-button
-      kind="tertiary"
-      @click.prevent="goToStep(2)"
-    >
-      <span>Edit contacts</span>
-      <Edit16 slot="icon" />
-    </cds-button>
+    <div class="grouping-06">
+      <cds-button kind="tertiary" @click.prevent="goToStep(2)">
+        <span>Edit contacts</span>
+        <Edit16 slot="icon" />
+      </cds-button>
     </div>
   </div>
 </template>
diff --git a/frontend/tests/unittests/pages/bceidform/RevieWizarStep.spec.ts b/frontend/tests/unittests/pages/bceidform/RevieWizarStep.spec.ts
new file mode 100644
index 0000000000..57b2bf2a28
--- /dev/null
+++ b/frontend/tests/unittests/pages/bceidform/RevieWizarStep.spec.ts
@@ -0,0 +1,64 @@
+// Import the necessary dependencies
+import { mount } from "@vue/test-utils";
+import { describe, it, expect } from "vitest";
+import ReviewWizardStep from "@/pages/bceidform/ReviewWizardStep.vue";
+
+describe("ReviewWizardStep.vue", () => {
+  it("renders correctly", async () => {
+    const wrapper = mount(ReviewWizardStep, {
+      props: {
+        data: {
+          businessInformation: {
+            businessName: "Your Business Name",
+            businessType: "R",
+          },
+          location: {
+            addresses: [
+              {
+                locationName: "Location 1",
+                streetAddress: "123 Main St",
+                city: "City",
+                province: { text: "Province" },
+                country: { text: "Country" },
+                postalCode: "12345",
+              },
+            ],
+            contacts: [
+              {
+                firstName: "John",
+                lastName: "Doe",
+                locationNames: [{ text: "Location 1" }],
+                contactType: { text: "Contact Type" },
+                email: "john@example.com",
+                phoneNumber: "123-456-7890",
+              },
+            ],
+          },
+        },
+        active: true,
+        goToStep: () => {},
+      },
+    });
+
+    await wrapper.vm.$nextTick();
+
+    // Debugging: Log the HTML content of the component
+    console.log(wrapper.html());
+
+    // Attempt to find the button element
+    const buttonElement = wrapper.find(".grouping-06 .cds-button");
+
+    // Debugging: Log the found button element
+    console.log(buttonElement);
+
+    // Check if the button element exists
+    if (buttonElement.exists()) {
+      await buttonElement.trigger("click");
+    } else {
+      console.error("Button element not found");
+    }
+
+    // Unmount the component after the test
+    wrapper.unmount();
+  });
+});

From 1bb375a91b77c1277eb39437a94b238d3e99c801 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 27 Sep 2023 16:22:04 -0700
Subject: [PATCH 218/313] Made code reviews

---
 .../unittests/components/DataFetcher.spec.ts  | 104 +++++++++---------
 .../components/MainHeaderComponent.spec.ts    |  56 +++++-----
 2 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/frontend/tests/unittests/components/DataFetcher.spec.ts b/frontend/tests/unittests/components/DataFetcher.spec.ts
index ffe10014ea..6150d94241 100644
--- a/frontend/tests/unittests/components/DataFetcher.spec.ts
+++ b/frontend/tests/unittests/components/DataFetcher.spec.ts
@@ -1,90 +1,90 @@
-import { describe, it, expect, vi } from 'vitest'
-import { mount } from '@vue/test-utils'
-import { nextTick, ref } from 'vue'
-import * as fetcher from '@/composables/useFetch'
+import { describe, it, expect, vi } from "vitest";
+import { mount } from "@vue/test-utils";
+import { nextTick, ref } from "vue";
+import * as fetcher from "@/composables/useFetch";
 
-import DataFetcher from '@/components/DataFetcher.vue'
+import DataFetcher from "@/components/DataFetcher.vue";
 
-describe('DataFetcher', () => {
+describe("DataFetcher", () => {
   const mockedFetchTo = (url: string, received: any, config: any = {}) => ({
     response: ref({}),
     error: ref({}),
     data: received,
     loading: ref(false),
     fetch: async () => {
-      received.value = { name: 'Loaded' }
-    }
-  })
+      received.value = { name: "Loaded" };
+    },
+  });
 
-  it('should render', () => {
+  it("should render", () => {
     const wrapper = mount(DataFetcher, {
       props: {
-        url: '/api/data',
+        url: "/api/data",
         minLength: 1,
-        initValue: { name: 'test' }
-      }
-    })
-    expect(wrapper.html()).toBe('')
-  })
+        initValue: { name: "test" },
+      },
+    });
+    expect(wrapper.html()).toBe("");
+  });
 
-  it('should render slot with initial data', () => {
+  it("should render slot with initial data", () => {
     const wrapper = mount(DataFetcher, {
       props: {
-        url: '/api/data',
+        url: "/api/data",
         minLength: 1,
-        initValue: { name: 'test' }
+        initValue: { name: "test" },
       },
       slots: {
-        default: '<div>slot content is {{ content.name }}</div>'
-      }
-    })
-    expect(wrapper.html()).toBe('<div>slot content is test</div>')
-    expect(wrapper.find('div').text()).toBe('slot content is test')
-  })
+        default: "<div>slot content is {{ content.name }}</div>",
+      },
+    });
+    expect(wrapper.html()).toBe("<div>slot content is test</div>");
+    expect(wrapper.find("div").text()).toBe("slot content is test");
+  });
 
-  it('should render slot with fetched data on init', async () => {
-    vi.spyOn(fetcher, 'useFetchTo').mockImplementation(mockedFetchTo)
+  it("should render slot with fetched data on init", async () => {
+    vi.spyOn(fetcher, "useFetchTo").mockImplementation(mockedFetchTo);
 
     const wrapper = mount(DataFetcher, {
       props: {
-        url: '/api/data',
+        url: "/api/data",
         minLength: 1,
-        initValue: { name: 'test' },
-        initFetch: true
+        initValue: { name: "test" },
+        initFetch: true,
       },
       slots: {
-        default: '<div>slot content is {{ content.name }}</div>'
-      }
-    })
+        default: "<div>slot content is {{ content.name }}</div>",
+      },
+    });
 
-    await nextTick()
+    await nextTick();
 
-    expect(wrapper.html()).toBe('<div>slot content is Loaded</div>')
-    expect(wrapper.find('div').text()).toBe('slot content is Loaded')
-  })
+    expect(wrapper.html()).toBe("<div>slot content is Loaded</div>");
+    expect(wrapper.find("div").text()).toBe("slot content is Loaded");
+  });
 
-  it('should render slot with fetched data on url change', async () => {
-    vi.spyOn(fetcher, 'useFetchTo').mockImplementation(mockedFetchTo)
+  it("should render slot with fetched data on url change", async () => {
+    vi.spyOn(fetcher, "useFetchTo").mockImplementation(mockedFetchTo);
 
     const wrapper = mount(DataFetcher, {
       props: {
-        url: '/api/data',
+        url: "/api/data",
         minLength: 1,
-        initValue: { name: 'test' }
+        initValue: { name: "test" },
       },
       slots: {
-        default: '<div>slot content is {{ content.name }}</div>'
-      }
-    })
+        default: "<div>slot content is {{ content.name }}</div>",
+      },
+    });
 
-    expect(wrapper.html()).toBe('<div>slot content is test</div>')
-    expect(wrapper.find('div').text()).toBe('slot content is test')
+    expect(wrapper.html()).toBe("<div>slot content is test</div>");
+    expect(wrapper.find("div").text()).toBe("slot content is test");
 
-    await wrapper.setProps({ url: '/api/data/changed' })
+    await wrapper.setProps({ url: "/api/data/changed" });
 
-    await nextTick()
+    await nextTick();
 
-    expect(wrapper.html()).toBe('<div>slot content is Loaded</div>')
-    expect(wrapper.find('div').text()).toBe('slot content is Loaded')
-  })
-})
+    expect(wrapper.html()).toBe("<div>slot content is Loaded</div>");
+    expect(wrapper.find("div").text()).toBe("slot content is Loaded");
+  });
+});
diff --git a/frontend/tests/unittests/components/MainHeaderComponent.spec.ts b/frontend/tests/unittests/components/MainHeaderComponent.spec.ts
index 72609884d6..dde0ab0097 100644
--- a/frontend/tests/unittests/components/MainHeaderComponent.spec.ts
+++ b/frontend/tests/unittests/components/MainHeaderComponent.spec.ts
@@ -1,45 +1,45 @@
-import { describe, it, expect, vi } from 'vitest'
-import { mount } from '@vue/test-utils'
+import { describe, it, expect, vi } from "vitest";
+import { mount } from "@vue/test-utils";
 
-import MainHeaderComponent from '@/components/MainHeaderComponent.vue'
+import MainHeaderComponent from "@/components/MainHeaderComponent.vue";
 
-describe('MainHeaderComponent.vue', () => {
-  it('renders the component when authenticated', async () => {
+describe("MainHeaderComponent.vue", () => {
+  it("renders the component when authenticated", async () => {
     const session = {
-      session: { user: { provider: 'bcsc' } },
+      session: { user: { provider: "bcsc" } },
       isLoggedIn: () => true,
-      logOut: vi.fn()
-    }
+      logOut: vi.fn(),
+    };
 
     const wrapper = mount(MainHeaderComponent, {
       global: {
         mocks: {
-          $session: session
-        }
-      }
-    })
+          $session: session,
+        },
+      },
+    });
 
-    expect(wrapper.html()).not.toBe('')
-    expect(wrapper.find('cds-button').exists()).toBe(true)
-    expect(wrapper.html()).toContain('Ministry of Forests')
-  })
+    expect(wrapper.html()).not.toBe("");
+    expect(wrapper.find("cds-button").exists()).toBe(true);
+    expect(wrapper.html()).toContain("Ministry of Forests");
+  });
 
-  it('renders the component when unauthenticated', async () => {
+  it("renders the component when unauthenticated", async () => {
     const session = {
       isLoggedIn: () => false,
-      logOut: vi.fn()
-    }
+      logOut: vi.fn(),
+    };
 
     const wrapper = mount(MainHeaderComponent, {
       global: {
         mocks: {
-          $session: session
-        }
-      }
-    })
+          $session: session,
+        },
+      },
+    });
 
-    expect(wrapper.html()).not.toBe('')
-    expect(wrapper.find('bx-btn').exists()).toBe(false)
-    expect(wrapper.html()).toContain('Ministry of Forests')
-  })
-})
+    expect(wrapper.html()).not.toBe("");
+    expect(wrapper.find("bx-btn").exists()).toBe(false);
+    expect(wrapper.html()).toContain("Ministry of Forests");
+  });
+});

From aec83fba46bb570491ead8856a06a02008e69ce1 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 27 Sep 2023 16:29:35 -0700
Subject: [PATCH 219/313] Made improvement

---
 .../components/MainHeaderComponent.spec.ts    | 62 ++++++++++---------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/frontend/tests/unittests/components/MainHeaderComponent.spec.ts b/frontend/tests/unittests/components/MainHeaderComponent.spec.ts
index dde0ab0097..203db19140 100644
--- a/frontend/tests/unittests/components/MainHeaderComponent.spec.ts
+++ b/frontend/tests/unittests/components/MainHeaderComponent.spec.ts
@@ -4,42 +4,46 @@ import { mount } from "@vue/test-utils";
 import MainHeaderComponent from "@/components/MainHeaderComponent.vue";
 
 describe("MainHeaderComponent.vue", () => {
-  it("renders the component when authenticated", async () => {
-    const session = {
-      session: { user: { provider: "bcsc" } },
-      isLoggedIn: () => true,
-      logOut: vi.fn(),
-    };
+  describe("Authenticated Scenario", () => {
+    it("renders the component correctly when authenticated", async () => {
+      const session = {
+        session: { user: { provider: "bcsc" } },
+        isLoggedIn: () => true,
+        logOut: vi.fn(),
+      };
 
-    const wrapper = mount(MainHeaderComponent, {
-      global: {
-        mocks: {
-          $session: session,
+      const wrapper = mount(MainHeaderComponent, {
+        global: {
+          mocks: {
+            $session: session,
+          },
         },
-      },
-    });
+      });
 
-    expect(wrapper.html()).not.toBe("");
-    expect(wrapper.find("cds-button").exists()).toBe(true);
-    expect(wrapper.html()).toContain("Ministry of Forests");
+      expect(wrapper.html()).toBeTruthy();
+      expect(wrapper.find("cds-button").exists()).toBe(true);
+      expect(wrapper.html()).toContain("Ministry of Forests");
+    });
   });
 
-  it("renders the component when unauthenticated", async () => {
-    const session = {
-      isLoggedIn: () => false,
-      logOut: vi.fn(),
-    };
+  describe("Unauthenticated Scenario", () => {
+    it("renders the component correctly when unauthenticated", async () => {
+      const session = {
+        isLoggedIn: () => false,
+        logOut: vi.fn(),
+      };
 
-    const wrapper = mount(MainHeaderComponent, {
-      global: {
-        mocks: {
-          $session: session,
+      const wrapper = mount(MainHeaderComponent, {
+        global: {
+          mocks: {
+            $session: session,
+          },
         },
-      },
-    });
+      });
 
-    expect(wrapper.html()).not.toBe("");
-    expect(wrapper.find("bx-btn").exists()).toBe(false);
-    expect(wrapper.html()).toContain("Ministry of Forests");
+      expect(wrapper.html()).toBeTruthy();
+      expect(wrapper.find("bx-btn").exists()).toBe(false);
+      expect(wrapper.html()).toContain("Ministry of Forests");
+    });
   });
 });

From 9636608d4893de9342570b34e5ce1409ba3d812a Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 27 Sep 2023 21:41:01 -0300
Subject: [PATCH 220/313] feat: clear text displayed on combo-box

---
 .../src/components/forms/DropdownInputComponent.vue   | 11 ++++++++++-
 .../src/components/grouping/AddressGroupComponent.vue |  2 ++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index 18d472de94..f2b0f427d9 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -2,6 +2,7 @@
 import { ref, computed, watch } from 'vue'
 // Carbon
 import '@carbon/web-components/es/components/combo-box/index';
+import CDSComboBox from '@carbon/web-components/es/components/combo-box/combo-box';
 // Composables
 import { useEventBus } from '@vueuse/core'
 // Types
@@ -12,6 +13,7 @@ import { isEmpty } from '@/dto/CommonTypesDto'
 const props = defineProps<{
   id: string
   label: string
+  placeholder?: string
   tip: string
   modelValue: Array<CodeNameType>
   initialValue: string
@@ -72,6 +74,10 @@ const selectItem = (event:any) => {
 
 //Watch for changes on the input
 watch([selectedValue], () => {
+  if (selectedValue.value === '') {
+    // force clear text displayed on the combo-box
+    cdsComboBoxRef.value._filterInputValue = '';
+  }
   validateInput(selectedValue.value)
   emitValueChange(selectedValue.value)
 })
@@ -90,15 +96,18 @@ watch(
 )
 
 revalidateBus.on(() => validateInput(selectedValue.value))
-</script>
 
+const cdsComboBoxRef = ref<InstanceType<typeof CDSComboBox> | null>(null);
+</script>
 
 <template>
   <div class="grouping-03">
     <cds-combo-box
+      ref="cdsComboBoxRef"
       :id="id"
       filterable
       :helper-text="tip"
+      :label="placeholder"
       :title-text="label"
       :value="selectedValue"
       :invalid="error ? true : false"
diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 7832919d4d..d0b13632a5 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -259,6 +259,7 @@ onMounted(() => {
     label="Country"
     :initial-value="selectedValue.country.text"
     tip=""
+    placeholder="Choose an option"
     :enabled="true"
     :model-value="countryList"
     :validations="[...getValidations('location.addresses.country.text'),submissionValidation(`location.addresses[${id}].country`)]"
@@ -327,6 +328,7 @@ onMounted(() => {
       :model-value="content"
       :enabled="true"
       tip=""
+      placeholder="Choose an option"
       :validations="[...getValidations('location.addresses.*.province.text'),submissionValidation(`location.addresses[${id}].province`)]"
       :error-message="addressError"
       @update:selected-value="updateStateProvince($event, 'province')"

From 6efaa7c3dd92d6a0f99c2cc56cf9c2354119cdfd Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 27 Sep 2023 23:07:32 -0300
Subject: [PATCH 221/313] fix: clear text displayed on combo-box

Without using any private properties from the component.
---
 .../forms/DropdownInputComponent.vue          | 62 ++++++++++---------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index f2b0f427d9..aa2312a688 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -72,11 +72,19 @@ const selectItem = (event:any) => {
   selectedValue.value = event?.detail?.item?.getAttribute('data-id')
 }
 
+/**
+ * This array is used in a way that allows to mount a brand new combo-box
+ * whenever it contains a different time.
+ * This is done as a workaround that allows to clear the text displayed in
+ * the combo-box.
+ * @see FSADT1-900
+ */
+const comboBoxMountTime = ref<[number]>([Date.now()]);
+
 //Watch for changes on the input
 watch([selectedValue], () => {
   if (selectedValue.value === '') {
-    // force clear text displayed on the combo-box
-    cdsComboBoxRef.value._filterInputValue = '';
+    comboBoxMountTime.value = [Date.now()];
   }
   validateInput(selectedValue.value)
   emitValueChange(selectedValue.value)
@@ -96,34 +104,32 @@ watch(
 )
 
 revalidateBus.on(() => validateInput(selectedValue.value))
-
-const cdsComboBoxRef = ref<InstanceType<typeof CDSComboBox> | null>(null);
 </script>
 
 <template>
   <div class="grouping-03">
-    <cds-combo-box
-      ref="cdsComboBoxRef"
-      :id="id"
-      filterable
-      :helper-text="tip"
-      :label="placeholder"
-      :title-text="label"
-      :value="selectedValue"
-      :invalid="error ? true : false"
-      :invalidText="error"
-      @cds-combo-box-selected="selectItem"
-      :data-focus="id"
-      :data-scroll="id">
-      <cds-combo-box-item 
-        v-for="option in inputList"
-        :key="option.code"
-        :value="option.name"
-        :data-id="option.code"
-        :data-value="option.name">
-        {{ option.name }}
-      </cds-combo-box-item>
-    </cds-combo-box>
-</div>
+    <template v-for="time in comboBoxMountTime" :key="time">
+      <cds-combo-box
+        :id="id"
+        filterable
+        :helper-text="tip"
+        :label="placeholder"
+        :title-text="label"
+        :value="selectedValue"
+        :invalid="error ? true : false"
+        :invalidText="error"
+        @cds-combo-box-selected="selectItem"
+        :data-focus="id"
+        :data-scroll="id">
+        <cds-combo-box-item 
+          v-for="option in inputList"
+          :key="option.code"
+          :value="option.name"
+          :data-id="option.code"
+          :data-value="option.name">
+          {{ option.name }}
+        </cds-combo-box-item>
+      </cds-combo-box>
+    </template>
+  </div>
 </template>
-

From 214e0f5dc0c77e9e29173b69ab0412efbdcb6b51 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 27 Sep 2023 23:11:03 -0300
Subject: [PATCH 222/313] refactor: move iteration props

---
 .../forms/DropdownInputComponent.vue          | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index aa2312a688..78b5c1a24d 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -108,28 +108,28 @@ revalidateBus.on(() => validateInput(selectedValue.value))
 
 <template>
   <div class="grouping-03">
-    <template v-for="time in comboBoxMountTime" :key="time">
-      <cds-combo-box
-        :id="id"
-        filterable
-        :helper-text="tip"
-        :label="placeholder"
-        :title-text="label"
-        :value="selectedValue"
-        :invalid="error ? true : false"
-        :invalidText="error"
-        @cds-combo-box-selected="selectItem"
-        :data-focus="id"
-        :data-scroll="id">
-        <cds-combo-box-item 
-          v-for="option in inputList"
-          :key="option.code"
-          :value="option.name"
-          :data-id="option.code"
-          :data-value="option.name">
-          {{ option.name }}
-        </cds-combo-box-item>
-      </cds-combo-box>
-    </template>
+    <cds-combo-box
+      v-for="time in comboBoxMountTime"
+      :key="time"
+      :id="id"
+      filterable
+      :helper-text="tip"
+      :label="placeholder"
+      :title-text="label"
+      :value="selectedValue"
+      :invalid="error ? true : false"
+      :invalidText="error"
+      @cds-combo-box-selected="selectItem"
+      :data-focus="id"
+      :data-scroll="id">
+      <cds-combo-box-item 
+        v-for="option in inputList"
+        :key="option.code"
+        :value="option.name"
+        :data-id="option.code"
+        :data-value="option.name">
+        {{ option.name }}
+      </cds-combo-box-item>
+    </cds-combo-box>
   </div>
 </template>

From d81303f432ec65fc461cd3d2aa98af320f579e11 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 28 Sep 2023 10:17:38 -0300
Subject: [PATCH 223/313] fix: fix link to bceid

---
 frontend/src/pages/FormBCeIDPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index e1350ed00b..87855cfcf6 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -421,7 +421,7 @@ const isSmallScreen = useMediaQuery("(max-width: 671px)");
               Your first name, last name and email address are from your BCeID.
               If they're incorrect,
               <a
-                href="https://bceid.ca"
+                href="https://www.bceid.ca/"
                 target="_blank"
                 rel="noopener noreferrer"
                 >go to BCeID</a

From 4e8dbd1f2c030a3b5326e3a907fd95f2cba0b34c Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 28 Sep 2023 13:53:28 -0300
Subject: [PATCH 224/313] chore: remove unused import

---
 frontend/src/components/forms/DropdownInputComponent.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index 78b5c1a24d..64e9b1b100 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -2,7 +2,6 @@
 import { ref, computed, watch } from 'vue'
 // Carbon
 import '@carbon/web-components/es/components/combo-box/index';
-import CDSComboBox from '@carbon/web-components/es/components/combo-box/combo-box';
 // Composables
 import { useEventBus } from '@vueuse/core'
 // Types

From 5fafae13c97ec6796d262a211b7ecf711769f2ae Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 28 Sep 2023 15:44:10 -0300
Subject: [PATCH 225/313] fix: remove placeholders on country and province

---
 frontend/src/components/grouping/AddressGroupComponent.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index d0b13632a5..7832919d4d 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -259,7 +259,6 @@ onMounted(() => {
     label="Country"
     :initial-value="selectedValue.country.text"
     tip=""
-    placeholder="Choose an option"
     :enabled="true"
     :model-value="countryList"
     :validations="[...getValidations('location.addresses.country.text'),submissionValidation(`location.addresses[${id}].country`)]"
@@ -328,7 +327,6 @@ onMounted(() => {
       :model-value="content"
       :enabled="true"
       tip=""
-      placeholder="Choose an option"
       :validations="[...getValidations('location.addresses.*.province.text'),submissionValidation(`location.addresses[${id}].province`)]"
       :error-message="addressError"
       @update:selected-value="updateStateProvince($event, 'province')"

From 2f440cf31b8bf216dc54c6a4b3af64123508b55f Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 28 Sep 2023 19:03:15 -0300
Subject: [PATCH 226/313] fix: fix casing for Business information

---
 frontend/src/pages/FormBCeIDPage.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 87855cfcf6..189a6a5bf8 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -125,7 +125,7 @@ addValidation(
 // Tab system
 const progressData = reactive([
   {
-    title: "Business Information",
+    title: "Business information",
     subtitle: "Step 1",
     kind: "current",
     disabled: false,

From 3654f8e699f644ebe8a611100b312e8da366b296 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 28 Sep 2023 20:50:17 -0300
Subject: [PATCH 227/313] fix: fix doc coment closing

For some reason this was messing the code displayed in the Chrome browser
sources.
---
 .../src/helpers/validators/GlobalValidators.ts   | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 8f87e613a4..eaec71fdcd 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -27,7 +27,7 @@ const errorBus = useEventBus<ValidationMessageType[]>(
  * isNotEmpty(' ') // false
  * isNotEmpty('a') // true
  * isNotEmpty(' a ') // true
- **/
+ */
 export const isNotEmpty =
   (message: string = "This field is required") =>
   (value: string): string => {
@@ -47,7 +47,7 @@ export const isNotEmpty =
  * isEmail('a@b') // false
  * isEmail(' a@b ') // false
  * isEmail('mail@mail.com') // true
- **/
+ */
 export const isEmail =
   (message: string = "This field must be a valid email") =>
   (value: string): string => {
@@ -80,7 +80,7 @@ export const isPhoneNumber =
  * isCanadianPostalCode('A1A1A1') // true
  * isCanadianPostalCode('A1A 1A1') // false
  * isCanadianPostalCode('A1A-1A1') // false
- **/
+ */
 export const isCanadianPostalCode = (
   value: string,
   message: string = "This field must be a valid Canadian postal code without spaces or dashes"
@@ -108,7 +108,7 @@ export const isCanadianPostalCode = (
  * isUsZipCode("12345-6789") // true
  * isUsZipCode("123456") // false
  * isUsZipCode("ABCDE") // false
- **/
+ */
 export const isUsZipCode = (
   value: string,
   message: string = "This field must be a valid US zip code"
@@ -130,7 +130,7 @@ export const isUsZipCode = (
  * isMaxSize(5)(' a ') // true
  * isMaxSize(5)('abcde') // true
  * isMaxSize(5)('abcdef') // false
- **/
+ */
 export const isMaxSize =
   (message: string = "This field must be smaller") =>
   (maxSize: number) => {
@@ -152,7 +152,7 @@ export const isMaxSize =
  * isMinSize(5)(' a ') // false
  * isMinSize(5)('abcde') // true
  * isMinSize(5)('abcdef') // true
- **/
+ */
 export const isMinSize =
   (message: string = "This field must bigger") =>
   (minSize: number) => {
@@ -174,7 +174,7 @@ export const isMinSize =
  * isOnlyNumbers(' a ') // false
  * isOnlyNumbers('123') // true
  * isOnlyNumbers('123a') // false
- **/
+ */
 export const isOnlyNumbers =
   (message: string = "This field must be composed of only numbers") =>
   (value: string): string => {
@@ -192,7 +192,7 @@ export const isOnlyNumbers =
  * isUnique.add('key', 'field')('value'); // true
  * isUnique.add('key', 'field')('value'); // false
  * isUnique.remove('key', 'field'); // true
- **/
+ */
 export const isUniqueDescriptive = (): {
   add: (
     key: string,

From 8fbee82a2459f63ac03051b2fd3081a98a94dd18 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 2 Oct 2023 15:17:22 -0300
Subject: [PATCH 228/313] fix: conditions used on postalCode validations

---
 .../grouping/AddressGroupComponent.vue        |  6 +-
 .../validators/BCeIDFormValidations.ts        |  6 +-
 .../helpers/validators/GlobalValidators.ts    | 36 ++++++--
 frontend/src/pages/FormBCeIDPage.vue          | 12 +--
 .../validators/BCeIDFormValidations.spec.ts   | 84 ++++++++++++++-----
 5 files changed, 102 insertions(+), 42 deletions(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 7832919d4d..169e04b644 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -116,21 +116,21 @@ const postalCodeValidators = computed(() => {
     case "CA":
       return [
         ...getValidations(
-          'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'
+          'location.addresses.*.postalCode(location.addresses.*.country.value === "CA")'
         ),
         submissionValidation(`location.addresses[${props.id}].postalCode`),
       ];
     case "US":
       return [
         ...getValidations(
-          'location.addresses.*.postalCode(location.addresses.*.country.text === "US")'
+          'location.addresses.*.postalCode(location.addresses.*.country.value === "US")'
         ),
         submissionValidation(`location.addresses[${props.id}].postalCode`),
       ];
     default:
       return [
         ...getValidations(
-          'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")'
+          'location.addresses.*.postalCode($.location.addresses.*.country.value !== "CA" && $.location.addresses.*.country.value !== "US")'
         ),
         submissionValidation(`location.addresses[${props.id}].postalCode`),
       ];
diff --git a/frontend/src/helpers/validators/BCeIDFormValidations.ts b/frontend/src/helpers/validators/BCeIDFormValidations.ts
index 0d2cde984d..0fbb1b4dbf 100644
--- a/frontend/src/helpers/validators/BCeIDFormValidations.ts
+++ b/frontend/src/helpers/validators/BCeIDFormValidations.ts
@@ -50,13 +50,13 @@ formFieldValidations["location.addresses.*.streetAddress"] = [
   isMaxSize("The address must be between 5 and 50 characters")(50),
 ];
 formFieldValidations[
-  'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")'
+  'location.addresses.*.postalCode(location.addresses.*.country.value === "CA")'
 ] = [isCanadianPostalCode];
 formFieldValidations[
-  'location.addresses.*.postalCode(location.addresses.*.country.text === "US")'
+  'location.addresses.*.postalCode(location.addresses.*.country.value === "US")'
 ] = [isUsZipCode];
 formFieldValidations[
-  'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && country.text !== "US")'
+  'location.addresses.*.postalCode($.location.addresses.*.country.value !== "CA" && $.location.addresses.*.country.value !== "US")'
 ] = [
   isOnlyNumbers(
     "Postal code should be composed of only numbers and should be between 5 and 10 characters"
diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index eaec71fdcd..372a18c9ba 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -296,6 +296,8 @@ export const formFieldValidations: Record<
 export const getValidations = (key: string): ((value: string) => string)[] =>
   formFieldValidations[key] || [];
 
+const arrayIndexGlobalRegex = /\.\*\./g;
+
 // This function will run the validators and return the errors
 export const validate = (
   keys: string[],
@@ -315,8 +317,17 @@ export const validate = (
       // We then load the field value
       const fieldValue = getFieldValue(fieldKey, target);
       // We define a function that will run the validation if the condition is true
-      const buildEval = (condition: string) =>
-        condition === "true" ? "true" : `target.${condition}`;
+      const buildEval = (condition: string) => {
+        if (condition === "true") {
+          return "true";
+        }
+        const targetGlobalRegex = /\$\./g;
+        let result = condition.replace(targetGlobalRegex, "target.");
+        if (!result.includes("target.")) {
+          result = `target.${result}`;
+        }
+        return result;
+      }
       const runValidation = (
         item: any,
         condition: string,
@@ -342,7 +353,7 @@ export const validate = (
               (subItem: any) =>
                 runValidation(
                   subItem,
-                  buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+                  buildEval(fieldCondition.replace(arrayIndexGlobalRegex, `[${index}].`)),
                   fieldKey.replace(".*.", `[${index}].`)
                 ) === ""
             );
@@ -351,7 +362,7 @@ export const validate = (
           return (
             runValidation(
               item,
-              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+              buildEval(fieldCondition.replace(arrayIndexGlobalRegex, `[${index}].`)),
               fieldKey.replace(".*.", `[${index}].`)
             ) === ""
           );
@@ -378,8 +389,17 @@ export const runValidation = (
   // We then load the field value
   const fieldValue = getFieldValue(fieldKey, target);
   // We define a function that will run the validation if the condition is true
-  const buildEval = (condition: string) =>
-    condition === "true" ? "true" : `target.${condition}`;
+  const buildEval = (condition: string) => {
+    if (condition === "true") {
+      return "true";
+    }
+    const targetGlobalRegex = /\$\./g;
+    let result = condition.replace(targetGlobalRegex, "target.");
+    if (!result.includes("target.")) {
+      result = `target.${result}`;
+    }
+    return result;
+  }
   const executeValidation = (
     item: any,
     condition: string,
@@ -409,7 +429,7 @@ export const runValidation = (
           const valid =
             executeValidation(
               subItem,
-              buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+              buildEval(fieldCondition.replace(arrayIndexGlobalRegex, `[${index}].`)),
               fieldKey.replace(".*.", `[${index}].`)
             ) === "";
           if (!valid) {
@@ -425,7 +445,7 @@ export const runValidation = (
       const valid =
         executeValidation(
           item,
-          buildEval(fieldCondition.replace(".*.", `[${index}].`)),
+          buildEval(fieldCondition.replace(arrayIndexGlobalRegex, `[${index}].`)),
           fieldKey.replace(".*.", `[${index}].`)
         ) === "";
       if (!valid) {
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 189a6a5bf8..9a731bde59 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -151,9 +151,9 @@ const progressData = reactive([
       "location.addresses.*.province.text",
       "location.addresses.*.city",
       "location.addresses.*.streetAddress",
-      'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
-      'location.addresses.*.postalCode(location.addresses.*.country.text === "US")',
-      'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")',
+      'location.addresses.*.postalCode(location.addresses.*.country.value === "CA")',
+      'location.addresses.*.postalCode(location.addresses.*.country.value === "US")',
+      'location.addresses.*.postalCode($.location.addresses.*.country.value !== "CA" && $.location.addresses.*.country.value !== "US")',
     ],
     extraValidations: [],
   },
@@ -197,9 +197,9 @@ const progressData = reactive([
       "location.addresses.*.province.text",
       "location.addresses.*.city",
       "location.addresses.*.streetAddress",
-      'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
-      'location.addresses.*.postalCode(location.addresses.*.country.text === "US")',
-      'location.addresses.*.postalCode(location.addresses.*.country.text !== "CA" && location.addresses.*.country.text !== "US")',
+      'location.addresses.*.postalCode(location.addresses.*.country.value === "CA")',
+      'location.addresses.*.postalCode(location.addresses.*.country.value === "US")',
+      'location.addresses.*.postalCode($.location.addresses.*.country.value !== "CA" && $.location.addresses.*.country.value !== "US")',
       "location.contacts.*.locationNames.*.text",
       "location.contacts.*.contactType.text",
       "location.contacts.*.firstName",
diff --git a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
index 2af78262bb..60ad71121c 100644
--- a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
+++ b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
@@ -9,6 +9,7 @@ import {
   getValidations,
   runValidation,
   validate,
+  formFieldValidations,
 } from "@/helpers/validators/GlobalValidators";
 
 import type { ValidationMessageType } from "@/dto/CommonTypesDto";
@@ -64,7 +65,7 @@ describe("BCeIDFormValidations.ts", () => {
   it("should return the value of a nested field with a condition", () => {
     expect(
       getFieldValue(
-        'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
+        'location.addresses.*.postalCode(location.addresses.*.country.value === "CA")',
         formDataDto
       )
     ).toEqual(["A1A1A1"]);
@@ -72,7 +73,7 @@ describe("BCeIDFormValidations.ts", () => {
   it("should return the value of a nested field with a condition", () => {
     expect(
       getFieldValue(
-        'location.addresses.*.postalCode(location.addresses.*.country.text === "US")',
+        'location.addresses.*.postalCode(location.addresses.*.country.value === "US")',
         formDataDto
       )
     ).toEqual(["A1A1A1"]);
@@ -92,16 +93,52 @@ describe("BCeIDFormValidations.ts", () => {
       validate(["location.addresses.*.locationName"], formDataDto)
     ).toBeTruthy();
   });
-  it("should return true for nested fields with conditions", () => {
-    expect(
-      validate(
-        [
-          'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
-        ],
-        formDataDto
-      )
-    ).toBeTruthy();
-  });
+  describe("nested fields with conditions", () => {
+    it("should return true when it's valid", () => {
+      expect(
+        validate(
+          ['location.addresses.*.postalCode(location.addresses.*.country.value === "CA")'],
+          formDataDto
+        )
+      ).toBeTruthy();
+    });
+    it("should return false when it's not valid", () => {
+      const newFormDataDto = structuredClone(formDataDto);
+      newFormDataDto.location.addresses[0].postalCode = "AAA111";
+      expect(
+        validate(
+          ['location.addresses.*.postalCode(location.addresses.*.country.value === "CA")'],
+          newFormDataDto
+        )
+      ).toBeFalsy();
+    });
+    describe("conditions with multiple wildcards", () => {
+      const condition =
+      '$.location.addresses.*.country.value !== "CA" && $.location.addresses.*.country.value !== "US"'
+      it("should return true when it's valid", () => {
+        const newFormDataDto = structuredClone(formDataDto);
+        newFormDataDto.location.addresses[0].country = {
+          value: "BR",
+          text: "Brazil"
+        };
+        newFormDataDto.location.addresses[0].postalCode = "12345678";
+        expect(
+          validate([`location.addresses.*.postalCode(${condition})`], newFormDataDto),
+        ).toBeTruthy();
+      });
+      it("should return false when it's not valid", () => {
+        const newFormDataDto = structuredClone(formDataDto);
+        newFormDataDto.location.addresses[0].country.value = {
+          value: "BR",
+          text: "Brazil"
+        };
+        newFormDataDto.location.addresses[0].postalCode = "A1A1A1";
+        expect(
+          validate([`location.addresses.*.postalCode(${condition})`], newFormDataDto),
+        ).toBeFalsy();
+      });
+    })
+  })
   it("should return true for nested fields withing nested fields", () => {
     expect(
       validate(["location.contacts.*.locationNames.*.text"], formDataDto)
@@ -112,16 +149,19 @@ describe("BCeIDFormValidations.ts", () => {
       validate(["businessInformation.businessType"], formDataDto)
     ).toBeTruthy();
   });
-  it("should return true for nested fields with conditions", () => {
-    expect(
-      validate(
-        [
-          'location.addresses.*.postalCode(location.addresses.*.country.text === "CA")',
-        ],
-        formDataDto
-      )
-    ).toBeTruthy();
-  });
+  describe("formFieldValidations", () => {
+    it("should compare contry values with two-letter country codes", () => {
+      // i.e. instead of comparing country values with the country names.
+
+      const countryValueConditions = Object.keys(formFieldValidations).filter((key) =>
+        key.match(/\(.+country\.value.+\)/),
+      );
+      expect(countryValueConditions.length).toBeGreaterThan(0);
+      countryValueConditions.forEach((key) => {
+        expect(key).toMatch(/['"][A-Z]{2}['"]/);
+      });
+    })
+  })
   describe("runValidation", () => {
     describe("when target is an array", () => {
       it("should stop at the first error when exhaustive is false (default)", () => {

From 399ff7ab3eef96fade6f904c90df1f28b15e80ea Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 2 Oct 2023 16:44:57 -0300
Subject: [PATCH 229/313] chore: fix VS Code resolution for source and test
 files

By fixing the test configuration and eliminating a conflict with the app
one.
---
 frontend/tsconfig.vitest.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/frontend/tsconfig.vitest.json b/frontend/tsconfig.vitest.json
index 45fa920374..ec50aa01f1 100644
--- a/frontend/tsconfig.vitest.json
+++ b/frontend/tsconfig.vitest.json
@@ -1,14 +1,12 @@
 {
   "extends": "./tsconfig.app.json",
   "exclude": [],
+  "include": ["tests/**/*"],
   "compilerOptions": {
     "composite": true,
     "lib": ["es2017", "dom", "dom.iterable"],
     "types": ["node", "jsdom"],
     "ignoreDeprecations": "5.0",
     "verbatimModuleSyntax": true,
-    "paths": {
-      "@/*": ["../src/*"]
-    },
   }
 }

From dc857bb30e5be68fe321df43df47516c67a6f6aa Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 3 Oct 2023 09:05:22 -0300
Subject: [PATCH 230/313] test: use a new query command after a click

Since it's unsafe to chain after a click.
---
 .../components/grouping/AddressGroupComponent.cy.ts          | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index 0d969b3358..f74d1608ec 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -144,10 +144,9 @@ describe('<AddressGroupComponent />', () => {
       .find('label')
       .and('include.text', 'Postal code')
 
+    cy.get('#country_0').should('be.visible').and('have.value', 'Canada').click()
+
     cy.get('#country_0')
-      .should('be.visible')
-      .and('have.value', 'Canada')
-      .click()
       .find('cds-combo-box-item[data-id="US"]')
       .click()
       .and('have.value', 'United States of America')

From 418cb8ae530bbb08b4bce2215ebb344ce619bfa7 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 3 Oct 2023 09:35:08 -0300
Subject: [PATCH 231/313] test: force click button

---
 .../components/components/grouping/AddressGroupComponent.cy.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index f74d1608ec..bc06f529ee 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -148,7 +148,7 @@ describe('<AddressGroupComponent />', () => {
 
     cy.get('#country_0')
       .find('cds-combo-box-item[data-id="US"]')
-      .click()
+      .click({ force: true })
       .and('have.value', 'United States of America')
 
     cy.wait('@getStates')

From 75de0b7ba2c5172f572172c2de8ace494d702159 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 3 Oct 2023 10:11:10 -0300
Subject: [PATCH 232/313] fix: prevent completing business step with invalid
 data

---
 .../forms/AutoCompleteInputComponent.vue      | 33 +++++++++----------
 .../BusinessInformationWizardStep.vue         |  3 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index b6f1104f92..72951a4306 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
 // Carbon
-import '@carbon/web-components/es/components/combo-box/index';
+import '@carbon/web-components/es/components/combo-box/index'
 // Composables
 import { useEventBus } from '@vueuse/core'
 // Types
@@ -38,7 +38,7 @@ const revalidateBus = useEventBus<void>('revalidate-bus')
 watch(error, () => emit('error', error.value))
 watch(
   () => props.errorMessage,
-  () => (error.value = props.errorMessage)
+  () => (error.value = props.errorMessage),
 )
 
 //We set the value prop as a reference for update reason
@@ -46,7 +46,10 @@ const inputValue = ref(props.modelValue)
 
 // This is to make the input list contains the selected value to show when component render
 const inputList = computed<Array<BusinessSearchResult>>(() =>
-  ((!props.contents || props.contents.length === 0) ? [{name: props.modelValue, code: '',status:'',legalType:''}] : props.contents).filter(entry => entry.name)
+  (!props.contents || props.contents.length === 0
+    ? [{ name: props.modelValue, code: '', status: '', legalType: '' }]
+    : props.contents
+  ).filter((entry) => entry.name),
 )
 
 let selectedValue: BusinessSearchResult | undefined = undefined
@@ -65,7 +68,7 @@ watch(
   () => {
     inputValue.value = props.modelValue
     validateInput(inputValue.value)
-  }
+  },
 )
 watch([inputValue], () => {
   validateInput(inputValue.value)
@@ -96,39 +99,35 @@ const onTyping = (event: any) => {
 }
 
 revalidateBus.on(() => validateInput(inputValue.value))
-
-watch(() => props.modelValue,() => inputValue.value = props.modelValue)
 </script>
 
-<template>  
+<template>
   <div class="grouping-02">
     <cds-combo-box
       :id="id"
-      :name="id"      
+      :name="id"
       :helper-text="tip"
       :title-text="label"
-      :value="inputValue"      
-filterable
+      :value="inputValue"
+      filterable
       :invalid="error ? true : false"
       :invalid-text="error"
       @cds-combo-box-selected="selectAutocompleteItem"
       v-on:input="onTyping"
-      v-on:blur="(event:any) => validateInput(event.srcElement._filterInputValue)"
+      v-on:blur="(event: any) => validateInput(event.srcElement._filterInputValue)"
       :data-focus="id"
       :data-scroll="id"
       :data-id="'input-' + id"
-      >
-
+    >
       <cds-combo-box-item
         v-for="item in inputList"
         :key="item.code"
         :data-id="item.code"
-        :data-value="item.name" 
-        :value="item.name">
+        :data-value="item.name"
+        :value="item.name"
+      >
         {{ item.name }}
       </cds-combo-box-item>
-      
     </cds-combo-box>
   </div>
 </template>
-
diff --git a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
index db33c16595..7bc137aed9 100644
--- a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
@@ -108,7 +108,7 @@ watch([autoCompleteResult], () => {
   // reset business validation state
   validation.business = false;
 
-  if (autoCompleteResult.value) {
+  if (autoCompleteResult.value && autoCompleteResult.value.code) {
     toggleErrorMessages(false, false);
 
     formData.value.businessInformation.incorporationNumber =
@@ -239,6 +239,7 @@ watch([selectedOption], () => {
         ]"
       :loading="loading"
       @update:selected-value="autoCompleteResult = $event"
+      @update:model-value="validation.business = false"
     />
 
     <cds-inline-loading status="active" v-if="showDetailsLoading">Loading client details...</cds-inline-loading>

From 6c3baab7e8fe8545cf476fde7627beb591098233 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 3 Oct 2023 11:00:50 -0300
Subject: [PATCH 233/313] fix: prevent fetching for name "undefined"

---
 frontend/src/components/grouping/AddressGroupComponent.vue    | 4 +++-
 .../src/pages/bceidform/BusinessInformationWizardStep.vue     | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 169e04b644..fedac02cfd 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -182,7 +182,9 @@ const postalCodeNaming = computed(() =>
 
 const autoCompleteUrl = computed(
   () =>
-    `/api/clients/addresses?country=${selectedValue.country.value}&maxSuggestions=10&searchTerm=${selectedValue.streetAddress}`
+    `/api/clients/addresses?country=${
+      selectedValue.country.value ?? ""
+    }&maxSuggestions=10&searchTerm=${selectedValue.streetAddress ?? ""}`,
 );
 const autoCompleteResult = ref<BusinessSearchResult | undefined>(
   {} as BusinessSearchResult
diff --git a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
index 7bc137aed9..ed97d17b40 100644
--- a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
@@ -76,7 +76,7 @@ const selectedOption = computed(() => {
 });
 
 const autoCompleteUrl = computed(
-  () => `/api/clients/name/${formData.value.businessInformation.businessName}`
+  () => `/api/clients/name/${formData.value.businessInformation.businessName || ""}`
 );
 
 const showAutoCompleteInfo = ref<boolean>(false);

From cf811b08d2a5aa948a3e75d5e48028ff54373726 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 3 Oct 2023 11:16:25 -0300
Subject: [PATCH 234/313] test: wait before clicking the option

---
 .../components/components/grouping/AddressGroupComponent.cy.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index bc06f529ee..4dd6d33cc7 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -148,7 +148,8 @@ describe('<AddressGroupComponent />', () => {
 
     cy.get('#country_0')
       .find('cds-combo-box-item[data-id="US"]')
-      .click({ force: true })
+      .should('be.visible') // wait for option to become visible before clicking it
+      .click()
       .and('have.value', 'United States of America')
 
     cy.wait('@getStates')

From 7d5e2c86ae04f3e261b94b3049292077404aaddd Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 3 Oct 2023 09:19:25 -0700
Subject: [PATCH 235/313] Made a minor change for internal emails after a
 conversation with Andrew.

---
 backend/src/main/resources/templates/approval.html | 2 +-
 backend/src/main/resources/templates/revision.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/resources/templates/approval.html b/backend/src/main/resources/templates/approval.html
index a468023a34..9b0cabddbb 100644
--- a/backend/src/main/resources/templates/approval.html
+++ b/backend/src/main/resources/templates/approval.html
@@ -26,7 +26,7 @@
 		<div>&nbsp;</div>
 			
 		<p>Thank you,</p>
-		<p>The Client Management Team</p>
+		<p>Client Management System</p>
 		<div>&nbsp;</div>
 		
 		<p>
diff --git a/backend/src/main/resources/templates/revision.html b/backend/src/main/resources/templates/revision.html
index 300d0f5e83..9cc0f0f760 100644
--- a/backend/src/main/resources/templates/revision.html
+++ b/backend/src/main/resources/templates/revision.html
@@ -26,7 +26,7 @@
 		<div>&nbsp;</div>
 			
 		<p>Thank you,</p>
-		<p>The Client Management Team</p>
+		<p>Client Management System</p>
 		<div>&nbsp;</div>
 		
 		<p>

From bd5cb304f82f0ec20cc7f9415a1c1a639d0dc8cf Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 3 Oct 2023 12:47:47 -0300
Subject: [PATCH 236/313] style: add semi-colon as requested after review

---
 frontend/src/components/forms/AutoCompleteInputComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index 72951a4306..c210e80938 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
 // Carbon
-import '@carbon/web-components/es/components/combo-box/index'
+import '@carbon/web-components/es/components/combo-box/index';
 // Composables
 import { useEventBus } from '@vueuse/core'
 // Types

From 95642475c4a150c90b380710b11404a3f842560e Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 3 Oct 2023 15:05:52 -0300
Subject: [PATCH 237/313] style: add the dollar signal to all conditions

---
 .../src/components/grouping/AddressGroupComponent.vue     | 4 ++--
 frontend/src/helpers/validators/BCeIDFormValidations.ts   | 4 ++--
 frontend/src/pages/FormBCeIDPage.vue                      | 8 ++++----
 .../helpers/validators/BCeIDFormValidations.spec.ts       | 8 ++++----
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index fedac02cfd..304f1851b8 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -116,14 +116,14 @@ const postalCodeValidators = computed(() => {
     case "CA":
       return [
         ...getValidations(
-          'location.addresses.*.postalCode(location.addresses.*.country.value === "CA")'
+          'location.addresses.*.postalCode($.location.addresses.*.country.value === "CA")'
         ),
         submissionValidation(`location.addresses[${props.id}].postalCode`),
       ];
     case "US":
       return [
         ...getValidations(
-          'location.addresses.*.postalCode(location.addresses.*.country.value === "US")'
+          'location.addresses.*.postalCode($.location.addresses.*.country.value === "US")'
         ),
         submissionValidation(`location.addresses[${props.id}].postalCode`),
       ];
diff --git a/frontend/src/helpers/validators/BCeIDFormValidations.ts b/frontend/src/helpers/validators/BCeIDFormValidations.ts
index 0fbb1b4dbf..a912177457 100644
--- a/frontend/src/helpers/validators/BCeIDFormValidations.ts
+++ b/frontend/src/helpers/validators/BCeIDFormValidations.ts
@@ -50,10 +50,10 @@ formFieldValidations["location.addresses.*.streetAddress"] = [
   isMaxSize("The address must be between 5 and 50 characters")(50),
 ];
 formFieldValidations[
-  'location.addresses.*.postalCode(location.addresses.*.country.value === "CA")'
+  'location.addresses.*.postalCode($.location.addresses.*.country.value === "CA")'
 ] = [isCanadianPostalCode];
 formFieldValidations[
-  'location.addresses.*.postalCode(location.addresses.*.country.value === "US")'
+  'location.addresses.*.postalCode($.location.addresses.*.country.value === "US")'
 ] = [isUsZipCode];
 formFieldValidations[
   'location.addresses.*.postalCode($.location.addresses.*.country.value !== "CA" && $.location.addresses.*.country.value !== "US")'
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 9a731bde59..0c67b311a7 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -151,8 +151,8 @@ const progressData = reactive([
       "location.addresses.*.province.text",
       "location.addresses.*.city",
       "location.addresses.*.streetAddress",
-      'location.addresses.*.postalCode(location.addresses.*.country.value === "CA")',
-      'location.addresses.*.postalCode(location.addresses.*.country.value === "US")',
+      'location.addresses.*.postalCode($.location.addresses.*.country.value === "CA")',
+      'location.addresses.*.postalCode($.location.addresses.*.country.value === "US")',
       'location.addresses.*.postalCode($.location.addresses.*.country.value !== "CA" && $.location.addresses.*.country.value !== "US")',
     ],
     extraValidations: [],
@@ -197,8 +197,8 @@ const progressData = reactive([
       "location.addresses.*.province.text",
       "location.addresses.*.city",
       "location.addresses.*.streetAddress",
-      'location.addresses.*.postalCode(location.addresses.*.country.value === "CA")',
-      'location.addresses.*.postalCode(location.addresses.*.country.value === "US")',
+      'location.addresses.*.postalCode($.location.addresses.*.country.value === "CA")',
+      'location.addresses.*.postalCode($.location.addresses.*.country.value === "US")',
       'location.addresses.*.postalCode($.location.addresses.*.country.value !== "CA" && $.location.addresses.*.country.value !== "US")',
       "location.contacts.*.locationNames.*.text",
       "location.contacts.*.contactType.text",
diff --git a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
index 60ad71121c..7f53ccffb4 100644
--- a/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
+++ b/frontend/tests/unittests/helpers/validators/BCeIDFormValidations.spec.ts
@@ -65,7 +65,7 @@ describe("BCeIDFormValidations.ts", () => {
   it("should return the value of a nested field with a condition", () => {
     expect(
       getFieldValue(
-        'location.addresses.*.postalCode(location.addresses.*.country.value === "CA")',
+        'location.addresses.*.postalCode($.location.addresses.*.country.value === "CA")',
         formDataDto
       )
     ).toEqual(["A1A1A1"]);
@@ -73,7 +73,7 @@ describe("BCeIDFormValidations.ts", () => {
   it("should return the value of a nested field with a condition", () => {
     expect(
       getFieldValue(
-        'location.addresses.*.postalCode(location.addresses.*.country.value === "US")',
+        'location.addresses.*.postalCode($.location.addresses.*.country.value === "US")',
         formDataDto
       )
     ).toEqual(["A1A1A1"]);
@@ -97,7 +97,7 @@ describe("BCeIDFormValidations.ts", () => {
     it("should return true when it's valid", () => {
       expect(
         validate(
-          ['location.addresses.*.postalCode(location.addresses.*.country.value === "CA")'],
+          ['location.addresses.*.postalCode($.location.addresses.*.country.value === "CA")'],
           formDataDto
         )
       ).toBeTruthy();
@@ -107,7 +107,7 @@ describe("BCeIDFormValidations.ts", () => {
       newFormDataDto.location.addresses[0].postalCode = "AAA111";
       expect(
         validate(
-          ['location.addresses.*.postalCode(location.addresses.*.country.value === "CA")'],
+          ['location.addresses.*.postalCode($.location.addresses.*.country.value === "CA")'],
           newFormDataDto
         )
       ).toBeFalsy();

From 24707feba477b6d494d6599ff935a7765aaa23db Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 3 Oct 2023 15:11:48 -0300
Subject: [PATCH 238/313] feat: turn the dollar signal required

---
 frontend/src/helpers/validators/GlobalValidators.ts | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index 372a18c9ba..fe67421e8d 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -297,6 +297,7 @@ export const getValidations = (key: string): ((value: string) => string)[] =>
   formFieldValidations[key] || [];
 
 const arrayIndexGlobalRegex = /\.\*\./g;
+const targetGlobalRegex = /\$\./g;
 
 // This function will run the validators and return the errors
 export const validate = (
@@ -321,11 +322,7 @@ export const validate = (
         if (condition === "true") {
           return "true";
         }
-        const targetGlobalRegex = /\$\./g;
-        let result = condition.replace(targetGlobalRegex, "target.");
-        if (!result.includes("target.")) {
-          result = `target.${result}`;
-        }
+        const result = condition.replace(targetGlobalRegex, "target.");
         return result;
       }
       const runValidation = (
@@ -393,11 +390,7 @@ export const runValidation = (
     if (condition === "true") {
       return "true";
     }
-    const targetGlobalRegex = /\$\./g;
-    let result = condition.replace(targetGlobalRegex, "target.");
-    if (!result.includes("target.")) {
-      result = `target.${result}`;
-    }
+    const result = condition.replace(targetGlobalRegex, "target.");
     return result;
   }
   const executeValidation = (

From d19af8134447dbdfad05ee8a648890cbd3d9bb28 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 3 Oct 2023 12:11:33 -0700
Subject: [PATCH 239/313] Made code reviews

---
 .../forms/AutoCompleteInputComponent.vue      | 106 +++++++++---------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index c210e80938..b5a420e5ce 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -1,79 +1,79 @@
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { ref, computed, watch } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/combo-box/index';
+import "@carbon/web-components/es/components/combo-box/index";
 // Composables
-import { useEventBus } from '@vueuse/core'
+import { useEventBus } from "@vueuse/core";
 // Types
-import type { BusinessSearchResult } from '@/dto/CommonTypesDto'
-import { isEmpty } from '@/dto/CommonTypesDto'
+import type { BusinessSearchResult } from "@/dto/CommonTypesDto";
+import { isEmpty } from "@/dto/CommonTypesDto";
 
 //Define the input properties for this component
 const props = defineProps<{
-  id: string
-  label: string
-  tip?: string
-  placeholder?: string
-  modelValue: string
-  contents: Array<BusinessSearchResult>
-  validations: Array<Function>
-  errorMessage?: string
-  loading?: boolean
-}>()
+  id: string;
+  label: string;
+  tip?: string;
+  placeholder?: string;
+  modelValue: string;
+  contents: Array<BusinessSearchResult>;
+  validations: Array<Function>;
+  errorMessage?: string;
+  loading?: boolean;
+}>();
 
 //Events we emit during component lifecycle
 const emit = defineEmits<{
-  (e: 'error', value: string | undefined): void
-  (e: 'empty', value: boolean): void
-  (e: 'update:model-value', value: string): void
-  (e: 'update:selected-value', value: BusinessSearchResult | undefined): void
-}>()
+  (e: "error", value: string | undefined): void;
+  (e: "empty", value: boolean): void;
+  (e: "update:model-value", value: string): void;
+  (e: "update:selected-value", value: BusinessSearchResult | undefined): void;
+}>();
 
 //We initialize the error message handling for validation
-const error = ref<string | undefined>(props.errorMessage || '')
+const error = ref<string | undefined>(props.errorMessage || "");
 
-const revalidateBus = useEventBus<void>('revalidate-bus')
+const revalidateBus = useEventBus<void>("revalidate-bus");
 
 //We watch for error changes to emit events
-watch(error, () => emit('error', error.value))
+watch(error, () => emit("error", error.value));
 watch(
   () => props.errorMessage,
-  () => (error.value = props.errorMessage),
-)
+  () => (error.value = props.errorMessage)
+);
 
 //We set the value prop as a reference for update reason
-const inputValue = ref(props.modelValue)
+const inputValue = ref(props.modelValue);
 
 // This is to make the input list contains the selected value to show when component render
 const inputList = computed<Array<BusinessSearchResult>>(() =>
   (!props.contents || props.contents.length === 0
-    ? [{ name: props.modelValue, code: '', status: '', legalType: '' }]
+    ? [{ name: props.modelValue, code: "", status: "", legalType: "" }]
     : props.contents
-  ).filter((entry) => entry.name),
-)
+  ).filter((entry) => entry.name)
+);
 
-let selectedValue: BusinessSearchResult | undefined = undefined
+let selectedValue: BusinessSearchResult | undefined = undefined;
 
 //This function emits the events on update
 const emitValueChange = (newValue: string): void => {
-  selectedValue = inputList.value.find((entry) => entry.code === newValue)
-  emit('update:model-value', selectedValue?.name ?? newValue)
-  emit('update:selected-value', selectedValue)
-  emit('empty', isEmpty(selectedValue))
-}
+  selectedValue = inputList.value.find((entry) => entry.code === newValue);
+  emit("update:model-value", selectedValue?.name ?? newValue);
+  emit("update:selected-value", selectedValue);
+  emit("empty", isEmpty(selectedValue));
+};
 
-emit('empty', true)
+emit("empty", true);
 watch(
   () => props.modelValue,
   () => {
-    inputValue.value = props.modelValue
-    validateInput(inputValue.value)
-  },
-)
+    inputValue.value = props.modelValue;
+    validateInput(inputValue.value);
+  }
+);
 watch([inputValue], () => {
-  validateInput(inputValue.value)
-  emitValueChange(inputValue.value)
-})
+  validateInput(inputValue.value);
+  emitValueChange(inputValue.value);
+});
 
 //We call all the validations
 const validateInput = (newValue: string) => {
@@ -82,23 +82,23 @@ const validateInput = (newValue: string) => {
       props.validations
         .map((validation) => validation(newValue))
         .filter((errorMessage) => {
-          if (errorMessage) return true
-          return false
+          if (errorMessage) return true;
+          return false;
         })
-        .shift() ?? props.errorMessage
+        .shift() ?? props.errorMessage;
   }
-}
+};
 
 const selectAutocompleteItem = (event: any) => {
-  emitValueChange(event?.detail?.item?.getAttribute('data-id'))
-}
+  emitValueChange(event?.detail?.item?.getAttribute("data-id"));
+};
 
 const onTyping = (event: any) => {
-  inputValue.value = event.srcElement._filterInputValue
-  emit('update:model-value', inputValue.value)
-}
+  inputValue.value = event.srcElement._filterInputValue;
+  emit("update:model-value", inputValue.value);
+};
 
-revalidateBus.on(() => validateInput(inputValue.value))
+revalidateBus.on(() => validateInput(inputValue.value));
 </script>
 
 <template>

From 3f5b497b33ae29fd3a4736142c3ffde46a894309 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 3 Oct 2023 12:15:03 -0700
Subject: [PATCH 240/313] Made more code reviews

---
 .../forms/DropdownInputComponent.vue          |  94 +++++++-------
 .../forms/MultiselectInputComponent.vue       | 115 +++++++++---------
 .../components/forms/RadioInputComponent.vue  |  71 +++++------
 .../components/forms/TextInputComponent.vue   |  73 +++++------
 4 files changed, 181 insertions(+), 172 deletions(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index 64e9b1b100..528c478bac 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -1,57 +1,59 @@
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { ref, computed, watch } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/combo-box/index';
+import "@carbon/web-components/es/components/combo-box/index";
 // Composables
-import { useEventBus } from '@vueuse/core'
+import { useEventBus } from "@vueuse/core";
 // Types
-import type { CodeNameType } from '@/dto/CommonTypesDto'
-import { isEmpty } from '@/dto/CommonTypesDto'
+import type { CodeNameType } from "@/dto/CommonTypesDto";
+import { isEmpty } from "@/dto/CommonTypesDto";
 
 //Define the input properties for this component
 const props = defineProps<{
-  id: string
-  label: string
-  placeholder?: string
-  tip: string
-  modelValue: Array<CodeNameType>
-  initialValue: string
-  validations: Array<Function>
-  errorMessage?: string
-}>()
+  id: string;
+  label: string;
+  placeholder?: string;
+  tip: string;
+  modelValue: Array<CodeNameType>;
+  initialValue: string;
+  validations: Array<Function>;
+  errorMessage?: string;
+}>();
 
 //Events we emit during component lifecycle
 const emit = defineEmits<{
-  (e: 'error', value: string | undefined): void
-  (e: 'empty', value: boolean): void
-  (e: 'update:modelValue', value: string | undefined): void
-  (e: 'update:selectedValue', value: CodeNameType | undefined): void
-}>()
+  (e: "error", value: string | undefined): void;
+  (e: "empty", value: boolean): void;
+  (e: "update:modelValue", value: string | undefined): void;
+  (e: "update:selectedValue", value: CodeNameType | undefined): void;
+}>();
 
 //We initialize the error message handling for validation
-const error = ref<string | undefined>(props.errorMessage || '')
+const error = ref<string | undefined>(props.errorMessage || "");
 
-const revalidateBus = useEventBus<void>('revalidate-bus')
+const revalidateBus = useEventBus<void>("revalidate-bus");
 
 //We set it as a separated ref due to props not being updatable
-const selectedValue = ref(props.initialValue)
+const selectedValue = ref(props.initialValue);
 // This is to make the input list contains the selected value to show when component render
 const inputList = computed<Array<CodeNameType>>(() =>
-  ((!props.modelValue || props.modelValue.length === 0) ? [{name: props.initialValue, code: '',status:'',legalType:''}] : props.modelValue)
-)
+  !props.modelValue || props.modelValue.length === 0
+    ? [{ name: props.initialValue, code: "", status: "", legalType: "" }]
+    : props.modelValue
+);
 
 //We set the value prop as a reference for update reason
-emit('empty', isEmpty(props.initialValue))
+emit("empty", isEmpty(props.initialValue));
 //This function emits the events on update
 const emitValueChange = (newValue: string): void => {
   const reference = newValue
     ? props.modelValue.find((entry) => entry.code === newValue)
-    : undefined
+    : undefined;
 
-  emit('update:modelValue', newValue)
-  emit('update:selectedValue', reference)
-  emit('empty', isEmpty(newValue))
-}
+  emit("update:modelValue", newValue);
+  emit("update:selectedValue", reference);
+  emit("empty", isEmpty(newValue));
+};
 
 //We call all the validations
 const validateInput = (newValue: any) => {
@@ -60,16 +62,16 @@ const validateInput = (newValue: any) => {
       props.validations
         .map((validation) => validation(newValue))
         .filter((errorMessage) => {
-          if (errorMessage) return true
-          return false
+          if (errorMessage) return true;
+          return false;
         })
-        .shift() ?? props.errorMessage
+        .shift() ?? props.errorMessage;
   }
-}
+};
 
-const selectItem = (event:any) => {  
-  selectedValue.value = event?.detail?.item?.getAttribute('data-id')
-}
+const selectItem = (event: any) => {
+  selectedValue.value = event?.detail?.item?.getAttribute("data-id");
+};
 
 /**
  * This array is used in a way that allows to mount a brand new combo-box
@@ -82,27 +84,27 @@ const comboBoxMountTime = ref<[number]>([Date.now()]);
 
 //Watch for changes on the input
 watch([selectedValue], () => {
-  if (selectedValue.value === '') {
+  if (selectedValue.value === "") {
     comboBoxMountTime.value = [Date.now()];
   }
-  validateInput(selectedValue.value)
-  emitValueChange(selectedValue.value)
-})
+  validateInput(selectedValue.value);
+  emitValueChange(selectedValue.value);
+});
 
-watch(inputList,() => (selectedValue.value = props.initialValue))
+watch(inputList, () => (selectedValue.value = props.initialValue));
 
 //We watch for error changes to emit events
-watch(error, () => emit('error', error.value))
+watch(error, () => emit("error", error.value));
 watch(
   () => props.errorMessage,
   () => (error.value = props.errorMessage)
-)
+);
 watch(
   () => props.initialValue,
   () => (selectedValue.value = props.initialValue)
-)
+);
 
-revalidateBus.on(() => validateInput(selectedValue.value))
+revalidateBus.on(() => validateInput(selectedValue.value));
 </script>
 
 <template>
diff --git a/frontend/src/components/forms/MultiselectInputComponent.vue b/frontend/src/components/forms/MultiselectInputComponent.vue
index aedce8f6e4..536cce2780 100644
--- a/frontend/src/components/forms/MultiselectInputComponent.vue
+++ b/frontend/src/components/forms/MultiselectInputComponent.vue
@@ -1,117 +1,120 @@
 <script setup lang="ts">
-import { ref,computed, watch } from 'vue'
+import { ref, computed, watch } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/multi-select/index';
-import '@carbon/web-components/es/components/tag/index';
+import "@carbon/web-components/es/components/multi-select/index";
+import "@carbon/web-components/es/components/tag/index";
 // Composables
-import { useEventBus } from '@vueuse/core'
+import { useEventBus } from "@vueuse/core";
 // Types
-import type {  CodeNameType } from '@/dto/CommonTypesDto'
-import { isEmpty } from '@/dto/CommonTypesDto'
+import type { CodeNameType } from "@/dto/CommonTypesDto";
+import { isEmpty } from "@/dto/CommonTypesDto";
 
 //Define the input properties for this component
 const props = defineProps<{
-  id: string
-  label: string
-  tip: string
-  modelValue: Array<CodeNameType>
-  selectedValues?: Array<string>
-  initialValue: string
-  validations: Array<Function>
-  errorMessage?: string
-}>()
+  id: string;
+  label: string;
+  tip: string;
+  modelValue: Array<CodeNameType>;
+  selectedValues?: Array<string>;
+  initialValue: string;
+  validations: Array<Function>;
+  errorMessage?: string;
+}>();
 
 //Events we emit during component lifecycle
 const emit = defineEmits<{
-  (e: 'error', value: string | undefined): void
-  (e: 'empty', value: boolean): void
-  (e: 'update:modelValue', value: string[] | undefined): void
-  (e: 'update:selectedValue', value: Array<CodeNameType> | undefined): void
-}>()
+  (e: "error", value: string | undefined): void;
+  (e: "empty", value: boolean): void;
+  (e: "update:modelValue", value: string[] | undefined): void;
+  (e: "update:selectedValue", value: Array<CodeNameType> | undefined): void;
+}>();
 
 //We initialize the error message handling for validation
-const error = ref<string | undefined>(props.errorMessage || '')
+const error = ref<string | undefined>(props.errorMessage || "");
 
-const revalidateBus = useEventBus<void>('revalidate-bus')
+const revalidateBus = useEventBus<void>("revalidate-bus");
 
 //We set it as a separated ref due to props not being updatable
-const selectedValue = ref(props.initialValue)
+const selectedValue = ref(props.initialValue);
 // This is to make the input list contains the selected value to show when component render
 const inputList = computed<Array<CodeNameType>>(() =>
-  ((!props.modelValue || props.modelValue.length === 0) ? [{name: props.initialValue, code: '',status:'',legalType:''}] : props.modelValue)
-)
+  !props.modelValue || props.modelValue.length === 0
+    ? [{ name: props.initialValue, code: "", status: "", legalType: "" }]
+    : props.modelValue
+);
 
 //We set the value prop as a reference for update reason
-emit('empty', props.selectedValues ? props.selectedValues.length === 0 : true)
+emit("empty", props.selectedValues ? props.selectedValues.length === 0 : true);
 
 //Controls the selected values
-const items = ref<string[]>([])
+const items = ref<string[]>([]);
 
 //We call all the validations
 const validateInput = (newValue: any) => {
   if (props.validations && props.validations.length > 0) {
     const hasError = (message: string) => {
-      if (message) return true
-      return false
-    }
+      if (message) return true;
+      return false;
+    };
     const validate = (value: string) =>
       props.validations
         .map((validation) => validation(value))
         .filter(hasError)
-        .shift() ?? props.errorMessage
+        .shift() ?? props.errorMessage;
 
     error.value =
       items.value
         .map((item: string) => validate(item))
         .filter(hasError)
-        .shift() ?? props.errorMessage
+        .shift() ?? props.errorMessage;
   }
-}
+};
 
 const emitChange = () => {
   const reference = props.modelValue.filter((entry) =>
     items.value.includes(entry.name)
-  )
-  emit('update:modelValue', items.value)
-  emit('update:selectedValue', reference)
-  emit('empty', reference.length === 0)
-}
+  );
+  emit("update:modelValue", items.value);
+  emit("update:selectedValue", reference);
+  emit("empty", reference.length === 0);
+};
 
 const addFromSelection = (itemCode: string) => {
-  const reference = props.modelValue.find((entry) => entry.name === itemCode)
+  const reference = props.modelValue.find((entry) => entry.name === itemCode);
   if (reference) {
-    items.value.push(reference.name)
-    selectedValue.value = items.value.join(',')
+    items.value.push(reference.name);
+    selectedValue.value = items.value.join(",");
   }
-}
+};
 
-const selectItems = (event:any) => {
+const selectItems = (event: any) => {
   // Why this undefined data check is here you might ask? Well, it's because I can't emit the event with value on target
-  const contentValue = event?.data !== undefined ? event?.data : event.target.value
-  selectedValue.value = contentValue
-  items.value = contentValue.split(',').filter((value:string) => value)
-}
+  const contentValue =
+    event?.data !== undefined ? event?.data : event.target.value;
+  selectedValue.value = contentValue;
+  items.value = contentValue.split(",").filter((value: string) => value);
+};
 
-props.selectedValues?.forEach((value: string) => addFromSelection(value))
+props.selectedValues?.forEach((value: string) => addFromSelection(value));
 
-watch([items], () => emitChange())
+watch([items], () => emitChange());
 
 watch(
   () => props.modelValue,
   () => (selectedValue.value = props.initialValue)
-)
+);
 
-watch([selectedValue], () => validateInput(selectedValue.value))
+watch([selectedValue], () => validateInput(selectedValue.value));
 
 //We watch for error changes to emit events
-watch(error, () => emit('error', error.value))
+watch(error, () => emit("error", error.value));
 watch(
   () => props.errorMessage,
   () => (error.value = props.errorMessage)
-)
+);
 
-validateInput(selectedValue.value)
-revalidateBus.on(() => validateInput(selectedValue.value))
+validateInput(selectedValue.value);
+revalidateBus.on(() => validateInput(selectedValue.value));
 </script>
 
 <template>
@@ -141,4 +144,4 @@ revalidateBus.on(() => validateInput(selectedValue.value))
       </cds-multi-select>
     </div>
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/frontend/src/components/forms/RadioInputComponent.vue b/frontend/src/components/forms/RadioInputComponent.vue
index 816f02af76..f573037cb4 100644
--- a/frontend/src/components/forms/RadioInputComponent.vue
+++ b/frontend/src/components/forms/RadioInputComponent.vue
@@ -1,42 +1,42 @@
 <script setup lang="ts">
-import { ref, watch } from 'vue'
-// Carbon 
-import '@carbon/web-components/es/components/radio-button/index';
+import { ref, watch } from "vue";
+// Carbon
+import "@carbon/web-components/es/components/radio-button/index";
 // Composables
-import { useEventBus } from '@vueuse/core'
+import { useEventBus } from "@vueuse/core";
 // Types
-import type { CodeDescrType } from '@/dto/CommonTypesDto'
-import { isEmpty } from '@/dto/CommonTypesDto'
+import type { CodeDescrType } from "@/dto/CommonTypesDto";
+import { isEmpty } from "@/dto/CommonTypesDto";
 
 const props = defineProps<{
-  id: string
-  label: string
-  tip?: string
-  modelValue: Array<CodeDescrType>
-  initialValue: string
-  validations: Array<Function>
-  errorMessage?: string
-}>()
+  id: string;
+  label: string;
+  tip?: string;
+  modelValue: Array<CodeDescrType>;
+  initialValue: string;
+  validations: Array<Function>;
+  errorMessage?: string;
+}>();
 
 //Events we emit during component lifecycle
 const emit = defineEmits<{
-  (e: 'error', value: string | undefined): void
-  (e: 'empty', value: boolean): void
-  (e: 'update:model-value', value: string | undefined): void
-}>()
+  (e: "error", value: string | undefined): void;
+  (e: "empty", value: boolean): void;
+  (e: "update:model-value", value: string | undefined): void;
+}>();
 
-const selectedValue = ref<string>(props.initialValue)
+const selectedValue = ref<string>(props.initialValue);
 //We initialize the error message handling for validation
-const error = ref<string | undefined>(props.errorMessage || '')
+const error = ref<string | undefined>(props.errorMessage || "");
 
-const revalidateBus = useEventBus<void>('revalidate-bus')
+const revalidateBus = useEventBus<void>("revalidate-bus");
 
 //We watch for error changes to emit events
-watch(error, () => emit('error', error.value))
+watch(error, () => emit("error", error.value));
 watch(
   () => props.errorMessage,
   () => (error.value = props.errorMessage)
-)
+);
 
 //We call all the validations
 const validateInput = () => {
@@ -45,28 +45,29 @@ const validateInput = () => {
       props.validations
         .map((validation) => validation(selectedValue.value))
         .filter((errorMessage) => {
-          if (errorMessage) return true
-          return false
+          if (errorMessage) return true;
+          return false;
         })
-        .shift() ?? props.errorMessage
+        .shift() ?? props.errorMessage;
   }
-  emit('empty', isEmpty(selectedValue))
-}
+  emit("empty", isEmpty(selectedValue));
+};
 
 //We watch for input changes to emit events
 watch(selectedValue, () => {
-  validateInput()
+  validateInput();
   emit(
-    'update:model-value',
+    "update:model-value",
     props.modelValue
       .map((entry) => entry.value)
       .find((entry) => entry === selectedValue.value)
-  )
-  emit('empty', isEmpty(selectedValue))
-})
+  );
+  emit("empty", isEmpty(selectedValue));
+});
 
-const updateSelectedValue = (event: any) => (selectedValue.value = event.detail.value)
-revalidateBus.on(() => validateInput())
+const updateSelectedValue = (event: any) =>
+  (selectedValue.value = event.detail.value);
+revalidateBus.on(() => validateInput());
 </script>
 
 <template>
diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index 09fdbf3e6d..3a53aee96f 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -1,57 +1,57 @@
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { ref, watch } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/text-input/index';
+import "@carbon/web-components/es/components/text-input/index";
 // Composables
-import { useEventBus } from '@vueuse/core'
+import { useEventBus } from "@vueuse/core";
 // Types
-import { isEmpty } from '@/dto/CommonTypesDto'
+import { isEmpty } from "@/dto/CommonTypesDto";
 
 //Define the input properties for this component
 const props = defineProps<{
-  id: string
-  label: string
-  tip?: string
-  enabled?: boolean
-  placeholder: string
-  modelValue: string
-  validations: Array<Function>
-  errorMessage?: string
-  mask?: string
-}>()
+  id: string;
+  label: string;
+  tip?: string;
+  enabled?: boolean;
+  placeholder: string;
+  modelValue: string;
+  validations: Array<Function>;
+  errorMessage?: string;
+  mask?: string;
+}>();
 
 //Events we emit during component lifecycle
 const emit = defineEmits<{
-  (e: 'error', value: string | undefined): void
-  (e: 'empty', value: boolean): void
-  (e: 'update:model-value', value: string): void
-}>()
+  (e: "error", value: string | undefined): void;
+  (e: "empty", value: boolean): void;
+  (e: "update:model-value", value: string): void;
+}>();
 
 //We initialize the error message handling for validation
-const error = ref<string | undefined>(props.errorMessage || '')
+const error = ref<string | undefined>(props.errorMessage || "");
 
-const revalidateBus = useEventBus<void>('revalidate-bus')
+const revalidateBus = useEventBus<void>("revalidate-bus");
 
 //We watch for error changes to emit events
-watch(error, () => emit('error', error.value))
+watch(error, () => emit("error", error.value));
 watch(
   () => props.errorMessage,
   () => (error.value = props.errorMessage)
-)
+);
 
 //We set it as a separated ref due to props not being updatable
-const selectedValue = ref<string>(props.modelValue)
+const selectedValue = ref<string>(props.modelValue);
 
 //We set the value prop as a reference for update reason
-emit('empty', isEmpty(props.modelValue))
+emit("empty", isEmpty(props.modelValue));
 
 //This function emits the events on update
 const emitValueChange = (newValue: string): void => {
-  emit('update:model-value', newValue)
-  emit('empty', isEmpty(newValue))
-}
+  emit("update:model-value", newValue);
+  emit("empty", isEmpty(newValue));
+};
 //Watch for changes on the input
-watch([selectedValue], () => emitValueChange(selectedValue.value))
+watch([selectedValue], () => emitValueChange(selectedValue.value));
 
 //We call all the validations
 const validateInput = (newValue: string) => {
@@ -60,18 +60,21 @@ const validateInput = (newValue: string) => {
       props.validations
         .map((validation) => validation(newValue))
         .filter((errorMessage) => {
-          if (errorMessage) return true
-          return false
+          if (errorMessage) return true;
+          return false;
         })
-        .shift() ?? props.errorMessage
+        .shift() ?? props.errorMessage;
   }
-}
+};
 
 revalidateBus.on(() => {
-  validateInput(selectedValue.value)
-})
+  validateInput(selectedValue.value);
+});
 
-watch(() => props.modelValue,() => selectedValue.value = props.modelValue)
+watch(
+  () => props.modelValue,
+  () => (selectedValue.value = props.modelValue)
+);
 </script>
 
 <template>

From 93c3c8e4c8403cd27b9295e3a3e0c81dba344eb5 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 3 Oct 2023 15:26:22 -0700
Subject: [PATCH 241/313] Made this to prevent perisisting information mutliple
 times

---
 frontend/src/pages/FormBCeIDPage.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 0c67b311a7..d759347dc4 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -288,10 +288,14 @@ const processAndLogOut = () => {
   session?.logOut();
 };
 
+let submitBtnDisabled = ref(false);
+
 const submit = () => {
   errorBus.emit([]);
   notificationBus.emit(undefined);
+
   if (checkStepValidity(currentTab.value)) {
+    submitBtnDisabled.value = true;
     fetch();
   }
 };
@@ -500,6 +504,7 @@ const isSmallScreen = useMediaQuery("(max-width: 671px)");
               kind="primary"
               size="lg"
               @click.prevent="submit"
+              :disabled="submitBtnDisabled"
             >
             <span>Submit application</span>
             <Check16 slot="icon" />

From a61dbd549a79d3ffd92feaa2510fab51d37f87f4 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 3 Oct 2023 16:06:08 -0300
Subject: [PATCH 242/313] test: wait for the option's inner element to become
 visible

---
 .../components/grouping/AddressGroupComponent.cy.ts        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index 4dd6d33cc7..de002840d9 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -148,7 +148,12 @@ describe('<AddressGroupComponent />', () => {
 
     cy.get('#country_0')
       .find('cds-combo-box-item[data-id="US"]')
-      .should('be.visible') // wait for option to become visible before clicking it
+      .shadow()
+      .find('div')
+      .should('be.visible') // wait for the option's inner, standard HTML element to become visible before clicking it.
+
+    cy.get('#country_0')
+      .find('cds-combo-box-item[data-id="US"]')
       .click()
       .and('have.value', 'United States of America')
 

From b19d71fa6d882c48249e9b8e05f24da2bcaf8ee7 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 3 Oct 2023 19:06:37 -0300
Subject: [PATCH 243/313] fix: emit error always for text-input

Instead of only when the error changes.
---
 .../components/forms/TextInputComponent.vue   | 26 +++++++++++---
 .../forms/TextInputComponent.spec.ts          | 35 +++++++++++++++++++
 2 files changed, 56 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index 3a53aee96f..bebf5c05e6 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -32,11 +32,26 @@ const error = ref<string | undefined>(props.errorMessage || "");
 
 const revalidateBus = useEventBus<void>("revalidate-bus");
 
-//We watch for error changes to emit events
-watch(error, () => emit("error", error.value));
+/**
+ * Sets the error and emits an error event.
+ * @param errorMessage - the error message
+ */
+const setError = (errorMessage: string | undefined) => {
+  error.value = errorMessage;
+
+  /*
+  The error should be emitted whenever it is found, instead of watching and emitting only when it
+  changes.
+  Because the empty event is always emitted, even when it remains the same payload, and then we
+  rely on empty(false) to consider a value "valid". In turn we need to emit a new error event after
+  an empty one to be able to make the field go invalid again when needed.
+  */
+  emit('error', error.value);
+}
+
 watch(
   () => props.errorMessage,
-  () => (error.value = props.errorMessage)
+  () => setError(props.errorMessage),
 );
 
 //We set it as a separated ref due to props not being updatable
@@ -56,14 +71,15 @@ watch([selectedValue], () => emitValueChange(selectedValue.value));
 //We call all the validations
 const validateInput = (newValue: string) => {
   if (props.validations) {
-    error.value =
+    setError(
       props.validations
         .map((validation) => validation(newValue))
         .filter((errorMessage) => {
           if (errorMessage) return true;
           return false;
         })
-        .shift() ?? props.errorMessage;
+        .shift() ?? props.errorMessage,
+    );
   }
 };
 
diff --git a/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts b/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
index 5c419763b8..d74b335637 100644
--- a/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
@@ -1,6 +1,7 @@
 import { describe, it, expect } from 'vitest'
 import { mount } from '@vue/test-utils'
 import TextInputComponent from '@/components/forms/TextInputComponent.vue'
+import { isMinSize } from "@/helpers/validators/GlobalValidators"
 
 describe('Text Input Component', () => {
   const id = 'my-input'
@@ -69,6 +70,40 @@ describe('Text Input Component', () => {
     expect(wrapper.emitted('error')![0][0]).toBe('Field is required')
   })
 
+  it('emits the "error" event even when the error message is the same as before', async () => {
+    const errorMessage = "sample error message";
+    const wrapper = mount(TextInputComponent, {
+      props: {
+        id,
+        label: 'TestField',
+        placeholder: '',
+        modelValue: '',
+        validations: [isMinSize(errorMessage)(5)],
+        enabled: true,
+      },
+      directives: {
+        masked: () => {},
+      },
+    });
+
+    console.log(wrapper.html());
+
+    await wrapper.setProps({ modelValue: "1"});
+    await wrapper.find(`#${id}`).trigger("input");
+    await wrapper.find(`#${id}`).trigger("blur");
+
+    expect(wrapper.emitted("error")).toBeTruthy();
+    expect(wrapper.emitted("error")).toHaveLength(1);
+    expect(wrapper.emitted("error")![0][0]).toBe(errorMessage);
+
+    await wrapper.setProps({ modelValue: "12"}); // adds another character
+    await wrapper.find(`#${id}`).trigger("input");
+    await wrapper.find(`#${id}`).trigger("blur");
+
+    expect(wrapper.emitted("error")).toHaveLength(2);
+    expect(wrapper.emitted("error")![1][0]).toBe(errorMessage);
+  });
+
   it('emits the "empty" event when the input field is empty', async () => {
     const wrapper = mount(TextInputComponent, {
       props: {

From 42c8e9e0e97d96d9608e521263f050e2e22eeb1e Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 3 Oct 2023 19:22:29 -0300
Subject: [PATCH 244/313] fix: update error status on Address step text fields

So to be able to properly make it valid later when it gets resolved.
---
 frontend/src/components/grouping/AddressGroupComponent.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 304f1851b8..6a72182aed 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -253,6 +253,7 @@ onMounted(() => {
     ]"
     :error-message="nameError"
     @empty="validation.locationName = !$event"
+    @error="validation.locationName = !$event"
     v-if="id !== 0"
   />
 
@@ -312,6 +313,7 @@ onMounted(() => {
       submissionValidation(`location.addresses[${id}].city`)
     ]"
     @empty="validation.city = !$event"
+    @error="validation.city = !$event"
   />
 
   <data-fetcher

From d04dbe83e334ef4c75e2e47fadb98a4d57898cc6 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 4 Oct 2023 09:38:57 -0300
Subject: [PATCH 245/313] fix: update Street address empty status properly

---
 frontend/src/components/forms/AutoCompleteInputComponent.vue | 3 ++-
 frontend/src/components/grouping/AddressGroupComponent.vue   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index b5a420e5ce..bcdf19a955 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -56,7 +56,8 @@ let selectedValue: BusinessSearchResult | undefined = undefined;
 
 //This function emits the events on update
 const emitValueChange = (newValue: string): void => {
-  selectedValue = inputList.value.find((entry) => entry.code === newValue);
+  // Prevent selecting the empty value provided when props.contents is empty.
+  selectedValue = newValue ? inputList.value.find((entry) => entry.code === newValue) : undefined;
   emit("update:model-value", selectedValue?.name ?? newValue);
   emit("update:selected-value", selectedValue);
   emit("empty", isEmpty(selectedValue));
diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index 6a72182aed..e6901cb6de 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -193,7 +193,7 @@ const detailsData = ref<Address | null>(null);
 
 watch([autoCompleteResult], () => {
   addressControl.value = false;
-  if (autoCompleteResult.value) {
+  if (autoCompleteResult.value && autoCompleteResult.value.code) {
     showDetailsLoading.value = true;
     const { error, loading: detailsLoading } = useFetchTo(
       `/api/clients/addresses/${encodeURIComponent(

From 8f8931fbe736df68cf71b086caa11af9efc02592 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 4 Oct 2023 11:30:31 -0300
Subject: [PATCH 246/313] test: emit empty true when contents is empty

---
 .../forms/AutoCompleteInputComponent.spec.ts  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
index aaf2512b62..bb9869fe89 100644
--- a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
@@ -2,6 +2,7 @@ import { describe, it, expect, beforeEach } from 'vitest'
 
 import { VueWrapper, mount } from '@vue/test-utils'
 import AutoCompleteInputComponent from '@/components/forms/AutoCompleteInputComponent.vue'
+import CDSComboBox from "@carbon/web-components/es/components/combo-box/combo-box"
 
 describe('Auto Complete Input Component', () => {
   const id = 'my-input'
@@ -85,6 +86,35 @@ describe('Auto Complete Input Component', () => {
     expect(wrapper.emitted('empty')![0][0]).toBe(true)
   })
 
+  describe('when the contents prop is empty', () => {
+    const emptyContents: any[] = []
+    it('emits "empty" when the input becomes empty', async () => {
+      const wrapper = mount(AutoCompleteInputComponent, {
+        props: {
+          id,
+          modelValue: 'a',
+          contents: emptyContents,
+          validations: [],
+          label: id,
+        },
+      })
+
+      wrapper.find<CDSComboBox>(`#${id}`).element.value = ''
+      await wrapper.find(`#${id}`).trigger('input')
+
+      expect(wrapper.emitted('empty')).toBeTruthy()
+
+      // the first event is from the initialization
+      expect(wrapper.emitted('empty')![0][0]).toBe(true)
+
+      // the second event is the result from changing the input value
+      // Note: before FSADT1-907, it would be a "not empty" (false) one.
+      expect(wrapper.emitted('empty')![1][0]).toBe(true)
+
+      expect(wrapper.emitted('empty')).toHaveLength(2)
+    })
+  })
+
   it('emits the "update:selected-value" event when an option from the list is clicked', async () => {
     const wrapper = mount(AutoCompleteInputComponent, {
       props: {

From 61412a2d8e47b31fcb8b26ba6bb5b72465fd4302 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 4 Oct 2023 11:46:07 -0300
Subject: [PATCH 247/313] docs: refer specific Jira issue

---
 .../components/forms/AutoCompleteInputComponent.spec.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
index bb9869fe89..7ec844e4ac 100644
--- a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
@@ -108,7 +108,7 @@ describe('Auto Complete Input Component', () => {
       expect(wrapper.emitted('empty')![0][0]).toBe(true)
 
       // the second event is the result from changing the input value
-      // Note: before FSADT1-907, it would be a "not empty" (false) one.
+      // Note: before FSADT1-912, it would emit a "not empty" (false) one.
       expect(wrapper.emitted('empty')![1][0]).toBe(true)
 
       expect(wrapper.emitted('empty')).toHaveLength(2)

From c37e059c16f27d9d2b081beed8ca7020f9261eb8 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 4 Oct 2023 08:37:46 -0700
Subject: [PATCH 248/313] fix: - Renamed variable and added an new property to
 make it more generic - Beautified code

---
 .../ErrorNotificationGroupingComponent.vue    | 51 ++++++++++---------
 frontend/src/pages/FormBCeIDPage.vue          |  3 +-
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
index 5cb2397886..58d8a27963 100644
--- a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
+++ b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
@@ -13,7 +13,8 @@ import type { Address, FormDataDto } from "@/dto/ApplyClientNumberDto";
 
 const props = defineProps<{
   formData: FormDataDto;
-  scrollToNewContact: () => void;
+  scrollToElementFn: () => void;
+  scrollToElementName: string;
 }>();
 
 const nonAssociatedAddressList = reactive<string[]>([]);
@@ -114,7 +115,7 @@ const goToStep = (step: number) => {
       open="true"
       kind="error"
       title="Assigned contact required:">
-    <span>You must associate "{{ globalErrorMessage.errorMsg }}" address with an existing contact or <a href="#" @click="goToStep(2)">add a new contact</a> before submitting the application again.</span>
+      <span>You must associate "{{ globalErrorMessage.errorMsg }}" address with an existing contact or <a href="#" @click="goToStep(2)">add a new contact</a> before submitting the application again.</span>
     </cds-inline-notification>
 
     <cds-actionable-notification
@@ -126,12 +127,12 @@ const goToStep = (step: number) => {
       kind="error"
       title="Your application could not be submitted:"      
     >    
-    <div v-if="globalErrorMessage.errorMsg">
-      Review the "{{ globalErrorMessage.errorMsg }}" before submitting the application again.
-    </div>
-    <div v-else>
-      Review the information in the sections below before submitting the application again.
-    </div>
+      <div v-if="globalErrorMessage.errorMsg">
+        Review the "{{ globalErrorMessage.errorMsg }}" before submitting the application again.
+      </div>
+      <div v-else>
+        Review the information in the sections below before submitting the application again.
+      </div>
     </cds-actionable-notification>
 
     <cds-actionable-notification
@@ -143,22 +144,24 @@ const goToStep = (step: number) => {
       kind="error"
       title="Your application could not be submitted:"      
     >    
-    <div>{{ globalErrorMessage.errorMsg }}</div>    
-  </cds-actionable-notification>
+      <div>{{ globalErrorMessage.errorMsg }}</div>    
+    </cds-actionable-notification>
 
-  <cds-inline-notification
-    v-for="item in nonAssociatedAddressList"
-    :key="item"
-    v-shadow="true"
-    low-contrast="true"
-    hide-close-button="true"
-    open="true"
-    kind="error"
-  >
-    <p class="body-compact-01">
-      <span class="heading-compact-01 heading-compact-01-dark">Assigned contact required:</span>
-      You must associate <span class="heading-compact-01 heading-compact-01-dark">“{{ item }}”</span> address with an existing contact or <a href="#" @click.prevent="scrollToNewContact">add a new contact</a> before submitting the application again.
-    </p>
-  </cds-inline-notification>
+    <span v-if="scrollToElementName === 'addNewContact'">
+      <cds-inline-notification
+        v-for="item in nonAssociatedAddressList"
+        :key="item"
+        v-shadow="true"
+        low-contrast="true"
+        hide-close-button="true"
+        open="true"
+        kind="error"
+      >
+        <p class="body-compact-01">
+          <span class="heading-compact-01 heading-compact-01-dark">Assigned contact required:</span>
+          You must associate <span class="heading-compact-01 heading-compact-01-dark">“{{ item }}”</span> address with an existing contact or <a href="#" @click.prevent="scrollToElementFn">add a new contact</a> before submitting the application again.
+        </p>
+      </cds-inline-notification>
+    </span>
   </div>
 </template>
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index d759347dc4..496881878f 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -360,7 +360,8 @@ const isSmallScreen = useMediaQuery("(max-width: 671px)");
     </cds-progress-indicator>
     <error-notification-grouping-component
       :form-data="formData"
-      :scroll-to-new-contact="scrollToNewContact"
+      :scroll-to-element-fn="scrollToNewContact"
+      scroll-to-element-name="addNewContact"
     />
   </div>
 

From 86b9a28ee51f728fc38e59b5cbe40e6c106681ca Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 4 Oct 2023 09:18:26 -0700
Subject: [PATCH 249/313] fix: - Renamed variable and added an new property in
 test file

---
 .../ErrorNotificationGroupingComponent.spec.ts  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts b/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts
index 7a7784399d..c1f473319c 100644
--- a/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts
+++ b/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts
@@ -12,12 +12,15 @@ const formData = {
   }
 }
 
+const scrollToElementName = "";
+
 describe('Error Notification Grouping Component', () => {
   it('renders no error by default', () => {
     const wrapper = mount(ErrorNotificationGroupingComponent, {
       props: {
         formData,
-        scrollToNewContact: () => {}
+        scrollToElementFn: () => {},
+        scrollToElementName
       },
     })
     expect(wrapper.find('cds-inline-notification').exists()).toBe(false)
@@ -27,7 +30,8 @@ describe('Error Notification Grouping Component', () => {
       const wrapper = mount(ErrorNotificationGroupingComponent, {
         props: {
           formData,
-          scrollToNewContact: () => {}
+          scrollToElementFn: () => {},
+          scrollToElementName
         },
       })
       const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
@@ -46,7 +50,8 @@ describe('Error Notification Grouping Component', () => {
       const wrapper = mount(ErrorNotificationGroupingComponent, {
         props: {
           formData,
-          scrollToNewContact: () => {}
+          scrollToElementFn: () => {},
+          scrollToElementName
         },
       })
       const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
@@ -85,7 +90,8 @@ describe('Error Notification Grouping Component', () => {
                 addresses: locationNames.map(locationName => ({ locationName }))
               }
             },
-            scrollToNewContact: () => {}
+            scrollToElementFn: () => {},
+            scrollToElementName: ""
           },
         })
         notificationBus.emit({
@@ -135,7 +141,8 @@ describe('Error Notification Grouping Component', () => {
               addresses: newLocationNames.map(locationName => ({ locationName }))
             }
           },
-          scrollToNewContact: () => {}
+          scrollToElementFn: () => {},
+          scrollToElementName: ""
         })
     
         const elements = wrapper.findAll('cds-inline-notification');

From 84ad6b07f738876e7530e8ee9f3ec9f0b4472ee9 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 4 Oct 2023 09:46:15 -0700
Subject: [PATCH 250/313] fix: Made code reviews and removed unneeded prop I
 added

---
 .../ErrorNotificationGroupingComponent.vue    |  31 +-
 frontend/src/pages/FormBCeIDPage.vue          |   1 -
 ...ErrorNotificationGroupingComponent.spec.ts | 307 ++++++++++--------
 3 files changed, 190 insertions(+), 149 deletions(-)

diff --git a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
index 58d8a27963..4b4adc818f 100644
--- a/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
+++ b/frontend/src/components/grouping/ErrorNotificationGroupingComponent.vue
@@ -14,7 +14,6 @@ import type { Address, FormDataDto } from "@/dto/ApplyClientNumberDto";
 const props = defineProps<{
   formData: FormDataDto;
   scrollToElementFn: () => void;
-  scrollToElementName: string;
 }>();
 
 const nonAssociatedAddressList = reactive<string[]>([]);
@@ -147,21 +146,19 @@ const goToStep = (step: number) => {
       <div>{{ globalErrorMessage.errorMsg }}</div>    
     </cds-actionable-notification>
 
-    <span v-if="scrollToElementName === 'addNewContact'">
-      <cds-inline-notification
-        v-for="item in nonAssociatedAddressList"
-        :key="item"
-        v-shadow="true"
-        low-contrast="true"
-        hide-close-button="true"
-        open="true"
-        kind="error"
-      >
-        <p class="body-compact-01">
-          <span class="heading-compact-01 heading-compact-01-dark">Assigned contact required:</span>
-          You must associate <span class="heading-compact-01 heading-compact-01-dark">“{{ item }}”</span> address with an existing contact or <a href="#" @click.prevent="scrollToElementFn">add a new contact</a> before submitting the application again.
-        </p>
-      </cds-inline-notification>
-    </span>
+    <cds-inline-notification
+      v-for="item in nonAssociatedAddressList"
+      :key="item"
+      v-shadow="true"
+      low-contrast="true"
+      hide-close-button="true"
+      open="true"
+      kind="error"
+    >
+      <p class="body-compact-01">
+        <span class="heading-compact-01 heading-compact-01-dark">Assigned contact required:</span>
+        You must associate <span class="heading-compact-01 heading-compact-01-dark">“{{ item }}”</span> address with an existing contact or <a href="#" @click.prevent="scrollToElementFn">add a new contact</a> before submitting the application again.
+      </p>
+    </cds-inline-notification>
   </div>
 </template>
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 496881878f..369feb8432 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -361,7 +361,6 @@ const isSmallScreen = useMediaQuery("(max-width: 671px)");
     <error-notification-grouping-component
       :form-data="formData"
       :scroll-to-element-fn="scrollToNewContact"
-      scroll-to-element-name="addNewContact"
     />
   </div>
 
diff --git a/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts b/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts
index c1f473319c..d723911d48 100644
--- a/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts
+++ b/frontend/tests/unittests/components/grouping/ErrorNotificationGroupingComponent.spec.ts
@@ -1,192 +1,237 @@
-import { describe, it, expect, beforeEach } from 'vitest'
+import { describe, it, expect, beforeEach } from "vitest";
 
-import { VueWrapper, mount } from '@vue/test-utils'
-import ErrorNotificationGroupingComponent from '@/components/grouping/ErrorNotificationGroupingComponent.vue'
-import type { ValidationMessageType } from '@/dto/CommonTypesDto'
-import { useEventBus } from '@vueuse/core'
-import { nextTick } from 'vue'
+import { VueWrapper, mount } from "@vue/test-utils";
+import ErrorNotificationGroupingComponent from "@/components/grouping/ErrorNotificationGroupingComponent.vue";
+import type { ValidationMessageType } from "@/dto/CommonTypesDto";
+import { useEventBus } from "@vueuse/core";
+import { nextTick } from "vue";
 
 const formData = {
   location: {
-    addresses: []
-  }
-}
+    addresses: [],
+  },
+};
 
-const scrollToElementName = "";
-
-describe('Error Notification Grouping Component', () => {
-  it('renders no error by default', () => {
+describe("Error Notification Grouping Component", () => {
+  it("renders no error by default", () => {
     const wrapper = mount(ErrorNotificationGroupingComponent, {
       props: {
         formData,
         scrollToElementFn: () => {},
-        scrollToElementName
       },
-    })
-    expect(wrapper.find('cds-inline-notification').exists()).toBe(false)
-  })
-  describe('location.addresses.*.locationName', () => {
-    it('renders a notification when an error message arrives', async () => {
+    });
+    expect(wrapper.find("cds-inline-notification").exists()).toBe(false);
+  });
+  describe("location.addresses.*.locationName", () => {
+    it("renders a notification when an error message arrives", async () => {
       const wrapper = mount(ErrorNotificationGroupingComponent, {
         props: {
           formData,
           scrollToElementFn: () => {},
-          scrollToElementName
         },
-      })
-      const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
-      const locationName = 'My location'
-      notificationBus.emit({
-        fieldId: 'location.addresses[1].locationName',
-        errorMsg: 'This value is invalid!'
-      }, locationName)
-  
-      await nextTick()
-  
-      expect(wrapper.find('cds-inline-notification').exists()).toBe(true)
-      expect(wrapper.find('cds-inline-notification').text()).toContain(locationName)
-    })
-    it('renders as many notifications as the number of different error messages arrived', async () => {
+      });
+      const notificationBus = useEventBus<ValidationMessageType | undefined>(
+        "error-notification"
+      );
+      const locationName = "My location";
+      notificationBus.emit(
+        {
+          fieldId: "location.addresses[1].locationName",
+          errorMsg: "This value is invalid!",
+        },
+        locationName
+      );
+
+      await nextTick();
+
+      expect(wrapper.find("cds-inline-notification").exists()).toBe(true);
+      expect(wrapper.find("cds-inline-notification").text()).toContain(
+        locationName
+      );
+    });
+    it("renders as many notifications as the number of different error messages arrived", async () => {
       const wrapper = mount(ErrorNotificationGroupingComponent, {
         props: {
           formData,
           scrollToElementFn: () => {},
-          scrollToElementName
         },
-      })
-      const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
-      const locationNames = ['Mailing address', 'My location 1', 'My location 2', 'My location 3']
-      notificationBus.emit({
-        fieldId: 'location.addresses[1].locationName',
-        errorMsg: 'This value is invalid!'
-      }, locationNames[1])
-      notificationBus.emit({
-        fieldId: 'location.addresses[2].locationName',
-        errorMsg: 'This value is invalid!'
-      }, locationNames[2])
-      notificationBus.emit({
-        fieldId: 'location.addresses[3].locationName',
-        errorMsg: 'This value is invalid!'
-      }, locationNames[3])
-  
-      await nextTick()
-  
-      const elements = wrapper.findAll('cds-inline-notification');
-      expect(elements).toHaveLength(3)
+      });
+      const notificationBus = useEventBus<ValidationMessageType | undefined>(
+        "error-notification"
+      );
+      const locationNames = [
+        "Mailing address",
+        "My location 1",
+        "My location 2",
+        "My location 3",
+      ];
+      notificationBus.emit(
+        {
+          fieldId: "location.addresses[1].locationName",
+          errorMsg: "This value is invalid!",
+        },
+        locationNames[1]
+      );
+      notificationBus.emit(
+        {
+          fieldId: "location.addresses[2].locationName",
+          errorMsg: "This value is invalid!",
+        },
+        locationNames[2]
+      );
+      notificationBus.emit(
+        {
+          fieldId: "location.addresses[3].locationName",
+          errorMsg: "This value is invalid!",
+        },
+        locationNames[3]
+      );
+
+      await nextTick();
+
+      const elements = wrapper.findAll("cds-inline-notification");
+      expect(elements).toHaveLength(3);
       for (let index = 0; index < elements.length; index++) {
         const element = elements[index];
-        expect(element.text()).toContain(locationNames[index + 1])
+        expect(element.text()).toContain(locationNames[index + 1]);
       }
-    })
+    });
     describe("when there are some rendered notifications initially", () => {
-      let wrapper: VueWrapper<any, any>
-      const locationNames = ['Mailing address', 'My location 1', 'My location 2', 'My location 3']
-      const notificationBus = useEventBus<ValidationMessageType|undefined>("error-notification");
+      let wrapper: VueWrapper<any, any>;
+      const locationNames = [
+        "Mailing address",
+        "My location 1",
+        "My location 2",
+        "My location 3",
+      ];
+      const notificationBus = useEventBus<ValidationMessageType | undefined>(
+        "error-notification"
+      );
       beforeEach(async () => {
         wrapper = mount(ErrorNotificationGroupingComponent, {
           props: {
             formData: {
               location: {
-                addresses: locationNames.map(locationName => ({ locationName }))
-              }
+                addresses: locationNames.map((locationName) => ({
+                  locationName,
+                })),
+              },
             },
             scrollToElementFn: () => {},
-            scrollToElementName: ""
           },
-        })
-        notificationBus.emit({
-          fieldId: 'location.addresses[1].locationName',
-          errorMsg: 'This value is invalid!'
-        }, locationNames[1])
-        notificationBus.emit({
-          fieldId: 'location.addresses[2].locationName',
-          errorMsg: 'This value is invalid!'
-        }, locationNames[2])
-        notificationBus.emit({
-          fieldId: 'location.addresses[3].locationName',
-          errorMsg: 'This value is invalid!'
-        }, locationNames[3])
-    
-        await nextTick()
-    
-        const elements = wrapper.findAll('cds-inline-notification');
-        expect(elements).toHaveLength(3)
-      })
+        });
+        notificationBus.emit(
+          {
+            fieldId: "location.addresses[1].locationName",
+            errorMsg: "This value is invalid!",
+          },
+          locationNames[1]
+        );
+        notificationBus.emit(
+          {
+            fieldId: "location.addresses[2].locationName",
+            errorMsg: "This value is invalid!",
+          },
+          locationNames[2]
+        );
+        notificationBus.emit(
+          {
+            fieldId: "location.addresses[3].locationName",
+            errorMsg: "This value is invalid!",
+          },
+          locationNames[3]
+        );
+
+        await nextTick();
+
+        const elements = wrapper.findAll("cds-inline-notification");
+        expect(elements).toHaveLength(3);
+      });
       it("clears the notification when an event with no error message for the corresponding location arrives", async () => {
-        notificationBus.emit({
-          fieldId: 'location.addresses[2].locationName',
-          errorMsg: '' // empty means valid
-        }, locationNames[2])
-    
-        await nextTick()
-    
-        const elements = wrapper.findAll('cds-inline-notification');
-        expect(elements).toHaveLength(2)
+        notificationBus.emit(
+          {
+            fieldId: "location.addresses[2].locationName",
+            errorMsg: "", // empty means valid
+          },
+          locationNames[2]
+        );
+
+        await nextTick();
+
+        const elements = wrapper.findAll("cds-inline-notification");
+        expect(elements).toHaveLength(2);
         for (let index = 0; index < elements.length; index++) {
           const element = elements[index];
           // #2 was removed
-          expect(element.text()).not.toContain(locationNames[2])
+          expect(element.text()).not.toContain(locationNames[2]);
         }
 
         // #1 and #3 were kept
-        expect(elements[0].text()).toContain(locationNames[1])
-        expect(elements[1].text()).toContain(locationNames[3])
-      })
+        expect(elements[0].text()).toContain(locationNames[1]);
+        expect(elements[1].text()).toContain(locationNames[3]);
+      });
       it("clears the notification when the corresponding location has been removed", async () => {
         const newLocationNames = [...locationNames];
         newLocationNames.splice(2, 1); // removing #2
         await wrapper.setProps({
           formData: {
             location: {
-              addresses: newLocationNames.map(locationName => ({ locationName }))
-            }
+              addresses: newLocationNames.map((locationName) => ({
+                locationName,
+              })),
+            },
           },
           scrollToElementFn: () => {},
-          scrollToElementName: ""
-        })
-    
-        const elements = wrapper.findAll('cds-inline-notification');
-        expect(elements).toHaveLength(2)
+        });
+
+        const elements = wrapper.findAll("cds-inline-notification");
+        expect(elements).toHaveLength(2);
         for (let index = 0; index < elements.length; index++) {
           const element = elements[index];
           // #2 was removed
-          expect(element.text()).not.toContain(locationNames[2])
+          expect(element.text()).not.toContain(locationNames[2]);
         }
 
         // #1 and #3 were kept
-        expect(elements[0].text()).toContain(locationNames[1])
-        expect(elements[1].text()).toContain(locationNames[3])
-      })
+        expect(elements[0].text()).toContain(locationNames[1]);
+        expect(elements[1].text()).toContain(locationNames[3]);
+      });
       it("does not duplicate notifications", async () => {
-        notificationBus.emit({
-          fieldId: 'location.addresses[2].locationName',
-          errorMsg: 'This value is invalid!'
-        }, locationNames[2])
-    
-        await nextTick()
-    
-        const elements = wrapper.findAll('cds-inline-notification');
-        expect(elements).toHaveLength(3) // still 3 notifications just like before
+        notificationBus.emit(
+          {
+            fieldId: "location.addresses[2].locationName",
+            errorMsg: "This value is invalid!",
+          },
+          locationNames[2]
+        );
+
+        await nextTick();
+
+        const elements = wrapper.findAll("cds-inline-notification");
+        expect(elements).toHaveLength(3); // still 3 notifications just like before
         for (let index = 0; index < elements.length; index++) {
           const element = elements[index];
-          expect(element.text()).toContain(locationNames[index + 1])
+          expect(element.text()).toContain(locationNames[index + 1]);
         }
-      })
+      });
       it("ignores a valid event when the corresponding location was already valid", async () => {
-        notificationBus.emit({
-          fieldId: 'location.addresses[0].locationName',
-          errorMsg: ''
-        }, locationNames[0])
-    
-        await nextTick()
-    
-        const elements = wrapper.findAll('cds-inline-notification');
-        expect(elements).toHaveLength(3) // still 3 notifications just like before
+        notificationBus.emit(
+          {
+            fieldId: "location.addresses[0].locationName",
+            errorMsg: "",
+          },
+          locationNames[0]
+        );
+
+        await nextTick();
+
+        const elements = wrapper.findAll("cds-inline-notification");
+        expect(elements).toHaveLength(3); // still 3 notifications just like before
         for (let index = 0; index < elements.length; index++) {
           const element = elements[index];
-          expect(element.text()).toContain(locationNames[index + 1])
+          expect(element.text()).toContain(locationNames[index + 1]);
         }
-      })
-    })
-  })
-})
+      });
+    });
+  });
+});

From eedcce197b5a55113c4866c4c55f001c076e0d51 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 4 Oct 2023 12:05:43 -0300
Subject: [PATCH 251/313] fix: update error status on Contacts step text fields

So to be able to properly make it valid later when it gets resolved.
---
 frontend/src/components/grouping/ContactGroupComponent.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index 5e628c4780..2133b50f67 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -145,6 +145,7 @@ const updateContactType = (value: CodeNameType | undefined) => {
     :enabled="enabled"
     :error-message="error"
     @empty="validation.firstName = !$event"
+    @error="validation.firstName = !$event"
   />
 
   <text-input-component
@@ -159,6 +160,7 @@ const updateContactType = (value: CodeNameType | undefined) => {
     :enabled="enabled"
     :error-message="error"
     @empty="validation.lastName = !$event"
+    @error="validation.lastName = !$event"
   />
 
   <text-input-component
@@ -172,6 +174,7 @@ const updateContactType = (value: CodeNameType | undefined) => {
     ]"
     :enabled="enabled"
     @empty="validation.email = !$event"
+    @error="validation.email = !$event"
   />
 
   <text-input-component
@@ -186,6 +189,7 @@ const updateContactType = (value: CodeNameType | undefined) => {
       submissionValidation(`location.contacts[${id}].phoneNumber`)
     ]"
     @empty="validation.phoneNumber = !$event"
+    @error="validation.phoneNumber = !$event"
   />
 
   <div class="grouping-06">

From 2e8fce94d47c2830daab53a0d81ce4a2353ff283 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 4 Oct 2023 20:09:39 -0300
Subject: [PATCH 252/313] test: emit valid events properly

---
 .../grouping/AddressGroupComponent.cy.ts      | 104 +++++++++++++++
 .../grouping/ContactGroupComponent.cy.ts      | 121 ++++++++++++++++++
 2 files changed, 225 insertions(+)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index de002840d9..cbf02e03d9 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -1,5 +1,8 @@
 import AddressGroupComponent from '@/components/grouping/AddressGroupComponent.vue'
 
+// load app validations
+import '@/helpers/validators/BCeIDFormValidations'
+
 describe('<AddressGroupComponent />', () => {
   const dummyValidation = (): ((key: string, field: string) => (value: string) => string) => {
     return (key: string, fieldId: string) => (value: string) => {
@@ -173,4 +176,105 @@ describe('<AddressGroupComponent />', () => {
       .find('label')
       .and('include.text', 'Zip code')
   })
+
+  describe('when it has last emitted "valid" with false due to a single, not empty, invalid field', () => {
+    const genericTest = (
+      fieldSelector: string,
+      firstContent: string,
+      additionalContent: string,
+    ) => {
+      const calls: boolean[] = []
+      const onValid = (valid: boolean) => {
+        calls.push(valid)
+      }
+      cy.get('@addressFixture').then((address) => {
+        cy.get('@countriesFixture').then((countries) => {
+          cy.mount(AddressGroupComponent, {
+            props: {
+              id: 1,
+              modelValue: address,
+              countryList: countries,
+              validations: [],
+              onValid,
+            },
+          })
+        })
+      })
+      cy.wait('@getProvinces')
+
+      // Prevents issues due to moving focus in the middle of the test.
+      cy.get('#name_1').should('be.focused')
+
+      cy.get(fieldSelector).shadow().find('input').clear() // emits false
+      cy.get(fieldSelector).blur() // (doesn't emit)
+      cy.get(fieldSelector).shadow().find('input').type(firstContent) // emits true before blurring
+      cy.get(fieldSelector).blur() // emits false
+      cy.get(fieldSelector).should('be.visible').and('have.value', firstContent)
+      cy.get(fieldSelector).shadow().find('input').type(additionalContent) // emits true (last2)
+      cy.get(fieldSelector).blur() // emits false (last1)
+      cy.get(fieldSelector)
+        .should('be.visible')
+        .and('have.value', `${firstContent}${additionalContent}`)
+
+      // For some reason on Electron we need to wait a millisecond now.
+      // Otherwise this test either fails or can't be trusted on Electron.
+      cy.wait(1)
+
+      return calls
+    }
+    const checkValidFalseAgain = (calls: boolean[]) => {
+      cy.wrap(calls).then((value) => {
+        const last1 = value.pop()
+        const last2 = value.pop()
+        const last3 = value.pop()
+        expect(last3).to.equal(false)
+        expect(last2).to.equal(true)
+        expect(last1).to.equal(false)
+      })
+    }
+    const checkValidTrue = (calls: boolean[]) => {
+      cy.wrap(calls).then((value) => {
+        const last1 = value.pop()
+        const last2 = value.pop()
+        expect(last2).to.equal(false)
+        expect(last1).to.equal(true)
+      })
+    }
+    describe('Location name', () => {
+      it('should emit "valid" with false again', () => {
+        const calls = genericTest('#name_1', '1', '2')
+
+        checkValidFalseAgain(calls)
+      })
+      it('should emit "valid" with true', () => {
+        const calls = genericTest('#name_1', '12', '3')
+
+        checkValidTrue(calls)
+      })
+    })
+    describe('City', () => {
+      it('should emit "valid" with false again', () => {
+        const calls = genericTest('#city_1', 'A', 'b')
+
+        checkValidFalseAgain(calls)
+      })
+      it('should emit "valid" with true', () => {
+        const calls = genericTest('#city_1', 'Ab', 'c')
+
+        checkValidTrue(calls)
+      })
+    })
+    describe('Postal code', () => {
+      it('should emit "valid" with false again', () => {
+        const calls = genericTest('#postalCode_1', 'A1B', '2C')
+
+        checkValidFalseAgain(calls)
+      })
+      it('should emit "valid" with true', () => {
+        const calls = genericTest('#postalCode_1', 'A1B', '2C3')
+
+        checkValidTrue(calls)
+      })
+    })
+  })
 })
diff --git a/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts b/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts
index 96f0252c83..9657cfe0e2 100644
--- a/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/ContactGroupComponent.cy.ts
@@ -1,6 +1,9 @@
 import ContactGroupComponent from '@/components/grouping/ContactGroupComponent.vue'
 import type { Contact } from '@/dto/ApplyClientNumberDto'
 
+// load app validations
+import '@/helpers/validators/BCeIDFormValidations'
+
 describe('<ContactGroupComponent />', () => {
   const dummyValidation = (): ((key: string, field: string) => (value: string) => string) => {
     return (key: string, fieldId: string) => (value: string) => {
@@ -208,4 +211,122 @@ describe('<ContactGroupComponent />', () => {
 
     cy.get('#addressname_0').should('be.visible').and('have.value', '')
   })
+
+  describe('when it has last emitted "valid" with false due to a single, not empty, invalid field', () => {
+    const genericTest = (
+      fieldSelector: string,
+      firstContent: string,
+      additionalContent: string,
+      expectedFinalValue = `${firstContent}${additionalContent}`,
+    ) => {
+      const calls: boolean[] = []
+      const onValid = (valid: boolean) => {
+        calls.push(valid)
+      }
+      cy.get('@contactFixture').then((contact: Contact) => {
+        cy.get('@rolesFixture').then((roles) => {
+          cy.get('@addressesFixture').then((addresses) => {
+            cy.mount(ContactGroupComponent, {
+              props: {
+                id: 1,
+                modelValue: {
+                  ...contact,
+                  locationNames: addresses.map((a) => ({ value: a.code, text: a.name })),
+                  email: 'a@b.com',
+                  phoneNumber: '(123) 123-1234',
+                  contactType: { value: roles[0].code, text: roles[0].name },
+                },
+                enabled: true,
+                roleList: roles,
+                addressList: addresses,
+                validations: [],
+                onValid,
+              },
+            })
+          })
+        })
+      })
+
+      cy.get(fieldSelector).shadow().find('input').clear() // emits false
+      cy.get(fieldSelector).blur() // (doesn't emit)
+      cy.get(fieldSelector).shadow().find('input').type(firstContent) // emits true before blurring
+      cy.get(fieldSelector).blur() // emits false
+      cy.get(fieldSelector).should('be.visible').and('have.value', firstContent)
+      cy.get(fieldSelector).shadow().find('input').type(additionalContent) // emits true (last2)
+      cy.get(fieldSelector).blur() // emits false (last1)
+      cy.get(fieldSelector).should('be.visible').and('have.value', expectedFinalValue)
+
+      // For some reason on Electron we need to wait a millisecond now.
+      // Otherwise this test either fails or can't be trusted on Electron.
+      cy.wait(1)
+
+      return calls
+    }
+    const checkValidFalseAgain = (calls: boolean[]) => {
+      cy.wrap(calls).then((value) => {
+        const last1 = value.pop()
+        const last2 = value.pop()
+        const last3 = value.pop()
+        expect(last3).to.equal(false)
+        expect(last2).to.equal(true)
+        expect(last1).to.equal(false)
+      })
+    }
+    const checkValidTrue = (calls: boolean[]) => {
+      cy.wrap(calls).then((value) => {
+        const last1 = value.pop()
+        const last2 = value.pop()
+        expect(last2).to.equal(false)
+        expect(last1).to.equal(true)
+      })
+    }
+    describe('First name', () => {
+      it('should emit "valid" with false again', () => {
+        const calls = genericTest('#firstName_1', 'A', '{backspace}', '')
+
+        checkValidFalseAgain(calls)
+      })
+      it('should emit "valid" with true', () => {
+        const calls = genericTest('#firstName_1', 'A', '{backspace}B', 'B')
+
+        checkValidTrue(calls)
+      })
+    })
+    describe('Last name', () => {
+      it('should emit "valid" with false again', () => {
+        const calls = genericTest('#lastName_1', 'A', '{backspace}', '')
+
+        checkValidFalseAgain(calls)
+      })
+      it('should emit "valid" with true', () => {
+        const calls = genericTest('#lastName_1', 'A', '{backspace}B', 'B')
+
+        checkValidTrue(calls)
+      })
+    })
+    describe('Email address', () => {
+      it('should emit "valid" with false again', () => {
+        const calls = genericTest('#email_1', 'a@', 'b')
+
+        checkValidFalseAgain(calls)
+      })
+      it('should emit "valid" with true', () => {
+        const calls = genericTest('#email_1', 'a@', 'b.com')
+
+        checkValidTrue(calls)
+      })
+    })
+    describe('Phone number', () => {
+      it('should emit "valid" with false again', () => {
+        const calls = genericTest('#phoneNumber_1', '(123) 123', '-1')
+
+        checkValidFalseAgain(calls)
+      })
+      it('should emit "valid" with true', () => {
+        const calls = genericTest('#phoneNumber_1', '(123) 123', '-1234')
+
+        checkValidTrue(calls)
+      })
+    })
+  })
 })

From e2babb10bdb5b74787c964d9d45da284a3229fbf Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 5 Oct 2023 10:09:16 -0700
Subject: [PATCH 253/313] no message

---
 frontend/src/dto/CommonTypesDto.ts  |  7 ++-
 frontend/src/pages/FormBCSCPage.vue | 81 +++++++++++++++++++++++++++--
 2 files changed, 83 insertions(+), 5 deletions(-)

diff --git a/frontend/src/dto/CommonTypesDto.ts b/frontend/src/dto/CommonTypesDto.ts
index ae82b9ff64..7d62c330b6 100644
--- a/frontend/src/dto/CommonTypesDto.ts
+++ b/frontend/src/dto/CommonTypesDto.ts
@@ -34,6 +34,11 @@ export enum ClientTypeEnum {
   U
 }
 
+export enum LegalTypeEnum {
+  Unknow,
+  SP,
+}
+
 export interface ProgressData {
   kind: string
   title: string
@@ -72,4 +77,4 @@ type ProgressNotificationKind = 'disabled' | 'error' | 'navigate'
 export interface ProgressNotification {
   kind: ProgressNotificationKind
   value?: number | number[] | boolean
-}
\ No newline at end of file
+}
diff --git a/frontend/src/pages/FormBCSCPage.vue b/frontend/src/pages/FormBCSCPage.vue
index 36e9b5fd2e..4d3e022a72 100644
--- a/frontend/src/pages/FormBCSCPage.vue
+++ b/frontend/src/pages/FormBCSCPage.vue
@@ -1,6 +1,79 @@
 <template>
-    <div>
-      <h1>Test</h1>
+<!--   <div class="cds--css-grid">
+    <div class="cds--col-span-4">Span 4 columns</div>
+    <div class="cds--col-span-2">Span 2 columns</div>
+  </div> -->
+  <div class="form-header">
+    <div class="form-header-title">
+      <span class="heading-05" data-scroll="top">
+        New client application
+      </span>
     </div>
-  </template>
-  
\ No newline at end of file
+    
+    <span class="heading-04" data-scroll="scroll-0">
+      Personal information
+    </span>
+    <p class="body-compact-01">
+      Review the personal information below. It’s from your BC Services card.<br />
+      We use it to know who we're giving a number to and for communicating with clients. 
+    </p>
+
+   
+    <div class="grouping-01">
+      <p class="heading-02">
+        Full name
+      </p>
+      <p class="body-compact-01">
+        {{ formData.businessInformation.businessName }}
+      </p>
+    </div>
+    <div class="grouping-06">
+      <!-- <cds-button kind="tertiary" @click.prevent="goToStep(0)">
+        <span>Edit business information</span>
+        <Edit16 slot="icon" />
+      </cds-button> -->
+    </div>
+
+    
+  </div>
+</template>
+
+
+<script setup lang="ts">
+import { reactive, watch, toRef, ref, getCurrentInstance, computed } from "vue";
+import { newFormDataDto } from "@/dto/ApplyClientNumberDto";
+import { ClientTypeEnum, LegalTypeEnum } from "@/dto/CommonTypesDto";
+import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
+
+
+const instance = getCurrentInstance();
+const session = instance?.appContext.config.globalProperties.$session;
+
+const submitterContact: Contact = {
+  locationNames: [],
+  contactType: { value: "", text: "" },
+  phoneNumber: "",
+  firstName: session?.user?.firstName ?? "",
+  lastName: session?.user?.lastName ?? "",
+  email: session?.user?.email ?? "",
+};
+
+let formDataDto = ref<FormDataDto>({ ...newFormDataDto() });
+
+//---- Form Data ----//
+let formData = reactive<FormDataDto>({
+  ...formDataDto.value,
+  businessInformation :{
+    businessType: ClientTypeEnum.U.toString(),
+    legalType: LegalTypeEnum.SP.toString(),
+    clientType: '',
+    incorporationNumber: '',
+    businessName: 'Test',
+    goodStandingInd: '',
+  },
+  location: {
+    addresses: formDataDto.value.location.addresses,
+    contacts: [submitterContact],
+  },
+});
+</script>

From e3043d56453ec72469d2c4d8873f0a2871c4ab29 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 5 Oct 2023 12:01:59 -0700
Subject: [PATCH 254/313] fix: - Renamed variable with a proper name - Made
 code reviews

---
 frontend/src/dto/CommonTypesDto.ts            | 113 +++++++++++-------
 .../BusinessInformationWizardStep.vue         |  18 +--
 2 files changed, 80 insertions(+), 51 deletions(-)

diff --git a/frontend/src/dto/CommonTypesDto.ts b/frontend/src/dto/CommonTypesDto.ts
index ae82b9ff64..8153e6b570 100644
--- a/frontend/src/dto/CommonTypesDto.ts
+++ b/frontend/src/dto/CommonTypesDto.ts
@@ -1,75 +1,104 @@
-import { isRef } from 'vue'
+import { isRef } from "vue";
 
 export interface CodeDescrType {
-  value: string
-  text: string
+  value: string;
+  text: string;
 }
 
 export interface CodeNameType {
-  code: string
-  name: string
+  code: string;
+  name: string;
 }
 
 export interface BusinessSearchResult {
-  code: string
-  name: string
-  status: string
-  legalType: string
+  code: string;
+  name: string;
+  status: string;
+  legalType: string;
 }
 
 export interface ValidationMessageType {
-  fieldId: string
-  errorMsg: string
-  originalValue?: string
+  fieldId: string;
+  errorMsg: string;
+  originalValue?: string;
 }
 
 export const isEmpty = (receivedValue: any): boolean => {
-  const value = isRef(receivedValue) ? receivedValue.value : receivedValue
-  return value === undefined || value === null || value === ''
-}
+  const value = isRef(receivedValue) ? receivedValue.value : receivedValue;
+  return value === undefined || value === null || value === "";
+};
 
-export enum ClientTypeEnum {
+export enum BusinessTypeEnum {
   Unknow,
   R,
-  U
+  U,
+}
+
+export enum LegalTypeEnum {
+  A,
+  B,
+  BC,
+  C,
+  CP,
+  EPR,
+  FOR,
+  LIC,
+  REG,
+  S,
+  XS,
+  XCP,
+  SP,
+  GP,
+  LP,
+  XL,
+  XP,
+}
+
+export enum ClientTypeEnum {
+  C,
+  S,
+  A,
+  I,
+  P,
+  L,
 }
 
 export interface ProgressData {
-  kind: string
-  title: string
-  subtitle: string
-  enabled: boolean
+  kind: string;
+  title: string;
+  subtitle: string;
+  enabled: boolean;
 }
 
 export interface Submitter {
-  name: string
-  email: string
-  provider: string
-  userId: string | undefined
-  firstName: string
-  lastName: string
-  businessName: string
+  name: string;
+  email: string;
+  provider: string;
+  userId: string | undefined;
+  firstName: string;
+  lastName: string;
+  businessName: string;
 }
 
 export interface ModalNotification {
-  message: string
-  kind: string
-  toastTitle: string
-  active: boolean
-  handler: () => void
+  message: string;
+  kind: string;
+  toastTitle: string;
+  active: boolean;
+  handler: () => void;
 }
 
 export interface SessionProperties {
-  user: Submitter | undefined
-  logIn: (provider: string) => void
-  logOut: () => void
-  isLoggedIn: () => boolean
-  loadDetails: () => Submitter | undefined
+  user: Submitter | undefined;
+  logIn: (provider: string) => void;
+  logOut: () => void;
+  isLoggedIn: () => boolean;
+  loadDetails: () => Submitter | undefined;
 }
 
-type ProgressNotificationKind = 'disabled' | 'error' | 'navigate'
+type ProgressNotificationKind = "disabled" | "error" | "navigate";
 
 export interface ProgressNotification {
-  kind: ProgressNotificationKind
-  value?: number | number[] | boolean
-}
\ No newline at end of file
+  kind: ProgressNotificationKind;
+  value?: number | number[] | boolean;
+}
diff --git a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
index ed97d17b40..3cc90fb9b0 100644
--- a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
@@ -11,7 +11,7 @@ import type {
   BusinessSearchResult,
   ProgressNotification,
 } from "@/dto/CommonTypesDto";
-import { ClientTypeEnum } from "@/dto/CommonTypesDto";
+import { BusinessTypeEnum } from "@/dto/CommonTypesDto";
 import type {
   FormDataDto,
   ForestClientDetailsDto,
@@ -67,11 +67,11 @@ emit("valid", checkValid());
 const selectedOption = computed(() => {
   switch (formData.value.businessInformation.businessType) {
     case "R":
-      return ClientTypeEnum.R;
+      return BusinessTypeEnum.R;
     case "U":
-      return ClientTypeEnum.U;
+      return BusinessTypeEnum.U;
     default:
-      return ClientTypeEnum.Unknow;
+      return BusinessTypeEnum.Unknow;
   }
 });
 
@@ -180,7 +180,7 @@ watch([detailsData], () => {
 
 // -- Unregistered Proprietorship
 watch([selectedOption], () => {
-  if (selectedOption.value === ClientTypeEnum.U) {
+  if (selectedOption.value === BusinessTypeEnum.U) {
     const fromName = `${ForestClientUserSession.user?.firstName} ${ForestClientUserSession.user?.lastName}`;
 
     formData.value.businessInformation.businessType = "U";
@@ -226,7 +226,7 @@ watch([selectedOption], () => {
     #="{ content, loading, error }"
   >
     <AutoCompleteInputComponent
-      v-if="selectedOption === ClientTypeEnum.R"
+      v-if="selectedOption === BusinessTypeEnum.R"
       id="business"
       label="BC registered business name"
       tip=""
@@ -245,10 +245,10 @@ watch([selectedOption], () => {
     <cds-inline-loading status="active" v-if="showDetailsLoading">Loading client details...</cds-inline-loading>
     <div
       class="grouping-02"
-      v-if="(showAutoCompleteInfo && selectedOption === ClientTypeEnum.R) || showGoodStandingError || showDuplicatedError">
+      v-if="(showAutoCompleteInfo && selectedOption === BusinessTypeEnum.R) || showGoodStandingError || showDuplicatedError">
       <cds-inline-notification
         v-shadow="2"
-        v-if="showAutoCompleteInfo && selectedOption === ClientTypeEnum.R"
+        v-if="showAutoCompleteInfo && selectedOption === BusinessTypeEnum.R"
         low-contrast="true"
         open="true"
         kind="info"
@@ -315,7 +315,7 @@ watch([selectedOption], () => {
   </data-fetcher>
 
   <text-input-component
-    v-if="selectedOption === ClientTypeEnum.U"
+    v-if="selectedOption === BusinessTypeEnum.U"
     id="businessName"
     label="Unregistered proprietorship"
     placeholder=""

From bb4b79695acf25828a79e89f08c3ec6efad70b8d Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 5 Oct 2023 09:19:48 -0300
Subject: [PATCH 255/313] docs: improve comment

---
 frontend/src/components/forms/AutoCompleteInputComponent.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index bcdf19a955..819be41dc3 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -56,8 +56,10 @@ let selectedValue: BusinessSearchResult | undefined = undefined;
 
 //This function emits the events on update
 const emitValueChange = (newValue: string): void => {
-  // Prevent selecting the empty value provided when props.contents is empty.
+
+  // Prevent selecting the empty value included when props.contents is empty.
   selectedValue = newValue ? inputList.value.find((entry) => entry.code === newValue) : undefined;
+
   emit("update:model-value", selectedValue?.name ?? newValue);
   emit("update:selected-value", selectedValue);
   emit("empty", isEmpty(selectedValue));

From cf606241f7507e7d2433fda524a503f2987a6bf7 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 5 Oct 2023 09:37:23 -0300
Subject: [PATCH 256/313] docs: improve comment

---
 frontend/src/components/forms/TextInputComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index bebf5c05e6..965ce1cae7 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -44,7 +44,7 @@ const setError = (errorMessage: string | undefined) => {
   changes.
   Because the empty event is always emitted, even when it remains the same payload, and then we
   rely on empty(false) to consider a value "valid". In turn we need to emit a new error event after
-  an empty one to be able to make the field go invalid again when needed.
+  an empty one to allow subscribers to know in case the field still has the same error.
   */
   emit('error', error.value);
 }

From 3f31ede3965903154875e79fc4b721ec48527c55 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 5 Oct 2023 20:41:35 -0300
Subject: [PATCH 257/313] fix: synchronize dropdown value

---
 frontend/src/components/forms/DropdownInputComponent.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index 528c478bac..d9379d4664 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -47,10 +47,10 @@ emit("empty", isEmpty(props.initialValue));
 //This function emits the events on update
 const emitValueChange = (newValue: string): void => {
   const reference = newValue
-    ? props.modelValue.find((entry) => entry.code === newValue)
-    : undefined;
+    ? props.modelValue.find((entry) => entry.name === newValue)
+    : { code: '', name: '' };
 
-  emit("update:modelValue", newValue);
+  emit("update:modelValue", reference?.name);
   emit("update:selectedValue", reference);
   emit("empty", isEmpty(newValue));
 };
@@ -70,7 +70,7 @@ const validateInput = (newValue: any) => {
 };
 
 const selectItem = (event: any) => {
-  selectedValue.value = event?.detail?.item?.getAttribute("data-id");
+  selectedValue.value = event?.detail?.item?.getAttribute("data-value");
 };
 
 /**

From b306d51a57709b182462615c3a89936b398786d6 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 5 Oct 2023 20:42:01 -0300
Subject: [PATCH 258/313] fix: get country validation

---
 frontend/src/components/grouping/AddressGroupComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index e6901cb6de..abd74310e0 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -264,7 +264,7 @@ onMounted(() => {
     tip=""
     :enabled="true"
     :model-value="countryList"
-    :validations="[...getValidations('location.addresses.country.text'),submissionValidation(`location.addresses[${id}].country`)]"
+    :validations="[...getValidations('location.addresses.*.country.text'),submissionValidation(`location.addresses[${id}].country`)]"
     :error-message="addressError"
     @update:selected-value="updateStateProvince($event, 'country')"
     @update:model-value="resetProvinceOnChange"

From bf572b16549a099d56a0ab81e3242c13b2094429 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Thu, 5 Oct 2023 20:47:03 -0300
Subject: [PATCH 259/313] fix: validate after changed from outside

---
 frontend/src/components/forms/TextInputComponent.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index 965ce1cae7..97a2f53d55 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -66,7 +66,14 @@ const emitValueChange = (newValue: string): void => {
   emit("empty", isEmpty(newValue));
 };
 //Watch for changes on the input
-watch([selectedValue], () => emitValueChange(selectedValue.value));
+watch([selectedValue], () => {
+  emitValueChange(selectedValue.value);
+
+  // We don't to validate at each key pressed, but we do want to validate when it's changed from outside
+  if (document.activeElement?.id !== props.id) {
+    validateInput(selectedValue.value);
+  }
+});
 
 //We call all the validations
 const validateInput = (newValue: string) => {

From 7a6e001e5fef09ba46f9d6cf1b22b1c375ac6ba0 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 09:47:55 -0300
Subject: [PATCH 260/313] test: define some tests to be implemented

---
 .../grouping/AddressGroupComponent.cy.ts      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index cbf02e03d9..f9848f9b56 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -277,4 +277,23 @@ describe('<AddressGroupComponent />', () => {
       })
     })
   })
+  // TODO: FSADT1-915
+  // it('should update the province when changed manually', () => {
+  // })
+  // it('should update the province when a Street address option gets selected', () => {
+  // })
+  // describe('when Province is cleared by the user', () => {
+  //   /**
+  //    * @see FSADT1-914
+  //    */
+  //   it('should update the Province when a Street address in the same province gets selected', () => {
+  //   })
+
+  //   it('should update the Province when a Street address in a different province gets selected', () => {
+  //   })
+  // })
+  // describe('when the following fields are displayed as invalid: City, Province, Postal code', () => {
+  //   it('should display them as valid when they get filled by selecting a Street address option', () => {
+  //   })
+  // })
 })

From 882650fb6a595a44c7365828cc0108eb1ed2667e Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 10:45:39 -0300
Subject: [PATCH 261/313] test: province gets cleared

---
 .../components/components/grouping/AddressGroupComponent.cy.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index f9848f9b56..6cf6f38d99 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -162,6 +162,9 @@ describe('<AddressGroupComponent />', () => {
 
     cy.wait('@getStates')
 
+    // Value effectively displayed has got cleared (see FSADT1-900).
+    cy.get('#province_0').find('input').should('have.value', '')
+
     cy.get('#province_0')
       .should('be.visible')
       .and('have.value', '')

From 3835366c9f582f4131590c2e261256654ecc9453 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 10:56:36 -0300
Subject: [PATCH 262/313] docs: add issue references

---
 .../components/grouping/AddressGroupComponent.cy.ts           | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index 6cf6f38d99..6abab826e4 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -180,6 +180,10 @@ describe('<AddressGroupComponent />', () => {
       .and('include.text', 'Zip code')
   })
 
+  /**
+   * @see FSADT1-905
+   * @see FSADT1-907
+   */
   describe('when it has last emitted "valid" with false due to a single, not empty, invalid field', () => {
     const genericTest = (
       fieldSelector: string,

From 6f745484c6572c434894dc4b134f4dae8c0d0947 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 12:55:33 -0300
Subject: [PATCH 263/313] test: revalidates when changed from outside

Also fixes another test.
---
 .../forms/TextInputComponent.spec.ts          | 33 +++++++++++++++----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts b/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
index d74b335637..fdf9242d9b 100644
--- a/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
@@ -70,7 +70,7 @@ describe('Text Input Component', () => {
     expect(wrapper.emitted('error')![0][0]).toBe('Field is required')
   })
 
-  it('emits the "error" event even when the error message is the same as before', async () => {
+  it('revalidates when changed from outside (i.e. not directly by the user)', async () => {
     const errorMessage = "sample error message";
     const wrapper = mount(TextInputComponent, {
       props: {
@@ -86,19 +86,40 @@ describe('Text Input Component', () => {
       },
     });
 
-    console.log(wrapper.html());
+    /*
+    Note: we are not triggerring "input" nor "blur".
+    Just like on a programmatic change, which was not performed by a user.
+    */
+    await wrapper.setProps({ modelValue: "1"});
+
+    expect(wrapper.emitted("error")).toBeTruthy();
+    expect(wrapper.emitted("error")).toHaveLength(1);
+    expect(wrapper.emitted("error")![0][0]).toBe(errorMessage);
+  });
+
+  it.only('emits the "error" event even when the error message is the same as before', async () => {
+    const errorMessage = "sample error message";
+    const wrapper = mount(TextInputComponent, {
+      props: {
+        id,
+        label: 'TestField',
+        placeholder: '',
+        modelValue: '',
+        validations: [isMinSize(errorMessage)(5)],
+        enabled: true,
+      },
+      directives: {
+        masked: () => {},
+      },
+    });
 
     await wrapper.setProps({ modelValue: "1"});
-    await wrapper.find(`#${id}`).trigger("input");
-    await wrapper.find(`#${id}`).trigger("blur");
 
     expect(wrapper.emitted("error")).toBeTruthy();
     expect(wrapper.emitted("error")).toHaveLength(1);
     expect(wrapper.emitted("error")![0][0]).toBe(errorMessage);
 
     await wrapper.setProps({ modelValue: "12"}); // adds another character
-    await wrapper.find(`#${id}`).trigger("input");
-    await wrapper.find(`#${id}`).trigger("blur");
 
     expect(wrapper.emitted("error")).toHaveLength(2);
     expect(wrapper.emitted("error")![1][0]).toBe(errorMessage);

From 9ec363686013b1bbe6a51472e8e644e93ad4ba2d Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Fri, 6 Oct 2023 09:10:24 -0700
Subject: [PATCH 264/313] Fast commit to switch branches

---
 frontend/src/pages/FormBCSCPage.vue | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/frontend/src/pages/FormBCSCPage.vue b/frontend/src/pages/FormBCSCPage.vue
index 4d3e022a72..53a5b23590 100644
--- a/frontend/src/pages/FormBCSCPage.vue
+++ b/frontend/src/pages/FormBCSCPage.vue
@@ -27,6 +27,16 @@
         {{ formData.businessInformation.businessName }}
       </p>
     </div>
+
+    <div class="grouping-01">
+      <p class="heading-02">
+        Date of birth
+      </p>
+      <p class="body-compact-01">
+        {{ formData.businessInformation.businessName }}
+      </p>
+    </div>
+
     <div class="grouping-06">
       <!-- <cds-button kind="tertiary" @click.prevent="goToStep(0)">
         <span>Edit business information</span>
@@ -42,7 +52,7 @@
 <script setup lang="ts">
 import { reactive, watch, toRef, ref, getCurrentInstance, computed } from "vue";
 import { newFormDataDto } from "@/dto/ApplyClientNumberDto";
-import { ClientTypeEnum, LegalTypeEnum } from "@/dto/CommonTypesDto";
+import { BusinessTypeEnum, ClientTypeEnum, LegalTypeEnum } from "@/dto/CommonTypesDto";
 import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
 
 
@@ -58,18 +68,20 @@ const submitterContact: Contact = {
   email: session?.user?.email ?? "",
 };
 
+console.log(session);
+
 let formDataDto = ref<FormDataDto>({ ...newFormDataDto() });
 
 //---- Form Data ----//
 let formData = reactive<FormDataDto>({
   ...formDataDto.value,
   businessInformation :{
-    businessType: ClientTypeEnum.U.toString(),
+    businessType: BusinessTypeEnum.U.toString(),
     legalType: LegalTypeEnum.SP.toString(),
-    clientType: '',
+    clientType: ClientTypeEnum.I.toString(),
     incorporationNumber: '',
-    businessName: 'Test',
-    goodStandingInd: '',
+    businessName: session?.user?.name ?? "",
+    goodStandingInd: "Y",
   },
   location: {
     addresses: formDataDto.value.location.addresses,

From fa36f42390dc5ce3a5265c9910c9ade0b0b98e9c Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 15:15:26 -0300
Subject: [PATCH 265/313] fix: validate the item code instead of its name

---
 frontend/src/components/forms/DropdownInputComponent.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index d9379d4664..16bd236331 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -87,7 +87,10 @@ watch([selectedValue], () => {
   if (selectedValue.value === "") {
     comboBoxMountTime.value = [Date.now()];
   }
-  validateInput(selectedValue.value);
+  const reference = selectedValue.value
+    ? props.modelValue.find((entry) => entry.name === selectedValue.value)
+    : { code: "", name: "" };
+  validateInput(reference ? reference.code : "");
   emitValueChange(selectedValue.value);
 });
 

From 283b072c769df60f252467f8e61c5350b74d030c Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 15:16:55 -0300
Subject: [PATCH 266/313] test: update tests

---
 .../forms/DropdownInputComponent.spec.ts      | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts b/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
index 64060ddd22..5350ef4d79 100644
--- a/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
@@ -8,7 +8,7 @@ describe('DropdownInputComponent', () => {
     (value: any) => (value === 'A' ? 'A is not supported' : '')
   ]
 
-  const eventContent = (value:string) => {return { detail: { item: { 'data-id': value, getAttribute: (key:string) => value } }}}
+  const eventContent = (value:string) => {return { detail: { item: { 'data-value': value, getAttribute: (key:string) => value } }}}
 
 
   it('should render', () => {
@@ -48,10 +48,10 @@ describe('DropdownInputComponent', () => {
 
     const dropdown = wrapper.find('cds-combo-box')
 
-    await dropdown.trigger('cds-combo-box-selected', eventContent('A'))
+    await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('A')
+    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value A')
 
     expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
     expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
@@ -80,7 +80,7 @@ describe('DropdownInputComponent', () => {
 
     const dropdown = wrapper.find('cds-combo-box')
 
-    await dropdown.trigger('cds-combo-box-selected', eventContent('A'))
+    await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
 
     expect(wrapper.emitted('empty')).toBeTruthy()
     expect(wrapper.emitted('empty')![1][0]).toBe(false)
@@ -103,10 +103,10 @@ describe('DropdownInputComponent', () => {
 
     const dropdown = wrapper.find('cds-combo-box')
 
-    await dropdown.trigger('cds-combo-box-selected', eventContent('A'))
+    await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('A')
+    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value A')
 
     expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
     expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
@@ -135,10 +135,10 @@ describe('DropdownInputComponent', () => {
 
     const dropdown = wrapper.find('cds-combo-box')
 
-    await dropdown.trigger('cds-combo-box-selected', eventContent('B'))
+    await dropdown.trigger('cds-combo-box-selected', eventContent('Value B'))
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('B')
+    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value B')
 
     expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
     expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
@@ -167,10 +167,10 @@ describe('DropdownInputComponent', () => {
 
     const dropdown = wrapper.find('cds-combo-box')
 
-    await dropdown.trigger('cds-combo-box-selected', eventContent('A'))
+    await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('A')
+    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value A')
 
     expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
     expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
@@ -189,8 +189,9 @@ describe('DropdownInputComponent', () => {
     expect(wrapper.emitted('update:modelValue')![1][0]).toBe('')
 
     expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![1][0]).toStrictEqual(
-      undefined
-    )
+    expect(wrapper.emitted('update:selectedValue')![1][0]).toStrictEqual({
+      code: '',
+      name: '',
+    })
   })
 })

From ccce1fa4cce67b54f944b4340573c0fc11bbd19b Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 15:34:56 -0300
Subject: [PATCH 267/313] fix: remove meaningless tag

---
 frontend/src/components/MainHeaderComponent.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index 42fffe1b07..bfebc912f4 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -35,7 +35,6 @@ const logoutModalActive = ref(false);
       alt="Go to the Government of British Columbia website"
       v-else
     />
-    <logo />
   </a>
   <div class="heading">
     <span class="heading-compact-01" v-if="$session?.user?.provider !== 'idir'">Ministry of Forests</span>

From 8a47741953db43b2831caa2e53ada025dbe4a402 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 16:22:30 -0300
Subject: [PATCH 268/313] fix: do not display field as invalid

When the field is empty and user didn't have a chance to add its value yet.
For example, when it gets auto-changed as a result of changing another field.
---
 .../forms/DropdownInputComponent.vue          | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index 16bd236331..b634dc5cf3 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -55,17 +55,30 @@ const emitValueChange = (newValue: string): void => {
   emit("empty", isEmpty(newValue));
 };
 
-//We call all the validations
-const validateInput = (newValue: any) => {
+/**
+ * Performs all validations and returns the first error message.
+ * If there's no error from the validations, returns props.errorMessage.
+ *
+ * @param {string} newValue
+ * @returns {string | undefined} the error message or props.errorMessage
+ */
+const validatePurely = (newValue: string): string | undefined => {
   if (props.validations) {
-    error.value =
+    return (
       props.validations
         .map((validation) => validation(newValue))
         .filter((errorMessage) => {
           if (errorMessage) return true;
           return false;
         })
-        .shift() ?? props.errorMessage;
+        .shift() ?? props.errorMessage
+    );
+  }
+}
+
+const validateInput = (newValue: any) => {
+  if (props.validations) {
+    error.value = validatePurely(newValue);
   }
 };
 
@@ -90,7 +103,19 @@ watch([selectedValue], () => {
   const reference = selectedValue.value
     ? props.modelValue.find((entry) => entry.name === selectedValue.value)
     : { code: "", name: "" };
-  validateInput(reference ? reference.code : "");
+  const errorMessage = validatePurely(reference ? reference.code : "");
+
+  /*
+  If the element is not active, we don't want to set a non-empty error message
+  on it.
+  We don't want to call user's attention for something they didn't do wrong.
+  Note: we still want to UPDATE the error message in case it already had an
+  error, because the type of error could have changed.
+  */
+  if (document.activeElement?.id === props.id || !errorMessage || error.value) {
+    error.value = errorMessage
+  }
+
   emitValueChange(selectedValue.value);
 });
 

From 5fe37283f11927bdbf9b978984568a4adb42a344 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Fri, 6 Oct 2023 12:55:09 -0700
Subject: [PATCH 269/313] Fast commit to switch branches

---
 frontend/src/dto/ApplyClientNumberDto.ts      | 115 ++++++++---------
 frontend/src/dto/CommonTypesDto.ts            |   1 +
 .../src/helpers/ForestClientUserSession.ts    | 118 +++++++++---------
 frontend/src/pages/FormBCSCPage.vue           |  13 +-
 4 files changed, 130 insertions(+), 117 deletions(-)

diff --git a/frontend/src/dto/ApplyClientNumberDto.ts b/frontend/src/dto/ApplyClientNumberDto.ts
index d29e548dfc..8cf902d3c7 100644
--- a/frontend/src/dto/ApplyClientNumberDto.ts
+++ b/frontend/src/dto/ApplyClientNumberDto.ts
@@ -1,89 +1,92 @@
-import type { CodeDescrType } from '@/dto/CommonTypesDto'
+import type { CodeDescrType } from "@/dto/CommonTypesDto";
 
 export interface Address {
-  locationName: string
-  streetAddress: string
-  country: CodeDescrType
-  province: CodeDescrType
-  city: string
-  postalCode: string
+  locationName: string;
+  streetAddress: string;
+  country: CodeDescrType;
+  province: CodeDescrType;
+  city: string;
+  postalCode: string;
 }
 
 export interface Contact {
-  locationNames: CodeDescrType[]
-  contactType: CodeDescrType
-  firstName: string
-  lastName: string
-  phoneNumber: string
-  email: string
+  locationNames: CodeDescrType[];
+  contactType: CodeDescrType;
+  firstName: string;
+  lastName: string;
+  phoneNumber: string;
+  email: string;
 }
 
 export interface FormDataDto {
   businessInformation: {
-    businessType: string
-    legalType: string
-    clientType: string
-    incorporationNumber: string
-    businessName: string
-    goodStandingInd: string
-  }
+    businessType: string;
+    legalType: string;
+    clientType: string;
+    incorporationNumber: string;
+    businessName: string;
+    goodStandingInd: string;
+    birthDate: string;
+  };
   location: {
-    addresses: Address[]
-    contacts: Contact[]
-  }
+    addresses: Address[];
+    contacts: Contact[];
+  };
 }
 
 export interface ForestClientDetailsDto {
-  name: string
-  id: string
-  goodStanding: boolean
-  addresses: Address[]
-  contacts: Contact[]
+  name: string;
+  id: string;
+  goodStanding: boolean;
+  addresses: Address[];
+  contacts: Contact[];
 }
 
 export const formDataDto: FormDataDto = {
   businessInformation: {
-    businessType: '',
-    legalType: '',
-    clientType: '',
-    incorporationNumber: '',
-    businessName: '',
-    goodStandingInd: '',
+    businessType: "",
+    legalType: "",
+    clientType: "",
+    incorporationNumber: "",
+    businessName: "",
+    goodStandingInd: "",
+    birthDate: "",
   },
   location: {
     addresses: [
       {
-        locationName: 'Mailing address',
-        streetAddress: '',
-        country: { value: 'CA', text: 'Canada' },
-        province: { value: 'BC', text: 'British Columbia' },
-        city: '',
-        postalCode: '',
+        locationName: "Mailing address",
+        streetAddress: "",
+        country: { value: "CA", text: "Canada" },
+        province: { value: "BC", text: "British Columbia" },
+        city: "",
+        postalCode: "",
       },
     ],
     contacts: [],
   },
-}
+};
 
 export const emptyAddress = (): Address =>
   JSON.parse(
     JSON.stringify({
-      locationName: '',
-      streetAddress: '',
-      country: { value: 'CA', text: 'Canada' },
-      province: { value: 'BC', text: 'British Columbia' },
-      city: '',
-      postalCode: '',
-    }),
-  )
+      locationName: "",
+      streetAddress: "",
+      country: { value: "CA", text: "Canada" },
+      province: { value: "BC", text: "British Columbia" },
+      city: "",
+      postalCode: "",
+    })
+  );
 
 export const emptyContact: Contact = {
   locationNames: [],
-  contactType: { value: '', text: '' },
-  firstName: '',
-  lastName: '',
-  phoneNumber: '',
-  email: '',
-}
+  contactType: { value: "", text: "" },
+  firstName: "",
+  lastName: "",
+  phoneNumber: "",
+  email: "",
+};
 
-export const newFormDataDto = (): FormDataDto => JSON.parse(JSON.stringify(formDataDto))
+export const newFormDataDto = (): FormDataDto =>
+  JSON.parse(JSON.stringify(formDataDto));
diff --git a/frontend/src/dto/CommonTypesDto.ts b/frontend/src/dto/CommonTypesDto.ts
index 8153e6b570..fb04a8b821 100644
--- a/frontend/src/dto/CommonTypesDto.ts
+++ b/frontend/src/dto/CommonTypesDto.ts
@@ -78,6 +78,7 @@ export interface Submitter {
   firstName: string;
   lastName: string;
   businessName: string;
+  birthDate: string;
 }
 
 export interface ModalNotification {
diff --git a/frontend/src/helpers/ForestClientUserSession.ts b/frontend/src/helpers/ForestClientUserSession.ts
index f297bd6672..dbe0094fc0 100644
--- a/frontend/src/helpers/ForestClientUserSession.ts
+++ b/frontend/src/helpers/ForestClientUserSession.ts
@@ -1,110 +1,110 @@
-import type { SessionProperties, Submitter } from '@/dto/CommonTypesDto'
-import { backendUrl } from '@/CoreConstants'
+import type { SessionProperties, Submitter } from "@/dto/CommonTypesDto";
+import { backendUrl } from "@/CoreConstants";
 
 class ForestClientUserSession implements SessionProperties {
-  public user: Submitter | undefined
+  public user: Submitter | undefined;
 
-  public constructor () {
-    this.loadUser()
+  public constructor() {
+    this.loadUser();
   }
 
   logIn = (provider: string): void => {
-    window.location.href = `${backendUrl}/login?code=${provider}`
-  }
+    window.location.href = `${backendUrl}/login?code=${provider}`;
+  };
 
   logOut = (): void => {
-    this.user = undefined
-    window.location.href = `${backendUrl}/logout`
-  }
+    this.user = undefined;
+    window.location.href = `${backendUrl}/logout`;
+  };
 
   isLoggedIn = (): boolean => {
-    return this.loadDetails() !== undefined
-  }
+    return this.loadDetails() !== undefined;
+  };
 
   loadDetails = (): Submitter | undefined => {
     if (this.user === undefined) {
-      this.loadUser()
+      this.loadUser();
     }
-    return this.user
-  }
+    return this.user;
+  };
 
   private processName = (
     payload: any,
     provider: string
   ): { firstName: string; lastName: string; businessName: string } => {
-    const additionalInfo = { firstName: '', lastName: '', businessName: '' }
+    const additionalInfo = { firstName: "", lastName: "", businessName: "" };
     if (payload.given_name) {
-      additionalInfo.firstName = payload.given_name
+      additionalInfo.firstName = payload.given_name;
     }
 
     if (payload.family_name) {
-      additionalInfo.lastName = payload.family_name
+      additionalInfo.lastName = payload.family_name;
     }
 
     if (
-      provider === 'bceidbusiness' ||
-      (additionalInfo.firstName === '' && additionalInfo.lastName === '')
+      provider === "bceidbusiness" ||
+      (additionalInfo.firstName === "" && additionalInfo.lastName === "")
     ) {
-      const name = payload['custom:idp_display_name']
-      const spaceIndex = name.indexOf(' ')
+      const name = payload["custom:idp_display_name"];
+      const spaceIndex = name.indexOf(" ");
       if (spaceIndex > 0) {
         additionalInfo.lastName = this.splitAtSpace(
-          payload['custom:idp_display_name']
-        )[0].replace(/,/g, '')
+          payload["custom:idp_display_name"]
+        )[0].replace(/,/g, "");
         additionalInfo.firstName = this.splitAtSpace(
-          payload['custom:idp_display_name']
-        )[1].replace(/,/g, '')
-        additionalInfo.businessName = payload['custom:idp_business_name']
+          payload["custom:idp_display_name"]
+        )[1].replace(/,/g, "");
+        additionalInfo.businessName = payload["custom:idp_business_name"];
       }
     }
 
-    return additionalInfo
-  }
+    return additionalInfo;
+  };
 
   private splitAtSpace = (name: string): string[] => {
-    const nameArray = name.split(' ')
-    const nameArrayWithoutSpaces = nameArray.filter((name) => name !== '')
-    return nameArrayWithoutSpaces
-  }
+    const nameArray = name.split(" ");
+    const nameArrayWithoutSpaces = nameArray.filter((name) => name !== "");
+    return nameArrayWithoutSpaces;
+  };
 
   private loadUser = (): void => {
-    const accessToken = this.getCookie('idToken')
+    const accessToken = this.getCookie("idToken");
     if (accessToken) {
-      const parsedUser = this.parseJwt(accessToken)
+      const parsedUser = this.parseJwt(accessToken);
       this.user = {
-        name: parsedUser['custom:idp_display_name'],
-        provider: parsedUser['custom:idp_name'],
-        userId: parsedUser['custom:idp_user_id'],
+        name: parsedUser["custom:idp_display_name"],
+        provider: parsedUser["custom:idp_name"],
+        userId: parsedUser["custom:idp_user_id"],
+        birthDate: parsedUser["birthdate"],
         email: parsedUser.email,
-        ...this.processName(
-          parsedUser,
-          parsedUser['custom:idp_name']
-        )
-      }
-      this.user.provider = this.user.provider.startsWith('ca.bc.gov.flnr.fam.') ? 'bcsc' : this.user.provider
+        ...this.processName(parsedUser, parsedUser["custom:idp_name"]),
+      };
+      this.user.provider = this.user.provider.startsWith("ca.bc.gov.flnr.fam.")
+        ? "bcsc"
+        : this.user.provider;
     }
-  }
+  };
 
-  private getCookie = (name:string): string | null => {
-    const cookieString = document.cookie
-    if (cookieString !== '') {
-      const cookies = cookieString.split(';')
+  private getCookie = (name: string): string | null => {
+    const cookieString = document.cookie;
+    if (cookieString !== "") {
+      const cookies = cookieString.split(";");
       for (const cookie of cookies) {
-        const [cookieName, cookieValue] = cookie.trim().split('=')
+        const [cookieName, cookieValue] = cookie.trim().split("=");
         if (cookieName === name) {
-          return decodeURIComponent(cookieValue)
+          return decodeURIComponent(cookieValue);
         }
       }
     }
-    return null
-  }
+    return null;
+  };
 
   private parseJwt = (token: string): any => {
-    const base64Url = token.split('.')[1]
-    const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
-    const decodedPayload = JSON.parse(atob(base64))
-    return decodedPayload
-  }
+    const base64Url = token.split(".")[1];
+    const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
+    const decodedPayload = JSON.parse(atob(base64));
+    return decodedPayload;
+  };
 }
 
-export default new ForestClientUserSession()
+export default new ForestClientUserSession();
diff --git a/frontend/src/pages/FormBCSCPage.vue b/frontend/src/pages/FormBCSCPage.vue
index 53a5b23590..248044cf89 100644
--- a/frontend/src/pages/FormBCSCPage.vue
+++ b/frontend/src/pages/FormBCSCPage.vue
@@ -33,7 +33,7 @@
         Date of birth
       </p>
       <p class="body-compact-01">
-        {{ formData.businessInformation.businessName }}
+        {{ formData.businessInformation.birthDate }}
       </p>
     </div>
 
@@ -55,7 +55,6 @@ import { newFormDataDto } from "@/dto/ApplyClientNumberDto";
 import { BusinessTypeEnum, ClientTypeEnum, LegalTypeEnum } from "@/dto/CommonTypesDto";
 import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
 
-
 const instance = getCurrentInstance();
 const session = instance?.appContext.config.globalProperties.$session;
 
@@ -72,6 +71,15 @@ console.log(session);
 
 let formDataDto = ref<FormDataDto>({ ...newFormDataDto() });
 
+const formatter = new Intl.DateTimeFormat('en-US', {
+  year: 'numeric',
+  month: 'short',
+  day: 'numeric',
+});
+
+const birthDate = new Date(session?.user?.birthDate ?? "");
+const formattedDate = formatter.format(birthDate);
+
 //---- Form Data ----//
 let formData = reactive<FormDataDto>({
   ...formDataDto.value,
@@ -82,6 +90,7 @@ let formData = reactive<FormDataDto>({
     incorporationNumber: '',
     businessName: session?.user?.name ?? "",
     goodStandingInd: "Y",
+    birthDate: formattedDate,
   },
   location: {
     addresses: formDataDto.value.location.addresses,

From 21c2969da4a9cd34a2f44bf1e6413577746ba076 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Fri, 6 Oct 2023 13:48:58 -0700
Subject: [PATCH 270/313] fix: Made code reviews and added birth date field

---
 frontend/src/dto/ApplyClientNumberDto.ts      | 115 ++++++++---------
 frontend/src/dto/CommonTypesDto.ts            |   1 +
 .../src/helpers/ForestClientUserSession.ts    | 118 +++++++++---------
 3 files changed, 119 insertions(+), 115 deletions(-)

diff --git a/frontend/src/dto/ApplyClientNumberDto.ts b/frontend/src/dto/ApplyClientNumberDto.ts
index d29e548dfc..8cf902d3c7 100644
--- a/frontend/src/dto/ApplyClientNumberDto.ts
+++ b/frontend/src/dto/ApplyClientNumberDto.ts
@@ -1,89 +1,92 @@
-import type { CodeDescrType } from '@/dto/CommonTypesDto'
+import type { CodeDescrType } from "@/dto/CommonTypesDto";
 
 export interface Address {
-  locationName: string
-  streetAddress: string
-  country: CodeDescrType
-  province: CodeDescrType
-  city: string
-  postalCode: string
+  locationName: string;
+  streetAddress: string;
+  country: CodeDescrType;
+  province: CodeDescrType;
+  city: string;
+  postalCode: string;
 }
 
 export interface Contact {
-  locationNames: CodeDescrType[]
-  contactType: CodeDescrType
-  firstName: string
-  lastName: string
-  phoneNumber: string
-  email: string
+  locationNames: CodeDescrType[];
+  contactType: CodeDescrType;
+  firstName: string;
+  lastName: string;
+  phoneNumber: string;
+  email: string;
 }
 
 export interface FormDataDto {
   businessInformation: {
-    businessType: string
-    legalType: string
-    clientType: string
-    incorporationNumber: string
-    businessName: string
-    goodStandingInd: string
-  }
+    businessType: string;
+    legalType: string;
+    clientType: string;
+    incorporationNumber: string;
+    businessName: string;
+    goodStandingInd: string;
+    birthDate: string;
+  };
   location: {
-    addresses: Address[]
-    contacts: Contact[]
-  }
+    addresses: Address[];
+    contacts: Contact[];
+  };
 }
 
 export interface ForestClientDetailsDto {
-  name: string
-  id: string
-  goodStanding: boolean
-  addresses: Address[]
-  contacts: Contact[]
+  name: string;
+  id: string;
+  goodStanding: boolean;
+  addresses: Address[];
+  contacts: Contact[];
 }
 
 export const formDataDto: FormDataDto = {
   businessInformation: {
-    businessType: '',
-    legalType: '',
-    clientType: '',
-    incorporationNumber: '',
-    businessName: '',
-    goodStandingInd: '',
+    businessType: "",
+    legalType: "",
+    clientType: "",
+    incorporationNumber: "",
+    businessName: "",
+    goodStandingInd: "",
+    birthDate: "",
   },
   location: {
     addresses: [
       {
-        locationName: 'Mailing address',
-        streetAddress: '',
-        country: { value: 'CA', text: 'Canada' },
-        province: { value: 'BC', text: 'British Columbia' },
-        city: '',
-        postalCode: '',
+        locationName: "Mailing address",
+        streetAddress: "",
+        country: { value: "CA", text: "Canada" },
+        province: { value: "BC", text: "British Columbia" },
+        city: "",
+        postalCode: "",
       },
     ],
     contacts: [],
   },
-}
+};
 
 export const emptyAddress = (): Address =>
   JSON.parse(
     JSON.stringify({
-      locationName: '',
-      streetAddress: '',
-      country: { value: 'CA', text: 'Canada' },
-      province: { value: 'BC', text: 'British Columbia' },
-      city: '',
-      postalCode: '',
-    }),
-  )
+      locationName: "",
+      streetAddress: "",
+      country: { value: "CA", text: "Canada" },
+      province: { value: "BC", text: "British Columbia" },
+      city: "",
+      postalCode: "",
+    })
+  );
 
 export const emptyContact: Contact = {
   locationNames: [],
-  contactType: { value: '', text: '' },
-  firstName: '',
-  lastName: '',
-  phoneNumber: '',
-  email: '',
-}
+  contactType: { value: "", text: "" },
+  firstName: "",
+  lastName: "",
+  phoneNumber: "",
+  email: "",
+};
 
-export const newFormDataDto = (): FormDataDto => JSON.parse(JSON.stringify(formDataDto))
+export const newFormDataDto = (): FormDataDto =>
+  JSON.parse(JSON.stringify(formDataDto));
diff --git a/frontend/src/dto/CommonTypesDto.ts b/frontend/src/dto/CommonTypesDto.ts
index 8153e6b570..fb04a8b821 100644
--- a/frontend/src/dto/CommonTypesDto.ts
+++ b/frontend/src/dto/CommonTypesDto.ts
@@ -78,6 +78,7 @@ export interface Submitter {
   firstName: string;
   lastName: string;
   businessName: string;
+  birthDate: string;
 }
 
 export interface ModalNotification {
diff --git a/frontend/src/helpers/ForestClientUserSession.ts b/frontend/src/helpers/ForestClientUserSession.ts
index f297bd6672..dbe0094fc0 100644
--- a/frontend/src/helpers/ForestClientUserSession.ts
+++ b/frontend/src/helpers/ForestClientUserSession.ts
@@ -1,110 +1,110 @@
-import type { SessionProperties, Submitter } from '@/dto/CommonTypesDto'
-import { backendUrl } from '@/CoreConstants'
+import type { SessionProperties, Submitter } from "@/dto/CommonTypesDto";
+import { backendUrl } from "@/CoreConstants";
 
 class ForestClientUserSession implements SessionProperties {
-  public user: Submitter | undefined
+  public user: Submitter | undefined;
 
-  public constructor () {
-    this.loadUser()
+  public constructor() {
+    this.loadUser();
   }
 
   logIn = (provider: string): void => {
-    window.location.href = `${backendUrl}/login?code=${provider}`
-  }
+    window.location.href = `${backendUrl}/login?code=${provider}`;
+  };
 
   logOut = (): void => {
-    this.user = undefined
-    window.location.href = `${backendUrl}/logout`
-  }
+    this.user = undefined;
+    window.location.href = `${backendUrl}/logout`;
+  };
 
   isLoggedIn = (): boolean => {
-    return this.loadDetails() !== undefined
-  }
+    return this.loadDetails() !== undefined;
+  };
 
   loadDetails = (): Submitter | undefined => {
     if (this.user === undefined) {
-      this.loadUser()
+      this.loadUser();
     }
-    return this.user
-  }
+    return this.user;
+  };
 
   private processName = (
     payload: any,
     provider: string
   ): { firstName: string; lastName: string; businessName: string } => {
-    const additionalInfo = { firstName: '', lastName: '', businessName: '' }
+    const additionalInfo = { firstName: "", lastName: "", businessName: "" };
     if (payload.given_name) {
-      additionalInfo.firstName = payload.given_name
+      additionalInfo.firstName = payload.given_name;
     }
 
     if (payload.family_name) {
-      additionalInfo.lastName = payload.family_name
+      additionalInfo.lastName = payload.family_name;
     }
 
     if (
-      provider === 'bceidbusiness' ||
-      (additionalInfo.firstName === '' && additionalInfo.lastName === '')
+      provider === "bceidbusiness" ||
+      (additionalInfo.firstName === "" && additionalInfo.lastName === "")
     ) {
-      const name = payload['custom:idp_display_name']
-      const spaceIndex = name.indexOf(' ')
+      const name = payload["custom:idp_display_name"];
+      const spaceIndex = name.indexOf(" ");
       if (spaceIndex > 0) {
         additionalInfo.lastName = this.splitAtSpace(
-          payload['custom:idp_display_name']
-        )[0].replace(/,/g, '')
+          payload["custom:idp_display_name"]
+        )[0].replace(/,/g, "");
         additionalInfo.firstName = this.splitAtSpace(
-          payload['custom:idp_display_name']
-        )[1].replace(/,/g, '')
-        additionalInfo.businessName = payload['custom:idp_business_name']
+          payload["custom:idp_display_name"]
+        )[1].replace(/,/g, "");
+        additionalInfo.businessName = payload["custom:idp_business_name"];
       }
     }
 
-    return additionalInfo
-  }
+    return additionalInfo;
+  };
 
   private splitAtSpace = (name: string): string[] => {
-    const nameArray = name.split(' ')
-    const nameArrayWithoutSpaces = nameArray.filter((name) => name !== '')
-    return nameArrayWithoutSpaces
-  }
+    const nameArray = name.split(" ");
+    const nameArrayWithoutSpaces = nameArray.filter((name) => name !== "");
+    return nameArrayWithoutSpaces;
+  };
 
   private loadUser = (): void => {
-    const accessToken = this.getCookie('idToken')
+    const accessToken = this.getCookie("idToken");
     if (accessToken) {
-      const parsedUser = this.parseJwt(accessToken)
+      const parsedUser = this.parseJwt(accessToken);
       this.user = {
-        name: parsedUser['custom:idp_display_name'],
-        provider: parsedUser['custom:idp_name'],
-        userId: parsedUser['custom:idp_user_id'],
+        name: parsedUser["custom:idp_display_name"],
+        provider: parsedUser["custom:idp_name"],
+        userId: parsedUser["custom:idp_user_id"],
+        birthDate: parsedUser["birthdate"],
         email: parsedUser.email,
-        ...this.processName(
-          parsedUser,
-          parsedUser['custom:idp_name']
-        )
-      }
-      this.user.provider = this.user.provider.startsWith('ca.bc.gov.flnr.fam.') ? 'bcsc' : this.user.provider
+        ...this.processName(parsedUser, parsedUser["custom:idp_name"]),
+      };
+      this.user.provider = this.user.provider.startsWith("ca.bc.gov.flnr.fam.")
+        ? "bcsc"
+        : this.user.provider;
     }
-  }
+  };
 
-  private getCookie = (name:string): string | null => {
-    const cookieString = document.cookie
-    if (cookieString !== '') {
-      const cookies = cookieString.split(';')
+  private getCookie = (name: string): string | null => {
+    const cookieString = document.cookie;
+    if (cookieString !== "") {
+      const cookies = cookieString.split(";");
       for (const cookie of cookies) {
-        const [cookieName, cookieValue] = cookie.trim().split('=')
+        const [cookieName, cookieValue] = cookie.trim().split("=");
         if (cookieName === name) {
-          return decodeURIComponent(cookieValue)
+          return decodeURIComponent(cookieValue);
         }
       }
     }
-    return null
-  }
+    return null;
+  };
 
   private parseJwt = (token: string): any => {
-    const base64Url = token.split('.')[1]
-    const base64 = base64Url.replace(/-/g, '+').replace(/_/g, '/')
-    const decodedPayload = JSON.parse(atob(base64))
-    return decodedPayload
-  }
+    const base64Url = token.split(".")[1];
+    const base64 = base64Url.replace(/-/g, "+").replace(/_/g, "/");
+    const decodedPayload = JSON.parse(atob(base64));
+    return decodedPayload;
+  };
 }
 
-export default new ForestClientUserSession()
+export default new ForestClientUserSession();

From c9595f112d1ef9d9689f0bdd2bf2835e0b3046da Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Fri, 6 Oct 2023 14:25:18 -0700
Subject: [PATCH 271/313] fix: Fixed logo for small screens

---
 frontend/public/img/logo-vertical1.svg | 73 ++++++++++++--------------
 1 file changed, 33 insertions(+), 40 deletions(-)

diff --git a/frontend/public/img/logo-vertical1.svg b/frontend/public/img/logo-vertical1.svg
index 628eaf884e..14f92f2c3d 100644
--- a/frontend/public/img/logo-vertical1.svg
+++ b/frontend/public/img/logo-vertical1.svg
@@ -1,61 +1,54 @@
 <svg width="40" height="36" viewBox="0 0 40 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g id="logo-vertical 1" clip-path="url(#clip0_746_105172)">
+<g id="logo-vertical 1" clip-path="url(#clip0_3500_6441)">
 <g id="1.0---Login">
 <g id="gov_v_pos-(1)">
-<path id="Fill-1" fill-rule="evenodd" clip-rule="evenodd" d="M6.17438 25.4036C6.17438 25.7099 6.19258 26.1438 6.365 26.331C6.53753 26.5265 6.8098 26.5692 7.08207 26.5692C7.88967 26.5692 8.50677 26.229 8.50677 25.378C8.50677 24.7058 8.14374 23.9231 6.70084 23.9231C6.21078 23.9231 6.17438 23.9744 6.17438 24.1443V25.4036ZM6.17438 23.4295C6.17438 23.6679 6.18348 23.6849 6.64637 23.6679C7.57202 23.6338 8.0713 23.3786 8.0713 22.5789C8.0713 21.745 7.4087 21.4303 6.71904 21.4303C6.51933 21.4303 6.38319 21.4471 6.30153 21.4812C6.21078 21.5068 6.17438 21.5495 6.17438 21.7024V23.4295ZM5.43024 22.2982C5.43024 21.6686 5.3876 21.5016 4.97919 21.4677L4.6952 21.4471C4.64891 21.4089 4.66199 21.2385 4.7043 21.2346C5.19414 21.1891 5.81147 21.1665 6.65546 21.1665C7.22719 21.1665 7.77173 21.2089 8.18025 21.4047C8.57046 21.5833 8.8698 21.9236 8.8698 22.4683C8.8698 23.0808 8.48869 23.3957 7.94414 23.6338C7.94414 23.7189 8.01682 23.7446 8.11656 23.7614C8.60663 23.8467 9.33268 24.2718 9.33268 25.1823C9.33268 26.1695 8.55226 26.8332 6.91852 26.8332C6.65546 26.8332 6.21078 26.8074 5.82955 26.8074C5.43024 26.8074 5.12169 26.8248 4.78585 26.8332C4.73148 26.8074 4.71329 26.6714 4.76776 26.6201L4.93119 26.5946C5.41205 26.518 5.43024 26.4245 5.43024 25.5312V22.2982Z" fill="white"/>
-<path id="Fill-2" fill-rule="evenodd" clip-rule="evenodd" d="M16.0201 23.2528C16.0201 22.5101 16.0048 22.3909 15.5532 22.3559L15.3617 22.3418C15.3158 22.3138 15.3311 22.1878 15.3771 22.1665C15.7599 22.1807 16.0201 22.1878 16.3417 22.1878C16.6479 22.1878 16.9081 22.1807 17.291 22.1665C17.3369 22.1878 17.3522 22.3138 17.3062 22.3418L17.1148 22.3559C16.6632 22.3909 16.6479 22.5101 16.6479 23.2528V25.7473C16.6479 26.4898 16.6632 26.5879 17.1148 26.637L17.3062 26.6579C17.3522 26.686 17.3369 26.8119 17.291 26.8332C16.9081 26.819 16.6479 26.8119 16.3417 26.8119C16.0201 26.8119 15.7599 26.819 15.3771 26.8332C15.3311 26.8119 15.3158 26.7 15.3617 26.6579L15.5532 26.637C16.0048 26.5879 16.0201 26.4898 16.0201 25.7473V23.2528Z" fill="white"/>
-<path id="Fill-3" fill-rule="evenodd" clip-rule="evenodd" d="M20.2861 25.8072C20.2861 26.5112 20.3006 26.6117 20.7215 26.6454L20.9538 26.6654C20.9973 26.6923 20.9829 26.8129 20.9394 26.8332C20.5256 26.8196 20.279 26.8129 19.9885 26.8129C19.6982 26.8129 19.4442 26.8196 18.9798 26.8332C18.9362 26.8129 18.9217 26.6991 18.9798 26.6654L19.241 26.6454C19.6547 26.6117 19.691 26.5112 19.691 25.8072V22.8095C19.691 22.6016 19.691 22.5951 19.4732 22.5951H19.074C18.762 22.5951 18.3628 22.6083 18.1814 22.7625C18.0072 22.91 17.9347 23.0578 17.8549 23.2253C17.7967 23.2656 17.6952 23.232 17.666 23.1784C17.7822 22.8767 17.8911 22.4474 17.9418 22.1791C17.9638 22.1658 18.0581 22.1591 18.0798 22.1791C18.1234 22.3936 18.3628 22.3872 18.6968 22.3872H21.636C22.0279 22.3872 22.0933 22.3736 22.2022 22.1993C22.2384 22.1859 22.3182 22.1927 22.3327 22.2193C22.253 22.4944 22.2022 23.0375 22.2239 23.2389C22.1949 23.2925 22.0714 23.2925 22.0353 23.2522C22.0134 23.0843 21.9626 22.8363 21.8538 22.7625C21.6867 22.6484 21.4112 22.5951 21.0119 22.5951H20.4967C20.279 22.5951 20.2861 22.6016 20.2861 22.823V25.8072Z" fill="white"/>
-<path id="Fill-4" fill-rule="evenodd" clip-rule="evenodd" d="M23.352 23.2528C23.352 22.5101 23.3368 22.3909 22.8851 22.3559L22.6938 22.3418C22.6478 22.3138 22.6631 22.1878 22.709 22.1665C23.0918 22.1807 23.352 22.1878 23.6737 22.1878C23.9798 22.1878 24.2401 22.1807 24.623 22.1665C24.6689 22.1878 24.6842 22.3138 24.6383 22.3418L24.4467 22.3559C23.9952 22.3909 23.9798 22.5101 23.9798 23.2528V25.7473C23.9798 26.4898 23.9952 26.5879 24.4467 26.637L24.6383 26.6579C24.6842 26.686 24.6689 26.8119 24.623 26.8332C24.2401 26.819 23.9798 26.8119 23.6737 26.8119C23.352 26.8119 23.0918 26.819 22.709 26.8332C22.6631 26.8119 22.6478 26.7 22.6938 26.6579L22.8851 26.637C23.3368 26.5879 23.352 26.4898 23.352 25.7473V23.2528Z" fill="white"/>
-<path id="Fill-5" fill-rule="evenodd" clip-rule="evenodd" d="M26.8744 26.8332C26.1673 26.8332 25.7212 26.6577 25.5612 26.5838C25.46 26.4352 25.3508 25.9565 25.334 25.6394C25.376 25.5923 25.5023 25.579 25.5361 25.6193C25.6623 25.9633 26.0073 26.6238 26.9839 26.6238C27.691 26.6238 28.036 26.253 28.036 25.8486C28.036 25.5521 27.9604 25.2215 27.3457 24.9045L26.5462 24.4863C26.1252 24.264 25.637 23.8795 25.637 23.3265C25.637 22.6859 26.26 22.1665 27.3542 22.1665C27.6151 22.1665 27.9182 22.2072 28.137 22.2544C28.2465 22.2814 28.3642 22.2947 28.4316 22.2947C28.5075 22.4567 28.5833 22.8343 28.5833 23.1175C28.5495 23.1581 28.4149 23.1781 28.3728 23.1378C28.2634 22.8141 28.036 22.3758 27.2279 22.3758C26.4031 22.3758 26.2263 22.8141 26.2263 23.1242C26.2263 23.5155 26.6302 23.7987 26.9417 23.9537L27.6151 24.2909C28.1455 24.5538 28.6673 24.9448 28.6673 25.5855C28.6673 26.3273 27.9688 26.8332 26.8744 26.8332Z" fill="white"/>
-<path id="Fill-6" fill-rule="evenodd" clip-rule="evenodd" d="M31.0554 24.5488C30.681 24.5488 30.6653 24.563 30.6653 24.7732V25.7612C30.6653 26.4968 30.7044 26.595 31.1413 26.637L31.3675 26.6579C31.4144 26.686 31.3988 26.8119 31.352 26.8332C30.9306 26.819 30.6653 26.8119 30.3611 26.8119C30.0254 26.8119 29.7602 26.826 29.456 26.8332C29.4091 26.8119 29.3935 26.7 29.4404 26.6579L29.5729 26.637C30.01 26.567 30.0254 26.4968 30.0254 25.7612V23.2388C30.0254 22.503 29.9709 22.384 29.5651 22.3559L29.3622 22.3418C29.3155 22.3138 29.331 22.1878 29.3778 22.1665C29.7602 22.1737 30.0254 22.1878 30.3611 22.1878C30.6653 22.1878 30.9306 22.1807 31.2661 22.1665C31.3131 22.1878 31.3285 22.3138 31.2818 22.3418L31.1335 22.3559C30.681 22.398 30.6653 22.503 30.6653 23.2388V24.0444C30.6653 24.2616 30.681 24.2686 31.0554 24.2686H33.287C33.6615 24.2686 33.6772 24.2616 33.6772 24.0444V23.2388C33.6772 22.503 33.6615 22.398 33.2012 22.3559L33.0532 22.3418C33.006 22.3138 33.0217 22.1878 33.0686 22.1665C33.4276 22.1807 33.6929 22.1878 34.0127 22.1878C34.317 22.1878 34.5822 22.1807 34.9334 22.1665C34.9802 22.1878 34.9958 22.3138 34.949 22.3418L34.7851 22.3559C34.3327 22.398 34.317 22.503 34.317 23.2388V25.7612C34.317 26.4968 34.3327 26.5879 34.7851 26.637L34.9724 26.6579C35.0191 26.686 35.0037 26.8119 34.9569 26.8332C34.5822 26.819 34.317 26.8119 34.0127 26.8119C33.6929 26.8119 33.412 26.819 33.0686 26.8332C33.0217 26.8119 33.006 26.7 33.0532 26.6579L33.2012 26.637C33.6772 26.567 33.6772 26.4968 33.6772 25.7612V24.7732C33.6772 24.563 33.6615 24.5488 33.287 24.5488H31.0554Z" fill="white"/>
-<path id="Fill-7" fill-rule="evenodd" clip-rule="evenodd" d="M1.12969 28.5703C1.78432 28.0761 2.61816 27.8335 3.55057 27.8335C4.03479 27.8335 4.71618 27.9287 5.13761 28.0414C5.24523 28.0674 5.30802 28.0848 5.38864 28.076C5.39768 28.2754 5.44251 28.8216 5.51422 29.3508C5.46939 29.4113 5.33489 29.42 5.2721 29.3681C5.13761 28.7785 4.73413 28.102 3.43415 28.102C2.06223 28.102 0.8965 28.943 0.8965 30.7378C0.8965 32.5586 2.0891 33.5645 3.55949 33.5645C4.71618 33.5645 5.22727 32.836 5.43347 32.3244C5.49626 32.2813 5.63087 32.2986 5.66667 32.3593C5.604 32.8102 5.37081 33.3823 5.23631 33.5473C5.12869 33.5645 5.02108 33.5992 4.9225 33.6337C4.72509 33.7033 4.07962 33.8335 3.50586 33.8335C2.6989 33.8335 1.92773 33.6773 1.2731 33.2523C0.555808 32.7756 0 31.9866 0 30.8681C0 29.9055 0.44831 29.0819 1.12969 28.5703Z" fill="white"/>
-<path id="Fill-8" fill-rule="evenodd" clip-rule="evenodd" d="M10.5746 31.5356C10.5746 30.3436 10.0209 29.0574 8.57189 29.0574C7.78284 29.0574 6.75869 29.5703 6.75869 31.1527C6.75869 32.2219 7.30489 33.6094 8.79933 33.6094C9.70981 33.6094 10.5746 32.9592 10.5746 31.5356ZM6 31.3838C6 29.9389 7.13792 28.8335 8.70073 28.8335C10.4533 28.8335 11.3333 30.0399 11.3333 31.3116C11.3333 32.771 10.1651 33.8335 8.70073 33.8335C7.01673 33.8335 6 32.6844 6 31.3838Z" fill="white"/>
-<path id="Fill-9" fill-rule="evenodd" clip-rule="evenodd" d="M19.4549 30.9123C19.4549 30.4862 19.4417 29.6959 19.3293 29.4897C19.2832 29.4072 19.1643 29.359 18.9992 29.3452L18.8342 29.3315C18.7945 29.2832 18.8077 29.1941 18.8472 29.1665C19.0982 29.1803 19.3426 29.1872 19.6003 29.1872C19.8778 29.1872 20.0561 29.1803 20.294 29.1666C20.3466 29.2012 20.34 29.2903 20.3071 29.3315L20.1486 29.3452C19.9834 29.359 19.8578 29.421 19.8183 29.5104C19.7259 29.7371 19.7259 30.5275 19.7259 30.9123V31.6889C19.7259 32.2868 19.6333 32.9189 19.2635 33.3313C18.9794 33.6542 18.4906 33.8332 18.0018 33.8332C17.546 33.8332 17.0903 33.7436 16.7666 33.455C16.4165 33.1528 16.2513 32.651 16.2513 31.8332V30.2111C16.2513 29.4965 16.2381 29.3798 15.8552 29.3452L15.6899 29.3315C15.6504 29.3042 15.6635 29.1874 15.7031 29.1665C16.0334 29.1803 16.258 29.1872 16.5222 29.1872C16.793 29.1872 17.011 29.1803 17.3346 29.1666C17.3743 29.1874 17.3875 29.3042 17.3479 29.3315L17.1893 29.3452C16.8062 29.3798 16.793 29.4965 16.793 30.2111V31.6957C16.793 32.8021 17.1232 33.5308 18.1339 33.5308C19.0917 33.5308 19.4549 32.7471 19.4549 31.7026V30.9123Z" fill="white"/>
-<path id="Fill-10" fill-rule="evenodd" clip-rule="evenodd" d="M29.0675 32.6559C29.0675 32.908 29.0843 33.2655 29.2444 33.4198C29.4045 33.5808 29.6573 33.616 29.91 33.616C30.6596 33.616 31.2326 33.3355 31.2326 32.6349C31.2326 32.0813 30.8956 31.4369 29.556 31.4369C29.1012 31.4369 29.0675 31.4788 29.0675 31.6188V32.6559ZM29.0675 31.0302C29.0675 31.2264 29.076 31.2404 29.5055 31.2264C30.3649 31.1984 30.8283 30.9884 30.8283 30.3294C30.8283 29.6427 30.2133 29.3835 29.573 29.3835C29.3876 29.3835 29.2614 29.3977 29.1853 29.4256C29.1012 29.4467 29.0675 29.4816 29.0675 29.6078V31.0302ZM28.3766 30.0983C28.3766 29.5798 28.343 29.4467 27.9639 29.4187L27.6942 29.3935C27.6634 29.3667 27.6472 29.2262 27.7026 29.2222C28.1577 29.1896 28.7304 29.1665 29.5141 29.1665C30.0448 29.1665 30.5501 29.2015 30.9294 29.3624C31.2916 29.5097 31.5694 29.7899 31.5694 30.2384C31.5694 30.743 31.2157 31.0024 30.7103 31.1984C30.7103 31.2686 30.7774 31.2896 30.8703 31.3037C31.3253 31.3735 31.9993 31.7241 31.9993 32.4737C31.9993 33.2866 31.2747 33.8332 29.7581 33.8332C29.5141 33.8332 29.1012 33.8118 28.7473 33.8118C28.3766 33.8118 28.0904 33.8259 27.7784 33.8332C27.728 33.8118 27.711 33.6999 27.7615 33.6581L27.9133 33.637C28.3597 33.5738 28.3766 33.4968 28.3766 32.7611V30.0983Z" fill="white"/>
-<path id="Fill-11" fill-rule="evenodd" clip-rule="evenodd" d="M5 35.8333H35V35.5H5V35.8333Z" fill="#F3B229"/>
+<path id="Fill-1" fill-rule="evenodd" clip-rule="evenodd" d="M6.17438 25.4031C6.17438 25.7094 6.19258 26.1433 6.365 26.3305C6.53753 26.526 6.8098 26.5688 7.08207 26.5688C7.88967 26.5688 8.50677 26.2285 8.50677 25.3776C8.50677 24.7053 8.14374 23.9227 6.70084 23.9227C6.21078 23.9227 6.17438 23.9739 6.17438 24.1439V25.4031ZM6.17438 23.429C6.17438 23.6674 6.18348 23.6844 6.64637 23.6674C7.57202 23.6333 8.0713 23.3781 8.0713 22.5784C8.0713 21.7445 7.4087 21.4298 6.71904 21.4298C6.51933 21.4298 6.38319 21.4466 6.30153 21.4807C6.21078 21.5063 6.17438 21.549 6.17438 21.7019V23.429ZM5.43024 22.2977C5.43024 21.6681 5.3876 21.5011 4.97919 21.4672L4.6952 21.4466C4.64891 21.4084 4.66199 21.238 4.7043 21.2341C5.19414 21.1886 5.81147 21.166 6.65546 21.166C7.22719 21.166 7.77173 21.2084 8.18025 21.4043C8.57046 21.5828 8.8698 21.9231 8.8698 22.4678C8.8698 23.0804 8.48869 23.3952 7.94414 23.6333C7.94414 23.7184 8.01682 23.7441 8.11656 23.7609C8.60663 23.8462 9.33268 24.2713 9.33268 25.1818C9.33268 26.169 8.55226 26.8327 6.91852 26.8327C6.65546 26.8327 6.21078 26.8069 5.82955 26.8069C5.43024 26.8069 5.12169 26.8243 4.78585 26.8327C4.73148 26.8069 4.71329 26.6709 4.76776 26.6196L4.93119 26.5941C5.41205 26.5175 5.43024 26.424 5.43024 25.5307V22.2977Z" fill="white"/>
+<path id="Fill-2" fill-rule="evenodd" clip-rule="evenodd" d="M16.0201 23.2523C16.0201 22.5096 16.0048 22.3905 15.5532 22.3554L15.3617 22.3413C15.3158 22.3133 15.3311 22.1874 15.3771 22.166C15.7599 22.1802 16.0201 22.1874 16.3417 22.1874C16.6479 22.1874 16.9081 22.1802 17.291 22.166C17.3369 22.1874 17.3522 22.3133 17.3062 22.3413L17.1148 22.3554C16.6632 22.3905 16.6479 22.5096 16.6479 23.2523V25.7468C16.6479 26.4893 16.6632 26.5874 17.1148 26.6365L17.3062 26.6574C17.3522 26.6855 17.3369 26.8115 17.291 26.8327C16.9081 26.8185 16.6479 26.8115 16.3417 26.8115C16.0201 26.8115 15.7599 26.8185 15.3771 26.8327C15.3311 26.8115 15.3158 26.6995 15.3617 26.6574L15.5532 26.6365C16.0048 26.5874 16.0201 26.4893 16.0201 25.7468V23.2523Z" fill="white"/>
+<path id="Fill-3" fill-rule="evenodd" clip-rule="evenodd" d="M20.2861 25.8067C20.2861 26.5107 20.3006 26.6112 20.7215 26.645L20.9538 26.6649C20.9973 26.6918 20.9829 26.8124 20.9394 26.8327C20.5256 26.8191 20.279 26.8124 19.9885 26.8124C19.6982 26.8124 19.4442 26.8191 18.9798 26.8327C18.9362 26.8124 18.9217 26.6986 18.9798 26.6649L19.241 26.645C19.6547 26.6112 19.691 26.5107 19.691 25.8067V22.809C19.691 22.6011 19.691 22.5946 19.4732 22.5946H19.074C18.762 22.5946 18.3628 22.6078 18.1814 22.762C18.0072 22.9095 17.9347 23.0573 17.8549 23.2248C17.7967 23.2651 17.6952 23.2315 17.666 23.1779C17.7822 22.8762 17.8911 22.4469 17.9418 22.1786C17.9638 22.1653 18.0581 22.1586 18.0798 22.1786C18.1234 22.3931 18.3628 22.3867 18.6968 22.3867H21.636C22.0279 22.3867 22.0933 22.3731 22.2022 22.1988C22.2384 22.1854 22.3182 22.1922 22.3327 22.2188C22.253 22.4939 22.2022 23.037 22.2239 23.2384C22.1949 23.292 22.0714 23.292 22.0353 23.2517C22.0134 23.0838 21.9626 22.8358 21.8538 22.762C21.6867 22.6479 21.4112 22.5946 21.0119 22.5946H20.4967C20.279 22.5946 20.2861 22.6011 20.2861 22.8225V25.8067Z" fill="white"/>
+<path id="Fill-4" fill-rule="evenodd" clip-rule="evenodd" d="M23.352 23.2523C23.352 22.5096 23.3368 22.3905 22.8851 22.3554L22.6938 22.3413C22.6478 22.3133 22.6631 22.1874 22.709 22.166C23.0918 22.1802 23.352 22.1874 23.6737 22.1874C23.9798 22.1874 24.2401 22.1802 24.623 22.166C24.6689 22.1874 24.6842 22.3133 24.6383 22.3413L24.4467 22.3554C23.9952 22.3905 23.9798 22.5096 23.9798 23.2523V25.7468C23.9798 26.4893 23.9952 26.5874 24.4467 26.6365L24.6383 26.6574C24.6842 26.6855 24.6689 26.8115 24.623 26.8327C24.2401 26.8185 23.9798 26.8115 23.6737 26.8115C23.352 26.8115 23.0918 26.8185 22.709 26.8327C22.6631 26.8115 22.6478 26.6995 22.6938 26.6574L22.8851 26.6365C23.3368 26.5874 23.352 26.4893 23.352 25.7468V23.2523Z" fill="white"/>
+<path id="Fill-5" fill-rule="evenodd" clip-rule="evenodd" d="M26.8744 26.8327C26.1673 26.8327 25.7212 26.6572 25.5612 26.5833C25.46 26.4347 25.3508 25.956 25.334 25.6389C25.376 25.5918 25.5023 25.5785 25.5361 25.6188C25.6623 25.9628 26.0073 26.6233 26.9839 26.6233C27.691 26.6233 28.036 26.2525 28.036 25.8481C28.036 25.5516 27.9604 25.221 27.3457 24.904L26.5462 24.4858C26.1252 24.2635 25.637 23.879 25.637 23.326C25.637 22.6854 26.26 22.166 27.3542 22.166C27.6151 22.166 27.9182 22.2068 28.137 22.2539C28.2465 22.2809 28.3642 22.2942 28.4316 22.2942C28.5075 22.4563 28.5833 22.8338 28.5833 23.117C28.5495 23.1576 28.4149 23.1776 28.3728 23.1373C28.2634 22.8136 28.036 22.3753 27.2279 22.3753C26.4031 22.3753 26.2263 22.8136 26.2263 23.1237C26.2263 23.515 26.6302 23.7982 26.9417 23.9532L27.6151 24.2904C28.1455 24.5533 28.6673 24.9443 28.6673 25.585C28.6673 26.3268 27.9688 26.8327 26.8744 26.8327Z" fill="white"/>
+<path id="Fill-6" fill-rule="evenodd" clip-rule="evenodd" d="M31.0554 24.5484C30.681 24.5484 30.6653 24.5625 30.6653 24.7727V25.7607C30.6653 26.4963 30.7044 26.5946 31.1413 26.6365L31.3675 26.6574C31.4144 26.6855 31.3988 26.8115 31.352 26.8327C30.9306 26.8185 30.6653 26.8115 30.3611 26.8115C30.0254 26.8115 29.7602 26.8255 29.456 26.8327C29.4091 26.8115 29.3935 26.6995 29.4404 26.6574L29.5729 26.6365C30.01 26.5665 30.0254 26.4963 30.0254 25.7607V23.2383C30.0254 22.5025 29.9709 22.3835 29.5651 22.3554L29.3622 22.3413C29.3155 22.3133 29.331 22.1874 29.3778 22.166C29.7602 22.1732 30.0254 22.1874 30.3611 22.1874C30.6653 22.1874 30.9306 22.1802 31.2661 22.166C31.3131 22.1874 31.3285 22.3133 31.2818 22.3413L31.1335 22.3554C30.681 22.3975 30.6653 22.5025 30.6653 23.2383V24.0439C30.6653 24.2612 30.681 24.2681 31.0554 24.2681H33.287C33.6615 24.2681 33.6772 24.2612 33.6772 24.0439V23.2383C33.6772 22.5025 33.6615 22.3975 33.2012 22.3554L33.0532 22.3413C33.006 22.3133 33.0217 22.1874 33.0686 22.166C33.4276 22.1802 33.6929 22.1874 34.0127 22.1874C34.317 22.1874 34.5822 22.1802 34.9334 22.166C34.9802 22.1874 34.9958 22.3133 34.949 22.3413L34.7851 22.3554C34.3327 22.3975 34.317 22.5025 34.317 23.2383V25.7607C34.317 26.4963 34.3327 26.5874 34.7851 26.6365L34.9724 26.6574C35.0191 26.6855 35.0037 26.8115 34.9569 26.8327C34.5822 26.8185 34.317 26.8115 34.0127 26.8115C33.6929 26.8115 33.412 26.8185 33.0686 26.8327C33.0217 26.8115 33.006 26.6995 33.0532 26.6574L33.2012 26.6365C33.6772 26.5665 33.6772 26.4963 33.6772 25.7607V24.7727C33.6772 24.5625 33.6615 24.5484 33.287 24.5484H31.0554Z" fill="white"/>
+<path id="Fill-7" fill-rule="evenodd" clip-rule="evenodd" d="M1.12969 28.5688C1.78432 28.0746 2.61816 27.832 3.55057 27.832C4.03479 27.832 4.71618 27.9272 5.13761 28.04C5.24523 28.0659 5.30802 28.0834 5.38864 28.0746C5.39768 28.274 5.44251 28.8201 5.51422 29.3493C5.46939 29.4098 5.33489 29.4186 5.2721 29.3666C5.13761 28.777 4.73413 28.1005 3.43415 28.1005C2.06223 28.1005 0.8965 28.9415 0.8965 30.7364C0.8965 32.5572 2.0891 33.563 3.55949 33.563C4.71618 33.563 5.22727 32.8346 5.43347 32.3229C5.49626 32.2799 5.63087 32.2972 5.66667 32.3579C5.604 32.8087 5.37081 33.3808 5.23631 33.5459C5.12869 33.563 5.02108 33.5978 4.9225 33.6323C4.72509 33.7019 4.07962 33.832 3.50586 33.832C2.6989 33.832 1.92773 33.6758 1.2731 33.2508C0.555808 32.7741 0 31.9852 0 30.8666C0 29.904 0.44831 29.0805 1.12969 28.5688Z" fill="white"/>
+<path id="Fill-8" fill-rule="evenodd" clip-rule="evenodd" d="M10.5746 31.5341C10.5746 30.3421 10.0209 29.0559 8.57189 29.0559C7.78284 29.0559 6.75869 29.5688 6.75869 31.1512C6.75869 32.2204 7.30489 33.6079 8.79933 33.6079C9.70981 33.6079 10.5746 32.9577 10.5746 31.5341ZM6 31.3823C6 29.9375 7.13792 28.832 8.70073 28.832C10.4533 28.832 11.3333 30.0384 11.3333 31.3101C11.3333 32.7696 10.1651 33.832 8.70073 33.832C7.01673 33.832 6 32.683 6 31.3823Z" fill="white"/>
+<path id="Fill-9" fill-rule="evenodd" clip-rule="evenodd" d="M19.4549 30.9118C19.4549 30.4857 19.4417 29.6954 19.3293 29.4892C19.2832 29.4067 19.1643 29.3585 18.9992 29.3447L18.8342 29.331C18.7945 29.2827 18.8077 29.1937 18.8472 29.166C19.0982 29.1798 19.3426 29.1867 19.6003 29.1867C19.8778 29.1867 20.0561 29.1798 20.294 29.1661C20.3466 29.2007 20.34 29.2898 20.3071 29.331L20.1486 29.3447C19.9834 29.3585 19.8578 29.4205 19.8183 29.5099C19.7259 29.7366 19.7259 30.527 19.7259 30.9118V31.6884C19.7259 32.2863 19.6333 32.9184 19.2635 33.3309C18.9794 33.6537 18.4906 33.8327 18.0018 33.8327C17.546 33.8327 17.0903 33.7431 16.7666 33.4545C16.4165 33.1523 16.2513 32.6505 16.2513 31.8327V30.2106C16.2513 29.4961 16.2381 29.3793 15.8552 29.3447L15.6899 29.331C15.6504 29.3037 15.6635 29.1869 15.7031 29.166C16.0334 29.1798 16.258 29.1867 16.5222 29.1867C16.793 29.1867 17.011 29.1798 17.3346 29.1661C17.3743 29.1869 17.3875 29.3037 17.3479 29.331L17.1893 29.3447C16.8062 29.3793 16.793 29.4961 16.793 30.2106V31.6952C16.793 32.8016 17.1232 33.5303 18.1339 33.5303C19.0917 33.5303 19.4549 32.7467 19.4549 31.7021V30.9118Z" fill="white"/>
+<path id="Fill-10" fill-rule="evenodd" clip-rule="evenodd" d="M29.0675 32.6555C29.0675 32.9075 29.0843 33.265 29.2444 33.4193C29.4045 33.5803 29.6573 33.6155 29.91 33.6155C30.6596 33.6155 31.2326 33.335 31.2326 32.6344C31.2326 32.0808 30.8956 31.4364 29.556 31.4364C29.1012 31.4364 29.0675 31.4783 29.0675 31.6183V32.6555ZM29.0675 31.0297C29.0675 31.2259 29.076 31.24 29.5055 31.2259C30.3649 31.1979 30.8283 30.9879 30.8283 30.3289C30.8283 29.6422 30.2133 29.383 29.573 29.383C29.3876 29.383 29.2614 29.3972 29.1853 29.4251C29.1012 29.4462 29.0675 29.4811 29.0675 29.6073V31.0297ZM28.3766 30.0979C28.3766 29.5793 28.343 29.4462 27.9639 29.4182L27.6942 29.393C27.6634 29.3662 27.6472 29.2257 27.7026 29.2217C28.1577 29.1891 28.7304 29.166 29.5141 29.166C30.0448 29.166 30.5501 29.201 30.9294 29.3619C31.2916 29.5092 31.5694 29.7894 31.5694 30.238C31.5694 30.7425 31.2157 31.0019 30.7103 31.1979C30.7103 31.2681 30.7774 31.2891 30.8703 31.3032C31.3253 31.373 31.9993 31.7236 31.9993 32.4732C31.9993 33.2861 31.2747 33.8327 29.7581 33.8327C29.5141 33.8327 29.1012 33.8113 28.7473 33.8113C28.3766 33.8113 28.0904 33.8255 27.7784 33.8327C27.728 33.8113 27.711 33.6994 27.7615 33.6576L27.9133 33.6366C28.3597 33.5733 28.3766 33.4963 28.3766 32.7606V30.0979Z" fill="white"/>
+<path id="Fill-11" fill-rule="evenodd" clip-rule="evenodd" d="M5 35.8314H35V35.498H5V35.8314Z" fill="#EFA20F"/>
 <g id="Group-14">
 <g id="Mask group">
-<mask id="mask0_746_105172" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="5" y="0" width="30" height="15">
-<g id="Group">
-<path id="Vector" d="M34.5881 11.7619C33.0244 5.12303 27.0248 0.178711 19.8621 0.178711C12.5785 0.178711 6.49762 5.29097 5.06055 12.0989L8.25466 10.2917L10.0158 11.5152C10.0158 11.5152 11.0457 11.053 11.2625 10.917L12.536 12.2494C12.536 12.2494 15.3003 14.4247 15.3813 14.4247C15.4627 14.4247 17.8204 13.0651 17.8204 13.0651L19.9346 11.6239L21.777 12.9563L23.1589 13.2283L24.568 14.18C24.568 14.18 27.9828 11.923 28.5249 11.651C28.5249 11.651 30.0152 12.1951 30.1506 12.1678C30.2859 12.1406 32.6166 10.346 32.6166 10.346L34.5881 11.7619Z" fill="#FCBA19"/>
-</g>
-</mask>
-<g mask="url(#mask0_746_105172)">
-<path id="Fill-12" fill-rule="evenodd" clip-rule="evenodd" d="M34.5881 11.7619C33.0244 5.12303 27.0248 0.178711 19.8621 0.178711C12.5785 0.178711 6.49762 5.29097 5.06055 12.0989L8.25466 10.2917L10.0158 11.5152C10.0158 11.5152 11.0457 11.053 11.2625 10.917L12.536 12.2494C12.536 12.2494 15.3003 14.4247 15.3813 14.4247C15.4627 14.4247 17.8204 13.0651 17.8204 13.0651L19.9346 11.6239L21.777 12.9563L23.1589 13.2283L24.568 14.18C24.568 14.18 27.9828 11.923 28.5249 11.651C28.5249 11.651 30.0152 12.1951 30.1506 12.1678C30.2859 12.1406 32.6166 10.346 32.6166 10.346L34.5881 11.7619Z" fill="#FCBA19"/>
-</g>
+<path id="Fill-12" fill-rule="evenodd" clip-rule="evenodd" d="M34.5881 11.7609C33.0244 5.12206 27.0248 0.177734 19.8621 0.177734C12.5785 0.177734 6.49762 5.28999 5.06055 12.0979L8.25466 10.2907L10.0158 11.5143C10.0158 11.5143 11.0457 11.052 11.2625 10.916L12.536 12.2484C12.536 12.2484 15.3003 14.4237 15.3813 14.4237C15.4627 14.4237 17.8204 13.0641 17.8204 13.0641L19.9346 11.623L21.777 12.9553L23.1589 13.2273L24.568 14.179C24.568 14.179 27.9828 11.922 28.5249 11.65C28.5249 11.65 30.0152 12.1941 30.1506 12.1668C30.2859 12.1396 32.6166 10.345 32.6166 10.345L34.5881 11.7609Z" fill="#EFA20F"/>
 </g>
 </g>
 <g id="Group-38">
 <g id="Mask group_2">
-<mask id="mask1_746_105172" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="8" y="1" width="24" height="15">
-<g id="Group_2">
-<path id="Vector_2" d="M17.9586 13.6816L20.0955 12.1901L21.9577 13.569L23.3545 13.8505L24.7788 14.8355C24.7788 14.8355 26.332 13.7843 27.5201 13.0074C27.3148 12.4581 27.0522 11.9376 26.7391 11.454L31.8953 7.39551L26.4137 10.9884C25.9213 10.3348 25.3319 9.76078 24.6673 9.2884L27.8993 3.65423L24.2036 8.98294C23.5145 8.56313 22.7574 8.2474 21.9523 8.05758L22.8778 1.57129L21.4074 7.95012C21.0043 7.88529 20.5909 7.85118 20.1697 7.85118C19.7214 7.85118 19.2819 7.88996 18.854 7.9632L17.3805 1.57129L18.3088 8.07721C17.511 8.27403 16.7607 8.5942 16.079 9.01764L12.359 3.65423L15.6146 9.32917C14.9615 9.80224 14.3827 10.3745 13.899 11.0241L8.36328 7.39551L13.5729 11.4963C13.2729 11.9662 13.0199 12.4703 12.8209 13.0012C13.4648 13.5184 15.4249 15.0888 15.4933 15.0888C15.5756 15.0888 17.9586 13.6816 17.9586 13.6816Z" fill="white"/>
+<mask id="mask0_3500_6441" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="8" y="1" width="24" height="15">
+<g id="Group">
+<path id="Vector" d="M17.9586 13.6806L20.0955 12.1891L21.9577 13.568L23.3545 13.8495L24.7788 14.8346C24.7788 14.8346 26.332 13.7833 27.5201 13.0064C27.3148 12.4572 27.0522 11.9367 26.7391 11.4531L31.8953 7.39453L26.4137 10.9875C25.9213 10.3338 25.3319 9.7598 24.6673 9.28742L27.8993 3.65325L24.2036 8.98197C23.5145 8.56216 22.7574 8.24642 21.9523 8.05661L22.8778 1.57031L21.4074 7.94914C21.0043 7.88431 20.5909 7.8502 20.1697 7.8502C19.7214 7.8502 19.2819 7.88899 18.854 7.96222L17.3805 1.57031L18.3088 8.07623C17.511 8.27305 16.7607 8.59323 16.079 9.01666L12.359 3.65325L15.6146 9.32819C14.9615 9.80127 14.3827 10.3735 13.899 11.0231L8.36328 7.39453L13.5729 11.4953C13.2729 11.9653 13.0199 12.4693 12.8209 13.0002C13.4648 13.5174 15.4249 15.0878 15.4933 15.0878C15.5756 15.0878 17.9586 13.6806 17.9586 13.6806Z" fill="white"/>
 </g>
 </mask>
-<g mask="url(#mask1_746_105172)">
-<path id="Fill-36" fill-rule="evenodd" clip-rule="evenodd" d="M17.9586 13.6816L20.0955 12.1901L21.9577 13.569L23.3545 13.8505L24.7788 14.8355C24.7788 14.8355 26.332 13.7843 27.5201 13.0074C27.3148 12.4581 27.0522 11.9376 26.7391 11.454L31.8953 7.39551L26.4137 10.9884C25.9213 10.3348 25.3319 9.76078 24.6673 9.2884L27.8993 3.65423L24.2036 8.98294C23.5145 8.56313 22.7574 8.2474 21.9523 8.05758L22.8778 1.57129L21.4074 7.95012C21.0043 7.88529 20.5909 7.85118 20.1697 7.85118C19.7214 7.85118 19.2819 7.88996 18.854 7.9632L17.3805 1.57129L18.3088 8.07721C17.511 8.27403 16.7607 8.5942 16.079 9.01764L12.359 3.65423L15.6146 9.32917C14.9615 9.80224 14.3827 10.3745 13.899 11.0241L8.36328 7.39551L13.5729 11.4963C13.2729 11.9662 13.0199 12.4703 12.8209 13.0012C13.4648 13.5184 15.4249 15.0888 15.4933 15.0888C15.5756 15.0888 17.9586 13.6816 17.9586 13.6816Z" fill="white"/>
+<g mask="url(#mask0_3500_6441)">
+<path id="Fill-36" fill-rule="evenodd" clip-rule="evenodd" d="M17.9586 13.6806L20.0955 12.1891L21.9577 13.568L23.3545 13.8495L24.7788 14.8346C24.7788 14.8346 26.332 13.7833 27.5201 13.0064C27.3148 12.4572 27.0522 11.9367 26.7391 11.4531L31.8953 7.39453L26.4137 10.9875C25.9213 10.3338 25.3319 9.7598 24.6673 9.28742L27.8993 3.65325L24.2036 8.98197C23.5145 8.56216 22.7574 8.24642 21.9523 8.05661L22.8778 1.57031L21.4074 7.94914C21.0043 7.88431 20.5909 7.8502 20.1697 7.8502C19.7214 7.8502 19.2819 7.88899 18.854 7.96222L17.3805 1.57031L18.3088 8.07623C17.511 8.27305 16.7607 8.59323 16.079 9.01666L12.359 3.65325L15.6146 9.32819C14.9615 9.80127 14.3827 10.3735 13.899 11.0231L8.36328 7.39453L13.5729 11.4953C13.2729 11.9653 13.0199 12.4693 12.8209 13.0002C13.4648 13.5174 15.4249 15.0878 15.4933 15.0878C15.5756 15.0878 17.9586 13.6806 17.9586 13.6806Z" fill="white"/>
 </g>
 </g>
 </g>
-<path id="Path-2" fill-rule="evenodd" clip-rule="evenodd" d="M20.6953 8.16667L21.334 0.5H21.25L20.4936 6.34127L20.6953 0.5H20.6113L20.1743 7.07143L19.939 0.5H19.855V6.34127L19.418 0.5H19.334L19.6533 8.16667H20.6953Z" fill="white"/>
-<path id="Path-2-Copy" fill-rule="evenodd" clip-rule="evenodd" d="M17.6514 8.81195L15.6294 1.3892L15.5504 1.41794L16.8376 7.16561L15.0292 1.60763L14.9503 1.63638L16.7872 7.96095L14.3186 1.86631L14.2396 1.89505L16.2374 7.38404L13.829 2.0445L13.75 2.07324L16.6722 9.16834L17.6514 8.81195Z" fill="white"/>
-<path id="Path-2-Copy-3" fill-rule="evenodd" clip-rule="evenodd" d="M15.2998 10.1216L10.3302 4.24887L10.2708 4.30829L13.8664 8.97348L9.87863 4.70047L9.81921 4.75989L14.1569 9.71558L9.34384 5.23526L9.28442 5.29468L13.4148 9.42508L8.97544 5.60366L8.91602 5.66309L14.563 10.8584L15.2998 10.1216Z" fill="white"/>
-<path id="Path-2-Copy-5" fill-rule="evenodd" clip-rule="evenodd" d="M24.7002 10.1216L29.6698 4.24887L29.7292 4.30829L26.1336 8.97348L30.1214 4.70047L30.1808 4.75989L25.8431 9.71558L30.6562 5.23526L30.7156 5.29468L26.5852 9.42508L31.0246 5.60367L31.084 5.66309L25.437 10.8584L24.7002 10.1216Z" fill="white"/>
-<path id="Path-2-Copy-4" fill-rule="evenodd" clip-rule="evenodd" d="M13.7266 11.6383L6.74068 8.41602L6.71194 8.49499L11.9423 11.2035L6.52225 9.01616L6.49351 9.09513L12.5192 11.7533L6.26358 9.72686L6.23484 9.80582L11.7238 11.8037L6.08538 10.2164L6.05664 10.2954L13.3702 12.6175L13.7266 11.6383Z" fill="white"/>
-<path id="Path-2-Copy-6" fill-rule="evenodd" clip-rule="evenodd" d="M26.0984 11.7479L32.771 8.63966L32.7998 8.71862L27.8081 11.3403L32.9895 9.2398L33.0182 9.31876L27.261 11.8792L33.2481 9.95049L33.2769 10.0295L28.0265 11.9404L33.4263 10.4401L33.4551 10.519L26.4548 12.7271L26.0984 11.7479Z" fill="white"/>
-<path id="Path-2-Copy-2" fill-rule="evenodd" clip-rule="evenodd" d="M22.6826 8.81195L24.7046 1.3892L24.7836 1.41794L23.4964 7.16561L25.3047 1.60764L25.3837 1.63638L23.5468 7.96095L26.0154 1.86631L26.0944 1.89505L24.0966 7.38404L26.505 2.0445L26.584 2.07324L23.6618 9.16834L22.6826 8.81195Z" fill="white"/>
-<path id="Fill-40" fill-rule="evenodd" clip-rule="evenodd" d="M11.8197 24.3821C11.6793 24.3821 11.3985 24.4343 11.3985 24.2486V22.9189C11.3985 22.399 11.4152 22.3247 12.0427 22.3247C12.7775 22.3247 13.2319 22.6959 13.2319 23.3793C13.2319 23.6763 13.1244 23.9512 12.852 24.137C12.5382 24.3524 12.1995 24.3821 11.8197 24.3821ZM14.6386 26.6599L14.4452 26.6432C14.4061 26.6391 14.3714 26.6342 14.3383 26.629C14.0553 26.579 13.9421 26.3282 13.8089 26.0957L13.1401 24.937C13.0246 24.7439 12.9006 24.4838 12.6363 24.4469C13.3217 24.3652 13.9412 23.9715 13.9412 23.2957C13.9412 22.5155 13.1648 22.1665 12.3803 22.1665C11.9097 22.1665 11.4807 22.1791 11.0017 22.1791C10.7375 22.1791 10.4233 22.1665 10.1591 22.1665C10.0123 22.1665 10.0105 22.1963 10.0105 22.2778C10.0105 22.3985 10.0617 22.3648 10.217 22.3734C10.775 22.4047 10.7535 22.5082 10.7535 22.9835V26.0214C10.7535 26.4564 10.7913 26.5862 10.3326 26.627C10.3326 26.627 10.2622 26.6342 10.2224 26.6384L10.028 26.6582C9.98158 26.6997 9.99713 26.8106 10.0435 26.8316C10.1468 26.8279 10.3302 26.8205 10.3302 26.8205C10.5841 26.8131 10.8382 26.7938 11.0921 26.7938C11.3476 26.7938 11.5921 26.8133 11.8432 26.8205V26.8209C11.9324 26.8237 12.0263 26.8267 12.1297 26.8305C12.1761 26.8097 12.1917 26.6987 12.1453 26.6573L11.9496 26.6389C11.9097 26.6347 11.841 26.6285 11.841 26.6285C11.3776 26.5972 11.406 26.4672 11.406 26.0214V24.8777C11.406 24.8107 11.3977 24.6325 11.4472 24.5807C11.4886 24.5358 11.5628 24.5433 11.6289 24.5433C12.2566 24.5433 12.2482 24.6028 12.5456 25.1226L13.3548 26.5712C13.4207 26.6827 13.4704 26.8237 13.6356 26.8237H14.3384C14.4271 26.8265 14.5205 26.8293 14.6231 26.8332C14.6696 26.8124 14.6851 26.7014 14.6386 26.6599Z" fill="white"/>
-<path id="Fill-41" fill-rule="evenodd" clip-rule="evenodd" d="M12.056 30.2387C12.056 29.5031 12.0406 29.391 11.5549 29.3558L11.3619 29.3418C11.3157 29.3137 11.3311 29.1878 11.3774 29.1665C11.8093 29.1805 12.0715 29.1875 12.38 29.1875C12.6807 29.1875 12.943 29.1805 13.3286 29.1667C13.3749 29.1878 13.3904 29.3137 13.3441 29.3418L13.159 29.3558C12.704 29.391 12.6885 29.5031 12.6885 30.2387V32.6773C12.6885 33.1186 12.7117 33.3007 12.8504 33.4338C12.9352 33.5108 13.0817 33.5951 13.6911 33.5951C14.3468 33.5951 14.5087 33.5672 14.6322 33.5042C14.7865 33.4199 14.9869 33.1676 15.1411 32.8103C15.1875 32.7754 15.334 32.8033 15.334 32.8523C15.334 32.9296 15.1179 33.6442 15.01 33.8332C14.6167 33.8192 13.8839 33.8123 13.0895 33.8123H12.38C12.056 33.8123 11.8093 33.8192 11.3774 33.8332C11.3311 33.8123 11.3157 33.7 11.3619 33.6581L11.5933 33.6372C12.0406 33.5951 12.056 33.497 12.056 32.7615V30.2387Z" fill="white"/>
-<path id="Fill-42" fill-rule="evenodd" clip-rule="evenodd" d="M33.02 30.2525C33.02 29.51 33.0048 29.391 32.553 29.3558L32.3617 29.3418C32.3159 29.3137 32.331 29.1878 32.3772 29.1665C32.7598 29.1805 33.02 29.1875 33.3417 29.1875C33.6479 29.1875 33.9081 29.1805 34.291 29.1667C34.3369 29.1878 34.3522 29.3137 34.3062 29.3418L34.1149 29.3558C33.6632 29.391 33.6479 29.51 33.6479 30.2525V32.7474C33.6479 33.4899 33.6632 33.5882 34.1149 33.6372L34.3062 33.6581C34.3522 33.6862 34.3369 33.8123 34.291 33.8332C33.9081 33.8192 33.6479 33.8123 33.3417 33.8123C33.02 33.8123 32.7598 33.8192 32.3772 33.8332C32.331 33.8123 32.3159 33.7 32.3617 33.6581L32.553 33.6372C33.0048 33.5882 33.02 33.4899 33.02 32.7474V30.2525Z" fill="white"/>
-<path id="Fill-43" fill-rule="evenodd" clip-rule="evenodd" d="M26.7718 33.6358C26.7325 33.6318 26.6595 33.6258 26.6595 33.6258C26.5791 33.6178 26.5071 33.6065 26.45 33.5448C26.3512 33.4406 26.3595 33.1438 26.3595 33.0251V29.9589C26.3595 29.8251 26.3266 29.5358 26.4253 29.4318C26.475 29.3768 26.5777 29.3678 26.6693 29.3624C26.7249 29.3582 26.7263 29.3579 26.7751 29.3554L26.9709 29.3416C27.018 29.3136 27.0023 29.1876 26.9552 29.1665C26.8506 29.1703 26.7555 29.1689 26.665 29.1717V29.1721H25.8324C25.7419 29.1721 25.6595 29.1721 25.6102 29.2686L23.9137 32.7726L22.415 29.3874C22.3655 29.2686 22.3573 29.1721 22.2008 29.1721H21.3342C21.2439 29.1694 21.1442 29.1703 21.0397 29.1665C20.9927 29.1876 20.9769 29.3136 21.0239 29.3416L21.2198 29.3554C21.2602 29.3588 21.3334 29.3636 21.3334 29.3636C21.6583 29.3844 21.6786 29.4562 21.649 29.7956L21.3938 33.0843C21.3714 33.4145 21.3531 33.589 21.0045 33.621C21.0045 33.621 20.9306 33.6303 20.8902 33.6346L20.6944 33.6555C20.6474 33.6973 20.6631 33.8094 20.7101 33.8303C20.8134 33.8268 20.9968 33.8212 20.9968 33.8212C21.1735 33.8128 21.3538 33.7971 21.5339 33.7971C21.7281 33.7971 21.9227 33.8151 22.1172 33.823C22.2074 33.8259 22.3027 33.829 22.4073 33.8329C22.4544 33.8119 22.47 33.7 22.4232 33.658L22.2272 33.6371C22.1758 33.633 22.118 33.6274 22.118 33.6274C21.6147 33.5933 21.6258 33.2407 21.6572 32.8099L21.8962 29.7512H21.9538L23.576 33.5149C23.5925 33.5668 23.6171 33.6561 23.6997 33.6561C23.7738 33.6561 23.7984 33.5744 23.8231 33.5222L25.6512 29.6618H25.709V33.0251C25.709 33.1584 25.7253 33.4333 25.5855 33.5374C25.5121 33.591 25.2744 33.6236 25.2744 33.6236C25.2417 33.6288 25.2072 33.6332 25.1683 33.6375L24.9724 33.6584C24.9254 33.7003 24.9411 33.8123 24.988 33.8332C25.0912 33.8296 25.2744 33.8237 25.2744 33.8237C25.5397 33.8166 25.8095 33.7971 26.0795 33.7971C26.2733 33.7971 26.6535 33.8154 26.6535 33.8154C26.7439 33.8181 26.847 33.8278 26.9517 33.8317C26.9988 33.8107 27.0145 33.6988 26.9675 33.6568L26.7718 33.6358Z" fill="white"/>
-<path id="Fill-44" fill-rule="evenodd" clip-rule="evenodd" d="M37.8847 31.9487H36.9551C36.9227 31.9487 36.6642 31.9778 36.6642 31.9047C36.6642 31.8827 36.6803 31.8388 36.6883 31.8171L37.2462 30.4846C37.2624 30.4481 37.3189 30.2653 37.3836 30.2653C37.4321 30.2653 37.4967 30.4554 37.5129 30.4846L38.0624 31.7291C38.0624 31.7436 38.1189 31.8606 38.1189 31.89C38.1189 31.9706 37.9332 31.9487 37.8847 31.9487ZM39.9713 33.6574L39.9446 33.6364C39.905 33.6323 39.8697 33.6277 39.8365 33.6226C39.5269 33.5559 39.406 33.1962 39.2919 32.9402L37.699 29.3042C37.6832 29.2607 37.6516 29.1665 37.5884 29.1665C37.5016 29.1665 37.478 29.268 37.4544 29.3258L35.9325 32.9549C35.8772 33.0922 35.7354 33.4255 35.6327 33.5268C35.5542 33.6045 35.4519 33.6194 35.3429 33.6301C35.3429 33.6301 35.257 33.6382 35.2159 33.6425L35.0289 33.6607C34.9811 33.7021 34.997 33.8126 35.0447 33.8332C35.1509 33.8297 35.3393 33.8232 35.3393 33.8232C35.5475 33.8204 35.7556 33.7951 35.9639 33.7951C36.1393 33.7951 36.3145 33.813 36.4898 33.8205C36.4898 33.8205 36.6779 33.827 36.784 33.8307C36.8317 33.81 36.8476 33.6995 36.8 33.6582L36.6013 33.6373C36.5618 33.6335 36.4934 33.627 36.4934 33.627C36.3105 33.6077 36.0824 33.576 36.0824 33.382C36.0824 33.2516 36.1454 33.0995 36.1927 32.9835L36.4292 32.4405C36.5476 32.1797 36.5003 32.1506 36.8156 32.1506H37.8881C38.2666 32.1506 38.2114 32.1506 38.3771 32.5202L38.6294 33.0705C38.6689 33.1647 38.7398 33.3243 38.7398 33.4255C38.7398 33.6075 38.5337 33.6196 38.3412 33.6354C38.3412 33.6354 38.2773 33.6406 38.222 33.6445L38.0309 33.658C37.9831 33.6993 37.9991 33.8098 38.0468 33.8305C38.1528 33.8269 38.3412 33.8195 38.3412 33.8195C38.5655 33.8116 38.7913 33.7951 39.0079 33.7951C39.2841 33.7951 39.5604 33.813 39.8366 33.8205C39.9272 33.8231 39.8505 33.8261 39.9553 33.8297C40.0029 33.8091 40.019 33.6986 39.9713 33.6574Z" fill="white"/>
-<path id="Fill-39" fill-rule="evenodd" clip-rule="evenodd" d="M34.5757 11.6045L32.6242 10.2203C32.6242 10.2203 30.2867 11.9973 30.1511 12.0244C30.0153 12.0513 28.5207 11.5127 28.5207 11.5127C27.977 11.7819 24.5524 14.0169 24.5524 14.0169L23.1392 13.0745L21.7533 12.8051L19.9055 11.4857L17.7852 12.9128C17.7852 12.9128 15.4208 14.2592 15.339 14.2592C15.2579 14.2592 12.4855 12.105 12.4855 12.105L11.2084 10.7856C10.991 10.9202 9.95807 11.3781 9.95807 11.3781L8.19185 10.1665L5.01039 11.9435C4.7856 12.9623 4.66602 14.0194 4.66602 15.1042C4.66602 16.0548 4.75789 16.9841 4.93185 17.885C6.26455 17.647 8.6949 17.3087 10.7055 17.5575C13.6406 17.9212 15.475 18.4057 18.5734 19.0924C21.6714 19.7791 23.9545 20.4253 27.2971 20.0618C30.4264 19.7216 32.6982 19.0978 34.7808 17.628C34.924 16.8076 34.9993 15.9646 34.9993 15.1042C34.9993 13.8986 34.8521 12.727 34.5757 11.6045Z" fill="#5475A7"/>
+<path id="Path-2" fill-rule="evenodd" clip-rule="evenodd" d="M20.6953 8.16471L21.334 0.498047H21.25L20.4936 6.33932L20.6953 0.498047H20.6113L20.1743 7.06948L19.939 0.498047H19.855V6.33932L19.418 0.498047H19.334L19.6533 8.16471H20.6953Z" fill="white"/>
+<path id="Path-2-Copy" fill-rule="evenodd" clip-rule="evenodd" d="M17.6514 8.81097L15.6294 1.38823L15.5504 1.41697L16.8376 7.16464L15.0292 1.60666L14.9503 1.6354L16.7872 7.95998L14.3186 1.86533L14.2396 1.89407L16.2374 7.38307L13.829 2.04352L13.75 2.07227L16.6722 9.16736L17.6514 8.81097Z" fill="white"/>
+<path id="Path-2-Copy-3" fill-rule="evenodd" clip-rule="evenodd" d="M15.2998 10.1206L10.3302 4.2479L10.2708 4.30732L13.8664 8.9725L9.87863 4.69949L9.81921 4.75891L14.1569 9.7146L9.34384 5.23428L9.28442 5.2937L13.4148 9.4241L8.97544 5.60269L8.91602 5.66211L14.563 10.8575L15.2998 10.1206Z" fill="white"/>
+<path id="Path-2-Copy-5" fill-rule="evenodd" clip-rule="evenodd" d="M24.7002 10.1206L29.6698 4.2479L29.7292 4.30732L26.1336 8.97251L30.1214 4.69949L30.1808 4.75891L25.8431 9.7146L30.6562 5.23428L30.7156 5.2937L26.5852 9.4241L31.0246 5.60269L31.084 5.66211L25.437 10.8575L24.7002 10.1206Z" fill="white"/>
+<path id="Path-2-Copy-4" fill-rule="evenodd" clip-rule="evenodd" d="M13.7266 11.6378L6.74068 8.41554L6.71194 8.4945L11.9423 11.203L6.52225 9.01568L6.49351 9.09464L12.5192 11.7528L6.26358 9.72637L6.23484 9.80533L11.7238 11.8032L6.08538 10.216L6.05664 10.2949L13.3702 12.617L13.7266 11.6378Z" fill="white"/>
+<path id="Path-2-Copy-6" fill-rule="evenodd" clip-rule="evenodd" d="M26.0984 11.7465L32.771 8.63819L32.7998 8.71716L27.8081 11.3388L32.9895 9.23833L33.0182 9.3173L27.261 11.8778L33.2481 9.94903L33.2769 10.028L28.0265 11.939L33.4263 10.4386L33.4551 10.5176L26.4548 12.7257L26.0984 11.7465Z" fill="white"/>
+<path id="Path-2-Copy-2" fill-rule="evenodd" clip-rule="evenodd" d="M22.6826 8.81097L24.7046 1.38823L24.7836 1.41697L23.4964 7.16464L25.3047 1.60666L25.3837 1.6354L23.5468 7.95998L26.0154 1.86533L26.0944 1.89407L24.0966 7.38307L26.505 2.04352L26.584 2.07227L23.6618 9.16736L22.6826 8.81097Z" fill="white"/>
+<path id="Fill-40" fill-rule="evenodd" clip-rule="evenodd" d="M11.8197 24.3816C11.6793 24.3816 11.3985 24.4338 11.3985 24.2481V22.9184C11.3985 22.3986 11.4152 22.3242 12.0427 22.3242C12.7775 22.3242 13.2319 22.6954 13.2319 23.3789C13.2319 23.6759 13.1244 23.9507 12.852 24.1365C12.5382 24.3519 12.1995 24.3816 11.8197 24.3816ZM14.6386 26.6594L14.4452 26.6427C14.4061 26.6386 14.3714 26.6337 14.3383 26.6285C14.0553 26.5785 13.9421 26.3277 13.8089 26.0952L13.1401 24.9366C13.0246 24.7434 12.9006 24.4833 12.6363 24.4464C13.3217 24.3647 13.9412 23.971 13.9412 23.2952C13.9412 22.5151 13.1648 22.166 12.3803 22.166C11.9097 22.166 11.4807 22.1787 11.0017 22.1787C10.7375 22.1787 10.4233 22.166 10.1591 22.166C10.0123 22.166 10.0105 22.1958 10.0105 22.2773C10.0105 22.398 10.0617 22.3644 10.217 22.3729C10.775 22.4042 10.7535 22.5077 10.7535 22.983V26.0209C10.7535 26.4559 10.7913 26.5857 10.3326 26.6266C10.3326 26.6266 10.2622 26.6337 10.2224 26.638L10.028 26.6577C9.98158 26.6993 9.99713 26.8101 10.0435 26.8311C10.1468 26.8274 10.3302 26.82 10.3302 26.82C10.5841 26.8126 10.8382 26.7933 11.0921 26.7933C11.3476 26.7933 11.5921 26.8128 11.8432 26.82V26.8204C11.9324 26.8232 12.0263 26.8262 12.1297 26.83C12.1761 26.8092 12.1917 26.6982 12.1453 26.6568L11.9496 26.6384C11.9097 26.6342 11.841 26.628 11.841 26.628C11.3776 26.5968 11.406 26.4667 11.406 26.0209V24.8772C11.406 24.8102 11.3977 24.632 11.4472 24.5802C11.4886 24.5354 11.5628 24.5428 11.6289 24.5428C12.2566 24.5428 12.2482 24.6023 12.5456 25.1221L13.3548 26.5707C13.4207 26.6822 13.4704 26.8232 13.6356 26.8232H14.3384C14.4271 26.826 14.5205 26.8288 14.6231 26.8327C14.6696 26.8119 14.6851 26.7009 14.6386 26.6594Z" fill="white"/>
+<path id="Fill-41" fill-rule="evenodd" clip-rule="evenodd" d="M12.056 30.2382C12.056 29.5026 12.0406 29.3905 11.5549 29.3553L11.3619 29.3413C11.3157 29.3132 11.3311 29.1874 11.3774 29.166C11.8093 29.1801 12.0715 29.187 12.38 29.187C12.6807 29.187 12.943 29.1801 13.3286 29.1662C13.3749 29.1874 13.3904 29.3132 13.3441 29.3413L13.159 29.3553C12.704 29.3905 12.6885 29.5026 12.6885 30.2382V32.6768C12.6885 33.1181 12.7117 33.3003 12.8504 33.4333C12.9352 33.5103 13.0817 33.5947 13.6911 33.5947C14.3468 33.5947 14.5087 33.5667 14.6322 33.5037C14.7865 33.4194 14.9869 33.1671 15.1411 32.8098C15.1875 32.7749 15.334 32.8029 15.334 32.8518C15.334 32.9291 15.1179 33.6437 15.01 33.8327C14.6167 33.8188 13.8839 33.8118 13.0895 33.8118H12.38C12.056 33.8118 11.8093 33.8188 11.3774 33.8327C11.3311 33.8118 11.3157 33.6995 11.3619 33.6576L11.5933 33.6368C12.0406 33.5947 12.056 33.4965 12.056 32.761V30.2382Z" fill="white"/>
+<path id="Fill-42" fill-rule="evenodd" clip-rule="evenodd" d="M33.02 30.252C33.02 29.5095 33.0048 29.3905 32.553 29.3553L32.3617 29.3413C32.3159 29.3132 32.331 29.1874 32.3772 29.166C32.7598 29.1801 33.02 29.187 33.3417 29.187C33.6479 29.187 33.9081 29.1801 34.291 29.1662C34.3369 29.1874 34.3522 29.3132 34.3062 29.3413L34.1149 29.3553C33.6632 29.3905 33.6479 29.5095 33.6479 30.252V32.7469C33.6479 33.4894 33.6632 33.5877 34.1149 33.6368L34.3062 33.6576C34.3522 33.6857 34.3369 33.8118 34.291 33.8327C33.9081 33.8188 33.6479 33.8118 33.3417 33.8118C33.02 33.8118 32.7598 33.8188 32.3772 33.8327C32.331 33.8118 32.3159 33.6995 32.3617 33.6576L32.553 33.6368C33.0048 33.5877 33.02 33.4894 33.02 32.7469V30.252Z" fill="white"/>
+<path id="Fill-43" fill-rule="evenodd" clip-rule="evenodd" d="M26.7718 33.6353C26.7325 33.6313 26.6595 33.6253 26.6595 33.6253C26.5791 33.6173 26.5071 33.606 26.45 33.5443C26.3512 33.4401 26.3595 33.1433 26.3595 33.0246V29.9584C26.3595 29.8246 26.3266 29.5353 26.4253 29.4313C26.475 29.3764 26.5777 29.3674 26.6693 29.3619C26.7249 29.3577 26.7263 29.3574 26.7751 29.3549L26.9709 29.3412C27.018 29.3131 27.0023 29.1871 26.9552 29.166C26.8506 29.1698 26.7555 29.1684 26.665 29.1713V29.1716H25.8324C25.7419 29.1716 25.6595 29.1716 25.6102 29.2681L23.9137 32.7721L22.415 29.387C22.3655 29.2681 22.3573 29.1716 22.2008 29.1716H21.3342C21.2439 29.1689 21.1442 29.1698 21.0397 29.166C20.9927 29.1871 20.9769 29.3131 21.0239 29.3412L21.2198 29.3549C21.2602 29.3584 21.3334 29.3631 21.3334 29.3631C21.6583 29.3839 21.6786 29.4557 21.649 29.7951L21.3938 33.0838C21.3714 33.414 21.3531 33.5885 21.0045 33.6205C21.0045 33.6205 20.9306 33.6299 20.8902 33.6341L20.6944 33.655C20.6474 33.6969 20.6631 33.8089 20.7101 33.8298C20.8134 33.8263 20.9968 33.8207 20.9968 33.8207C21.1735 33.8123 21.3538 33.7966 21.5339 33.7966C21.7281 33.7966 21.9227 33.8146 22.1172 33.8225C22.2074 33.8254 22.3027 33.8285 22.4073 33.8325C22.4544 33.8114 22.47 33.6995 22.4232 33.6575L22.2272 33.6366C22.1758 33.6325 22.118 33.6269 22.118 33.6269C21.6147 33.5928 21.6258 33.2402 21.6572 32.8094L21.8962 29.7507H21.9538L23.576 33.5144C23.5925 33.5663 23.6171 33.6556 23.6997 33.6556C23.7738 33.6556 23.7984 33.5739 23.8231 33.5217L25.6512 29.6613H25.709V33.0246C25.709 33.1579 25.7253 33.4328 25.5855 33.5369C25.5121 33.5905 25.2744 33.6231 25.2744 33.6231C25.2417 33.6283 25.2072 33.6327 25.1683 33.637L24.9724 33.6579C24.9254 33.6998 24.9411 33.8118 24.988 33.8327C25.0912 33.8292 25.2744 33.8232 25.2744 33.8232C25.5397 33.8162 25.8095 33.7966 26.0795 33.7966C26.2733 33.7966 26.6535 33.8149 26.6535 33.8149C26.7439 33.8176 26.847 33.8273 26.9517 33.8312C26.9988 33.8102 27.0145 33.6983 26.9675 33.6563L26.7718 33.6353Z" fill="white"/>
+<path id="Fill-44" fill-rule="evenodd" clip-rule="evenodd" d="M37.8847 31.9482H36.9551C36.9227 31.9482 36.6642 31.9773 36.6642 31.9042C36.6642 31.8822 36.6803 31.8383 36.6883 31.8166L37.2462 30.4841C37.2624 30.4476 37.3189 30.2648 37.3836 30.2648C37.4321 30.2648 37.4967 30.4549 37.5129 30.4841L38.0624 31.7286C38.0624 31.7431 38.1189 31.8601 38.1189 31.8895C38.1189 31.9702 37.9332 31.9482 37.8847 31.9482ZM39.9713 33.6569L39.9446 33.636C39.905 33.6318 39.8697 33.6272 39.8365 33.6221C39.5269 33.5555 39.406 33.1957 39.2919 32.9398L37.699 29.3037C37.6832 29.2602 37.6516 29.166 37.5884 29.166C37.5016 29.166 37.478 29.2675 37.4544 29.3253L35.9325 32.9544C35.8772 33.0917 35.7354 33.4251 35.6327 33.5263C35.5542 33.604 35.4519 33.6189 35.3429 33.6297C35.3429 33.6297 35.257 33.6378 35.2159 33.642L35.0289 33.6602C34.9811 33.7016 34.997 33.8121 35.0447 33.8327C35.1509 33.8292 35.3393 33.8227 35.3393 33.8227C35.5475 33.8199 35.7556 33.7946 35.9639 33.7946C36.1393 33.7946 36.3145 33.8126 36.4898 33.82C36.4898 33.82 36.6779 33.8265 36.784 33.8302C36.8317 33.8095 36.8476 33.699 36.8 33.6578L36.6013 33.6369C36.5618 33.633 36.4934 33.6265 36.4934 33.6265C36.3105 33.6072 36.0824 33.5755 36.0824 33.3816C36.0824 33.2511 36.1454 33.099 36.1927 32.983L36.4292 32.4401C36.5476 32.1792 36.5003 32.1501 36.8156 32.1501H37.8881C38.2666 32.1501 38.2114 32.1501 38.3771 32.5198L38.6294 33.07C38.6689 33.1642 38.7398 33.3238 38.7398 33.4251C38.7398 33.6071 38.5337 33.6191 38.3412 33.6349C38.3412 33.6349 38.2773 33.6401 38.222 33.644L38.0309 33.6575C37.9831 33.6988 37.9991 33.8093 38.0468 33.83C38.1528 33.8264 38.3412 33.819 38.3412 33.819C38.5655 33.8111 38.7913 33.7946 39.0079 33.7946C39.2841 33.7946 39.5604 33.8126 39.8366 33.82C39.9272 33.8226 39.8505 33.8256 39.9553 33.8292C40.0029 33.8086 40.019 33.6981 39.9713 33.6569Z" fill="white"/>
+<path id="Fill-39" fill-rule="evenodd" clip-rule="evenodd" d="M34.5757 11.604L32.6242 10.2198C32.6242 10.2198 30.2867 11.9968 30.1511 12.0239C30.0153 12.0508 28.5207 11.5122 28.5207 11.5122C27.977 11.7814 24.5524 14.0164 24.5524 14.0164L23.1392 13.074L21.7533 12.8046L19.9055 11.4852L17.7852 12.9123C17.7852 12.9123 15.4208 14.2587 15.339 14.2587C15.2579 14.2587 12.4855 12.1046 12.4855 12.1046L11.2084 10.7851C10.991 10.9198 9.95807 11.3776 9.95807 11.3776L8.19185 10.166L5.01039 11.9431C4.7856 12.9618 4.66602 14.019 4.66602 15.1037C4.66602 16.0543 4.75789 16.9836 4.93185 17.8845C6.26455 17.6465 8.6949 17.3082 10.7055 17.5571C13.6406 17.9207 15.475 18.4052 18.5734 19.0919C21.6714 19.7786 23.9545 20.4248 27.2971 20.0613C30.4264 19.7211 32.6982 19.0973 34.7808 17.6275C34.924 16.8071 34.9993 15.9641 34.9993 15.1037C34.9993 13.8981 34.8521 12.7265 34.5757 11.604Z" fill="#25346D"/>
 </g>
 </g>
 </g>
 <defs>
-<clipPath id="clip0_746_105172">
-<rect width="40" height="35.6667" fill="white" transform="translate(0 0.166504)"/>
+<clipPath id="clip0_3500_6441">
+<rect width="40" height="35.6667" fill="white" transform="translate(0 0.166016)"/>
 </clipPath>
 </defs>
 </svg>

From 7d68bb3e5b2aad6591d47120a082ab4837fead50 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 18:06:30 -0300
Subject: [PATCH 272/313] test: do not emit error in specific situation

---
 .../forms/DropdownInputComponent.spec.ts      | 92 ++++++++++++++++++-
 1 file changed, 87 insertions(+), 5 deletions(-)

diff --git a/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts b/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
index 5350ef4d79..e9b8400cff 100644
--- a/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect } from 'vitest'
+import { describe, it, expect, vi } from 'vitest'
 import { mount } from '@vue/test-utils'
 
 import DropdownInputComponent from '@/components/forms/DropdownInputComponent.vue'
@@ -94,30 +94,112 @@ describe('DropdownInputComponent', () => {
         tip: '',
         modelValue: [
           { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: 'B', name: 'Value B' },
         ],
         initialValue: '',
-        validations
-      }
+        validations,
+      },
     })
 
     const dropdown = wrapper.find('cds-combo-box')
 
+    const originalActiveElement = document.activeElement
+
+    // Make the combo-box active
+    Object.defineProperty(document, 'activeElement', {
+      value: { id: 'test' },
+      writable: true,
+    })
+
     await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
 
+    // Restore document's activeElement
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    document.activeElement = originalActiveElement
+
+    await wrapper.trigger('click')
+
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
     expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value A')
 
     expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
     expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
       code: 'A',
-      name: 'Value A'
+      name: 'Value A',
     })
 
     expect(wrapper.emitted('error')).toBeTruthy()
     expect(wrapper.emitted('error')![0][0]).toBe('A is not supported')
   })
 
+  it('should not emit error if the component is not focused', async () => {
+    const wrapper = mount(DropdownInputComponent, {
+      props: {
+        id: 'test',
+        label: 'test',
+        tip: '',
+        modelValue: [
+          { code: 'A', name: 'Value A' },
+          { code: 'B', name: 'Value B' },
+        ],
+        initialValue: '',
+        validations,
+      },
+    })
+
+    // const dropdown = wrapper.find('cds-combo-box')
+    // await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
+
+    await wrapper.setProps({ initialValue: 'Value A' })
+
+    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
+    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value A')
+
+    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
+    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
+      code: 'A',
+      name: 'Value A',
+    })
+
+    expect(wrapper.emitted('error')).toBeFalsy()
+  })
+
+  it('should emit error with empty payload (meaning it is valid) even if the component is not focused', async () => {
+    const wrapper = mount(DropdownInputComponent, {
+      props: {
+        id: 'test',
+        label: 'test',
+        tip: '',
+        modelValue: [
+          { code: 'A', name: 'Value A' },
+          { code: 'B', name: 'Value B' },
+        ],
+        initialValue: '',
+        validations,
+      },
+    })
+
+    // const dropdown = wrapper.find('cds-combo-box')
+    // await dropdown.trigger('cds-combo-box-selected', eventContent('Value B'))
+
+    await wrapper.setProps({ initialValue: 'Value B' })
+
+    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
+    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value B')
+
+    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
+    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
+      code: 'B',
+      name: 'Value B',
+    })
+
+    expect(wrapper.emitted('error')).toBeTruthy()
+
+    // Error payload is empty - i.e. it is valid
+    expect(wrapper.emitted('error')![0][0]).toBe(undefined)
+  })
+
   it('should validate and emit no error if required', async () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {

From ed22a30513a046ea3048f022fd3f5e2c7d50050a Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 18:23:26 -0300
Subject: [PATCH 273/313] feat: use variable to tell if selection was a user
 event

---
 .../components/forms/DropdownInputComponent.vue   | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index b634dc5cf3..2e9cf92d14 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -82,8 +82,12 @@ const validateInput = (newValue: any) => {
   }
 };
 
+// Tells whether the current value change was done manually by the user.
+const isUserEvent = ref(false)
+
 const selectItem = (event: any) => {
   selectedValue.value = event?.detail?.item?.getAttribute("data-value");
+  isUserEvent.value = true
 };
 
 /**
@@ -106,16 +110,19 @@ watch([selectedValue], () => {
   const errorMessage = validatePurely(reference ? reference.code : "");
 
   /*
-  If the element is not active, we don't want to set a non-empty error message
-  on it.
+  If the current change was not directly performed by the user, we don't want
+  to set a non-empty error message on it.
   We don't want to call user's attention for something they didn't do wrong.
   Note: we still want to UPDATE the error message in case it already had an
-  error, because the type of error could have changed.
+  error, since the type of error could have changed.
   */
-  if (document.activeElement?.id === props.id || !errorMessage || error.value) {
+  if (isUserEvent.value || !errorMessage || error.value) {
     error.value = errorMessage
   }
 
+  // resets variable
+  isUserEvent.value = false;
+
   emitValueChange(selectedValue.value);
 });
 

From 7560d768a2c256d98e30bebace3962a054357ec9 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 18:26:14 -0300
Subject: [PATCH 274/313] test: update tests

---
 .../forms/DropdownInputComponent.spec.ts      | 23 ++-----------------
 1 file changed, 2 insertions(+), 21 deletions(-)

diff --git a/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts b/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
index e9b8400cff..37f811d207 100644
--- a/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
@@ -103,21 +103,8 @@ describe('DropdownInputComponent', () => {
 
     const dropdown = wrapper.find('cds-combo-box')
 
-    const originalActiveElement = document.activeElement
-
-    // Make the combo-box active
-    Object.defineProperty(document, 'activeElement', {
-      value: { id: 'test' },
-      writable: true,
-    })
-
     await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
 
-    // Restore document's activeElement
-    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-    // @ts-ignore
-    document.activeElement = originalActiveElement
-
     await wrapper.trigger('click')
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
@@ -133,7 +120,7 @@ describe('DropdownInputComponent', () => {
     expect(wrapper.emitted('error')![0][0]).toBe('A is not supported')
   })
 
-  it('should not emit error if the component is not focused', async () => {
+  it('should not emit error if the change on selected value was not made by the user', async () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {
         id: 'test',
@@ -148,9 +135,6 @@ describe('DropdownInputComponent', () => {
       },
     })
 
-    // const dropdown = wrapper.find('cds-combo-box')
-    // await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
-
     await wrapper.setProps({ initialValue: 'Value A' })
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
@@ -165,7 +149,7 @@ describe('DropdownInputComponent', () => {
     expect(wrapper.emitted('error')).toBeFalsy()
   })
 
-  it('should emit error with empty payload (meaning it is valid) even if the component is not focused', async () => {
+  it('should emit error with empty payload (meaning it is valid) even if the change on selected value was not made by the user', async () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {
         id: 'test',
@@ -180,9 +164,6 @@ describe('DropdownInputComponent', () => {
       },
     })
 
-    // const dropdown = wrapper.find('cds-combo-box')
-    // await dropdown.trigger('cds-combo-box-selected', eventContent('Value B'))
-
     await wrapper.setProps({ initialValue: 'Value B' })
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()

From a97e8ca63618832380fd1742573e7b55f2563c1e Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 18:36:00 -0300
Subject: [PATCH 275/313] chore: use variable to tell if the change was a user
 event

---
 .../components/forms/DropdownInputComponent.vue   |  2 +-
 .../src/components/forms/TextInputComponent.vue   | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index 2e9cf92d14..de7d91eaf2 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -82,7 +82,7 @@ const validateInput = (newValue: any) => {
   }
 };
 
-// Tells whether the current value change was done manually by the user.
+// Tells whether the current change was done manually by the user.
 const isUserEvent = ref(false)
 
 const selectItem = (event: any) => {
diff --git a/frontend/src/components/forms/TextInputComponent.vue b/frontend/src/components/forms/TextInputComponent.vue
index 97a2f53d55..b7c39fdddb 100644
--- a/frontend/src/components/forms/TextInputComponent.vue
+++ b/frontend/src/components/forms/TextInputComponent.vue
@@ -70,9 +70,12 @@ watch([selectedValue], () => {
   emitValueChange(selectedValue.value);
 
   // We don't to validate at each key pressed, but we do want to validate when it's changed from outside
-  if (document.activeElement?.id !== props.id) {
+  if (!isUserEvent.value) {
     validateInput(selectedValue.value);
   }
+
+  // resets variable
+  isUserEvent.value = false;
 });
 
 //We call all the validations
@@ -98,6 +101,14 @@ watch(
   () => props.modelValue,
   () => (selectedValue.value = props.modelValue)
 );
+
+// Tells whether the current change was done manually by the user.
+const isUserEvent = ref(false)
+
+const selectValue = (event: any) => {
+  selectedValue.value = event.target.value;
+  isUserEvent.value = true
+};
 </script>
 
 <template>
@@ -114,7 +125,7 @@ watch(
       :invalid-text="error"
       v-masked="mask"
       @blur="(event:any) => validateInput(event.target.value)"
-      @input="(event:any) => selectedValue = event.target.value"
+      @input="selectValue"
       :data-focus="id"
       :data-scroll="id"
       :data-id="'input-' + id"

From 3c69a3809476edca13e1a0dae64e1791d5805792 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 6 Oct 2023 18:57:11 -0300
Subject: [PATCH 276/313] test: update test

---
 .../forms/TextInputComponent.spec.ts          | 25 +++++++++++++------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts b/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
index fdf9242d9b..bc030c7841 100644
--- a/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest'
-import { mount } from '@vue/test-utils'
+import { DOMWrapper, mount } from '@vue/test-utils'
 import TextInputComponent from '@/components/forms/TextInputComponent.vue'
 import { isMinSize } from "@/helpers/validators/GlobalValidators"
 
@@ -7,6 +7,11 @@ describe('Text Input Component', () => {
   const id = 'my-input'
   const validations = [(value: any) => (value ? '' : 'Field is required')]
 
+  const setInputValue = async (inputWrapper: DOMWrapper<HTMLInputElement>, value: string) => {
+    inputWrapper.element.value = value
+    await inputWrapper.trigger('input')
+  }
+
   it('renders the input field with the provided id', () => {
     const wrapper = mount(TextInputComponent, {
       props: {
@@ -40,9 +45,9 @@ describe('Text Input Component', () => {
       }
     })
 
-    await wrapper.setProps({ modelValue: 'John Doe' })
-    await wrapper.find(`#${id}`).trigger('blur')
-    await wrapper.find(`#${id}`).trigger('input')
+    const inputWrapper = wrapper.find<HTMLInputElement>(`#${id}`)
+    await setInputValue(inputWrapper, 'John Doe')
+    await inputWrapper.trigger('blur')
 
     expect(wrapper.emitted('update:model-value')).toBeTruthy()
     expect(wrapper.emitted('update:model-value')![0][0]).toEqual('John Doe')
@@ -97,7 +102,7 @@ describe('Text Input Component', () => {
     expect(wrapper.emitted("error")![0][0]).toBe(errorMessage);
   });
 
-  it.only('emits the "error" event even when the error message is the same as before', async () => {
+  it('emits the "error" event even when the error message is the same as before', async () => {
     const errorMessage = "sample error message";
     const wrapper = mount(TextInputComponent, {
       props: {
@@ -113,13 +118,19 @@ describe('Text Input Component', () => {
       },
     });
 
-    await wrapper.setProps({ modelValue: "1"});
+    const inputWrapper = wrapper.find<HTMLInputElement>(`#${id}`)
+    await setInputValue(inputWrapper, '1')
+    await inputWrapper.trigger('blur')
 
     expect(wrapper.emitted("error")).toBeTruthy();
     expect(wrapper.emitted("error")).toHaveLength(1);
     expect(wrapper.emitted("error")![0][0]).toBe(errorMessage);
 
-    await wrapper.setProps({ modelValue: "12"}); // adds another character
+    await setInputValue(inputWrapper, '12') // adds another character
+    await inputWrapper.trigger('blur')
+
+    // Just a sanity check on the updated element value
+    expect(inputWrapper.element.value).toEqual('12')
 
     expect(wrapper.emitted("error")).toHaveLength(2);
     expect(wrapper.emitted("error")![1][0]).toBe(errorMessage);

From ae3a94deb5327e17c14add074799d8de9d8790d1 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 9 Oct 2023 10:15:09 -0300
Subject: [PATCH 277/313] feat: add tooltip to button Next

---
 frontend/src/pages/FormBCeIDPage.vue | 30 +++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index 369feb8432..b767c4e195 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -4,6 +4,7 @@ import { reactive, watch, toRef, ref, getCurrentInstance, computed } from "vue";
 import "@carbon/web-components/es/components/button/index";
 import "@carbon/web-components/es/components/progress-indicator/index";
 import "@carbon/web-components/es/components/notification/index";
+import "@carbon/web-components/es/components/tooltip/index";
 // Composables
 import { useEventBus, useMediaQuery } from "@vueuse/core";
 import { useRouter } from "vue-router";
@@ -485,18 +486,23 @@ const isSmallScreen = useMediaQuery("(max-width: 671px)");
             <span>Back</span>
           </cds-button>
 
-          <cds-button
-            v-if="!isLast && !endAndLogOut && !mailAndLogOut"
-            id="nextBtn"
-            kind="primary"
-            size="lg"
-            v-on:click="onNext"
-            :disabled="progressData[currentTab].valid === false"
-            data-test="wizard-next-button"
-            >
-            <span>Next</span>
-            <ArrowRight16 slot="icon" />
-          </cds-button>
+          <cds-tooltip>
+            <cds-button
+              v-if="!isLast && !endAndLogOut && !mailAndLogOut"
+              id="nextBtn"
+              kind="primary"
+              size="lg"
+              v-on:click="onNext"
+              :disabled="progressData[currentTab].valid === false"
+              data-test="wizard-next-button"
+              >
+              <span>Next</span>
+              <ArrowRight16 slot="icon" />
+            </cds-button>
+            <cds-tooltip-content v-show="progressData[currentTab].valid === false">
+              All fields must be filled in correctly.
+            </cds-tooltip-content>
+          </cds-tooltip>
 
           <cds-button
             v-if="isLast && !endAndLogOut && !mailAndLogOut"

From 6af4f2c96f1c6a74906977f9c460bff1e91e2657 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 9 Oct 2023 15:29:15 -0300
Subject: [PATCH 278/313] fix: proceed applying part to next level

Regardless of current element already having a part attribute.
---
 frontend/src/helpers/CustomDirectives.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/frontend/src/helpers/CustomDirectives.ts b/frontend/src/helpers/CustomDirectives.ts
index 803f9430f3..bf70d7b2da 100644
--- a/frontend/src/helpers/CustomDirectives.ts
+++ b/frontend/src/helpers/CustomDirectives.ts
@@ -16,13 +16,14 @@ export const masking = (shadowSelector: string) => (el: any, binding: any) => {
 const setPart = (nodes: HTMLCollection, currentLevel: number, maxLevel: number) => {
   for (const node of nodes) {
     if (node.nodeType === Node.ELEMENT_NODE) {
-      if (node.getAttribute('part')) continue
-
-      const partValues = [node.tagName.toLowerCase()]
-      if (node.className) {
-        partValues.push(node.className)
+      if (!node.getAttribute('part')) {
+        const partValues = [node.tagName.toLowerCase()]
+        if (node.className) {
+          partValues.push(node.className)
+        }
+        node.setAttribute('part', partValues.join(' '))
       }
-      node.setAttribute('part', partValues.join(' '))
+
       if (currentLevel < maxLevel) {
         setPart(node.children, currentLevel + 1, maxLevel)
       }

From acdd081e5250b36351a95bbd63b16922e7f479e0 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 9 Oct 2023 16:48:44 -0300
Subject: [PATCH 279/313] chore: adjust combo-boxes focus outline

---
 frontend/src/assets/styles/global.scss                   | 9 +++++++++
 .../src/components/forms/AutoCompleteInputComponent.vue  | 1 +
 frontend/src/components/forms/DropdownInputComponent.vue | 4 +++-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 485cec7172..65b418a630 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -159,6 +159,15 @@ cds-combo-box::part(trigger-button) {
   padding: 0px 3rem 0px 0;
 }
 
+cds-combo-box::part(input) {
+  outline: none;
+}
+
+cds-combo-box:where(:active, :focus)::part(cds--combo-box) {
+  outline: 2px solid var(--cds-focus,#0f62fe);
+  outline-offset: -2px;
+}
+
 .top-notification {
   margin-top: 3rem;
   display: flex;
diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index 819be41dc3..d0e54abe2b 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -121,6 +121,7 @@ revalidateBus.on(() => validateInput(inputValue.value));
       :data-focus="id"
       :data-scroll="id"
       :data-id="'input-' + id"
+      v-shadow="3"
     >
       <cds-combo-box-item
         v-for="item in inputList"
diff --git a/frontend/src/components/forms/DropdownInputComponent.vue b/frontend/src/components/forms/DropdownInputComponent.vue
index de7d91eaf2..930f7650d7 100644
--- a/frontend/src/components/forms/DropdownInputComponent.vue
+++ b/frontend/src/components/forms/DropdownInputComponent.vue
@@ -157,7 +157,9 @@ revalidateBus.on(() => validateInput(selectedValue.value));
       :invalidText="error"
       @cds-combo-box-selected="selectItem"
       :data-focus="id"
-      :data-scroll="id">
+      :data-scroll="id"
+      v-shadow="3"
+    >
       <cds-combo-box-item 
         v-for="option in inputList"
         :key="option.code"

From e656ffb4abe25cfc388326edec323ea678518007 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 10 Oct 2023 20:45:43 -0700
Subject: [PATCH 280/313] Fast commit to switch branches

---
 frontend/src/dto/ApplyClientNumberDto.ts        |  9 +++++++++
 frontend/src/dto/CommonTypesDto.ts              |  1 +
 frontend/src/helpers/ForestClientUserSession.ts | 17 +++++++++++++++++
 frontend/src/pages/FormBCSCPage.vue             | 10 ++++++++++
 4 files changed, 37 insertions(+)

diff --git a/frontend/src/dto/ApplyClientNumberDto.ts b/frontend/src/dto/ApplyClientNumberDto.ts
index 8cf902d3c7..e6b3c4ec0f 100644
--- a/frontend/src/dto/ApplyClientNumberDto.ts
+++ b/frontend/src/dto/ApplyClientNumberDto.ts
@@ -27,6 +27,7 @@ export interface FormDataDto {
     businessName: string;
     goodStandingInd: string;
     birthDate: string;
+    address: Address;
   };
   location: {
     addresses: Address[];
@@ -51,6 +52,14 @@ export const formDataDto: FormDataDto = {
     businessName: "",
     goodStandingInd: "",
     birthDate: "",
+    address: {
+      locationName: "",
+      streetAddress: "",
+      country: { value: "", text: "" },
+      province: { value: "", text: "" },
+      city: "",
+      postalCode: "",
+    },
   },
   location: {
     addresses: [
diff --git a/frontend/src/dto/CommonTypesDto.ts b/frontend/src/dto/CommonTypesDto.ts
index fb04a8b821..4a6a62ffd8 100644
--- a/frontend/src/dto/CommonTypesDto.ts
+++ b/frontend/src/dto/CommonTypesDto.ts
@@ -79,6 +79,7 @@ export interface Submitter {
   lastName: string;
   businessName: string;
   birthDate: string;
+  address: {};
 }
 
 export interface ModalNotification {
diff --git a/frontend/src/helpers/ForestClientUserSession.ts b/frontend/src/helpers/ForestClientUserSession.ts
index dbe0094fc0..6d0b1f3b61 100644
--- a/frontend/src/helpers/ForestClientUserSession.ts
+++ b/frontend/src/helpers/ForestClientUserSession.ts
@@ -71,11 +71,28 @@ class ForestClientUserSession implements SessionProperties {
     const accessToken = this.getCookie("idToken");
     if (accessToken) {
       const parsedUser = this.parseJwt(accessToken);
+      const address = parsedUser["address"];
+      const streetAddress = JSON.parse(address.formatted);
+
       this.user = {
         name: parsedUser["custom:idp_display_name"],
         provider: parsedUser["custom:idp_name"],
         userId: parsedUser["custom:idp_user_id"],
         birthDate: parsedUser["birthdate"],
+        address: {
+          locationName: "",
+          streetAddress: streetAddress.street_address,
+          city: streetAddress.locality,
+          country: {
+            code: streetAddress.country,
+            text: ""
+          },
+          province: {
+            code: streetAddress.region,
+            text: ""
+          },
+          postalCode: streetAddress.postal_code
+        },
         email: parsedUser.email,
         ...this.processName(parsedUser, parsedUser["custom:idp_name"]),
       };
diff --git a/frontend/src/pages/FormBCSCPage.vue b/frontend/src/pages/FormBCSCPage.vue
index 248044cf89..184e31e85c 100644
--- a/frontend/src/pages/FormBCSCPage.vue
+++ b/frontend/src/pages/FormBCSCPage.vue
@@ -37,6 +37,15 @@
       </p>
     </div>
 
+    <div class="grouping-01">
+      <p class="heading-02">
+        Address
+      </p>
+      <p class="body-compact-01">
+        {{ formData.businessInformation.address }}
+      </p>
+    </div>
+
     <div class="grouping-06">
       <!-- <cds-button kind="tertiary" @click.prevent="goToStep(0)">
         <span>Edit business information</span>
@@ -91,6 +100,7 @@ let formData = reactive<FormDataDto>({
     businessName: session?.user?.name ?? "",
     goodStandingInd: "Y",
     birthDate: formattedDate,
+    address: session?.user?.address,
   },
   location: {
     addresses: formDataDto.value.location.addresses,

From b97c3ccde8020003f983a8ba33457459a9af792f Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 11 Oct 2023 11:06:20 -0700
Subject: [PATCH 281/313] Modified gitignore

---
 .gitignore                                               | 3 ++-
 legacy/config/{application.yml => application-local.yml} | 0
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename legacy/config/{application.yml => application-local.yml} (100%)

diff --git a/.gitignore b/.gitignore
index 46bafc34e3..b397e3b6eb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -570,4 +570,5 @@ frontend/cypress/videos/*
 reports/
 frontend/reports/
 
-**/sonar-report.xml
\ No newline at end of file
+**/sonar-report.xml
+**/config/*.jks
diff --git a/legacy/config/application.yml b/legacy/config/application-local.yml
similarity index 100%
rename from legacy/config/application.yml
rename to legacy/config/application-local.yml

From b5bbae02bf5aef4bfeeff52e9efe079925d19c09 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 11 Oct 2023 11:35:19 -0700
Subject: [PATCH 282/313] feat: - Removed unused code - Made code reviews

---
 frontend/src/helpers/DataConversors.ts        | 66 +++++++++----------
 frontend/src/services/GeneralServices.ts      | 10 ---
 .../services/GeneralServices.spec.ts          | 24 -------
 3 files changed, 30 insertions(+), 70 deletions(-)
 delete mode 100644 frontend/src/services/GeneralServices.ts
 delete mode 100644 frontend/tests/unittests/services/GeneralServices.spec.ts

diff --git a/frontend/src/helpers/DataConversors.ts b/frontend/src/helpers/DataConversors.ts
index 2b06c460b1..0f15842747 100644
--- a/frontend/src/helpers/DataConversors.ts
+++ b/frontend/src/helpers/DataConversors.ts
@@ -1,48 +1,42 @@
-import { type Address, emptyAddress } from '@/dto/ApplyClientNumberDto'
+import { type Address, emptyAddress } from "@/dto/ApplyClientNumberDto";
 
 export const retrieveClientType = (legalType: string): string => {
   if (legalType) {
     switch (legalType) {
-      case 'A':
-      case 'B':
-      case 'BC':
-      case 'C':
-      case 'CP':
-      case 'EPR':
-      case 'FOR':
-      case 'LIC':
-      case 'REG':
-        return 'C'
-      case 'S':
-      case 'XS':
-        return 'S'
-      case 'XCP':
-        return 'A'
-      case 'SP':
-        return 'I'
-      case 'GP':
-        return 'P'
-      case 'LP':
-      case 'XL':
-      case 'XP':
-        return 'L'
+      case "A":
+      case "B":
+      case "BC":
+      case "C":
+      case "CP":
+      case "EPR":
+      case "FOR":
+      case "LIC":
+      case "REG":
+        return "C";
+      case "S":
+      case "XS":
+        return "S";
+      case "XCP":
+        return "A";
+      case "SP":
+        return "I";
+      case "GP":
+        return "P";
+      case "LP":
+      case "XL":
+      case "XP":
+        return "L";
       default:
-        throw new Error('Unknown Legal Type ' + legalType)
+        throw new Error("Unknown Legal Type " + legalType);
     }
   } else {
-    return ''
+    return "";
   }
-}
-
-export const toMixedCase = (inputString: string) =>
-  inputString
-    .split(' ')
-    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
-    .join(' ')
+};
 
 export const exportAddress = (addresses: Address[]): Address[] => {
   if (addresses && addresses.length > 0) {
-    return addresses
+    return addresses;
   }
-  return [{ ...emptyAddress(), locationName: 'Mailing address' }]
-}
+  return [{ ...emptyAddress(), locationName: "Mailing address" }];
+};
diff --git a/frontend/src/services/GeneralServices.ts b/frontend/src/services/GeneralServices.ts
deleted file mode 100644
index 65cf8ee634..0000000000
--- a/frontend/src/services/GeneralServices.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
- * This file will have control over fetching of everything
- */
-export const conversionFn = (code: any) => {
-  return {
-    value: { value: code.code, text: code.name },
-    text: code.name,
-    legalType: code.legalType
-  }
-}
diff --git a/frontend/tests/unittests/services/GeneralServices.spec.ts b/frontend/tests/unittests/services/GeneralServices.spec.ts
deleted file mode 100644
index b0853b45e8..0000000000
--- a/frontend/tests/unittests/services/GeneralServices.spec.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { describe, it, expect, beforeEach } from 'vitest'
-import { conversionFn } from '@/services/GeneralServices'
-
-describe('GeneralServices.ts', () => {
-  let code: any
-
-  beforeEach(() => {
-    code = {
-      code: 'code',
-      name: 'name',
-      legalType: 'legalType'
-    }
-  })
-
-  it('returns an object with the correct properties', () => {
-    const result = conversionFn(code)
-
-    expect(result).toEqual({
-      value: { value: 'code', text: 'name' },
-      text: 'name',
-      legalType: 'legalType'
-    })
-  })
-})

From 161754360a7805805d99950a6361c87e7ba019ed Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 11 Oct 2023 11:44:13 -0700
Subject: [PATCH 283/313] feat: - Made more code reviews

---
 frontend/src/CoreConstants.ts                |  22 +--
 frontend/src/main.ts                         |  44 ++---
 frontend/src/routes.ts                       | 174 ++++++++++---------
 frontend/src/services/ForestClientService.ts |  44 ++---
 frontend/src/styles.ts                       |   4 +-
 5 files changed, 145 insertions(+), 143 deletions(-)

diff --git a/frontend/src/CoreConstants.ts b/frontend/src/CoreConstants.ts
index 2d31dc7409..2142104eae 100644
--- a/frontend/src/CoreConstants.ts
+++ b/frontend/src/CoreConstants.ts
@@ -1,17 +1,17 @@
-import { version } from '../package.json'
+import { version } from "../package.json";
 
 export const checkEnv = (key: string) =>
-  window.localStorage.getItem(key) || import.meta.env[key]
+  window.localStorage.getItem(key) || import.meta.env[key];
 
-export const featureFlags = JSON.parse(checkEnv('VITE_FEATURE_FLAGS') || '{}')
-export const backendUrl = checkEnv('VITE_BACKEND_URL')
-export const frontendUrl = checkEnv('VITE_FRONTEND_URL')
-export const keycloakUrl = checkEnv('VITE_KEYCLOAK_URL')
-export const keycloakClientId = checkEnv('VITE_KEYCLOAK_CLIENT_ID')
-export const nodeEnv = checkEnv('VITE_NODE_ENV')
+export const featureFlags = JSON.parse(checkEnv("VITE_FEATURE_FLAGS") || "{}");
+export const backendUrl = checkEnv("VITE_BACKEND_URL");
+export const frontendUrl = checkEnv("VITE_FRONTEND_URL");
+export const keycloakUrl = checkEnv("VITE_KEYCLOAK_URL");
+export const keycloakClientId = checkEnv("VITE_KEYCLOAK_CLIENT_ID");
+export const nodeEnv = checkEnv("VITE_NODE_ENV");
 
-export const appVersion = version
+export const appVersion = version;
 
 // constant
-export const maxFileSizePerFile = 1000000 * 20 // 20 mb
-export const maxTotalFileSize = 1000000 * 20 * 5 // 100 mb
+export const maxFileSizePerFile = 1000000 * 20; // 20 mb
+export const maxTotalFileSize = 1000000 * 20 * 5; // 100 mb
diff --git a/frontend/src/main.ts b/frontend/src/main.ts
index 94c363c02d..8f638f6146 100644
--- a/frontend/src/main.ts
+++ b/frontend/src/main.ts
@@ -1,31 +1,31 @@
-import { createApp } from 'vue'
-import VueTheMask from 'vue-the-mask'
-import App from '@/App.vue'
-import { router } from '@/routes'
-import { featureFlags, backendUrl } from '@/CoreConstants'
-import { masking, shadowPart } from '@/helpers/CustomDirectives'
-import type { SessionProperties } from '@/dto/CommonTypesDto'
-import ForestClientUserSession from '@/helpers/ForestClientUserSession'
+import { createApp } from "vue";
+import VueTheMask from "vue-the-mask";
+import App from "@/App.vue";
+import { router } from "@/routes";
+import { featureFlags, backendUrl } from "@/CoreConstants";
+import { masking, shadowPart } from "@/helpers/CustomDirectives";
+import type { SessionProperties } from "@/dto/CommonTypesDto";
+import ForestClientUserSession from "@/helpers/ForestClientUserSession";
 
 // Importing Styles
-import '@/styles'
+import "@/styles";
 
-const app = createApp(App)
+const app = createApp(App);
 
-app.use(router)
-app.use(VueTheMask)
-app.directive('masked', masking('.cds--text-input__field-wrapper input'))
-app.directive('shadow', shadowPart)
-app.config.globalProperties.$session = ForestClientUserSession
-app.config.globalProperties.$features = featureFlags
-app.config.globalProperties.$backend = backendUrl
-app.mount('#app')
+app.use(router);
+app.use(VueTheMask);
+app.directive("masked", masking(".cds--text-input__field-wrapper input"));
+app.directive("shadow", shadowPart);
+app.config.globalProperties.$session = ForestClientUserSession;
+app.config.globalProperties.$features = featureFlags;
+app.config.globalProperties.$backend = backendUrl;
+app.mount("#app");
 
-declare module '@vue/runtime-core' {
+declare module "@vue/runtime-core" {
   // eslint-disable-next-line no-unused-vars
   interface ComponentCustomProperties {
-    $session: SessionProperties
-    $features: Record<string, any>
-    $backend: string
+    $session: SessionProperties;
+    $features: Record<string, any>;
+    $backend: string;
   }
 }
diff --git a/frontend/src/routes.ts b/frontend/src/routes.ts
index b3ec389818..756725638d 100644
--- a/frontend/src/routes.ts
+++ b/frontend/src/routes.ts
@@ -1,179 +1,179 @@
 /**
  * Router configuration for the application.
  */
-import { createRouter, createWebHistory } from 'vue-router'
+import { createRouter, createWebHistory } from "vue-router";
 
-import ReviewApplicationPage from '@/pages/ReviewApplicationPage.vue'
-import BCeIDForm from '@/pages/FormBCeIDPage.vue'
-import BCSCForm from '@/pages/FormBCSCPage.vue'
-import FormSubmittedPage from '@/pages/FormSubmittedPage.vue'
-import UserLoadingPage from '@/pages/UserLoadingPage.vue'
-import LandingPage from '@/pages/LandingPage.vue'
-import ErrorPage from '@/pages/ErrorPage.vue'
-import NotFoundPage from '@/pages/NotFoundPage.vue'
-import ForestClientUserSession from '@/helpers/ForestClientUserSession'
+import ReviewApplicationPage from "@/pages/ReviewApplicationPage.vue";
+import BCeIDForm from "@/pages/FormBCeIDPage.vue";
+import BCSCForm from "@/pages/FormBCSCPage.vue";
+import FormSubmittedPage from "@/pages/FormSubmittedPage.vue";
+import UserLoadingPage from "@/pages/UserLoadingPage.vue";
+import LandingPage from "@/pages/LandingPage.vue";
+import ErrorPage from "@/pages/ErrorPage.vue";
+import NotFoundPage from "@/pages/NotFoundPage.vue";
+import ForestClientUserSession from "@/helpers/ForestClientUserSession";
 
-import { nodeEnv } from '@/CoreConstants'
+import { nodeEnv } from "@/CoreConstants";
 
 const routes = [
   {
-    path: '/landing',
-    name: 'home',
+    path: "/landing",
+    name: "home",
     component: LandingPage,
     props: true,
     meta: {
-      format: 'full',
+      format: "full",
       hideHeader: true,
       requireAuth: false,
       showLoggedIn: false,
       visibleTo: [],
       redirectTo: {
-        idir: 'internal',
-        bceidbusiness: 'form',
-        bcsc: 'bcsc-form',
+        idir: "internal",
+        bceidbusiness: "form",
+        bcsc: "bcsc-form",
       },
-      style: 'content-landing',
+      style: "content-landing",
     },
   },
   {
-    path: '/new-client',
-    alias: '/',
-    name: 'form',
+    path: "/new-client",
+    alias: "/",
+    name: "form",
     component: BCeIDForm,
     props: true,
     meta: {
-      format: 'screen',
+      format: "screen",
       hideHeader: false,
       requireAuth: true,
       showLoggedIn: true,
-      visibleTo: ['bceidbusiness'],
+      visibleTo: ["bceidbusiness"],
       redirectTo: {
-        idir: 'internal',
-        bcsc: 'bcsc-form',
+        idir: "internal",
+        bcsc: "bcsc-form",
       },
-      style: 'content',
+      style: "content",
     },
   },
   {
-    path: '/new-client-bcsc',
-    alias: '/',
-    name: 'bcsc-form',
+    path: "/new-client-bcsc",
+    alias: "/",
+    name: "bcsc-form",
     component: BCSCForm,
     props: true,
     meta: {
-      format: 'screen',
+      format: "screen",
       hideHeader: false,
       requireAuth: true,
       showLoggedIn: true,
-      visibleTo: ['bcsc'],
+      visibleTo: ["bcsc"],
       redirectTo: {
-        idir: 'internal',
-        bceidbusiness: 'form',
+        idir: "internal",
+        bceidbusiness: "form",
       },
-      style: 'content',
+      style: "content",
     },
   },
   {
-    path: '/form-submitted',
-    name: 'confirmation',
+    path: "/form-submitted",
+    name: "confirmation",
     component: FormSubmittedPage,
     props: true,
     meta: {
-      format: 'full-centered',
+      format: "full-centered",
       hideHeader: false,
       requireAuth: true,
       showLoggedIn: true,
-      visibleTo: ['bceidbusiness', 'bcsc'],
+      visibleTo: ["bceidbusiness", "bcsc"],
       redirectTo: {
-        idir: 'internal',
+        idir: "internal",
       },
-      style: 'content',
+      style: "content",
     },
   },
   {
-    path: '/submissions',
-    name: 'internal',
+    path: "/submissions",
+    name: "internal",
     component: ReviewApplicationPage,
     props: true,
     meta: {
-      format: 'screen',
+      format: "screen",
       hideHeader: false,
       requireAuth: true,
       showLoggedIn: true,
-      visibleTo: ['idir'],
+      visibleTo: ["idir"],
       redirectTo: {
-        bceidbusiness: 'form',
-        bcsc: 'form',
+        bceidbusiness: "form",
+        bcsc: "form",
       },
-      style: 'content',
+      style: "content",
     },
   },
   {
-    path: '/dashboard',
-    name: 'loading',
+    path: "/dashboard",
+    name: "loading",
     component: UserLoadingPage,
     props: true,
     meta: {
-      format: 'full-centered',
+      format: "full-centered",
       hideHeader: true,
       requireAuth: false,
       showLoggedIn: false,
-      visibleTo: ['idir', 'bceidbusiness', 'bcsc'],
+      visibleTo: ["idir", "bceidbusiness", "bcsc"],
       redirectTo: {
-        idir: 'internal',
-        bceidbusiness: 'form',
-        bcsc: 'bcsc-form',
+        idir: "internal",
+        bceidbusiness: "form",
+        bcsc: "bcsc-form",
       },
-      style: 'content',
+      style: "content",
     },
   },
   {
-    path: '/error',
-    name: 'error',
+    path: "/error",
+    name: "error",
     component: ErrorPage,
     props: true,
     meta: {
-      format: 'full',
+      format: "full",
       hideHeader: true,
       requireAuth: false,
       showLoggedIn: true,
-      visibleTo: ['idir', 'bceidbusiness', 'bcsc'],
+      visibleTo: ["idir", "bceidbusiness", "bcsc"],
     },
-    style: 'content',
+    style: "content",
   },
   {
-    path: '/:pathMatch(.*)*',
-    name: 'not-found',
+    path: "/:pathMatch(.*)*",
+    name: "not-found",
     component: NotFoundPage,
     props: true,
     meta: {
-      format: 'full',
+      format: "full",
       hideHeader: true,
       requireAuth: false,
       showLoggedIn: true,
-      visibleTo: ['idir', 'bceidbusiness', 'bcsc'],
+      visibleTo: ["idir", "bceidbusiness", "bcsc"],
     },
-    style: 'content',
+    style: "content",
   },
-]
+];
 
-if (nodeEnv === 'openshift-dev') {
-  const names = ['form', 'confirmation']
+if (nodeEnv === "openshift-dev") {
+  const names = ["form", "confirmation"];
 
   routes.forEach((route) => {
     if (names.includes(route.name as string)) {
-      route.meta?.visibleTo.push('idir')
+      route.meta?.visibleTo.push("idir");
     }
-  })
+  });
 }
 
 const router = createRouter({
   history: createWebHistory(),
   routes,
-})
+});
 
 router.beforeEach(async (to, from, next) => {
-  const user = ForestClientUserSession.loadDetails()
+  const user = ForestClientUserSession.loadDetails();
   // Page requires auth
   if (to.meta.requireAuth) {
     // User is logged in
@@ -181,32 +181,34 @@ router.beforeEach(async (to, from, next) => {
       // If user can see this page, continue, otherwise go to specific page or error
       to.meta.visibleTo.includes(user.provider)
         ? next()
-        : next({ name: to.meta.redirectTo?.[user.provider] || 'error' })
+        : next({ name: to.meta.redirectTo?.[user.provider] || "error" });
     } else {
       // User is not logged in, redirect to home for login
-      next({ name: 'home' })
+      next({ name: "home" });
     }
     // Page does not require auth
   } else {
     if (user && !to.meta.showLoggedIn) {
-      next({ name: to.meta.redirectTo?.[user?.provider || 'error'] ?? 'error' })
+      next({
+        name: to.meta.redirectTo?.[user?.provider || "error"] ?? "error",
+      });
     } else {
-      next()
+      next();
     }
   }
-})
+});
 
-export { routes, router }
+export { routes, router };
 
-declare module 'vue-router' {
+declare module "vue-router" {
   // eslint-disable-next-line no-unused-vars
   interface RouteMeta {
-    format: string
-    hideHeader: boolean
-    requireAuth: boolean
-    showLoggedIn: boolean
-    visibleTo: Array<string>
-    redirectTo?: Record<string, string>
-    style: string
+    format: string;
+    hideHeader: boolean;
+    requireAuth: boolean;
+    showLoggedIn: boolean;
+    visibleTo: Array<string>;
+    redirectTo?: Record<string, string>;
+    style: string;
   }
 }
diff --git a/frontend/src/services/ForestClientService.ts b/frontend/src/services/ForestClientService.ts
index ea72de332c..8e1dbade51 100644
--- a/frontend/src/services/ForestClientService.ts
+++ b/frontend/src/services/ForestClientService.ts
@@ -1,30 +1,30 @@
-import type { Address, Contact } from '../dto/ApplyClientNumberDto'
-import type { CodeDescrType } from '@/dto/CommonTypesDto'
+import type { Address, Contact } from "../dto/ApplyClientNumberDto";
+import type { CodeDescrType } from "@/dto/CommonTypesDto";
 
 export const addNewAddress = (addresses: Address[]): number => {
   const blankAddress: Address = {
-    locationName: '',
-    streetAddress: '',
-    country: { value: '', text: '' } as CodeDescrType,
-    province: { value: '', text: '' } as CodeDescrType,
-    city: '',
-    postalCode: ''
-  }
+    locationName: "",
+    streetAddress: "",
+    country: { value: "", text: "" } as CodeDescrType,
+    province: { value: "", text: "" } as CodeDescrType,
+    city: "",
+    postalCode: "",
+  };
 
-  const newAddresses = addresses.push(blankAddress)
-  return newAddresses
-}
+  const newAddresses = addresses.push(blankAddress);
+  return newAddresses;
+};
 
 export const addNewContact = (contacts: Contact[]): number => {
   const blankContact: Contact = {
-    locationNames: [{ value: '', text: '' }] as CodeDescrType[],
-    contactType: { value: '', text: '' } as CodeDescrType,
-    firstName: '',
-    lastName: '',
-    phoneNumber: '',
-    email: ''
-  }
+    locationNames: [{ value: "", text: "" }] as CodeDescrType[],
+    contactType: { value: "", text: "" } as CodeDescrType,
+    firstName: "",
+    lastName: "",
+    phoneNumber: "",
+    email: "",
+  };
 
-  const newContacts = contacts.push(blankContact)
-  return newContacts
-}
+  const newContacts = contacts.push(blankContact);
+  return newContacts;
+};
diff --git a/frontend/src/styles.ts b/frontend/src/styles.ts
index 45855f2c94..2aaae8b257 100644
--- a/frontend/src/styles.ts
+++ b/frontend/src/styles.ts
@@ -1,4 +1,4 @@
 // Importing BC typography
-import '@bcgov/bc-sans/css/BCSans.css'
+import "@bcgov/bc-sans/css/BCSans.css";
 
-import '@/assets/styles/global.scss'
+import "@/assets/styles/global.scss";

From 23cc3497bb09b4be3c56668a026e54de7c8d7d34 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 11 Oct 2023 13:01:25 -0700
Subject: [PATCH 284/313] Fast commit to switch branches

---
 frontend/src/helpers/ForestClientUserSession.ts | 5 +++--
 frontend/src/services/ForestClientService.ts    | 8 ++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/helpers/ForestClientUserSession.ts b/frontend/src/helpers/ForestClientUserSession.ts
index 6d0b1f3b61..6d7040c87a 100644
--- a/frontend/src/helpers/ForestClientUserSession.ts
+++ b/frontend/src/helpers/ForestClientUserSession.ts
@@ -1,5 +1,6 @@
 import type { SessionProperties, Submitter } from "@/dto/CommonTypesDto";
 import { backendUrl } from "@/CoreConstants";
+import { toTitleCase } from "@/services/ForestClientService";
 
 class ForestClientUserSession implements SessionProperties {
   public user: Submitter | undefined;
@@ -81,8 +82,8 @@ class ForestClientUserSession implements SessionProperties {
         birthDate: parsedUser["birthdate"],
         address: {
           locationName: "",
-          streetAddress: streetAddress.street_address,
-          city: streetAddress.locality,
+          streetAddress: toTitleCase(streetAddress.street_address),
+          city: toTitleCase(streetAddress.locality),
           country: {
             code: streetAddress.country,
             text: ""
diff --git a/frontend/src/services/ForestClientService.ts b/frontend/src/services/ForestClientService.ts
index 8e1dbade51..2a7a45a8dd 100644
--- a/frontend/src/services/ForestClientService.ts
+++ b/frontend/src/services/ForestClientService.ts
@@ -28,3 +28,11 @@ export const addNewContact = (contacts: Contact[]): number => {
   const newContacts = contacts.push(blankContact);
   return newContacts;
 };
+
+export const toTitleCase = (inputString: string): string => {
+  return inputString
+    .toLowerCase()
+    .split(" ")
+    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(" ");
+};

From ad580cbbefdf87b08c8e80e048241c0430aa95dd Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 11 Oct 2023 13:23:40 -0700
Subject: [PATCH 285/313] Renamed class with a more generic name

---
 .../GlobalServiceConfiguration.java           |  4 +--
 .../client/ClientAddressController.java       |  6 ++---
 .../controller/client/ClientController.java   | 10 +++----
 ...lientNameCodeDto.java => CodeNameDto.java} |  2 +-
 .../service/client/ClientAddressService.java  |  6 ++---
 .../gov/app/service/client/ClientService.java | 26 +++++++++----------
 6 files changed, 27 insertions(+), 27 deletions(-)
 rename backend/src/main/java/ca/bc/gov/app/dto/client/{ClientNameCodeDto.java => CodeNameDto.java} (93%)

diff --git a/backend/src/main/java/ca/bc/gov/app/configuration/GlobalServiceConfiguration.java b/backend/src/main/java/ca/bc/gov/app/configuration/GlobalServiceConfiguration.java
index f0f9f5fff0..b30a84bdc5 100644
--- a/backend/src/main/java/ca/bc/gov/app/configuration/GlobalServiceConfiguration.java
+++ b/backend/src/main/java/ca/bc/gov/app/configuration/GlobalServiceConfiguration.java
@@ -34,7 +34,7 @@
 import ca.bc.gov.app.dto.client.ClientContactDto;
 import ca.bc.gov.app.dto.client.ClientLocationDto;
 import ca.bc.gov.app.dto.client.ClientLookUpDto;
-import ca.bc.gov.app.dto.client.ClientNameCodeDto;
+import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.dto.client.ClientSubmissionDto;
 import ca.bc.gov.app.dto.client.ClientValueTextDto;
 import ca.bc.gov.app.dto.cognito.AuthResponse;
@@ -64,7 +64,7 @@
     ClientContactDto.class,
     ClientLocationDto.class,
     ClientLookUpDto.class,
-    ClientNameCodeDto.class,
+    CodeNameDto.class,
     ClientSubmissionDto.class,
     ClientValueTextDto.class,
     BcRegistryAddressDto.class,
diff --git a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientAddressController.java b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientAddressController.java
index 1aae03b330..6805fdea6d 100644
--- a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientAddressController.java
+++ b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientAddressController.java
@@ -1,7 +1,7 @@
 package ca.bc.gov.app.controller.client;
 
 import ca.bc.gov.app.dto.client.ClientAddressDto;
-import ca.bc.gov.app.dto.client.ClientNameCodeDto;
+import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.service.client.ClientAddressService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -45,14 +45,14 @@ public class ClientAddressController {
                   array = @ArraySchema(
                       schema = @Schema(
                           name = "NameCode",
-                          implementation = ClientNameCodeDto.class
+                          implementation = CodeNameDto.class
                       )
                   )
               )
           )
       }
   )
-  public Flux<ClientNameCodeDto> findPossibleAddresses(
+  public Flux<CodeNameDto> findPossibleAddresses(
       @Parameter(description =
           "The name or ISO 2 or 3 character code for the country to search in, defaults to CA",
           example = "UK")
diff --git a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
index 9342f7fa4a..8bc132232f 100644
--- a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
+++ b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
@@ -2,7 +2,7 @@
 
 import ca.bc.gov.app.dto.bcregistry.ClientDetailsDto;
 import ca.bc.gov.app.dto.client.ClientLookUpDto;
-import ca.bc.gov.app.dto.client.ClientNameCodeDto;
+import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.dto.client.EmailRequestDto;
 import ca.bc.gov.app.exception.NoClientDataFound;
 import ca.bc.gov.app.service.client.ClientService;
@@ -40,7 +40,7 @@ public Mono<ClientDetailsDto> getClientDetails(@PathVariable String clientNumber
   }
 
   @GetMapping("/activeCountryCodes")
-  public Flux<ClientNameCodeDto> listCountries(
+  public Flux<CodeNameDto> listCountries(
       @RequestParam(value = "page", required = false, defaultValue = "0")
       Integer page,
       @RequestParam(value = "size", required = false, defaultValue = "10")
@@ -50,7 +50,7 @@ public Flux<ClientNameCodeDto> listCountries(
   }
 
   @GetMapping("/activeCountryCodes/{countryCode}")
-  public Flux<ClientNameCodeDto> listProvinces(
+  public Flux<CodeNameDto> listProvinces(
       @PathVariable String countryCode,
       @RequestParam(value = "page", required = false, defaultValue = "0")
       Integer page,
@@ -61,13 +61,13 @@ public Flux<ClientNameCodeDto> listProvinces(
   }
 
   @GetMapping("/activeClientTypeCodes")
-  public Flux<ClientNameCodeDto> findActiveClientTypeCodes() {
+  public Flux<CodeNameDto> findActiveClientTypeCodes() {
     return clientService
         .findActiveClientTypeCodes(LocalDate.now());
   }
 
   @GetMapping("/activeContactTypeCodes")
-  public Flux<ClientNameCodeDto> listClientContactTypeCodes(
+  public Flux<CodeNameDto> listClientContactTypeCodes(
       @RequestParam(value = "page", required = false, defaultValue = "0")
       Integer page,
       @RequestParam(value = "size", required = false, defaultValue = "10")
diff --git a/backend/src/main/java/ca/bc/gov/app/dto/client/ClientNameCodeDto.java b/backend/src/main/java/ca/bc/gov/app/dto/client/CodeNameDto.java
similarity index 93%
rename from backend/src/main/java/ca/bc/gov/app/dto/client/ClientNameCodeDto.java
rename to backend/src/main/java/ca/bc/gov/app/dto/client/CodeNameDto.java
index 74ebad5307..b2042a4f9b 100644
--- a/backend/src/main/java/ca/bc/gov/app/dto/client/ClientNameCodeDto.java
+++ b/backend/src/main/java/ca/bc/gov/app/dto/client/CodeNameDto.java
@@ -11,7 +11,7 @@
           "name": "BAXTER"
         }"""
 )
-public record ClientNameCodeDto(
+public record CodeNameDto(
 
     @Schema(description = "The code for that specific object", example = "00000002")
     String code,
diff --git a/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java b/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
index 9b63e75569..1cf68a317c 100644
--- a/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
+++ b/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
@@ -5,7 +5,7 @@
 import ca.bc.gov.app.dto.client.AddressCompleteRetrieveListDto;
 import ca.bc.gov.app.dto.client.AddressError;
 import ca.bc.gov.app.dto.client.ClientAddressDto;
-import ca.bc.gov.app.dto.client.ClientNameCodeDto;
+import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.dto.client.ClientValueTextDto;
 import ca.bc.gov.app.exception.AddressLookupException;
 import java.util.List;
@@ -34,7 +34,7 @@ public ClientAddressService(
     this.addressCompleteApi = addressCompleteApi;
   }
 
-  public Flux<ClientNameCodeDto> findPossibleAddresses(
+  public Flux<CodeNameDto> findPossibleAddresses(
       String country, Integer maxSuggestions, String searchTerm) {
     log.info("Searching for address {} for country {}", searchTerm, country);
     return
@@ -95,7 +95,7 @@ public Flux<ClientNameCodeDto> findPossibleAddresses(
             })
             .flatMapMany(Flux::fromIterable)
             .filter(address -> "Retrieve" .equalsIgnoreCase(address.next()))
-            .map(address -> new ClientNameCodeDto(
+            .map(address -> new CodeNameDto(
                     address.id(),
                     String.format("%s %s", address.text().trim(), address.description().trim())
                 )
diff --git a/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java b/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
index 08be469028..59585c72ce 100644
--- a/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
+++ b/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
@@ -7,7 +7,7 @@
 import ca.bc.gov.app.dto.client.ClientAddressDto;
 import ca.bc.gov.app.dto.client.ClientContactDto;
 import ca.bc.gov.app.dto.client.ClientLookUpDto;
-import ca.bc.gov.app.dto.client.ClientNameCodeDto;
+import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.dto.client.ClientValueTextDto;
 import ca.bc.gov.app.dto.client.EmailRequestDto;
 import ca.bc.gov.app.dto.legacy.ForestClientDto;
@@ -57,14 +57,14 @@ public class ClientService {
    * <p>The order is by description.</p>
    *
    * @param targetDate The date to be used as reference.
-   * @return A list of {@link ClientNameCodeDto}
+   * @return A list of {@link CodeNameDto}
    */
-  public Flux<ClientNameCodeDto> findActiveClientTypeCodes(LocalDate targetDate) {
+  public Flux<CodeNameDto> findActiveClientTypeCodes(LocalDate targetDate) {
 
     return
         clientTypeCodeRepository
             .findActiveAt(targetDate)
-            .map(entity -> new ClientNameCodeDto(
+            .map(entity -> new CodeNameDto(
                     entity.getCode(),
                     entity.getDescription()
                 )
@@ -79,12 +79,12 @@ public Flux<ClientNameCodeDto> findActiveClientTypeCodes(LocalDate targetDate) {
    *
    * @param page The page number, it is a 0-index base.
    * @param size The amount of entries per page.
-   * @return A list of {@link ClientNameCodeDto} entries.
+   * @return A list of {@link CodeNameDto} entries.
    */
-  public Flux<ClientNameCodeDto> listCountries(int page, int size) {
+  public Flux<CodeNameDto> listCountries(int page, int size) {
     return countryCodeRepository
         .findBy(PageRequest.of(page, size, Sort.by("order", "description")))
-        .map(entity -> new ClientNameCodeDto(entity.getCountryCode(), entity.getDescription()));
+        .map(entity -> new CodeNameDto(entity.getCountryCode(), entity.getDescription()));
   }
 
   /**
@@ -95,12 +95,12 @@ public Flux<ClientNameCodeDto> listCountries(int page, int size) {
    * @param countryCode The code of the country to list provinces from.
    * @param page        The page number, it is a 0-index base.
    * @param size        The amount of entries per page.
-   * @return A list of {@link ClientNameCodeDto} entries.
+   * @return A list of {@link CodeNameDto} entries.
    */
-  public Flux<ClientNameCodeDto> listProvinces(String countryCode, int page, int size) {
+  public Flux<CodeNameDto> listProvinces(String countryCode, int page, int size) {
     return provinceCodeRepository
         .findByCountryCode(countryCode, PageRequest.of(page, size, Sort.by("description")))
-        .map(entity -> new ClientNameCodeDto(entity.getProvinceCode(), entity.getDescription()));
+        .map(entity -> new CodeNameDto(entity.getProvinceCode(), entity.getDescription()));
   }
 
   /**
@@ -109,12 +109,12 @@ public Flux<ClientNameCodeDto> listProvinces(String countryCode, int page, int s
    *
    * @param page The page number, it is a 0-index base.
    * @param size The amount of entries per page.
-   * @return A list of {@link ClientNameCodeDto} entries.
+   * @return A list of {@link CodeNameDto} entries.
    */
-  public Flux<ClientNameCodeDto> listClientContactTypeCodes(int page, int size) {
+  public Flux<CodeNameDto> listClientContactTypeCodes(int page, int size) {
     return contactTypeCodeRepository
         .findBy(PageRequest.of(page, size))
-        .map(entity -> new ClientNameCodeDto(
+        .map(entity -> new CodeNameDto(
             entity.getContactTypeCode(),
             entity.getDescription()));
   }

From 0a1c41ab5bdacc4f655681fe84d1000a1dbba499 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 11 Oct 2023 14:32:22 -0700
Subject: [PATCH 286/313] Fast commit to switch branches

---
 .../controller/client/ClientController.java   |  6 ++++++
 .../gov/app/service/client/ClientService.java |  6 ++++++
 frontend/src/pages/FormBCSCPage.vue           | 20 +++++++++++++++++--
 3 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
index 8bc132232f..f39a48faaf 100644
--- a/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
+++ b/backend/src/main/java/ca/bc/gov/app/controller/client/ClientController.java
@@ -48,6 +48,12 @@ public Flux<CodeNameDto> listCountries(
     return clientService
         .listCountries(page, size);
   }
+  
+  @GetMapping("/getCountryByCode/{countryCode}")
+  public Mono<Object> getCountryByCode(
+      @PathVariable String countryCode) {
+    return clientService.getCountryByCode(countryCode);
+  }
 
   @GetMapping("/activeCountryCodes/{countryCode}")
   public Flux<CodeNameDto> listProvinces(
diff --git a/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java b/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
index 59585c72ce..9986cef895 100644
--- a/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
+++ b/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
@@ -86,6 +86,12 @@ public Flux<CodeNameDto> listCountries(int page, int size) {
         .findBy(PageRequest.of(page, size, Sort.by("order", "description")))
         .map(entity -> new CodeNameDto(entity.getCountryCode(), entity.getDescription()));
   }
+  
+  public Mono<Object> getCountryByCode(String countryCode) {
+    return countryCodeRepository
+            .findByCountryCode(countryCode)
+            .map(entity -> new CodeNameDto(entity.getCountryCode(), entity.getDescription()));
+  }
 
   /**
    * <p><b>List Provinces</b></p>
diff --git a/frontend/src/pages/FormBCSCPage.vue b/frontend/src/pages/FormBCSCPage.vue
index 184e31e85c..6467de3045 100644
--- a/frontend/src/pages/FormBCSCPage.vue
+++ b/frontend/src/pages/FormBCSCPage.vue
@@ -43,6 +43,16 @@
       </p>
       <p class="body-compact-01">
         {{ formData.businessInformation.address }}
+        <data-fetcher
+          v-model:url="countryTest"
+          :min-length="0"
+          :init-value="[]"
+          :init-fetch="true"
+          :params="{ method: 'GET' }"
+          #="{ content }"
+        >
+        --{{ content }}
+        </data-fetcher>
       </p>
     </div>
 
@@ -76,8 +86,6 @@ const submitterContact: Contact = {
   email: session?.user?.email ?? "",
 };
 
-console.log(session);
-
 let formDataDto = ref<FormDataDto>({ ...newFormDataDto() });
 
 const formatter = new Intl.DateTimeFormat('en-US', {
@@ -89,6 +97,7 @@ const formatter = new Intl.DateTimeFormat('en-US', {
 const birthDate = new Date(session?.user?.birthDate ?? "");
 const formattedDate = formatter.format(birthDate);
 
+
 //---- Form Data ----//
 let formData = reactive<FormDataDto>({
   ...formDataDto.value,
@@ -107,4 +116,11 @@ let formData = reactive<FormDataDto>({
     contacts: [submitterContact],
   },
 });
+
+const countryTest = computed(
+        () =>
+          `/api/clients/getCountryByCode/${session?.user?.address?.country?.code}`
+      );
+
+console.log(session?.user?.address?.country?.code);
 </script>

From 70dec09cc56e27e7bcf63252b61ea66d4d544dee Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Wed, 11 Oct 2023 14:36:25 -0700
Subject: [PATCH 287/313] Made more code reviews

---
 frontend/stub/mappings/backend.json | 58 ++++++++++++++++-------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/frontend/stub/mappings/backend.json b/frontend/stub/mappings/backend.json
index 7c650621c9..4879e00748 100644
--- a/frontend/stub/mappings/backend.json
+++ b/frontend/stub/mappings/backend.json
@@ -1,7 +1,7 @@
 {
   "mappings": [
     {
-      "name":"Autocomplete BC Registry",
+      "name": "Autocomplete BC Registry",
       "request": {
         "urlPattern": "/api/clients/name/(.*)",
         "method": "GET"
@@ -9,11 +9,13 @@
       "response": {
         "status": 200,
         "bodyFileName": "response-autocomplete.json",
-        "transformers": ["response-template"]
+        "transformers": [
+          "response-template"
+        ]
       }
     },
     {
-      "name":"BC Registry Details OK",
+      "name": "BC Registry Details OK",
       "request": {
         "urlPattern": "/api/clients/(XX|YY|UU|JJ|FM)(.*)",
         "method": "GET"
@@ -21,12 +23,14 @@
       "response": {
         "status": 200,
         "bodyFileName": "response-details-{{regexExtract request.path.[2] '(XX|YY|UU|JJ|FM)(.*)' 'parts'}}{{parts.0}}.json",
-        "transformers": ["response-template"],
+        "transformers": [
+          "response-template"
+        ],
         "fixedDelayMilliseconds": 2500
       }
     },
     {
-      "name":"BC Registry Details Duplicated",
+      "name": "BC Registry Details Duplicated",
       "request": {
         "urlPattern": "/api/clients/ZZ(.*)",
         "method": "GET"
@@ -34,12 +38,13 @@
       "response": {
         "status": 409,
         "body": "The Edgar Paciolli already exists with the Incorporation number {{request.path.[2]}} and client number 999999",
-        "transformers": ["response-template"]
+        "transformers": [
+          "response-template"
+        ]
       }
     },
-
     {
-      "name":"Country Codes",
+      "name": "Country Codes",
       "request": {
         "url": "/api/clients/activeCountryCodes?page=0&size=250",
         "method": "GET"
@@ -50,20 +55,21 @@
       }
     },
     {
-      "name":"Province Codes",
+      "name": "Province Codes",
       "request": {
         "urlPattern": "/api/clients/activeCountryCodes/(.*)?page=0&size=250",
         "method": "GET"
       },
       "response": {
         "status": 200,
-        "transformers": ["response-template"],
+        "transformers": [
+          "response-template"
+        ],
         "bodyFileName": "response-provinces-{{request.path.[3]}}.json"
       }
     },
-
     {
-      "name":"Contact Type Codes",
+      "name": "Contact Type Codes",
       "request": {
         "url": "/api/clients/activeContactTypeCodes?page=0&size=250",
         "method": "GET"
@@ -73,9 +79,8 @@
         "body": "[{\"code\":\"P\",\"name\":\"Person\"}]"
       }
     },
-
     {
-      "name":"Submission Success for XX",
+      "name": "Submission Success for XX",
       "request": {
         "url": "/api/clients/submissions",
         "method": "POST",
@@ -97,7 +102,7 @@
       }
     },
     {
-      "name":"Submission Error for UU",
+      "name": "Submission Error for UU",
       "request": {
         "url": "/api/clients/submissions",
         "method": "POST",
@@ -116,7 +121,7 @@
       }
     },
     {
-      "name":"Send email for ZZ",
+      "name": "Send email for ZZ",
       "request": {
         "url": "/api/clients/mail",
         "method": "POST",
@@ -134,7 +139,7 @@
       }
     },
     {
-      "name":"Submission Error for FM1234567",
+      "name": "Submission Error for FM1234567",
       "request": {
         "url": "/api/clients/submissions",
         "method": "POST",
@@ -149,12 +154,11 @@
       },
       "response": {
         "status": 400,
-        "body":"[{\"fieldId\":\"businessInformation.clientType\",\"errorMsg\":\"clientType value I is not supported for registered businesses\"}]"
+        "body": "[{\"fieldId\":\"businessInformation.clientType\",\"errorMsg\":\"clientType value I is not supported for registered businesses\"}]"
       }
     },
-
     {
-      "name":"Autocompete Canada Post Canada",
+      "name": "Autocompete Canada Post Canada",
       "request": {
         "urlPath": "/api/clients/addresses",
         "method": "GET",
@@ -176,7 +180,7 @@
       }
     },
     {
-      "name":"Autocompete Canada Post US",
+      "name": "Autocompete Canada Post US",
       "request": {
         "urlPath": "/api/clients/addresses",
         "method": "GET",
@@ -198,7 +202,7 @@
       }
     },
     {
-      "name":"Canada Post details for success",
+      "name": "Canada Post details for success",
       "request": {
         "urlPattern": "/api/clients/addresses/(.*)",
         "method": "GET"
@@ -206,19 +210,23 @@
       "response": {
         "status": 200,
         "bodyFileName": "response-address-{{request.path.[3]}}.json",
-        "transformers": ["response-template"],
+        "transformers": [
+          "response-template"
+        ],
         "fixedDelayMilliseconds": 2500
       }
     },
     {
-      "name":"Canada Post error details for F8F8F8",
+      "name": "Canada Post error details for F8F8F8",
       "request": {
         "url": "/api/clients/addresses/F8F8F8",
         "method": "GET"
       },
       "response": {
         "status": 404,
-        "transformers": ["response-template"],
+        "transformers": [
+          "response-template"
+        ],
         "fixedDelayMilliseconds": 2500
       }
     }

From f2aff9c6462a2b53bba975787a52ae799ea68ff9 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 12 Oct 2023 09:51:37 -0700
Subject: [PATCH 288/313] Fast commit to switch branches

---
 frontend/src/dto/CommonTypesDto.ts            |  3 +-
 frontend/src/pages/FormBCSCPage.vue           | 42 +++++++++++--------
 frontend/src/services/ForestClientService.ts  |  9 +++-
 .../stub/__files/response-country-CA.json     |  1 +
 frontend/stub/mappings/backend.json           | 14 +++++++
 5 files changed, 49 insertions(+), 20 deletions(-)
 create mode 100644 frontend/stub/__files/response-country-CA.json

diff --git a/frontend/src/dto/CommonTypesDto.ts b/frontend/src/dto/CommonTypesDto.ts
index 4a6a62ffd8..dae1e67d80 100644
--- a/frontend/src/dto/CommonTypesDto.ts
+++ b/frontend/src/dto/CommonTypesDto.ts
@@ -1,4 +1,5 @@
 import { isRef } from "vue";
+import type { Address } from "./ApplyClientNumberDto";
 
 export interface CodeDescrType {
   value: string;
@@ -79,7 +80,7 @@ export interface Submitter {
   lastName: string;
   businessName: string;
   birthDate: string;
-  address: {};
+  address: Address;
 }
 
 export interface ModalNotification {
diff --git a/frontend/src/pages/FormBCSCPage.vue b/frontend/src/pages/FormBCSCPage.vue
index 6467de3045..519bec2468 100644
--- a/frontend/src/pages/FormBCSCPage.vue
+++ b/frontend/src/pages/FormBCSCPage.vue
@@ -42,17 +42,11 @@
         Address
       </p>
       <p class="body-compact-01">
-        {{ formData.businessInformation.address }}
-        <data-fetcher
-          v-model:url="countryTest"
-          :min-length="0"
-          :init-value="[]"
-          :init-fetch="true"
-          :params="{ method: 'GET' }"
-          #="{ content }"
-        >
-        --{{ content }}
-        </data-fetcher>
+        TBD => {{ formData.businessInformation.address }} <br />
+        {{ formData.businessInformation.address.streetAddress }} <br />
+        {{ formData.businessInformation.address.city }} <br />
+        {{ formData.businessInformation.address.country }} <br />
+        {{ formData.location.addresses }}
       </p>
     </div>
 
@@ -71,7 +65,8 @@
 <script setup lang="ts">
 import { reactive, watch, toRef, ref, getCurrentInstance, computed } from "vue";
 import { newFormDataDto } from "@/dto/ApplyClientNumberDto";
-import { BusinessTypeEnum, ClientTypeEnum, LegalTypeEnum } from "@/dto/CommonTypesDto";
+import { BusinessTypeEnum, ClientTypeEnum, CodeNameType, LegalTypeEnum } from "@/dto/CommonTypesDto";
+import { useFetchTo } from "@/composables/useFetch";
 import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
 
 const instance = getCurrentInstance();
@@ -112,15 +107,26 @@ let formData = reactive<FormDataDto>({
     address: session?.user?.address,
   },
   location: {
-    addresses: formDataDto.value.location.addresses,
+    addresses: [],
     contacts: [submitterContact],
   },
 });
 
-const countryTest = computed(
-        () =>
-          `/api/clients/getCountryByCode/${session?.user?.address?.country?.code}`
-      );
 
-console.log(session?.user?.address?.country?.code);
+const receviedCountry = ref({} as CodeNameType);
+
+useFetchTo(`/api/clients/getCountryByCode/${session?.user?.address?.country?.code}`, 
+            receviedCountry);
+
+const country = computed(
+  () => {
+    return { value: receviedCountry.value.code, text: receviedCountry.value.name };
+  }
+);
+
+watch(country, (newValue) => {
+  formData.businessInformation.address.country = { value: newValue.value, text: newValue.text };
+  formData.location.addresses.push(formData.businessInformation.address);
+})
+
 </script>
diff --git a/frontend/src/services/ForestClientService.ts b/frontend/src/services/ForestClientService.ts
index 2a7a45a8dd..4c7d297e45 100644
--- a/frontend/src/services/ForestClientService.ts
+++ b/frontend/src/services/ForestClientService.ts
@@ -1,5 +1,5 @@
 import type { Address, Contact } from "../dto/ApplyClientNumberDto";
-import type { CodeDescrType } from "@/dto/CommonTypesDto";
+import type { CodeDescrType, CodeNameType } from "@/dto/CommonTypesDto";
 
 export const addNewAddress = (addresses: Address[]): number => {
   const blankAddress: Address = {
@@ -36,3 +36,10 @@ export const toTitleCase = (inputString: string): string => {
     .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
     .join(" ");
 };
+
+export const codeConversionFn = (code: any) => {
+  return {
+    value: code.code,
+    text: code.name,
+  }
+};
diff --git a/frontend/stub/__files/response-country-CA.json b/frontend/stub/__files/response-country-CA.json
new file mode 100644
index 0000000000..6d47f9f984
--- /dev/null
+++ b/frontend/stub/__files/response-country-CA.json
@@ -0,0 +1 @@
+{ "code": "CA", "name": "Canada" }
diff --git a/frontend/stub/mappings/backend.json b/frontend/stub/mappings/backend.json
index 4879e00748..b403fd6056 100644
--- a/frontend/stub/mappings/backend.json
+++ b/frontend/stub/mappings/backend.json
@@ -54,6 +54,20 @@
         "bodyFileName": "response-countries.json"
       }
     },
+    {
+      "name": "Country Code",
+      "request": {
+        "urlPattern": "/api/clients/getCountryByCode/(.*)",
+        "method": "GET"
+      },
+      "response": {
+        "status": 200,
+        "transformers": [
+          "response-template"
+        ],
+        "bodyFileName": "response-country-{{request.path.[3]}}.json"
+      }
+    },
     {
       "name": "Province Codes",
       "request": {

From 3dd9ced2f6a9d37da492965e1fd065f972bc097f Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 12 Oct 2023 09:53:36 -0700
Subject: [PATCH 289/313] Pushed common functions

---
 frontend/src/services/ForestClientService.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/frontend/src/services/ForestClientService.ts b/frontend/src/services/ForestClientService.ts
index 8e1dbade51..eb8956ebd7 100644
--- a/frontend/src/services/ForestClientService.ts
+++ b/frontend/src/services/ForestClientService.ts
@@ -28,3 +28,18 @@ export const addNewContact = (contacts: Contact[]): number => {
   const newContacts = contacts.push(blankContact);
   return newContacts;
 };
+
+export const toTitleCase = (inputString: string): string => {
+  return inputString
+    .toLowerCase()
+    .split(" ")
+    .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(" ");
+};
+
+export const codeConversionFn = (code: any) => {
+  return {
+    value: code.code,
+    text: code.name,
+  }
+};

From 3e34a0e9841127c45a30ff1228f9febef32fb863 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 12 Oct 2023 13:53:03 -0700
Subject: [PATCH 290/313] Fast commit to switch branches

---
 frontend/src/dto/ApplyClientNumberDto.ts     |  1 +
 frontend/src/pages/FormBCSCPage.vue          | 14 ++++++++++----
 frontend/src/services/ForestClientService.ts |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/frontend/src/dto/ApplyClientNumberDto.ts b/frontend/src/dto/ApplyClientNumberDto.ts
index e6b3c4ec0f..e2300029e1 100644
--- a/frontend/src/dto/ApplyClientNumberDto.ts
+++ b/frontend/src/dto/ApplyClientNumberDto.ts
@@ -16,6 +16,7 @@ export interface Contact {
   lastName: string;
   phoneNumber: string;
   email: string;
+  idpUserId: string;
 }
 
 export interface FormDataDto {
diff --git a/frontend/src/pages/FormBCSCPage.vue b/frontend/src/pages/FormBCSCPage.vue
index 519bec2468..33ac41eb83 100644
--- a/frontend/src/pages/FormBCSCPage.vue
+++ b/frontend/src/pages/FormBCSCPage.vue
@@ -44,8 +44,8 @@
       <p class="body-compact-01">
         TBD => {{ formData.businessInformation.address }} <br />
         {{ formData.businessInformation.address.streetAddress }} <br />
-        {{ formData.businessInformation.address.city }} <br />
-        {{ formData.businessInformation.address.country }} <br />
+        {{ formData.businessInformation.address.city }}, {{ formData.businessInformation.address.province.value }} <br />
+        {{ formData.businessInformation.address.country.text }} <br />
         {{ formData.location.addresses }}
       </p>
     </div>
@@ -68,6 +68,7 @@ import { newFormDataDto } from "@/dto/ApplyClientNumberDto";
 import { BusinessTypeEnum, ClientTypeEnum, CodeNameType, LegalTypeEnum } from "@/dto/CommonTypesDto";
 import { useFetchTo } from "@/composables/useFetch";
 import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
+import { codeConversionFn } from "@/services/ForestClientService";
 
 const instance = getCurrentInstance();
 const session = instance?.appContext.config.globalProperties.$session;
@@ -120,12 +121,17 @@ useFetchTo(`/api/clients/getCountryByCode/${session?.user?.address?.country?.cod
 
 const country = computed(
   () => {
-    return { value: receviedCountry.value.code, text: receviedCountry.value.name };
+    return codeConversionFn(receviedCountry.value);
   }
 );
 
 watch(country, (newValue) => {
-  formData.businessInformation.address.country = { value: newValue.value, text: newValue.text };
+  formData.businessInformation.address = {
+    ...formData.businessInformation.address,
+    country: { value: newValue.value, text: newValue.text },
+    locationName: "Mailing address",
+  };
+
   formData.location.addresses.push(formData.businessInformation.address);
 })
 
diff --git a/frontend/src/services/ForestClientService.ts b/frontend/src/services/ForestClientService.ts
index 4c7d297e45..91910eb228 100644
--- a/frontend/src/services/ForestClientService.ts
+++ b/frontend/src/services/ForestClientService.ts
@@ -1,5 +1,5 @@
 import type { Address, Contact } from "../dto/ApplyClientNumberDto";
-import type { CodeDescrType, CodeNameType } from "@/dto/CommonTypesDto";
+import type { CodeDescrType } from "@/dto/CommonTypesDto";
 
 export const addNewAddress = (addresses: Address[]): number => {
   const blankAddress: Address = {
@@ -41,5 +41,5 @@ export const codeConversionFn = (code: any) => {
   return {
     value: code.code,
     text: code.name,
-  }
+  } as CodeDescrType;
 };

From 20d7645c314208396a190ea4751cc42e2e4da442 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 13 Oct 2023 09:53:12 -0300
Subject: [PATCH 291/313] fix: fix AutoComplete events

- fix empty value;
- always emit the error;
- do not validate at each key pressed.
---
 .../forms/AutoCompleteInputComponent.vue      | 24 +++++++++++--------
 .../grouping/AddressGroupComponent.vue        |  6 ++---
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index d0e54abe2b..d455f4e41a 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -34,11 +34,9 @@ const error = ref<string | undefined>(props.errorMessage || "");
 
 const revalidateBus = useEventBus<void>("revalidate-bus");
 
-//We watch for error changes to emit events
-watch(error, () => emit("error", error.value));
 watch(
   () => props.errorMessage,
-  () => (error.value = props.errorMessage)
+  () => setError(props.errorMessage),
 );
 
 //We set the value prop as a reference for update reason
@@ -62,7 +60,7 @@ const emitValueChange = (newValue: string): void => {
 
   emit("update:model-value", selectedValue?.name ?? newValue);
   emit("update:selected-value", selectedValue);
-  emit("empty", isEmpty(selectedValue));
+  emit("empty", isEmpty(newValue));
 };
 
 emit("empty", true);
@@ -70,30 +68,36 @@ watch(
   () => props.modelValue,
   () => {
     inputValue.value = props.modelValue;
-    validateInput(inputValue.value);
-  }
+  },
 );
 watch([inputValue], () => {
-  validateInput(inputValue.value);
   emitValueChange(inputValue.value);
 });
 
+const setError = (errorMessage: string | undefined) => {
+  error.value = errorMessage;
+  emit("error", error.value);
+}
+
 //We call all the validations
 const validateInput = (newValue: string) => {
   if (props.validations) {
-    error.value =
+    setError(
       props.validations
         .map((validation) => validation(newValue))
         .filter((errorMessage) => {
           if (errorMessage) return true;
           return false;
         })
-        .shift() ?? props.errorMessage;
+        .shift() ?? props.errorMessage,
+    );
   }
 };
 
 const selectAutocompleteItem = (event: any) => {
-  emitValueChange(event?.detail?.item?.getAttribute("data-id"));
+  const newValue = event?.detail?.item?.getAttribute("data-id");
+  emitValueChange(newValue);
+  validateInput(newValue);
 };
 
 const onTyping = (event: any) => {
diff --git a/frontend/src/components/grouping/AddressGroupComponent.vue b/frontend/src/components/grouping/AddressGroupComponent.vue
index abd74310e0..0b59856640 100644
--- a/frontend/src/components/grouping/AddressGroupComponent.vue
+++ b/frontend/src/components/grouping/AddressGroupComponent.vue
@@ -291,11 +291,9 @@ onMounted(() => {
       ]"
       :loading="loading"
       @update:selected-value="autoCompleteResult = $event"
-      @update:model-value="validation.streetAddress = false"
       :error-message="addressError"
-      @empty="
-        validation.streetAddress = selectedValue.streetAddress ? true : false
-      "
+      @empty="validation.streetAddress = !$event"
+      @error="validation.streetAddress = !$event"
     />
     <cds-inline-loading status="active" v-if="showDetailsLoading">Loading address details...</cds-inline-loading>
   </data-fetcher>

From d57e6a85d2e8fe1c46703f48c0e3ad993788a456 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 13 Oct 2023 11:46:32 -0300
Subject: [PATCH 292/313] test: add empty and error tests

---
 .../forms/AutoCompleteInputComponent.spec.ts  | 58 ++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
index 7ec844e4ac..2c463624ba 100644
--- a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
@@ -3,6 +3,7 @@ import { describe, it, expect, beforeEach } from 'vitest'
 import { VueWrapper, mount } from '@vue/test-utils'
 import AutoCompleteInputComponent from '@/components/forms/AutoCompleteInputComponent.vue'
 import CDSComboBox from "@carbon/web-components/es/components/combo-box/combo-box"
+import { isMinSize } from '@/helpers/validators/GlobalValidators'
 
 describe('Auto Complete Input Component', () => {
   const id = 'my-input'
@@ -68,6 +69,38 @@ describe('Auto Complete Input Component', () => {
     expect(wrapper.emitted('error')![0][0]).toBe('Field is required')
   })
 
+  it('emits the "error" event even when the error message is the same as before', async () => {
+    const errorMessage = 'sample error message'
+    const wrapper = mount(AutoCompleteInputComponent, {
+      props: {
+        id,
+        modelValue: '',
+        contents,
+        validations: [isMinSize(errorMessage)(5)],
+        label: id,
+      }
+    })
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = 'a'
+    await wrapper.find(`#${id}`).trigger('input')
+    await wrapper.find(`#${id}`).trigger('blur')
+
+    expect(wrapper.emitted('error')).toBeTruthy()
+    expect(wrapper.emitted('error')).toHaveLength(1)
+    expect(wrapper.emitted('error')![0][0]).toBe(errorMessage)
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = 'ab' // adds another character
+    await wrapper.find(`#${id}`).trigger('input')
+    await wrapper.find(`#${id}`).trigger('blur')
+
+    expect(wrapper.emitted('error')).toHaveLength(2)
+    expect(wrapper.emitted('error')![1][0]).toBe(errorMessage)
+  })
+
   it('emits the "empty" event when the input field is empty', async () => {
     const wrapper = mount(AutoCompleteInputComponent, {
       props: {
@@ -86,6 +119,27 @@ describe('Auto Complete Input Component', () => {
     expect(wrapper.emitted('empty')![0][0]).toBe(true)
   })
 
+  it('emits the "empty" event with false when the input field is not empty', async () => {
+    const wrapper = mount(AutoCompleteInputComponent, {
+      props: {
+        id,
+        modelValue: '',
+        contents,
+        validations: [],
+        label: id
+      }
+    })
+
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = 'a'
+    await wrapper.find(`#${id}`).trigger('input')
+    await wrapper.find(`#${id}`).trigger('blur')
+
+    expect(wrapper.emitted('empty')).toHaveLength(2)
+    expect(wrapper.emitted('empty')![1][0]).toBe(false)
+  })
+
   describe('when the contents prop is empty', () => {
     const emptyContents: any[] = []
     it('emits "empty" when the input becomes empty', async () => {
@@ -99,7 +153,9 @@ describe('Auto Complete Input Component', () => {
         },
       })
 
-      wrapper.find<CDSComboBox>(`#${id}`).element.value = ''
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = ''
       await wrapper.find(`#${id}`).trigger('input')
 
       expect(wrapper.emitted('empty')).toBeTruthy()

From 2d1d934adcb6a8523c0626e88d784fc95a6a510c Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Fri, 13 Oct 2023 12:26:55 -0300
Subject: [PATCH 293/313] fix: fix initial empty value

---
 frontend/src/components/forms/AutoCompleteInputComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index d455f4e41a..d5043c2ca4 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -63,7 +63,7 @@ const emitValueChange = (newValue: string): void => {
   emit("empty", isEmpty(newValue));
 };
 
-emit("empty", true);
+emit("empty", isEmpty(props.modelValue));
 watch(
   () => props.modelValue,
   () => {

From 4fc2b2e033d8b5a8d168ca86c863f9103d100596 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Fri, 13 Oct 2023 14:40:02 -0700
Subject: [PATCH 294/313] removed unneeded key

---
 frontend/src/dto/ApplyClientNumberDto.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/frontend/src/dto/ApplyClientNumberDto.ts b/frontend/src/dto/ApplyClientNumberDto.ts
index e2300029e1..e6b3c4ec0f 100644
--- a/frontend/src/dto/ApplyClientNumberDto.ts
+++ b/frontend/src/dto/ApplyClientNumberDto.ts
@@ -16,7 +16,6 @@ export interface Contact {
   lastName: string;
   phoneNumber: string;
   email: string;
-  idpUserId: string;
 }
 
 export interface FormDataDto {

From 875b2ddb4f242553f992d37f28c2565fa2780303 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 16 Oct 2023 15:59:13 -0300
Subject: [PATCH 295/313] fix: allow selecting item identical to the typed
 value

---
 .../forms/AutoCompleteInputComponent.vue      | 51 ++++++++++++++++---
 1 file changed, 43 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index d5043c2ca4..94be766528 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -2,10 +2,11 @@
 import { ref, computed, watch } from "vue";
 // Carbon
 import "@carbon/web-components/es/components/combo-box/index";
+import type { CDSComboBox } from "@carbon/web-components";
 // Composables
 import { useEventBus } from "@vueuse/core";
 // Types
-import type { BusinessSearchResult } from "@/dto/CommonTypesDto";
+import type { BusinessSearchResult, CodeNameType } from "@/dto/CommonTypesDto";
 import { isEmpty } from "@/dto/CommonTypesDto";
 
 //Define the input properties for this component
@@ -43,12 +44,18 @@ watch(
 const inputValue = ref(props.modelValue);
 
 // This is to make the input list contains the selected value to show when component render
-const inputList = computed<Array<BusinessSearchResult>>(() =>
-  (!props.contents || props.contents.length === 0
-    ? [{ name: props.modelValue, code: "", status: "", legalType: "" }]
-    : props.contents
-  ).filter((entry) => entry.name)
-);
+const inputList = computed<Array<BusinessSearchResult>>(() => {
+  if (props.contents?.length > 0) {
+    return props.contents.filter((entry) => entry.name);
+  } else if (props.modelValue !== userValue.value) {
+    // Needed when the component mounts with a pre-filled value.
+    return [{ name: props.modelValue, code: "", status: "", legalType: "" }]
+  } else if (props.modelValue && props.loading) {
+    // Just to give a "loading" feedback.
+    return [{ name: "...", code: "", status: "", legalType: "" }];
+  }
+  return [];
+});
 
 let selectedValue: BusinessSearchResult | undefined = undefined;
 
@@ -64,10 +71,19 @@ const emitValueChange = (newValue: string): void => {
 };
 
 emit("empty", isEmpty(props.modelValue));
+
+const isUserEvent = ref(false);
+const userValue = ref("");
+
+const cdsComboBoxRef = ref<InstanceType<typeof CDSComboBox> | null>(null);
 watch(
   () => props.modelValue,
   () => {
     inputValue.value = props.modelValue;
+    if (!isUserEvent.value && cdsComboBoxRef.value) {
+      cdsComboBoxRef.value._filterInputValue = props.modelValue || "";
+    }
+    isUserEvent.value = false;
   },
 );
 watch([inputValue], () => {
@@ -101,16 +117,35 @@ const selectAutocompleteItem = (event: any) => {
 };
 
 const onTyping = (event: any) => {
+  isUserEvent.value = true;
   inputValue.value = event.srcElement._filterInputValue;
+  userValue.value = inputValue.value;
   emit("update:model-value", inputValue.value);
 };
 
 revalidateBus.on(() => validateInput(inputValue.value));
+
+/*
+By applying a suffix which is impossible to be typed to the items' names, the search input will
+never be exactly the same as any item name.
+This allows the user to select the item even when the provided search input is exactly the same as
+the item name. (see: FSADT1-918)
+Note: removing the value prop from the cds-combo-box-item is not an option, since it causes another
+kind of issue when the field gets cleared.
+*/
+const nameSuffix = "\0";
+
+/*
+By checking the item has a code, we know this is a real option instead of a mock one.
+We need the mock one (with no suffix) when the component mounts with a pre-filled value.
+*/
+const getComboBoxItemValue = (item: CodeNameType) => item.name + (item.code ? nameSuffix : "");
 </script>
 
 <template>
   <div class="grouping-02">
     <cds-combo-box
+      ref="cdsComboBoxRef"
       :id="id"
       :name="id"
       :helper-text="tip"
@@ -132,7 +167,7 @@ revalidateBus.on(() => validateInput(inputValue.value));
         :key="item.code"
         :data-id="item.code"
         :data-value="item.name"
-        :value="item.name"
+        :value="getComboBoxItemValue(item)"
       >
         {{ item.name }}
       </cds-combo-box-item>

From 103f700cc9b9994f490ce7d82346645c4ed62dae Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 16 Oct 2023 16:07:12 -0300
Subject: [PATCH 296/313] test: update test

---
 .../components/forms/AutoCompleteInputComponent.spec.ts         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
index 2c463624ba..0ffb90d1d7 100644
--- a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
@@ -161,7 +161,7 @@ describe('Auto Complete Input Component', () => {
       expect(wrapper.emitted('empty')).toBeTruthy()
 
       // the first event is from the initialization
-      expect(wrapper.emitted('empty')![0][0]).toBe(true)
+      expect(wrapper.emitted('empty')![0][0]).toBe(false)
 
       // the second event is the result from changing the input value
       // Note: before FSADT1-912, it would emit a "not empty" (false) one.

From a9a6f7f6d4eb922ab6e167c29d8344329a550c15 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 16 Oct 2023 13:13:33 -0700
Subject: [PATCH 297/313] Fast commit to switch branches

---
 .../GlobalServiceConfiguration.java           |  4 +--
 frontend/src/pages/FormBCSCPage.vue           | 29 ++++++++++++++++---
 frontend/src/services/ForestClientService.ts  |  2 +-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/backend/src/main/java/ca/bc/gov/app/configuration/GlobalServiceConfiguration.java b/backend/src/main/java/ca/bc/gov/app/configuration/GlobalServiceConfiguration.java
index b30a84bdc5..64fd95cc86 100644
--- a/backend/src/main/java/ca/bc/gov/app/configuration/GlobalServiceConfiguration.java
+++ b/backend/src/main/java/ca/bc/gov/app/configuration/GlobalServiceConfiguration.java
@@ -34,9 +34,9 @@
 import ca.bc.gov.app.dto.client.ClientContactDto;
 import ca.bc.gov.app.dto.client.ClientLocationDto;
 import ca.bc.gov.app.dto.client.ClientLookUpDto;
-import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.dto.client.ClientSubmissionDto;
 import ca.bc.gov.app.dto.client.ClientValueTextDto;
+import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.dto.cognito.AuthResponse;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.aot.hint.annotation.RegisterReflectionForBinding;
@@ -64,9 +64,9 @@
     ClientContactDto.class,
     ClientLocationDto.class,
     ClientLookUpDto.class,
-    CodeNameDto.class,
     ClientSubmissionDto.class,
     ClientValueTextDto.class,
+    CodeNameDto.class,
     BcRegistryAddressDto.class,
     BcRegistryBusinessAdressesDto.class,
     BcRegistryBusinessDto.class,
diff --git a/frontend/src/pages/FormBCSCPage.vue b/frontend/src/pages/FormBCSCPage.vue
index 33ac41eb83..a248364d43 100644
--- a/frontend/src/pages/FormBCSCPage.vue
+++ b/frontend/src/pages/FormBCSCPage.vue
@@ -42,15 +42,35 @@
         Address
       </p>
       <p class="body-compact-01">
-        TBD => {{ formData.businessInformation.address }} <br />
         {{ formData.businessInformation.address.streetAddress }} <br />
         {{ formData.businessInformation.address.city }}, {{ formData.businessInformation.address.province.value }} <br />
         {{ formData.businessInformation.address.country.text }} <br />
-        {{ formData.location.addresses }}
+        {{ formData.businessInformation.address.postalCode }}
       </p>
     </div>
 
+    <div class="grouping-01">
+      <p class="heading-02">
+        Email address
+      </p>
+      <p class="body-compact-01">
+        {{ formData.location.contacts[0].email }}
+      </p>
+    </div>
+
+    <div class="grouping-01">
+      <text-input-component
+        id="phoneNumberId"
+        label="Phone number"
+        placeholder=""
+        :enabled="true" 
+        v-model="formData.location.contacts[0].phoneNumber"
+        mask="(###) ###-####"
+      />
+    </div>
+
     <div class="grouping-06">
+
       <!-- <cds-button kind="tertiary" @click.prevent="goToStep(0)">
         <span>Edit business information</span>
         <Edit16 slot="icon" />
@@ -129,10 +149,11 @@ watch(country, (newValue) => {
   formData.businessInformation.address = {
     ...formData.businessInformation.address,
     country: { value: newValue.value, text: newValue.text },
+    province: codeConversionFn(formData.businessInformation.address.province),
+    postalCode: formData.businessInformation.address.postalCode.replace(/\s/g, ""),
     locationName: "Mailing address",
   };
 
   formData.location.addresses.push(formData.businessInformation.address);
-})
-
+});
 </script>
diff --git a/frontend/src/services/ForestClientService.ts b/frontend/src/services/ForestClientService.ts
index 91910eb228..37948cf294 100644
--- a/frontend/src/services/ForestClientService.ts
+++ b/frontend/src/services/ForestClientService.ts
@@ -40,6 +40,6 @@ export const toTitleCase = (inputString: string): string => {
 export const codeConversionFn = (code: any) => {
   return {
     value: code.code,
-    text: code.name,
+    text: code.name ?? '',
   } as CodeDescrType;
 };

From 2b8bb8e1b1785654d1af617d97b1249e65421849 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Mon, 16 Oct 2023 20:56:39 -0300
Subject: [PATCH 298/313] test: add address group test

---
 frontend/cypress/fixtures/addressSearch.json  |   4 +
 frontend/cypress/fixtures/emptyAddress.json   |   8 ++
 .../grouping/AddressGroupComponent.cy.ts      | 127 ++++++++++++++++++
 3 files changed, 139 insertions(+)
 create mode 100644 frontend/cypress/fixtures/addressSearch.json
 create mode 100644 frontend/cypress/fixtures/emptyAddress.json

diff --git a/frontend/cypress/fixtures/addressSearch.json b/frontend/cypress/fixtures/addressSearch.json
new file mode 100644
index 0000000000..3cbb754d51
--- /dev/null
+++ b/frontend/cypress/fixtures/addressSearch.json
@@ -0,0 +1,4 @@
+[{
+  "code": "V8T5J9",
+  "name": "2975 Jutland Rd Victoria, BC, V8T 5J9"
+}]
\ No newline at end of file
diff --git a/frontend/cypress/fixtures/emptyAddress.json b/frontend/cypress/fixtures/emptyAddress.json
new file mode 100644
index 0000000000..aeeec14ad7
--- /dev/null
+++ b/frontend/cypress/fixtures/emptyAddress.json
@@ -0,0 +1,8 @@
+{
+  "locationName": "",
+  "streetAddress": "",
+  "country": { "value": "CA", "text": "Canada" },
+  "province": { "value": "BC", "text": "British Columbia" },
+  "city": "",
+  "postalCode": ""
+}
diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index 6abab826e4..755c3b5678 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -1,4 +1,5 @@
 import AddressGroupComponent from '@/components/grouping/AddressGroupComponent.vue'
+import { Address } from '@/dto/ApplyClientNumberDto'
 
 // load app validations
 import '@/helpers/validators/BCeIDFormValidations'
@@ -22,6 +23,29 @@ describe('<AddressGroupComponent />', () => {
 
     cy.fixture('address.json').as('addressFixture')
     cy.fixture('countries.json').as('countriesFixture')
+
+    cy.fixture('emptyAddress.json').as('emptyAddressFixture')
+
+    cy.intercept(
+      'GET',
+      `/api/clients/addresses?country=CA&maxSuggestions=10&searchTerm=${encodeURI(
+        '2975 Jutland Rd',
+      )}*`,
+      {
+        fixture: 'addressSearch.json',
+      },
+    ).as('searchAddress')
+
+    cy.intercept('GET', `/api/clients/addresses?country=CA&maxSuggestions=10&searchTerm=111`, [
+      {
+        code: 'A1A1A1',
+        name: '111 A St Victoria, BC, A1A 1A1',
+      },
+    ]).as('searchAddress111')
+
+    cy.intercept('GET', '/api/clients/addresses/V8T5J9', {
+      fixture: 'address.json',
+    }).as('getAddress')
   })
 
   it('should render the component', () => {
@@ -180,6 +204,109 @@ describe('<AddressGroupComponent />', () => {
       .and('include.text', 'Zip code')
   })
 
+  const streetAddressMatchingScenarios = [
+    {
+      description: 'when a partial matching address is typed in',
+      value: '2975 Jutland Rd',
+      identical: false,
+    },
+    {
+      description: 'when a complete matching address is typed in',
+      value: '2975 Jutland Rd Victoria, BC, V8T 5J9',
+      identical: true,
+    },
+  ]
+  streetAddressMatchingScenarios.forEach((scenario) => {
+    describe(scenario.description, () => {
+      it('should update the address related fields', () => {
+        cy.get('@emptyAddressFixture').then((emptyAddress) => {
+          cy.get('@countriesFixture').then((countries) => {
+            cy.mount(AddressGroupComponent, {
+              props: {
+                id: 0,
+                modelValue: emptyAddress,
+                countryList: countries,
+                validations: [],
+              },
+            })
+          })
+        })
+
+        cy.wait('@getProvinces')
+
+        cy.get('#addr_0').shadow().find('input').type(scenario.value, { delay: 0 })
+
+        cy.wait('@searchAddress')
+
+        if (scenario.identical) {
+          // Sanity check to make sure the option's full text content is the exact same value typed by the user.
+          cy.get('cds-combo-box-item').contains(scenario.value).should('have.text', scenario.value)
+        }
+
+        cy.get('cds-combo-box-item').contains(scenario.value).click()
+
+        cy.wait('@getAddress')
+
+        cy.get('@addressFixture').then((address: Address) => {
+          cy.get('#city_0').should('have.value', address.city)
+
+          cy.get('#province_0').should('be.visible').and('have.value', address.province.text)
+
+          cy.get('#postalCode_0').should('be.visible').and('have.value', address.postalCode)
+        })
+      })
+    })
+  })
+
+  it('loads pre-filled Street address value properly', () => {
+    cy.get('@addressFixture').then((address) => {
+      cy.get('@countriesFixture').then((countries) => {
+        cy.mount(AddressGroupComponent, {
+          props: {
+            id: 0,
+            modelValue: address,
+            countryList: countries,
+            validations: [],
+          },
+        })
+      })
+    })
+
+    cy.wait('@getProvinces')
+
+    cy.get('#addr_0').should('be.visible').and('have.value', '2975 Jutland Rd')
+  })
+
+  it('keeps working normally to search and load new address options after clearing the Street address with the x button', () => {
+    cy.get('@addressFixture').then((address) => {
+      cy.get('@countriesFixture').then((countries) => {
+        cy.mount(AddressGroupComponent, {
+          props: {
+            id: 0,
+            modelValue: address,
+            countryList: countries,
+            validations: [],
+          },
+        })
+      })
+    })
+
+    cy.wait('@getProvinces')
+
+    cy.get('#addr_0').should('be.visible').and('have.value', '2975 Jutland Rd')
+
+    // Click the clear (x) button
+    cy.get('#addr_0').shadow().find('#selection-button').click()
+
+    cy.get('#addr_0').should('have.value', '')
+
+    cy.get('#addr_0').shadow().find('input').type('111', { delay: 0 })
+
+    cy.wait('@searchAddress111')
+
+    cy.get('cds-combo-box-item').contains('111 A St Victoria, BC, A1A 1A1')
+  })
+
   /**
    * @see FSADT1-905
    * @see FSADT1-907

From 86e2d0dac2a7bfb3a045c5e71528391ba8126349 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Mon, 16 Oct 2023 18:13:11 -0700
Subject: [PATCH 299/313] Fast commit to switch branches

---
 frontend/src/assets/styles/global.scss        | 10 +++
 .../src/helpers/ForestClientUserSession.ts    |  2 +-
 frontend/src/pages/FormBCSCPage.vue           | 80 +++++++++----------
 frontend/src/services/ForestClientService.ts  |  2 +
 4 files changed, 50 insertions(+), 44 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 65b418a630..11ea5bb6f4 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -632,6 +632,16 @@ div#app {
   background: #fff;
 }
 
+.grouping-tbd {
+  align-self: stretch;
+  display: flex;
+  flex-direction: column;
+  padding: 1.5rem 0 1.5rem 0;
+  border-radius: 0.5rem;
+  border: 1px solid var(--light-theme-border-border-subtle-00, #dfdfe1);
+  background: #fff;
+}
+
 .grouping-06 {
   display: flex;
   flex-direction: column;
diff --git a/frontend/src/helpers/ForestClientUserSession.ts b/frontend/src/helpers/ForestClientUserSession.ts
index 6d7040c87a..f19d465b9e 100644
--- a/frontend/src/helpers/ForestClientUserSession.ts
+++ b/frontend/src/helpers/ForestClientUserSession.ts
@@ -73,7 +73,7 @@ class ForestClientUserSession implements SessionProperties {
     if (accessToken) {
       const parsedUser = this.parseJwt(accessToken);
       const address = parsedUser["address"];
-      const streetAddress = JSON.parse(address.formatted);
+      const streetAddress = address !== undefined ? JSON.parse(address.formatted) : {};
 
       this.user = {
         name: parsedUser["custom:idp_display_name"],
diff --git a/frontend/src/pages/FormBCSCPage.vue b/frontend/src/pages/FormBCSCPage.vue
index a248364d43..dec2be82a2 100644
--- a/frontend/src/pages/FormBCSCPage.vue
+++ b/frontend/src/pages/FormBCSCPage.vue
@@ -18,45 +18,42 @@
       We use it to know who we're giving a number to and for communicating with clients. 
     </p>
 
-   
-    <div class="grouping-01">
-      <p class="heading-02">
-        Full name
-      </p>
-      <p class="body-compact-01">
-        {{ formData.businessInformation.businessName }}
-      </p>
+    <div class="grouping-tbd">
+      <div class="cds--css-grid">
+        <div class="cds--css-grid-column cds--sm:col-span-3">
+          <p class="body-compact-01">Full name</p>
+          <p>{{ formData.businessInformation.businessName }}</p>
+        </div>
+        <div class="cds--css-grid-column cds--sm:col-span-3">
+          <p class="body-compact-01">Date of birth</p>
+          <p>{{ formData.businessInformation.birthDate }}</p>
+        </div>
+        <div class="cds--css-grid-column cds--sm:col-span-3">
+          <p class="body-compact-01">Email address</p>
+          <p>{{ formData.location.contacts[0].email }}</p>
+        </div>
+        <div class="cds--css-grid-column cds--sm:col-span-3">
+          <p class="body-compact-01">Address</p>
+          <p>
+            {{ formData.businessInformation.address.streetAddress }} <br />
+            {{ formData.businessInformation.address.city }}, {{ formData.businessInformation.address.province.value }} <br />
+            {{ formData.businessInformation.address.country.text }} <br />
+            {{ formData.businessInformation.address.postalCode }}
+          </p>
+        </div>
+      </div>
     </div>
 
-    <div class="grouping-01">
-      <p class="heading-02">
-        Date of birth
-      </p>
-      <p class="body-compact-01">
-        {{ formData.businessInformation.birthDate }}
-      </p>
-    </div>
+    TODO
 
-    <div class="grouping-01">
-      <p class="heading-02">
-        Address
-      </p>
-      <p class="body-compact-01">
-        {{ formData.businessInformation.address.streetAddress }} <br />
-        {{ formData.businessInformation.address.city }}, {{ formData.businessInformation.address.province.value }} <br />
-        {{ formData.businessInformation.address.country.text }} <br />
-        {{ formData.businessInformation.address.postalCode }}
-      </p>
-    </div>
+    <hr class="divider" />
 
-    <div class="grouping-01">
-      <p class="heading-02">
-        Email address
-      </p>
-      <p class="body-compact-01">
-        {{ formData.location.contacts[0].email }}
-      </p>
-    </div>
+    <span class="heading-04" data-scroll="scroll-0">
+      Contact information
+    </span>
+    <p class="body-compact-01">
+      We need your phone number to communicate with you.
+    </p>
 
     <div class="grouping-01">
       <text-input-component
@@ -69,14 +66,11 @@
       />
     </div>
 
-    <div class="grouping-06">
-
-      <!-- <cds-button kind="tertiary" @click.prevent="goToStep(0)">
-        <span>Edit business information</span>
-        <Edit16 slot="icon" />
-      </cds-button> -->
-    </div>
-
+    <p class="body-compact-01">
+      You can add contacts to the aacount. For example, a person you want to give or receive information on your behalf.
+    </p>
+    
+    TODO
     
   </div>
 </template>
diff --git a/frontend/src/services/ForestClientService.ts b/frontend/src/services/ForestClientService.ts
index 37948cf294..b70416d572 100644
--- a/frontend/src/services/ForestClientService.ts
+++ b/frontend/src/services/ForestClientService.ts
@@ -30,6 +30,8 @@ export const addNewContact = (contacts: Contact[]): number => {
 };
 
 export const toTitleCase = (inputString: string): string => {
+  if (inputString === undefined) 
+    return "";
   return inputString
     .toLowerCase()
     .split(" ")

From 9d5584de9f5735a317ac96eee0d8cc438af3adfb Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 17 Oct 2023 08:38:45 -0300
Subject: [PATCH 300/313] test: fix import

---
 .../components/components/grouping/AddressGroupComponent.cy.ts  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
index 755c3b5678..0e3dfe762d 100644
--- a/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
+++ b/frontend/tests/components/components/grouping/AddressGroupComponent.cy.ts
@@ -1,5 +1,5 @@
 import AddressGroupComponent from '@/components/grouping/AddressGroupComponent.vue'
-import { Address } from '@/dto/ApplyClientNumberDto'
+import type { Address } from '@/dto/ApplyClientNumberDto'
 
 // load app validations
 import '@/helpers/validators/BCeIDFormValidations'

From 68020b3147bd8d831b054299d4f9bc49aed35a6d Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 17 Oct 2023 16:45:39 -0300
Subject: [PATCH 301/313] feat: show loading icon on auto-complete fields

---
 frontend/src/assets/styles/global.scss             | 10 ++++++++++
 .../forms/AutoCompleteInputComponent.vue           | 14 ++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 65b418a630..9da7b82435 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -168,6 +168,16 @@ cds-combo-box:where(:active, :focus)::part(cds--combo-box) {
   outline-offset: -2px;
 }
 
+cds-combo-box-item[data-loading="true"] {
+  display: flex;
+  align-items: center;
+}
+
+cds-combo-box-item[data-loading="true"]::part(cds--list-box__menu-item__option) {
+  padding: 0;
+  border-top: 0;
+}
+
 .top-notification {
   margin-top: 3rem;
   display: flex;
diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index 94be766528..d77550b5a7 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -2,6 +2,7 @@
 import { ref, computed, watch } from "vue";
 // Carbon
 import "@carbon/web-components/es/components/combo-box/index";
+import "@carbon/web-components/es/components/inline-loading/index";
 import type { CDSComboBox } from "@carbon/web-components";
 // Composables
 import { useEventBus } from "@vueuse/core";
@@ -43,6 +44,8 @@ watch(
 //We set the value prop as a reference for update reason
 const inputValue = ref(props.modelValue);
 
+const LOADING_NAME = "loading...";
+
 // This is to make the input list contains the selected value to show when component render
 const inputList = computed<Array<BusinessSearchResult>>(() => {
   if (props.contents?.length > 0) {
@@ -52,7 +55,7 @@ const inputList = computed<Array<BusinessSearchResult>>(() => {
     return [{ name: props.modelValue, code: "", status: "", legalType: "" }]
   } else if (props.modelValue && props.loading) {
     // Just to give a "loading" feedback.
-    return [{ name: "...", code: "", status: "", legalType: "" }];
+    return [{ name: LOADING_NAME, code: "", status: "", legalType: "" }];
   }
   return [];
 });
@@ -168,8 +171,15 @@ const getComboBoxItemValue = (item: CodeNameType) => item.name + (item.code ? na
         :data-id="item.code"
         :data-value="item.name"
         :value="getComboBoxItemValue(item)"
+        v-shadow
+        :data-loading="item.name === LOADING_NAME"
       >
-        {{ item.name }}
+        <template v-if="item.name === LOADING_NAME">
+          <cds-inline-loading />
+        </template>
+        <template v-else>
+          {{ item.name }}
+        </template>
       </cds-combo-box-item>
     </cds-combo-box>
   </div>

From 02669638f8bc8955afc28260c8d2d1b8c3a1ebe3 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 17 Oct 2023 17:03:07 -0300
Subject: [PATCH 302/313] feat: allow some time before showing the loading icon

---
 .../forms/AutoCompleteInputComponent.vue      | 48 ++++++++++++++-----
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/frontend/src/components/forms/AutoCompleteInputComponent.vue b/frontend/src/components/forms/AutoCompleteInputComponent.vue
index d77550b5a7..9224d95b36 100644
--- a/frontend/src/components/forms/AutoCompleteInputComponent.vue
+++ b/frontend/src/components/forms/AutoCompleteInputComponent.vue
@@ -11,17 +11,22 @@ import type { BusinessSearchResult, CodeNameType } from "@/dto/CommonTypesDto";
 import { isEmpty } from "@/dto/CommonTypesDto";
 
 //Define the input properties for this component
-const props = defineProps<{
-  id: string;
-  label: string;
-  tip?: string;
-  placeholder?: string;
-  modelValue: string;
-  contents: Array<BusinessSearchResult>;
-  validations: Array<Function>;
-  errorMessage?: string;
-  loading?: boolean;
-}>();
+const props = withDefaults(defineProps<{
+    id: string;
+    label: string;
+    tip?: string;
+    placeholder?: string;
+    modelValue: string;
+    contents: Array<BusinessSearchResult>;
+    validations: Array<Function>;
+    errorMessage?: string;
+    loading?: boolean;
+    showLoadingAfterTime?: number;
+  }>(),
+  {
+    showLoadingAfterTime: 2000,
+  },
+);
 
 //Events we emit during component lifecycle
 const emit = defineEmits<{
@@ -46,6 +51,25 @@ const inputValue = ref(props.modelValue);
 
 const LOADING_NAME = "loading...";
 
+const showLoadingTimer = ref<number>();
+
+const showLoading = ref(false);
+
+watch(
+  () => props.loading && props.modelValue,
+  (value, oldValue) => {
+    if (oldValue || !value) {
+      clearTimeout(showLoadingTimer.value);
+      showLoading.value = false;
+    }
+    if (value) {
+      showLoadingTimer.value = setTimeout(() => {
+        showLoading.value = true;
+      }, props.showLoadingAfterTime);
+    }
+  },
+)
+
 // This is to make the input list contains the selected value to show when component render
 const inputList = computed<Array<BusinessSearchResult>>(() => {
   if (props.contents?.length > 0) {
@@ -53,7 +77,7 @@ const inputList = computed<Array<BusinessSearchResult>>(() => {
   } else if (props.modelValue !== userValue.value) {
     // Needed when the component mounts with a pre-filled value.
     return [{ name: props.modelValue, code: "", status: "", legalType: "" }]
-  } else if (props.modelValue && props.loading) {
+  } else if (props.modelValue && showLoading.value) {
     // Just to give a "loading" feedback.
     return [{ name: LOADING_NAME, code: "", status: "", legalType: "" }];
   }

From 6f40376f5dff135a4a47f7161eba300bc54a2834 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 17 Oct 2023 17:36:04 -0300
Subject: [PATCH 303/313] chore: add helper text

---
 frontend/src/pages/bceidform/BusinessInformationWizardStep.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
index 3cc90fb9b0..95bba23ca6 100644
--- a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
@@ -229,7 +229,7 @@ watch([selectedOption], () => {
       v-if="selectedOption === BusinessTypeEnum.R"
       id="business"
       label="BC registered business name"
-      tip=""
+      tip="Start typing to search for your BC registered business name"
       v-model="formData.businessInformation.businessName"
       :contents="content"
       :validations="[

From 244f76cceea1e509b974c0a210561c881f698e1d Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 17 Oct 2023 18:42:48 -0300
Subject: [PATCH 304/313] fix: validate multi-select field

---
 .../forms/MultiselectInputComponent.vue         |  9 ++-------
 .../grouping/ContactGroupComponent.vue          |  2 +-
 .../helpers/validators/BCeIDFormValidations.ts  |  5 +++--
 .../src/helpers/validators/GlobalValidators.ts  | 17 +++++++++++++++++
 .../forms/MultiselectInputComponent.spec.ts     | 13 +++++++------
 5 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/forms/MultiselectInputComponent.vue b/frontend/src/components/forms/MultiselectInputComponent.vue
index 536cce2780..cba797898d 100644
--- a/frontend/src/components/forms/MultiselectInputComponent.vue
+++ b/frontend/src/components/forms/MultiselectInputComponent.vue
@@ -56,17 +56,13 @@ const validateInput = (newValue: any) => {
       if (message) return true;
       return false;
     };
-    const validate = (value: string) =>
+    const validate = (value: string[]) =>
       props.validations
         .map((validation) => validation(value))
         .filter(hasError)
         .shift() ?? props.errorMessage;
 
-    error.value =
-      items.value
-        .map((item: string) => validate(item))
-        .filter(hasError)
-        .shift() ?? props.errorMessage;
+    error.value = validate(items.value);
   }
 };
 
@@ -113,7 +109,6 @@ watch(
   () => (error.value = props.errorMessage)
 );
 
-validateInput(selectedValue.value);
 revalidateBus.on(() => validateInput(selectedValue.value));
 </script>
 
diff --git a/frontend/src/components/grouping/ContactGroupComponent.vue b/frontend/src/components/grouping/ContactGroupComponent.vue
index 2133b50f67..5975c79951 100644
--- a/frontend/src/components/grouping/ContactGroupComponent.vue
+++ b/frontend/src/components/grouping/ContactGroupComponent.vue
@@ -110,7 +110,7 @@ const updateContactType = (value: CodeNameType | undefined) => {
     :model-value="addressList"
     :selectedValues="selectedValue.locationNames?.map((location:CodeDescrType) => location?.text)"
     :validations="[
-      ...getValidations('location.contacts.*.locationNames.*.text'),
+      ...getValidations('location.contacts.*.locationNames'),
       submissionValidation(`location.contacts[${id}].locationNames`)
     ]"
     @update:selected-value="
diff --git a/frontend/src/helpers/validators/BCeIDFormValidations.ts b/frontend/src/helpers/validators/BCeIDFormValidations.ts
index a912177457..a95bb4b6ab 100644
--- a/frontend/src/helpers/validators/BCeIDFormValidations.ts
+++ b/frontend/src/helpers/validators/BCeIDFormValidations.ts
@@ -12,6 +12,7 @@ import {
   isNoSpecialCharacters,
   isNot,
   formFieldValidations,
+  isNotEmptyArray,
 } from "@/helpers/validators/GlobalValidators";
 
 
@@ -70,8 +71,8 @@ formFieldValidations[
 ];
 
 // Step 3: Contacts
-formFieldValidations["location.contacts.*.locationNames.*.text"] = [
-  isNotEmpty("You must select at least one location"),
+formFieldValidations["location.contacts.*.locationNames"] = [
+  isNotEmptyArray("You must select at least one location"),
 ];
 formFieldValidations["location.contacts.*.contactType.text"] = [
   isNotEmpty("You must select at least one contact type"),
diff --git a/frontend/src/helpers/validators/GlobalValidators.ts b/frontend/src/helpers/validators/GlobalValidators.ts
index fe67421e8d..b85f49c7bd 100644
--- a/frontend/src/helpers/validators/GlobalValidators.ts
+++ b/frontend/src/helpers/validators/GlobalValidators.ts
@@ -35,6 +35,23 @@ export const isNotEmpty =
     return message;
   };
 
+/**
+ * Checks if the array is not empty
+ * @param array - The array to check
+ * @returns An empty string if the array is not empty, error message otherwise
+ * @example
+ * isNotEmptyArray([]) // false
+ * isNotEmptyArray('a') // true
+ * isNotEmptyArray([' ']) // true
+ * isNotEmptyArray([undefined]) // true
+ */
+export const isNotEmptyArray =
+  (message: string = "This field is required") =>
+  (array: any[]): string => {
+    if (array && array.length > 0) return "";
+    return message;
+  };
+
 /**
  * Checks if the value is an email
  * @param value - The value to check
diff --git a/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts b/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
index 1fa62efed8..6a9f01bd16 100644
--- a/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
@@ -5,12 +5,13 @@ import MultiselectInputComponent from '@/components/forms/MultiselectInputCompon
 
 describe('MultiselectInputComponent', () => {
   const validations = [
-    (value: any) =>
-      value === 'A' || value === 'Value A' ? 'A is not supported' : ''
+    (value: any[]) =>
+      value.includes('A') || value.includes('Value A') ? 'A is not supported' : ''
   ]
 
-  const eventContent = (value:string) => {return { data:  value }}
-
+  const eventContent = (value: string) => {
+    return { data: value }
+  }
 
   it('should render', () => {
     const wrapper = mount(MultiselectInputComponent, {
@@ -128,7 +129,7 @@ describe('MultiselectInputComponent', () => {
 
     const dropdown = wrapper.find('cds-multi-select')
 
-    await dropdown.trigger('cds-multi-select-selected',eventContent('Value A'))
+    await dropdown.trigger('cds-multi-select-selected', eventContent('Value A'))
 
     expect(wrapper.emitted('update:modelValue')).toBeTruthy()
     expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual(['Value A'])
@@ -142,7 +143,7 @@ describe('MultiselectInputComponent', () => {
     ])
 
     expect(wrapper.emitted('error')).toBeTruthy()
-    expect(wrapper.emitted('error')![1][0]).toBe('A is not supported')
+    expect(wrapper.emitted('error')![0][0]).toBe('A is not supported')
   })
 
   it('should validate and emit no error if required', async () => {

From e8d74c4d60d5f936ff6fa237383d6fe8ccb29dd8 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Tue, 17 Oct 2023 19:55:11 -0300
Subject: [PATCH 305/313] fix: remove deleted address from contacts

---
 .../src/pages/bceidform/AddressWizardStep.vue    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/frontend/src/pages/bceidform/AddressWizardStep.vue b/frontend/src/pages/bceidform/AddressWizardStep.vue
index 015eefb65c..d687c18931 100644
--- a/frontend/src/pages/bceidform/AddressWizardStep.vue
+++ b/frontend/src/pages/bceidform/AddressWizardStep.vue
@@ -38,8 +38,22 @@ const updateAddress = (value: Address | undefined, index: number) => {
     if (value) formData.location.addresses[index] = value;
     else {
       const addressesCopy: Address[] = [...formData.location.addresses];
-      addressesCopy.splice(index, 1);
+      const removedAddressArray = addressesCopy.splice(index, 1);
       formData.location.addresses = addressesCopy;
+
+      // Remove the deleted address from the contacts that are associated to it.
+      // (the condition is just a sanity check)
+      if (removedAddressArray.length > 0) {
+        const removedAddress = removedAddressArray[0];
+        formData.location.contacts.forEach(contact => {
+          const indexWithinContact = contact.locationNames.findIndex(
+            (locationName) => locationName.text === removedAddress.locationName,
+          );
+          if (indexWithinContact !== -1) {
+            contact.locationNames.splice(indexWithinContact, 1);
+          } 
+        })
+      }
     }
     revalidate.value = !revalidate.value;
   }

From dd1573dcf7d12c72c3c074854188519b2c6ce8d0 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Tue, 17 Oct 2023 21:55:30 -0700
Subject: [PATCH 306/313] Fast commit to switch branches

---
 frontend/src/pages/FormBCSCPage.vue | 123 ++++++++++++++++++++++++++--
 1 file changed, 115 insertions(+), 8 deletions(-)

diff --git a/frontend/src/pages/FormBCSCPage.vue b/frontend/src/pages/FormBCSCPage.vue
index dec2be82a2..4b3231ac63 100644
--- a/frontend/src/pages/FormBCSCPage.vue
+++ b/frontend/src/pages/FormBCSCPage.vue
@@ -9,7 +9,9 @@
         New client application
       </span>
     </div>
-    
+  </div>
+   
+  <div class="form-steps-section">
     <span class="heading-04" data-scroll="scroll-0">
       Personal information
     </span>
@@ -67,25 +69,40 @@
     </div>
 
     <p class="body-compact-01">
-      You can add contacts to the aacount. For example, a person you want to give or receive information on your behalf.
+      You can add contacts to the account. For example, a person you want to give or receive information on your behalf.
     </p>
     
-    TODO
-    
+    <cds-button
+      kind="tertiary"
+      @click.prevent="addContact"
+      v-if="formData.location.contacts.length < 5">
+      <span>Add another contact</span>
+      <Add16 slot="icon" />
+    </cds-button>
+
+    {{ formData.location.contacts }}
   </div>
+
 </template>
 
 
 <script setup lang="ts">
-import { reactive, watch, toRef, ref, getCurrentInstance, computed } from "vue";
+import { reactive, watch, ref, getCurrentInstance, computed, onMounted } from "vue";
 import { newFormDataDto } from "@/dto/ApplyClientNumberDto";
-import { BusinessTypeEnum, ClientTypeEnum, CodeNameType, LegalTypeEnum } from "@/dto/CommonTypesDto";
+import { BusinessTypeEnum, ClientTypeEnum, LegalTypeEnum } from "@/dto/CommonTypesDto";
 import { useFetchTo } from "@/composables/useFetch";
-import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
+import { useEventBus } from "@vueuse/core";
+import { useFocus } from "@/composables/useFocus";
 import { codeConversionFn } from "@/services/ForestClientService";
+import { emptyContact } from "@/dto/ApplyClientNumberDto";
+import { isUniqueDescriptive } from "@/helpers/validators/GlobalValidators";
+import type { FormDataDto, Contact } from "@/dto/ApplyClientNumberDto";
+import type { CodeNameType, ModalNotification } from "@/dto/CommonTypesDto";
+import Add16 from "@carbon/icons-vue/es/add/16";
 
 const instance = getCurrentInstance();
 const session = instance?.appContext.config.globalProperties.$session;
+const { setFocusedComponent } = useFocus();
 
 const submitterContact: Contact = {
   locationNames: [],
@@ -127,7 +144,6 @@ let formData = reactive<FormDataDto>({
   },
 });
 
-
 const receviedCountry = ref({} as CodeNameType);
 
 useFetchTo(`/api/clients/getCountryByCode/${session?.user?.address?.country?.code}`, 
@@ -150,4 +166,95 @@ watch(country, (newValue) => {
 
   formData.location.addresses.push(formData.businessInformation.address);
 });
+
+//New contact being added
+const otherContacts = computed(() => formData.location.contacts.slice(1));
+const addContact = (autoFocus = true) => {
+  const newLength = formData.location.contacts.push(
+    JSON.parse(JSON.stringify(emptyContact))
+  );
+  if (autoFocus) {
+    const focusIndex = newLength - 1;
+    setFocusedComponent(`addressname_${focusIndex}`);
+  }
+  return newLength;
+};
+
+const uniqueValues = isUniqueDescriptive();
+
+const removeContact = (index: number) => () => {
+  updateContact(undefined, index);
+  delete validation[index];
+  uniqueValues.remove("Name", index + "");
+  bus.emit({
+    active: false,
+    message: "",
+    kind: "",
+    toastTitle: "",
+    handler: () => {},
+  });
+};
+
+const revalidate = ref(false);
+
+const updateContact = (value: Contact | undefined, index: number) => {
+  if (index < formData.location.contacts.length) {
+    if (value) formData.location.contacts[index] = value;
+    else {
+      const contactCopy: Contact[] = [...formData.location.contacts];
+      contactCopy.splice(index, 1);
+      formData.location.contacts = contactCopy;
+    }
+  }
+  revalidate.value = !revalidate.value;
+};
+
+//Validation
+const validation = reactive<Record<string, boolean>>({
+  0: false,
+});
+
+const updateValidState = (index: number, valid: boolean) => {
+  if (validation[index] !== valid) {
+    validation[index] = valid;
+  }
+};
+
+const checkValid = () =>
+  Object.values(validation).reduce(
+    (accumulator: boolean, currentValue: boolean) =>
+      accumulator && currentValue,
+    true
+  );
+
+const emit = defineEmits<{
+  (e: "update:data", value: FormDataDto): void;
+  (e: "valid", value: boolean): void;
+}>();
+
+
+watch([validation], () => emit("valid", checkValid()));
+emit("valid", false);
+
+const bus = useEventBus<ModalNotification>("modal-notification");
+
+const handleRemove = (index: number) => {
+  const selectedContact =
+    formData.location.contacts[index].firstName.length !== 0
+      ? `${formData.location.contacts[index].firstName} ${formData.location.contacts[index].lastName}`
+      : "Contact #" + index;
+  bus.emit({
+    message: selectedContact,
+    kind: "Contact deleted",
+    toastTitle: "The additional contact was deleted",
+    handler: removeContact(index),
+    active: true,
+  });
+};
+
+//onMounted(() => setFocusedComponent("addressname_0", 800));
+
+defineExpose({
+  addContact,
+});
 </script>

From 10f0769a345a58c95d3dca1956ac096fdee4eb10 Mon Sep 17 00:00:00 2001
From: Fernando Terra <fernando.terra@encora.com>
Date: Wed, 18 Oct 2023 11:28:47 -0300
Subject: [PATCH 307/313] chore: small fix to remove extra spaces on the first
 step

---
 frontend/src/assets/styles/global.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/assets/styles/global.scss b/frontend/src/assets/styles/global.scss
index 9da7b82435..7c7c19d623 100644
--- a/frontend/src/assets/styles/global.scss
+++ b/frontend/src/assets/styles/global.scss
@@ -431,7 +431,7 @@ div#app {
 
 .content {
   flex-grow: 1;
-  align-self: stretch;
+  align-self: flex-start;
   display: flex;
   flex-direction: column;
   gap: 3rem;

From bdb0dccc885376bcfa493ae2b58250405ce260df Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 19 Oct 2023 11:38:38 -0700
Subject: [PATCH 308/313] - Made code reviews - Improve code and made it more
 genetic

---
 frontend/cypress/e2e/FormGeneral.cy.ts        | 161 ++++++++++--------
 frontend/src/CoreConstants.ts                 |   4 +
 .../src/components/MainHeaderComponent.vue    |  14 +-
 frontend/src/pages/FormBCeIDPage.vue          |  33 ++--
 .../src/pages/bceidform/AddressWizardStep.vue |   8 +-
 .../stub/__files/response-autocomplete.json   |   6 +-
 6 files changed, 125 insertions(+), 101 deletions(-)

diff --git a/frontend/cypress/e2e/FormGeneral.cy.ts b/frontend/cypress/e2e/FormGeneral.cy.ts
index 1b50ad2b98..3f337e7550 100644
--- a/frontend/cypress/e2e/FormGeneral.cy.ts
+++ b/frontend/cypress/e2e/FormGeneral.cy.ts
@@ -1,114 +1,125 @@
 /* eslint-disable no-undef */
-describe('General Form', () => {
+describe("General Form", () => {
   beforeEach(() => {
-    cy.intercept('http://localhost:8080/api/clients/name/*', {
-      fixture: 'business.json',
-    }).as('searchCompany')
+    cy.intercept("http://localhost:8080/api/clients/name/*", {
+      fixture: "business.json",
+    }).as("searchCompany");
 
-    cy.intercept('GET', '/api/clients/XX9016140', {
-      fixture: 'example.json',
-    }).as('selectCompany')
-  })
+    cy.intercept("GET", "/api/clients/XX9016140", {
+      fixture: "example.json",
+    }).as("selectCompany");
+  });
 
-  it('should render the component', () => {
-    cy.visit('/')
-    cy.get('#landing-title').should('contain', 'Client Management System')
+  it("should render the component", () => {
+    cy.visit("/");
+    cy.get("#landing-title").should("contain", "Client Management System");
 
-    cy.get('#landing-subtitle').should('contain', 'Create and manage client accounts')
-  })
+    cy.get("#landing-subtitle").should(
+      "contain",
+      "Create and manage client accounts"
+    );
+  });
 
-  it('should render the form', () => {
-    cy.visit('/')
-    cy.wait(500)
+  it("should render the form", () => {
+    cy.visit("/");
+    cy.wait(500);
 
-    cy.login('uattest@forest.client', 'Uat Test', 'bceidbusiness')
+    cy.login("uattest@forest.client", "Uat Test", "bceidbusiness");
 
-    cy.get('#business').should('not.exist')
+    cy.get("#business").should("not.exist");
 
-    cy.get('cds-inline-notification').should('not.exist')
+    cy.get("cds-inline-notification").should("not.exist");
 
     cy.get(
-      '[label-text="I have a BC registered business (corporation, sole proprietorship, society, etc.)"]',
+      '[label-text="I have a BC registered business (corporation, sole proprietorship, society, etc.)"]'
     )
-      .should('be.visible')
-      .click()
+      .should("be.visible")
+      .click();
 
-    cy.get('cds-inline-notification').should('be.visible')
+    cy.get("cds-inline-notification").should("be.visible");
 
-    cy.get('#business')
-      .should('be.visible')
+    cy.get("#business")
+      .should("be.visible")
       .shadow()
-      .find('input')
-      .should('have.value', '')
-      .type('Valid Company')
-    cy.wait('@searchCompany')
+      .find("input")
+      .should("have.value", "")
+      .type("Valid Company");
+    cy.wait("@searchCompany");
 
-    cy.get('cds-combo-box-item[data-id="XX9016140"]').click()
+    cy.get('cds-combo-box-item[data-id="XX9016140"]').click();
 
-    cy.wait('@selectCompany')
+    cy.wait("@selectCompany");
 
-    cy.get('[data-test="wizard-next-button"]').should('be.visible').click()
+    cy.get('[data-test="wizard-next-button"]').should("be.visible").click();
 
-    cy.logout()
-  })
+    cy.logout();
+  });
 
-  describe('Progress Indicator', () => {
-    type Orientation = 'horizontal' | 'vertical'
+  describe("Progress Indicator", () => {
+    type Orientation = "horizontal" | "vertical";
     beforeEach(() => {
-      cy.visit('/')
-      cy.wait(500)
+      cy.visit("/");
+      cy.wait(500);
 
-      cy.login('uattest@forest.client', 'Uat Test', 'bceidbusiness')
-    })
-    ;[
+      cy.login("uattest@forest.client", "Uat Test", "bceidbusiness");
+    });
+    [
       {
         viewportWidth: 400,
-        orientation: 'vertical',
+        orientation: "vertical",
       },
       {
         viewportWidth: 671,
-        orientation: 'vertical',
+        orientation: "vertical",
       },
       {
         viewportWidth: 672,
-        orientation: 'horizontal',
+        orientation: "horizontal",
       },
       {
         viewportWidth: 1200,
-        orientation: 'horizontal',
+        orientation: "horizontal",
       },
     ].forEach(({ viewportWidth, orientation }) => {
       describe(`when viewport width is ${viewportWidth}`, () => {
         before(() => {
-          const viewportHeight = 600
-          cy.viewport(viewportWidth, viewportHeight)
-        })
+          const viewportHeight = 600;
+          cy.viewport(viewportWidth, viewportHeight);
+        });
         it(`should display steps ${orientation}ly`, () => {
-          cy.contains('Step 1').as('step1')
-          cy.contains('Step 2').as('step2')
-          cy.contains('Step 3').as('step3')
-          cy.contains('Step 4').as('step4')
-
-          cy.getMany(['@step1', '@step2', '@step3', '@step4']).then(([...elements]) => {
-            const rects = (elements as JQuery<HTMLElement>[]).map((el) => {
-              return el.get(0).getBoundingClientRect()
-            })
-            if (orientation === 'horizontal') {
-              expect(rects[0].top).to.eq(rects[1].top).and.eq(rects[2].top).and.eq(rects[3].top)
-
-              expect(rects[0].left).to.be.lessThan(rects[1].left)
-              expect(rects[1].left).to.be.lessThan(rects[2].left)
-              expect(rects[2].left).to.be.lessThan(rects[3].left)
-            } else {
-              expect(rects[0].left).to.eq(rects[1].left).and.eq(rects[2].left).and.eq(rects[3].left)
-
-              expect(rects[0].top).to.be.lessThan(rects[1].top)
-              expect(rects[1].top).to.be.lessThan(rects[2].top)
-              expect(rects[2].top).to.be.lessThan(rects[3].top)
+          cy.contains("Step 1").as("step1");
+          cy.contains("Step 2").as("step2");
+          cy.contains("Step 3").as("step3");
+          cy.contains("Step 4").as("step4");
+
+          cy.getMany(["@step1", "@step2", "@step3", "@step4"]).then(
+            ([...elements]) => {
+              const rects = (elements as JQuery<HTMLElement>[]).map((el) => {
+                return el.get(0).getBoundingClientRect();
+              });
+              if (orientation === "horizontal") {
+                expect(rects[0].top)
+                  .to.eq(rects[1].top)
+                  .and.eq(rects[2].top)
+                  .and.eq(rects[3].top);
+
+                expect(rects[0].left).to.be.lessThan(rects[1].left);
+                expect(rects[1].left).to.be.lessThan(rects[2].left);
+                expect(rects[2].left).to.be.lessThan(rects[3].left);
+              } else {
+                expect(rects[0].left)
+                  .to.eq(rects[1].left)
+                  .and.eq(rects[2].left)
+                  .and.eq(rects[3].left);
+
+                expect(rects[0].top).to.be.lessThan(rects[1].top);
+                expect(rects[1].top).to.be.lessThan(rects[2].top);
+                expect(rects[2].top).to.be.lessThan(rects[3].top);
+              }
             }
-          })
-        })
-      })
-    })
-  })
-})
+          );
+        });
+      });
+    });
+  });
+});
diff --git a/frontend/src/CoreConstants.ts b/frontend/src/CoreConstants.ts
index 2142104eae..75e151c4c2 100644
--- a/frontend/src/CoreConstants.ts
+++ b/frontend/src/CoreConstants.ts
@@ -1,4 +1,5 @@
 import { version } from "../package.json";
+import { useMediaQuery } from "@vueuse/core";
 
 export const checkEnv = (key: string) =>
   window.localStorage.getItem(key) || import.meta.env[key];
@@ -15,3 +16,6 @@ export const appVersion = version;
 // constant
 export const maxFileSizePerFile = 1000000 * 20; // 20 mb
 export const maxTotalFileSize = 1000000 * 20 * 5; // 100 mb
+
+export const isSmallScreen = useMediaQuery("(max-width: 671px)");
+export const isMediumScreen = useMediaQuery("(min-width: 672px) and (max-width: 1055px)");
diff --git a/frontend/src/components/MainHeaderComponent.vue b/frontend/src/components/MainHeaderComponent.vue
index bfebc912f4..b71fa52760 100644
--- a/frontend/src/components/MainHeaderComponent.vue
+++ b/frontend/src/components/MainHeaderComponent.vue
@@ -1,23 +1,19 @@
 <script setup lang="ts">
-import { ref } from 'vue';
-import { useMediaQuery } from '@vueuse/core';
+import { ref } from "vue";
 // Carbon
-import '@carbon/web-components/es/components/button/index';
+import "@carbon/web-components/es/components/button/index";
 // Types
-import { nodeEnv, appVersion } from '@/CoreConstants';
+import { nodeEnv, appVersion, isSmallScreen } from "@/CoreConstants";
 // @ts-ignore
-import Logout16 from '@carbon/icons-vue/es/logout/16';
+import Logout16 from "@carbon/icons-vue/es/logout/16";
 // @ts-ignore
-import Help16 from '@carbon/icons-vue/es/help/16';
+import Help16 from "@carbon/icons-vue/es/help/16";
 
 const envPrefix = "openshift-";
 const env = ref(nodeEnv);
 env.value = env.value.slice(envPrefix.length);
 env.value = env.value.charAt(0).toUpperCase() + env.value.slice(1);
 
-const isSmallScreen = useMediaQuery('(max-width: 671px)')
-const isMediumScreen = useMediaQuery('(min-width: 672px) and (max-width: 1055px)')
-
 const helpModalActive = ref(false);
 const logoutModalActive = ref(false);
 </script>
diff --git a/frontend/src/pages/FormBCeIDPage.vue b/frontend/src/pages/FormBCeIDPage.vue
index b767c4e195..8c39d1031d 100644
--- a/frontend/src/pages/FormBCeIDPage.vue
+++ b/frontend/src/pages/FormBCeIDPage.vue
@@ -6,7 +6,7 @@ import "@carbon/web-components/es/components/progress-indicator/index";
 import "@carbon/web-components/es/components/notification/index";
 import "@carbon/web-components/es/components/tooltip/index";
 // Composables
-import { useEventBus, useMediaQuery } from "@vueuse/core";
+import { useEventBus } from "@vueuse/core";
 import { useRouter } from "vue-router";
 import { useFocus } from "@/composables/useFocus";
 import { usePost } from "@/composables/useFetch";
@@ -23,6 +23,7 @@ import type {
   ProgressNotification,
   CodeDescrType,
 } from "@/dto/CommonTypesDto";
+import { isSmallScreen } from "@/CoreConstants";
 // Imported User session
 import ForestClientUserSession from "@/helpers/ForestClientUserSession";
 // Imported global validations
@@ -41,11 +42,18 @@ import LogOut16 from "@carbon/icons-vue/es/logout/16";
 // @ts-ignore
 import Check16 from "@carbon/icons-vue/es/checkmark/16";
 
-const errorBus = useEventBus<ValidationMessageType[]>("submission-error-notification");
-const notificationBus = useEventBus<ValidationMessageType | undefined>("error-notification");
-const exitBus = useEventBus<Record<string, boolean | null>>("exit-notification");
+const errorBus = useEventBus<ValidationMessageType[]>(
+  "submission-error-notification"
+);
+const notificationBus = useEventBus<ValidationMessageType | undefined>(
+  "error-notification"
+);
+const exitBus =
+  useEventBus<Record<string, boolean | null>>("exit-notification");
 const revalidateBus = useEventBus<void>("revalidate-bus");
-const progressIndicatorBus = useEventBus<ProgressNotification>("progress-indicator-bus");
+const progressIndicatorBus = useEventBus<ProgressNotification>(
+  "progress-indicator-bus"
+);
 
 const router = useRouter();
 const { setScrollPoint, setFocusedComponent } = useFocus();
@@ -221,9 +229,16 @@ const checkStepValidity = (stepNumber: number): boolean => {
     }
   });
 
-  if(!progressData[stepNumber]
-    .extraValidations
-    .every((validation: any) => runValidation(validation.field, formData, validation.validation, true, true))
+  if (
+    !progressData[stepNumber].extraValidations.every((validation: any) =>
+      runValidation(
+        validation.field,
+        formData,
+        validation.validation,
+        true,
+        true
+      )
+    )
   )
     return false;
 
@@ -337,8 +352,6 @@ const scrollToNewContact = () => {
     });
   }
 };
-
-const isSmallScreen = useMediaQuery("(max-width: 671px)");
 </script>
 
 <template>
diff --git a/frontend/src/pages/bceidform/AddressWizardStep.vue b/frontend/src/pages/bceidform/AddressWizardStep.vue
index d687c18931..946d83faa3 100644
--- a/frontend/src/pages/bceidform/AddressWizardStep.vue
+++ b/frontend/src/pages/bceidform/AddressWizardStep.vue
@@ -45,14 +45,14 @@ const updateAddress = (value: Address | undefined, index: number) => {
       // (the condition is just a sanity check)
       if (removedAddressArray.length > 0) {
         const removedAddress = removedAddressArray[0];
-        formData.location.contacts.forEach(contact => {
+        formData.location.contacts.forEach((contact) => {
           const indexWithinContact = contact.locationNames.findIndex(
-            (locationName) => locationName.text === removedAddress.locationName,
+            (locationName) => locationName.text === removedAddress.locationName
           );
           if (indexWithinContact !== -1) {
             contact.locationNames.splice(indexWithinContact, 1);
-          } 
-        })
+          }
+        });
       }
     }
     revalidate.value = !revalidate.value;
diff --git a/frontend/stub/__files/response-autocomplete.json b/frontend/stub/__files/response-autocomplete.json
index a0a81e88a3..1dabf8f736 100644
--- a/frontend/stub/__files/response-autocomplete.json
+++ b/frontend/stub/__files/response-autocomplete.json
@@ -42,9 +42,9 @@
     "legalType": "GP"
   },
   {
-    "code":"FM1234567",
-    "name":"The Great Pacific  Forest Company",
-    "status":"ACTIVE",
+    "code": "FM1234567",
+    "name": "The Great Pacific  Forest Company",
+    "status": "ACTIVE",
     "legalType": "SP"
   }
 ]

From b0ec22156ea1168f178d1866de12d8bb2db7b40a Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 19 Oct 2023 13:08:45 -0700
Subject: [PATCH 309/313] Made code reviews

---
 .../forms/AutoCompleteInputComponent.spec.ts  | 253 ++++++------
 .../forms/DropdownInputComponent.spec.ts      | 361 +++++++++---------
 .../forms/MultiselectInputComponent.spec.ts   | 331 ++++++++--------
 .../forms/RadioInputComponent.spec.ts         | 130 +++----
 .../forms/TextInputComponent.spec.ts          | 155 ++++----
 5 files changed, 646 insertions(+), 584 deletions(-)

diff --git a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
index 0ffb90d1d7..a432f3f9ce 100644
--- a/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/AutoCompleteInputComponent.spec.ts
@@ -1,230 +1,245 @@
-import { describe, it, expect, beforeEach } from 'vitest'
+import { describe, it, expect, beforeEach } from "vitest";
 
-import { VueWrapper, mount } from '@vue/test-utils'
-import AutoCompleteInputComponent from '@/components/forms/AutoCompleteInputComponent.vue'
-import CDSComboBox from "@carbon/web-components/es/components/combo-box/combo-box"
-import { isMinSize } from '@/helpers/validators/GlobalValidators'
+import { VueWrapper, mount } from "@vue/test-utils";
+import AutoCompleteInputComponent from "@/components/forms/AutoCompleteInputComponent.vue";
+import CDSComboBox from "@carbon/web-components/es/components/combo-box/combo-box";
+import { isMinSize } from "@/helpers/validators/GlobalValidators";
 
-describe('Auto Complete Input Component', () => {
-  const id = 'my-input'
-  const validations = [(value: any) => (value ? '' : 'Field is required')]
+describe("Auto Complete Input Component", () => {
+  const id = "my-input";
+  const validations = [(value: any) => (value ? "" : "Field is required")];
   const contents = [
-    { code: 'TA', name: 'TANGO' },
-    { code: 'TB', name: 'TAMBOR' },
-    { code: 'TC', name: 'TAMCADA' },
-    { code: 'TD', name: 'TADANARA' }
-  ]
-  const eventContent = (value:string) => {return { detail: { item: { 'data-id': value, getAttribute: (key:string) => value } }}}
-
-  it('renders the input field with the provided id', () => {
+    { code: "TA", name: "TANGO" },
+    { code: "TB", name: "TAMBOR" },
+    { code: "TC", name: "TAMCADA" },
+    { code: "TD", name: "TADANARA" },
+  ];
+  const eventContent = (value: string) => {
+    return {
+      detail: {
+        item: { "data-id": value, getAttribute: (key: string) => value },
+      },
+    };
+  };
+
+  it("renders the input field with the provided id", () => {
     const wrapper = mount(AutoCompleteInputComponent, {
       props: {
         id,
-        modelValue: '',
+        modelValue: "",
         contents,
         validations: [],
-        label: id
-      }
-    })
-
-    expect(wrapper.find(`#${id}`).exists()).toBe(true)
+        label: id,
+      },
+    });
 
-  })
+    expect(wrapper.find(`#${id}`).exists()).toBe(true);
+  });
 
   it('emits the "update" event with the updated value', async () => {
     const wrapper = mount(AutoCompleteInputComponent, {
       props: {
         id,
-        modelValue: '',
+        modelValue: "",
         contents,
         validations: [],
         label: id,
-        tip: ''
-      }
-    })
+        tip: "",
+      },
+    });
 
-    await wrapper.setProps({ modelValue: 'TANGO' })
-    await wrapper.find(`#${id}`).trigger('blur')
-    await wrapper.find(`#${id}`).trigger('input')
+    await wrapper.setProps({ modelValue: "TANGO" });
+    await wrapper.find(`#${id}`).trigger("blur");
+    await wrapper.find(`#${id}`).trigger("input");
 
-    expect(wrapper.emitted('update:model-value')).toBeTruthy()
-    expect(wrapper.emitted('update:model-value')![0][0]).toEqual('TANGO')
-  })
+    expect(wrapper.emitted("update:model-value")).toBeTruthy();
+    expect(wrapper.emitted("update:model-value")![0][0]).toEqual("TANGO");
+  });
 
   it('emits the "error" event when there is a validation error', async () => {
     const wrapper = mount(AutoCompleteInputComponent, {
       props: {
         id,
-        modelValue: '',
+        modelValue: "",
         contents,
         validations,
-        label: id
-      }
-    })
+        label: id,
+      },
+    });
 
-    await wrapper.find(`#${id}`).trigger('input')
-    await wrapper.find(`#${id}`).trigger('blur')
+    await wrapper.find(`#${id}`).trigger("input");
+    await wrapper.find(`#${id}`).trigger("blur");
 
-    expect(wrapper.emitted('error')).toBeTruthy()
-    expect(wrapper.emitted('error')![0][0]).toBe('Field is required')
-  })
+    expect(wrapper.emitted("error")).toBeTruthy();
+    expect(wrapper.emitted("error")![0][0]).toBe("Field is required");
+  });
 
   it('emits the "error" event even when the error message is the same as before', async () => {
-    const errorMessage = 'sample error message'
+    const errorMessage = "sample error message";
     const wrapper = mount(AutoCompleteInputComponent, {
       props: {
         id,
-        modelValue: '',
+        modelValue: "",
         contents,
         validations: [isMinSize(errorMessage)(5)],
         label: id,
-      }
-    })
+      },
+    });
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = 'a'
-    await wrapper.find(`#${id}`).trigger('input')
-    await wrapper.find(`#${id}`).trigger('blur')
+    wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = "a";
+    await wrapper.find(`#${id}`).trigger("input");
+    await wrapper.find(`#${id}`).trigger("blur");
 
-    expect(wrapper.emitted('error')).toBeTruthy()
-    expect(wrapper.emitted('error')).toHaveLength(1)
-    expect(wrapper.emitted('error')![0][0]).toBe(errorMessage)
+    expect(wrapper.emitted("error")).toBeTruthy();
+    expect(wrapper.emitted("error")).toHaveLength(1);
+    expect(wrapper.emitted("error")![0][0]).toBe(errorMessage);
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = 'ab' // adds another character
-    await wrapper.find(`#${id}`).trigger('input')
-    await wrapper.find(`#${id}`).trigger('blur')
+    wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = "ab"; // adds another character
+    await wrapper.find(`#${id}`).trigger("input");
+    await wrapper.find(`#${id}`).trigger("blur");
 
-    expect(wrapper.emitted('error')).toHaveLength(2)
-    expect(wrapper.emitted('error')![1][0]).toBe(errorMessage)
-  })
+    expect(wrapper.emitted("error")).toHaveLength(2);
+    expect(wrapper.emitted("error")![1][0]).toBe(errorMessage);
+  });
 
   it('emits the "empty" event when the input field is empty', async () => {
     const wrapper = mount(AutoCompleteInputComponent, {
       props: {
         id,
-        modelValue: '',
+        modelValue: "",
         contents,
         validations: [],
-        label: id
-      }
-    })
+        label: id,
+      },
+    });
 
-    await wrapper.find(`#${id}`).trigger('input')
-    await wrapper.find(`#${id}`).trigger('blur')
+    await wrapper.find(`#${id}`).trigger("input");
+    await wrapper.find(`#${id}`).trigger("blur");
 
-    expect(wrapper.emitted('empty')).toBeTruthy()
-    expect(wrapper.emitted('empty')![0][0]).toBe(true)
-  })
+    expect(wrapper.emitted("empty")).toBeTruthy();
+    expect(wrapper.emitted("empty")![0][0]).toBe(true);
+  });
 
   it('emits the "empty" event with false when the input field is not empty', async () => {
     const wrapper = mount(AutoCompleteInputComponent, {
       props: {
         id,
-        modelValue: '',
+        modelValue: "",
         contents,
         validations: [],
-        label: id
-      }
-    })
+        label: id,
+      },
+    });
 
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = 'a'
-    await wrapper.find(`#${id}`).trigger('input')
-    await wrapper.find(`#${id}`).trigger('blur')
+    wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = "a";
+    await wrapper.find(`#${id}`).trigger("input");
+    await wrapper.find(`#${id}`).trigger("blur");
 
-    expect(wrapper.emitted('empty')).toHaveLength(2)
-    expect(wrapper.emitted('empty')![1][0]).toBe(false)
-  })
+    expect(wrapper.emitted("empty")).toHaveLength(2);
+    expect(wrapper.emitted("empty")![1][0]).toBe(false);
+  });
 
-  describe('when the contents prop is empty', () => {
-    const emptyContents: any[] = []
+  describe("when the contents prop is empty", () => {
+    const emptyContents: any[] = [];
     it('emits "empty" when the input becomes empty', async () => {
       const wrapper = mount(AutoCompleteInputComponent, {
         props: {
           id,
-          modelValue: 'a',
+          modelValue: "a",
           contents: emptyContents,
           validations: [],
           label: id,
         },
-      })
+      });
 
       // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-ignore
-      wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = ''
-      await wrapper.find(`#${id}`).trigger('input')
+      wrapper.find<CDSComboBox>(`#${id}`).element._filterInputValue = "";
+      await wrapper.find(`#${id}`).trigger("input");
 
-      expect(wrapper.emitted('empty')).toBeTruthy()
+      expect(wrapper.emitted("empty")).toBeTruthy();
 
       // the first event is from the initialization
-      expect(wrapper.emitted('empty')![0][0]).toBe(false)
+      expect(wrapper.emitted("empty")![0][0]).toBe(false);
 
       // the second event is the result from changing the input value
       // Note: before FSADT1-912, it would emit a "not empty" (false) one.
-      expect(wrapper.emitted('empty')![1][0]).toBe(true)
+      expect(wrapper.emitted("empty")![1][0]).toBe(true);
 
-      expect(wrapper.emitted('empty')).toHaveLength(2)
-    })
-  })
+      expect(wrapper.emitted("empty")).toHaveLength(2);
+    });
+  });
 
   it('emits the "update:selected-value" event when an option from the list is clicked', async () => {
     const wrapper = mount(AutoCompleteInputComponent, {
       props: {
         id,
-        modelValue: '',
+        modelValue: "",
         contents,
         validations: [],
-        label: id
-      }
-    })
+        label: id,
+      },
+    });
 
-    await wrapper.find(`#${id}`).trigger('cds-combo-box-selected',eventContent('TA'));
-    expect(wrapper.emitted('update:selected-value')).toBeTruthy()
-    expect(wrapper.emitted('update:selected-value')![0][0]).toEqual(contents[0])
-  })
+    await wrapper
+      .find(`#${id}`)
+      .trigger("cds-combo-box-selected", eventContent("TA"));
+    expect(wrapper.emitted("update:selected-value")).toBeTruthy();
+    expect(wrapper.emitted("update:selected-value")![0][0]).toEqual(
+      contents[0]
+    );
+  });
 
-  describe('when an option was previously selected', () => {
-    let wrapper: VueWrapper<any, any>
+  describe("when an option was previously selected", () => {
+    let wrapper: VueWrapper<any, any>;
 
     beforeEach(async () => {
       wrapper = mount(AutoCompleteInputComponent, {
         props: {
           id,
-          modelValue: '',
+          modelValue: "",
           contents,
           validations: [],
-          label: id
-        }
-      })
+          label: id,
+        },
+      });
 
-      await wrapper.find(`#${id}`).trigger('cds-combo-box-selected',eventContent(contents[0].code));
+      await wrapper
+        .find(`#${id}`)
+        .trigger("cds-combo-box-selected", eventContent(contents[0].code));
 
       // Now an option is effectively selected
-      expect(wrapper.emitted('update:selected-value')).toBeTruthy()
-      expect(wrapper.emitted('update:selected-value')![0][0]).toEqual(
+      expect(wrapper.emitted("update:selected-value")).toBeTruthy();
+      expect(wrapper.emitted("update:selected-value")![0][0]).toEqual(
         contents[0]
-      )
-    })
+      );
+    });
 
     it('emits the "update:selected-value" with undefined when user types something in the input field', async () => {
       // adding a 'Z' character to the end of the original value so to trigger an update:model-value
-      await wrapper.setProps({ modelValue: 'TANGOZ' })
+      await wrapper.setProps({ modelValue: "TANGOZ" });
 
-      expect(wrapper.emitted('update:selected-value')).toHaveLength(2)
-      expect(wrapper.emitted('update:selected-value')![1][0]).toEqual(undefined)
-    })
+      expect(wrapper.emitted("update:selected-value")).toHaveLength(2);
+      expect(wrapper.emitted("update:selected-value")![1][0]).toEqual(
+        undefined
+      );
+    });
 
     it('emits the "update:selected-value" with the newly selected value', async () => {
-      await wrapper.find(`#${id}`).trigger('cds-combo-box-selected',eventContent(contents[1].code));
+      await wrapper
+        .find(`#${id}`)
+        .trigger("cds-combo-box-selected", eventContent(contents[1].code));
 
-      expect(wrapper.emitted('update:selected-value')).toHaveLength(2)
-      expect(wrapper.emitted('update:selected-value')![1][0]).toEqual(
+      expect(wrapper.emitted("update:selected-value")).toHaveLength(2);
+      expect(wrapper.emitted("update:selected-value")![1][0]).toEqual(
         contents[1]
-      )
-    })
-  })
-})
+      );
+    });
+  });
+});
diff --git a/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts b/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
index 37f811d207..4000b0486a 100644
--- a/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/DropdownInputComponent.spec.ts
@@ -1,260 +1,271 @@
-import { describe, it, expect, vi } from 'vitest'
-import { mount } from '@vue/test-utils'
+import { describe, it, expect, vi } from "vitest";
+import { mount } from "@vue/test-utils";
 
-import DropdownInputComponent from '@/components/forms/DropdownInputComponent.vue'
+import DropdownInputComponent from "@/components/forms/DropdownInputComponent.vue";
 
-describe('DropdownInputComponent', () => {
+describe("DropdownInputComponent", () => {
   const validations = [
-    (value: any) => (value === 'A' ? 'A is not supported' : '')
-  ]
-
-  const eventContent = (value:string) => {return { detail: { item: { 'data-value': value, getAttribute: (key:string) => value } }}}
+    (value: any) => (value === "A" ? "A is not supported" : ""),
+  ];
 
+  const eventContent = (value: string) => {
+    return {
+      detail: {
+        item: { "data-value": value, getAttribute: (key: string) => value },
+      },
+    };
+  };
 
-  it('should render', () => {
+  it("should render", () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
-        validations: []
-      }
-    })
-
-    expect(wrapper.find('cds-combo-box-item[data-value="Value A"]').exists()).toBe(true)
-    expect(wrapper.find('cds-combo-box-item[data-value="Value B"]').exists()).toBe(true)
-    expect(wrapper.find('cds-combo-box-item[data-value="Value C"]').exists()).toBe(false)
-  })
-
-  it('should emit event when changing selection', async () => {
+        initialValue: "",
+        validations: [],
+      },
+    });
+
+    expect(
+      wrapper.find('cds-combo-box-item[data-value="Value A"]').exists()
+    ).toBe(true);
+    expect(
+      wrapper.find('cds-combo-box-item[data-value="Value B"]').exists()
+    ).toBe(true);
+    expect(
+      wrapper.find('cds-combo-box-item[data-value="Value C"]').exists()
+    ).toBe(false);
+  });
+
+  it("should emit event when changing selection", async () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
-        validations: []
-      }
-    })
+        initialValue: "",
+        validations: [],
+      },
+    });
 
-    const dropdown = wrapper.find('cds-combo-box')
+    const dropdown = wrapper.find("cds-combo-box");
 
-    await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
+    await dropdown.trigger("cds-combo-box-selected", eventContent("Value A"));
 
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value A')
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![0][0]).toBe("Value A");
 
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
-      code: 'A',
-      name: 'Value A'
-    })
-  })
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![0][0]).toStrictEqual({
+      code: "A",
+      name: "Value A",
+    });
+  });
 
-  it('should emit empty then emit not empty', async () => {
+  it("should emit empty then emit not empty", async () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
-        validations: []
-      }
-    })
+        initialValue: "",
+        validations: [],
+      },
+    });
 
-    expect(wrapper.emitted('empty')).toBeTruthy()
-    expect(wrapper.emitted('empty')![0][0]).toBe(true)
+    expect(wrapper.emitted("empty")).toBeTruthy();
+    expect(wrapper.emitted("empty")![0][0]).toBe(true);
 
-    const dropdown = wrapper.find('cds-combo-box')
+    const dropdown = wrapper.find("cds-combo-box");
 
-    await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
+    await dropdown.trigger("cds-combo-box-selected", eventContent("Value A"));
 
-    expect(wrapper.emitted('empty')).toBeTruthy()
-    expect(wrapper.emitted('empty')![1][0]).toBe(false)
-  })
+    expect(wrapper.emitted("empty")).toBeTruthy();
+    expect(wrapper.emitted("empty")![1][0]).toBe(false);
+  });
 
-  it('should validate and emit error if required', async () => {
+  it("should validate and emit error if required", async () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' },
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
+        initialValue: "",
         validations,
       },
-    })
+    });
 
-    const dropdown = wrapper.find('cds-combo-box')
+    const dropdown = wrapper.find("cds-combo-box");
 
-    await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
+    await dropdown.trigger("cds-combo-box-selected", eventContent("Value A"));
 
-    await wrapper.trigger('click')
+    await wrapper.trigger("click");
 
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value A')
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![0][0]).toBe("Value A");
 
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
-      code: 'A',
-      name: 'Value A',
-    })
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![0][0]).toStrictEqual({
+      code: "A",
+      name: "Value A",
+    });
 
-    expect(wrapper.emitted('error')).toBeTruthy()
-    expect(wrapper.emitted('error')![0][0]).toBe('A is not supported')
-  })
+    expect(wrapper.emitted("error")).toBeTruthy();
+    expect(wrapper.emitted("error")![0][0]).toBe("A is not supported");
+  });
 
-  it('should not emit error if the change on selected value was not made by the user', async () => {
+  it("should not emit error if the change on selected value was not made by the user", async () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' },
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
+        initialValue: "",
         validations,
       },
-    })
+    });
 
-    await wrapper.setProps({ initialValue: 'Value A' })
+    await wrapper.setProps({ initialValue: "Value A" });
 
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value A')
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![0][0]).toBe("Value A");
 
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
-      code: 'A',
-      name: 'Value A',
-    })
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![0][0]).toStrictEqual({
+      code: "A",
+      name: "Value A",
+    });
 
-    expect(wrapper.emitted('error')).toBeFalsy()
-  })
+    expect(wrapper.emitted("error")).toBeFalsy();
+  });
 
-  it('should emit error with empty payload (meaning it is valid) even if the change on selected value was not made by the user', async () => {
+  it("should emit error with empty payload (meaning it is valid) even if the change on selected value was not made by the user", async () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' },
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
+        initialValue: "",
         validations,
       },
-    })
+    });
 
-    await wrapper.setProps({ initialValue: 'Value B' })
+    await wrapper.setProps({ initialValue: "Value B" });
 
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value B')
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![0][0]).toBe("Value B");
 
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
-      code: 'B',
-      name: 'Value B',
-    })
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![0][0]).toStrictEqual({
+      code: "B",
+      name: "Value B",
+    });
 
-    expect(wrapper.emitted('error')).toBeTruthy()
+    expect(wrapper.emitted("error")).toBeTruthy();
 
     // Error payload is empty - i.e. it is valid
-    expect(wrapper.emitted('error')![0][0]).toBe(undefined)
-  })
+    expect(wrapper.emitted("error")![0][0]).toBe(undefined);
+  });
 
-  it('should validate and emit no error if required', async () => {
+  it("should validate and emit no error if required", async () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
-        validations
-      }
-    })
+        initialValue: "",
+        validations,
+      },
+    });
 
-    const dropdown = wrapper.find('cds-combo-box')
+    const dropdown = wrapper.find("cds-combo-box");
 
-    await dropdown.trigger('cds-combo-box-selected', eventContent('Value B'))
+    await dropdown.trigger("cds-combo-box-selected", eventContent("Value B"));
 
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value B')
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![0][0]).toBe("Value B");
 
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
-      code: 'B',
-      name: 'Value B'
-    })
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![0][0]).toStrictEqual({
+      code: "B",
+      name: "Value B",
+    });
 
-    expect(wrapper.emitted('error')).toBeTruthy()
-    expect(wrapper.emitted('error')![0][0]).toBe(undefined)
-  })
+    expect(wrapper.emitted("error")).toBeTruthy();
+    expect(wrapper.emitted("error")![0][0]).toBe(undefined);
+  });
 
-  it('should reset selected to initial value when list change', async () => {
+  it("should reset selected to initial value when list change", async () => {
     const wrapper = mount(DropdownInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
-        validations: []
-      }
-    })
+        initialValue: "",
+        validations: [],
+      },
+    });
 
-    const dropdown = wrapper.find('cds-combo-box')
+    const dropdown = wrapper.find("cds-combo-box");
 
-    await dropdown.trigger('cds-combo-box-selected', eventContent('Value A'))
+    await dropdown.trigger("cds-combo-box-selected", eventContent("Value A"));
 
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toBe('Value A')
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![0][0]).toBe("Value A");
 
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual({
-      code: 'A',
-      name: 'Value A'
-    })
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![0][0]).toStrictEqual({
+      code: "A",
+      name: "Value A",
+    });
 
     await wrapper.setProps({
       modelValue: [
-        { code: 'C', name: 'Value C' },
-        { code: 'D', name: 'Value D' }
-      ]
-    })
-
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![1][0]).toBe('')
-
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![1][0]).toStrictEqual({
-      code: '',
-      name: '',
-    })
-  })
-})
+        { code: "C", name: "Value C" },
+        { code: "D", name: "Value D" },
+      ],
+    });
+
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![1][0]).toBe("");
+
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![1][0]).toStrictEqual({
+      code: "",
+      name: "",
+    });
+  });
+});
diff --git a/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts b/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
index 6a9f01bd16..5f8f7b2c6f 100644
--- a/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/MultiselectInputComponent.spec.ts
@@ -1,222 +1,255 @@
-import { describe, it, expect } from 'vitest'
-import { mount } from '@vue/test-utils'
+import { describe, it, expect } from "vitest";
+import { mount } from "@vue/test-utils";
 
-import MultiselectInputComponent from '@/components/forms/MultiselectInputComponent.vue'
+import MultiselectInputComponent from "@/components/forms/MultiselectInputComponent.vue";
 
-describe('MultiselectInputComponent', () => {
+describe("MultiselectInputComponent", () => {
   const validations = [
     (value: any[]) =>
-      value.includes('A') || value.includes('Value A') ? 'A is not supported' : ''
-  ]
+      value.includes("A") || value.includes("Value A")
+        ? "A is not supported"
+        : "",
+  ];
 
   const eventContent = (value: string) => {
-    return { data: value }
-  }
+    return { data: value };
+  };
 
-  it('should render', () => {
+  it("should render", () => {
     const wrapper = mount(MultiselectInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
-        validations: []
-      }
-    })
-
-    expect(wrapper.find('cds-multi-select-item[data-value="Value A"]').exists()).toBe(true)
-    expect(wrapper.find('cds-multi-select-item[data-value="Value B"]').exists()).toBe(true)
-    expect(wrapper.find('cds-multi-select-item[data-value="Value C"]').exists()).toBe(false)
-  })
-
-  it('should emit event when changing selection', async () => {
+        initialValue: "",
+        validations: [],
+      },
+    });
+
+    expect(
+      wrapper.find('cds-multi-select-item[data-value="Value A"]').exists()
+    ).toBe(true);
+    expect(
+      wrapper.find('cds-multi-select-item[data-value="Value B"]').exists()
+    ).toBe(true);
+    expect(
+      wrapper.find('cds-multi-select-item[data-value="Value C"]').exists()
+    ).toBe(false);
+  });
+
+  it("should emit event when changing selection", async () => {
     const wrapper = mount(MultiselectInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
-        validations: []
-      }
-    })
+        initialValue: "",
+        validations: [],
+      },
+    });
 
-    const dropdown = wrapper.find('cds-multi-select')
+    const dropdown = wrapper.find("cds-multi-select");
 
-    await dropdown.trigger('cds-multi-select-selected',eventContent('Value A'))
+    await dropdown.trigger(
+      "cds-multi-select-selected",
+      eventContent("Value A")
+    );
 
-    await wrapper.vm.$nextTick()
+    await wrapper.vm.$nextTick();
 
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual(['Value A'])
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![0][0]).toStrictEqual([
+      "Value A",
+    ]);
 
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual([
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![0][0]).toStrictEqual([
       {
-        code: 'A',
-        name: 'Value A'
-      }
-    ])
-  })
+        code: "A",
+        name: "Value A",
+      },
+    ]);
+  });
 
-  it('should emit empty then emit not empty', async () => {
+  it("should emit empty then emit not empty", async () => {
     const wrapper = mount(MultiselectInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
-        validations: []
-      }
-    })
+        initialValue: "",
+        validations: [],
+      },
+    });
 
-    expect(wrapper.emitted('empty')).toBeTruthy()
-    expect(wrapper.emitted('empty')![0][0]).toBe(true)
+    expect(wrapper.emitted("empty")).toBeTruthy();
+    expect(wrapper.emitted("empty")![0][0]).toBe(true);
 
-    const dropdown = wrapper.find('cds-multi-select')
+    const dropdown = wrapper.find("cds-multi-select");
 
-    await dropdown.trigger('cds-multi-select-selected',eventContent('Value A'))
+    await dropdown.trigger(
+      "cds-multi-select-selected",
+      eventContent("Value A")
+    );
 
-    expect(wrapper.emitted('empty')).toBeTruthy()
-    expect(wrapper.emitted('empty')![1][0]).toBe(false)
-  })
+    expect(wrapper.emitted("empty")).toBeTruthy();
+    expect(wrapper.emitted("empty")![1][0]).toBe(false);
+  });
 
-  it('should emit not empty when selectedValues is not empty', async () => {
+  it("should emit not empty when selectedValues is not empty", async () => {
     const wrapper = mount(MultiselectInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
+        initialValue: "",
         validations: [],
-        selectedValues: ['Value A']
-      }
-    })
+        selectedValues: ["Value A"],
+      },
+    });
 
-    expect(wrapper.emitted('empty')).toBeTruthy()
-    expect(wrapper.emitted('empty')![0][0]).toBe(false)
-  })
+    expect(wrapper.emitted("empty")).toBeTruthy();
+    expect(wrapper.emitted("empty")![0][0]).toBe(false);
+  });
 
-  it('should validate and emit error if required', async () => {
+  it("should validate and emit error if required", async () => {
     const wrapper = mount(MultiselectInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
-        validations
-      }
-    })
+        initialValue: "",
+        validations,
+      },
+    });
 
-    const dropdown = wrapper.find('cds-multi-select')
+    const dropdown = wrapper.find("cds-multi-select");
 
-    await dropdown.trigger('cds-multi-select-selected', eventContent('Value A'))
+    await dropdown.trigger(
+      "cds-multi-select-selected",
+      eventContent("Value A")
+    );
 
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual(['Value A'])
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![0][0]).toStrictEqual([
+      "Value A",
+    ]);
 
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual([
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![0][0]).toStrictEqual([
       {
-        code: 'A',
-        name: 'Value A'
-      }
-    ])
+        code: "A",
+        name: "Value A",
+      },
+    ]);
 
-    expect(wrapper.emitted('error')).toBeTruthy()
-    expect(wrapper.emitted('error')![0][0]).toBe('A is not supported')
-  })
+    expect(wrapper.emitted("error")).toBeTruthy();
+    expect(wrapper.emitted("error")![0][0]).toBe("A is not supported");
+  });
 
-  it('should validate and emit no error if required', async () => {
+  it("should validate and emit no error if required", async () => {
     const wrapper = mount(MultiselectInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
-        validations
-      }
-    })
+        initialValue: "",
+        validations,
+      },
+    });
 
-    const dropdown = wrapper.find('cds-multi-select')
+    const dropdown = wrapper.find("cds-multi-select");
 
-    await dropdown.trigger('cds-multi-select-selected', eventContent('Value B'))
+    await dropdown.trigger(
+      "cds-multi-select-selected",
+      eventContent("Value B")
+    );
 
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual(['Value B'])
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![0][0]).toStrictEqual([
+      "Value B",
+    ]);
 
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual([
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![0][0]).toStrictEqual([
       {
-        code: 'B',
-        name: 'Value B'
-      }
-    ])
+        code: "B",
+        name: "Value B",
+      },
+    ]);
 
-    expect(wrapper.emitted('error')).toBeTruthy()
-    expect(wrapper.emitted('error')![0][0]).toBe(undefined)
-  })
+    expect(wrapper.emitted("error")).toBeTruthy();
+    expect(wrapper.emitted("error")![0][0]).toBe(undefined);
+  });
 
-  it('should remove selection', async () => {
+  it("should remove selection", async () => {
     const wrapper = mount(MultiselectInputComponent, {
       props: {
-        id: 'test',
-        label: 'test',
-        tip: '',
+        id: "test",
+        label: "test",
+        tip: "",
         modelValue: [
-          { code: 'A', name: 'Value A' },
-          { code: 'B', name: 'Value B' }
+          { code: "A", name: "Value A" },
+          { code: "B", name: "Value B" },
         ],
-        initialValue: '',
-        validations: []
-      }
-    })
+        initialValue: "",
+        validations: [],
+      },
+    });
 
-    const dropdown = wrapper.find('#test')
+    const dropdown = wrapper.find("#test");
 
-    await dropdown.trigger('cds-multi-select-selected',eventContent('Value A'))
+    await dropdown.trigger(
+      "cds-multi-select-selected",
+      eventContent("Value A")
+    );
 
-    await wrapper.vm.$nextTick()
-    await wrapper.vm.$nextTick()
+    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick();
 
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![0][0]).toStrictEqual(['Value A'])
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![0][0]).toStrictEqual([
+      "Value A",
+    ]);
 
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![0][0]).toStrictEqual([ { code: 'A', name: 'Value A' } ])
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![0][0]).toStrictEqual([
+      { code: "A", name: "Value A" },
+    ]);
 
-    await dropdown.trigger('cds-multi-select-selected',eventContent(''))
+    await dropdown.trigger("cds-multi-select-selected", eventContent(""));
 
-    await wrapper.vm.$nextTick()
-    await wrapper.vm.$nextTick()
+    await wrapper.vm.$nextTick();
+    await wrapper.vm.$nextTick();
 
-    expect(wrapper.emitted('update:modelValue')).toBeTruthy()
-    expect(wrapper.emitted('update:modelValue')![1][0]).toStrictEqual([])
+    expect(wrapper.emitted("update:modelValue")).toBeTruthy();
+    expect(wrapper.emitted("update:modelValue")![1][0]).toStrictEqual([]);
 
-    expect(wrapper.emitted('update:selectedValue')).toBeTruthy()
-    expect(wrapper.emitted('update:selectedValue')![1][0]).toStrictEqual([])
-  })
-})
+    expect(wrapper.emitted("update:selectedValue")).toBeTruthy();
+    expect(wrapper.emitted("update:selectedValue")![1][0]).toStrictEqual([]);
+  });
+});
diff --git a/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts b/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts
index f7d4ca37d7..7c8e935fb0 100644
--- a/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/RadioInputComponent.spec.ts
@@ -1,120 +1,120 @@
-import { describe, it, expect } from 'vitest'
+import { describe, it, expect } from "vitest";
 
-import { mount } from '@vue/test-utils'
-import RadioInputComponent from '@/components/forms/RadioInputComponent.vue'
+import { mount } from "@vue/test-utils";
+import RadioInputComponent from "@/components/forms/RadioInputComponent.vue";
 
-describe('Radio Input Component', () => {
-  const id = 'my-input'
+describe("Radio Input Component", () => {
+  const id = "my-input";
   const values = [
-    { value: 'A', text: 'First' },
-    { value: 'B', text: 'Second' }
-  ]
+    { value: "A", text: "First" },
+    { value: "B", text: "Second" },
+  ];
   const validations = [
-    (value: any) => (value && value === 'A' ? "Can't select A" : '')
-  ]
+    (value: any) => (value && value === "A" ? "Can't select A" : ""),
+  ];
 
-  it('renders the input field with the provided id', () => {
+  it("renders the input field with the provided id", () => {
     const wrapper = mount(RadioInputComponent, {
       props: {
         id,
-        label: 'Options',
+        label: "Options",
         modelValue: values,
         validations: [],
-        initialValue: ''
-      }
-    })
+        initialValue: "",
+      },
+    });
     for (const value of values) {
       expect(wrapper.html()).toContain(
         `<cds-radio-button label-text="${value.text}"></cds-radio-button>`
-      )
+      );
     }
-  })
+  });
 
   it('emits the "error" event when there is a validation error', async () => {
     const wrapper = mount(RadioInputComponent, {
       props: {
         id,
-        label: 'Options',
+        label: "Options",
         modelValue: values,
         validations,
-        initialValue: ''
-      }
-    })
+        initialValue: "",
+      },
+    });
 
     await wrapper
       .find(`[id=${id}rb]`)
-      .trigger('cds-radio-button-group-changed', {
-        detail: { value: 'A' }
-      })
+      .trigger("cds-radio-button-group-changed", {
+        detail: { value: "A" },
+      });
 
-    const event = wrapper.emitted('error')
+    const event = wrapper.emitted("error");
 
-    expect(event).toBeTruthy()
-    expect(event).toHaveLength(1)
-    expect(event[0][0]).toBe("Can't select A")
-  })
+    expect(event).toBeTruthy();
+    expect(event).toHaveLength(1);
+    expect(event[0][0]).toBe("Can't select A");
+  });
 
   it('emits the "update" event when selected', async () => {
     const wrapper = mount(RadioInputComponent, {
       props: {
         id,
-        label: 'Options',
+        label: "Options",
         modelValue: values,
         validations,
-        initialValue: ''
-      }
-    })
+        initialValue: "",
+      },
+    });
 
     await wrapper
       .find(`[id=${id}rb]`)
-      .trigger('cds-radio-button-group-changed', {
-        detail: { value: 'B' }
-      })
+      .trigger("cds-radio-button-group-changed", {
+        detail: { value: "B" },
+      });
 
-    const event = wrapper.emitted('update:model-value')
-    expect(event).toBeTruthy()
-    expect(event).toHaveLength(1)
-    expect(event[0]).toStrictEqual(['B'])
-  })
+    const event = wrapper.emitted("update:model-value");
+    expect(event).toBeTruthy();
+    expect(event).toHaveLength(1);
+    expect(event[0]).toStrictEqual(["B"]);
+  });
 
   it('emits the "error" then no error', async () => {
     const wrapper = mount(RadioInputComponent, {
       props: {
         id,
-        label: 'Options',
+        label: "Options",
         modelValue: values,
         validations,
-        initialValue: ''
-      }
-    })
+        initialValue: "",
+      },
+    });
 
     await wrapper
       .find(`[id=${id}rb]`)
-      .trigger('cds-radio-button-group-changed', {
-        detail: { value: 'A' }
-      })
+      .trigger("cds-radio-button-group-changed", {
+        detail: { value: "A" },
+      });
 
-    const errorEvent = wrapper.emitted('error')
-    const updateEvent = wrapper.emitted('update:model-value')
+    const errorEvent = wrapper.emitted("error");
+    const updateEvent = wrapper.emitted("update:model-value");
 
-    expect(errorEvent).toBeTruthy()
-    expect(errorEvent).toHaveLength(1)
-    expect(errorEvent[0][0]).toBe("Can't select A")
+    expect(errorEvent).toBeTruthy();
+    expect(errorEvent).toHaveLength(1);
+    expect(errorEvent[0][0]).toBe("Can't select A");
 
-    expect(updateEvent).toBeTruthy()
-    expect(updateEvent).toHaveLength(1)
-    expect(updateEvent[0]).toStrictEqual(['A'])
+    expect(updateEvent).toBeTruthy();
+    expect(updateEvent).toHaveLength(1);
+    expect(updateEvent[0]).toStrictEqual(["A"]);
 
     await wrapper
       .find(`[id=${id}rb]`)
-      .trigger('cds-radio-button-group-changed', {
-        detail: { value: 'B' }
-      })
+      .trigger("cds-radio-button-group-changed", {
+        detail: { value: "B" },
+      });
 
-    expect(errorEvent).toHaveLength(2)
-    expect(errorEvent[0][1]).toBeUndefined()
+    expect(errorEvent).toHaveLength(2);
+    expect(errorEvent[0][1]).toBeUndefined();
 
-    expect(updateEvent).toHaveLength(2)
-    expect(updateEvent[1]).toStrictEqual(['B'])
-  })
-})
+    expect(updateEvent).toHaveLength(2);
+    expect(updateEvent[1]).toStrictEqual(["B"]);
+  });
+});
diff --git a/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts b/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
index bc030c7841..110d109816 100644
--- a/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
+++ b/frontend/tests/unittests/components/forms/TextInputComponent.spec.ts
@@ -1,88 +1,91 @@
-import { describe, it, expect } from 'vitest'
-import { DOMWrapper, mount } from '@vue/test-utils'
-import TextInputComponent from '@/components/forms/TextInputComponent.vue'
-import { isMinSize } from "@/helpers/validators/GlobalValidators"
-
-describe('Text Input Component', () => {
-  const id = 'my-input'
-  const validations = [(value: any) => (value ? '' : 'Field is required')]
-
-  const setInputValue = async (inputWrapper: DOMWrapper<HTMLInputElement>, value: string) => {
-    inputWrapper.element.value = value
-    await inputWrapper.trigger('input')
-  }
-
-  it('renders the input field with the provided id', () => {
+import { describe, it, expect } from "vitest";
+import { DOMWrapper, mount } from "@vue/test-utils";
+import TextInputComponent from "@/components/forms/TextInputComponent.vue";
+import { isMinSize } from "@/helpers/validators/GlobalValidators";
+
+describe("Text Input Component", () => {
+  const id = "my-input";
+  const validations = [(value: any) => (value ? "" : "Field is required")];
+
+  const setInputValue = async (
+    inputWrapper: DOMWrapper<HTMLInputElement>,
+    value: string
+  ) => {
+    inputWrapper.element.value = value;
+    await inputWrapper.trigger("input");
+  };
+
+  it("renders the input field with the provided id", () => {
     const wrapper = mount(TextInputComponent, {
       props: {
         id,
-        label: 'TestField',
-        placeholder: '',
-        modelValue: '',
+        label: "TestField",
+        placeholder: "",
+        modelValue: "",
         validations: [],
-        enabled: true
+        enabled: true,
       },
       directives: {
-        masked: () => {}
-      }
-    })
+        masked: () => {},
+      },
+    });
 
-    expect(wrapper.find(`#${id}`).exists()).toBe(true)
-  })
+    expect(wrapper.find(`#${id}`).exists()).toBe(true);
+  });
 
   it('emits the "update" event with the updated value', async () => {
     const wrapper = mount(TextInputComponent, {
       props: {
         id,
-        label: 'TestField',
-        placeholder: '',
-        modelValue: '',
+        label: "TestField",
+        placeholder: "",
+        modelValue: "",
         validations: [],
-        enabled: true
+        enabled: true,
       },
       directives: {
-        masked: () => {}
-      }
-    })
+        masked: () => {},
+      },
+    });
 
-    const inputWrapper = wrapper.find<HTMLInputElement>(`#${id}`)
-    await setInputValue(inputWrapper, 'John Doe')
-    await inputWrapper.trigger('blur')
+    const inputWrapper = wrapper.find<HTMLInputElement>(`#${id}`);
+    await setInputValue(inputWrapper, "John Doe");
+    await inputWrapper.trigger("blur");
 
-    expect(wrapper.emitted('update:model-value')).toBeTruthy()
-    expect(wrapper.emitted('update:model-value')![0][0]).toEqual('John Doe')
-  })
+    expect(wrapper.emitted("update:model-value")).toBeTruthy();
+    expect(wrapper.emitted("update:model-value")![0][0]).toEqual("John Doe");
+  });
 
   it('emits the "error" event when there is a validation error', async () => {
     const wrapper = mount(TextInputComponent, {
       props: {
         id,
-        label: 'TestField',
-        placeholder: '',
-        modelValue: '',
+        label: "TestField",
+        placeholder: "",
+        modelValue: "",
         validations,
-        enabled: true
+        enabled: true,
       },
       directives: {
-        masked: () => {}
-      }
-    })
+        masked: () => {},
+      },
+    });
 
-    await wrapper.find(`#${id}`).trigger('input')
-    await wrapper.find(`#${id}`).trigger('blur')
+    await wrapper.find(`#${id}`).trigger("input");
+    await wrapper.find(`#${id}`).trigger("blur");
 
-    expect(wrapper.emitted('error')).toBeTruthy()
-    expect(wrapper.emitted('error')![0][0]).toBe('Field is required')
-  })
+    expect(wrapper.emitted("error")).toBeTruthy();
+    expect(wrapper.emitted("error")![0][0]).toBe("Field is required");
+  });
 
-  it('revalidates when changed from outside (i.e. not directly by the user)', async () => {
+  it("revalidates when changed from outside (i.e. not directly by the user)", async () => {
     const errorMessage = "sample error message";
     const wrapper = mount(TextInputComponent, {
       props: {
         id,
-        label: 'TestField',
-        placeholder: '',
-        modelValue: '',
+        label: "TestField",
+        placeholder: "",
+        modelValue: "",
         validations: [isMinSize(errorMessage)(5)],
         enabled: true,
       },
@@ -95,7 +98,7 @@ describe('Text Input Component', () => {
     Note: we are not triggerring "input" nor "blur".
     Just like on a programmatic change, which was not performed by a user.
     */
-    await wrapper.setProps({ modelValue: "1"});
+    await wrapper.setProps({ modelValue: "1" });
 
     expect(wrapper.emitted("error")).toBeTruthy();
     expect(wrapper.emitted("error")).toHaveLength(1);
@@ -107,9 +110,9 @@ describe('Text Input Component', () => {
     const wrapper = mount(TextInputComponent, {
       props: {
         id,
-        label: 'TestField',
-        placeholder: '',
-        modelValue: '',
+        label: "TestField",
+        placeholder: "",
+        modelValue: "",
         validations: [isMinSize(errorMessage)(5)],
         enabled: true,
       },
@@ -118,19 +121,19 @@ describe('Text Input Component', () => {
       },
     });
 
-    const inputWrapper = wrapper.find<HTMLInputElement>(`#${id}`)
-    await setInputValue(inputWrapper, '1')
-    await inputWrapper.trigger('blur')
+    const inputWrapper = wrapper.find<HTMLInputElement>(`#${id}`);
+    await setInputValue(inputWrapper, "1");
+    await inputWrapper.trigger("blur");
 
     expect(wrapper.emitted("error")).toBeTruthy();
     expect(wrapper.emitted("error")).toHaveLength(1);
     expect(wrapper.emitted("error")![0][0]).toBe(errorMessage);
 
-    await setInputValue(inputWrapper, '12') // adds another character
-    await inputWrapper.trigger('blur')
+    await setInputValue(inputWrapper, "12"); // adds another character
+    await inputWrapper.trigger("blur");
 
     // Just a sanity check on the updated element value
-    expect(inputWrapper.element.value).toEqual('12')
+    expect(inputWrapper.element.value).toEqual("12");
 
     expect(wrapper.emitted("error")).toHaveLength(2);
     expect(wrapper.emitted("error")![1][0]).toBe(errorMessage);
@@ -140,21 +143,21 @@ describe('Text Input Component', () => {
     const wrapper = mount(TextInputComponent, {
       props: {
         id,
-        label: 'TestField',
-        placeholder: '',
-        modelValue: '',
+        label: "TestField",
+        placeholder: "",
+        modelValue: "",
         validations: [],
-        enabled: true
+        enabled: true,
       },
       directives: {
-        masked: () => {}
-      }
-    })
+        masked: () => {},
+      },
+    });
 
-    await wrapper.find(`#${id}`).trigger('input')
-    await wrapper.find(`#${id}`).trigger('blur')
+    await wrapper.find(`#${id}`).trigger("input");
+    await wrapper.find(`#${id}`).trigger("blur");
 
-    expect(wrapper.emitted('empty')).toBeTruthy()
-    expect(wrapper.emitted('empty')![0][0]).toBe(true)
-  })
-})
+    expect(wrapper.emitted("empty")).toBeTruthy();
+    expect(wrapper.emitted("empty")![0][0]).toBe(true);
+  });
+});

From ea06c7406c70753ee9c5532a926f04b7895851d5 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 19 Oct 2023 13:09:23 -0700
Subject: [PATCH 310/313] FSADT1-928

---
 frontend/src/pages/bceidform/BusinessInformationWizardStep.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
index 95bba23ca6..87f3684bbb 100644
--- a/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
+++ b/frontend/src/pages/bceidform/BusinessInformationWizardStep.vue
@@ -317,7 +317,7 @@ watch([selectedOption], () => {
   <text-input-component
     v-if="selectedOption === BusinessTypeEnum.U"
     id="businessName"
-    label="Unregistered proprietorship"
+    label="Unregistered sole proprietorship"
     placeholder=""
     v-model="formData.businessInformation.businessName"
     :validations="[]"

From 0b7c18e618e4e1e7cde40faebe4f4b5c7b2fe883 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 19 Oct 2023 13:22:24 -0700
Subject: [PATCH 311/313] Fixed code smell issues

---
 .../ca/bc/gov/app/dto/client/CodeNameDto.java | 31 ++++++++++++++++++-
 .../service/client/ClientAddressService.java  |  2 +-
 .../gov/app/service/client/ClientService.java | 17 +++++++++-
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/backend/src/main/java/ca/bc/gov/app/dto/client/CodeNameDto.java b/backend/src/main/java/ca/bc/gov/app/dto/client/CodeNameDto.java
index b2042a4f9b..64687e8130 100644
--- a/backend/src/main/java/ca/bc/gov/app/dto/client/CodeNameDto.java
+++ b/backend/src/main/java/ca/bc/gov/app/dto/client/CodeNameDto.java
@@ -2,6 +2,26 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 
+/**
+ * The {@code CodeNameDto} class represents a simple data transfer object (DTO) that encapsulates
+ * a name and code for a specific object. It is used to transfer this information between different
+ * parts of an application.
+ *
+ * This class is annotated with Swagger annotations for generating API documentation. It provides
+ * a description and example JSON representation for the object it represents.
+ *
+ * <p>
+ * Example JSON representation:
+ * <pre>{@code
+ * {
+ *   "code": "00000002",
+ *   "name": "BAXTER"
+ * }
+ * }</pre>
+ * </p>
+ *
+ * @see Schema
+ */
 @Schema(
     description = "A simple name and code object",
     title = "NameCode",
@@ -12,10 +32,19 @@
         }"""
 )
 public record CodeNameDto(
-
+    /**
+     * The code for the specific object. It is a string value.
+     *
+     * @see Schema
+     */
     @Schema(description = "The code for that specific object", example = "00000002")
     String code,
 
+    /**
+     * The name information for the specific object. It is a string value.
+     *
+     * @see Schema
+     */
     @Schema(description = "The name information for that specific object", example = "BAXTER")
     String name
 ) {
diff --git a/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java b/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
index 1cf68a317c..bd29b97347 100644
--- a/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
+++ b/backend/src/main/java/ca/bc/gov/app/service/client/ClientAddressService.java
@@ -5,8 +5,8 @@
 import ca.bc.gov.app.dto.client.AddressCompleteRetrieveListDto;
 import ca.bc.gov.app.dto.client.AddressError;
 import ca.bc.gov.app.dto.client.ClientAddressDto;
-import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.dto.client.ClientValueTextDto;
+import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.exception.AddressLookupException;
 import java.util.List;
 import java.util.Map;
diff --git a/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java b/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
index 9986cef895..490dbdc8e4 100644
--- a/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
+++ b/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
@@ -7,8 +7,8 @@
 import ca.bc.gov.app.dto.client.ClientAddressDto;
 import ca.bc.gov.app.dto.client.ClientContactDto;
 import ca.bc.gov.app.dto.client.ClientLookUpDto;
-import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.dto.client.ClientValueTextDto;
+import ca.bc.gov.app.dto.client.CodeNameDto;
 import ca.bc.gov.app.dto.client.EmailRequestDto;
 import ca.bc.gov.app.dto.legacy.ForestClientDto;
 import ca.bc.gov.app.exception.ClientAlreadyExistException;
@@ -87,6 +87,21 @@ public Flux<CodeNameDto> listCountries(int page, int size) {
         .map(entity -> new CodeNameDto(entity.getCountryCode(), entity.getDescription()));
   }
   
+  /**
+   * Retrieves country information by its country code.
+   *
+   * This method queries the {@code countryCodeRepository} to find a country entity with the specified
+   * country code. If a matching entity is found, it is mapped to a {@code CodeNameDto} object, which
+   * encapsulates the country code and description. The resulting data is wrapped in a Mono, which
+   * represents the asynchronous result of the operation.
+   *
+   * @param countryCode The code of the country to retrieve information for.
+   * @return A Mono that emits the {@code CodeNameDto} object if a matching country is found,
+   *         or an empty result if no match is found.
+   *
+   * @see CodeNameDto
+   * @see countryCodeRepository
+   */
   public Mono<Object> getCountryByCode(String countryCode) {
     return countryCodeRepository
             .findByCountryCode(countryCode)

From ef4351a69cebdd198c6067d0ba964acfd8231ba8 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 19 Oct 2023 13:32:36 -0700
Subject: [PATCH 312/313] Fixed code smell issues

---
 .../ca/bc/gov/app/dto/client/CodeNameDto.java  | 11 -----------
 .../gov/app/service/client/ClientService.java  | 18 +++++++++---------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/backend/src/main/java/ca/bc/gov/app/dto/client/CodeNameDto.java b/backend/src/main/java/ca/bc/gov/app/dto/client/CodeNameDto.java
index 64687e8130..89cd432b12 100644
--- a/backend/src/main/java/ca/bc/gov/app/dto/client/CodeNameDto.java
+++ b/backend/src/main/java/ca/bc/gov/app/dto/client/CodeNameDto.java
@@ -6,7 +6,6 @@
  * The {@code CodeNameDto} class represents a simple data transfer object (DTO) that encapsulates
  * a name and code for a specific object. It is used to transfer this information between different
  * parts of an application.
- *
  * This class is annotated with Swagger annotations for generating API documentation. It provides
  * a description and example JSON representation for the object it represents.
  *
@@ -32,19 +31,9 @@
         }"""
 )
 public record CodeNameDto(
-    /**
-     * The code for the specific object. It is a string value.
-     *
-     * @see Schema
-     */
     @Schema(description = "The code for that specific object", example = "00000002")
     String code,
 
-    /**
-     * The name information for the specific object. It is a string value.
-     *
-     * @see Schema
-     */
     @Schema(description = "The name information for that specific object", example = "BAXTER")
     String name
 ) {
diff --git a/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java b/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
index 490dbdc8e4..8aed79f728 100644
--- a/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
+++ b/backend/src/main/java/ca/bc/gov/app/service/client/ClientService.java
@@ -88,16 +88,15 @@ public Flux<CodeNameDto> listCountries(int page, int size) {
   }
   
   /**
-   * Retrieves country information by its country code.
-   *
-   * This method queries the {@code countryCodeRepository} to find a country entity with the specified
-   * country code. If a matching entity is found, it is mapped to a {@code CodeNameDto} object, which
-   * encapsulates the country code and description. The resulting data is wrapped in a Mono, which
-   * represents the asynchronous result of the operation.
+   * Retrieves country information by its country code. This method queries the
+   * {@code countryCodeRepository} to find a country entity with the specified country code. If a
+   * matching entity is found, it is mapped to a {@code CodeNameDto} object, which encapsulates the
+   * country code and description. The resulting data is wrapped in a Mono, which represents the
+   * asynchronous result of the operation.
    *
    * @param countryCode The code of the country to retrieve information for.
-   * @return A Mono that emits the {@code CodeNameDto} object if a matching country is found,
-   *         or an empty result if no match is found.
+   * @return A Mono that emits the {@code CodeNameDto} object if a matching country is found, or an
+   *         empty result if no match is found.
    *
    * @see CodeNameDto
    * @see countryCodeRepository
@@ -105,7 +104,8 @@ public Flux<CodeNameDto> listCountries(int page, int size) {
   public Mono<Object> getCountryByCode(String countryCode) {
     return countryCodeRepository
             .findByCountryCode(countryCode)
-            .map(entity -> new CodeNameDto(entity.getCountryCode(), entity.getDescription()));
+            .map(entity -> new CodeNameDto(entity.getCountryCode(), 
+                                           entity.getDescription()));
   }
 
   /**

From c9b4d4ef6d2c1245eedcaa826240ab0b9f00b459 Mon Sep 17 00:00:00 2001
From: Maria Martinez <maria.martinez@gov.bc.ca>
Date: Thu, 19 Oct 2023 14:38:34 -0700
Subject: [PATCH 313/313] Create unit test

---
 .../app/entity/client/CountryCodeEntity.java  |  5 +++++
 .../client/ClientServiceIntegrationTest.java  | 22 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/backend/src/main/java/ca/bc/gov/app/entity/client/CountryCodeEntity.java b/backend/src/main/java/ca/bc/gov/app/entity/client/CountryCodeEntity.java
index ad6e5b45f8..28a3b74a75 100644
--- a/backend/src/main/java/ca/bc/gov/app/entity/client/CountryCodeEntity.java
+++ b/backend/src/main/java/ca/bc/gov/app/entity/client/CountryCodeEntity.java
@@ -33,4 +33,9 @@ public class CountryCodeEntity extends ExpirableBaseEntity {
   @NotNull
   private Integer order;
 
+  public CountryCodeEntity(@NotNull @Size(min = 2, max = 2) String countryCode, @NotNull String description) {
+    this.countryCode = countryCode;
+    this.description = description;
+  }
+  
 }
diff --git a/backend/src/test/java/ca/bc/gov/app/service/client/ClientServiceIntegrationTest.java b/backend/src/test/java/ca/bc/gov/app/service/client/ClientServiceIntegrationTest.java
index a4445c3dc0..00f4b8211e 100644
--- a/backend/src/test/java/ca/bc/gov/app/service/client/ClientServiceIntegrationTest.java
+++ b/backend/src/test/java/ca/bc/gov/app/service/client/ClientServiceIntegrationTest.java
@@ -1,15 +1,21 @@
 package ca.bc.gov.app.service.client;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.when;
 
 import ca.bc.gov.app.extensions.AbstractTestContainerIntegrationTest;
+import ca.bc.gov.app.dto.client.CodeNameDto;
+import ca.bc.gov.app.entity.client.CountryCodeEntity;
+import ca.bc.gov.app.repository.client.CountryCodeRepository;
 import java.time.LocalDate;
 import java.util.stream.Stream;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
+import reactor.core.publisher.Mono;
 import reactor.test.StepVerifier;
 
 @Slf4j
@@ -18,6 +24,9 @@ class ClientServiceIntegrationTest extends AbstractTestContainerIntegrationTest
 
   @Autowired
   private ClientService service;
+  
+  @Autowired
+  private CountryCodeRepository countryCodeRepository;
 
   @ParameterizedTest
   @MethodSource("date")
@@ -29,6 +38,19 @@ void shouldListCodeAsExpected(LocalDate date) {
         .expectNextCount(11)
         .verifyComplete();
   }
+  
+  @Test
+  void testGetCountryByCode() {
+
+    CountryCodeEntity countryCodeEntity = new CountryCodeEntity("CA", "Canada");
+    CodeNameDto expectedDto = new CodeNameDto("CA", "Canada");
+
+    when(countryCodeRepository.findByCountryCode("CA")).thenReturn(Mono.just(countryCodeEntity));
+
+    Mono<Object> resultMono = service.getCountryByCode("CA");
+
+    StepVerifier.create(resultMono).expectNext(expectedDto).verifyComplete();
+  }
 
   private static Stream<LocalDate> date() {
     return