From d7543e111717362e480a51b22e42b0ecb85e9220 Mon Sep 17 00:00:00 2001
From: Shay Nehmad <shay.nehmad@guardicore.com>
Date: Mon, 2 Sep 2019 15:38:57 +0300
Subject: [PATCH] Extracted magic numbers to consts and deleted unused css file

---
 .../zerotrust/FindingsTable.js                | 10 ++++---
 .../zerotrust/PillarLabel.js                  |  1 -
 .../zerotrust/RecommendationsStatusTable.js   |  4 +--
 .../cc/ui/src/styles/ZeroTrustPillars.css     | 27 -------------------
 4 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 monkey/monkey_island/cc/ui/src/styles/ZeroTrustPillars.css

diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
index 924ddf631..acff1df89 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/FindingsTable.js
@@ -5,6 +5,8 @@ import * as PropTypes from "prop-types";
 import PillarLabel from "./PillarLabel";
 import EventsButton from "./EventsButton";
 
+const EVENTS_COLUMN_MAX_WIDTH = 160;
+const PILLARS_COLUMN_MAX_WIDTH = 200;
 const columns = [
   {
     columns: [
@@ -18,7 +20,7 @@ const columns = [
         accessor: x => {
           return <EventsButton events={x.events} exportFilename={"Events_" + x.test_key}/>;
         },
-        maxWidth: 160,
+        maxWidth: EVENTS_COLUMN_MAX_WIDTH,
       },
 
       {
@@ -30,7 +32,7 @@ const columns = [
           );
           return <div style={{textAlign: "center"}}>{pillarLabels}</div>;
         },
-        maxWidth: 200,
+        maxWidth: PILLARS_COLUMN_MAX_WIDTH,
         style: {'whiteSpace': 'unset'}
       },
     ]
@@ -41,8 +43,8 @@ const columns = [
 export class FindingsTable extends Component {
   render() {
     return <Fragment>
-      <h3>{<div style={{display: "inline-block"}}><StatusLabel status={this.props.status} showText={true}/>
-      </div>} tests' findings</h3>
+      <h3>{<span style={{display: "inline-block"}}><StatusLabel status={this.props.status} showText={true}/>
+      </span>} tests' findings</h3>
       <PaginatedTable data={this.props.data} pageSize={10} columns={columns}/>
     </Fragment>
   }
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarLabel.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarLabel.js
index 0724f9a13..51c5ca380 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarLabel.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarLabel.js
@@ -1,5 +1,4 @@
 import React, {Component} from "react";
-import 'styles/ZeroTrustPillars.css'
 import {statusToLabelType} from "./StatusLabel";
 import * as PropTypes from "prop-types";
 
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/RecommendationsStatusTable.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/RecommendationsStatusTable.js
index e2f9259de..e1ba3f814 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/RecommendationsStatusTable.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/RecommendationsStatusTable.js
@@ -1,12 +1,12 @@
 import React, {Fragment} from "react";
 import PaginatedTable from "../common/PaginatedTable";
 import AuthComponent from "../../AuthComponent";
-import 'styles/ZeroTrustPillars.css'
 import StatusLabel from "./StatusLabel";
 import * as PropTypes from "prop-types";
 import {ZeroTrustStatuses} from "./ZeroTrustPillars";
 
 
+const MAX_WIDTH_STATUS_COLUMN = 80;
 const columns = [
   {
     columns: [
@@ -14,7 +14,7 @@ const columns = [
         accessor: x => {
           return <StatusLabel status={x.status} size="fa-3x" showText={false} />;
         },
-        maxWidth: 80
+        maxWidth: MAX_WIDTH_STATUS_COLUMN
       },
       { Header: 'ZT Recommendation', accessor: 'recommendation',
         style: {'whiteSpace': 'unset'}  // This enables word wrap
diff --git a/monkey/monkey_island/cc/ui/src/styles/ZeroTrustPillars.css b/monkey/monkey_island/cc/ui/src/styles/ZeroTrustPillars.css
deleted file mode 100644
index 09b5289dc..000000000
--- a/monkey/monkey_island/cc/ui/src/styles/ZeroTrustPillars.css
+++ /dev/null
@@ -1,27 +0,0 @@
-.label-zt-data {
-  background-color: #FAD02C !important;
-}
-
-.label-zt-people {
-  background-color: #507581 !important;
-}
-
-.label-zt-networks {
-  background-color: #746233 !important;
-}
-
-.label-zt-devices {
-  background-color: #2F3B29 !important;
-}
-
-.label-zt-workloads {
-  background-color: #0C1440 !important;
-}
-
-.label-zt-analytics {
-  background-color: #6B8836 !important;
-}
-
-.label-zt-automation {
-  background-color: #B4BC82 !important;
-}