From 2dbb06f433964ccac13fd64ef512ed03142ed97b Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Tue, 11 May 2021 16:34:25 +0200
Subject: ui: Move communication to REST API

This change removes the socket.io websocket connection/client in favour
of the OpenDC REST API. The socket.io websocket implementation was
intended to be used for interactive and collaborative datacenter design
and exploration.

However, we do not support this functionality at the moment
(collaborative design and exploration) and having the entire API run
over this websocket connection is fragile and not standard practice.

To improve maintainability, we therefore remove the websocket
implementation in favour of the OpenDC REST API implementation using
the fetch API. If we want to implement collaboration in the future, we
will develop appropriate extensions in conjuction with the existing REST
API. For this, we should look for standard and existing implementation
of this functionality.
---
 opendc-web/opendc-web-ui/src/api/index.js          | 31 +++++++++-----
 .../opendc-web-ui/src/api/routes/portfolios.js     | 35 +++------------
 opendc-web/opendc-web-ui/src/api/routes/prefabs.js | 33 +++-----------
 .../opendc-web-ui/src/api/routes/projects.js       | 33 +++-----------
 .../opendc-web-ui/src/api/routes/scenarios.js      | 35 +++------------
 .../opendc-web-ui/src/api/routes/schedulers.js     |  4 +-
 .../opendc-web-ui/src/api/routes/topologies.js     | 35 +++------------
 opendc-web/opendc-web-ui/src/api/routes/traces.js  |  4 +-
 opendc-web/opendc-web-ui/src/api/routes/users.js   | 41 +++---------------
 opendc-web/opendc-web-ui/src/api/routes/util.js    | 37 ----------------
 opendc-web/opendc-web-ui/src/api/socket.js         | 50 ----------------------
 11 files changed, 54 insertions(+), 284 deletions(-)
 delete mode 100644 opendc-web/opendc-web-ui/src/api/routes/util.js
 delete mode 100644 opendc-web/opendc-web-ui/src/api/socket.js

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/index.js b/opendc-web/opendc-web-ui/src/api/index.js
index cefcb2c5..e6528fd9 100644
--- a/opendc-web/opendc-web-ui/src/api/index.js
+++ b/opendc-web/opendc-web-ui/src/api/index.js
@@ -1,13 +1,22 @@
-import { sendSocketRequest } from './socket'
-
-export function sendRequest(request) {
-    return new Promise((resolve, reject) => {
-        sendSocketRequest(request, (response) => {
-            if (response.status.code === 200) {
-                resolve(response.content)
-            } else {
-                reject(response)
-            }
-        })
+import config from '../config'
+import { getAuthToken } from '../auth'
+
+const apiUrl = config['API_BASE_URL']
+
+export async function request(path, method = 'GET', body) {
+    const res = await fetch(`${apiUrl}/v2/${path}`, {
+        method: method,
+        headers: {
+            'auth-token': getAuthToken(),
+            'Content-Type': 'application/json',
+        },
+        body: body && JSON.stringify(body),
     })
+    const { status, content } = await res.json()
+
+    if (status.code !== 200) {
+        throw status
+    }
+
+    return content
 }
diff --git a/opendc-web/opendc-web-ui/src/api/routes/portfolios.js b/opendc-web/opendc-web-ui/src/api/routes/portfolios.js
index 7c9ea02a..ba15e828 100644
--- a/opendc-web/opendc-web-ui/src/api/routes/portfolios.js
+++ b/opendc-web/opendc-web-ui/src/api/routes/portfolios.js
@@ -1,42 +1,17 @@
-import { deleteById, getById } from './util'
-import { sendRequest } from '../index'
+import { request } from '../index'
 
 export function addPortfolio(projectId, portfolio) {
-    return sendRequest({
-        path: '/projects/{projectId}/portfolios',
-        method: 'POST',
-        parameters: {
-            body: {
-                portfolio,
-            },
-            path: {
-                projectId,
-            },
-            query: {},
-        },
-    })
+    return request(`projects/${projectId}/portfolios`, 'POST', { portfolio })
 }
 
 export function getPortfolio(portfolioId) {
-    return getById('/portfolios/{portfolioId}', { portfolioId })
+    return request(`portfolios/${portfolioId}`)
 }
 
 export function updatePortfolio(portfolioId, portfolio) {
-    return sendRequest({
-        path: '/portfolios/{projectId}',
-        method: 'POST',
-        parameters: {
-            body: {
-                portfolio,
-            },
-            path: {
-                portfolioId,
-            },
-            query: {},
-        },
-    })
+    return request(`portfolios/${portfolioId}`, 'PUT', { portfolio })
 }
 
 export function deletePortfolio(portfolioId) {
-    return deleteById('/portfolios/{portfolioId}', { portfolioId })
+    return request(`portfolios/${portfolioId}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/routes/prefabs.js b/opendc-web/opendc-web-ui/src/api/routes/prefabs.js
index 8a1debfa..032e12bc 100644
--- a/opendc-web/opendc-web-ui/src/api/routes/prefabs.js
+++ b/opendc-web/opendc-web-ui/src/api/routes/prefabs.js
@@ -1,40 +1,17 @@
-import { sendRequest } from '../index'
-import { deleteById, getById } from './util'
+import { request } from '../index'
 
 export function getPrefab(prefabId) {
-    return getById('/prefabs/{prefabId}', { prefabId })
+    return request(`prefabs/${prefabId}`)
 }
 
 export function addPrefab(prefab) {
-    return sendRequest({
-        path: '/prefabs',
-        method: 'POST',
-        parameters: {
-            body: {
-                prefab,
-            },
-            path: {},
-            query: {},
-        },
-    })
+    return request('prefabs', 'POST', { prefab })
 }
 
 export function updatePrefab(prefab) {
-    return sendRequest({
-        path: '/prefabs/{prefabId}',
-        method: 'PUT',
-        parameters: {
-            body: {
-                prefab,
-            },
-            path: {
-                prefabId: prefab._id,
-            },
-            query: {},
-        },
-    })
+    return request(`prefabs/${prefab._id}`, 'PUT', { prefab })
 }
 
 export function deletePrefab(prefabId) {
-    return deleteById('/prefabs/{prefabId}', { prefabId })
+    return request(`prefabs/${prefabId}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/routes/projects.js b/opendc-web/opendc-web-ui/src/api/routes/projects.js
index 4109079c..cd46036f 100644
--- a/opendc-web/opendc-web-ui/src/api/routes/projects.js
+++ b/opendc-web/opendc-web-ui/src/api/routes/projects.js
@@ -1,40 +1,17 @@
-import { sendRequest } from '../index'
-import { deleteById, getById } from './util'
+import { request } from '../index'
 
 export function getProject(projectId) {
-    return getById('/projects/{projectId}', { projectId })
+    return request(`projects/${projectId}`)
 }
 
 export function addProject(project) {
-    return sendRequest({
-        path: '/projects',
-        method: 'POST',
-        parameters: {
-            body: {
-                project,
-            },
-            path: {},
-            query: {},
-        },
-    })
+    return request('projects', 'POST', { project })
 }
 
 export function updateProject(project) {
-    return sendRequest({
-        path: '/projects/{projectId}',
-        method: 'PUT',
-        parameters: {
-            body: {
-                project,
-            },
-            path: {
-                projectId: project._id,
-            },
-            query: {},
-        },
-    })
+    return request(`projects/${project._id}`, 'PUT', { project })
 }
 
 export function deleteProject(projectId) {
-    return deleteById('/projects/{projectId}', { projectId })
+    return request(`projects/${projectId}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/routes/scenarios.js b/opendc-web/opendc-web-ui/src/api/routes/scenarios.js
index ab2e8b86..00cc1eb0 100644
--- a/opendc-web/opendc-web-ui/src/api/routes/scenarios.js
+++ b/opendc-web/opendc-web-ui/src/api/routes/scenarios.js
@@ -1,42 +1,17 @@
-import { deleteById, getById } from './util'
-import { sendRequest } from '../index'
+import { request } from '../index'
 
 export function addScenario(portfolioId, scenario) {
-    return sendRequest({
-        path: '/portfolios/{portfolioId}/scenarios',
-        method: 'POST',
-        parameters: {
-            body: {
-                scenario,
-            },
-            path: {
-                portfolioId,
-            },
-            query: {},
-        },
-    })
+    return request(`portfolios/${portfolioId}/scenarios`, 'POST', { scenario })
 }
 
 export function getScenario(scenarioId) {
-    return getById('/scenarios/{scenarioId}', { scenarioId })
+    return request(`scenarios/${scenarioId}`)
 }
 
 export function updateScenario(scenarioId, scenario) {
-    return sendRequest({
-        path: '/scenarios/{projectId}',
-        method: 'POST',
-        parameters: {
-            body: {
-                scenario,
-            },
-            path: {
-                scenarioId,
-            },
-            query: {},
-        },
-    })
+    return request(`scenarios/${scenarioId}`, 'PUT', { scenario })
 }
 
 export function deleteScenario(scenarioId) {
-    return deleteById('/scenarios/{scenarioId}', { scenarioId })
+    return request(`scenarios/${scenarioId}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/routes/schedulers.js b/opendc-web/opendc-web-ui/src/api/routes/schedulers.js
index 4481fb2a..5e129d33 100644
--- a/opendc-web/opendc-web-ui/src/api/routes/schedulers.js
+++ b/opendc-web/opendc-web-ui/src/api/routes/schedulers.js
@@ -1,5 +1,5 @@
-import { getAll } from './util'
+import { request } from '../index'
 
 export function getAllSchedulers() {
-    return getAll('/schedulers')
+    return request('schedulers')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/routes/topologies.js b/opendc-web/opendc-web-ui/src/api/routes/topologies.js
index a8f0d6b1..076895ff 100644
--- a/opendc-web/opendc-web-ui/src/api/routes/topologies.js
+++ b/opendc-web/opendc-web-ui/src/api/routes/topologies.js
@@ -1,42 +1,17 @@
-import { deleteById, getById } from './util'
-import { sendRequest } from '../index'
+import { request } from '../index'
 
 export function addTopology(topology) {
-    return sendRequest({
-        path: '/projects/{projectId}/topologies',
-        method: 'POST',
-        parameters: {
-            body: {
-                topology,
-            },
-            path: {
-                projectId: topology.projectId,
-            },
-            query: {},
-        },
-    })
+    return request(`projects/${topology.projectId}/topologies`, 'POST', { topology })
 }
 
 export function getTopology(topologyId) {
-    return getById('/topologies/{topologyId}', { topologyId })
+    return request(`topologies/${topologyId}`)
 }
 
 export function updateTopology(topology) {
-    return sendRequest({
-        path: '/topologies/{topologyId}',
-        method: 'PUT',
-        parameters: {
-            body: {
-                topology,
-            },
-            path: {
-                topologyId: topology._id,
-            },
-            query: {},
-        },
-    })
+    return request(`topologies/${topology._id}`, 'PUT', { topology })
 }
 
 export function deleteTopology(topologyId) {
-    return deleteById('/topologies/{topologyId}', { topologyId })
+    return request(`topologies/${topologyId}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/routes/traces.js b/opendc-web/opendc-web-ui/src/api/routes/traces.js
index 67895a87..eb2526ee 100644
--- a/opendc-web/opendc-web-ui/src/api/routes/traces.js
+++ b/opendc-web/opendc-web-ui/src/api/routes/traces.js
@@ -1,5 +1,5 @@
-import { getAll } from './util'
+import { request } from '../index'
 
 export function getAllTraces() {
-    return getAll('/traces')
+    return request('traces')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/routes/users.js b/opendc-web/opendc-web-ui/src/api/routes/users.js
index 3028f3f7..619aec1f 100644
--- a/opendc-web/opendc-web-ui/src/api/routes/users.js
+++ b/opendc-web/opendc-web-ui/src/api/routes/users.js
@@ -1,48 +1,17 @@
-import { sendRequest } from '../index'
-import { deleteById } from './util'
+import { request } from '../index'
 
 export function getUserByEmail(email) {
-    return sendRequest({
-        path: '/users',
-        method: 'GET',
-        parameters: {
-            body: {},
-            path: {},
-            query: {
-                email,
-            },
-        },
-    })
+    return request(`users` + new URLSearchParams({ email }))
 }
 
 export function addUser(user) {
-    return sendRequest({
-        path: '/users',
-        method: 'POST',
-        parameters: {
-            body: {
-                user,
-            },
-            path: {},
-            query: {},
-        },
-    })
+    return request('users', 'POST', { user })
 }
 
 export function getUser(userId) {
-    return sendRequest({
-        path: '/users/{userId}',
-        method: 'GET',
-        parameters: {
-            body: {},
-            path: {
-                userId,
-            },
-            query: {},
-        },
-    })
+    return request(`users/${userId}`)
 }
 
 export function deleteUser(userId) {
-    return deleteById('/users/{userId}', { userId })
+    return request(`users/${userId}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/routes/util.js b/opendc-web/opendc-web-ui/src/api/routes/util.js
deleted file mode 100644
index 67e7173b..00000000
--- a/opendc-web/opendc-web-ui/src/api/routes/util.js
+++ /dev/null
@@ -1,37 +0,0 @@
-import { sendRequest } from '../index'
-
-export function getAll(path) {
-    return sendRequest({
-        path,
-        method: 'GET',
-        parameters: {
-            body: {},
-            path: {},
-            query: {},
-        },
-    })
-}
-
-export function getById(path, pathObject) {
-    return sendRequest({
-        path,
-        method: 'GET',
-        parameters: {
-            body: {},
-            path: pathObject,
-            query: {},
-        },
-    })
-}
-
-export function deleteById(path, pathObject) {
-    return sendRequest({
-        path,
-        method: 'DELETE',
-        parameters: {
-            body: {},
-            path: pathObject,
-            query: {},
-        },
-    })
-}
diff --git a/opendc-web/opendc-web-ui/src/api/socket.js b/opendc-web/opendc-web-ui/src/api/socket.js
deleted file mode 100644
index 87facda8..00000000
--- a/opendc-web/opendc-web-ui/src/api/socket.js
+++ /dev/null
@@ -1,50 +0,0 @@
-import io from 'socket.io-client'
-import { getAuthToken } from '../auth/index'
-import config from '../config'
-
-let socket
-let requestIdCounter = 0
-const callbacks = {}
-
-export function setupSocketConnection(onConnect) {
-    const apiUrl =
-        config['API_BASE_URL'] || `${window.location.protocol}//${window.location.hostname}:${window.location.port}`
-
-    socket = io.connect(apiUrl)
-    socket.on('connect', onConnect)
-    socket.on('response', onSocketResponse)
-}
-
-export function sendSocketRequest(request, callback) {
-    if (!socket.connected) {
-        console.error('Attempted to send request over unconnected socket')
-        return
-    }
-
-    const newId = requestIdCounter++
-    callbacks[newId] = callback
-
-    request.id = newId
-    request.token = getAuthToken()
-
-    if (!request.isRootRoute) {
-        request.path = '/v2' + request.path
-    }
-
-    socket.emit('request', request)
-
-    if (process.env.NODE_ENV !== 'production') {
-        console.log('Sent socket request:', request)
-    }
-}
-
-function onSocketResponse(json) {
-    const response = JSON.parse(json)
-
-    if (process.env.NODE_ENV !== 'production') {
-        console.log('Received socket response:', response)
-    }
-
-    callbacks[response.id](response)
-    delete callbacks[response.id]
-}
-- 
cgit v1.2.3


From 4397a959e806bf476be4c81bc804616adf58b969 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 12 May 2021 22:42:12 +0200
Subject: ui: Migrate from CRA to Next.js

This change updates the web frontend to use Next.js instead of Create
React App (CRA). Next.js enables the possibility of rendering pages on
the server side (which reduces the time to first frame) and overall
provides a better development experience.

Future commits will try to futher optimize the implementation for
Next.js.
---
 opendc-web/opendc-web-ui/src/api/index.js          | 31 ++++++++++++++++++++--
 .../opendc-web-ui/src/api/routes/token-signin.js   |  4 +--
 2 files changed, 30 insertions(+), 5 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/index.js b/opendc-web/opendc-web-ui/src/api/index.js
index e6528fd9..65358745 100644
--- a/opendc-web/opendc-web-ui/src/api/index.js
+++ b/opendc-web/opendc-web-ui/src/api/index.js
@@ -1,8 +1,35 @@
-import config from '../config'
+/*
+ * 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 { getAuthToken } from '../auth'
 
-const apiUrl = config['API_BASE_URL']
+const apiUrl = process.env.NEXT_PUBLIC_API_BASE_URL
 
+/**
+ * Send the specified request to the OpenDC API.
+ * @param path Relative path for the API.
+ * @param method The method to use for the request.
+ * @param body The body of the request.
+ */
 export async function request(path, method = 'GET', body) {
     const res = await fetch(`${apiUrl}/v2/${path}`, {
         method: method,
diff --git a/opendc-web/opendc-web-ui/src/api/routes/token-signin.js b/opendc-web/opendc-web-ui/src/api/routes/token-signin.js
index ced5d2e0..1c285bdb 100644
--- a/opendc-web/opendc-web-ui/src/api/routes/token-signin.js
+++ b/opendc-web/opendc-web-ui/src/api/routes/token-signin.js
@@ -1,7 +1,5 @@
-import config from '../../config'
-
 export function performTokenSignIn(token) {
-    const apiUrl = config['API_BASE_URL']
+    const apiUrl = process.env.NEXT_PUBLIC_API_BASE_URL
 
     return fetch(`${apiUrl}/tokensignin`, {
         method: 'POST',
-- 
cgit v1.2.3


From d9e65dceb38cdb8dc4e464d388755f9456620566 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Sun, 16 May 2021 17:07:58 +0200
Subject: ui: Restructure OpenDC frontend

This change updates the structure of the OpenDC frontend in order to
improve the maintainability of the frontend.
---
 opendc-web/opendc-web-ui/src/api/portfolios.js     | 39 ++++++++++++++++++++++
 opendc-web/opendc-web-ui/src/api/prefabs.js        | 39 ++++++++++++++++++++++
 opendc-web/opendc-web-ui/src/api/projects.js       | 39 ++++++++++++++++++++++
 .../opendc-web-ui/src/api/routes/portfolios.js     | 17 ----------
 opendc-web/opendc-web-ui/src/api/routes/prefabs.js | 17 ----------
 .../opendc-web-ui/src/api/routes/projects.js       | 17 ----------
 .../opendc-web-ui/src/api/routes/scenarios.js      | 17 ----------
 .../opendc-web-ui/src/api/routes/schedulers.js     |  5 ---
 .../opendc-web-ui/src/api/routes/token-signin.js   | 10 ------
 .../opendc-web-ui/src/api/routes/topologies.js     | 17 ----------
 opendc-web/opendc-web-ui/src/api/routes/traces.js  |  5 ---
 opendc-web/opendc-web-ui/src/api/routes/users.js   | 17 ----------
 opendc-web/opendc-web-ui/src/api/scenarios.js      | 39 ++++++++++++++++++++++
 opendc-web/opendc-web-ui/src/api/schedulers.js     | 27 +++++++++++++++
 opendc-web/opendc-web-ui/src/api/token-signin.js   | 32 ++++++++++++++++++
 opendc-web/opendc-web-ui/src/api/topologies.js     | 39 ++++++++++++++++++++++
 opendc-web/opendc-web-ui/src/api/traces.js         | 27 +++++++++++++++
 opendc-web/opendc-web-ui/src/api/users.js          | 39 ++++++++++++++++++++++
 18 files changed, 320 insertions(+), 122 deletions(-)
 create mode 100644 opendc-web/opendc-web-ui/src/api/portfolios.js
 create mode 100644 opendc-web/opendc-web-ui/src/api/prefabs.js
 create mode 100644 opendc-web/opendc-web-ui/src/api/projects.js
 delete mode 100644 opendc-web/opendc-web-ui/src/api/routes/portfolios.js
 delete mode 100644 opendc-web/opendc-web-ui/src/api/routes/prefabs.js
 delete mode 100644 opendc-web/opendc-web-ui/src/api/routes/projects.js
 delete mode 100644 opendc-web/opendc-web-ui/src/api/routes/scenarios.js
 delete mode 100644 opendc-web/opendc-web-ui/src/api/routes/schedulers.js
 delete mode 100644 opendc-web/opendc-web-ui/src/api/routes/token-signin.js
 delete mode 100644 opendc-web/opendc-web-ui/src/api/routes/topologies.js
 delete mode 100644 opendc-web/opendc-web-ui/src/api/routes/traces.js
 delete mode 100644 opendc-web/opendc-web-ui/src/api/routes/users.js
 create mode 100644 opendc-web/opendc-web-ui/src/api/scenarios.js
 create mode 100644 opendc-web/opendc-web-ui/src/api/schedulers.js
 create mode 100644 opendc-web/opendc-web-ui/src/api/token-signin.js
 create mode 100644 opendc-web/opendc-web-ui/src/api/topologies.js
 create mode 100644 opendc-web/opendc-web-ui/src/api/traces.js
 create mode 100644 opendc-web/opendc-web-ui/src/api/users.js

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/portfolios.js b/opendc-web/opendc-web-ui/src/api/portfolios.js
new file mode 100644
index 00000000..6202e702
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/api/portfolios.js
@@ -0,0 +1,39 @@
+/*
+ * 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 addPortfolio(projectId, portfolio) {
+    return request(`projects/${projectId}/portfolios`, 'POST', { portfolio })
+}
+
+export function getPortfolio(portfolioId) {
+    return request(`portfolios/${portfolioId}`)
+}
+
+export function updatePortfolio(portfolioId, portfolio) {
+    return request(`portfolios/${portfolioId}`, 'PUT', { portfolio })
+}
+
+export function deletePortfolio(portfolioId) {
+    return request(`portfolios/${portfolioId}`, 'DELETE')
+}
diff --git a/opendc-web/opendc-web-ui/src/api/prefabs.js b/opendc-web/opendc-web-ui/src/api/prefabs.js
new file mode 100644
index 00000000..a8bd3f3b
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/api/prefabs.js
@@ -0,0 +1,39 @@
+/*
+ * 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(prefabId) {
+    return request(`prefabs/${prefabId}`)
+}
+
+export function addPrefab(prefab) {
+    return request('prefabs', 'POST', { prefab })
+}
+
+export function updatePrefab(prefab) {
+    return request(`prefabs/${prefab._id}`, 'PUT', { prefab })
+}
+
+export function deletePrefab(prefabId) {
+    return request(`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
new file mode 100644
index 00000000..9ff7deda
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/api/projects.js
@@ -0,0 +1,39 @@
+/*
+ * 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 getProject(projectId) {
+    return request(`projects/${projectId}`)
+}
+
+export function addProject(project) {
+    return request('projects', 'POST', { project })
+}
+
+export function updateProject(project) {
+    return request(`projects/${project._id}`, 'PUT', { project })
+}
+
+export function deleteProject(projectId) {
+    return request(`projects/${projectId}`, 'DELETE')
+}
diff --git a/opendc-web/opendc-web-ui/src/api/routes/portfolios.js b/opendc-web/opendc-web-ui/src/api/routes/portfolios.js
deleted file mode 100644
index ba15e828..00000000
--- a/opendc-web/opendc-web-ui/src/api/routes/portfolios.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { request } from '../index'
-
-export function addPortfolio(projectId, portfolio) {
-    return request(`projects/${projectId}/portfolios`, 'POST', { portfolio })
-}
-
-export function getPortfolio(portfolioId) {
-    return request(`portfolios/${portfolioId}`)
-}
-
-export function updatePortfolio(portfolioId, portfolio) {
-    return request(`portfolios/${portfolioId}`, 'PUT', { portfolio })
-}
-
-export function deletePortfolio(portfolioId) {
-    return request(`portfolios/${portfolioId}`, 'DELETE')
-}
diff --git a/opendc-web/opendc-web-ui/src/api/routes/prefabs.js b/opendc-web/opendc-web-ui/src/api/routes/prefabs.js
deleted file mode 100644
index 032e12bc..00000000
--- a/opendc-web/opendc-web-ui/src/api/routes/prefabs.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { request } from '../index'
-
-export function getPrefab(prefabId) {
-    return request(`prefabs/${prefabId}`)
-}
-
-export function addPrefab(prefab) {
-    return request('prefabs', 'POST', { prefab })
-}
-
-export function updatePrefab(prefab) {
-    return request(`prefabs/${prefab._id}`, 'PUT', { prefab })
-}
-
-export function deletePrefab(prefabId) {
-    return request(`prefabs/${prefabId}`, 'DELETE')
-}
diff --git a/opendc-web/opendc-web-ui/src/api/routes/projects.js b/opendc-web/opendc-web-ui/src/api/routes/projects.js
deleted file mode 100644
index cd46036f..00000000
--- a/opendc-web/opendc-web-ui/src/api/routes/projects.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { request } from '../index'
-
-export function getProject(projectId) {
-    return request(`projects/${projectId}`)
-}
-
-export function addProject(project) {
-    return request('projects', 'POST', { project })
-}
-
-export function updateProject(project) {
-    return request(`projects/${project._id}`, 'PUT', { project })
-}
-
-export function deleteProject(projectId) {
-    return request(`projects/${projectId}`, 'DELETE')
-}
diff --git a/opendc-web/opendc-web-ui/src/api/routes/scenarios.js b/opendc-web/opendc-web-ui/src/api/routes/scenarios.js
deleted file mode 100644
index 00cc1eb0..00000000
--- a/opendc-web/opendc-web-ui/src/api/routes/scenarios.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { request } from '../index'
-
-export function addScenario(portfolioId, scenario) {
-    return request(`portfolios/${portfolioId}/scenarios`, 'POST', { scenario })
-}
-
-export function getScenario(scenarioId) {
-    return request(`scenarios/${scenarioId}`)
-}
-
-export function updateScenario(scenarioId, scenario) {
-    return request(`scenarios/${scenarioId}`, 'PUT', { scenario })
-}
-
-export function deleteScenario(scenarioId) {
-    return request(`scenarios/${scenarioId}`, 'DELETE')
-}
diff --git a/opendc-web/opendc-web-ui/src/api/routes/schedulers.js b/opendc-web/opendc-web-ui/src/api/routes/schedulers.js
deleted file mode 100644
index 5e129d33..00000000
--- a/opendc-web/opendc-web-ui/src/api/routes/schedulers.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { request } from '../index'
-
-export function getAllSchedulers() {
-    return request('schedulers')
-}
diff --git a/opendc-web/opendc-web-ui/src/api/routes/token-signin.js b/opendc-web/opendc-web-ui/src/api/routes/token-signin.js
deleted file mode 100644
index 1c285bdb..00000000
--- a/opendc-web/opendc-web-ui/src/api/routes/token-signin.js
+++ /dev/null
@@ -1,10 +0,0 @@
-export function performTokenSignIn(token) {
-    const apiUrl = process.env.NEXT_PUBLIC_API_BASE_URL
-
-    return fetch(`${apiUrl}/tokensignin`, {
-        method: 'POST',
-        body: new URLSearchParams({
-            idtoken: token,
-        }),
-    }).then((res) => res.json())
-}
diff --git a/opendc-web/opendc-web-ui/src/api/routes/topologies.js b/opendc-web/opendc-web-ui/src/api/routes/topologies.js
deleted file mode 100644
index 076895ff..00000000
--- a/opendc-web/opendc-web-ui/src/api/routes/topologies.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { request } from '../index'
-
-export function addTopology(topology) {
-    return request(`projects/${topology.projectId}/topologies`, 'POST', { topology })
-}
-
-export function getTopology(topologyId) {
-    return request(`topologies/${topologyId}`)
-}
-
-export function updateTopology(topology) {
-    return request(`topologies/${topology._id}`, 'PUT', { topology })
-}
-
-export function deleteTopology(topologyId) {
-    return request(`topologies/${topologyId}`, 'DELETE')
-}
diff --git a/opendc-web/opendc-web-ui/src/api/routes/traces.js b/opendc-web/opendc-web-ui/src/api/routes/traces.js
deleted file mode 100644
index eb2526ee..00000000
--- a/opendc-web/opendc-web-ui/src/api/routes/traces.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import { request } from '../index'
-
-export function getAllTraces() {
-    return request('traces')
-}
diff --git a/opendc-web/opendc-web-ui/src/api/routes/users.js b/opendc-web/opendc-web-ui/src/api/routes/users.js
deleted file mode 100644
index 619aec1f..00000000
--- a/opendc-web/opendc-web-ui/src/api/routes/users.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import { request } from '../index'
-
-export function getUserByEmail(email) {
-    return request(`users` + new URLSearchParams({ email }))
-}
-
-export function addUser(user) {
-    return request('users', 'POST', { user })
-}
-
-export function getUser(userId) {
-    return request(`users/${userId}`)
-}
-
-export function deleteUser(userId) {
-    return request(`users/${userId}`, 'DELETE')
-}
diff --git a/opendc-web/opendc-web-ui/src/api/scenarios.js b/opendc-web/opendc-web-ui/src/api/scenarios.js
new file mode 100644
index 00000000..9f8c717b
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/api/scenarios.js
@@ -0,0 +1,39 @@
+/*
+ * 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 addScenario(portfolioId, scenario) {
+    return request(`portfolios/${portfolioId}/scenarios`, 'POST', { scenario })
+}
+
+export function getScenario(scenarioId) {
+    return request(`scenarios/${scenarioId}`)
+}
+
+export function updateScenario(scenarioId, scenario) {
+    return request(`scenarios/${scenarioId}`, 'PUT', { scenario })
+}
+
+export function deleteScenario(scenarioId) {
+    return request(`scenarios/${scenarioId}`, 'DELETE')
+}
diff --git a/opendc-web/opendc-web-ui/src/api/schedulers.js b/opendc-web/opendc-web-ui/src/api/schedulers.js
new file mode 100644
index 00000000..7791e51e
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/api/schedulers.js
@@ -0,0 +1,27 @@
+/*
+ * 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 getAllSchedulers() {
+    return request('schedulers')
+}
diff --git a/opendc-web/opendc-web-ui/src/api/token-signin.js b/opendc-web/opendc-web-ui/src/api/token-signin.js
new file mode 100644
index 00000000..a3761fa1
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/api/token-signin.js
@@ -0,0 +1,32 @@
+/*
+ * 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.
+ */
+
+export function performTokenSignIn(token) {
+    const apiUrl = process.env.NEXT_PUBLIC_API_BASE_URL
+
+    return fetch(`${apiUrl}/tokensignin`, {
+        method: 'POST',
+        body: new URLSearchParams({
+            idtoken: token,
+        }),
+    }).then((res) => res.json())
+}
diff --git a/opendc-web/opendc-web-ui/src/api/topologies.js b/opendc-web/opendc-web-ui/src/api/topologies.js
new file mode 100644
index 00000000..e6df73c7
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/api/topologies.js
@@ -0,0 +1,39 @@
+/*
+ * 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 addTopology(topology) {
+    return request(`projects/${topology.projectId}/topologies`, 'POST', { topology })
+}
+
+export function getTopology(topologyId) {
+    return request(`topologies/${topologyId}`)
+}
+
+export function updateTopology(topology) {
+    return request(`topologies/${topology._id}`, 'PUT', { topology })
+}
+
+export function deleteTopology(topologyId) {
+    return request(`topologies/${topologyId}`, 'DELETE')
+}
diff --git a/opendc-web/opendc-web-ui/src/api/traces.js b/opendc-web/opendc-web-ui/src/api/traces.js
new file mode 100644
index 00000000..1c5cfa1d
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/api/traces.js
@@ -0,0 +1,27 @@
+/*
+ * 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 getAllTraces() {
+    return request('traces')
+}
diff --git a/opendc-web/opendc-web-ui/src/api/users.js b/opendc-web/opendc-web-ui/src/api/users.js
new file mode 100644
index 00000000..3da030ad
--- /dev/null
+++ b/opendc-web/opendc-web-ui/src/api/users.js
@@ -0,0 +1,39 @@
+/*
+ * 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 getUserByEmail(email) {
+    return request(`users` + new URLSearchParams({ email }))
+}
+
+export function addUser(user) {
+    return request('users', 'POST', { user })
+}
+
+export function getUser(userId) {
+    return request(`users/${userId}`)
+}
+
+export function deleteUser(userId) {
+    return request(`users/${userId}`, 'DELETE')
+}
-- 
cgit v1.2.3


From a6865b86cc8d710374fc0b6cfcbd2b863f1942a9 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Sun, 16 May 2021 23:18:02 +0200
Subject: ui: Migrate to Auth0 as Identity Provider

This change updates the frontend codebase to move away from the Google
login and instead use Auth0 as generic Identity Provider. This allows
users to login with other accounts as well.

Since Auth0 has a free tier, users can experiment themselves with OpenDC
locally without having to pay for the login functionality. The code has
been written so that we should be able to migrate away from Auth0 once
it is not a suitable Identity Provider for OpenDC anymore.
---
 opendc-web/opendc-web-ui/src/api/index.js        | 20 ++++++------
 opendc-web/opendc-web-ui/src/api/portfolios.js   | 16 +++++-----
 opendc-web/opendc-web-ui/src/api/prefabs.js      | 16 +++++-----
 opendc-web/opendc-web-ui/src/api/projects.js     | 20 +++++++-----
 opendc-web/opendc-web-ui/src/api/scenarios.js    | 16 +++++-----
 opendc-web/opendc-web-ui/src/api/schedulers.js   |  4 +--
 opendc-web/opendc-web-ui/src/api/token-signin.js | 32 -------------------
 opendc-web/opendc-web-ui/src/api/topologies.js   | 16 +++++-----
 opendc-web/opendc-web-ui/src/api/traces.js       |  4 +--
 opendc-web/opendc-web-ui/src/api/users.js        | 39 ------------------------
 10 files changed, 59 insertions(+), 124 deletions(-)
 delete mode 100644 opendc-web/opendc-web-ui/src/api/token-signin.js
 delete mode 100644 opendc-web/opendc-web-ui/src/api/users.js

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/index.js b/opendc-web/opendc-web-ui/src/api/index.js
index 65358745..680d49ce 100644
--- a/opendc-web/opendc-web-ui/src/api/index.js
+++ b/opendc-web/opendc-web-ui/src/api/index.js
@@ -20,30 +20,32 @@
  * SOFTWARE.
  */
 
-import { getAuthToken } from '../auth'
-
 const apiUrl = process.env.NEXT_PUBLIC_API_BASE_URL
 
 /**
  * Send the specified request to the OpenDC API.
+ *
+ * @param auth The authentication context.
  * @param path Relative path for the API.
  * @param method The method to use for the request.
  * @param body The body of the request.
  */
-export async function request(path, method = 'GET', body) {
-    const res = await fetch(`${apiUrl}/v2/${path}`, {
+export async function request(auth, path, method = 'GET', body) {
+    const { getAccessTokenSilently } = auth
+    const token = await getAccessTokenSilently()
+    const response = await fetch(`${apiUrl}/${path}`, {
         method: method,
         headers: {
-            'auth-token': getAuthToken(),
+            Authorization: `Bearer ${token}`,
             'Content-Type': 'application/json',
         },
         body: body && JSON.stringify(body),
     })
-    const { status, content } = await res.json()
+    const json = await response.json()
 
-    if (status.code !== 200) {
-        throw status
+    if (!response.ok) {
+        throw response.message
     }
 
-    return content
+    return json.data
 }
diff --git a/opendc-web/opendc-web-ui/src/api/portfolios.js b/opendc-web/opendc-web-ui/src/api/portfolios.js
index 6202e702..28898e6a 100644
--- a/opendc-web/opendc-web-ui/src/api/portfolios.js
+++ b/opendc-web/opendc-web-ui/src/api/portfolios.js
@@ -22,18 +22,18 @@
 
 import { request } from './index'
 
-export function addPortfolio(projectId, portfolio) {
-    return request(`projects/${projectId}/portfolios`, 'POST', { portfolio })
+export function addPortfolio(auth, projectId, portfolio) {
+    return request(auth, `projects/${projectId}/portfolios`, 'POST', { portfolio })
 }
 
-export function getPortfolio(portfolioId) {
-    return request(`portfolios/${portfolioId}`)
+export function getPortfolio(auth, portfolioId) {
+    return request(auth, `portfolios/${portfolioId}`)
 }
 
-export function updatePortfolio(portfolioId, portfolio) {
-    return request(`portfolios/${portfolioId}`, 'PUT', { portfolio })
+export function updatePortfolio(auth, portfolioId, portfolio) {
+    return request(auth, `portfolios/${portfolioId}`, 'PUT', { portfolio })
 }
 
-export function deletePortfolio(portfolioId) {
-    return request(`portfolios/${portfolioId}`, 'DELETE')
+export function deletePortfolio(auth, portfolioId) {
+    return request(auth, `portfolios/${portfolioId}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/prefabs.js b/opendc-web/opendc-web-ui/src/api/prefabs.js
index a8bd3f3b..eb9aa23c 100644
--- a/opendc-web/opendc-web-ui/src/api/prefabs.js
+++ b/opendc-web/opendc-web-ui/src/api/prefabs.js
@@ -22,18 +22,18 @@
 
 import { request } from './index'
 
-export function getPrefab(prefabId) {
-    return request(`prefabs/${prefabId}`)
+export function getPrefab(auth, prefabId) {
+    return request(auth, `prefabs/${prefabId}`)
 }
 
-export function addPrefab(prefab) {
-    return request('prefabs', 'POST', { prefab })
+export function addPrefab(auth, prefab) {
+    return request(auth, 'prefabs/', 'POST', { prefab })
 }
 
-export function updatePrefab(prefab) {
-    return request(`prefabs/${prefab._id}`, 'PUT', { prefab })
+export function updatePrefab(auth, prefab) {
+    return request(auth, `prefabs/${prefab._id}`, 'PUT', { prefab })
 }
 
-export function deletePrefab(prefabId) {
-    return request(`prefabs/${prefabId}`, 'DELETE')
+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 9ff7deda..93052080 100644
--- a/opendc-web/opendc-web-ui/src/api/projects.js
+++ b/opendc-web/opendc-web-ui/src/api/projects.js
@@ -22,18 +22,22 @@
 
 import { request } from './index'
 
-export function getProject(projectId) {
-    return request(`projects/${projectId}`)
+export function getProjects(auth) {
+    return request(auth, `projects/`)
 }
 
-export function addProject(project) {
-    return request('projects', 'POST', { project })
+export function getProject(auth, projectId) {
+    return request(auth, `projects/${projectId}`)
 }
 
-export function updateProject(project) {
-    return request(`projects/${project._id}`, 'PUT', { project })
+export function addProject(auth, project) {
+    return request(auth, 'projects/', 'POST', { project })
 }
 
-export function deleteProject(projectId) {
-    return request(`projects/${projectId}`, 'DELETE')
+export function updateProject(auth, project) {
+    return request(auth, `projects/${project._id}`, 'PUT', { project })
+}
+
+export function deleteProject(auth, projectId) {
+    return request(auth, `projects/${projectId}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/scenarios.js b/opendc-web/opendc-web-ui/src/api/scenarios.js
index 9f8c717b..095aa788 100644
--- a/opendc-web/opendc-web-ui/src/api/scenarios.js
+++ b/opendc-web/opendc-web-ui/src/api/scenarios.js
@@ -22,18 +22,18 @@
 
 import { request } from './index'
 
-export function addScenario(portfolioId, scenario) {
-    return request(`portfolios/${portfolioId}/scenarios`, 'POST', { scenario })
+export function addScenario(auth, portfolioId, scenario) {
+    return request(auth, `portfolios/${portfolioId}/scenarios`, 'POST', { scenario })
 }
 
-export function getScenario(scenarioId) {
-    return request(`scenarios/${scenarioId}`)
+export function getScenario(auth, scenarioId) {
+    return request(auth, `scenarios/${scenarioId}`)
 }
 
-export function updateScenario(scenarioId, scenario) {
-    return request(`scenarios/${scenarioId}`, 'PUT', { scenario })
+export function updateScenario(auth, scenarioId, scenario) {
+    return request(auth, `scenarios/${scenarioId}`, 'PUT', { scenario })
 }
 
-export function deleteScenario(scenarioId) {
-    return request(`scenarios/${scenarioId}`, 'DELETE')
+export function deleteScenario(auth, scenarioId) {
+    return request(auth, `scenarios/${scenarioId}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/schedulers.js b/opendc-web/opendc-web-ui/src/api/schedulers.js
index 7791e51e..1b69f1a1 100644
--- a/opendc-web/opendc-web-ui/src/api/schedulers.js
+++ b/opendc-web/opendc-web-ui/src/api/schedulers.js
@@ -22,6 +22,6 @@
 
 import { request } from './index'
 
-export function getAllSchedulers() {
-    return request('schedulers')
+export function getAllSchedulers(auth) {
+    return request(auth, 'schedulers/')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/token-signin.js b/opendc-web/opendc-web-ui/src/api/token-signin.js
deleted file mode 100644
index a3761fa1..00000000
--- a/opendc-web/opendc-web-ui/src/api/token-signin.js
+++ /dev/null
@@ -1,32 +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.
- */
-
-export function performTokenSignIn(token) {
-    const apiUrl = process.env.NEXT_PUBLIC_API_BASE_URL
-
-    return fetch(`${apiUrl}/tokensignin`, {
-        method: 'POST',
-        body: new URLSearchParams({
-            idtoken: token,
-        }),
-    }).then((res) => res.json())
-}
diff --git a/opendc-web/opendc-web-ui/src/api/topologies.js b/opendc-web/opendc-web-ui/src/api/topologies.js
index e6df73c7..c8744e6c 100644
--- a/opendc-web/opendc-web-ui/src/api/topologies.js
+++ b/opendc-web/opendc-web-ui/src/api/topologies.js
@@ -22,18 +22,18 @@
 
 import { request } from './index'
 
-export function addTopology(topology) {
-    return request(`projects/${topology.projectId}/topologies`, 'POST', { topology })
+export function addTopology(auth, topology) {
+    return request(auth, `projects/${topology.projectId}/topologies`, 'POST', { topology })
 }
 
-export function getTopology(topologyId) {
-    return request(`topologies/${topologyId}`)
+export function getTopology(auth, topologyId) {
+    return request(auth, `topologies/${topologyId}`)
 }
 
-export function updateTopology(topology) {
-    return request(`topologies/${topology._id}`, 'PUT', { topology })
+export function updateTopology(auth, topology) {
+    return request(auth, `topologies/${topology._id}`, 'PUT', { topology })
 }
 
-export function deleteTopology(topologyId) {
-    return request(`topologies/${topologyId}`, 'DELETE')
+export function deleteTopology(auth, topologyId) {
+    return request(auth, `topologies/${topologyId}`, 'DELETE')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/traces.js b/opendc-web/opendc-web-ui/src/api/traces.js
index 1c5cfa1d..df03a2dd 100644
--- a/opendc-web/opendc-web-ui/src/api/traces.js
+++ b/opendc-web/opendc-web-ui/src/api/traces.js
@@ -22,6 +22,6 @@
 
 import { request } from './index'
 
-export function getAllTraces() {
-    return request('traces')
+export function getAllTraces(auth) {
+    return request(auth, 'traces/')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/users.js b/opendc-web/opendc-web-ui/src/api/users.js
deleted file mode 100644
index 3da030ad..00000000
--- a/opendc-web/opendc-web-ui/src/api/users.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 getUserByEmail(email) {
-    return request(`users` + new URLSearchParams({ email }))
-}
-
-export function addUser(user) {
-    return request('users', 'POST', { user })
-}
-
-export function getUser(userId) {
-    return request(`users/${userId}`)
-}
-
-export function deleteUser(userId) {
-    return request(`users/${userId}`, 'DELETE')
-}
-- 
cgit v1.2.3


From 45b73e4683cce35de79117c5b4a6919556d9644f Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Fri, 2 Jul 2021 14:26:23 +0200
Subject: api: Add stricter validation of input/output data

This change adds stricter validation of data that enters and leaves the
database. As a result, we clearly separate the database model from the
data model that the REST API exports.
---
 opendc-web/opendc-web-ui/src/api/topologies.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/topologies.js b/opendc-web/opendc-web-ui/src/api/topologies.js
index c8744e6c..802be4bb 100644
--- a/opendc-web/opendc-web-ui/src/api/topologies.js
+++ b/opendc-web/opendc-web-ui/src/api/topologies.js
@@ -31,7 +31,8 @@ export function getTopology(auth, topologyId) {
 }
 
 export function updateTopology(auth, topology) {
-    return request(auth, `topologies/${topology._id}`, 'PUT', { topology })
+    const { _id, ...data } = topology;
+    return request(auth, `topologies/${topology._id}`, 'PUT', { topology: data })
 }
 
 export function deleteTopology(auth, topologyId) {
-- 
cgit v1.2.3


From 1ce8bf170cda2afab334cd330325cd4fbb97dab4 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 7 Jul 2021 11:46:57 +0200
Subject: ui: Split App container into separate components

This change splits the App container into separate pages, as a starting
point for removing much of the unnecessary state from Redux.
---
 opendc-web/opendc-web-ui/src/api/topologies.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/topologies.js b/opendc-web/opendc-web-ui/src/api/topologies.js
index 802be4bb..40685094 100644
--- a/opendc-web/opendc-web-ui/src/api/topologies.js
+++ b/opendc-web/opendc-web-ui/src/api/topologies.js
@@ -31,7 +31,7 @@ export function getTopology(auth, topologyId) {
 }
 
 export function updateTopology(auth, topology) {
-    const { _id, ...data } = topology;
+    const { _id, ...data } = topology
     return request(auth, `topologies/${topology._id}`, 'PUT', { topology: data })
 }
 
-- 
cgit v1.2.3


From e5e5d2c65e583493870bc0b62fb185c5e757c13f Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 7 Jul 2021 16:27:49 +0200
Subject: ui: Migrate project APIs to React Query

This change updates the OpenDC frontend to use React Query for fetching
and mutating project data. Previously, this state was tracked and
synchronized via Redux. Migrating to React Query greatly simplifies the
state synchronization logic necessary in the frontend.
---
 opendc-web/opendc-web-ui/src/api/projects.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/projects.js b/opendc-web/opendc-web-ui/src/api/projects.js
index 93052080..4123b371 100644
--- a/opendc-web/opendc-web-ui/src/api/projects.js
+++ b/opendc-web/opendc-web-ui/src/api/projects.js
@@ -22,11 +22,11 @@
 
 import { request } from './index'
 
-export function getProjects(auth) {
+export function fetchProjects(auth) {
     return request(auth, `projects/`)
 }
 
-export function getProject(auth, projectId) {
+export function fetchProject(auth, projectId) {
     return request(auth, `projects/${projectId}`)
 }
 
-- 
cgit v1.2.3


From d28a2f194a75eb86095485ae4f88be349bcc18b6 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 7 Jul 2021 16:36:54 +0200
Subject: ui: Fetch schedulers and traces using React Query

This change updates the OpenDC frontend to fetch schedulers and traces
using React Query, removing its dependency on Redux.
---
 opendc-web/opendc-web-ui/src/api/schedulers.js | 2 +-
 opendc-web/opendc-web-ui/src/api/traces.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/schedulers.js b/opendc-web/opendc-web-ui/src/api/schedulers.js
index 1b69f1a1..0b8b8153 100644
--- a/opendc-web/opendc-web-ui/src/api/schedulers.js
+++ b/opendc-web/opendc-web-ui/src/api/schedulers.js
@@ -22,6 +22,6 @@
 
 import { request } from './index'
 
-export function getAllSchedulers(auth) {
+export function fetchSchedulers(auth) {
     return request(auth, 'schedulers/')
 }
diff --git a/opendc-web/opendc-web-ui/src/api/traces.js b/opendc-web/opendc-web-ui/src/api/traces.js
index df03a2dd..fd637ac3 100644
--- a/opendc-web/opendc-web-ui/src/api/traces.js
+++ b/opendc-web/opendc-web-ui/src/api/traces.js
@@ -22,6 +22,6 @@
 
 import { request } from './index'
 
-export function getAllTraces(auth) {
+export function fetchTraces(auth) {
     return request(auth, 'traces/')
 }
-- 
cgit v1.2.3


From 9c8a987556d0fb0cdf0eb67e0c191a8dcc5593b9 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 7 Jul 2021 17:30:15 +0200
Subject: ui: Fetch scenarios and portfolios using React Query

---
 opendc-web/opendc-web-ui/src/api/portfolios.js | 8 ++++----
 opendc-web/opendc-web-ui/src/api/scenarios.js  | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/portfolios.js b/opendc-web/opendc-web-ui/src/api/portfolios.js
index 28898e6a..36709b36 100644
--- a/opendc-web/opendc-web-ui/src/api/portfolios.js
+++ b/opendc-web/opendc-web-ui/src/api/portfolios.js
@@ -22,12 +22,12 @@
 
 import { request } from './index'
 
-export function addPortfolio(auth, projectId, portfolio) {
-    return request(auth, `projects/${projectId}/portfolios`, 'POST', { portfolio })
+export function fetchPortfolio(auth, portfolioId) {
+    return request(auth, `portfolios/${portfolioId}`)
 }
 
-export function getPortfolio(auth, portfolioId) {
-    return request(auth, `portfolios/${portfolioId}`)
+export function addPortfolio(auth, portfolio) {
+    return request(auth, `projects/${portfolio.projectId}/portfolios`, 'POST', { portfolio })
 }
 
 export function updatePortfolio(auth, portfolioId, portfolio) {
diff --git a/opendc-web/opendc-web-ui/src/api/scenarios.js b/opendc-web/opendc-web-ui/src/api/scenarios.js
index 095aa788..3a7c7e6f 100644
--- a/opendc-web/opendc-web-ui/src/api/scenarios.js
+++ b/opendc-web/opendc-web-ui/src/api/scenarios.js
@@ -22,12 +22,12 @@
 
 import { request } from './index'
 
-export function addScenario(auth, portfolioId, scenario) {
-    return request(auth, `portfolios/${portfolioId}/scenarios`, 'POST', { scenario })
+export function fetchScenario(auth, scenarioId) {
+    return request(auth, `scenarios/${scenarioId}`)
 }
 
-export function getScenario(auth, scenarioId) {
-    return request(auth, `scenarios/${scenarioId}`)
+export function addScenario(auth, scenario) {
+    return request(auth, `portfolios/${scenario.portfolioId}/scenarios`, 'POST', { scenario })
 }
 
 export function updateScenario(auth, scenarioId, scenario) {
-- 
cgit v1.2.3


From 02a2f0f89cb1f39a5f8856bca1971a4e1b12374f Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Wed, 7 Jul 2021 20:13:30 +0200
Subject: ui: Use React Query defaults to reduce duplication

---
 opendc-web/opendc-web-ui/src/api/topologies.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/topologies.js b/opendc-web/opendc-web-ui/src/api/topologies.js
index 40685094..74fc1977 100644
--- a/opendc-web/opendc-web-ui/src/api/topologies.js
+++ b/opendc-web/opendc-web-ui/src/api/topologies.js
@@ -22,12 +22,12 @@
 
 import { request } from './index'
 
-export function addTopology(auth, topology) {
-    return request(auth, `projects/${topology.projectId}/topologies`, 'POST', { topology })
+export function fetchTopology(auth, topologyId) {
+    return request(auth, `topologies/${topologyId}`)
 }
 
-export function getTopology(auth, topologyId) {
-    return request(auth, `topologies/${topologyId}`)
+export function addTopology(auth, topology) {
+    return request(auth, `projects/${topology.projectId}/topologies`, 'POST', { topology })
 }
 
 export function updateTopology(auth, topology) {
-- 
cgit v1.2.3


From 2c8d675c2cf140eac05988065a9d20fd2773399a Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Thu, 8 Jul 2021 13:36:39 +0200
Subject: ui: Combine fetching of project relations

This change updates the OpenDC frontend to combine the fetching of
project relations. This means that for a single project, we make only
one additional request to retrieve all its topologies.
---
 opendc-web/opendc-web-ui/src/api/portfolios.js | 4 ++++
 opendc-web/opendc-web-ui/src/api/scenarios.js  | 4 ++++
 opendc-web/opendc-web-ui/src/api/topologies.js | 4 ++++
 3 files changed, 12 insertions(+)

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/portfolios.js b/opendc-web/opendc-web-ui/src/api/portfolios.js
index 36709b36..82ac0ced 100644
--- a/opendc-web/opendc-web-ui/src/api/portfolios.js
+++ b/opendc-web/opendc-web-ui/src/api/portfolios.js
@@ -26,6 +26,10 @@ export function fetchPortfolio(auth, portfolioId) {
     return request(auth, `portfolios/${portfolioId}`)
 }
 
+export function fetchPortfoliosOfProject(auth, projectId) {
+    return request(auth, `projects/${projectId}/portfolios`)
+}
+
 export function addPortfolio(auth, portfolio) {
     return request(auth, `projects/${portfolio.projectId}/portfolios`, 'POST', { portfolio })
 }
diff --git a/opendc-web/opendc-web-ui/src/api/scenarios.js b/opendc-web/opendc-web-ui/src/api/scenarios.js
index 3a7c7e6f..88516caa 100644
--- a/opendc-web/opendc-web-ui/src/api/scenarios.js
+++ b/opendc-web/opendc-web-ui/src/api/scenarios.js
@@ -26,6 +26,10 @@ export function fetchScenario(auth, scenarioId) {
     return request(auth, `scenarios/${scenarioId}`)
 }
 
+export function fetchScenariosOfPortfolio(auth, portfolioId) {
+    return request(auth, `portfolios/${portfolioId}/scenarios`)
+}
+
 export function addScenario(auth, scenario) {
     return request(auth, `portfolios/${scenario.portfolioId}/scenarios`, 'POST', { scenario })
 }
diff --git a/opendc-web/opendc-web-ui/src/api/topologies.js b/opendc-web/opendc-web-ui/src/api/topologies.js
index 74fc1977..0b8864e0 100644
--- a/opendc-web/opendc-web-ui/src/api/topologies.js
+++ b/opendc-web/opendc-web-ui/src/api/topologies.js
@@ -26,6 +26,10 @@ export function fetchTopology(auth, topologyId) {
     return request(auth, `topologies/${topologyId}`)
 }
 
+export function fetchTopologiesOfProject(auth, projectId) {
+    return request(auth, `projects/${projectId}/topologies`)
+}
+
 export function addTopology(auth, topology) {
     return request(auth, `projects/${topology.projectId}/topologies`, 'POST', { topology })
 }
-- 
cgit v1.2.3


From 5e5ab63b280eb446db4090733cd3ad2e97d02018 Mon Sep 17 00:00:00 2001
From: Fabian Mastenbroek <mail.fabianm@gmail.com>
Date: Mon, 19 Jul 2021 15:47:23 +0200
Subject: refactor(ui): Restructure components per page

This change updates the source structure of the OpenDC frontend to
follow the page structure.
---
 opendc-web/opendc-web-ui/src/api/topologies.js | 1 +
 1 file changed, 1 insertion(+)

(limited to 'opendc-web/opendc-web-ui/src/api')

diff --git a/opendc-web/opendc-web-ui/src/api/topologies.js b/opendc-web/opendc-web-ui/src/api/topologies.js
index 0b8864e0..bd4e3bc4 100644
--- a/opendc-web/opendc-web-ui/src/api/topologies.js
+++ b/opendc-web/opendc-web-ui/src/api/topologies.js
@@ -35,6 +35,7 @@ export function addTopology(auth, 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 })
 }
-- 
cgit v1.2.3