@@ -244,8 +252,8 @@ class PreviewPaneComponent extends AuthComponent {
info = this.scanInfo(this.props.item);
break;
case 'node':
- info = this.props.item.group.includes('monkey', 'manual') ?
- this.infectedAssetInfo(this.props.item) : this.assetInfo(this.props.item);
+ info = this.props.item.group.includes('monkey', 'manual') ? this.infectedAssetInfo(this.props.item) :
+ this.props.item.group !== 'island' ? this.assetInfo(this.props.item) : this.islandAssetInfo();
break;
case 'island_edge':
info = this.islandEdgeInfo();
diff --git a/monkey_island/cc/ui/src/components/pages/ConfigurePage.js b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/pages/ConfigurePage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
diff --git a/monkey_island/cc/ui/src/components/pages/LicensePage.js b/monkey/monkey_island/cc/ui/src/components/pages/LicensePage.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/pages/LicensePage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/LicensePage.js
diff --git a/monkey_island/cc/ui/src/components/pages/LoginPage.js b/monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/pages/LoginPage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js
diff --git a/monkey_island/cc/ui/src/components/pages/MapPage.js b/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
similarity index 91%
rename from monkey_island/cc/ui/src/components/pages/MapPage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
index 4a54aeb8c..0a7e006aa 100644
--- a/monkey_island/cc/ui/src/components/pages/MapPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
@@ -1,10 +1,9 @@
import React from 'react';
-import {Col} from 'react-bootstrap';
+import {Col, Modal} from 'react-bootstrap';
import {Link} from 'react-router-dom';
import {Icon} from 'react-fa';
import PreviewPane from 'components/map/preview-pane/PreviewPane';
import {ReactiveGraph} from 'components/reactive-graph/ReactiveGraph';
-import {ModalContainer, ModalDialog} from 'react-modal-dialog';
import {options, edgeGroupToColor} from 'components/map/MapOptions';
import AuthComponent from '../AuthComponent';
@@ -28,7 +27,7 @@ class MapPageComponent extends AuthComponent {
componentDidMount() {
this.updateMapFromServer();
- this.interval = setInterval(this.timedEvents, 1000);
+ this.interval = setInterval(this.timedEvents, 5000);
}
componentWillUnmount() {
@@ -45,7 +44,7 @@ class MapPageComponent extends AuthComponent {
.then(res => res.json())
.then(res => {
res.edges.forEach(edge => {
- edge.color = edgeGroupToColor(edge.group);
+ edge.color = {'color': edgeGroupToColor(edge.group)};
});
this.setState({graph: res});
this.props.onStatusChange();
@@ -98,14 +97,10 @@ class MapPageComponent extends AuthComponent {
};
renderKillDialogModal = () => {
- if (!this.state.showKillDialog) {
- return
- }
-
return (
-
this.setState({showKillDialog: false})}>
- this.setState({showKillDialog: false})}>
- Are you sure you want to kill all monkeys?
+ this.setState({showKillDialog: false})}>
+
+ Are you sure you want to kill all monkeys?
This might take a few moments...
@@ -122,9 +117,10 @@ class MapPageComponent extends AuthComponent {
Cancel
-
-
+
+
)
+
};
renderTelemetryEntry(telemetry) {
diff --git a/monkey_island/cc/ui/src/components/pages/ReportPage.js b/monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
similarity index 88%
rename from monkey_island/cc/ui/src/components/pages/ReportPage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
index 4002f3251..281c4f009 100644
--- a/monkey_island/cc/ui/src/components/pages/ReportPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
@@ -25,7 +25,9 @@ class ReportPageComponent extends AuthComponent {
AZURE: 6,
STOLEN_SSH_KEYS: 7,
STRUTS2: 8,
- MSSQL: 9
+ WEBLOGIC: 9,
+ HADOOP: 10,
+ MSSQL: 11
};
Warning =
@@ -47,7 +49,7 @@ class ReportPageComponent extends AuthComponent {
componentDidMount() {
this.updateMonkeysRunning().then(res => this.getReportFromServer(res));
this.updateMapFromServer();
- this.interval = setInterval(this.updateMapFromServer, 1000);
+ this.interval = setInterval(this.updateMapFromServer, 5000);
}
componentWillUnmount() {
@@ -327,6 +329,12 @@ class ReportPageComponent extends AuthComponent {