From bf7708f658cc6299a3b775afe24459b5a808c54d Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Fri, 22 Sep 2017 21:20:54 +0200 Subject: Restructure component and container directories --- src/components/sidebars/topology/NameComponent.js | 13 ----- .../sidebars/topology/TopologySidebarComponent.js | 35 ------------ .../topology/building/BuildingSidebarComponent.js | 16 ------ .../building/NewRoomConstructionComponent.js | 27 --------- .../topology/machine/BackToRackComponent.js | 10 ---- .../topology/machine/DeleteMachineComponent.js | 12 ---- .../topology/machine/MachineNameComponent.js | 7 --- .../topology/machine/MachineSidebarComponent.js | 26 --------- .../sidebars/topology/machine/UnitAddComponent.js | 38 ------------- .../sidebars/topology/machine/UnitComponent.js | 16 ------ .../sidebars/topology/machine/UnitListComponent.js | 20 ------- .../sidebars/topology/machine/UnitTabsComponent.js | 54 ------------------ .../sidebars/topology/rack/BackToRoomComponent.js | 10 ---- .../sidebars/topology/rack/DeleteRackComponent.js | 12 ---- .../sidebars/topology/rack/EmptySlotComponent.js | 20 ------- .../sidebars/topology/rack/MachineComponent.js | 65 ---------------------- .../sidebars/topology/rack/MachineListComponent.js | 20 ------- .../topology/rack/MachineListComponent.sass | 2 - .../sidebars/topology/rack/RackNameComponent.js | 8 --- .../sidebars/topology/rack/RackSidebarComponent.js | 33 ----------- .../topology/rack/RackSidebarComponent.sass | 11 ---- .../topology/room/BackToBuildingComponent.js | 10 ---- .../sidebars/topology/room/DeleteRoomComponent.js | 12 ---- .../topology/room/RackConstructionComponent.js | 21 ------- .../sidebars/topology/room/RoomNameComponent.js | 8 --- .../sidebars/topology/room/RoomSidebarComponent.js | 35 ------------ .../sidebars/topology/room/RoomTypeComponent.js | 10 ---- 27 files changed, 551 deletions(-) delete mode 100644 src/components/sidebars/topology/NameComponent.js delete mode 100644 src/components/sidebars/topology/TopologySidebarComponent.js delete mode 100644 src/components/sidebars/topology/building/BuildingSidebarComponent.js delete mode 100644 src/components/sidebars/topology/building/NewRoomConstructionComponent.js delete mode 100644 src/components/sidebars/topology/machine/BackToRackComponent.js delete mode 100644 src/components/sidebars/topology/machine/DeleteMachineComponent.js delete mode 100644 src/components/sidebars/topology/machine/MachineNameComponent.js delete mode 100644 src/components/sidebars/topology/machine/MachineSidebarComponent.js delete mode 100644 src/components/sidebars/topology/machine/UnitAddComponent.js delete mode 100644 src/components/sidebars/topology/machine/UnitComponent.js delete mode 100644 src/components/sidebars/topology/machine/UnitListComponent.js delete mode 100644 src/components/sidebars/topology/machine/UnitTabsComponent.js delete mode 100644 src/components/sidebars/topology/rack/BackToRoomComponent.js delete mode 100644 src/components/sidebars/topology/rack/DeleteRackComponent.js delete mode 100644 src/components/sidebars/topology/rack/EmptySlotComponent.js delete mode 100644 src/components/sidebars/topology/rack/MachineComponent.js delete mode 100644 src/components/sidebars/topology/rack/MachineListComponent.js delete mode 100644 src/components/sidebars/topology/rack/MachineListComponent.sass delete mode 100644 src/components/sidebars/topology/rack/RackNameComponent.js delete mode 100644 src/components/sidebars/topology/rack/RackSidebarComponent.js delete mode 100644 src/components/sidebars/topology/rack/RackSidebarComponent.sass delete mode 100644 src/components/sidebars/topology/room/BackToBuildingComponent.js delete mode 100644 src/components/sidebars/topology/room/DeleteRoomComponent.js delete mode 100644 src/components/sidebars/topology/room/RackConstructionComponent.js delete mode 100644 src/components/sidebars/topology/room/RoomNameComponent.js delete mode 100644 src/components/sidebars/topology/room/RoomSidebarComponent.js delete mode 100644 src/components/sidebars/topology/room/RoomTypeComponent.js (limited to 'src/components/sidebars/topology') diff --git a/src/components/sidebars/topology/NameComponent.js b/src/components/sidebars/topology/NameComponent.js deleted file mode 100644 index d663f4ae..00000000 --- a/src/components/sidebars/topology/NameComponent.js +++ /dev/null @@ -1,13 +0,0 @@ -import React from "react"; -import FontAwesome from "react-fontawesome"; - -const NameComponent = ({name, onEdit}) => ( -

- {name} - -

-); - -export default NameComponent; diff --git a/src/components/sidebars/topology/TopologySidebarComponent.js b/src/components/sidebars/topology/TopologySidebarComponent.js deleted file mode 100644 index b61c7e3c..00000000 --- a/src/components/sidebars/topology/TopologySidebarComponent.js +++ /dev/null @@ -1,35 +0,0 @@ -import React from "react"; -import BuildingSidebarContainer from "../../../containers/sidebars/topology/building/BuildingSidebarContainer"; -import MachineSidebarContainer from "../../../containers/sidebars/topology/machine/MachineSidebarContainer"; -import RackSidebarContainer from "../../../containers/sidebars/topology/rack/RackSidebarContainer"; -import RoomSidebarContainer from "../../../containers/sidebars/topology/room/RoomSidebarContainer"; -import Sidebar from "../Sidebar"; - -const TopologySidebarComponent = ({interactionLevel}) => { - let sidebarContent; - - switch (interactionLevel.mode) { - case "BUILDING": - sidebarContent = ; - break; - case "ROOM": - sidebarContent = ; - break; - case "RACK": - sidebarContent = ; - break; - case "MACHINE": - sidebarContent = ; - break; - default: - sidebarContent = "Missing Content"; - } - - return ( - - {sidebarContent} - - ); -}; - -export default TopologySidebarComponent; diff --git a/src/components/sidebars/topology/building/BuildingSidebarComponent.js b/src/components/sidebars/topology/building/BuildingSidebarComponent.js deleted file mode 100644 index 835943f2..00000000 --- a/src/components/sidebars/topology/building/BuildingSidebarComponent.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from "react"; -import NewRoomConstructionContainer from "../../../../containers/sidebars/topology/building/NewRoomConstructionContainer"; - -const BuildingSidebarComponent = ({inSimulation}) => { - return ( -
-

Building

- {inSimulation ? - undefined : - - } -
- ); -}; - -export default BuildingSidebarComponent; diff --git a/src/components/sidebars/topology/building/NewRoomConstructionComponent.js b/src/components/sidebars/topology/building/NewRoomConstructionComponent.js deleted file mode 100644 index d89b0ac0..00000000 --- a/src/components/sidebars/topology/building/NewRoomConstructionComponent.js +++ /dev/null @@ -1,27 +0,0 @@ -import React from "react"; - -const NewRoomConstructionComponent = ({onStart, onFinish, onCancel, currentRoomInConstruction}) => { - if (currentRoomInConstruction === -1) { - return ( -
- - Construct a new room -
- ); - } - return ( -
-
- - Finalize new room -
-
- - Cancel construction -
-
- ); - -}; - -export default NewRoomConstructionComponent; diff --git a/src/components/sidebars/topology/machine/BackToRackComponent.js b/src/components/sidebars/topology/machine/BackToRackComponent.js deleted file mode 100644 index 19e33904..00000000 --- a/src/components/sidebars/topology/machine/BackToRackComponent.js +++ /dev/null @@ -1,10 +0,0 @@ -import React from "react"; - -const BackToRackComponent = ({onClick}) => ( -
- - Back to rack -
-); - -export default BackToRackComponent; diff --git a/src/components/sidebars/topology/machine/DeleteMachineComponent.js b/src/components/sidebars/topology/machine/DeleteMachineComponent.js deleted file mode 100644 index 14713158..00000000 --- a/src/components/sidebars/topology/machine/DeleteMachineComponent.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from "react"; - -const DeleteMachineComponent = ({onClick}) => { - return ( -
- - Delete this machine -
- ); -}; - -export default DeleteMachineComponent; diff --git a/src/components/sidebars/topology/machine/MachineNameComponent.js b/src/components/sidebars/topology/machine/MachineNameComponent.js deleted file mode 100644 index 321e350d..00000000 --- a/src/components/sidebars/topology/machine/MachineNameComponent.js +++ /dev/null @@ -1,7 +0,0 @@ -import React from "react"; - -const MachineNameComponent = ({position}) => ( -

Machine at slot {position}

-); - -export default MachineNameComponent; diff --git a/src/components/sidebars/topology/machine/MachineSidebarComponent.js b/src/components/sidebars/topology/machine/MachineSidebarComponent.js deleted file mode 100644 index e8009c34..00000000 --- a/src/components/sidebars/topology/machine/MachineSidebarComponent.js +++ /dev/null @@ -1,26 +0,0 @@ -import React from "react"; -import LoadBarContainer from "../../../../containers/sidebars/elements/LoadBarContainer"; -import LoadChartContainer from "../../../../containers/sidebars/elements/LoadChartContainer"; -import BackToRackContainer from "../../../../containers/sidebars/topology/machine/BackToRackContainer"; -import DeleteMachineContainer from "../../../../containers/sidebars/topology/machine/DeleteMachineContainer"; -import MachineNameContainer from "../../../../containers/sidebars/topology/machine/MachineNameContainer"; -import UnitTabsContainer from "../../../../containers/sidebars/topology/machine/UnitTabsContainer"; - -const MachineSidebarComponent = ({inSimulation, machineId}) => { - return ( -
- - - {inSimulation ? -
- - -
: - - } - -
- ); -}; - -export default MachineSidebarComponent; diff --git a/src/components/sidebars/topology/machine/UnitAddComponent.js b/src/components/sidebars/topology/machine/UnitAddComponent.js deleted file mode 100644 index f16700df..00000000 --- a/src/components/sidebars/topology/machine/UnitAddComponent.js +++ /dev/null @@ -1,38 +0,0 @@ -import PropTypes from "prop-types"; -import React from "react"; - -class UnitAddComponent extends React.Component { - static propTypes = { - units: PropTypes.array.isRequired, - onAdd: PropTypes.func.isRequired, - }; - - render() { - return ( -
-
- - -
-
- ); - } -} - -export default UnitAddComponent; diff --git a/src/components/sidebars/topology/machine/UnitComponent.js b/src/components/sidebars/topology/machine/UnitComponent.js deleted file mode 100644 index c734f508..00000000 --- a/src/components/sidebars/topology/machine/UnitComponent.js +++ /dev/null @@ -1,16 +0,0 @@ -import React from "react"; - -const UnitComponent = ({unit, onDelete, inSimulation}) => ( -
  • - {unit.manufacturer + " " + unit.family + " " + unit.model + " " + unit.generation} - {inSimulation ? - undefined : - - - Delete - - } -
  • -); - -export default UnitComponent; diff --git a/src/components/sidebars/topology/machine/UnitListComponent.js b/src/components/sidebars/topology/machine/UnitListComponent.js deleted file mode 100644 index 307edc0a..00000000 --- a/src/components/sidebars/topology/machine/UnitListComponent.js +++ /dev/null @@ -1,20 +0,0 @@ -import React from "react"; -import UnitContainer from "../../../../containers/sidebars/topology/machine/UnitContainer"; - -const UnitListComponent = ({unitType, unitIds, inSimulation}) => ( -
      - {unitIds.length !== 0 ? - unitIds.map((unitId, index) => ( - - )) : -
      - {inSimulation ? - No units of this type in this machine : - No units... Add some with the menu above! - } -
      - } -
    -); - -export default UnitListComponent; diff --git a/src/components/sidebars/topology/machine/UnitTabsComponent.js b/src/components/sidebars/topology/machine/UnitTabsComponent.js deleted file mode 100644 index a7692ecf..00000000 --- a/src/components/sidebars/topology/machine/UnitTabsComponent.js +++ /dev/null @@ -1,54 +0,0 @@ -import React from "react"; -import UnitAddContainer from "../../../../containers/sidebars/topology/machine/UnitAddContainer"; -import UnitListContainer from "../../../../containers/sidebars/topology/machine/UnitListContainer"; - -const UnitTabsComponent = ({inSimulation}) => ( -
    - -
    -
    - {inSimulation ? - undefined : - - } - -
    -
    - {inSimulation ? - undefined : - - } - -
    -
    - {inSimulation ? - undefined : - - } - -
    -
    - {inSimulation ? - undefined : - - } - -
    -
    -
    -); - -export default UnitTabsComponent; diff --git a/src/components/sidebars/topology/rack/BackToRoomComponent.js b/src/components/sidebars/topology/rack/BackToRoomComponent.js deleted file mode 100644 index 267001c6..00000000 --- a/src/components/sidebars/topology/rack/BackToRoomComponent.js +++ /dev/null @@ -1,10 +0,0 @@ -import React from "react"; - -const BackToRoomComponent = ({onClick}) => ( -
    - - Back to room -
    -); - -export default BackToRoomComponent; diff --git a/src/components/sidebars/topology/rack/DeleteRackComponent.js b/src/components/sidebars/topology/rack/DeleteRackComponent.js deleted file mode 100644 index 06c45048..00000000 --- a/src/components/sidebars/topology/rack/DeleteRackComponent.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from "react"; - -const DeleteRackComponent = ({onClick}) => { - return ( -
    - - Delete this rack -
    - ); -}; - -export default DeleteRackComponent; diff --git a/src/components/sidebars/topology/rack/EmptySlotComponent.js b/src/components/sidebars/topology/rack/EmptySlotComponent.js deleted file mode 100644 index 08665072..00000000 --- a/src/components/sidebars/topology/rack/EmptySlotComponent.js +++ /dev/null @@ -1,20 +0,0 @@ -import React from "react"; - -const EmptySlotComponent = ({position, onAdd, inSimulation}) => ( -
  • - - {position} - - {inSimulation ? - - Empty Slot - : - - } -
  • -); - -export default EmptySlotComponent; diff --git a/src/components/sidebars/topology/rack/MachineComponent.js b/src/components/sidebars/topology/rack/MachineComponent.js deleted file mode 100644 index c9211115..00000000 --- a/src/components/sidebars/topology/rack/MachineComponent.js +++ /dev/null @@ -1,65 +0,0 @@ -import React from "react"; -import Shapes from "../../../../shapes"; -import {convertLoadToSimulationColor} from "../../../../util/simulation-load"; - -const UnitIcon = ({id, type}) => ( -
    - {"Machine -
    -); - -const MachineComponent = ({position, machine, inSimulation, machineLoad, onClick}) => { - let color = "white"; - if (inSimulation && machineLoad) { - color = convertLoadToSimulationColor(machineLoad); - } - const hasNoUnits = machine.cpuIds.length + machine.gpuIds.length + machine.memoryIds.length - + machine.storageIds.length === 0; - - return ( -
  • - - {position} - -
    - {machine.cpuIds.length > 0 ? - : - undefined - } - {machine.gpuIds.length > 0 ? - : - undefined - } - {machine.memoryIds.length > 0 ? - : - undefined - } - {machine.storageIds.length > 0 ? - : - undefined - } - {hasNoUnits ? - - Machine with no units - : - undefined - } -
    -
  • - ); -}; - -MachineComponent.propTypes = { - machine: Shapes.Machine -}; - -export default MachineComponent; diff --git a/src/components/sidebars/topology/rack/MachineListComponent.js b/src/components/sidebars/topology/rack/MachineListComponent.js deleted file mode 100644 index 41522e36..00000000 --- a/src/components/sidebars/topology/rack/MachineListComponent.js +++ /dev/null @@ -1,20 +0,0 @@ -import React from "react"; -import EmptySlotContainer from "../../../../containers/sidebars/topology/rack/EmptySlotContainer"; -import MachineContainer from "../../../../containers/sidebars/topology/rack/MachineContainer"; -import "./MachineListComponent.css"; - -const MachineListComponent = ({machineIds}) => { - return ( -
      - {machineIds.map((machineId, index) => { - if (machineId === null) { - return ; - } else { - return ; - } - })} -
    - ); -}; - -export default MachineListComponent; diff --git a/src/components/sidebars/topology/rack/MachineListComponent.sass b/src/components/sidebars/topology/rack/MachineListComponent.sass deleted file mode 100644 index bbcfe696..00000000 --- a/src/components/sidebars/topology/rack/MachineListComponent.sass +++ /dev/null @@ -1,2 +0,0 @@ -.machine-list li - min-height: 64px diff --git a/src/components/sidebars/topology/rack/RackNameComponent.js b/src/components/sidebars/topology/rack/RackNameComponent.js deleted file mode 100644 index ee8d194b..00000000 --- a/src/components/sidebars/topology/rack/RackNameComponent.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from "react"; -import NameComponent from "../NameComponent"; - -const RackNameComponent = ({rackName, onEdit}) => ( - -); - -export default RackNameComponent; diff --git a/src/components/sidebars/topology/rack/RackSidebarComponent.js b/src/components/sidebars/topology/rack/RackSidebarComponent.js deleted file mode 100644 index 6a36972f..00000000 --- a/src/components/sidebars/topology/rack/RackSidebarComponent.js +++ /dev/null @@ -1,33 +0,0 @@ -import React from "react"; -import LoadBarContainer from "../../../../containers/sidebars/elements/LoadBarContainer"; -import LoadChartContainer from "../../../../containers/sidebars/elements/LoadChartContainer"; -import BackToRoomContainer from "../../../../containers/sidebars/topology/rack/BackToRoomContainer"; -import DeleteRackContainer from "../../../../containers/sidebars/topology/rack/DeleteRackContainer"; -import MachineListContainer from "../../../../containers/sidebars/topology/rack/MachineListContainer"; -import RackNameContainer from "../../../../containers/sidebars/topology/rack/RackNameContainer"; -import "./RackSidebarComponent.css"; - -const RackSidebarComponent = ({inSimulation, rackId}) => { - return ( -
    -
    - - - {inSimulation ? -
    - - -
    : -
    - -
    - } -
    -
    - -
    -
    - ); -}; - -export default RackSidebarComponent; diff --git a/src/components/sidebars/topology/rack/RackSidebarComponent.sass b/src/components/sidebars/topology/rack/RackSidebarComponent.sass deleted file mode 100644 index 822804bc..00000000 --- a/src/components/sidebars/topology/rack/RackSidebarComponent.sass +++ /dev/null @@ -1,11 +0,0 @@ -.rack-sidebar-container - display: flex - height: 100% - max-height: 100% - -.rack-sidebar-header-container - flex: 0 - -.machine-list-container - flex: 1 - overflow-y: scroll diff --git a/src/components/sidebars/topology/room/BackToBuildingComponent.js b/src/components/sidebars/topology/room/BackToBuildingComponent.js deleted file mode 100644 index 81384ba5..00000000 --- a/src/components/sidebars/topology/room/BackToBuildingComponent.js +++ /dev/null @@ -1,10 +0,0 @@ -import React from "react"; - -const BackToBuildingComponent = ({onClick}) => ( -
    - - Back to building -
    -); - -export default BackToBuildingComponent; diff --git a/src/components/sidebars/topology/room/DeleteRoomComponent.js b/src/components/sidebars/topology/room/DeleteRoomComponent.js deleted file mode 100644 index 72bb6a83..00000000 --- a/src/components/sidebars/topology/room/DeleteRoomComponent.js +++ /dev/null @@ -1,12 +0,0 @@ -import React from "react"; - -const DeleteRoomComponent = ({onClick}) => { - return ( -
    - - Delete this room -
    - ); -}; - -export default DeleteRoomComponent; diff --git a/src/components/sidebars/topology/room/RackConstructionComponent.js b/src/components/sidebars/topology/room/RackConstructionComponent.js deleted file mode 100644 index 9bfe28ce..00000000 --- a/src/components/sidebars/topology/room/RackConstructionComponent.js +++ /dev/null @@ -1,21 +0,0 @@ -import React from "react"; - -const RackConstructionComponent = ({inRackConstructionMode, onStart, onStop}) => { - if (inRackConstructionMode) { - return ( -
    - - Stop rack construction -
    - ); - } - - return ( -
    - - Start rack construction -
    - ); -}; - -export default RackConstructionComponent; diff --git a/src/components/sidebars/topology/room/RoomNameComponent.js b/src/components/sidebars/topology/room/RoomNameComponent.js deleted file mode 100644 index 4d3e41cc..00000000 --- a/src/components/sidebars/topology/room/RoomNameComponent.js +++ /dev/null @@ -1,8 +0,0 @@ -import React from "react"; -import NameComponent from "../NameComponent"; - -const RoomNameComponent = ({roomName, onEdit}) => ( - -); - -export default RoomNameComponent; diff --git a/src/components/sidebars/topology/room/RoomSidebarComponent.js b/src/components/sidebars/topology/room/RoomSidebarComponent.js deleted file mode 100644 index fb3c3296..00000000 --- a/src/components/sidebars/topology/room/RoomSidebarComponent.js +++ /dev/null @@ -1,35 +0,0 @@ -import React from "react"; -import LoadBarContainer from "../../../../containers/sidebars/elements/LoadBarContainer"; -import LoadChartContainer from "../../../../containers/sidebars/elements/LoadChartContainer"; -import BackToBuildingContainer from "../../../../containers/sidebars/topology/room/BackToBuildingContainer"; -import DeleteRoomContainer from "../../../../containers/sidebars/topology/room/DeleteRoomContainer"; -import RackConstructionContainer from "../../../../containers/sidebars/topology/room/RackConstructionContainer"; -import RoomNameContainer from "../../../../containers/sidebars/topology/room/RoomNameContainer"; -import RoomTypeContainer from "../../../../containers/sidebars/topology/room/RoomTypeContainer"; - -const RoomSidebarComponent = ({roomId, roomType, inSimulation}) => { - let allowedObjects; - if (!inSimulation && roomType === "SERVER") { - allowedObjects = ; - } - - return ( -
    - - - - {inSimulation ? -
    - - -
    : -
    - {allowedObjects} - -
    - } -
    - ); -}; - -export default RoomSidebarComponent; diff --git a/src/components/sidebars/topology/room/RoomTypeComponent.js b/src/components/sidebars/topology/room/RoomTypeComponent.js deleted file mode 100644 index c48c185a..00000000 --- a/src/components/sidebars/topology/room/RoomTypeComponent.js +++ /dev/null @@ -1,10 +0,0 @@ -import React from "react"; -import {ROOM_TYPE_TO_NAME_MAP} from "../../../../util/room-types"; - -const RoomTypeComponent = ({roomType}) => ( -

    - {ROOM_TYPE_TO_NAME_MAP[roomType]} -

    -); - -export default RoomTypeComponent; -- cgit v1.2.3