Transfer Validation and Submission Updates (#1637)

* Transfer validation and submission fix * Code Clean Up
bcgov · Dec 1, 2023 · 3948f14 · 3948f14
1 parent f2b6210
commit 3948f14
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
diff --git a/ppr-ui/package.json b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "2.1.26",
+  "version": "2.1.27",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",

diff --git a/ppr-ui/src/App.vue b/ppr-ui/src/App.vue
@@ -182,7 +182,7 @@ export default defineComponent({
       registrationTypeUI: computed((): string => {
         const regType = getRegistrationType.value
         const regOther = getRegistrationOther.value
-        if (regType.registrationTypeAPI === APIRegistrationTypes.OTHER) {
+        if (regType?.registrationTypeAPI === APIRegistrationTypes.OTHER) {
           return regOther || ''
         }
         return regType?.registrationTypeUI || ''

diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
@@ -468,7 +468,7 @@ import { mhrDeceasedOwnerChanges } from '@/resources/dialogOptions'
 import { yyyyMmDdToPacificDate } from '@/utils/date-helper'
 import { InfoChip } from '@/components/common'
 import { MhrRegistrationHomeOwnerIF } from '@/interfaces'
-import { ActionTypes, HomeOwnerPartyTypes, SupportingDocumentsOptions } from '@/enums'
+import { ActionTypes, HomeOwnerPartyTypes, HomeTenancyTypes, SupportingDocumentsOptions } from '@/enums'
 import { storeToRefs } from 'pinia'
 
 export default defineComponent({
@@ -515,6 +515,7 @@ export default defineComponent({
       getGroupById,
       undoGroupChanges,
       getGroupNumberById,
+      getHomeTenancyType,
       hasMixedOwnersInAGroup,
       hasMixedOwnersInGroup,
       hasRemovedAllHomeOwners,
@@ -601,7 +602,8 @@ export default defineComponent({
         return groups.some(group => group.owners.filter(owner => owner.action !== ActionTypes.REMOVED).length === 0)
       }),
       isValidAllocation: computed((): boolean => {
-        return !showGroups.value || !getTotalOwnershipAllocationStatus().hasTotalAllocationError
+        return !showGroups.value || !getTotalOwnershipAllocationStatus().hasTotalAllocationError ||
+          [HomeTenancyTypes.SOLE, HomeTenancyTypes.JOINT].includes(getHomeTenancyType())
       })
     })
 

diff --git a/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts b/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
@@ -353,7 +353,7 @@ export const useMhrInformation = () => {
       declaredValue: getMhrTransferDeclaredValue.value,
       consideration: getMhrTransferConsideration.value,
       transferDate: getMhrTransferDate.value,
-      ownLand: getMhrTransferOwnLand.value || null,
+      ownLand: getMhrTransferOwnLand.value,
       ...(getMhrTransferDocumentId.value && {
         documentId: getMhrTransferDocumentId.value
       }),

diff --git a/ppr-ui/src/composables/mhrRegistration/useHomeOwners.ts b/ppr-ui/src/composables/mhrRegistration/useHomeOwners.ts
@@ -77,6 +77,7 @@ export function useHomeOwners (isMhrTransfer: boolean = false) {
     isGlobalEditingMode.value = isEditing
   }
 
+  /** Returns the Home Tenancy Type based on the CURRENT state of the Home Owners */
   const getHomeTenancyType = (): HomeTenancyTypes => {
     // check if there are any groups with mixed owner types for Sale or Gift transfers
     if (isMhrTransfer &&