From 3d1c02e50ee619598bcd7fad4368be8b4a039e84 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Mon, 7 Mar 2022 18:19:21 +0100
Subject: refactor(web/ui): Fix compatibility with new API

This change updates the web interface in React to be compatible with the
new API written in Kotlin. Several changes have been made in the new API
to ensure consistency.
---
 .../src/components/portfolios/PortfolioOverview.js | 23 +++++++++++-----------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/components/portfolios/PortfolioOverview.js')

diff --git a/opendc-web/opendc-web-ui/src/components/portfolios/PortfolioOverview.js b/opendc-web/opendc-web-ui/src/components/portfolios/PortfolioOverview.js
index 580b0a29..e561b655 100644
--- a/opendc-web/opendc-web-ui/src/components/portfolios/PortfolioOverview.js
+++ b/opendc-web/opendc-web-ui/src/components/portfolios/PortfolioOverview.js
@@ -43,8 +43,8 @@ import { METRIC_NAMES } from '../../util/available-metrics'
 import NewScenario from './NewScenario'
 import ScenarioTable from './ScenarioTable'
 
-function PortfolioOverview({ portfolioId }) {
-    const { data: portfolio } = usePortfolio(portfolioId)
+function PortfolioOverview({ projectId, portfolioId }) {
+    const { status, data: portfolio } = usePortfolio(projectId, portfolioId)
 
     return (
         <Grid hasGutter>
@@ -62,16 +62,16 @@ function PortfolioOverview({ portfolioId }) {
                             <DescriptionListGroup>
                                 <DescriptionListTerm>Scenarios</DescriptionListTerm>
                                 <DescriptionListDescription>
-                                    {portfolio?.scenarioIds.length ?? <Skeleton screenreaderText="Loading portfolio" />}
+                                    {portfolio?.scenarios?.length ?? <Skeleton screenreaderText="Loading portfolio" />}
                                 </DescriptionListDescription>
                             </DescriptionListGroup>
                             <DescriptionListGroup>
                                 <DescriptionListTerm>Metrics</DescriptionListTerm>
                                 <DescriptionListDescription>
-                                    {portfolio?.targets?.enabledMetrics ? (
-                                        portfolio.targets.enabledMetrics.length > 0 ? (
+                                    {portfolio ? (
+                                        portfolio.targets.metrics.length > 0 ? (
                                             <ChipGroup>
-                                                {portfolio.targets.enabledMetrics.map((metric) => (
+                                                {portfolio.targets.metrics.map((metric) => (
                                                     <Chip isReadOnly key={metric}>
                                                         {METRIC_NAMES[metric]}
                                                     </Chip>
@@ -88,9 +88,7 @@ function PortfolioOverview({ portfolioId }) {
                             <DescriptionListGroup>
                                 <DescriptionListTerm>Repeats per Scenario</DescriptionListTerm>
                                 <DescriptionListDescription>
-                                    {portfolio?.targets?.repeatsPerScenario ?? (
-                                        <Skeleton screenreaderText="Loading portfolio" />
-                                    )}
+                                    {portfolio?.targets?.repeats ?? <Skeleton screenreaderText="Loading portfolio" />}
                                 </DescriptionListDescription>
                             </DescriptionListGroup>
                         </DescriptionList>
@@ -101,12 +99,12 @@ function PortfolioOverview({ portfolioId }) {
                 <Card>
                     <CardHeader>
                         <CardActions>
-                            <NewScenario portfolioId={portfolioId} />
+                            <NewScenario projectId={projectId} portfolioId={portfolioId} />
                         </CardActions>
                         <CardTitle>Scenarios</CardTitle>
                     </CardHeader>
                     <CardBody>
-                        <ScenarioTable portfolioId={portfolioId} />
+                        <ScenarioTable portfolio={portfolio} status={status} />
                     </CardBody>
                 </Card>
             </GridItem>
@@ -115,7 +113,8 @@ function PortfolioOverview({ portfolioId }) {
 }
 
 PortfolioOverview.propTypes = {
-    portfolioId: PropTypes.string,
+    projectId: PropTypes.number,
+    portfolioId: PropTypes.number,
 }
 
 export default PortfolioOverview
-- 
cgit v1.2.3