From aa788a3ad18badfac8beaabdaffc88b9e52f9306 Mon Sep 17 00:00:00 2001 From: Fabian Mastenbroek Date: Wed, 7 Jul 2021 15:07:11 +0200 Subject: 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. --- .../src/containers/app/results/PortfolioResultsContainer.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'opendc-web/opendc-web-ui/src/containers/app/results') diff --git a/opendc-web/opendc-web-ui/src/containers/app/results/PortfolioResultsContainer.js b/opendc-web/opendc-web-ui/src/containers/app/results/PortfolioResultsContainer.js index e60abe18..ce7d5514 100644 --- a/opendc-web/opendc-web-ui/src/containers/app/results/PortfolioResultsContainer.js +++ b/opendc-web/opendc-web-ui/src/containers/app/results/PortfolioResultsContainer.js @@ -1,13 +1,16 @@ import React from 'react' import { useSelector } from 'react-redux' import PortfolioResultsComponent from '../../../components/app/results/PortfolioResultsComponent' +import { useRouter } from 'next/router' const PortfolioResultsContainer = (props) => { + const router = useRouter() + const { portfolio: currentPortfolioId } = router.query const { scenarios, portfolio } = useSelector((state) => { if ( - state.currentPortfolioId === '-1' || - !state.objects.portfolio[state.currentPortfolioId] || - state.objects.portfolio[state.currentPortfolioId].scenarioIds + !currentPortfolioId || + !state.objects.portfolio[currentPortfolioId] || + state.objects.portfolio[currentPortfolioId].scenarioIds .map((scenarioId) => state.objects.scenario[scenarioId]) .some((s) => s === undefined) ) { @@ -18,8 +21,8 @@ const PortfolioResultsContainer = (props) => { } return { - portfolio: state.objects.portfolio[state.currentPortfolioId], - scenarios: state.objects.portfolio[state.currentPortfolioId].scenarioIds.map( + portfolio: state.objects.portfolio[currentPortfolioId], + scenarios: state.objects.portfolio[currentPortfolioId].scenarioIds.map( (scenarioId) => state.objects.scenario[scenarioId] ), } -- cgit v1.2.3