Merge pull request bcgov#53 from turb0c0w/sam/examiner-dash

Fixing enum mapping logic
turb0c0w · Jul 15, 2024 · 1b78bdc · 1b78bdc
2 parents c34bc87 + de47ffd
commit 1b78bdc
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 17 deletions.
diff --git a/strr-web/components/bcros/typography/H2.vue b/strr-web/components/bcros/typography/H2.vue
@@ -6,5 +6,5 @@
 
 <script setup lang="ts">
 const t = useNuxtApp().$i18n.t
-const { text, className, dataCy } = defineProps<{ text: string, className: string, dataCy?: string }>()
+const { text, className, dataCy } = defineProps<{ text: string, className?: string, dataCy?: string }>()
 </script>
diff --git a/strr-web/pages/create-account-pre/[id].vue b/strr-web/pages/create-account-pre/[id].vue
@@ -98,17 +98,12 @@ const {
 const toggleAddSecondary = () => { addSecondaryContact.value = !addSecondaryContact.value }
 
 const propertyToApiType = (type: string | undefined): string => {
-  switch (type) {
-    case (t('create-account.property-form.primaryDwelling')):
-      return 'PRIMARY'
-    case (t('create-account.property-form.secondarySuite')):
-      return 'SECONDARY'
-    case (t('create-account.property-form.accessory')):
-      return 'ACCESSORY'
-    case (t('create-account.property-form.float')):
-      return 'FLOAT_HOME'
-    case (t('create-account.property-form.other')):
-      return 'OTHER'
+  const tPropertyForm = (translationKey: string) => t(`create-account.property-form.${translationKey}`)
+  for (const key in propertyTypeMap) {
+    const propertyKey = propertyTypeMap[key as keyof PropertyTypeMapI]
+    if (type && tPropertyForm(propertyKey) === type) {
+      return key
+    }
   }
   return ''
 }
@@ -126,8 +121,8 @@ const ownershipToApiType = (type: string | undefined): string => {
 }
 
 const submit = () => {
-  validateStep(contactSchema, formState.primaryContact, 0)
-  validateStep(contactSchema, formState.secondaryContact, 0)
+  validateStep(primaryContactSchema, formState.primaryContact, 0)
+  validateStep(secondaryContactSchema, formState.secondaryContact, 0)
   validateStep(propertyDetailsSchema, formState.propertyDetails, 1)
   steps[1].step.complete = true
   steps[2].step.complete = true
@@ -159,11 +154,11 @@ const validateStep = (schema: any, state: any, index: number) => {
 }
 
 watch(formState.primaryContact, () => {
-  validateStep(contactSchema, formState.primaryContact, 0)
+  validateStep(primaryContactSchema, formState.primaryContact, 0)
 })
 
 watch(formState.secondaryContact, () => {
-  validateStep(contactSchema, formState.secondaryContact, 0)
+  validateStep(secondaryContactSchema, formState.secondaryContact, 0)
 })
 
 watch(formState.propertyDetails, () => {

diff --git a/strr-web/pages/create-account.vue b/strr-web/pages/create-account.vue
@@ -103,7 +103,8 @@ const toggleAddSecondary = () => { addSecondaryContact.value = !addSecondaryCont
 const propertyToApiType = (type: string | undefined): string => {
   const tPropertyForm = (translationKey: string) => t(`create-account.property-form.${translationKey}`)
   for (const key in propertyTypeMap) {
-    if (type && propertyTypeMap[key as keyof PropertyTypeMapI] === tPropertyForm(type)) {
+    const propertyKey = propertyTypeMap[key as keyof PropertyTypeMapI]
+    if (type && tPropertyForm(propertyKey) === type) {
       return key
     }
   }

diff --git a/strr-web/pages/registry-dashboard.vue b/strr-web/pages/registry-dashboard.vue
@@ -0,0 +1,28 @@
+<template>
+  <div>
+    <BcrosTypographyH1 text="My CEU STR Registry Dashboard" />
+    <BcrosTypographyH2 text="Owners STR Registration Applications" />
+    <div />
+    <div class="bg-white">
+      <div class="flex flex-row justify-between">
+        <div>
+          <UInput />
+        </div>
+        <div>
+          <USelect />
+        </div>
+      </div>
+      <UTable />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+
+// const t = useNuxtApp().$i18n.t
+
+definePageMeta({
+  layout: 'wide-no-space'
+})
+
+</script>