Skip to content

Commit 83e431c

Browse files
NickChungSUSExingzhang-suse
authored andcommitted
change VEX Management Overview to use real data
1 parent eeedab0 commit 83e431c

File tree

4 files changed

+79
-278
lines changed

4 files changed

+79
-278
lines changed

pkg/sbombastic-image-vulnerability-scanner/components/common/VexStatusBadge.vue

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<div class="badge" :class="statusClass">
3-
<div v-if="status" class="text">{{ t(`imageScanner.enum.status.${status.toLowerCase()}`) }}</div>
3+
<div class="text">{{ t(`imageScanner.enum.status.${enabled? 'enabled' : 'disabled'}`) }}</div>
44
</div>
55

66
</template>
@@ -10,21 +10,13 @@ import { VEX_STATUS } from "@sbombastic-image-vulnerability-scanner/types";
1010
export default {
1111
name: 'VexStatusBadge',
1212
props: {
13-
status: {
14-
type: String,
15-
default: ''
13+
enabled: {
14+
type: Boolean
1615
}
1716
},
1817
computed: {
1918
statusClass() {
20-
switch ((this.status || '').toLowerCase()) {
21-
case VEX_STATUS.ENABLED:
22-
return 'enabled';
23-
case VEX_STATUS.DISABLED:
24-
return 'disabled';
25-
default:
26-
return '';
27-
}
19+
return this.enabled ? VEX_STATUS.ENABLED: VEX_STATUS.DISABLED;
2820
}
2921
}
3022
};

pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts

Lines changed: 34 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -110,40 +110,38 @@ export const REGISTRY_SCAN_HISTORY_TABLE = [
110110
];
111111

112112
export const VEX_MANAGEMENT_TABLE = [
113-
{
114-
name: "_status",
115-
labelKey: "imageScanner.vexManagement.table.headers.status",
116-
value: "_status",
117-
getValue: (row: any) => row._status,
118-
formatter: "VexStatusCellBadge",
119-
sort: "_status",
120-
},
121-
{
122-
name: "name",
123-
labelKey: "imageScanner.vexManagement.table.headers.name",
124-
value: "name",
125-
formatter: "VexNameLink",
126-
sort: "name",
127-
},
128-
{
129-
name: "uri",
130-
labelKey: "imageScanner.vexManagement.table.headers.uri",
131-
value: "uri",
132-
formatter: "UriExternalLink",
133-
sort: "uri",
134-
},
135-
{
136-
name: "createdBy",
137-
labelKey: "imageScanner.vexManagement.table.headers.createdBy",
138-
value: "createdBy",
139-
sort: "createdBy",
140-
},
141-
{
142-
name: "updated",
143-
labelKey: "imageScanner.vexManagement.table.headers.updated",
144-
value: "updated",
145-
getValue: (row: any) => row.updated,
146-
formatter: "VexDateFormatter",
147-
sort: "updated",
148-
},
113+
{
114+
name: "_status",
115+
labelKey: "imageScanner.vexManagement.table.headers.status",
116+
value: "spec.enabled",
117+
formatter: "VexStatusCellBadge",
118+
sort: "spec.enabled",
119+
},
120+
{
121+
name: "name",
122+
labelKey: "imageScanner.vexManagement.table.headers.name",
123+
value: "metadata.name",
124+
formatter: "VexNameLink",
125+
sort: "metadata.name",
126+
},
127+
{
128+
name: "uri",
129+
labelKey: "imageScanner.vexManagement.table.headers.uri",
130+
value: "spec.url",
131+
formatter: "UriExternalLink",
132+
sort: "spec.url",
133+
},
134+
{
135+
name: "createdBy",
136+
labelKey: "imageScanner.vexManagement.table.headers.createdBy",
137+
value: (row: any) => row?.metadata?.generation === 1 ? 'Rancher' : 'Manual entry',
138+
sort: "metadata.generation",
139+
},
140+
{
141+
name: "updated",
142+
labelKey: "imageScanner.vexManagement.table.headers.updated",
143+
value: (row: any) => row?.metadata?.creationTimestamp || '',
144+
formatter: "VexDateFormatter",
145+
sort: "metadata.creationTimestamp",
146+
}
149147
];

pkg/sbombastic-image-vulnerability-scanner/formatters/VexStatusCellBadge.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ export default {
66
},
77
props: {
88
value: {
9-
type: String,
9+
type: Boolean,
1010
required: true
1111
},
1212
},
1313
};
1414
</script>
1515

1616
<template>
17-
<VexStatusBadge :status="value.toLowerCase()" />
17+
<VexStatusBadge :enabled="value" />
1818
</template>

0 commit comments

Comments
 (0)