1 files changed, 18 insertions, 9 deletions
diff --git a/opendc-web/opendc-web-ui/src/data/project.js b/opendc-web/opendc-web-ui/src/data/project.js
index 256203a3..9bdcfb93 100644
--- a/opendc-web/opendc-web-ui/src/data/project.js
+++ b/opendc-web/opendc-web-ui/src/data/project.js
@@ -23,8 +23,8 @@
 import { useQueries, useQuery } from 'react-query'
 import { addProject, deleteProject, fetchProject, fetchProjects } from '../api/projects'
 import { useRouter } from 'next/router'
-import { addPortfolio, deletePortfolio, fetchPortfolio } from '../api/portfolios'
-import { addScenario, deleteScenario, fetchScenario } from '../api/scenarios'
+import { addPortfolio, deletePortfolio, fetchPortfolio, fetchPortfoliosOfProject } from '../api/portfolios'
+import { addScenario, deleteScenario, fetchScenario, fetchScenariosOfPortfolio } from '../api/scenarios'
 
 /**
  * Configure the query defaults for the project endpoints.
@@ -51,6 +51,9 @@ export function configureProjectClient(queryClient, auth) {
     queryClient.setQueryDefaults('portfolios', {
         queryFn: ({ queryKey }) => fetchPortfolio(auth, queryKey[1]),
     })
+    queryClient.setQueryDefaults('project-portfolios', {
+        queryFn: ({ queryKey }) => fetchPortfoliosOfProject(auth, queryKey[1]),
+    })
     queryClient.setMutationDefaults('addPortfolio', {
         mutationFn: (data) => addPortfolio(auth, data),
         onSuccess: async (result) => {
@@ -75,6 +78,9 @@ export function configureProjectClient(queryClient, auth) {
     queryClient.setQueryDefaults('scenarios', {
         queryFn: ({ queryKey }) => fetchScenario(auth, queryKey[1]),
     })
+    queryClient.setQueryDefaults('portfolio-scenarios', {
+        queryFn: ({ queryKey }) => fetchScenariosOfPortfolio(auth, queryKey[1]),
+    })
     queryClient.setMutationDefaults('addScenario', {
         mutationFn: (data) => addScenario(auth, data),
         onSuccess: async (result) => {
@@ -122,14 +128,10 @@ export function usePortfolio(portfolioId) {
 }
 
 /**
- * Return the portfolios for the specified project id.
+ * Return the portfolios of the specified project.
  */
-export function usePortfolios(portfolioIds) {
-    return useQueries(
-        portfolioIds.map((portfolioId) => ({
-            queryKey: ['portfolios', portfolioId],
-        }))
-    )
+export function useProjectPortfolios(projectId) {
+    return useQuery(['project-portfolios', projectId], { enabled: !!projectId })
 }
 
 /**
@@ -144,6 +146,13 @@ export function useScenarios(scenarioIds) {
 }
 
 /**
+ * Return the scenarios of the specified portfolio.
+ */
+export function usePortfolioScenarios(portfolioId) {
+    return useQuery(['portfolio-scenarios', portfolioId], { enabled: !!portfolioId })
+}
+
+/**
  * Return the current active project identifier.
  */
 export function useActiveProjectId() {