From 1f4616cbf9c82e4976d1f4b4c018d5e9ff83ad10 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Wed, 8 Nov 2017 10:28:33 +0100 Subject: Implement room editing Allows for rooms to be edited from the room context menu. Fixes #24 --- .../sidebars/topology/room/DeleteRoomComponent.js | 2 +- .../sidebars/topology/room/EditRoomComponent.js | 27 ++++++++++++++++++++++ .../topology/room/RackConstructionComponent.js | 13 ++++++++--- .../sidebars/topology/room/RoomSidebarComponent.js | 2 ++ 4 files changed, 40 insertions(+), 4 deletions(-) create mode 100644 src/components/app/sidebars/topology/room/EditRoomComponent.js (limited to 'src/components/app/sidebars/topology/room') diff --git a/src/components/app/sidebars/topology/room/DeleteRoomComponent.js b/src/components/app/sidebars/topology/room/DeleteRoomComponent.js index 5df484b5..3e3b3b36 100644 --- a/src/components/app/sidebars/topology/room/DeleteRoomComponent.js +++ b/src/components/app/sidebars/topology/room/DeleteRoomComponent.js @@ -1,7 +1,7 @@ import React from "react"; const DeleteRoomComponent = ({ onClick }) => ( -
+
Delete this room
diff --git a/src/components/app/sidebars/topology/room/EditRoomComponent.js b/src/components/app/sidebars/topology/room/EditRoomComponent.js new file mode 100644 index 00000000..c3b9f0ad --- /dev/null +++ b/src/components/app/sidebars/topology/room/EditRoomComponent.js @@ -0,0 +1,27 @@ +import classNames from "classnames"; +import React from "react"; + +const EditRoomComponent = ({ + onEdit, + onFinish, + isEditing, + isInRackConstructionMode +}) => + isEditing ? ( +
+ + Finish editing room +
+ ) : ( +
(isInRackConstructionMode ? undefined : onEdit())} + > + + Edit the tiles of this room +
+ ); + +export default EditRoomComponent; diff --git a/src/components/app/sidebars/topology/room/RackConstructionComponent.js b/src/components/app/sidebars/topology/room/RackConstructionComponent.js index 0982e403..06b8a2aa 100644 --- a/src/components/app/sidebars/topology/room/RackConstructionComponent.js +++ b/src/components/app/sidebars/topology/room/RackConstructionComponent.js @@ -1,9 +1,11 @@ +import classNames from "classnames"; import React from "react"; const RackConstructionComponent = ({ - inRackConstructionMode, onStart, - onStop + onStop, + inRackConstructionMode, + isEditingRoom }) => { if (inRackConstructionMode) { return ( @@ -15,7 +17,12 @@ const RackConstructionComponent = ({ } return ( -
+
(isEditingRoom ? undefined : onStart())} + > Start rack construction
diff --git a/src/components/app/sidebars/topology/room/RoomSidebarComponent.js b/src/components/app/sidebars/topology/room/RoomSidebarComponent.js index 727c3f43..275f9624 100644 --- a/src/components/app/sidebars/topology/room/RoomSidebarComponent.js +++ b/src/components/app/sidebars/topology/room/RoomSidebarComponent.js @@ -3,6 +3,7 @@ import LoadBarContainer from "../../../../../containers/app/sidebars/elements/Lo import LoadChartContainer from "../../../../../containers/app/sidebars/elements/LoadChartContainer"; import BackToBuildingContainer from "../../../../../containers/app/sidebars/topology/room/BackToBuildingContainer"; import DeleteRoomContainer from "../../../../../containers/app/sidebars/topology/room/DeleteRoomContainer"; +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"; @@ -26,6 +27,7 @@ const RoomSidebarComponent = ({ roomId, roomType, inSimulation }) => { ) : (
{allowedObjects} +
)} -- cgit v1.2.3