Add current progress on frontend port

17 files changed, 31 insertions, 149 deletions

diff --git a/frontend/src/components/app/map/LoadingScreen.js b/frontend/src/components/app/map/LoadingScreen.js
index ca159982..1fd470fc 100644
--- a/frontend/src/components/app/map/LoadingScreen.js
+++ b/frontend/src/components/app/map/LoadingScreen.js
@@ -4,7 +4,7 @@ import FontAwesome from 'react-fontawesome'
 const LoadingScreen = () => (
     <div className="display-4">
         <FontAwesome name="refresh" className="mr-4" spin/>
-        Loading your datacenter...
+        Loading your topology...
     </div>
 )
 
diff --git a/frontend/src/components/app/map/groups/RackGroup.js b/frontend/src/components/app/map/groups/RackGroup.js
index 708dcf69..6de939a9 100644
--- a/frontend/src/components/app/map/groups/RackGroup.js
+++ b/frontend/src/components/app/map/groups/RackGroup.js
@@ -22,12 +22,12 @@ const RackGroup = ({ tile, inSimulation, rackLoad }) => {
             />
             <Group opacity={inSimulation ? 0.3 : 1}>
                 <RackSpaceFillContainer
-                    tileId={tile.id}
+                    tileId={tile._id}
                     positionX={tile.positionX}
                     positionY={tile.positionY}
                 />
                 <RackEnergyFillContainer
-                    tileId={tile.id}
+                    tileId={tile._id}
                     positionX={tile.positionX}
                     positionY={tile.positionY}
                 />
diff --git a/frontend/src/components/app/map/groups/RoomGroup.js b/frontend/src/components/app/map/groups/RoomGroup.js
index 230e3c9b..4e3c7410 100644
--- a/frontend/src/components/app/map/groups/RoomGroup.js
+++ b/frontend/src/components/app/map/groups/RoomGroup.js
@@ -11,7 +11,7 @@ const RoomGroup = ({
                        currentRoomInConstruction,
                        onClick,
                    }) => {
-    if (currentRoomInConstruction === room.id) {
+    if (currentRoomInConstruction === room._id) {
         return (
             <Group onClick={onClick}>
                 {room.tileIds.map(tileId => (
@@ -27,7 +27,7 @@ const RoomGroup = ({
                 if (
                     (interactionLevel.mode === 'RACK' ||
                         interactionLevel.mode === 'MACHINE') &&
-                    interactionLevel.roomId === room.id
+                    interactionLevel.roomId === room._id
                 ) {
                     return [
                         room.tileIds
@@ -44,7 +44,7 @@ const RoomGroup = ({
                     ))
                 }
             })()}
-            <WallContainer roomId={room.id}/>
+            <WallContainer roomId={room._id}/>
         </Group>
     )
 }
diff --git a/frontend/src/components/app/map/groups/TileGroup.js b/frontend/src/components/app/map/groups/TileGroup.js
index 49e2e52b..54f4ae17 100644
--- a/frontend/src/components/app/map/groups/TileGroup.js
+++ b/frontend/src/components/app/map/groups/TileGroup.js
@@ -9,12 +9,10 @@ import RoomTile from '../elements/RoomTile'
 
 const TileGroup = ({ tile, newTile, inSimulation, roomLoad, onClick }) => {
     let tileObject
-    switch (tile.objectType) {
-        case 'RACK':
-            tileObject = <RackContainer tile={tile}/>
-            break
-        default:
-            tileObject = null
+    if (tile.rackId) {
+        tileObject = <RackContainer tile={tile}/>
+    } else {
+        tileObject = null
     }
 
     let color = ROOM_DEFAULT_COLOR
diff --git a/frontend/src/components/app/map/groups/DatacenterGroup.js b/frontend/src/components/app/map/groups/TopologyGroup.js
index 3d3b9702..a40a1d41 100644
--- a/frontend/src/components/app/map/groups/DatacenterGroup.js
+++ b/frontend/src/components/app/map/groups/TopologyGroup.js
@@ -4,15 +4,15 @@ import GrayContainer from '../../../../containers/app/map/GrayContainer'
 import RoomContainer from '../../../../containers/app/map/RoomContainer'
 import Shapes from '../../../../shapes/index'
 
-const DatacenterGroup = ({ datacenter, interactionLevel }) => {
-    if (!datacenter) {
+const TopologyGroup = ({ topology, interactionLevel }) => {
+    if (!topology) {
         return <Group/>
     }
 
     if (interactionLevel.mode === 'BUILDING') {
         return (
             <Group>
-                {datacenter.roomIds.map(roomId => (
+                {topology.roomIds.map(roomId => (
                     <RoomContainer key={roomId} roomId={roomId}/>
                 ))}
             </Group>
@@ -21,20 +21,20 @@ const DatacenterGroup = ({ datacenter, interactionLevel }) => {
 
     return (
         <Group>
-            {datacenter.roomIds
+            {topology.roomIds
                 .filter(roomId => roomId !== interactionLevel.roomId)
                 .map(roomId => <RoomContainer key={roomId} roomId={roomId}/>)}
             {interactionLevel.mode === 'ROOM' ? <GrayContainer/> : null}
-            {datacenter.roomIds
+            {topology.roomIds
                 .filter(roomId => roomId === interactionLevel.roomId)
                 .map(roomId => <RoomContainer key={roomId} roomId={roomId}/>)}
         </Group>
     )
 }
 
-DatacenterGroup.propTypes = {
-    datacenter: Shapes.Datacenter,
+TopologyGroup.propTypes = {
+    topology: Shapes.Topology,
     interactionLevel: Shapes.InteractionLevel,
 }
 
-export default DatacenterGroup
+export default TopologyGroup
diff --git a/frontend/src/components/app/map/layers/MapLayerComponent.js b/frontend/src/components/app/map/layers/MapLayerComponent.js
index 1a31f2b9..940057f9 100644
--- a/frontend/src/components/app/map/layers/MapLayerComponent.js
+++ b/frontend/src/components/app/map/layers/MapLayerComponent.js
@@ -1,6 +1,6 @@
 import React from 'react'
 import { Group, Layer } from 'react-konva'
-import DatacenterContainer from '../../../../containers/app/map/DatacenterContainer'
+import TopologyContainer from '../../../../containers/app/map/TopologyContainer'
 import Backdrop from '../elements/Backdrop'
 import GridGroup from '../groups/GridGroup'
 
@@ -13,7 +13,7 @@ const MapLayerComponent = ({ mapPosition, mapScale }) => (
             scaleY={mapScale}
         >
             <Backdrop/>
-            <DatacenterContainer/>
+            <TopologyContainer/>
             <GridGroup/>
         </Group>
     </Layer>
diff --git a/frontend/src/components/app/sidebars/simulation/ExperimentMetadataComponent.js b/frontend/src/components/app/sidebars/simulation/ExperimentMetadataComponent.js
index 54a8b5e9..30990a13 100644
--- a/frontend/src/components/app/sidebars/simulation/ExperimentMetadataComponent.js
+++ b/frontend/src/components/app/sidebars/simulation/ExperimentMetadataComponent.js
@@ -2,14 +2,14 @@ import React from 'react'
 
 const ExperimentMetadataComponent = ({
                                          experimentName,
-                                         pathName,
+                                         topologyName,
                                          traceName,
                                          schedulerName,
                                      }) => (
     <div>
         <h2>{experimentName}</h2>
         <p>
-            Path: <strong>{pathName}</strong>
+            Topology: <strong>{topologyName}</strong>
         </p>
         <p>
             Trace: <strong>{traceName}</strong>
diff --git a/frontend/src/components/app/sidebars/simulation/SimulationSidebarComponent.js b/frontend/src/components/app/sidebars/simulation/SimulationSidebarComponent.js
index 6e89c40e..dba75eb2 100644
--- a/frontend/src/components/app/sidebars/simulation/SimulationSidebarComponent.js
+++ b/frontend/src/components/app/sidebars/simulation/SimulationSidebarComponent.js
@@ -1,7 +1,6 @@
 import React from 'react'
 import ExperimentMetadataContainer from '../../../../containers/app/sidebars/simulation/ExperimentMetadataContainer'
 import LoadMetricContainer from '../../../../containers/app/sidebars/simulation/LoadMetricContainer'
-import TraceContainer from '../../../../containers/app/sidebars/simulation/TraceContainer'
 import Sidebar from '../Sidebar'
 import './SimulationSidebarComponent.css'
 
@@ -11,9 +10,6 @@ const SimulationSidebarComponent = () => {
             <div className="simulation-sidebar-container flex-column">
                 <ExperimentMetadataContainer/>
                 <LoadMetricContainer/>
-                <div className="trace-container">
-                    <TraceContainer/>
-                </div>
             </div>
         </Sidebar>
     )
diff --git a/frontend/src/components/app/sidebars/simulation/TaskComponent.js b/frontend/src/components/app/sidebars/simulation/TaskComponent.js
deleted file mode 100644
index 94617086..00000000
--- a/frontend/src/components/app/sidebars/simulation/TaskComponent.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import approx from 'approximate-number'
-import classNames from 'classnames'
-import React from 'react'
-import { convertSecondsToFormattedTime } from '../../../../util/date-time'
-
-const TaskComponent = ({ task, flopsLeft }) => {
-    let icon
-    let progressBarContent
-    let percent
-    let infoTitle
-
-    if (flopsLeft === task.totalFlopCount) {
-        icon = 'hourglass-half'
-        progressBarContent = ''
-        percent = 0
-        infoTitle = 'Not submitted yet'
-    } else if (flopsLeft > 0) {
-        icon = 'refresh'
-        progressBarContent = approx(task.totalFlopCount - flopsLeft) + ' FLOP'
-        percent = 100 * (task.totalFlopCount - flopsLeft) / task.totalFlopCount
-        infoTitle =
-            progressBarContent + ' (' + Math.round(percent * 10) / 10 + '%)'
-    } else {
-        icon = 'check'
-        progressBarContent = 'Completed'
-        percent = 100
-        infoTitle = 'Completed'
-    }
-
-    return (
-        <li className="list-group-item flex-column align-items-start">
-            <div className="d-flex w-100 justify-content-between">
-                <h5 className="mb-1">{approx(task.totalFlopCount)} FLOP</h5>
-                <small>Starts at {convertSecondsToFormattedTime(task.startTick)}</small>
-            </div>
-            <div title={infoTitle} style={{ display: 'flex' }}>
-        <span
-            className={classNames('fa', 'fa-' + icon)}
-            style={{ width: '20px' }}
-        />
-                <div className="progress" style={{ flexGrow: 1 }}>
-                    <div
-                        className="progress-bar"
-                        role="progressbar"
-                        aria-valuenow={percent}
-                        aria-valuemin="0"
-                        aria-valuemax="100"
-                        style={{ width: percent + '%' }}
-                    >
-                        {progressBarContent}
-                    </div>
-                </div>
-            </div>
-        </li>
-    )
-}
-
-export default TaskComponent
diff --git a/frontend/src/components/app/sidebars/simulation/TraceComponent.js b/frontend/src/components/app/sidebars/simulation/TraceComponent.js
deleted file mode 100644
index 1292219b..00000000
--- a/frontend/src/components/app/sidebars/simulation/TraceComponent.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import React from 'react'
-import TaskContainer from '../../../../containers/app/sidebars/simulation/TaskContainer'
-
-const TraceComponent = ({ jobs }) => (
-    <div>
-        <h3>Trace</h3>
-        {jobs.map(job => (
-            <div key={job.id}>
-                <h4>Job: {job.name}</h4>
-                <ul className="list-group">
-                    {job.taskIds.map(taskId => (
-                        <TaskContainer taskId={taskId} key={taskId}/>
-                    ))}
-                </ul>
-            </div>
-        ))}
-    </div>
-)
-
-export default TraceComponent
diff --git a/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js b/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js
index 57e219fd..e8722506 100644
--- a/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js
+++ b/frontend/src/components/app/sidebars/topology/machine/UnitAddComponent.js
@@ -16,7 +16,7 @@ class UnitAddComponent extends React.Component {
                         ref={unitSelect => (this.unitSelect = unitSelect)}
                     >
                         {this.props.units.map(unit => (
-                            <option value={unit.id} key={unit.id}>
+                            <option value={unit._id} key={unit._id}>
                                 {unit.manufacturer +
                                 ' ' +
                                 unit.family +
@@ -31,7 +31,7 @@ class UnitAddComponent extends React.Component {
                         type="submit"
                         className="btn btn-outline-primary"
                         onClick={() =>
-                            this.props.onAdd(parseInt(this.unitSelect.value, 10))
+                            this.props.onAdd(this.unitSelect.value)
                         }
                     >
                         <span className="fa fa-plus mr-2"/>
diff --git a/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js b/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js
index 93ac1cdd..647c8e5c 100644
--- a/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js
+++ b/frontend/src/components/app/sidebars/topology/machine/UnitComponent.js
@@ -40,13 +40,7 @@ class UnitComponent extends React.Component {
         return (
             <li className="d-flex list-group-item justify-content-between align-items-center">
         <span style={{ maxWidth: '60%' }}>
-          {this.props.unit.manufacturer +
-          ' ' +
-          this.props.unit.family +
-          ' ' +
-          this.props.unit.model +
-          ' ' +
-          this.props.unit.generation}
+          {this.props.unit.name}
         </span>
                 <span>
           <span
diff --git a/frontend/src/components/app/sidebars/topology/machine/UnitListComponent.js b/frontend/src/components/app/sidebars/topology/machine/UnitListComponent.js
index 31d4db51..da65da23 100644
--- a/frontend/src/components/app/sidebars/topology/machine/UnitListComponent.js
+++ b/frontend/src/components/app/sidebars/topology/machine/UnitListComponent.js
@@ -18,8 +18,8 @@ const UnitListComponent = ({ unitType, unitIds, inSimulation }) => (
                     <strong>No units of this type in this machine</strong>
                 ) : (
                     <span>
-            <strong>No units...</strong> Add some with the menu above!
-          </span>
+                        <strong>No units...</strong> Add some with the menu above!
+                    </span>
                 )}
             </div>
         )}
diff --git a/frontend/src/components/app/sidebars/topology/rack/MachineComponent.js b/frontend/src/components/app/sidebars/topology/rack/MachineComponent.js
index 0a1d1065..b4204136 100644
--- a/frontend/src/components/app/sidebars/topology/rack/MachineComponent.js
+++ b/frontend/src/components/app/sidebars/topology/rack/MachineComponent.js
@@ -61,8 +61,8 @@ const MachineComponent = ({
                 )}
                 {hasNoUnits ? (
                     <span className="badge badge-default badge-warning">
-            Machine with no units
-          </span>
+                        Machine with no units
+                    </span>
                 ) : (
                     undefined
                 )}
diff --git a/frontend/src/components/app/sidebars/topology/room/RoomSidebarComponent.js b/frontend/src/components/app/sidebars/topology/room/RoomSidebarComponent.js
index d9865744..d8a805cb 100644
--- a/frontend/src/components/app/sidebars/topology/room/RoomSidebarComponent.js
+++ b/frontend/src/components/app/sidebars/topology/room/RoomSidebarComponent.js
@@ -6,18 +6,11 @@ import DeleteRoomContainer from '../../../../../containers/app/sidebars/topology
 import EditRoomContainer from '../../../../../containers/app/sidebars/topology/room/EditRoomContainer'
 import RackConstructionContainer from '../../../../../containers/app/sidebars/topology/room/RackConstructionContainer'
 import RoomNameContainer from '../../../../../containers/app/sidebars/topology/room/RoomNameContainer'
-import RoomTypeContainer from '../../../../../containers/app/sidebars/topology/room/RoomTypeContainer'
-
-const RoomSidebarComponent = ({ roomId, roomType, inSimulation }) => {
-    let allowedObjects
-    if (!inSimulation && roomType === 'SERVER') {
-        allowedObjects = <RackConstructionContainer/>
-    }
 
+const RoomSidebarComponent = ({ roomId, inSimulation }) => {
     return (
         <div>
             <RoomNameContainer/>
-            <RoomTypeContainer/>
             <BackToBuildingContainer/>
             {inSimulation ? (
                 <div>
@@ -26,7 +19,7 @@ const RoomSidebarComponent = ({ roomId, roomType, inSimulation }) => {
                 </div>
             ) : (
                 <div>
-                    {allowedObjects}
+                    <RackConstructionContainer/>
                     <EditRoomContainer/>
                     <DeleteRoomContainer/>
                 </div>
diff --git a/frontend/src/components/app/sidebars/topology/room/RoomTypeComponent.js b/frontend/src/components/app/sidebars/topology/room/RoomTypeComponent.js
deleted file mode 100644
index b662307c..00000000
--- a/frontend/src/components/app/sidebars/topology/room/RoomTypeComponent.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import React from 'react'
-import { ROOM_TYPE_TO_NAME_MAP } from '../../../../../util/room-types'
-
-const RoomTypeComponent = ({ roomType }) => (
-    <p className="lead">{ROOM_TYPE_TO_NAME_MAP[roomType]}</p>
-)
-
-export default RoomTypeComponent
diff --git a/frontend/src/components/app/timeline/TimelineControlsComponent.js b/frontend/src/components/app/timeline/TimelineControlsComponent.js
index 5412b1f5..01911aff 100644
--- a/frontend/src/components/app/timeline/TimelineControlsComponent.js
+++ b/frontend/src/components/app/timeline/TimelineControlsComponent.js
@@ -27,19 +27,6 @@ class TimelineControlsComponent extends React.Component {
                             ),
                         }}
                     />
-                    {this.props.sectionTicks.map(sectionTick => (
-                        <div
-                            key={sectionTick}
-                            className="section-marker"
-                            style={{
-                                left: convertTickToPercentage(
-                                    sectionTick,
-                                    this.props.lastSimulatedTick,
-                                ),
-                            }}
-                            title="Topology changes at this tick"
-                        />
-                    ))}
                 </div>
             </div>
         )