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.

6 files changed, 26 insertions, 78 deletions

diff --git a/opendc-web/opendc-web-ui/src/api/index.js b/opendc-web/opendc-web-ui/src/api/index.js
index 680d49ce..1a9877d0 100644
--- a/opendc-web/opendc-web-ui/src/api/index.js
+++ b/opendc-web/opendc-web-ui/src/api/index.js
@@ -47,5 +47,5 @@ export async function request(auth, path, method = 'GET', body) {
         throw response.message
     }
 
-    return json.data
+    return json
 }
diff --git a/opendc-web/opendc-web-ui/src/api/portfolios.js b/opendc-web/opendc-web-ui/src/api/portfolios.js
index 82ac0ced..d818876f 100644
--- a/opendc-web/opendc-web-ui/src/api/portfolios.js
+++ b/opendc-web/opendc-web-ui/src/api/portfolios.js
@@ -22,22 +22,18 @@
 
 import { request } from './index'
 
-export function fetchPortfolio(auth, portfolioId) {
-    return request(auth, `portfolios/${portfolioId}`)
+export function fetchPortfolio(auth, projectId, number) {
+    return request(auth, `projects/${projectId}/portfolios/${number}`)
 }
 
-export function fetchPortfoliosOfProject(auth, projectId) {
+export function fetchPortfolios(auth, projectId) {
     return request(auth, `projects/${projectId}/portfolios`)
 }
 
-export function addPortfolio(auth, portfolio) {
-    return request(auth, `projects/${portfolio.projectId}/portfolios`, 'POST', { portfolio })
+export function addPortfolio(auth, projectId, portfolio) {
+    return request(auth, `projects/${projectId}/portfolios`, 'POST', portfolio)
 }
 
-export function updatePortfolio(auth, portfolioId, portfolio) {
-    return request(auth, `portfolios/${portfolioId}`, 'PUT', { portfolio })
-}
-
-export function deletePortfolio(auth, portfolioId) {
-    return request(auth, `portfolios/${portfolioId}`, 'DELETE')
+export function deletePortfolio(auth, projectId, number) {
+    return request(auth, `projects/${projectId}/portfolios/${number}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/prefabs.js b/opendc-web/opendc-web-ui/src/api/prefabs.js
deleted file mode 100644
index eb9aa23c..00000000
--- a/opendc-web/opendc-web-ui/src/api/prefabs.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2021 AtLarge Research
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import { request } from './index'
-
-export function getPrefab(auth, prefabId) {
-    return request(auth, `prefabs/${prefabId}`)
-}
-
-export function addPrefab(auth, prefab) {
-    return request(auth, 'prefabs/', 'POST', { prefab })
-}
-
-export function updatePrefab(auth, prefab) {
-    return request(auth, `prefabs/${prefab._id}`, 'PUT', { prefab })
-}
-
-export function deletePrefab(auth, prefabId) {
-    return request(auth, `prefabs/${prefabId}`, 'DELETE')
-}
diff --git a/opendc-web/opendc-web-ui/src/api/projects.js b/opendc-web/opendc-web-ui/src/api/projects.js
index 4123b371..e7e095da 100644
--- a/opendc-web/opendc-web-ui/src/api/projects.js
+++ b/opendc-web/opendc-web-ui/src/api/projects.js
@@ -31,11 +31,7 @@ export function fetchProject(auth, projectId) {
 }
 
 export function addProject(auth, project) {
-    return request(auth, 'projects/', 'POST', { project })
-}
-
-export function updateProject(auth, project) {
-    return request(auth, `projects/${project._id}`, 'PUT', { project })
+    return request(auth, 'projects/', 'POST', project)
 }
 
 export function deleteProject(auth, projectId) {
diff --git a/opendc-web/opendc-web-ui/src/api/scenarios.js b/opendc-web/opendc-web-ui/src/api/scenarios.js
index 88516caa..7eeb8f28 100644
--- a/opendc-web/opendc-web-ui/src/api/scenarios.js
+++ b/opendc-web/opendc-web-ui/src/api/scenarios.js
@@ -22,22 +22,18 @@
 
 import { request } from './index'
 
-export function fetchScenario(auth, scenarioId) {
-    return request(auth, `scenarios/${scenarioId}`)
+export function fetchScenario(auth, projectId, scenarioId) {
+    return request(auth, `projects/${projectId}/scenarios/${scenarioId}`)
 }
 
-export function fetchScenariosOfPortfolio(auth, portfolioId) {
-    return request(auth, `portfolios/${portfolioId}/scenarios`)
+export function fetchScenariosOfPortfolio(auth, projectId, portfolioId) {
+    return request(auth, `projects/${projectId}/portfolios/${portfolioId}/scenarios`)
 }
 
-export function addScenario(auth, scenario) {
-    return request(auth, `portfolios/${scenario.portfolioId}/scenarios`, 'POST', { scenario })
+export function addScenario(auth, projectId, portfolioId, scenario) {
+    return request(auth, `projects/${projectId}/portfolios/${portfolioId}/scenarios`, 'POST', scenario)
 }
 
-export function updateScenario(auth, scenarioId, scenario) {
-    return request(auth, `scenarios/${scenarioId}`, 'PUT', { scenario })
-}
-
-export function deleteScenario(auth, scenarioId) {
-    return request(auth, `scenarios/${scenarioId}`, 'DELETE')
+export function deleteScenario(auth, projectId, scenarioId) {
+    return request(auth, `projects/${projectId}/scenarios/${scenarioId}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/topologies.js b/opendc-web/opendc-web-ui/src/api/topologies.js
index bd4e3bc4..0509c6d0 100644
--- a/opendc-web/opendc-web-ui/src/api/topologies.js
+++ b/opendc-web/opendc-web-ui/src/api/topologies.js
@@ -22,24 +22,23 @@
 
 import { request } from './index'
 
-export function fetchTopology(auth, topologyId) {
-    return request(auth, `topologies/${topologyId}`)
+export function fetchTopology(auth, projectId, number) {
+    return request(auth, `projects/${projectId}/topologies/${number}`)
 }
 
-export function fetchTopologiesOfProject(auth, projectId) {
+export function fetchTopologies(auth, projectId) {
     return request(auth, `projects/${projectId}/topologies`)
 }
 
-export function addTopology(auth, topology) {
-    return request(auth, `projects/${topology.projectId}/topologies`, 'POST', { topology })
+export function addTopology(auth, projectId, topology) {
+    return request(auth, `projects/${projectId}/topologies`, 'POST', topology)
 }
 
 export function updateTopology(auth, topology) {
-    // eslint-disable-next-line no-unused-vars
-    const { _id, ...data } = topology
-    return request(auth, `topologies/${topology._id}`, 'PUT', { topology: data })
+    const { project, number, rooms } = topology
+    return request(auth, `projects/${project.id}/topologies/${number}`, 'PUT', { rooms })
 }
 
-export function deleteTopology(auth, topologyId) {
-    return request(auth, `topologies/${topologyId}`, 'DELETE')
+export function deleteTopology(auth, projectId, number) {
+    return request(auth, `projects/${projectId}/topologies/${number}`, 'DELETE')
 }