Merge branch 'master' of github.com:atlarge-research/opendc-dev

1 files changed, 6 insertions, 3 deletions

diff --git a/frontend/src/reducers/construction-mode.js b/frontend/src/reducers/construction-mode.js
index b15ac834..257dddd2 100644
--- a/frontend/src/reducers/construction-mode.js
+++ b/frontend/src/reducers/construction-mode.js
@@ -1,5 +1,4 @@
 import { combineReducers } from 'redux'
-import { OPEN_EXPERIMENT_SUCCEEDED } from '../actions/experiments'
 import { GO_DOWN_ONE_INTERACTION_LEVEL } from '../actions/interaction-level'
 import {
     CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED,
@@ -10,6 +9,8 @@ import {
     START_ROOM_EDIT,
 } from '../actions/topology/building'
 import { DELETE_ROOM, START_RACK_CONSTRUCTION, STOP_RACK_CONSTRUCTION } from '../actions/topology/room'
+import { OPEN_PORTFOLIO_SUCCEEDED } from '../actions/portfolios'
+import { OPEN_SCENARIO_SUCCEEDED } from '../actions/scenarios'
 
 export function currentRoomInConstruction(state = '-1', action) {
     switch (action.type) {
@@ -19,7 +20,8 @@ export function currentRoomInConstruction(state = '-1', action) {
             return action.roomId
         case CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED:
         case FINISH_NEW_ROOM_CONSTRUCTION:
-        case OPEN_EXPERIMENT_SUCCEEDED:
+        case OPEN_PORTFOLIO_SUCCEEDED:
+        case OPEN_SCENARIO_SUCCEEDED:
         case FINISH_ROOM_EDIT:
         case SET_CURRENT_TOPOLOGY:
         case DELETE_ROOM:
@@ -34,7 +36,8 @@ export function inRackConstructionMode(state = false, action) {
         case START_RACK_CONSTRUCTION:
             return true
         case STOP_RACK_CONSTRUCTION:
-        case OPEN_EXPERIMENT_SUCCEEDED:
+        case OPEN_PORTFOLIO_SUCCEEDED:
+        case OPEN_SCENARIO_SUCCEEDED:
         case SET_CURRENT_TOPOLOGY:
         case GO_DOWN_ONE_INTERACTION_LEVEL:
             return false