diff --git a/pkg/sbombastic-image-vulnerability-scanner/components/RegistryDetailScanTable.vue b/pkg/sbombastic-image-vulnerability-scanner/components/RegistryDetailScanTable.vue index 1d2fb25..b4d57aa 100644 --- a/pkg/sbombastic-image-vulnerability-scanner/components/RegistryDetailScanTable.vue +++ b/pkg/sbombastic-image-vulnerability-scanner/components/RegistryDetailScanTable.vue @@ -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, + } + } + }) }); } } diff --git a/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts b/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts index e70e63d..d89264c 100644 --- a/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts +++ b/pkg/sbombastic-image-vulnerability-scanner/config/table-headers.ts @@ -48,7 +48,7 @@ export const REGISTRY_SCAN_TABLE = [ return { progress: row.progress, error: row.error, - } + }; }, formatter: "ProgressCell", sort: "progress", @@ -70,6 +70,7 @@ export const REGISTRY_SCAN_HISTORY_TABLE = [ value: "status.statusResult.type", formatter: "RegistryStatusCellBadge", sort: "status", + width: 100, }, { name: "since", @@ -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", + }, ];