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

[UXE-6210] feat: enhance digital certificates list with status details and tooltip #2159

Merged
merged 7 commits into from
Feb 17, 2025
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,21 @@ const adapt = (httpResponse) => {
trusted_ca_certificate: TRUSTED_CA_CERTIFICATE
}

const formattedStatus = item?.status ? parseStatusData(item.status) : '-'

let statusColumn = {
status: formattedStatus,
statusDetail: item?.status_detail
}

return {
id: checkIfFieldExist(item?.id, null),
name: checkIfFieldExist(item?.name),
issuer: checkIfFieldExist(item?.issuer),
subjectName: subjectNames,
type: checkIfFieldExist(typeMap[item?.type]),
validity: item?.validity ? parseValidityDate(item.validity) : '-',
status: item?.status ? parseStatusData(item.status) : '-'
status: statusColumn
}
})
: []
Expand Down
11 changes: 11 additions & 0 deletions src/templates/list-table-block/columns/column-builder.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import LanguageIconWithTextColumn from './language-icon-with-text-column.vue'
import TextWithTagColumn from './text-with-tag-column.vue'
import CreditCardColumn from './credit-card-column.vue'
import CountryFlagColumn from './country-flag-column.vue'
import TagWithTooltip from './tag-with-tooltip'

/**
* Build and return a specific column based on the given appearance.
*
Expand Down Expand Up @@ -101,6 +103,15 @@ export const columnBuilder = ({ data, columnAppearance, dependencies }) => {
country: data?.country,
code: data?.code
})
case 'tag-with-tooltip':
return h(TagWithTooltip, {
tagProps: {
value: data.content,
icon: data.icon,
severity: data.severity
},
tooltipText: data.tooltipText
})
default:
throw new Error('Invalid column appearance')
}
Expand Down
23 changes: 23 additions & 0 deletions src/templates/list-table-block/columns/tag-with-tooltip.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<template>
<div>
<PrimeTag
v-tooltip.top="{ value: tooltipText, showDelay: 200 }"
v-bind="tagProps"
v-if="displayTag"
/>
</div>
</template>

<script setup>
import PrimeTag from 'primevue/tag'
import { computed } from 'vue'

const props = defineProps({
tooltipText: String,
tagProps: Object
})

const displayTag = computed(() => {
return !!Object.keys(props.tagProps).length
})
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ const fixtures = {
subject_name: ['Subject 1', 'Subject 2'],
type: 'edge_certificate',
validity: new Date(2023, 10, 10),
status: 'active'
status: 'active',
status_detail: ''
},
trustedCertificateMock: {
id: 3,
Expand All @@ -21,15 +22,17 @@ const fixtures = {
subject_name: ['Subject 1', 'Subject 2'],
type: 'trusted_ca_certificate',
validity: new Date(2023, 10, 10),
status: 'active'
status: 'active',
status_detail: ''
},
certificateWithMissingData: {
id: 2,
name: 'Certificate 2',
subject_name: null,
type: null,
validity: null,
status: 'pending'
status: 'pending',
status_detail: 'Pending by error'
}
}

Expand Down Expand Up @@ -90,17 +93,23 @@ describe('DigitalCertificatesServices', () => {
subjectName: 'Subject 1,Subject 2',
validity: 'Nov 10, 2023, 12:00 AM',
status: {
content: 'Active',
severity: 'success'
status: {
content: 'Active',
severity: 'success'
},
statusDetail: ''
}
})
expect(parsedDomainMissingValues).toEqual({
id: 2,
issuer: '-',
name: 'Certificate 2',
status: {
content: 'Pending',
severity: 'danger'
status: {
content: 'Pending',
severity: 'danger'
},
statusDetail: 'Pending by error'
},
subjectName: '-',
type: '-',
Expand Down Expand Up @@ -141,8 +150,11 @@ describe('DigitalCertificatesServices', () => {
issuer: '-',
name: 'Certificate 2',
status: {
content: 'Inactive',
severity: 'danger'
status: {
content: 'Active',
severity: 'success'
},
statusDetail: ''
},
subjectName: '-',
type: '-',
Expand Down Expand Up @@ -186,8 +198,11 @@ describe('DigitalCertificatesServices', () => {
subjectName: 'Subject 1,Subject 2',
validity: 'Nov 10, 2023, 12:00 AM',
status: {
content: 'Active',
severity: 'success'
status: {
content: 'Active',
severity: 'success'
},
statusDetail: ''
}
}
])
Expand Down Expand Up @@ -216,8 +231,11 @@ describe('DigitalCertificatesServices', () => {
subjectName: 'Subject 1,Subject 2',
validity: 'Nov 10, 2023, 12:00 AM',
status: {
content: 'Active',
severity: 'success'
status: {
content: 'Active',
severity: 'success'
},
statusDetail: ''
}
}
])
Expand Down
5 changes: 3 additions & 2 deletions src/views/DigitalCertificates/ListView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@
'subject_name',
'issuer',
'status',
'status_detail',
'validity',
'type'
]
Expand Down Expand Up @@ -140,8 +141,8 @@
type: 'component',
component: (columnData) =>
columnBuilder({
data: columnData,
columnAppearance: 'tag'
data: { ...columnData.status, tooltipText: columnData.statusDetail },
columnAppearance: 'tag-with-tooltip'
})
}
]
Expand Down
Loading