From f119fc78dda4d1e828dde04f378a63a93e3a0a7e Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Thu, 2 Jul 2020 18:39:28 +0200
Subject: Add current progress on frontend port

---
 .../app/sidebars/topology/machine/UnitAddComponent.js         |  4 ++--
 .../components/app/sidebars/topology/machine/UnitComponent.js |  8 +-------
 .../app/sidebars/topology/machine/UnitListComponent.js        |  4 ++--
 .../components/app/sidebars/topology/rack/MachineComponent.js |  4 ++--
 .../app/sidebars/topology/room/RoomSidebarComponent.js        | 11 ++---------
 .../app/sidebars/topology/room/RoomTypeComponent.js           |  8 --------
 6 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 frontend/src/components/app/sidebars/topology/room/RoomTypeComponent.js

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

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
-- 
cgit v1.2.3