Merge branch 'feature/mongodb-migration' of github.com:atlarge-research/opendc-dev into feature/mongodb-migration

1 files changed, 31 insertions, 44 deletions

diff --git a/frontend/src/pages/App.js b/frontend/src/pages/App.js
index 89d1fa32..8f99d1bd 100644
--- a/frontend/src/pages/App.js
+++ b/frontend/src/pages/App.js
@@ -4,33 +4,31 @@ 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 { openProjectSucceeded } from '../actions/projects'
 import { resetCurrentTopology } 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 TopologySidebarContainer from '../containers/app/sidebars/topology/TopologySidebarContainer'
 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 ChangeTopologyModal from '../containers/modals/ChangeTopologyModal'
-import { openChangeTopologyModal } from '../actions/modals/topology'
+import NewTopologyModal from '../containers/modals/NewTopologyModal'
+import { openNewTopologyModal } from '../actions/modals/topology'
+import AppNavbarContainer from '../containers/navigation/AppNavbarContainer'
+import ProjectSidebarContainer from '../containers/app/sidebars/project/ProjectSidebarContainer'
 
 const shortcutManager = new ShortcutManager(KeymapConfiguration)
 
 class AppComponent extends React.Component {
     static propTypes = {
-        simulationId: PropTypes.string.isRequired,
-        inSimulation: PropTypes.bool,
+        projectId: PropTypes.string.isRequired,
         experimentId: PropTypes.number,
-        simulationName: PropTypes.string,
+        projectName: PropTypes.string,
         onViewTopologies: PropTypes.func,
     }
     static childContextTypes = {
@@ -38,12 +36,7 @@ class AppComponent extends React.Component {
     }
 
     componentDidMount() {
-        // TODO this.props.resetCurrentTopology()
-        if (this.props.inSimulation) {
-            this.props.openExperimentSucceeded(this.props.simulationId, this.props.experimentId)
-            return
-        }
-        this.props.openSimulationSucceeded(this.props.simulationId)
+        this.props.openProjectSucceeded(this.props.projectId)
     }
 
     getChildContext() {
@@ -55,35 +48,29 @@ class AppComponent extends React.Component {
     render() {
         return (
             <DocumentTitle
-                title={this.props.simulationName ? this.props.simulationName + ' - OpenDC' : 'Simulation - OpenDC'}
+                title={this.props.projectName ? this.props.projectName + ' - OpenDC' : 'Simulation - OpenDC'}
             >
                 <div className="page-container full-height">
-                    <AppNavbar
-                        simulationId={this.props.simulationId}
-                        inSimulation={true}
-                        fullWidth={true}
-                        onViewTopologies={this.props.onViewTopologies}
-                    />
+                    <AppNavbarContainer fullWidth={true} />
                     {this.props.topologyIsLoading ? (
                         <div className="full-height d-flex align-items-center justify-content-center">
-                            <LoadingScreen />
+                            <LoadingScreen/>
                         </div>
                     ) : (
                         <div className="full-height">
-                            <MapStage />
-                            <ScaleIndicatorContainer />
-                            <ToolPanelComponent />
-                            <TopologySidebar />
-                            {this.props.inSimulation ? <TimelineContainer /> : undefined}
-                            {this.props.inSimulation ? <SimulationSidebarComponent /> : undefined}
+                            <MapStage/>
+                            <ScaleIndicatorContainer/>
+                            <ToolPanelComponent/>
+                            <ProjectSidebarContainer/>
+                            <TopologySidebarContainer/>
                         </div>
                     )}
-                    <ChangeTopologyModal />
-                    <EditRoomNameModal />
-                    <DeleteRoomModal />
-                    <EditRackNameModal />
-                    <DeleteRackModal />
-                    <DeleteMachineModal />
+                    <NewTopologyModal/>
+                    <EditRoomNameModal/>
+                    <DeleteRoomModal/>
+                    <EditRackNameModal/>
+                    <DeleteRackModal/>
+                    <DeleteMachineModal/>
                 </div>
             </DocumentTitle>
         )
@@ -91,24 +78,24 @@ class AppComponent extends React.Component {
 }
 
 const mapStateToProps = (state) => {
-    let simulationName = undefined
-    if (state.currentSimulationId !== '-1' && state.objects.simulation[state.currentSimulationId]) {
-        simulationName = state.objects.simulation[state.currentSimulationId].name
+    let projectName = undefined
+    if (state.currentProjectId !== '-1' && state.objects.project[state.currentProjectId]) {
+        projectName = state.objects.project[state.currentProjectId].name
     }
 
     return {
         topologyIsLoading: state.currentTopologyId === '-1',
-        simulationName,
+        projectName,
     }
 }
 
 const mapDispatchToProps = (dispatch) => {
     return {
         resetCurrentTopology: () => dispatch(resetCurrentTopology()),
-        openSimulationSucceeded: (id) => dispatch(openSimulationSucceeded(id)),
-        onViewTopologies: () => dispatch(openChangeTopologyModal()),
-        openExperimentSucceeded: (simulationId, experimentId) =>
-            dispatch(openExperimentSucceeded(simulationId, experimentId)),
+        openProjectSucceeded: (id) => dispatch(openProjectSucceeded(id)),
+        onViewTopologies: () => dispatch(openNewTopologyModal()),
+        openExperimentSucceeded: (projectId, experimentId) =>
+            dispatch(openExperimentSucceeded(projectId, experimentId)),
     }
 }