Skip to content

Commit

Permalink
feat: position scanner column as last one (#80)
Browse files Browse the repository at this point in the history 
Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
  • Loading branch information
@danielpacak
danielpacak authored Mar 1, 2022
1 parent 08d2113 commit 0933e79
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 15 deletions.
5 changes: 2 additions & 3 deletions src/ciskubebenchreports/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
]}
/>
)
Expand Down
29 changes: 21 additions & 8 deletions src/configauditreports/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,44 +3,54 @@ 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 (
<Renderer.Component.KubeObjectListLayout
<KubeObjectListLayout
tableId="ClusterConfigAuditReportsTable"
className="ConfigAuditReports" store={clusterStore}
sortingCallbacks={{
[sortBy.name]: (report: ClusterConfigAuditReport) => report.getName(),
[sortBy.danger]: (report: ClusterConfigAuditReport) => 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()
]}
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,
<Badge flat expandable={false} key="name" label={report.getName()}
tooltip={report.getName()}/>,
report.report.summary.dangerCount,
report.report.summary.warningCount,
report.report.summary.passCount,
report.report.scanner.name + " " + report.report.scanner.version,
]}
/>
)
Expand All @@ -51,7 +61,7 @@ export class ConfigAuditReportPage extends React.Component<{ extension: Renderer

render() {
return (
<Renderer.Component.KubeObjectListLayout
<KubeObjectListLayout
tableId="ConfigAuditReportsTable"
className="ConfigAuditReports" store={store}
sortingCallbacks={{
Expand All @@ -60,6 +70,7 @@ export class ConfigAuditReportPage extends React.Component<{ extension: Renderer
[sortBy.danger]: (report: ConfigAuditReport) => 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()
Expand All @@ -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(),
<Badge flat expandable={false} key="name" label={report.getName()}
tooltip={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,
]}
/>
)
Expand Down
8 changes: 4 additions & 4 deletions src/vulnerabilityreports/page.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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),
]}
/>
)
Expand Down Expand Up @@ -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),
]}
/>
)
Expand Down

0 comments on commit 0933e79

Please sign in to comment.