From 6513b600e20bffb0d97f776455ec7c2b725ff555 Mon Sep 17 00:00:00 2001
From: Dima K <dima1086@hotmail.com>
Date: Fri, 7 Jun 2024 06:37:21 -0700
Subject: [PATCH 1/2] Fixes for MHR Re-Registrations

---
 .../mhrRegistration/YourHome/HomeSections.vue | 11 ++++++-----
 .../tables/mhr/HomeSectionsTable.vue          | 19 ++++++++++++-------
 .../mhrRegistration/useMhrReRegistration.ts   |  4 +++-
 .../mhrRegistration/useNewMhrRegistration.ts  | 11 +++++++----
 ppr-ui/src/views/Dashboard.vue                |  2 ++
 5 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/ppr-ui/src/components/mhrRegistration/YourHome/HomeSections.vue b/ppr-ui/src/components/mhrRegistration/YourHome/HomeSections.vue
index 252f88dc8..725cd75f1 100644
--- a/ppr-ui/src/components/mhrRegistration/YourHome/HomeSections.vue
+++ b/ppr-ui/src/components/mhrRegistration/YourHome/HomeSections.vue
@@ -102,7 +102,8 @@ export default defineComponent({
     const {
       // Getters
       getMhrHomeSections,
-      getMhrRegistrationValidationModel
+      getMhrRegistrationValidationModel,
+      isMhrReRegistration
     } = storeToRefs(useStore())
 
     const {
@@ -125,7 +126,7 @@ export default defineComponent({
         return getMhrHomeSections.value.length >= 1
       }),
       numberOfSections: computed((): number => {
-        return isMhrCorrection.value
+        return isMhrCorrection.value || isMhrReRegistration.value
           ? getMhrHomeSections.value.filter(section => section.action !== ActionTypes.REMOVED).length
           : getMhrHomeSections.value.length
       }),
@@ -140,7 +141,7 @@ export default defineComponent({
 
     const addHomeSection = (homeSection: HomeSectionIF): void => {
       const homeSections = [...getMhrHomeSections.value]
-      if (isMhrCorrection.value) {
+      if (isMhrCorrection.value || isMhrReRegistration.value) {
         homeSection.action = ActionTypes.ADDED
       }
       // Add new home section to array
@@ -153,7 +154,7 @@ export default defineComponent({
       // Create edited homeSection without id
       const { ...editedSection } = homeSection
 
-      if (isMhrCorrection.value) {
+      if (isMhrCorrection.value || isMhrReRegistration.value) {
         correctHomeSection(editedSection)
       }
       // Apply edited section to temp array
@@ -166,7 +167,7 @@ export default defineComponent({
       const homeSections = [...getMhrHomeSections.value]
       const homeSectionIndex = homeSections.indexOf(homeSection)
 
-      if (isMhrCorrection.value) {
+      if (isMhrCorrection.value || isMhrReRegistration.value) {
         if (homeSection.action === ActionTypes.ADDED) {
           // for newly Added section - remove section completely
           homeSections.splice(homeSectionIndex, 1)
diff --git a/ppr-ui/src/components/tables/mhr/HomeSectionsTable.vue b/ppr-ui/src/components/tables/mhr/HomeSectionsTable.vue
index e38fb401c..588b7c801 100644
--- a/ppr-ui/src/components/tables/mhr/HomeSectionsTable.vue
+++ b/ppr-ui/src/components/tables/mhr/HomeSectionsTable.vue
@@ -7,7 +7,7 @@
     <v-table
       id="mh-home-sections-table"
       class="home-sections-table"
-      :class="{ 'mhr-correction': isMhrCorrection }"
+      :class="{ 'mhr-correction': isMhrCorrection || isMhrReRegistration }"
       fixedHeader
     >
       <template #default>
@@ -29,7 +29,8 @@
           <tr
             v-for="(item, index) in homeSections"
             :key="`${item}: ${index}`"
-            :class="{ 'deleted-section': isMhrCorrection && item.action === ActionTypes.REMOVED }"
+            :class="{ 'deleted-section': (isMhrCorrection || isMhrReRegistration)
+              && item.action === ActionTypes.REMOVED }"
           >
             <!-- Edit Form -->
             <template v-if="isActiveIndex(homeSections.indexOf(item))">
@@ -52,7 +53,7 @@
             <template v-else>
               <td :class="{ 'pl-0': isReviewMode }">
                 <span
-                  v-if="isMhrCorrection"
+                  v-if="(isMhrCorrection || isMhrReRegistration)"
                   class="dynamic-section-number"
                 />
                 <span v-else>
@@ -77,7 +78,7 @@
                 class="text-right pr-2"
               >
                 <v-btn
-                  v-if="isMhrCorrection && showCorrectUndoOptions(item)"
+                  v-if="(isMhrCorrection || isMhrReRegistration) && showCorrectUndoOptions(item)"
                   variant="plain"
                   color="primary"
                   :ripple="false"
@@ -106,7 +107,9 @@
                   <v-icon size="small">
                     mdi-pencil
                   </v-icon>
-                  <span v-if="isMhrCorrection && item.action !== ActionTypes.ADDED">{{ correctAmendLabel }}</span>
+                  <span v-if="isMhrCorrection && item.action !== ActionTypes.ADDED">
+                    {{ correctAmendLabel }}
+                  </span>
                   <span v-else>Edit</span>
                   <v-divider
                     class="ma-0 pl-3"
@@ -148,7 +151,7 @@
                       </v-list-item-subtitle>
                     </v-list-item>
                     <v-list-item
-                      v-if="isMhrCorrection && item.action !== ActionTypes.REMOVED"
+                      v-if="(isMhrCorrection || isMhrReRegistration) && item.action !== ActionTypes.REMOVED"
                       class="my-n2"
                     >
                       <v-list-item-subtitle
@@ -215,7 +218,8 @@ export default defineComponent({
   emits: ['edit', 'remove', 'undo', 'isEditing'],
   setup (props, context) {
     const {
-      getMhrBaseline
+      getMhrBaseline,
+      isMhrReRegistration
     } = storeToRefs(useStore())
 
     const { isMhrCorrection, correctAmendLabel } = useMhrCorrections()
@@ -258,6 +262,7 @@ export default defineComponent({
       remove,
       isActiveIndex,
       isMhrCorrection,
+      isMhrReRegistration,
       correctAmendLabel,
       getMhrBaseline,
       showCorrectUndoOptions,
diff --git a/ppr-ui/src/composables/mhrRegistration/useMhrReRegistration.ts b/ppr-ui/src/composables/mhrRegistration/useMhrReRegistration.ts
index 01f68a7bc..b57ff5c2d 100644
--- a/ppr-ui/src/composables/mhrRegistration/useMhrReRegistration.ts
+++ b/ppr-ui/src/composables/mhrRegistration/useMhrReRegistration.ts
@@ -46,6 +46,8 @@ export const useMhrReRegistration = () => {
       // remove props that should not be pre-populated into Re-Registration
       data.documentId = ''
       data.ownerGroups = []
+      data.attentionReference = ''
+      data.submittingParty = {}
       // parse Transport Permit data to correctly show Location of Home step
       parseMhrPermitData(data)
     } else {
@@ -68,7 +70,7 @@ export const useMhrReRegistration = () => {
     )
 
     if (!isDraft) {
-      await useNewMhrRegistration().initDraftOrCurrentMhr(data, false)
+      await useNewMhrRegistration().initDraftOrCurrentMhr(data)
     }
   }
 
diff --git a/ppr-ui/src/composables/mhrRegistration/useNewMhrRegistration.ts b/ppr-ui/src/composables/mhrRegistration/useNewMhrRegistration.ts
index 7bfae64f8..804398f8c 100644
--- a/ppr-ui/src/composables/mhrRegistration/useNewMhrRegistration.ts
+++ b/ppr-ui/src/composables/mhrRegistration/useNewMhrRegistration.ts
@@ -37,6 +37,7 @@ export const useNewMhrRegistration = (isMhrCorrections: boolean = false) => {
     setEmptyMhr,
     setFolioOrReferenceNumber,
     setMhrLocation,
+    setMhrLocationAllFields,
     setMhrDraftNumber,
     setMhrTableHistory,
     setMhrHomeDescription,
@@ -239,17 +240,19 @@ export const useNewMhrRegistration = (isMhrCorrections: boolean = false) => {
     // Show groups for Tenants in Common
     setShowGroups(getHomeTenancyType() === HomeTenancyTypes.COMMON)
     // Set Home Location
-    for (const [key, val] of Object.entries(mhrData.location)) {
-      setMhrLocation({ key, value: val })
+    const homeLocation = {} as MhrRegistrationHomeLocationIF
 
+    for (const [key, val] of Object.entries(mhrData.location)) {
+      homeLocation[key] = val
       // Map radio button options for Other Land Types
       if (
         [HomeLocationTypes.OTHER_RESERVE, HomeLocationTypes.OTHER_STRATA, HomeLocationTypes.OTHER_TYPE].includes(val)
       ) {
-        setMhrLocation({ key: 'otherType', value: val })
-        setMhrLocation({ key: 'locationType', value: HomeLocationTypes.OTHER_LAND })
+        homeLocation.otherType = val
+        homeLocation.locationType = HomeLocationTypes.OTHER_LAND
       }
     }
+    setMhrLocationAllFields(homeLocation)
   }
 
   const resetLocationInfoFields = (location: MhrLocationInfoIF): MhrLocationInfoIF => {
diff --git a/ppr-ui/src/views/Dashboard.vue b/ppr-ui/src/views/Dashboard.vue
index 60cb6bfb5..f7a3ff303 100644
--- a/ppr-ui/src/views/Dashboard.vue
+++ b/ppr-ui/src/views/Dashboard.vue
@@ -204,6 +204,7 @@ export default defineComponent({
       // Actions
       setSearchHistory,
       setSearchResults,
+      setMhrDraftNumber,
       setSearchedType,
       setSearchedValue,
       setSearchDebtorName,
@@ -266,6 +267,7 @@ export default defineComponent({
       setSearchedType(null)
       setSearchedValue('')
       setSearchResults(null)
+      setMhrDraftNumber('')
       onAppReady(props.appReady)
     })
 

From 6cffe83ff1f27411a22da57f45d0f4a480186bcb Mon Sep 17 00:00:00 2001
From: Dima K <dima1086@hotmail.com>
Date: Fri, 7 Jun 2024 06:38:01 -0700
Subject: [PATCH 2/2] Version update

---
 ppr-ui/package-lock.json | 4 ++--
 ppr-ui/package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
index 2279dfc87..fa81da8ac 100644
--- a/ppr-ui/package-lock.json
+++ b/ppr-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ppr-ui",
-  "version": "3.2.13",
+  "version": "3.2.14",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ppr-ui",
-      "version": "3.2.13",
+      "version": "3.2.14",
       "dependencies": {
         "@bcrs-shared-components/input-field-date-picker": "^1.0.0",
         "@lemoncode/fonk": "^1.5.1",
diff --git a/ppr-ui/package.json b/ppr-ui/package.json
index 2d6e44195..b447c65e4 100644
--- a/ppr-ui/package.json
+++ b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "3.2.13",
+  "version": "3.2.14",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",