From 776b9410768f2034121aaaccf67cfaa548ec3730 Mon Sep 17 00:00:00 2001
From: Shay Nehmad <shay.nehmad@guardicore.com>
Date: Wed, 14 Aug 2019 09:31:45 +0300
Subject: [PATCH] Changed icons and fixed typo

---
 .../{PagenatedTable.js => PaginatedTable.js}     |  4 ++--
 .../zerotrust/DirectivesStatusTable.js           | 13 +++++++------
 .../report-components/zerotrust/FindingsTable.js |  4 ++--
 .../report-components/zerotrust/PillarGrades.js  |  4 ++--
 monkey/monkey_island/cc/ui/src/styles/App.css    | 16 ++++++++++++++++
 5 files changed, 29 insertions(+), 12 deletions(-)
 rename monkey/monkey_island/cc/ui/src/components/report-components/common/{PagenatedTable.js => PaginatedTable.js} (90%)

diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/common/PagenatedTable.js b/monkey/monkey_island/cc/ui/src/components/report-components/common/PaginatedTable.js
similarity index 90%
rename from monkey/monkey_island/cc/ui/src/components/report-components/common/PagenatedTable.js
rename to monkey/monkey_island/cc/ui/src/components/report-components/common/PaginatedTable.js
index 6a4652837..53ae1774d 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/common/PagenatedTable.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/common/PaginatedTable.js
@@ -1,7 +1,7 @@
 import React, {Component} from "react";
 import ReactTable from "react-table";
 
-class PagenatedTable extends Component {
+class PaginatedTable extends Component {
   render() {
     if (this.props.data.length > 0) {
       let defaultPageSize = this.props.data.length > this.props.pageSize ? this.props.pageSize : this.props.data.length;
@@ -26,4 +26,4 @@ class PagenatedTable extends Component {
   }
 }
 
-export default PagenatedTable;
+export default PaginatedTable;
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/DirectivesStatusTable.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/DirectivesStatusTable.js
index f1e2a5d43..4f413f37f 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/DirectivesStatusTable.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/DirectivesStatusTable.js
@@ -1,12 +1,13 @@
 import React from "react";
-import PagenatedTable from "../common/PagenatedTable";
+import PaginatedTable from "../common/PaginatedTable";
 import AuthComponent from "../../AuthComponent";
+import 'styles/ZeroTrustPillars.css'
 
 const statusToIcon = {
-  "Positive": "fa-shield alert-success",
-  "Inconclusive": "fa-question alert-info",
-  "Conclusive": "fa-unlock-alt alert-danger",
-  "Unexecuted": "fa-toggle-off",
+  "Positive": "fa-clipboard-check status-success",
+  "Inconclusive": "fa-exclamation-triangle status-warning",
+  "Conclusive": "fa-bomb status-danger",
+  "Unexecuted": "fa-question status-default",
 };
 
 const columns = [
@@ -65,7 +66,7 @@ class TestsStatus extends AuthComponent {
 
 export class DirectivesStatusTable extends AuthComponent {
   render() {
-    return <PagenatedTable data={this.props.directivesStatus} columns={columns} pageSize={5}/>;
+    return <PaginatedTable data={this.props.directivesStatus} columns={columns} pageSize={5}/>;
   }
 }
 
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 f2247461b..ae1c41d49 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
@@ -3,7 +3,7 @@ import {Button} from "react-bootstrap";
 import {EventsModal} from "./EventsModal";
 import FileSaver from "file-saver";
 import {PillarLabel} from "./PillarLabel";
-import PagenatedTable from "../common/PagenatedTable";
+import PaginatedTable from "../common/PaginatedTable";
 
 
 class EventsAndButtonComponent extends Component {
@@ -75,7 +75,7 @@ const columns = [
 class FindingsTable extends Component {
   render() {
     return (
-      <PagenatedTable data={this.props.findings} pageSize={10} columns={columns}/>
+      <PaginatedTable data={this.props.findings} pageSize={10} columns={columns}/>
     );
   }
 }
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarGrades.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarGrades.js
index 5c0d0d903..15e38607c 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarGrades.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/PillarGrades.js
@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import {PillarLabel} from "./PillarLabel";
-import PagenatedTable from "../common/PagenatedTable";
+import PaginatedTable from "../common/PaginatedTable";
 
 const columns = [
   {
@@ -19,7 +19,7 @@ const columns = [
 
 class PillarGrades extends Component {
   render() {
-    return <PagenatedTable data={this.props.pillars} columns={columns} pageSize={10}/>;
+    return <PaginatedTable data={this.props.pillars} columns={columns} pageSize={10}/>;
   }
 }
 
diff --git a/monkey/monkey_island/cc/ui/src/styles/App.css b/monkey/monkey_island/cc/ui/src/styles/App.css
index 9fc468f77..b617ab5d5 100644
--- a/monkey/monkey_island/cc/ui/src/styles/App.css
+++ b/monkey/monkey_island/cc/ui/src/styles/App.css
@@ -541,6 +541,22 @@ body {
   color: #e0ddde !important;
 }
 
+.status-success {
+  color: #24b716 !important;
+}
+
+.status-warning {
+  color: #b1a91c !important;
+}
+
+.status-danger {
+  color: #d91016 !important;
+}
+
+.status-default {
+  color: #575556 !important;
+}
+
 .attack-legend {
   text-align: center;
   margin-bottom: 20px;