From 8fe8c7698c5f9b3703f9c9abd38efa7b81300ab3 Mon Sep 17 00:00:00 2001
From: Cameron Bowler <cameron.bowler@ca.ey.com>
Date: Tue, 26 Nov 2024 05:58:32 -0800
Subject: [PATCH 1/3] UXA Updates and Draft Verification

---
 ppr-ui/package-lock.json                            |  4 ++--
 ppr-ui/package.json                                 |  2 +-
 .../mhrRegistration/HomeOwners/HomeOwnersTable.vue  | 13 +++++++++----
 ppr-ui/src/views/mhrInformation/MhrInformation.vue  |  1 -
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
index fa6878d6d..32cf68491 100644
--- a/ppr-ui/package-lock.json
+++ b/ppr-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ppr-ui",
-  "version": "3.3.6",
+  "version": "3.3.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ppr-ui",
-      "version": "3.3.6",
+      "version": "3.3.7",
       "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 dcf0b4fba..d42c6b618 100644
--- a/ppr-ui/package.json
+++ b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "3.3.6",
+  "version": "3.3.7",
   "private": true,
   "appName": "Assets UI",
   "sbcName": "SBC Common Components",
diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
index 0187780e8..b60362968 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
@@ -142,8 +142,13 @@
               <div
                 v-else-if="item.ownerId"
                 :key="`owner-row-key-${homeOwners.indexOf(item)}`"
-                class="owner-info"
-                :class="{ 'border-error-left': isInvalidOwnerGroup(item.groupId) }"
+                class="owner-row owner-info"
+                :class="{
+                  'border-error-left': isInvalidOwnerGroup(item.groupId),
+                  'no-bottom-border': (isRemovedHomeOwner(item) &&
+                    (showDeathCertificate() || showSupportingDocuments()) &&
+                    isReadonlyTable)
+                }"
                 :data-test-id="`owner-info-${item.ownerId}`"
               >
                 <!-- Start of Name -->
@@ -1355,8 +1360,8 @@ export default defineComponent({
       border-radius: 0 !important;
     }
 
-    .owner-row:not(:last-child) tr > td,
-    .bottom-border, .owner-info {
+    .owner-row,
+    .bottom-border {
       border-bottom: thin solid rgba(0, 0, 0, 0.12);
     }
 
diff --git a/ppr-ui/src/views/mhrInformation/MhrInformation.vue b/ppr-ui/src/views/mhrInformation/MhrInformation.vue
index 754035fe4..a172a49cf 100644
--- a/ppr-ui/src/views/mhrInformation/MhrInformation.vue
+++ b/ppr-ui/src/views/mhrInformation/MhrInformation.vue
@@ -266,7 +266,6 @@
                 <section
                   v-if="!isChangeLocationActive && !isCancelChangeLocationActive && !isExtendChangeLocationActive"
                 >
-                  <v-divider class="mx-7 ma-0" />
                   <TransferDetailsReview class="py-6 pt-4 px-8" />
                 </section>
 

From 2058bfcd24fe35630077f27c77be85c1e4cbd181 Mon Sep 17 00:00:00 2001
From: Cameron Bowler <cameron.bowler@ca.ey.com>
Date: Tue, 26 Nov 2024 11:34:06 -0800
Subject: [PATCH 2/3] Disable name edits on OTHER Transfers

---
 ppr-ui/src/composables/mhrInformation/useTransferOwners.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ppr-ui/src/composables/mhrInformation/useTransferOwners.ts b/ppr-ui/src/composables/mhrInformation/useTransferOwners.ts
index 405840db5..757821c88 100644
--- a/ppr-ui/src/composables/mhrInformation/useTransferOwners.ts
+++ b/ppr-ui/src/composables/mhrInformation/useTransferOwners.ts
@@ -178,7 +178,8 @@ export const useTransferOwners = (enableAllActions: boolean = false) => {
 
   /** Returns true when Add/Edit Owner name fields should be disabled **/
   const disableNameFields = computed((): boolean => {
-    return isTransferDueToDeath.value || isTransferBillOfSale.value || isTransferNonGiftBillOfSale.value
+    return isTransferDueToDeath.value || isTransferBillOfSale.value || isTransferNonGiftBillOfSale.value ||
+      isTransferWithoutBillOfSale.value
   })
 
   /** Returns true when ownership structure is joint tenancy /w min 2  owners but not executors, trustees or admins. **/

From 7e806233bc5a413418800dbc37f6d7f2dfe6e6ac Mon Sep 17 00:00:00 2001
From: Cameron Bowler <cameron.bowler@ca.ey.com>
Date: Wed, 27 Nov 2024 15:41:35 -0800
Subject: [PATCH 3/3] Updated Role Edit Permissions

---
 .../HomeOwners/AddEditHomeOwner.vue           |  6 +++-
 .../HomeOwners/HomeOwnerRoles.vue             | 29 +++----------------
 .../HomeOwners/HomeOwnersTable.vue            |  1 +
 .../mhrInformation/useTransferOwners.ts       |  3 +-
 4 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
index d06e9effd..d02e4bd80 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/AddEditHomeOwner.vue
@@ -391,7 +391,7 @@
                 variant="outlined"
                 color="error"
                 class="remove-btn"
-                :disabled="isAddingHomeOwner"
+                :disabled="isAddingHomeOwner || disableOwnerRemoval"
                 :ripple="false"
                 @click="remove()"
               >
@@ -486,6 +486,10 @@ export default defineComponent({
     showTableError: {
       type: Boolean,
       default: false
+    },
+    disableOwnerRemoval: {
+      type: Boolean,
+      default: false
     }
   },
   emits: ['remove', 'cancel'],
diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue
index 2cb63382e..b510a3fef 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnerRoles.vue
@@ -48,11 +48,10 @@
 </template>
 
 <script lang="ts">
-
 import { defineComponent, PropType, reactive, toRefs, watch } from 'vue'
 import { HomeOwnerPartyTypes } from '@/enums'
 import { HomeOwnerRoles } from '@/resources'
-import { useMhrInformation, useTransferOwners } from '@/composables'
+import { useTransferOwners } from '@/composables'
 
 
 export default defineComponent({
@@ -65,15 +64,9 @@ export default defineComponent({
   },
   emits: ['update:partyType'],
   setup (props, context) {
-    const { isFrozenMhrDueToUnitNote } = useMhrInformation()
     const {
       disableNameFields,
-      isTransferDueToDeath,
-      isTransferToAdminNoWill,
-      isTransferDueToSaleOrGift,
-      isTransferToExecutorProbateWill,
-      isTransferToExecutorUnder25Will,
-      isTransferToSurvivingJointTenant
+      isTransferWithoutBillOfSale
     } = useTransferOwners()
 
     const localState = reactive({
@@ -84,23 +77,9 @@ export default defineComponent({
 
     /**
      * Returns true when specific transfer type conditions are met for each respective party type
-     * @param partyType The specified party type from which to retrieve the conditions
      */
-    const isDisabledRadio = (partyType: HomeOwnerPartyTypes): boolean => {
-      switch (partyType) {
-        case HomeOwnerPartyTypes.OWNER_IND:
-        case HomeOwnerPartyTypes.OWNER_BUS:
-          return isTransferToExecutorProbateWill.value || isTransferToExecutorUnder25Will.value ||
-            isTransferToAdminNoWill.value || isTransferToSurvivingJointTenant.value
-        case HomeOwnerPartyTypes.EXECUTOR:
-          return disableNameFields.value || isTransferToAdminNoWill.value || isTransferDueToSaleOrGift.value ||
-            isFrozenMhrDueToUnitNote.value
-        case HomeOwnerPartyTypes.ADMINISTRATOR:
-          return isTransferToSurvivingJointTenant.value || isTransferToExecutorUnder25Will.value ||
-            isTransferToExecutorProbateWill.value || isTransferDueToSaleOrGift.value || isFrozenMhrDueToUnitNote.value
-        case HomeOwnerPartyTypes.TRUSTEE:
-          return isTransferDueToDeath.value || isTransferDueToSaleOrGift.value || isFrozenMhrDueToUnitNote.value
-      }
+    const isDisabledRadio = (): boolean => {
+      return disableNameFields.value && !isTransferWithoutBillOfSale.value
     }
 
     /** Apply local models to store when they change. **/
diff --git a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
index b60362968..74f1850da 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
@@ -132,6 +132,7 @@
                       :isHomeOwnerPerson="!item.organizationName"
                       :isMhrTransfer="isMhrTransfer"
                       :showTableError="validateTransfer && (isAddingMode || isEditingMode)"
+                      :disableOwnerRemoval="isDisabledForSJTChanges(item) || isDisabledForWillChanges(item)"
                       @cancel="currentlyEditingHomeOwnerId = -1"
                       @remove="removeOwnerHandler(item)"
                     />
diff --git a/ppr-ui/src/composables/mhrInformation/useTransferOwners.ts b/ppr-ui/src/composables/mhrInformation/useTransferOwners.ts
index 757821c88..5e06491e9 100644
--- a/ppr-ui/src/composables/mhrInformation/useTransferOwners.ts
+++ b/ppr-ui/src/composables/mhrInformation/useTransferOwners.ts
@@ -178,8 +178,7 @@ export const useTransferOwners = (enableAllActions: boolean = false) => {
 
   /** Returns true when Add/Edit Owner name fields should be disabled **/
   const disableNameFields = computed((): boolean => {
-    return isTransferDueToDeath.value || isTransferBillOfSale.value || isTransferNonGiftBillOfSale.value ||
-      isTransferWithoutBillOfSale.value
+    return !!getMhrTransferType.value?.transferType
   })
 
   /** Returns true when ownership structure is joint tenancy /w min 2  owners but not executors, trustees or admins. **/