Skip to content

Commit 2a7af5e

Browse files
rushk014xingzhang-suse
authored andcommitted
fix Scan History table error caused by immutable API getters
1 parent 9f72ccc commit 2a7af5e

File tree

2 files changed

+51
-43
lines changed

2 files changed

+51
-43
lines changed

pkg/sbombastic-image-vulnerability-scanner/components/RegistryDetailScanTable.vue

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,19 @@
4646
return rec.spec.registry === newRegistry.metadata.name;
4747
});
4848
49-
this.scanHistory = scanJobs.map((rec) => {
50-
rec.status.statusResult = rec.status.conditions.filter(condition => {
51-
return condition.status === "True";
52-
})[0] || {
53-
type: "Pending",
54-
lastTransitionTime: null,
55-
};
56-
return rec;
49+
scanJobs.forEach((rec) => {
50+
this.scanHistory.push({
51+
...rec,
52+
status: {
53+
...rec.status,
54+
statusResult: rec.status.conditions.filter(condition => {
55+
return condition.status === "True";
56+
})[0] || {
57+
type: "Pending",
58+
lastTransitionTime: null,
59+
}
60+
}
61+
})
5762
});
5863
}
5964
}

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

Lines changed: 38 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export const REGISTRY_SCAN_TABLE = [
4848
return {
4949
progress: row.progress,
5050
error: row.error,
51-
}
51+
};
5252
},
5353
formatter: "ProgressCell",
5454
sort: "progress",
@@ -70,6 +70,7 @@ export const REGISTRY_SCAN_HISTORY_TABLE = [
7070
value: "status.statusResult.type",
7171
formatter: "RegistryStatusCellBadge",
7272
sort: "status",
73+
width: 100,
7374
},
7475
{
7576
name: "since",
@@ -110,42 +111,44 @@ export const REGISTRY_SCAN_HISTORY_TABLE = [
110111
value: "status.statusResult.message",
111112
formatter: "ScanErrorCell",
112113
sort: "errors",
114+
width: 150,
113115
},
114116
];
115117

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

0 commit comments

Comments
 (0)