diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js
index b79970578..2fdfe5f00 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsButton.js
@@ -32,7 +32,7 @@ export default class EventsButton extends Component {
hideCallback={this.hide}
exportFilename={this.props.exportFilename}/>
-
+
Events {this.createEventsAmountBadge()}
@@ -41,7 +41,7 @@ export default class EventsButton extends Component {
createEventsAmountBadge() {
const eventsAmountBadgeContent = this.props.event_count > 9 ? '9+' : this.props.event_count;
- return
{eventsAmountBadgeContent} ;
+ return
{eventsAmountBadgeContent} ;
}
}
diff --git a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
index b7f3f9139..066e79367 100644
--- a/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
+++ b/monkey/monkey_island/cc/ui/src/components/report-components/zerotrust/EventsModal.js
@@ -27,10 +27,10 @@ export default class EventsModal extends AuthComponent {
There {Pluralize('is', this.props.event_count)} {
{this.props.event_count}
}
+ className={'badge badge-primary'}>{this.props.event_count}
}
{Pluralize('event', this.props.event_count)} associated
with this finding.
- {
+ {
{this.props.latest_events.length + this.props.oldest_events.length}
} {Pluralize('is', this.props.event_count)} displayed below.
All events can be exported to json.
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 3e87e1062..5b8c75be8 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,7 +5,7 @@ import * as PropTypes from 'prop-types';
import PillarLabel from './PillarLabel';
import EventsButton from './EventsButton';
-const EVENTS_COLUMN_MAX_WIDTH = 160;
+const EVENTS_COLUMN_MAX_WIDTH = 170;
const PILLARS_COLUMN_MAX_WIDTH = 200;
const columns = [
{
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 b244969e7..6dac907e5 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
@@ -23,7 +23,7 @@ const pillarToIcon = {
export default class PillarLabel extends Component {
render() {
- const className = 'label ' + statusToLabelType[this.props.status];
+ const className = 'badge ' + statusToLabelType[this.props.status];
return
{this.props.pillar}
}
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 524cc4055..02e156439 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
@@ -2,29 +2,43 @@ import React, {Component} from 'react';
import StatusLabel from './StatusLabel';
import {ZeroTrustStatuses} from './ZeroTrustPillars';
import {NavLink} from 'react-router-dom';
-import {Panel} from 'react-bootstrap';
+import {Card, Collapse} from 'react-bootstrap';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
-import { faChevronDown } from '@fortawesome/free-solid-svg-icons/faChevronDown';
+import {FontAwesomeIcon} from '@fortawesome/react-fontawesome';
+import {faChevronDown} from '@fortawesome/free-solid-svg-icons/faChevronDown';
class ZeroTrustReportLegend extends Component {
+
+ constructor(props, context) {
+ super(props, context);
+
+ this.state = {
+ open: false,
+ };
+ }
+
render() {
const legendContent = this.getLegendContent();
+ const {open} = this.state;
return (
-
-
-
- Legend
-
-
-
-
- {legendContent}
-
-
-
+
+ this.setState({open: !open})}
+ aria-controls='collapse-content'
+ aria-expanded={open}
+ className={'collapse-control'}>
+ Legend
+
+
+
+
+
+ {legendContent}
+
+
+
+
);
}
@@ -35,7 +49,8 @@ class ZeroTrustReportLegend extends Component {
- {'\t'}At least one of the tests related to this component failed. This means that the Infection Monkey detected an
+ {'\t'}At least one of the tests related to this component failed. This means that the Infection Monkey
+ detected an
unmet Zero Trust requirement.
@@ -55,7 +70,7 @@ class ZeroTrustReportLegend extends Component {
{'\t'}This status means the test wasn't executed.To activate more tests, refer to the Monkey