From 5dc6fffc2a2547d7001b4781c494ccaa624f7cd4 Mon Sep 17 00:00:00 2001
From: VakarisZ <vakarisz@yahoo.com>
Date: Fri, 20 Dec 2019 12:12:26 +0200
Subject: [PATCH] Added config won't change warning
---
.../ui/src/components/pages/ConfigurePage.js | 22 +++++++------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
index 6d9325487..a49e198a6 100644
--- a/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
@@ -30,7 +30,7 @@ class ConfigurePageComponent extends AuthComponent {
lastAction: 'none',
sections: [],
selectedSection: 'attack',
- allMonkeysAreDead: true,
+ monkeysRan: false,
PBAwinFile: [],
PBAlinuxFile: [],
showAttackAlert: false
@@ -363,13 +363,7 @@ class ConfigurePageComponent extends AuthComponent {
this.authFetch('/api')
.then(res => res.json())
.then(res => {
- // This check is used to prevent unnecessary re-rendering
- let allMonkeysAreDead = (!res['completed_steps']['run_monkey']) || (res['completed_steps']['infection_done']);
- if (allMonkeysAreDead !== this.state.allMonkeysAreDead) {
- this.setState({
- allMonkeysAreDead: allMonkeysAreDead
- });
- }
+ this.setState({monkeysRan: res['completed_steps']['run_monkey']});
});
};
@@ -470,15 +464,15 @@ class ConfigurePageComponent extends AuthComponent {
</div>)
};
- renderRunningMonkeysWarning = () => {
+ renderConfigWontChangeWarning = () => {
return (<div>
- {this.state.allMonkeysAreDead ?
- '' :
+ {this.state.monkeysRan ?
<div className="alert alert-warning">
<i className="glyphicon glyphicon-warning-sign" style={{'marginRight': '5px'}}/>
- Some monkeys are currently running. Note that changing the configuration will only apply to new
- infections.
+ Changed configuration will only apply to new infections.
+ "Start over" to run again with different configuration.
</div>
+ : ''
}
</div>)
};
@@ -520,7 +514,7 @@ class ConfigurePageComponent extends AuthComponent {
{this.renderAttackAlertModal()}
<h1 className="page-title">Monkey Configuration</h1>
{this.renderNav()}
- {this.renderRunningMonkeysWarning()}
+ {this.renderConfigWontChangeWarning()}
{content}
<div className="text-center">
<button type="submit" onClick={this.onSubmit} className="btn btn-success btn-lg" style={{margin: '5px'}}>