From f119fc78dda4d1e828dde04f378a63a93e3a0a7e Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Thu, 2 Jul 2020 18:39:28 +0200 Subject: Add current progress on frontend port --- .../app/sidebars/topology/room/EditRoomContainer.js | 5 +---- .../app/sidebars/topology/room/RackConstructionContainer.js | 5 +---- .../app/sidebars/topology/room/RoomSidebarContainer.js | 3 +-- .../app/sidebars/topology/room/RoomTypeContainer.js | 12 ------------ 4 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 frontend/src/containers/app/sidebars/topology/room/RoomTypeContainer.js (limited to 'frontend/src/containers/app/sidebars/topology/room') diff --git a/frontend/src/containers/app/sidebars/topology/room/EditRoomContainer.js b/frontend/src/containers/app/sidebars/topology/room/EditRoomContainer.js index 29014022..87470bfe 100644 --- a/frontend/src/containers/app/sidebars/topology/room/EditRoomContainer.js +++ b/frontend/src/containers/app/sidebars/topology/room/EditRoomContainer.js @@ -1,8 +1,5 @@ import { connect } from 'react-redux' -import { - finishRoomEdit, - startRoomEdit, -} from '../../../../../actions/topology/building' +import { finishRoomEdit, startRoomEdit } from '../../../../../actions/topology/building' import EditRoomComponent from '../../../../../components/app/sidebars/topology/room/EditRoomComponent' const mapStateToProps = state => { diff --git a/frontend/src/containers/app/sidebars/topology/room/RackConstructionContainer.js b/frontend/src/containers/app/sidebars/topology/room/RackConstructionContainer.js index fe42647c..30f7a688 100644 --- a/frontend/src/containers/app/sidebars/topology/room/RackConstructionContainer.js +++ b/frontend/src/containers/app/sidebars/topology/room/RackConstructionContainer.js @@ -1,8 +1,5 @@ import { connect } from 'react-redux' -import { - startRackConstruction, - stopRackConstruction, -} from '../../../../../actions/topology/room' +import { startRackConstruction, stopRackConstruction } from '../../../../../actions/topology/room' import RackConstructionComponent from '../../../../../components/app/sidebars/topology/room/RackConstructionComponent' const mapStateToProps = state => { diff --git a/frontend/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js b/frontend/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js index f940b282..443495de 100644 --- a/frontend/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js +++ b/frontend/src/containers/app/sidebars/topology/room/RoomSidebarContainer.js @@ -3,9 +3,8 @@ import RoomSidebarComponent from '../../../../../components/app/sidebars/topolog const mapStateToProps = state => { return { - roomId: state.interactionLevel.roomId, - roomType: state.objects.room[state.interactionLevel.roomId].roomType, inSimulation: state.currentExperimentId !== -1, + roomId: state.interactionLevel.roomId, } } diff --git a/frontend/src/containers/app/sidebars/topology/room/RoomTypeContainer.js b/frontend/src/containers/app/sidebars/topology/room/RoomTypeContainer.js deleted file mode 100644 index de4c8c85..00000000 --- a/frontend/src/containers/app/sidebars/topology/room/RoomTypeContainer.js +++ /dev/null @@ -1,12 +0,0 @@ -import { connect } from 'react-redux' -import RoomTypeComponent from '../../../../../components/app/sidebars/topology/room/RoomTypeComponent' - -const mapStateToProps = state => { - return { - roomType: state.objects.room[state.interactionLevel.roomId].roomType, - } -} - -const RoomNameContainer = connect(mapStateToProps)(RoomTypeComponent) - -export default RoomNameContainer -- cgit v1.2.3