merge: Integrate v2.1 progress into public repository

This pull request integrates the changes planned for the v2.1 release of
OpenDC into the public Github repository in order to sync the progress
of both repositories.

1 files changed, 0 insertions, 52 deletions

diff --git a/opendc-web/opendc-web-ui/src/reducers/construction-mode.js b/opendc-web/opendc-web-ui/src/reducers/construction-mode.js
deleted file mode 100644
index 257dddd2..00000000
--- a/opendc-web/opendc-web-ui/src/reducers/construction-mode.js
+++ /dev/null
@@ -1,52 +0,0 @@
-import { combineReducers } from 'redux'
-import { GO_DOWN_ONE_INTERACTION_LEVEL } from '../actions/interaction-level'
-import {
-    CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED,
-    FINISH_NEW_ROOM_CONSTRUCTION,
-    FINISH_ROOM_EDIT,
-    SET_CURRENT_TOPOLOGY,
-    START_NEW_ROOM_CONSTRUCTION_SUCCEEDED,
-    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) {
-        case START_NEW_ROOM_CONSTRUCTION_SUCCEEDED:
-            return action.roomId
-        case START_ROOM_EDIT:
-            return action.roomId
-        case CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED:
-        case FINISH_NEW_ROOM_CONSTRUCTION:
-        case OPEN_PORTFOLIO_SUCCEEDED:
-        case OPEN_SCENARIO_SUCCEEDED:
-        case FINISH_ROOM_EDIT:
-        case SET_CURRENT_TOPOLOGY:
-        case DELETE_ROOM:
-            return '-1'
-        default:
-            return state
-    }
-}
-
-export function inRackConstructionMode(state = false, action) {
-    switch (action.type) {
-        case START_RACK_CONSTRUCTION:
-            return true
-        case STOP_RACK_CONSTRUCTION:
-        case OPEN_PORTFOLIO_SUCCEEDED:
-        case OPEN_SCENARIO_SUCCEEDED:
-        case SET_CURRENT_TOPOLOGY:
-        case GO_DOWN_ONE_INTERACTION_LEVEL:
-            return false
-        default:
-            return state
-    }
-}
-
-export const construction = combineReducers({
-    currentRoomInConstruction,
-    inRackConstructionMode,
-})