From ebab0cc12e293a57cbc58d2dd51b3c9d7cd4ee92 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 20 Jul 2021 14:55:39 +0200
Subject: fix(ui): Load correct topology view

This change fixes an issue where the only the default topology view
would be shown to the user.
---
 opendc-web/opendc-web-ui/src/redux/sagas/index.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/redux/sagas/index.js')

diff --git a/opendc-web/opendc-web-ui/src/redux/sagas/index.js b/opendc-web/opendc-web-ui/src/redux/sagas/index.js
index 318f0afb..9ddc564d 100644
--- a/opendc-web/opendc-web-ui/src/redux/sagas/index.js
+++ b/opendc-web/opendc-web-ui/src/redux/sagas/index.js
@@ -1,5 +1,4 @@
 import { takeEvery } from 'redux-saga/effects'
-import { OPEN_PROJECT_SUCCEEDED } from '../actions/projects'
 import {
     ADD_TILE,
     CANCEL_NEW_ROOM_CONSTRUCTION,
@@ -9,7 +8,6 @@ import {
 import { ADD_UNIT, DELETE_MACHINE, DELETE_UNIT } from '../actions/topology/machine'
 import { ADD_MACHINE, DELETE_RACK, EDIT_RACK_NAME } from '../actions/topology/rack'
 import { ADD_RACK_TO_TILE, DELETE_ROOM, EDIT_ROOM_NAME } from '../actions/topology/room'
-import { onOpenProjectSucceeded } from './projects'
 import {
     onAddMachine,
     onAddRackToTile,
@@ -25,13 +23,14 @@ import {
     onEditRackName,
     onEditRoomName,
     onStartNewRoomConstruction,
+    onOpenTopology,
 } from './topology'
-import { ADD_TOPOLOGY } from '../actions/topologies'
+import { ADD_TOPOLOGY, OPEN_TOPOLOGY } from '../actions/topologies'
 import { onAddPrefab } from './prefabs'
 import { ADD_PREFAB } from '../actions/prefabs'
 
 export default function* rootSaga() {
-    yield takeEvery(OPEN_PROJECT_SUCCEEDED, onOpenProjectSucceeded)
+    yield takeEvery(OPEN_TOPOLOGY, onOpenTopology)
 
     yield takeEvery(ADD_TOPOLOGY, onAddTopology)
     yield takeEvery(START_NEW_ROOM_CONSTRUCTION, onStartNewRoomConstruction)
-- 
cgit v1.2.3


From 54f424a18cc21a52ea518d40893218a07ab55989 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 21 Jul 2021 15:04:22 +0200
Subject: feat(ui): Extract topology construction out of Sagas

This change updates the OpenDC frontend to perform the construction of
the topology directly in the reducers instead of performing the
mutations in Redux Sagas as side effects. This allows us to nicely map
actions to mutations in the reducers.
---
 opendc-web/opendc-web-ui/src/redux/sagas/index.js | 52 ++---------------------
 1 file changed, 4 insertions(+), 48 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/redux/sagas/index.js')

diff --git a/opendc-web/opendc-web-ui/src/redux/sagas/index.js b/opendc-web/opendc-web-ui/src/redux/sagas/index.js
index 9ddc564d..0fabdb6d 100644
--- a/opendc-web/opendc-web-ui/src/redux/sagas/index.js
+++ b/opendc-web/opendc-web-ui/src/redux/sagas/index.js
@@ -1,51 +1,7 @@
-import { takeEvery } from 'redux-saga/effects'
-import {
-    ADD_TILE,
-    CANCEL_NEW_ROOM_CONSTRUCTION,
-    DELETE_TILE,
-    START_NEW_ROOM_CONSTRUCTION,
-} from '../actions/topology/building'
-import { ADD_UNIT, DELETE_MACHINE, DELETE_UNIT } from '../actions/topology/machine'
-import { ADD_MACHINE, DELETE_RACK, EDIT_RACK_NAME } from '../actions/topology/rack'
-import { ADD_RACK_TO_TILE, DELETE_ROOM, EDIT_ROOM_NAME } from '../actions/topology/room'
-import {
-    onAddMachine,
-    onAddRackToTile,
-    onAddTile,
-    onAddTopology,
-    onAddUnit,
-    onCancelNewRoomConstruction,
-    onDeleteMachine,
-    onDeleteRack,
-    onDeleteRoom,
-    onDeleteTile,
-    onDeleteUnit,
-    onEditRackName,
-    onEditRoomName,
-    onStartNewRoomConstruction,
-    onOpenTopology,
-} from './topology'
-import { ADD_TOPOLOGY, OPEN_TOPOLOGY } from '../actions/topologies'
-import { onAddPrefab } from './prefabs'
-import { ADD_PREFAB } from '../actions/prefabs'
+import { fork } from 'redux-saga/effects'
+import { watchServer, updateServer } from './topology'
 
 export default function* rootSaga() {
-    yield takeEvery(OPEN_TOPOLOGY, onOpenTopology)
-
-    yield takeEvery(ADD_TOPOLOGY, onAddTopology)
-    yield takeEvery(START_NEW_ROOM_CONSTRUCTION, onStartNewRoomConstruction)
-    yield takeEvery(CANCEL_NEW_ROOM_CONSTRUCTION, onCancelNewRoomConstruction)
-    yield takeEvery(ADD_TILE, onAddTile)
-    yield takeEvery(DELETE_TILE, onDeleteTile)
-    yield takeEvery(EDIT_ROOM_NAME, onEditRoomName)
-    yield takeEvery(DELETE_ROOM, onDeleteRoom)
-    yield takeEvery(EDIT_RACK_NAME, onEditRackName)
-    yield takeEvery(DELETE_RACK, onDeleteRack)
-    yield takeEvery(ADD_RACK_TO_TILE, onAddRackToTile)
-    yield takeEvery(ADD_MACHINE, onAddMachine)
-    yield takeEvery(DELETE_MACHINE, onDeleteMachine)
-    yield takeEvery(ADD_UNIT, onAddUnit)
-    yield takeEvery(DELETE_UNIT, onDeleteUnit)
-
-    yield takeEvery(ADD_PREFAB, onAddPrefab)
+    yield fork(watchServer)
+    yield fork(updateServer)
 }
-- 
cgit v1.2.3