diff --git a/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js b/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
index 7b1369dbc..5c6b24614 100755
--- a/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ZeroTrustReportPage.js
@@ -4,7 +4,7 @@ import AuthComponent from '../AuthComponent';
import ReportHeader, {ReportTypes} from "../report-components/common/ReportHeader";
import PillarsOverview from "../report-components/zerotrust/PillarOverview";
import FindingsTable from "../report-components/zerotrust/FindingsTable";
-import SinglePillarDirectivesStatus from "../report-components/zerotrust/SinglePillarDirectivesStatus";
+import SinglePillarRecommendationsStatus from "../report-components/zerotrust/SinglePillarRecommendationsStatus";
import MonkeysStillAliveWarning from "../report-components/common/MonkeysStillAliveWarning";
import ReportLoader from "../report-components/common/ReportLoader";
import MustRunMonkeyWarning from "../report-components/common/MustRunMonkeyWarning";
@@ -103,18 +103,18 @@ class ZeroTrustReportPageComponent extends AuthComponent {
}
generateDirectivesSection() {
- return (
-
Directives
+ return (
+
Recommendations
Analyze each zero trust recommendation by pillar, and see if you've followed through with it. See test results
to understand how the monkey tested your adherence to that recommendation.
{
Object.keys(this.state.directives).map((pillar) =>
-
)
}
@@ -126,15 +126,12 @@ class ZeroTrustReportPageComponent extends AuthComponent {
Summary
-
+
Get a quick glance of the status for each of Zero Trust's seven pillars.
-
-
-
@@ -145,6 +142,11 @@ class ZeroTrustReportPageComponent extends AuthComponent {
+
+
+
+
+
);
}
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 658d6d039..6d43f3cda 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
@@ -13,7 +13,7 @@ const columns = [
const pillarLabels = pillars.map((pillar) =>
);
- return {pillarLabels};
+ return {pillarLabels}
;
},
maxWidth: 200,
style: {'whiteSpace': 'unset'}
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/RecommendationsStatusTable.js
similarity index 88%
rename from monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/DirectivesStatusTable.js
rename to monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/RecommendationsStatusTable.js
index 26e272200..67891da64 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/RecommendationsStatusTable.js
@@ -15,7 +15,7 @@ const columns = [
},
maxWidth: 80
},
- { Header: 'Directive', accessor: 'directive',
+ { Header: 'Recommendation', accessor: 'directive',
style: {'whiteSpace': 'unset'} // This enables word wrap
},
{ Header: 'Tests', id: 'tests',
@@ -64,12 +64,12 @@ class TestsStatus extends AuthComponent {
}
}
-export class DirectivesStatusTable extends AuthComponent {
+export class RecommendationsStatusTable extends AuthComponent {
render() {
return ;
}
}
-export default DirectivesStatusTable;
+export default RecommendationsStatusTable;
-DirectivesStatusTable.propTypes = {directivesStatus: PropTypes.array};
+RecommendationsStatusTable.propTypes = {directivesStatus: PropTypes.array};
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js
index b12cbf5ba..05905bccc 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/ReportLegend.js
@@ -13,7 +13,7 @@ class ZeroTrustReportLegend extends Component {
- 🔽 Legend
+ Legend
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarDirectivesStatus.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarDirectivesStatus.js
deleted file mode 100644
index 9a5f9723d..000000000
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarDirectivesStatus.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import AuthComponent from "../../AuthComponent";
-import PillarLabel from "./PillarLabel";
-import DirectivesStatusTable from "./DirectivesStatusTable";
-import React, {Fragment} from "react";
-import * as PropTypes from "prop-types";
-import {Panel} from "react-bootstrap";
-
-export default class SinglePillarDirectivesStatus extends AuthComponent {
- render() {
- if (this.props.directivesStatus.length === 0) {
- return null;
- }
- else {
- return (
-
-
-
-
- 🔽
-
-
-
-
-
-
-
-
-
- );
- }
- }
-}
-
-SinglePillarDirectivesStatus.propTypes = {
- directivesStatus: PropTypes.array,
- pillar: PropTypes.string,
-};
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarRecommendationsStatus.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarRecommendationsStatus.js
new file mode 100644
index 000000000..cd2ce6420
--- /dev/null
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/SinglePillarRecommendationsStatus.js
@@ -0,0 +1,37 @@
+import AuthComponent from "../../AuthComponent";
+import PillarLabel from "./PillarLabel";
+import RecommendationsStatusTable from "./RecommendationsStatusTable";
+import React from "react";
+import * as PropTypes from "prop-types";
+import {Panel} from "react-bootstrap";
+
+export default class SinglePillarRecommendationsStatus extends AuthComponent {
+ render() {
+ if (this.props.recommendationsStatus.length === 0) {
+ return null;
+ }
+ else {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+ }
+ }
+}
+
+SinglePillarRecommendationsStatus.propTypes = {
+ recommendationsStatus: PropTypes.array,
+ pillar: PropTypes.string,
+};