From 0d7889c23d407f6c0cd3db4020989ce8a5f8063a Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Wed, 22 Jul 2020 11:40:01 +0200
Subject: Fix polling and upgrade bootstrap

---
 .../app/results/PortfolioResultsComponent.js       | 28 +++++++++++++---------
 .../app/sidebars/project/PortfolioListComponent.js |  4 ++--
 .../sidebars/project/ProjectSidebarComponent.js    |  6 +++--
 .../app/sidebars/project/ScenarioListComponent.js  |  4 ++--
 .../app/sidebars/project/TopologyListComponent.js  |  4 ++--
 5 files changed, 27 insertions(+), 19 deletions(-)

(limited to 'frontend/src/components/app')

diff --git a/frontend/src/components/app/results/PortfolioResultsComponent.js b/frontend/src/components/app/results/PortfolioResultsComponent.js
index e9b33777..286dd48c 100644
--- a/frontend/src/components/app/results/PortfolioResultsComponent.js
+++ b/frontend/src/components/app/results/PortfolioResultsComponent.js
@@ -54,18 +54,24 @@ const PortfolioResultsComponent = ({ portfolio, scenarios }) => {
                     <div className="col-6 mb-2" key={metric}>
                         <h4>{METRIC_NAMES[metric]}</h4>
                         <ResponsiveContainer aspect={16 / 9} width="100%">
-                            <ComposedChart data={dataPerMetric[metric]} margin={{ bottom: 15 }} layout="vertical" animationDUration={0}>
-                                <CartesianGrid strokeDasharray="3 3"/>
-                                <XAxis tickFormatter={(tick) => approx(tick)}
-                                       label={{ value: METRIC_UNITS[metric], position: 'bottom', offset: 0 }}
-                                       type="number"/>
-                                <YAxis dataKey="name" type="category"/>
-                                <Bar dataKey="value" fill="#3399FF"/>
-                                <Scatter dataKey="value" opacity={0}>
-                                    <ErrorBar dataKey="errorX" width={10} strokeWidth={3} stroke="#FF6600"
-                                              direction="x"/>
+                            <ComposedChart data={dataPerMetric[metric]} margin={{ bottom: 15 }} layout="vertical">
+                                <CartesianGrid strokeDasharray="3 3" />
+                                <XAxis
+                                    tickFormatter={(tick) => approx(tick)}
+                                    label={{ value: METRIC_UNITS[metric], position: 'bottom', offset: 0 }}
+                                    type="number"
+                                />
+                                <YAxis dataKey="name" type="category" />
+                                <Bar dataKey="value" fill="#3399FF" isAnimationActive={false} />
+                                <Scatter dataKey="value" opacity={0} isAnimationActive={false}>
+                                    <ErrorBar
+                                        dataKey="errorX"
+                                        width={10}
+                                        strokeWidth={3}
+                                        stroke="#FF6600"
+                                        direction="x"
+                                    />
                                 </Scatter>
-
                             </ComposedChart>
                         </ResponsiveContainer>
                     </div>
diff --git a/frontend/src/components/app/sidebars/project/PortfolioListComponent.js b/frontend/src/components/app/sidebars/project/PortfolioListComponent.js
index 837666af..b000b9e2 100644
--- a/frontend/src/components/app/sidebars/project/PortfolioListComponent.js
+++ b/frontend/src/components/app/sidebars/project/PortfolioListComponent.js
@@ -37,13 +37,13 @@ class PortfolioListComponent extends React.Component {
                         <div className="row mb-1">
                             <div
                                 className={
-                                    'col-8 align-self-center ' +
+                                    'col-7 align-self-center ' +
                                     (portfolio._id === this.props.currentPortfolioId ? 'font-weight-bold' : '')
                                 }
                             >
                                 {portfolio.name}
                             </div>
-                            <div className="col-4 text-right">
+                            <div className="col-5 text-right">
                                 <Link
                                     className="btn btn-outline-primary mr-1 fa fa-play"
                                     to={`/projects/${this.props.currentProjectId}/portfolios/${portfolio._id}`}
diff --git a/frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js b/frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js
index aadc451e..4789315e 100644
--- a/frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js
+++ b/frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js
@@ -5,8 +5,10 @@ import PortfolioListContainer from '../../../../containers/app/sidebars/project/
 
 const ProjectSidebarComponent = ({ collapsible }) => (
     <Sidebar isRight={false} collapsible={collapsible}>
-        <TopologyListContainer />
-        <PortfolioListContainer />
+        <div className="h-100 overflow-auto container-fluid">
+            <TopologyListContainer />
+            <PortfolioListContainer />
+        </div>
     </Sidebar>
 )
 
diff --git a/frontend/src/components/app/sidebars/project/ScenarioListComponent.js b/frontend/src/components/app/sidebars/project/ScenarioListComponent.js
index 8b50eff0..e775a663 100644
--- a/frontend/src/components/app/sidebars/project/ScenarioListComponent.js
+++ b/frontend/src/components/app/sidebars/project/ScenarioListComponent.js
@@ -26,13 +26,13 @@ class ScenarioListComponent extends React.Component {
                     <div key={scenario._id} className="row mb-1">
                         <div
                             className={
-                                'col-8 pl-5 align-self-center ' +
+                                'col-7 pl-5 align-self-center ' +
                                 (scenario._id === this.props.currentScenarioId ? 'font-weight-bold' : '')
                             }
                         >
                             {scenario.name}
                         </div>
-                        <div className="col-4 text-right">
+                        <div className="col-5 text-right">
                             <Link
                                 className="btn btn-outline-primary mr-1 fa fa-play disabled"
                                 to={`/projects/${this.props.currentProjectId}/portfolios/${scenario.portfolioId}/scenarios/${scenario._id}`}
diff --git a/frontend/src/components/app/sidebars/project/TopologyListComponent.js b/frontend/src/components/app/sidebars/project/TopologyListComponent.js
index 498ee26d..2f42f7e4 100644
--- a/frontend/src/components/app/sidebars/project/TopologyListComponent.js
+++ b/frontend/src/components/app/sidebars/project/TopologyListComponent.js
@@ -34,13 +34,13 @@ class TopologyListComponent extends React.Component {
                     <div key={topology._id} className="row mb-1">
                         <div
                             className={
-                                'col-8 align-self-center ' +
+                                'col-7 align-self-center ' +
                                 (topology._id === this.props.currentTopologyId ? 'font-weight-bold' : '')
                             }
                         >
                             {topology.name}
                         </div>
-                        <div className="col-4 text-right">
+                        <div className="col-5 text-right">
                             <span
                                 className="btn btn-outline-primary mr-1 fa fa-play"
                                 onClick={() => this.onChoose(topology._id)}
-- 
cgit v1.2.3