Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A11Y-Table-UXA-Items #2023

Merged
merged 5 commits into from
Sep 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ppr-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ppr-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ppr-ui",
"version": "3.2.55",
"version": "3.2.56",
"private": true,
"appName": "Assets UI",
"sbcName": "SBC Common Components",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
</div>
</template>

<tr
<div
v-else-if="item.ownerId"
:key="`owner-row-key-${homeOwners.indexOf(item)}`"
class="owner-info"
Expand All @@ -163,40 +163,38 @@
]"
>
<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) }}
</v-icon>
<div class="font-weight-bold">
{{ item.organizationName }}
</div>
</div>
</span>

<div
v-if="item.partyType === HomeOwnerPartyTypes.OWNER_IND ||
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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);
}

Expand All @@ -1349,6 +1348,7 @@ export default defineComponent({
.owner-info {
width: 100%;
display: inline-flex;
align-items: baseline;

td {
white-space: normal;
Expand Down Expand Up @@ -1415,6 +1415,7 @@ export default defineComponent({
}

.owner-info {
align-items: baseline;
min-width: 50rem;
display: flex;
}
Expand Down
27 changes: 11 additions & 16 deletions ppr-ui/src/components/tables/SearchHistory.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions ppr-ui/tests/unit/MhrRegistration.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
Loading