Merge pull request bcgov#330 from dimak1/feat/update-details-page

Update App & Reg Details pages
avni-work · Nov 25, 2024 · 80c2395 · 80c2395
2 parents cd16ba5 + 9fcc173
commit 80c2395
Show file tree

Hide file tree

Showing 15 changed files with 419 additions and 476 deletions.
diff --git a/strr-web/components/bcros/form-section/contact-information/SummaryView.vue b/strr-web/components/bcros/form-section/contact-information/SummaryView.vue
@@ -0,0 +1,79 @@
+<script setup lang="ts">
+const { t } = useTranslation()
+const { header, contact } = defineProps<{
+  header: string,
+  contact: ContactI
+}>()
+
+const displayHostType = {
+  [HostContactTypeE.INDIVIDUAL]: t('createAccount.contactForm.hostTypeIndividual'),
+  [HostContactTypeE.BUSINESS]: t('createAccount.contactForm.hostTypeBusiness')
+}
+
+</script>
+
+<template>
+  <div>
+    <h2 class="font-bold mb-6 mobile:mx-2 text-xl">
+      {{ header }}
+    </h2>
+    <div class="bg-white p-8 m:px-2 grid d:grid-cols-3 d:grid-rows-4 d:grid-flow-col">
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.hostType')"
+        :content="displayHostType[contact.contactType]"
+        data-test-id="contact-info-host-type"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.name')"
+        :content="displayContactFullName(contact.name)"
+        data-test-id="contact-info-name"
+      />
+      <div class="grid grid-rows-subgrid row-span-2">
+        <BcrosFormSectionReviewItem
+          :title="t('common.formLabels.preferredName')"
+          :content="contact.details.preferredName || '-'"
+          data-test-id="contact-info-preferred-name"
+        />
+      </div>
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.dateOfBirth')"
+        :content="convertDateToLongFormat(contact.dateOfBirth) || '-'"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.socialInsuranceNumber')"
+        :content="contact.socialInsuranceNumber || '-'"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.businessLegalName')"
+        :content="contact.businessLegalName || '-'"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.craBusinessNumber')"
+        :content="contact.businessNumber || '-'"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.phoneNumber')"
+        :content="displayPhoneAndExt(
+          contact.details.phoneNumber,
+          contact.details.extension) || '-'"
+        data-test-id="contact-info-phone"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.faxNumber')"
+        :content="displayFormattedPhone(contact.details.faxNumber) || '-'"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.emailAddress')"
+        :content="contact.details.emailAddress || '-'"
+        data-test-id="contact-info-email"
+      />
+      <BcrosFormSectionReviewItem
+        :title="t('common.formLabels.mailingAddress')"
+        data-test-id="contact-info-address"
+      >
+        <!-- eslint-disable-next-line vue/no-v-html -->
+        <p v-html="displayFullAddress(contact.mailingAddress) || '-'" />
+      </BcrosFormSectionReviewItem>
+    </div>
+  </div>
+</template>
diff --git a/strr-web/components/bcros/form-section/property/SummaryView.vue b/strr-web/components/bcros/form-section/property/SummaryView.vue
@@ -62,7 +62,7 @@ const propertyAddressDetails = computed((): UnitAddressAPII => {
       </div>
       <BcrosFormSectionReviewItem
         :title="tReview('isUnitOnPrincipalResidenceProperty')"
-        :content="propertyDetails.isUnitOnPrincipalResidenceProperty !== null
+        :content="propertyDetails.isUnitOnPrincipalResidenceProperty !== undefined
           ? tReview(String(propertyDetails.isUnitOnPrincipalResidenceProperty)) : '-'
         "
       />

diff --git a/strr-web/interfaces/account-i.ts b/strr-web/interfaces/account-i.ts
@@ -56,6 +56,8 @@ export interface OrgI {
 export interface ContactI {
   socialInsuranceNumber: string
   businessNumber: string
+  businessLegalName: string
+  contactType: HostContactTypeE
   dateOfBirth: string
   details: {
     emailAddress: string
@@ -79,33 +81,8 @@ export interface ContactI {
   }
 }
 
-interface UserTermsI {
-  isTermsOfUseAccepted: boolean
-  termsOfUseAcceptedVersion: string
-}
-
-export interface ProfileI {
-  contacts: ContactI[]
-  created: string
-  firstname: string
-  id: number
-  idpUserid: string
-  keycloakGuid: string
-  lastname: string
-  loginSource: string
-  loginTime: string
-  modified: string
-  modifiedBy: string
-  type: string
-  userStatus: number
-  userTerms: UserTermsI
-  username: string
-  verified: boolean
-}
-
 export interface MeI {
   orgs: OrgI[]
-  profile: ProfileI
   settings: UserSettingsI[]
 }
 

diff --git a/strr-web/interfaces/terms-of-service-i.ts b/strr-web/interfaces/terms-of-service-i.ts
@@ -1,6 +1,4 @@
 export interface TermsOfServiceI {
   isTermsOfUseAccepted: boolean
   termsOfUseAcceptedVersion: string
-  termsOfUseCurrentVersion?: string
-  termsOfUse?: string
 }
diff --git a/strr-web/lang/en.json b/strr-web/lang/en.json
@@ -11,6 +11,14 @@
     "formLabels": {
       "hostType": "Host Type",
       "contactName": "Contact Name",
+      "name": "Name",
+      "preferredName": "Preferred Name",
+      "dateOfBirth": "Date of Birth",
+      "socialInsuranceNumber": "Social Insurance Number",
+      "phoneNumber": "Phone Number",
+      "faxNumber": "Fax Number",
+      "emailAddress": "Email Address",
+      "mailingAddress": "Mailing Address",
       "businessDetails": "Business Details",
       "businessLegalName": "Business Legal Name",
       "businessLegalNameOptional" : "Business Legal Name (Optional)",

diff --git a/strr-web/pages/account-select.vue b/strr-web/pages/account-select.vue
@@ -42,7 +42,7 @@ const existingAccountsTitle = `${t('account.existingAccountSection.title')} (${u
 
 onMounted(() => {
   // if no sbc accounts navigate to sbc account creation
-  if (!me?.settings.length) {
+  if (!me?.orgs.length) {
     goToCreateSbcAccount()
   }
 })