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.
---
 opendc-web/opendc-web-ui/src/redux/actions/topology/building.js | 8 ++++----
 opendc-web/opendc-web-ui/src/redux/actions/topology/index.js    | 3 ++-
 opendc-web/opendc-web-ui/src/redux/actions/topology/rack.js     | 2 +-
 opendc-web/opendc-web-ui/src/redux/actions/topology/room.js     | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'opendc-web/opendc-web-ui/src/redux/actions')

diff --git a/opendc-web/opendc-web-ui/src/redux/actions/topology/building.js b/opendc-web/opendc-web-ui/src/redux/actions/topology/building.js
index 939c24a4..e430da2e 100644
--- a/opendc-web/opendc-web-ui/src/redux/actions/topology/building.js
+++ b/opendc-web/opendc-web-ui/src/redux/actions/topology/building.js
@@ -14,16 +14,16 @@ export const DELETE_TILE = 'DELETE_TILE'
 export function startNewRoomConstruction() {
     return (dispatch, getState) => {
         const { topology } = getState()
-        const topologyId = topology.root._id
+        const topologyId = topology.root.id
         const room = {
-            _id: uuid(),
+            id: uuid(),
             name: 'Room',
             topologyId,
             tiles: [],
         }
 
         dispatch(addRoom(topologyId, room))
-        dispatch(startNewRoomConstructionSucceeded(room._id))
+        dispatch(startNewRoomConstructionSucceeded(room.id))
     }
 }
 
@@ -97,7 +97,7 @@ export function addTile(roomId, positionX, positionY) {
     return {
         type: ADD_TILE,
         tile: {
-            _id: uuid(),
+            id: uuid(),
             roomId,
             positionX,
             positionY,
diff --git a/opendc-web/opendc-web-ui/src/redux/actions/topology/index.js b/opendc-web/opendc-web-ui/src/redux/actions/topology/index.js
index 94a712c4..d48af37a 100644
--- a/opendc-web/opendc-web-ui/src/redux/actions/topology/index.js
+++ b/opendc-web/opendc-web-ui/src/redux/actions/topology/index.js
@@ -23,9 +23,10 @@
 export const OPEN_TOPOLOGY = 'OPEN_TOPOLOGY'
 export const STORE_TOPOLOGY = 'STORE_TOPOLOGY'
 
-export function openTopology(id) {
+export function openTopology(projectId, id) {
     return {
         type: OPEN_TOPOLOGY,
+        projectId,
         id,
     }
 }
diff --git a/opendc-web/opendc-web-ui/src/redux/actions/topology/rack.js b/opendc-web/opendc-web-ui/src/redux/actions/topology/rack.js
index c319d966..308acaa6 100644
--- a/opendc-web/opendc-web-ui/src/redux/actions/topology/rack.js
+++ b/opendc-web/opendc-web-ui/src/redux/actions/topology/rack.js
@@ -24,7 +24,7 @@ export function addMachine(rackId, position) {
     return {
         type: ADD_MACHINE,
         machine: {
-            _id: uuid(),
+            id: uuid(),
             rackId,
             position,
             cpus: [],
diff --git a/opendc-web/opendc-web-ui/src/redux/actions/topology/room.js b/opendc-web/opendc-web-ui/src/redux/actions/topology/room.js
index bd447db5..fd2d8cdc 100644
--- a/opendc-web/opendc-web-ui/src/redux/actions/topology/room.js
+++ b/opendc-web/opendc-web-ui/src/redux/actions/topology/room.js
@@ -16,7 +16,7 @@ export function addRoom(topologyId, room) {
     return {
         type: ADD_ROOM,
         room: {
-            _id: uuid(),
+            id: uuid(),
             topologyId,
             ...room,
         },
@@ -54,9 +54,9 @@ export function addRackToTile(positionX, positionY) {
             dispatch({
                 type: ADD_RACK_TO_TILE,
                 rack: {
-                    _id: uuid(),
+                    id: uuid(),
                     name: 'Rack',
-                    tileId: tile._id,
+                    tileId: tile.id,
                     capacity: DEFAULT_RACK_SLOT_CAPACITY,
                     powerCapacityW: DEFAULT_RACK_POWER_CAPACITY,
                     machines: [],
-- 
cgit v1.2.3