From 8aa174e70c01631ae4e00a6d208966fcd77cf972 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Fri, 10 Jul 2020 10:21:46 +0200 Subject: Add implementation of portfolio and scenario UI structure --- .../src/components/app/map/MapStageComponent.js | 4 +- frontend/src/components/app/sidebars/Sidebar.js | 12 +- .../app/sidebars/project/PortfolioListComponent.js | 59 ++++++++ .../sidebars/project/ProjectSidebarComponent.js | 7 +- .../app/sidebars/project/ScenarioListComponent.js | 54 +++++++ .../app/sidebars/project/TopologyListComponent.js | 8 -- .../experiments/ExperimentListComponent.js | 59 -------- .../experiments/ExperimentRowComponent.js | 36 ----- .../experiments/NewExperimentButtonComponent.js | 17 --- .../NewExperimentModalComponent.js | 105 -------------- .../NewPortfolioModalComponent.js | 99 +++++++++++++ .../custom-components/NewScenarioModalComponent.js | 155 +++++++++++++++++++++ 12 files changed, 383 insertions(+), 232 deletions(-) create mode 100644 frontend/src/components/app/sidebars/project/PortfolioListComponent.js create mode 100644 frontend/src/components/app/sidebars/project/ScenarioListComponent.js delete mode 100644 frontend/src/components/experiments/ExperimentListComponent.js delete mode 100644 frontend/src/components/experiments/ExperimentRowComponent.js delete mode 100644 frontend/src/components/experiments/NewExperimentButtonComponent.js delete mode 100644 frontend/src/components/modals/custom-components/NewExperimentModalComponent.js create mode 100644 frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js create mode 100644 frontend/src/components/modals/custom-components/NewScenarioModalComponent.js (limited to 'frontend/src/components') diff --git a/frontend/src/components/app/map/MapStageComponent.js b/frontend/src/components/app/map/MapStageComponent.js index 455604e4..f1c2b211 100644 --- a/frontend/src/components/app/map/MapStageComponent.js +++ b/frontend/src/components/app/map/MapStageComponent.js @@ -23,11 +23,9 @@ class MapStageComponent extends React.Component { this.updateScale = this.updateScale.bind(this) } - componentWillMount() { + componentDidMount() { this.updateDimensions() - } - componentDidMount() { window.addEventListener('resize', this.updateDimensions) window.addEventListener('wheel', this.updateScale) diff --git a/frontend/src/components/app/sidebars/Sidebar.js b/frontend/src/components/app/sidebars/Sidebar.js index 7ba8639a..a47a67c0 100644 --- a/frontend/src/components/app/sidebars/Sidebar.js +++ b/frontend/src/components/app/sidebars/Sidebar.js @@ -1,8 +1,18 @@ +import PropTypes from 'prop-types' import classNames from 'classnames' import React from 'react' import './Sidebar.css' class Sidebar extends React.Component { + static propTypes = { + isRight: PropTypes.bool.isRequired, + collapsible: PropTypes.bool, + } + + static defaultProps = { + collapsible: true + } + state = { collapsed: false, } @@ -41,7 +51,7 @@ class Sidebar extends React.Component { onWheel={e => e.stopPropagation()} > {this.props.children} - {collapseButton} + {this.props.collapsible && collapseButton} ) } diff --git a/frontend/src/components/app/sidebars/project/PortfolioListComponent.js b/frontend/src/components/app/sidebars/project/PortfolioListComponent.js new file mode 100644 index 00000000..a31f11cf --- /dev/null +++ b/frontend/src/components/app/sidebars/project/PortfolioListComponent.js @@ -0,0 +1,59 @@ +import PropTypes from 'prop-types' +import React from 'react' +import Shapes from '../../../../shapes' +import { Link } from 'react-router-dom' +import FontAwesome from 'react-fontawesome' +import ScenarioListContainer from '../../../../containers/app/sidebars/project/ScenarioListContainer' + +class PortfolioListComponent extends React.Component { + static propTypes = { + portfolios: PropTypes.arrayOf(Shapes.Portfolio), + currentProjectId: PropTypes.string.isRequired, + currentPortfolioId: PropTypes.string, + onNewPortfolio: PropTypes.func.isRequired, + onChoosePortfolio: PropTypes.func.isRequired, + onDeletePortfolio: PropTypes.func.isRequired, + } + + onDelete(id) { + this.props.onDeletePortfolio(id) + } + + render() { + return ( +
+

+ Portfolios + +

+ + {this.props.portfolios.map((portfolio, idx) => ( +
+
+
+ {portfolio.name} +
+
+ this.props.onChoosePortfolio(portfolio._id)} + /> + this.onDelete(portfolio._id)} + /> +
+
+ +
+ ))} +
+ ) + } +} + +export default PortfolioListComponent diff --git a/frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js b/frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js index d6e39ff6..b21b012b 100644 --- a/frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js +++ b/frontend/src/components/app/sidebars/project/ProjectSidebarComponent.js @@ -1,11 +1,12 @@ import React from 'react' import Sidebar from '../Sidebar' import TopologyListContainer from '../../../../containers/app/sidebars/project/TopologyListContainer' +import PortfolioListContainer from '../../../../containers/app/sidebars/project/PortfolioListContainer' -const ProjectSidebarComponent = () => ( - +const ProjectSidebarComponent = ({collapsible}) => ( + -

Portfolios

+
) diff --git a/frontend/src/components/app/sidebars/project/ScenarioListComponent.js b/frontend/src/components/app/sidebars/project/ScenarioListComponent.js new file mode 100644 index 00000000..9d2e261e --- /dev/null +++ b/frontend/src/components/app/sidebars/project/ScenarioListComponent.js @@ -0,0 +1,54 @@ +import PropTypes from 'prop-types' +import React from 'react' +import Shapes from '../../../../shapes' +import { Link } from 'react-router-dom' +import FontAwesome from 'react-fontawesome' + +class ScenarioListComponent extends React.Component { + static propTypes = { + scenarios: PropTypes.arrayOf(Shapes.Scenario), + portfolioId: PropTypes.string, + currentProjectId: PropTypes.string.isRequired, + currentScenarioId: PropTypes.string, + onNewScenario: PropTypes.func.isRequired, + onChooseScenario: PropTypes.func.isRequired, + onDeleteScenario: PropTypes.func.isRequired, + } + + onDelete(id) { + this.props.onDeleteScenario(id) + } + + render() { + return ( + <> + {this.props.scenarios.map((scenario, idx) => ( +
+
+ {scenario.name} +
+
+ this.props.onChooseScenario(scenario.portfolioId, scenario._id)} + /> + idx !== 0 ? this.onDelete(scenario._id) : undefined} + /> +
+
+ ))} +
+
this.props.onNewScenario(this.props.portfolioId)}> + + New scenario +
+
+ + ) + } +} + +export default ScenarioListComponent diff --git a/frontend/src/components/app/sidebars/project/TopologyListComponent.js b/frontend/src/components/app/sidebars/project/TopologyListComponent.js index 98615711..b8b41200 100644 --- a/frontend/src/components/app/sidebars/project/TopologyListComponent.js +++ b/frontend/src/components/app/sidebars/project/TopologyListComponent.js @@ -5,7 +5,6 @@ import FontAwesome from 'react-fontawesome' class TopologyListComponent extends React.Component { static propTypes = { - show: PropTypes.bool.isRequired, topologies: PropTypes.arrayOf(Shapes.Topology), currentTopologyId: PropTypes.string, onChooseTopology: PropTypes.func.isRequired, @@ -17,13 +16,6 @@ class TopologyListComponent extends React.Component { this.props.onChooseTopology(id) } - onDuplicate() { - this.props.onNewTopology( - this.textInput.value, - this.originTopology.value, - ) - } - onDelete(id) { this.props.onDeleteTopology(id) } diff --git a/frontend/src/components/experiments/ExperimentListComponent.js b/frontend/src/components/experiments/ExperimentListComponent.js deleted file mode 100644 index 3c53fc94..00000000 --- a/frontend/src/components/experiments/ExperimentListComponent.js +++ /dev/null @@ -1,59 +0,0 @@ -import PropTypes from 'prop-types' -import React from 'react' -import ExperimentRowContainer from '../../containers/experiments/ExperimentRowContainer' - -const ExperimentListComponent = ({ experimentIds, loading }) => { - let alert - - if (loading) { - alert = ( -
- - Loading Experiments... -
- ) - } else if (experimentIds.length === 0 && !loading) { - alert = ( -
- - No experiments here yet... Add some with the button - below! -
- ) - } - - return ( -
- {alert ? ( - alert - ) : ( - - - - - - - - - - - {experimentIds.map(experimentId => ( - - ))} - -
NameTopologyTraceScheduler -
- )} -
- ) -} - -ExperimentListComponent.propTypes = { - experimentIds: PropTypes.arrayOf(PropTypes.string).isRequired, - loading: PropTypes.bool, -} - -export default ExperimentListComponent diff --git a/frontend/src/components/experiments/ExperimentRowComponent.js b/frontend/src/components/experiments/ExperimentRowComponent.js deleted file mode 100644 index c6ae1ba4..00000000 --- a/frontend/src/components/experiments/ExperimentRowComponent.js +++ /dev/null @@ -1,36 +0,0 @@ -import PropTypes from 'prop-types' -import React from 'react' -import { Link } from 'react-router-dom' -import Shapes from '../../shapes/index' - -const ExperimentRowComponent = ({ experiment, projectId, onDelete }) => ( - - {experiment.name} - {experiment.topology.name} - {experiment.trace.name} - {experiment.scheduler.name} - - - - -
onDelete(experiment._id)} - > - -
- - -) - -ExperimentRowComponent.propTypes = { - experiment: Shapes.Experiment.isRequired, - projectId: PropTypes.string.isRequired, -} - -export default ExperimentRowComponent diff --git a/frontend/src/components/experiments/NewExperimentButtonComponent.js b/frontend/src/components/experiments/NewExperimentButtonComponent.js deleted file mode 100644 index 2902825d..00000000 --- a/frontend/src/components/experiments/NewExperimentButtonComponent.js +++ /dev/null @@ -1,17 +0,0 @@ -import PropTypes from 'prop-types' -import React from 'react' - -const NewExperimentButtonComponent = ({ onClick }) => ( -
-
- - New Experiment -
-
-) - -NewExperimentButtonComponent.propTypes = { - onClick: PropTypes.func.isRequired, -} - -export default NewExperimentButtonComponent diff --git a/frontend/src/components/modals/custom-components/NewExperimentModalComponent.js b/frontend/src/components/modals/custom-components/NewExperimentModalComponent.js deleted file mode 100644 index ce685837..00000000 --- a/frontend/src/components/modals/custom-components/NewExperimentModalComponent.js +++ /dev/null @@ -1,105 +0,0 @@ -import PropTypes from 'prop-types' -import React from 'react' -import Shapes from '../../../shapes' -import Modal from '../Modal' - -class NewExperimentModalComponent extends React.Component { - static propTypes = { - show: PropTypes.bool.isRequired, - topologies: PropTypes.arrayOf(Shapes.Topology), - schedulers: PropTypes.arrayOf(Shapes.Scheduler), - traces: PropTypes.arrayOf(Shapes.Trace), - callback: PropTypes.func.isRequired, - } - - reset() { - this.textInput.value = '' - this.topologySelect.selectedIndex = 0 - this.traceSelect.selectedIndex = 0 - this.schedulerSelect.selectedIndex = 0 - } - - onSubmit() { - this.props.callback( - this.textInput.value, - this.topologySelect.value, - this.traceSelect.value, - this.schedulerSelect.value, - ) - this.reset() - } - - onCancel() { - this.props.callback(undefined) - this.reset() - } - - render() { - return ( - -
{ - e.preventDefault() - this.onSubmit() - }} - > -
- - (this.textInput = textInput)} - /> -
-
- - -
-
- - -
-
- - -
-
-
- ) - } -} - -export default NewExperimentModalComponent diff --git a/frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js b/frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js new file mode 100644 index 00000000..ace2d751 --- /dev/null +++ b/frontend/src/components/modals/custom-components/NewPortfolioModalComponent.js @@ -0,0 +1,99 @@ +import PropTypes from 'prop-types' +import React from 'react' +import Modal from '../Modal' +import { AVAILABLE_METRICS } from '../../../util/available-metrics' + +class NewPortfolioModalComponent extends React.Component { + static propTypes = { + show: PropTypes.bool.isRequired, + callback: PropTypes.func.isRequired, + } + + constructor(props) { + super(props) + this.metricCheckboxes = {} + } + + componentDidMount() { + this.reset() + } + + reset() { + this.textInput.value = '' + AVAILABLE_METRICS.forEach(metric => { + this.metricCheckboxes[metric].checked = true + }) + this.repeatsInput.value = 1 + } + + onSubmit() { + this.props.callback( + this.textInput.value, + { + enabledMetrics: AVAILABLE_METRICS.filter(metric => this.metricCheckboxes[metric].checked), + repeatsPerScenario: parseInt(this.repeatsInput.value), + }, + ) + this.reset() + } + + onCancel() { + this.props.callback(undefined) + this.reset() + } + + render() { + return ( + +
{ + e.preventDefault() + this.onSubmit() + }} + > +
+ + (this.textInput = textInput)} + /> +
+

Targets

+
Metrics
+
+ {AVAILABLE_METRICS.map(metric => ( +
+ +
+ ))} +
+
+ + (this.repeatsInput = repeatsInput)} + /> +
+
+
+ ) + } +} + +export default NewPortfolioModalComponent diff --git a/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js b/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js new file mode 100644 index 00000000..4c2df2f6 --- /dev/null +++ b/frontend/src/components/modals/custom-components/NewScenarioModalComponent.js @@ -0,0 +1,155 @@ +import PropTypes from 'prop-types' +import React from 'react' +import Shapes from '../../../shapes' +import Modal from '../Modal' + +class NewScenarioModalComponent extends React.Component { + static propTypes = { + show: PropTypes.bool.isRequired, + currentPortfolioId: PropTypes.string.isRequired, + traces: PropTypes.arrayOf(Shapes.Trace), + topologies: PropTypes.arrayOf(Shapes.Topology), + schedulers: PropTypes.arrayOf(Shapes.Scheduler), + callback: PropTypes.func.isRequired, + } + + componentDidMount() { + this.reset() + } + + reset() { + this.textInput.value = '' + this.traceSelect.selectedIndex = 0 + this.traceLoadInput.value = 1.0 + this.topologySelect.selectedIndex = 0 + this.failuresCheckbox.checked = false + this.performanceInterferenceCheckbox.checked = false + this.schedulerSelect.selectedIndex = 0 + } + + onSubmit() { + this.props.callback( + this.textInput.value, + this.props.currentPortfolioId, + { + traceId: this.traceSelect.value, + loadSamplingFraction: parseFloat(this.traceLoadInput.value), + }, + { + topologyId: this.topologySelect.value + }, + { + failuresEnabled: this.failuresCheckbox.checked, + performanceInterferenceEnabled: this.performanceInterferenceCheckbox.checked, + schedulerName: this.schedulerSelect.value, + }, + ) + this.reset() + } + + onCancel() { + this.props.callback(undefined) + this.reset() + } + + render() { + return ( + +
{ + e.preventDefault() + this.onSubmit() + }} + > +
+ + (this.textInput = textInput)} + /> +
+

Trace

+
+ + +
+
+ + (this.traceLoadInput = traceLoadInput)} + /> +
+

Topology

+
+ + +
+

Operational Phenomena

+
+ +
+
+ +
+
+ + +
+
+
+ ) + } +} + +export default NewScenarioModalComponent -- cgit v1.2.3