From 68734329c568edc1b9df14bbca83e8aad7cf1b3f Mon Sep 17 00:00:00 2001
From: Daniel Pacak <pacak.daniel@gmail.com>
Date: Sat, 26 Feb 2022 00:20:10 +0100
Subject: [PATCH] fix: show all CIS benchmark sections (#76)

Signed-off-by: Daniel Pacak <pacak.daniel@gmail.com>
---
 package-lock.json                            |  4 +--
 package.json                                 |  2 +-
 src/ciskubebenchreports/cisresults-list.scss |  5 ++--
 src/ciskubebenchreports/cisresults-list.tsx  |  5 +---
 src/ciskubebenchreports/cissections-list.tsx | 26 ++++++++++++++------
 src/ciskubebenchreports/details.tsx          | 26 +++++++++++---------
 src/configauditreports/checks-list.tsx       |  1 +
 src/vulnerabilityreports/list.tsx            | 11 ++++-----
 8 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b15ff53..fe1aa9e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@aquasecurity/starboard-lens-extension",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@aquasecurity/starboard-lens-extension",
-      "version": "0.6.0",
+      "version": "0.7.0",
       "license": "Apache-2.0",
       "devDependencies": {
         "@emotion/css": "^11.0.0",
diff --git a/package.json b/package.json
index 0f5f538..432baf4 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@aquasecurity/starboard-lens-extension",
   "publisher": "aquasecurity.github.io",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Lens extension for viewing Starboard security information",
   "homepage": "https://github.com/aquasecurity/starboard-lens-extension",
   "repository": {
diff --git a/src/ciskubebenchreports/cisresults-list.scss b/src/ciskubebenchreports/cisresults-list.scss
index b6a09e4..0b5b32a 100644
--- a/src/ciskubebenchreports/cisresults-list.scss
+++ b/src/ciskubebenchreports/cisresults-list.scss
@@ -7,12 +7,13 @@
 
     .TableCell {
       &.number {
-        text-align: right;
+        text-align: left;
         flex-grow: 0.1;
       }
 
       &.status {
-        flex-grow: 0.2;
+        text-align: right;
+        flex-grow: 0.1;
       }
 
       .Badge {
diff --git a/src/ciskubebenchreports/cisresults-list.tsx b/src/ciskubebenchreports/cisresults-list.tsx
index 7b26a00..9005cd8 100644
--- a/src/ciskubebenchreports/cisresults-list.tsx
+++ b/src/ciskubebenchreports/cisresults-list.tsx
@@ -8,13 +8,11 @@ const {
         Table,
         TableRow,
         TableCell,
-        DrawerTitle,
         Badge,
     }
 } = Renderer;
 
 interface Props {
-    title: string;
     results: CISResult[];
 }
 
@@ -40,11 +38,10 @@ export class CISResultsList extends React.Component<Props> {
     }
 
     render() {
-        const {results, title} = this.props
+        const {results} = this.props
 
         return (
             <div className="CISResultsList flex column">
-                <DrawerTitle title={title}/>
                 <Table selectable scrollable={false} className="CISResultsTable box grow">
                     {
                         results.map((result, index) => this.getTableRow(index))
diff --git a/src/ciskubebenchreports/cissections-list.tsx b/src/ciskubebenchreports/cissections-list.tsx
index ccee28d..bdc3931 100644
--- a/src/ciskubebenchreports/cissections-list.tsx
+++ b/src/ciskubebenchreports/cissections-list.tsx
@@ -1,6 +1,13 @@
 import React from "react";
 import {CISResultsList} from "./cisresults-list";
 import {CISSection} from "./types";
+import {Renderer} from "@k8slens/extensions";
+
+const {
+    Component: {
+        DrawerTitle,
+    }
+} = Renderer;
 
 interface Props {
     sections: CISSection[];
@@ -11,13 +18,16 @@ export class CISSectionsList extends React.Component<Props> {
     render() {
         const {sections} = this.props
 
-        return (
-            <div>
-                {
-                    sections.map((section, index) =>
-                        <CISResultsList title={section.id + " " + section.text} results={section.tests[0].results}/>)
-                }
-            </div>
-        )
+        let rows = []
+
+        for (let section of sections) {
+            rows.push(<DrawerTitle title={section.id + " " + section.text}/>)
+            for (let test of section.tests) {
+                rows.push(<DrawerTitle title={test.section + " " + test.desc}/>)
+                rows.push(<CISResultsList results={test.results}/>)
+            }
+        }
+
+        return <div>{rows}</div>
     }
 }
diff --git a/src/ciskubebenchreports/details.tsx b/src/ciskubebenchreports/details.tsx
index f1dd1c8..f7e3dbd 100644
--- a/src/ciskubebenchreports/details.tsx
+++ b/src/ciskubebenchreports/details.tsx
@@ -4,6 +4,14 @@ import React from "react";
 import {CISSectionsList} from "./cissections-list";
 import {CISKubeBenchReport} from "./types";
 
+const {
+    Component: {
+        KubeObjectMeta,
+        DrawerItem,
+        Badge,
+    }
+} = Renderer;
+
 export interface CISKubeBenchReportDetailsProps extends Renderer.Component.KubeObjectDetailsProps<CISKubeBenchReport> {
     showObjectMeta?: boolean
 }
@@ -16,28 +24,24 @@ export class CISKubeBenchReportDetails extends React.Component<CISKubeBenchRepor
         return (
             <div className="CISKubeBenchReportDetails">
                 {this.props.showObjectMeta &&
-                <Renderer.Component.KubeObjectMeta
+                <KubeObjectMeta
                     object={report}
                     hideFields={["uid", "resourceVersion", "selfLink"]}/>}
 
-                <Renderer.Component.DrawerItem name="Summary" className="summary" labelsOnly>
-                    <Renderer.Component.Badge
-                        className="Badge theme-fail"
+                <DrawerItem name="Summary" className="summary" labelsOnly>
+                    <Badge className="Badge theme-fail"
                         label={report.report.summary.failCount}
                         tooltip="Fail"/>
-                    <Renderer.Component.Badge
-                        className="Badge theme-warn"
+                    <Badge className="Badge theme-warn"
                         label={report.report.summary.warnCount}
                         tooltip="Warn"/>
-                    <Renderer.Component.Badge
-                        className="Badge theme-info"
+                    <Badge className="Badge theme-info"
                         label={report.report.summary.infoCount}
                         tooltip="Info"/>
-                    <Renderer.Component.Badge
-                        className="Badge theme-pass"
+                    <Badge className="Badge theme-pass"
                         label={report.report.summary.passCount}
                         tooltip="Pass"/>
-                </Renderer.Component.DrawerItem>
+                </DrawerItem>
 
                 <CISSectionsList sections={report.report.sections}/>
 
diff --git a/src/configauditreports/checks-list.tsx b/src/configauditreports/checks-list.tsx
index 0471c99..cee9684 100644
--- a/src/configauditreports/checks-list.tsx
+++ b/src/configauditreports/checks-list.tsx
@@ -69,6 +69,7 @@ export class ChecksList extends React.Component<Props> {
         return (
             <div className="ChecksList">
                 <Table tableId="configurationChecksTable"
+                       selectable
                        virtual={virtual}
                        items={sorted}
                        getTableRow={this.getTableRow}
diff --git a/src/vulnerabilityreports/list.tsx b/src/vulnerabilityreports/list.tsx
index 683b6c6..e12afac 100644
--- a/src/vulnerabilityreports/list.tsx
+++ b/src/vulnerabilityreports/list.tsx
@@ -1,6 +1,5 @@
 import "./list.scss"
 import React from "react"
-import styled from "@emotion/styled"
 import {Renderer} from "@k8slens/extensions"
 import {Vulnerability} from "./types";
 
@@ -77,11 +76,11 @@ export class VulnerabilitiesList extends React.Component<Props> {
 
         return (
             <div className="VulnerabilitiesList">
-                <Table
-                    tableId="vulnerabilitiesTable"
-                    virtual={virtual}
-                    items={sorted}
-                    getTableRow={this.getTableRow}
+                <Table tableId="vulnerabilitiesTable"
+                       selectable
+                       virtual={virtual}
+                       items={sorted}
+                       getTableRow={this.getTableRow}
                 >
                     <TableHead>
                         <TableCell className="vulnerabilityID">ID</TableCell>