Merge branch 'master' onto working copy

7 files changed, 19 insertions, 57 deletions

diff --git a/frontend/src/components/app/sidebars/topology/rack/BackToRoomComponent.js b/frontend/src/components/app/sidebars/topology/rack/BackToRoomComponent.js
index 345674d1..c14775bf 100644
--- a/frontend/src/components/app/sidebars/topology/rack/BackToRoomComponent.js
+++ b/frontend/src/components/app/sidebars/topology/rack/BackToRoomComponent.js
@@ -2,7 +2,7 @@ import React from 'react'
 
 const BackToRoomComponent = ({ onClick }) => (
     <div className="btn btn-secondary btn-block mb-2" onClick={onClick}>
-        <span className="fa fa-angle-left mr-2"/>
+        <span className="fa fa-angle-left mr-2" />
         Back to room
     </div>
 )
diff --git a/frontend/src/components/app/sidebars/topology/rack/DeleteRackComponent.js b/frontend/src/components/app/sidebars/topology/rack/DeleteRackComponent.js
index b1672764..23b0daac 100644
--- a/frontend/src/components/app/sidebars/topology/rack/DeleteRackComponent.js
+++ b/frontend/src/components/app/sidebars/topology/rack/DeleteRackComponent.js
@@ -2,7 +2,7 @@ import React from 'react'
 
 const DeleteRackComponent = ({ onClick }) => (
     <div className="btn btn-outline-danger btn-block" onClick={onClick}>
-        <span className="fa fa-trash mr-2"/>
+        <span className="fa fa-trash mr-2" />
         Delete this rack
     </div>
 )
diff --git a/frontend/src/components/app/sidebars/topology/rack/EmptySlotComponent.js b/frontend/src/components/app/sidebars/topology/rack/EmptySlotComponent.js
index 03b44aa6..d7e30f1d 100644
--- a/frontend/src/components/app/sidebars/topology/rack/EmptySlotComponent.js
+++ b/frontend/src/components/app/sidebars/topology/rack/EmptySlotComponent.js
@@ -2,11 +2,9 @@ import React from 'react'
 
 const EmptySlotComponent = ({ position, onAdd }) => (
     <li className="list-group-item d-flex justify-content-between align-items-center">
-    <span className="badge badge-default badge-info mr-1 disabled">
-      {position}
-    </span>
+        <span className="badge badge-default badge-info mr-1 disabled">{position}</span>
         <button className="btn btn-outline-primary" onClick={onAdd}>
-            <span className="fa fa-plus mr-2"/>
+            <span className="fa fa-plus mr-2" />
             Add machine
         </button>
     </li>
diff --git a/frontend/src/components/app/sidebars/topology/rack/MachineComponent.js b/frontend/src/components/app/sidebars/topology/rack/MachineComponent.js
index cec3c912..caa3dc04 100644
--- a/frontend/src/components/app/sidebars/topology/rack/MachineComponent.js
+++ b/frontend/src/components/app/sidebars/topology/rack/MachineComponent.js
@@ -12,17 +12,9 @@ const UnitIcon = ({ id, type }) => (
     </div>
 )
 
-const MachineComponent = ({
-                              position,
-                              machine,
-                              onClick,
-                          }) => {
+const MachineComponent = ({ position, machine, onClick }) => {
     const hasNoUnits =
-        machine.cpuIds.length +
-        machine.gpuIds.length +
-        machine.memoryIds.length +
-        machine.storageIds.length ===
-        0
+        machine.cpuIds.length + machine.gpuIds.length + machine.memoryIds.length + machine.storageIds.length === 0
 
     return (
         <li
@@ -32,33 +24,13 @@ const MachineComponent = ({
         >
             <span className="badge badge-default badge-info mr-1">{position}</span>
             <div className="d-inline-flex">
-                {machine.cpuIds.length > 0 ? (
-                    <UnitIcon id="cpu" type="CPU"/>
-                ) : (
-                    undefined
-                )}
-                {machine.gpuIds.length > 0 ? (
-                    <UnitIcon id="gpu" type="GPU"/>
-                ) : (
-                    undefined
-                )}
-                {machine.memoryIds.length > 0 ? (
-                    <UnitIcon id="memory" type="memory"/>
-                ) : (
-                    undefined
-                )}
-                {machine.storageIds.length > 0 ? (
-                    <UnitIcon id="storage" type="storage"/>
-                ) : (
-                    undefined
-                )}
+                {machine.cpuIds.length > 0 ? <UnitIcon id="cpu" type="CPU" /> : undefined}
+                {machine.gpuIds.length > 0 ? <UnitIcon id="gpu" type="GPU" /> : undefined}
+                {machine.memoryIds.length > 0 ? <UnitIcon id="memory" type="memory" /> : undefined}
+                {machine.storageIds.length > 0 ? <UnitIcon id="storage" type="storage" /> : undefined}
                 {hasNoUnits ? (
-                    <span className="badge badge-default badge-warning">
-                        Machine with no units
-                    </span>
-                ) : (
-                    undefined
-                )}
+                    <span className="badge badge-default badge-warning">Machine with no units</span>
+                ) : undefined}
             </div>
         </li>
     )
diff --git a/frontend/src/components/app/sidebars/topology/rack/MachineListComponent.js b/frontend/src/components/app/sidebars/topology/rack/MachineListComponent.js
index a381771c..aa7a4f8f 100644
--- a/frontend/src/components/app/sidebars/topology/rack/MachineListComponent.js
+++ b/frontend/src/components/app/sidebars/topology/rack/MachineListComponent.js
@@ -8,15 +8,9 @@ const MachineListComponent = ({ machineIds }) => {
         <ul className="list-group machine-list">
             {machineIds.map((machineId, index) => {
                 if (machineId === null) {
-                    return <EmptySlotContainer key={index} position={index + 1}/>
+                    return <EmptySlotContainer key={index} position={index + 1} />
                 } else {
-                    return (
-                        <MachineContainer
-                            key={index}
-                            position={index + 1}
-                            machineId={machineId}
-                        />
-                    )
+                    return <MachineContainer key={index} position={index + 1} machineId={machineId} />
                 }
             })}
         </ul>
diff --git a/frontend/src/components/app/sidebars/topology/rack/RackNameComponent.js b/frontend/src/components/app/sidebars/topology/rack/RackNameComponent.js
index 1888b69d..b701909a 100644
--- a/frontend/src/components/app/sidebars/topology/rack/RackNameComponent.js
+++ b/frontend/src/components/app/sidebars/topology/rack/RackNameComponent.js
@@ -1,8 +1,6 @@
 import React from 'react'
 import NameComponent from '../NameComponent'
 
-const RackNameComponent = ({ rackName, onEdit }) => (
-    <NameComponent name={rackName} onEdit={onEdit}/>
-)
+const RackNameComponent = ({ rackName, onEdit }) => <NameComponent name={rackName} onEdit={onEdit} />
 
 export default RackNameComponent
diff --git a/frontend/src/components/app/sidebars/topology/rack/RackSidebarComponent.js b/frontend/src/components/app/sidebars/topology/rack/RackSidebarComponent.js
index 23e8e743..c04e46d8 100644
--- a/frontend/src/components/app/sidebars/topology/rack/RackSidebarComponent.js
+++ b/frontend/src/components/app/sidebars/topology/rack/RackSidebarComponent.js
@@ -9,12 +9,12 @@ const RackSidebarComponent = () => {
     return (
         <div className="rack-sidebar-container flex-column">
             <div className="rack-sidebar-header-container">
-                <RackNameContainer/>
-                <BackToRoomContainer/>
-                <DeleteRackContainer/>
+                <RackNameContainer />
+                <BackToRoomContainer />
+                <DeleteRackContainer />
             </div>
             <div className="machine-list-container mt-2">
-                <MachineListContainer/>
+                <MachineListContainer />
             </div>
         </div>
     )