From ddb55b84b6f39b3f25a6adadc051d9b45e6763e1 Mon Sep 17 00:00:00 2001
From: Cameron Bowler <cameron.bowler@ca.ey.com>
Date: Mon, 16 Sep 2024 07:25:53 -0700
Subject: [PATCH 1/5] A11Y-UXA-Items

---
 ppr-ui/package-lock.json                      |  4 +--
 ppr-ui/package.json                           |  2 +-
 .../HomeOwners/HomeOwnersTable.vue            | 29 ++++++++++---------
 .../src/components/tables/SearchHistory.vue   | 27 +++++++----------
 .../mhrInformation/useMhrInformation.ts       |  5 ++--
 ppr-ui/src/resources/tableHeaders.ts          |  1 +
 .../views/newMhrRegistration/HomeOwners.vue   |  2 --
 ppr-ui/tests/unit/MhrRegistration.spec.ts     |  2 --
 .../unit/MhrRegistrationHomeOwners.spec.ts    |  9 ------
 9 files changed, 32 insertions(+), 49 deletions(-)

diff --git a/ppr-ui/package-lock.json b/ppr-ui/package-lock.json
index fba5f0559..fde8f1d82 100644
--- a/ppr-ui/package-lock.json
+++ b/ppr-ui/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ppr-ui",
-  "version": "3.2.55",
+  "version": "3.2.56",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ppr-ui",
-      "version": "3.2.55",
+      "version": "3.2.56",
       "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 e505969ed..2339f8a33 100644
--- a/ppr-ui/package.json
+++ b/ppr-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ppr-ui",
-  "version": "3.2.55",
+  "version": "3.2.56",
   "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 57f7bdd4a..dde8861f4 100644
--- a/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
+++ b/ppr-ui/src/components/mhrRegistration/HomeOwners/HomeOwnersTable.vue
@@ -145,7 +145,7 @@
                 </div>
               </template>
 
-              <tr
+              <div
                 v-else-if="item.ownerId"
                 :key="`owner-row-key-${homeOwners.indexOf(item)}`"
                 class="owner-info"
@@ -163,32 +163,30 @@
                   ]"
                 >
                   <div :class="{ 'removed-owner': isRemovedHomeOwner(item) }">
-                    <div
+                    <span
                       v-if="item.individualName"
                       class="owner-icon-name"
+                      aria-label="Person"
                     >
                       <v-icon
                         class="mr-2"
-                        aria-hidden="false"
-                        aria-label="Owner Individual"
                         :class="{ 'person-executor-icon': item.partyType !== HomeOwnerPartyTypes.OWNER_IND }"
                       >
                         {{ getHomeOwnerIcon(item.partyType) }}
                       </v-icon>
-                      <div class="font-weight-bold">
+                      <span class="font-weight-bold">
                         {{ item.individualName.first }}
                         {{ item.individualName.middle }}
                         {{ item.individualName.last }}
-                      </div>
-                    </div>
-                    <div
+                      </span>
+                    </span>
+                    <span
                       v-else
                       class="owner-icon-name"
+                      aria-label="Business"
                     >
                       <v-icon
                         class="mr-2"
-                        aria-hidden="false"
-                        aria-label="Owner Business"
                         :class="{ 'business-executor-icon': item.partyType !== HomeOwnerPartyTypes.OWNER_BUS }"
                       >
                         {{ getHomeOwnerIcon(item.partyType, true) }}
@@ -196,7 +194,7 @@
                       <div class="font-weight-bold">
                         {{ item.organizationName }}
                       </div>
-                    </div>
+                    </span>
 
                     <div
                       v-if="item.partyType === HomeOwnerPartyTypes.OWNER_IND ||
@@ -516,7 +514,7 @@
                     </template>
                   </template>
                 </td>
-              </tr>
+              </div>
 
               <!-- For MHR scenarios where users can entirely remove added owners -->
               <tr v-else-if="!hideRemovedOwners && !showGroups">
@@ -1322,13 +1320,14 @@ export default defineComponent({
     }
 
     tbody > tr > td > div > tr > td,
-    tbody > tr > td {
+    tbody > tr > td,
+    .owner-info {
       padding: 20px 0;
       border-radius: 0 !important;
     }
 
     .owner-row:not(:last-child) tr > td,
-    .bottom-border {
+    .bottom-border, .owner-info {
       border-bottom: thin solid rgba(0, 0, 0, 0.12);
     }
 
@@ -1349,6 +1348,7 @@ export default defineComponent({
     .owner-info {
       width: 100%;
       display: inline-flex;
+      align-items: baseline;
 
       td {
         white-space: normal;
@@ -1415,6 +1415,7 @@ export default defineComponent({
     }
 
     .owner-info {
+      align-items: baseline;
       min-width: 50rem;
       display: flex;
     }
diff --git a/ppr-ui/src/components/tables/SearchHistory.vue b/ppr-ui/src/components/tables/SearchHistory.vue
index ec6d4adb9..b8eedcba2 100644
--- a/ppr-ui/src/components/tables/SearchHistory.vue
+++ b/ppr-ui/src/components/tables/SearchHistory.vue
@@ -41,22 +41,17 @@
                 :class="{ 'added-search-effect': searchAdded && index === 0 }"
               >
                 <td>
-                  <v-row noGutters>
-                    <v-col cols="2">
-                      <v-icon
-                        class="pr-2 mt-n1"
-                        color="#212529"
-                        aria-hidden="false"
-                        :aria-label="headers[0].text + ',' + (isPprSearch(item) ? 'PPR Search' : 'MHR Search')"
-                        role="img"
-                      >
-                        {{ isPprSearch(item) ? 'mdi-account-details' : 'mdi-home' }}
-                      </v-icon>
-                    </v-col>
-                    <v-col>
-                      {{ displaySearchValue(item.searchQuery) }}
-                    </v-col>
-                  </v-row>
+                  <v-icon
+                    class="pr-2 mt-n1"
+                    color="#212529"
+                    aria-hidden="false"
+                    :aria-label="
+                      headers[0].text + ',' + (isPprSearch(item) ? 'PPR' : 'MHR') + displaySearchValue(item.searchQuery)
+                    "
+                  >
+                    {{ isPprSearch(item) ? 'mdi-account-details' : 'mdi-home' }}
+                  </v-icon>
+                  <span aria-hidden="true">{{ displaySearchValue(item.searchQuery) }}</span>
                 </td>
                 <td>
                   <span
diff --git a/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts b/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
index 992c7c554..f885f56b5 100644
--- a/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
+++ b/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
@@ -87,7 +87,6 @@ export const useMhrInformation = () => {
     setShowGroups
   } = useHomeOwners(true)
   const {
-    isTransferToExecOrAdmin,
     isTransferDueToDeath,
     getCurrentOwnerGroupIdByOwnerId,
     isTransferNonGiftBillOfSale,
@@ -482,8 +481,8 @@ export const useMhrInformation = () => {
           // Determine group tenancy type
           type: (ownerGroup.owners.filter(owner => owner.action === ActionTypes.REMOVED).length > 1 ||
                 getMhrTransferType.value?.transferType === ApiTransferTypes.SURVIVING_JOINT_TENANT)
-                ? isTransferToExecOrAdmin.value
-                  ? ApiHomeTenancyTypes.NA
+                ? getMhrTransferType.value?.transferType === ApiTransferTypes.TO_EXECUTOR_PROBATE_WILL
+                  ? ApiHomeTenancyTypes.NA 
                   : ApiHomeTenancyTypes.JOINT
                 : getMhrTransferHomeOwnerGroups.value.length > 1
                   ? ApiHomeTenancyTypes.NA
diff --git a/ppr-ui/src/resources/tableHeaders.ts b/ppr-ui/src/resources/tableHeaders.ts
index f8997ac5c..3931c0314 100644
--- a/ppr-ui/src/resources/tableHeaders.ts
+++ b/ppr-ui/src/resources/tableHeaders.ts
@@ -897,6 +897,7 @@ export const homeOwnersTableHeaders: Array<BaseHeaderIF> = [
   {
     class: 'actions column-md',
     sortable: false,
+    text: '',
     value: 'actions'
   }
 ]
diff --git a/ppr-ui/src/views/newMhrRegistration/HomeOwners.vue b/ppr-ui/src/views/newMhrRegistration/HomeOwners.vue
index 14c732461..d87b6c24f 100644
--- a/ppr-ui/src/views/newMhrRegistration/HomeOwners.vue
+++ b/ppr-ui/src/views/newMhrRegistration/HomeOwners.vue
@@ -14,8 +14,6 @@
     <section
       id="mhr-owners"
       :class="{'mt-10': !isReadonlyTable && !isMhrTransfer}"
-      role="region"
-      aria-labelledby="mhr-home-owners-list"
     >
       <template v-if="!isMhrTransfer">
         <h2>1. Owners</h2>
diff --git a/ppr-ui/tests/unit/MhrRegistration.spec.ts b/ppr-ui/tests/unit/MhrRegistration.spec.ts
index 7b9fd883b..cf3d6d6c1 100644
--- a/ppr-ui/tests/unit/MhrRegistration.spec.ts
+++ b/ppr-ui/tests/unit/MhrRegistration.spec.ts
@@ -19,8 +19,6 @@ import HomeLocation from '@/views/newMhrRegistration/HomeLocation.vue'
 import HomeOwners from '@/views/newMhrRegistration/HomeOwners.vue'
 import { MhrRegistrationHomeOwnerGroupIF } from '@/interfaces'
 import { PreviousHomeOwners } from '@/components/mhrRegistration'
-import { expect, it } from 'vitest'
-import { axe } from 'vitest-axe'
 
 const store = useStore()
 
diff --git a/ppr-ui/tests/unit/MhrRegistrationHomeOwners.spec.ts b/ppr-ui/tests/unit/MhrRegistrationHomeOwners.spec.ts
index 60c76cfa3..9dd8ae846 100644
--- a/ppr-ui/tests/unit/MhrRegistrationHomeOwners.spec.ts
+++ b/ppr-ui/tests/unit/MhrRegistrationHomeOwners.spec.ts
@@ -18,8 +18,6 @@ import { MhrCorrectionStaff, MixedRolesErrors } from '@/resources'
 import { useStore } from '../../src/store/store'
 import { useNewMhrRegistration } from '@/composables/mhrRegistration'
 import { defaultFlagSet } from '@/utils'
-import { expect, it } from 'vitest'
-import { axe } from 'vitest-axe'
 
 const store = useStore()
 
@@ -75,13 +73,6 @@ describe('Home Owners', () => {
 
   // Tests
 
-  it('should have no accessibility violations', async () => {
-    // Run the axe-core accessibility check on the component's HTML
-    const results = await axe(wrapper.html())
-    // Use the custom vitest-axe matcher to check for violations
-    expect(results).toHaveNoViolations()
-  })
-
   it('renders Home Owners and its sub components', () => {
     expect(wrapper.exists()).toBeTruthy()
     expect(wrapper.findComponent(AddEditHomeOwner).exists()).toBeFalsy() // Hidden by default

From a7c98f2cce20a9499a999f68d4fafc406bbd85c8 Mon Sep 17 00:00:00 2001
From: Cameron Bowler <cameron.bowler@ca.ey.com>
Date: Mon, 16 Sep 2024 07:29:21 -0700
Subject: [PATCH 2/5] Revert some unitended changes

---
 ppr-ui/src/composables/mhrInformation/useMhrInformation.ts | 4 ++--
 ppr-ui/src/resources/tableHeaders.ts                       | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts b/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
index f885f56b5..fdd85a583 100644
--- a/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
+++ b/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
@@ -481,8 +481,8 @@ export const useMhrInformation = () => {
           // Determine group tenancy type
           type: (ownerGroup.owners.filter(owner => owner.action === ActionTypes.REMOVED).length > 1 ||
                 getMhrTransferType.value?.transferType === ApiTransferTypes.SURVIVING_JOINT_TENANT)
-                ? getMhrTransferType.value?.transferType === ApiTransferTypes.TO_EXECUTOR_PROBATE_WILL
-                  ? ApiHomeTenancyTypes.NA 
+                ? isTransferToExecOrAdmin.value
+                  ? ApiHomeTenancyTypes.NA
                   : ApiHomeTenancyTypes.JOINT
                 : getMhrTransferHomeOwnerGroups.value.length > 1
                   ? ApiHomeTenancyTypes.NA
diff --git a/ppr-ui/src/resources/tableHeaders.ts b/ppr-ui/src/resources/tableHeaders.ts
index 3931c0314..f8997ac5c 100644
--- a/ppr-ui/src/resources/tableHeaders.ts
+++ b/ppr-ui/src/resources/tableHeaders.ts
@@ -897,7 +897,6 @@ export const homeOwnersTableHeaders: Array<BaseHeaderIF> = [
   {
     class: 'actions column-md',
     sortable: false,
-    text: '',
     value: 'actions'
   }
 ]

From 60505796c0366a33b07a4a18255aba9ab49a4349 Mon Sep 17 00:00:00 2001
From: Cameron Bowler <cameron.bowler@ca.ey.com>
Date: Mon, 16 Sep 2024 07:31:13 -0700
Subject: [PATCH 3/5] Include import

---
 ppr-ui/src/composables/mhrInformation/useMhrInformation.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts b/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
index fdd85a583..992c7c554 100644
--- a/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
+++ b/ppr-ui/src/composables/mhrInformation/useMhrInformation.ts
@@ -87,6 +87,7 @@ export const useMhrInformation = () => {
     setShowGroups
   } = useHomeOwners(true)
   const {
+    isTransferToExecOrAdmin,
     isTransferDueToDeath,
     getCurrentOwnerGroupIdByOwnerId,
     isTransferNonGiftBillOfSale,

From d57ee93fb13074457480fd8ba8da36f93744fde8 Mon Sep 17 00:00:00 2001
From: Cameron Bowler <cameron.bowler@ca.ey.com>
Date: Mon, 16 Sep 2024 07:40:10 -0700
Subject: [PATCH 4/5] unit test revert

---
 ppr-ui/tests/unit/MhrRegistrationHomeOwners.spec.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ppr-ui/tests/unit/MhrRegistrationHomeOwners.spec.ts b/ppr-ui/tests/unit/MhrRegistrationHomeOwners.spec.ts
index 9dd8ae846..60c76cfa3 100644
--- a/ppr-ui/tests/unit/MhrRegistrationHomeOwners.spec.ts
+++ b/ppr-ui/tests/unit/MhrRegistrationHomeOwners.spec.ts
@@ -18,6 +18,8 @@ import { MhrCorrectionStaff, MixedRolesErrors } from '@/resources'
 import { useStore } from '../../src/store/store'
 import { useNewMhrRegistration } from '@/composables/mhrRegistration'
 import { defaultFlagSet } from '@/utils'
+import { expect, it } from 'vitest'
+import { axe } from 'vitest-axe'
 
 const store = useStore()
 
@@ -73,6 +75,13 @@ describe('Home Owners', () => {
 
   // Tests
 
+  it('should have no accessibility violations', async () => {
+    // Run the axe-core accessibility check on the component's HTML
+    const results = await axe(wrapper.html())
+    // Use the custom vitest-axe matcher to check for violations
+    expect(results).toHaveNoViolations()
+  })
+
   it('renders Home Owners and its sub components', () => {
     expect(wrapper.exists()).toBeTruthy()
     expect(wrapper.findComponent(AddEditHomeOwner).exists()).toBeFalsy() // Hidden by default

From 2664f602ea808c8d0e2499730b063f52bfd4eb44 Mon Sep 17 00:00:00 2001
From: Cameron Bowler <cameron.bowler@ca.ey.com>
Date: Mon, 16 Sep 2024 07:43:45 -0700
Subject: [PATCH 5/5] ReAdd role

---
 ppr-ui/src/views/newMhrRegistration/HomeOwners.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ppr-ui/src/views/newMhrRegistration/HomeOwners.vue b/ppr-ui/src/views/newMhrRegistration/HomeOwners.vue
index d87b6c24f..14c732461 100644
--- a/ppr-ui/src/views/newMhrRegistration/HomeOwners.vue
+++ b/ppr-ui/src/views/newMhrRegistration/HomeOwners.vue
@@ -14,6 +14,8 @@
     <section
       id="mhr-owners"
       :class="{'mt-10': !isReadonlyTable && !isMhrTransfer}"
+      role="region"
+      aria-labelledby="mhr-home-owners-list"
     >
       <template v-if="!isMhrTransfer">
         <h2>1. Owners</h2>