Skip to content
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,19 @@
return rec.spec.registry === newRegistry.metadata.name;
});

this.scanHistory = scanJobs.map((rec) => {
rec.status.statusResult = rec.status.conditions.filter(condition => {
return condition.status === "True";
})[0] || {
type: "Pending",
lastTransitionTime: null,
};
return rec;
scanJobs.forEach((rec) => {
this.scanHistory.push({
...rec,
status: {
...rec.status,
statusResult: rec.status.conditions.filter(condition => {
return condition.status === "True";
})[0] || {
type: "Pending",
lastTransitionTime: null,
}
}
})
});
}
}
Expand Down
73 changes: 38 additions & 35 deletions pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ export const REGISTRY_SCAN_TABLE = [
return {
progress: row.progress,
error: row.error,
}
};
},
formatter: "ProgressCell",
sort: "progress",
Expand All @@ -70,6 +70,7 @@ export const REGISTRY_SCAN_HISTORY_TABLE = [
value: "status.statusResult.type",
formatter: "RegistryStatusCellBadge",
sort: "status",
width: 100,
},
{
name: "since",
Expand Down Expand Up @@ -110,42 +111,44 @@ export const REGISTRY_SCAN_HISTORY_TABLE = [
value: "status.statusResult.message",
formatter: "ScanErrorCell",
sort: "errors",
width: 150,
},
];

export const VEX_MANAGEMENT_TABLE = [
{
name: "_status",
labelKey: "imageScanner.vexManagement.table.headers.status",
value: "spec.enabled",
formatter: "VexStatusCellBadge",
sort: "spec.enabled",
},
{
name: "name",
labelKey: "imageScanner.vexManagement.table.headers.name",
value: "metadata.name",
formatter: "VexNameLink",
sort: "metadata.name",
},
{
name: "uri",
labelKey: "imageScanner.vexManagement.table.headers.uri",
value: "spec.url",
formatter: "UriExternalLink",
sort: "spec.url",
},
{
name: "createdBy",
labelKey: "imageScanner.vexManagement.table.headers.createdBy",
value: (row: any) => row?.metadata?.generation === 1 ? 'Rancher' : 'Manual entry',
sort: "metadata.generation",
},
{
name: "updated",
labelKey: "imageScanner.vexManagement.table.headers.updated",
value: (row: any) => row?.metadata?.creationTimestamp || '',
formatter: "VexDateFormatter",
sort: "metadata.creationTimestamp",
}
{
name: "_status",
labelKey: "imageScanner.vexManagement.table.headers.status",
value: "spec.enabled",
formatter: "VexStatusCellBadge",
sort: "spec.enabled",
},
{
name: "name",
labelKey: "imageScanner.vexManagement.table.headers.name",
value: "metadata.name",
formatter: "VexNameLink",
sort: "metadata.name",
},
{
name: "uri",
labelKey: "imageScanner.vexManagement.table.headers.uri",
value: "spec.url",
formatter: "UriExternalLink",
sort: "spec.url",
},
{
name: "createdBy",
labelKey: "imageScanner.vexManagement.table.headers.createdBy",
value: (row: any) =>
row?.metadata?.generation === 1 ? "Rancher" : "Manual entry",
sort: "metadata.generation",
},
{
name: "updated",
labelKey: "imageScanner.vexManagement.table.headers.updated",
value: (row: any) => row?.metadata?.creationTimestamp || "",
formatter: "VexDateFormatter",
sort: "metadata.creationTimestamp",
},
];