Merge branch 'master' onto working copy

3 files changed, 8 insertions, 12 deletions

diff --git a/frontend/src/actions/topologies.js b/frontend/src/actions/topologies.js
index c80ef6b2..dcce3b7d 100644
--- a/frontend/src/actions/topologies.js
+++ b/frontend/src/actions/topologies.js
@@ -1,10 +1,11 @@
 export const ADD_TOPOLOGY = 'ADD_TOPOLOGY'
 export const DELETE_TOPOLOGY = 'DELETE_TOPOLOGY'
 
-export function addTopology(topology) {
+export function addTopology(name, duplicateId) {
     return {
         type: ADD_TOPOLOGY,
-        topology,
+        name,
+        duplicateId,
     }
 }
 
diff --git a/frontend/src/actions/topology/building.js b/frontend/src/actions/topology/building.js
index d6c53af9..72deda6f 100644
--- a/frontend/src/actions/topology/building.js
+++ b/frontend/src/actions/topology/building.js
@@ -1,11 +1,9 @@
 export const SET_CURRENT_TOPOLOGY = 'SET_CURRENT_TOPOLOGY'
 export const START_NEW_ROOM_CONSTRUCTION = 'START_NEW_ROOM_CONSTRUCTION'
-export const START_NEW_ROOM_CONSTRUCTION_SUCCEEDED =
-    'START_NEW_ROOM_CONSTRUCTION_SUCCEEDED'
+export const START_NEW_ROOM_CONSTRUCTION_SUCCEEDED = 'START_NEW_ROOM_CONSTRUCTION_SUCCEEDED'
 export const FINISH_NEW_ROOM_CONSTRUCTION = 'FINISH_NEW_ROOM_CONSTRUCTION'
 export const CANCEL_NEW_ROOM_CONSTRUCTION = 'CANCEL_NEW_ROOM_CONSTRUCTION'
-export const CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED =
-    'CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED'
+export const CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED = 'CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED'
 export const START_ROOM_EDIT = 'START_ROOM_EDIT'
 export const FINISH_ROOM_EDIT = 'FINISH_ROOM_EDIT'
 export const ADD_TILE = 'ADD_TILE'
@@ -34,9 +32,7 @@ export function startNewRoomConstructionSucceeded(roomId) {
 export function finishNewRoomConstruction() {
     return (dispatch, getState) => {
         const { objects, construction } = getState()
-        if (
-            objects.room[construction.currentRoomInConstruction].tileIds.length === 0
-        ) {
+        if (objects.room[construction.currentRoomInConstruction].tileIds.length === 0) {
             dispatch(cancelNewRoomConstruction())
             return
         }
@@ -79,8 +75,7 @@ export function toggleTileAtLocation(positionX, positionY) {
     return (dispatch, getState) => {
         const { objects, construction } = getState()
 
-        const tileIds =
-            objects.room[construction.currentRoomInConstruction].tileIds
+        const tileIds = objects.room[construction.currentRoomInConstruction].tileIds
         for (let index in tileIds) {
             if (
                 objects.tile[tileIds[index]].positionX === positionX &&
diff --git a/frontend/src/actions/topology/room.js b/frontend/src/actions/topology/room.js
index 939b475a..52cba680 100644
--- a/frontend/src/actions/topology/room.js
+++ b/frontend/src/actions/topology/room.js
@@ -29,7 +29,7 @@ export function addRackToTile(positionX, positionY) {
     return (dispatch, getState) => {
         const { objects, interactionLevel } = getState()
         const currentRoom = objects.room[interactionLevel.roomId]
-        const tiles = currentRoom.tileIds.map(tileId => objects.tile[tileId])
+        const tiles = currentRoom.tileIds.map((tileId) => objects.tile[tileId])
         const tile = findTileWithPosition(tiles, positionX, positionY)
 
         if (tile !== null) {