From 0933e79f14f49e951aac54896098c943bdb4be30 Mon Sep 17 00:00:00 2001 From: Daniel Pacak Date: Tue, 1 Mar 2022 16:05:23 +0100 Subject: [PATCH] feat: position scanner column as last one (#80) Signed-off-by: Daniel Pacak --- src/ciskubebenchreports/page.tsx | 5 ++--- src/configauditreports/page.tsx | 29 +++++++++++++++++++++-------- src/vulnerabilityreports/page.tsx | 8 ++++---- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/ciskubebenchreports/page.tsx b/src/ciskubebenchreports/page.tsx index 5789212..d0a92e7 100644 --- a/src/ciskubebenchreports/page.tsx +++ b/src/ciskubebenchreports/page.tsx @@ -31,20 +31,19 @@ export class CISKubeBenchReportsPage extends React.Component<{ extension: Render renderHeaderTitle="CISKubeBenchReports" renderTableHeader={[ {title: "Name", className: "name", sortBy: sortBy.name}, - {title: "Scanner", className: "scanner"}, {title: "Fail", className: "fail", sortBy: sortBy.fail}, {title: "Warn", className: "pass", sortBy: sortBy.warn}, {title: "Info", className: "xinfo", sortBy: sortBy.info}, {title: "Pass", className: "pass", sortBy: sortBy.pass}, - + {title: "Scanner", className: "scanner"}, ]} renderTableContents={(report: CISKubeBenchReport) => [ report.getName(), - report.report.scanner.name + " " + report.report.scanner.version, report.report.summary.failCount, report.report.summary.warnCount, report.report.summary.infoCount, report.report.summary.passCount, + report.report.scanner.name + " " + report.report.scanner.version, ]} /> ) diff --git a/src/configauditreports/page.tsx b/src/configauditreports/page.tsx index 587cd0e..6b6d282 100644 --- a/src/configauditreports/page.tsx +++ b/src/configauditreports/page.tsx @@ -3,19 +3,27 @@ import React from "react"; import {clusterStore, store} from "./store"; import {ClusterConfigAuditReport, ConfigAuditReport} from "./types"; +const { + Component: { + KubeObjectListLayout, + Badge, + } +} = Renderer; + enum sortBy { name = "name", namespace = "namespace", pass = "pass", danger = "danger", warning = "warning", + scanner = "scanner" } export class ClusterConfigAuditReportPage extends React.Component<{ extension: Renderer.LensExtension }> { render() { return ( - report.report.summary.dangerCount, [sortBy.warning]: (report: ClusterConfigAuditReport) => report.report.summary.warningCount, [sortBy.pass]: (report: ClusterConfigAuditReport) => report.report.summary.passCount, + [sortBy.scanner]: (report: ClusterConfigAuditReport) => report.report.scanner.name + " " + report.report.scanner.version, }} searchFilters={[ (report: ClusterConfigAuditReport) => report.getSearchFields() @@ -30,17 +39,18 @@ export class ClusterConfigAuditReportPage extends React.Component<{ extension: R renderHeaderTitle="ClusterConfigAuditReports" renderTableHeader={[ {title: "Name", sortBy: sortBy.name}, - {title: "Scanner"}, {title: "Danger", sortBy: sortBy.danger}, {title: "Warning", sortBy: sortBy.warning}, {title: "Pass", sortBy: sortBy.pass}, + {title: "Scanner", sortBy: sortBy.scanner}, ]} renderTableContents={(report: ClusterConfigAuditReport) => [ - report.getName(), - report.report.scanner.name + " " + report.report.scanner.version, + , report.report.summary.dangerCount, report.report.summary.warningCount, report.report.summary.passCount, + report.report.scanner.name + " " + report.report.scanner.version, ]} /> ) @@ -51,7 +61,7 @@ export class ConfigAuditReportPage extends React.Component<{ extension: Renderer render() { return ( - report.report.summary.dangerCount, [sortBy.warning]: (report: ConfigAuditReport) => report.report.summary.warningCount, [sortBy.pass]: (report: ConfigAuditReport) => report.report.summary.passCount, + [sortBy.scanner]: (report: ClusterConfigAuditReport) => report.report.scanner.name + " " + report.report.scanner.version, }} searchFilters={[ (report: ConfigAuditReport) => report.getSearchFields() @@ -68,18 +79,20 @@ export class ConfigAuditReportPage extends React.Component<{ extension: Renderer renderTableHeader={[ {title: "Name", sortBy: sortBy.name}, {title: "Namespace", sortBy: sortBy.namespace}, - {title: "Scanner",}, {title: "Danger", sortBy: sortBy.danger}, {title: "Warning", sortBy: sortBy.warning}, {title: "Pass", sortBy: sortBy.pass}, + {title: "Scanner", sortBy: sortBy.scanner}, + ]} renderTableContents={(report: ConfigAuditReport) => [ - report.getName(), + , report.metadata.namespace, - report.report.scanner.name + " " + report.report.scanner.version, report.report.summary.dangerCount, report.report.summary.warningCount, report.report.summary.passCount, + report.report.scanner.name + " " + report.report.scanner.version, ]} /> ) diff --git a/src/vulnerabilityreports/page.tsx b/src/vulnerabilityreports/page.tsx index c857e8d..4567e2a 100644 --- a/src/vulnerabilityreports/page.tsx +++ b/src/vulnerabilityreports/page.tsx @@ -42,23 +42,23 @@ export class ClusterVulnerabilityReportPage extends React.Component<{ extension: renderHeaderTitle="ClusterVulnerabilityReports" renderTableHeader={[ {title: "Name", className: "name", sortBy: sortBy.name}, - {title: "Scanner", className: "scanner"}, {title: "Image", className: "repository"}, {title: "Critical", className: "critical", sortBy: sortBy.critical}, {title: "High", className: "high", sortBy: sortBy.high}, {title: "Medium", className: "medium", sortBy: sortBy.medium}, {title: "Low", className: "low", sortBy: sortBy.low}, {title: "Unknown", sortBy: sortBy.unknown}, + {title: "Scanner", className: "scanner"}, ]} renderTableContents={(report: ClusterVulnerabilityReport) => [ renderName(report.getName()), - renderScanner(report.report.scanner), renderImage(report), report.report.summary.criticalCount, report.report.summary.highCount, report.report.summary.mediumCount, report.report.summary.lowCount, report.report.summary.unknownCount, + renderScanner(report.report.scanner), ]} /> ) @@ -89,24 +89,24 @@ export class VulnerabilityReportPage extends React.Component<{ extension: Render renderTableHeader={[ {title: "Name", className: "name", sortBy: sortBy.name}, {title: "Namespace", className: "namespace", sortBy: sortBy.namespace}, - {title: "Scanner", className: "scanner"}, {title: "Image", className: "repository"}, {title: "Critical", className: "critical", sortBy: sortBy.critical}, {title: "High", className: "high", sortBy: sortBy.high}, {title: "Medium", className: "medium", sortBy: sortBy.medium}, {title: "Low", className: "low", sortBy: sortBy.low}, {title: "Unknown", sortBy: sortBy.unknown}, + {title: "Scanner", className: "scanner"}, ]} renderTableContents={(report: VulnerabilityReport) => [ renderName(report.getName()), report.metadata.namespace, - renderScanner(report.report.scanner), renderImage(report), report.report.summary.criticalCount, report.report.summary.highCount, report.report.summary.mediumCount, report.report.summary.lowCount, report.report.summary.unknownCount, + renderScanner(report.report.scanner), ]} /> )