From de8f12d74faef5fa3f9e38d1340948cab2d06ea3 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Wed, 1 Jul 2020 13:33:31 +0200 Subject: Manually generate IDs --- frontend/src/pages/App.js | 220 +++++++++++++++++++++++----------------------- 1 file changed, 110 insertions(+), 110 deletions(-) (limited to 'frontend/src/pages/App.js') diff --git a/frontend/src/pages/App.js b/frontend/src/pages/App.js index ad201e7d..c2b9bd51 100644 --- a/frontend/src/pages/App.js +++ b/frontend/src/pages/App.js @@ -1,125 +1,125 @@ -import PropTypes from "prop-types"; -import React from "react"; -import DocumentTitle from "react-document-title"; -import { connect } from "react-redux"; -import { ShortcutManager } from "react-shortcuts"; -import { openExperimentSucceeded } from "../actions/experiments"; -import { openSimulationSucceeded } from "../actions/simulations"; -import { resetCurrentDatacenter } from "../actions/topology/building"; -import ToolPanelComponent from "../components/app/map/controls/ToolPanelComponent"; -import LoadingScreen from "../components/app/map/LoadingScreen"; -import SimulationSidebarComponent from "../components/app/sidebars/simulation/SimulationSidebarComponent"; -import AppNavbar from "../components/navigation/AppNavbar"; -import ScaleIndicatorContainer from "../containers/app/map/controls/ScaleIndicatorContainer"; -import MapStage from "../containers/app/map/MapStage"; -import TopologySidebar from "../containers/app/sidebars/topology/TopologySidebar"; -import TimelineContainer from "../containers/app/timeline/TimelineContainer"; -import DeleteMachineModal from "../containers/modals/DeleteMachineModal"; -import DeleteRackModal from "../containers/modals/DeleteRackModal"; -import DeleteRoomModal from "../containers/modals/DeleteRoomModal"; -import EditRackNameModal from "../containers/modals/EditRackNameModal"; -import EditRoomNameModal from "../containers/modals/EditRoomNameModal"; -import KeymapConfiguration from "../shortcuts/keymap"; +import PropTypes from 'prop-types' +import React from 'react' +import DocumentTitle from 'react-document-title' +import { connect } from 'react-redux' +import { ShortcutManager } from 'react-shortcuts' +import { openExperimentSucceeded } from '../actions/experiments' +import { openSimulationSucceeded } from '../actions/simulations' +import { resetCurrentDatacenter } from '../actions/topology/building' +import ToolPanelComponent from '../components/app/map/controls/ToolPanelComponent' +import LoadingScreen from '../components/app/map/LoadingScreen' +import SimulationSidebarComponent from '../components/app/sidebars/simulation/SimulationSidebarComponent' +import AppNavbar from '../components/navigation/AppNavbar' +import ScaleIndicatorContainer from '../containers/app/map/controls/ScaleIndicatorContainer' +import MapStage from '../containers/app/map/MapStage' +import TopologySidebar from '../containers/app/sidebars/topology/TopologySidebar' +import TimelineContainer from '../containers/app/timeline/TimelineContainer' +import DeleteMachineModal from '../containers/modals/DeleteMachineModal' +import DeleteRackModal from '../containers/modals/DeleteRackModal' +import DeleteRoomModal from '../containers/modals/DeleteRoomModal' +import EditRackNameModal from '../containers/modals/EditRackNameModal' +import EditRoomNameModal from '../containers/modals/EditRoomNameModal' +import KeymapConfiguration from '../shortcuts/keymap' -const shortcutManager = new ShortcutManager(KeymapConfiguration); +const shortcutManager = new ShortcutManager(KeymapConfiguration) class AppComponent extends React.Component { - static propTypes = { - simulationId: PropTypes.number.isRequired, - inSimulation: PropTypes.bool, - experimentId: PropTypes.number, - simulationName: PropTypes.string - }; - static childContextTypes = { - shortcuts: PropTypes.object.isRequired - }; - - componentDidMount() { - this.props.resetCurrentDatacenter(); - if (this.props.inSimulation) { - this.props.openExperimentSucceeded( - this.props.simulationId, - this.props.experimentId - ); - return; + static propTypes = { + simulationId: PropTypes.string.isRequired, + inSimulation: PropTypes.bool, + experimentId: PropTypes.number, + simulationName: PropTypes.string, + } + static childContextTypes = { + shortcuts: PropTypes.object.isRequired, } - this.props.openSimulationSucceeded(this.props.simulationId); - } - getChildContext() { - return { - shortcuts: shortcutManager - }; - } + componentDidMount() { + this.props.resetCurrentDatacenter() + if (this.props.inSimulation) { + this.props.openExperimentSucceeded( + this.props.simulationId, + this.props.experimentId, + ) + return + } + this.props.openSimulationSucceeded(this.props.simulationId) + } - render() { - return ( - -
- - {this.props.datacenterIsLoading ? ( -
- -
- ) : ( -
- - - - - {this.props.inSimulation ? : undefined} - {this.props.inSimulation ? ( - - ) : ( - undefined - )} -
- )} - - - - - -
-
- ); - } + } + + render() { + return ( + +
+ + {this.props.datacenterIsLoading ? ( +
+ +
+ ) : ( +
+ + + + + {this.props.inSimulation ? : undefined} + {this.props.inSimulation ? ( + + ) : ( + undefined + )} +
+ )} + + + + + +
+
+ ) + } } const mapStateToProps = state => { - let simulationName = undefined; - if ( - state.currentSimulationId !== -1 && - state.objects.simulation[state.currentSimulationId] - ) { - simulationName = state.objects.simulation[state.currentSimulationId].name; - } + let simulationName = undefined + if ( + state.currentSimulationId !== -1 && + state.objects.simulation[state.currentSimulationId] + ) { + simulationName = state.objects.simulation[state.currentSimulationId].name + } - return { - datacenterIsLoading: state.currentDatacenterId === -1, - simulationName - }; -}; + return { + datacenterIsLoading: state.currentDatacenterId === -1, + simulationName, + } +} const mapDispatchToProps = dispatch => { - return { - resetCurrentDatacenter: () => dispatch(resetCurrentDatacenter()), - openSimulationSucceeded: id => dispatch(openSimulationSucceeded(id)), - openExperimentSucceeded: (simulationId, experimentId) => - dispatch(openExperimentSucceeded(simulationId, experimentId)) - }; -}; + return { + resetCurrentDatacenter: () => dispatch(resetCurrentDatacenter()), + openSimulationSucceeded: id => dispatch(openSimulationSucceeded(id)), + openExperimentSucceeded: (simulationId, experimentId) => + dispatch(openExperimentSucceeded(simulationId, experimentId)), + } +} -const App = connect(mapStateToProps, mapDispatchToProps)(AppComponent); +const App = connect(mapStateToProps, mapDispatchToProps)(AppComponent) -export default App; +export default App -- cgit v1.2.3