From 912e1b96bfa7d6c022d854fa744f719b49ca98d0 Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Tue, 21 Jul 2020 15:33:37 +0200
Subject: Add first plotting attempts for portfolios

---
 .../custom-components/NewScenarioModalComponent.js | 31 +++++++++++-----------
 1 file changed, 15 insertions(+), 16 deletions(-)

(limited to 'frontend/src/components/modals/custom-components/NewScenarioModalComponent.js')

diff --git a/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js b/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
index 4c2df2f6..0bb4aeab 100644
--- a/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
+++ b/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
@@ -36,13 +36,13 @@ class NewScenarioModalComponent extends React.Component {
                 loadSamplingFraction: parseFloat(this.traceLoadInput.value),
             },
             {
-                topologyId: this.topologySelect.value
+                topologyId: this.topologySelect.value,
             },
             {
                 failuresEnabled: this.failuresCheckbox.checked,
                 performanceInterferenceEnabled: this.performanceInterferenceCheckbox.checked,
                 schedulerName: this.schedulerSelect.value,
-            },
+            }
         )
         this.reset()
     }
@@ -61,7 +61,7 @@ class NewScenarioModalComponent extends React.Component {
                 onCancel={this.onCancel.bind(this)}
             >
                 <form
-                    onSubmit={e => {
+                    onSubmit={(e) => {
                         e.preventDefault()
                         this.onSubmit()
                     }}
@@ -72,17 +72,14 @@ class NewScenarioModalComponent extends React.Component {
                             type="text"
                             className="form-control"
                             required
-                            ref={textInput => (this.textInput = textInput)}
+                            ref={(textInput) => (this.textInput = textInput)}
                         />
                     </div>
                     <h4>Trace</h4>
                     <div className="form-group">
                         <label className="form-control-label">Trace</label>
-                        <select
-                            className="form-control"
-                            ref={traceSelect => (this.traceSelect = traceSelect)}
-                        >
-                            {this.props.traces.map(trace => (
+                        <select className="form-control" ref={(traceSelect) => (this.traceSelect = traceSelect)}>
+                            {this.props.traces.map((trace) => (
                                 <option value={trace._id} key={trace._id}>
                                     {trace.name}
                                 </option>
@@ -95,7 +92,7 @@ class NewScenarioModalComponent extends React.Component {
                             type="number"
                             className="form-control"
                             required
-                            ref={traceLoadInput => (this.traceLoadInput = traceLoadInput)}
+                            ref={(traceLoadInput) => (this.traceLoadInput = traceLoadInput)}
                         />
                     </div>
                     <h4>Topology</h4>
@@ -103,9 +100,9 @@ class NewScenarioModalComponent extends React.Component {
                         <label className="form-control-label">Topology</label>
                         <select
                             className="form-control"
-                            ref={topologySelect => (this.topologySelect = topologySelect)}
+                            ref={(topologySelect) => (this.topologySelect = topologySelect)}
                         >
-                            {this.props.topologies.map(topology => (
+                            {this.props.topologies.map((topology) => (
                                 <option value={topology._id} key={topology._id}>
                                     {topology.name}
                                 </option>
@@ -118,7 +115,7 @@ class NewScenarioModalComponent extends React.Component {
                             <input
                                 type="checkbox"
                                 className="form-check-input"
-                                ref={failuresCheckbox => (this.failuresCheckbox = failuresCheckbox)}
+                                ref={(failuresCheckbox) => (this.failuresCheckbox = failuresCheckbox)}
                             />
                             <span className="ml-2">Enable failures</span>
                         </label>
@@ -128,7 +125,9 @@ class NewScenarioModalComponent extends React.Component {
                             <input
                                 type="checkbox"
                                 className="form-check-input"
-                                ref={performanceInterferenceCheckbox => (this.performanceInterferenceCheckbox = performanceInterferenceCheckbox)}
+                                ref={(performanceInterferenceCheckbox) =>
+                                    (this.performanceInterferenceCheckbox = performanceInterferenceCheckbox)
+                                }
                             />
                             <span className="ml-2">Enable performance interference</span>
                         </label>
@@ -137,9 +136,9 @@ class NewScenarioModalComponent extends React.Component {
                         <label className="form-control-label">Scheduler</label>
                         <select
                             className="form-control"
-                            ref={schedulerSelect => (this.schedulerSelect = schedulerSelect)}
+                            ref={(schedulerSelect) => (this.schedulerSelect = schedulerSelect)}
                         >
-                            {this.props.schedulers.map(scheduler => (
+                            {this.props.schedulers.map((scheduler) => (
                                 <option value={scheduler.name} key={scheduler.name}>
                                     {scheduler.name}
                                 </option>
-- 
cgit v1.2.3


From 94cc7acc9eeb88177b7d75ff1d1c3245d09bce53 Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Wed, 22 Jul 2020 15:19:32 +0200
Subject: Set first scenario name to be "Base scenario"

---
 .../modals/custom-components/NewScenarioModalComponent.js         | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'frontend/src/components/modals/custom-components/NewScenarioModalComponent.js')

diff --git a/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js b/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
index 0bb4aeab..51116f59 100644
--- a/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
+++ b/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
@@ -7,6 +7,7 @@ class NewScenarioModalComponent extends React.Component {
     static propTypes = {
         show: PropTypes.bool.isRequired,
         currentPortfolioId: PropTypes.string.isRequired,
+        currentPortfolioScenarioIds: PropTypes.arrayOf(PropTypes.string),
         traces: PropTypes.arrayOf(Shapes.Trace),
         topologies: PropTypes.arrayOf(Shapes.Topology),
         schedulers: PropTypes.arrayOf(Shapes.Scheduler),
@@ -17,8 +18,12 @@ class NewScenarioModalComponent extends React.Component {
         this.reset()
     }
 
+    componentDidUpdate() {
+        this.textInput.value = this.props.currentPortfolioScenarioIds.length === 0 ? 'Base scenario' : ''
+    }
+
     reset() {
-        this.textInput.value = ''
+        this.textInput.value = this.props.currentPortfolioScenarioIds.length === 0 ? 'Base scenario' : ''
         this.traceSelect.selectedIndex = 0
         this.traceLoadInput.value = 1.0
         this.topologySelect.selectedIndex = 0
@@ -72,6 +77,7 @@ class NewScenarioModalComponent extends React.Component {
                             type="text"
                             className="form-control"
                             required
+                            disabled={this.props.currentPortfolioScenarioIds.length === 0}
                             ref={(textInput) => (this.textInput = textInput)}
                         />
                     </div>
-- 
cgit v1.2.3


From 9e7cb3bd367607b32e102c3a87b68b33c53dec46 Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Wed, 22 Jul 2020 15:39:11 +0200
Subject: Fix scenario name handling and increase margin

---
 .../modals/custom-components/NewScenarioModalComponent.js           | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'frontend/src/components/modals/custom-components/NewScenarioModalComponent.js')

diff --git a/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js b/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
index 51116f59..d7d99982 100644
--- a/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
+++ b/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js
@@ -19,7 +19,11 @@ class NewScenarioModalComponent extends React.Component {
     }
 
     componentDidUpdate() {
-        this.textInput.value = this.props.currentPortfolioScenarioIds.length === 0 ? 'Base scenario' : ''
+        if (this.props.currentPortfolioScenarioIds.length === 0) {
+            this.textInput.value = 'Base scenario'
+        } else if (this.textInput.value === 'Base scenario') {
+            this.textInput.value = ''
+        }
     }
 
     reset() {
-- 
cgit v1.2.3