p15670423
/
monkey
1
0
Fork 5
Code Issues Pull Requests 3 Projects Releases Wiki Activity

Updated notification to only show if the island is not on the report page already

This commit is contained in:
Shay Nehmad 2019-09-09 11:47:16 +03:00
parent 313911fd77
commit 63d76f19f8
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
monkey/monkey_island/cc/ui/src/components/Main.js
View File

@ -29,7 +29,7 @@ let infectionMonkeyImage = require('../images/infection-monkey.svg');
let guardicoreLogoImage = require('../images/guardicore-logo.png'); let guardicoreLogoImage = require('../images/guardicore-logo.png');
let notificationIcon = require('../images/notification-logo-512x512.png'); let notificationIcon = require('../images/notification-logo-512x512.png');
const reportZeroTrustPath = '/report/zero_trust'; const reportZeroTrustRoute = '/report/zero_trust';
class AppComponent extends AuthComponent { class AppComponent extends AuthComponent {
updateStatus = () => { updateStatus = () => {
@ -202,7 +202,7 @@ class AppComponent extends AuthComponent {
{this.renderRoute('/infection/telemetry', <TelemetryPage onStatusChange={this.updateStatus}/>)} {this.renderRoute('/infection/telemetry', <TelemetryPage onStatusChange={this.updateStatus}/>)}
{this.renderRoute('/start-over', <StartOverPage onStatusChange={this.updateStatus}/>)} {this.renderRoute('/start-over', <StartOverPage onStatusChange={this.updateStatus}/>)}
{this.renderRoute('/report/security', <ReportPage onStatusChange={this.updateStatus}/>)} {this.renderRoute('/report/security', <ReportPage onStatusChange={this.updateStatus}/>)}
{this.renderRoute(reportZeroTrustPath, <ZeroTrustReportPage onStatusChange={this.updateStatus}/>)} {this.renderRoute(reportZeroTrustRoute, <ZeroTrustReportPage onStatusChange={this.updateStatus}/>)}
{this.renderRoute('/license', <LicensePage onStatusChange={this.updateStatus}/>)} {this.renderRoute('/license', <LicensePage onStatusChange={this.updateStatus}/>)}
</Col> </Col>
</Row> </Row>
@ -213,15 +213,18 @@ class AppComponent extends AuthComponent {
showInfectionDoneNotification() { showInfectionDoneNotification() {
if (this.state.completedSteps.infection_done) { if (this.state.completedSteps.infection_done) {
const hostname = window.location.hostname; // No need to show the notification to redirect to the report if we're already in the report page
const port = window.location.port; if (!window.location.href.includes("report")) {
let url = `https://${hostname}:${port}${reportZeroTrustPath}`; const hostname = window.location.hostname;
const port = window.location.port;
let url = `https://${hostname}:${port}${reportZeroTrustRoute}`;
Notifier.start( Notifier.start(
"Monkey Island", "Monkey Island",
"Infection is done! Click here to go to the report page.", "Infection is done! Click here to go to the report page.",
url, url,
notificationIcon); notificationIcon);
}
} }
} }
} }