ui: Remove current ids state from Redux

This change removes the current active identifiers from the Redux state.
Instead, we use the router query to track the active project, portfolio
and topology.

1 files changed, 4 insertions, 4 deletions

diff --git a/opendc-web/opendc-web-ui/src/redux/sagas/scenarios.js b/opendc-web/opendc-web-ui/src/redux/sagas/scenarios.js
index bdb7c45d..b2979636 100644
--- a/opendc-web/opendc-web-ui/src/redux/sagas/scenarios.js
+++ b/opendc-web/opendc-web-ui/src/redux/sagas/scenarios.js
@@ -34,7 +34,7 @@ export function* onAddScenario(action) {
                 scenarioIds: scenarioIds.concat([scenario._id]),
             })
         )
-        yield watchForPortfolioResults()
+        yield watchForPortfolioResults(action.scenario.portfolioId)
     } catch (error) {
         console.error(error)
     }
@@ -53,13 +53,13 @@ export function* onUpdateScenario(action) {
 export function* onDeleteScenario(action) {
     try {
         const auth = yield getContext('auth')
+        const scenario = yield select((state) => state.objects.scenario[action.id])
         yield call(deleteScenario, auth, action.id)
 
-        const currentPortfolioId = yield select((state) => state.currentPortfolioId)
-        const scenarioIds = yield select((state) => state.objects.portfolio[currentPortfolioId].scenarioIds)
+        const scenarioIds = yield select((state) => state.objects.portfolio[scenario.portfolioId].scenarioIds)
 
         yield put(
-            addPropToStoreObject('scenario', currentPortfolioId, {
+            addPropToStoreObject('scenario', scenario.portfolioId, {
                 scenarioIds: scenarioIds.filter((id) => id !== action.id),
             })
         )