From 540bb00a64e4704a0c08459af2b158bdafd59a60 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Sat, 9 Sep 2017 11:02:15 +0200 Subject: Move control of post-saga actions back to sagas --- src/actions/topology/building.js | 35 +++++------------------------------ src/actions/topology/machine.js | 35 ----------------------------------- src/actions/topology/rack.js | 30 ------------------------------ src/actions/topology/room.js | 18 ------------------ 4 files changed, 5 insertions(+), 113 deletions(-) (limited to 'src/actions/topology') diff --git a/src/actions/topology/building.js b/src/actions/topology/building.js index 87abbf5b..9f2d4590 100644 --- a/src/actions/topology/building.js +++ b/src/actions/topology/building.js @@ -1,5 +1,3 @@ -import {addIdToStoreObjectListProp, removeIdFromStoreObjectListProp} from "../objects"; - export const FETCH_TOPOLOGY_OF_DATACENTER = "FETCH_TOPOLOGY_OF_DATACENTER"; export const FETCH_TOPOLOGY_OF_DATACENTER_SUCCEEDED = "FETCH_TOPOLOGY_OF_DATACENTER_SUCCEEDED"; export const FETCH_LATEST_DATACENTER = "FETCH_LATEST_DATACENTER"; @@ -43,13 +41,9 @@ export function startNewRoomConstruction() { } export function startNewRoomConstructionSucceeded(roomId) { - return (dispatch, getState) => { - const {currentDatacenterId} = getState(); - dispatch(addIdToStoreObjectListProp("datacenter", currentDatacenterId, "roomIds", roomId)); - dispatch({ - type: START_NEW_ROOM_CONSTRUCTION_SUCCEEDED, - roomId - }); + return { + type: START_NEW_ROOM_CONSTRUCTION_SUCCEEDED, + roomId }; } @@ -74,13 +68,8 @@ export function cancelNewRoomConstruction() { } export function cancelNewRoomConstructionSucceeded() { - return (dispatch, getState) => { - const {currentDatacenterId, construction} = getState(); - dispatch(removeIdFromStoreObjectListProp("datacenter", currentDatacenterId, "roomIds", - construction.currentRoomInConstruction)); - dispatch({ - type: CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED - }); + return { + type: CANCEL_NEW_ROOM_CONSTRUCTION_SUCCEEDED }; } @@ -108,23 +97,9 @@ export function addTile(positionX, positionY) { }; } -export function addTileSucceeded(tileId) { - return (dispatch, getState) => { - const {construction} = getState(); - dispatch(addIdToStoreObjectListProp("room", construction.currentRoomInConstruction, "tileIds", tileId)); - }; -} - export function deleteTile(tileId) { return { type: DELETE_TILE, tileId } } - -export function deleteTileSucceeded(tileId) { - return (dispatch, getState) => { - const {construction} = getState(); - dispatch(removeIdFromStoreObjectListProp("room", construction.currentRoomInConstruction, "tileIds", tileId)); - }; -} diff --git a/src/actions/topology/machine.js b/src/actions/topology/machine.js index e11c7d1d..48d88052 100644 --- a/src/actions/topology/machine.js +++ b/src/actions/topology/machine.js @@ -1,6 +1,3 @@ -import {goDownOneInteractionLevel} from "../interaction-level"; -import {addPropToStoreObject} from "../objects"; - export const DELETE_MACHINE = "DELETE_MACHINE"; export const ADD_UNIT = "ADD_UNIT"; export const DELETE_UNIT = "DELETE_UNIT"; @@ -11,17 +8,6 @@ export function deleteMachine() { }; } -export function deleteMachineSucceeded() { - return (dispatch, getState) => { - const {interactionLevel, objects} = getState(); - const rack = objects.rack[objects.tile[interactionLevel.tileId].objectId]; - const machineIds = [...rack.machineIds]; - machineIds[interactionLevel.position - 1] = null; - dispatch(goDownOneInteractionLevel()); - dispatch(addPropToStoreObject("rack", rack.id, {machineIds})); - }; -} - export function addUnit(unitType, id) { return { type: ADD_UNIT, @@ -30,16 +16,6 @@ export function addUnit(unitType, id) { }; } -export function addUnitSucceeded(unitType, id) { - return (dispatch, getState) => { - const {objects, interactionLevel} = getState(); - const machine = objects.machine[objects.rack[objects.tile[interactionLevel.tileId].objectId] - .machineIds[interactionLevel.position - 1]]; - const units = [...machine[unitType + "Ids"], id]; - dispatch(addPropToStoreObject("machine", machine.id, {[unitType + "Ids"]: units})); - }; -} - export function deleteUnit(unitType, index) { return { type: DELETE_UNIT, @@ -47,14 +23,3 @@ export function deleteUnit(unitType, index) { index }; } - -export function deleteUnitSucceeded(unitType, index) { - return (dispatch, getState) => { - const {objects, interactionLevel} = getState(); - const machine = objects.machine[objects.rack[objects.tile[interactionLevel.tileId].objectId] - .machineIds[interactionLevel.position - 1]]; - const unitIds = machine[unitType + "Ids"].slice(); - unitIds.splice(index, 1); - dispatch(addPropToStoreObject("machine", machine.id, {[unitType + "Ids"]: unitIds})); - }; -} diff --git a/src/actions/topology/rack.js b/src/actions/topology/rack.js index cb6ec387..043d6190 100644 --- a/src/actions/topology/rack.js +++ b/src/actions/topology/rack.js @@ -1,6 +1,3 @@ -import {goDownOneInteractionLevel} from "../interaction-level"; -import {addPropToStoreObject} from "../objects"; - export const EDIT_RACK_NAME = "EDIT_RACK_NAME"; export const DELETE_RACK = "DELETE_RACK"; export const ADD_MACHINE = "ADD_MACHINE"; @@ -12,42 +9,15 @@ export function editRackName(name) { }; } -export function editRackNameSucceeded(name) { - return (dispatch, getState) => { - const {objects, interactionLevel} = getState(); - dispatch(addPropToStoreObject("rack", objects.tile[interactionLevel.tileId].objectId, {name})); - }; -} - export function deleteRack() { return { type: DELETE_RACK }; } -export function deleteRackSucceeded() { - return (dispatch, getState) => { - const {interactionLevel} = getState(); - const currentTileId = interactionLevel.tileId; - dispatch(goDownOneInteractionLevel()); - dispatch(addPropToStoreObject("tile", currentTileId, {objectType: undefined})); - dispatch(addPropToStoreObject("tile", currentTileId, {objectId: undefined})); - }; -} - export function addMachine(position) { return { type: ADD_MACHINE, position }; } - -export function addMachineSucceeded(machine) { - return (dispatch, getState) => { - const {objects, interactionLevel} = getState(); - const rack = objects.rack[objects.tile[interactionLevel.tileId].objectId]; - const machineIds = [...rack.machineIds]; - machineIds[machine.position - 1] = machine.id; - dispatch(addPropToStoreObject("rack", rack.id, {machineIds})); - }; -} diff --git a/src/actions/topology/room.js b/src/actions/topology/room.js index 07cf2b1d..884c7e84 100644 --- a/src/actions/topology/room.js +++ b/src/actions/topology/room.js @@ -1,6 +1,4 @@ import {findTileWithPosition} from "../../util/tile-calculations"; -import {goDownOneInteractionLevel} from "../interaction-level"; -import {addPropToStoreObject, removeIdFromStoreObjectListProp} from "../objects"; export const EDIT_ROOM_NAME = "EDIT_ROOM_NAME"; export const DELETE_ROOM = "DELETE_ROOM"; @@ -15,13 +13,6 @@ export function editRoomName(name) { }; } -export function editRoomNameSucceeded(name) { - return (dispatch, getState) => { - const {interactionLevel} = getState(); - dispatch(addPropToStoreObject("room", interactionLevel.roomId, {name})); - }; -} - export function startRackConstruction() { return { type: START_RACK_CONSTRUCTION @@ -55,12 +46,3 @@ export function deleteRoom() { type: DELETE_ROOM }; } - -export function deleteRoomSucceeded() { - return (dispatch, getState) => { - const {currentDatacenterId, interactionLevel} = getState(); - const currentRoomId = interactionLevel.roomId; - dispatch(goDownOneInteractionLevel()); - dispatch(removeIdFromStoreObjectListProp("datacenter", currentDatacenterId, "roomIds", currentRoomId)); - }; -} -- cgit v1.2.3