Merge pull request #18 from atlarge-research/prefabs_wip

Add support for prefabs

3 files changed, 74 insertions, 28 deletions

diff --git a/frontend/src/sagas/index.js b/frontend/src/sagas/index.js
index 9f6c4809..6332b2fb 100644
--- a/frontend/src/sagas/index.js
+++ b/frontend/src/sagas/index.js
@@ -36,6 +36,8 @@ import { onFetchAuthorizationsOfCurrentUser, onFetchLoggedInUser } from './users
 import { ADD_TOPOLOGY, DELETE_TOPOLOGY } from '../actions/topologies'
 import { ADD_SCENARIO, DELETE_SCENARIO, OPEN_SCENARIO_SUCCEEDED, UPDATE_SCENARIO } from '../actions/scenarios'
 import { onAddScenario, onDeleteScenario, onOpenScenarioSucceeded, onUpdateScenario } from './scenarios'
+import { onAddPrefab } from './prefabs'
+import { ADD_PREFAB } from '../actions/prefabs'
 
 export default function* rootSaga() {
     yield takeEvery(LOG_IN, onFetchLoggedInUser)
@@ -73,4 +75,6 @@ export default function* rootSaga() {
     yield takeEvery(ADD_SCENARIO, onAddScenario)
     yield takeEvery(UPDATE_SCENARIO, onUpdateScenario)
     yield takeEvery(DELETE_SCENARIO, onDeleteScenario)
+
+    yield takeEvery(ADD_PREFAB, onAddPrefab)
 }
diff --git a/frontend/src/sagas/objects.js b/frontend/src/sagas/objects.js
index 83d71a42..ebce1f0a 100644
--- a/frontend/src/sagas/objects.js
+++ b/frontend/src/sagas/objects.js
@@ -148,8 +148,50 @@ export const updateTopologyOnServer = function* (id) {
 
 export const getTopologyAsObject = function* (id, keepIds) {
     const topologyStore = yield select(OBJECT_SELECTORS['topology'])
+    const rooms = yield getAllRooms(topologyStore[id].roomIds, keepIds)
+    return {
+        _id: keepIds ? id : undefined,
+        name: topologyStore[id].name,
+        rooms: rooms,
+    }
+}
+
+export const getAllRooms = function* (roomIds, keepIds) {
     const roomStore = yield select(OBJECT_SELECTORS['room'])
+
+    let rooms = []
+
+    for (let i in roomIds) {
+        let tiles = yield getAllRoomTiles(roomStore[roomIds[i]], keepIds)
+        rooms.push({
+            _id: keepIds ? i : undefined,
+            name: roomStore[roomIds[i]].name,
+            tiles: tiles,
+        })
+    }
+    return rooms
+}
+
+export const getAllRoomTiles = function* (roomStore, keepIds) {
+    let tiles = []
+
+    for (let i in roomStore.tileIds) {
+        tiles.push(yield getTileById(roomStore.tileIds[i], keepIds))
+    }
+    return tiles
+}
+
+export const getTileById = function* (id, keepIds) {
     const tileStore = yield select(OBJECT_SELECTORS['tile'])
+    return {
+        _id: keepIds ? id : undefined,
+        positionX: tileStore[id].positionX,
+        positionY: tileStore[id].positionY,
+        rack: !tileStore[id].rackId ? undefined : yield getRackById(tileStore[id].rackId, keepIds),
+    }
+}
+
+export const getRackById = function* (id, keepIds) {
     const rackStore = yield select(OBJECT_SELECTORS['rack'])
     const machineStore = yield select(OBJECT_SELECTORS['machine'])
     const cpuStore = yield select(OBJECT_SELECTORS['cpu'])
@@ -158,35 +200,20 @@ export const getTopologyAsObject = function* (id, keepIds) {
     const storageStore = yield select(OBJECT_SELECTORS['storage'])
 
     return {
-        _id: keepIds ? id : undefined,
-        name: topologyStore[id].name,
-        rooms: topologyStore[id].roomIds.map((roomId) => ({
-            _id: keepIds ? roomId : undefined,
-            name: roomStore[roomId].name,
-            tiles: roomStore[roomId].tileIds.map((tileId) => ({
-                _id: keepIds ? tileId : undefined,
-                positionX: tileStore[tileId].positionX,
-                positionY: tileStore[tileId].positionY,
-                rack: !tileStore[tileId].rackId
-                    ? undefined
-                    : {
-                          _id: keepIds ? rackStore[tileStore[tileId].rackId]._id : undefined,
-                          name: rackStore[tileStore[tileId].rackId].name,
-                          capacity: rackStore[tileStore[tileId].rackId].capacity,
-                          powerCapacityW: rackStore[tileStore[tileId].rackId].powerCapacityW,
-                          machines: rackStore[tileStore[tileId].rackId].machineIds
-                              .filter((m) => m !== null)
-                              .map((machineId) => ({
-                                  _id: keepIds ? machineId : undefined,
-                                  position: machineStore[machineId].position,
-                                  cpus: machineStore[machineId].cpuIds.map((id) => cpuStore[id]),
-                                  gpus: machineStore[machineId].gpuIds.map((id) => gpuStore[id]),
-                                  memories: machineStore[machineId].memoryIds.map((id) => memoryStore[id]),
-                                  storages: machineStore[machineId].storageIds.map((id) => storageStore[id]),
-                              })),
-                      },
+        _id: keepIds ? rackStore[id]._id : undefined,
+        name: rackStore[id].name,
+        capacity: rackStore[id].capacity,
+        powerCapacityW: rackStore[id].powerCapacityW,
+        machines: rackStore[id].machineIds
+            .filter((m) => m !== null)
+            .map((machineId) => ({
+                _id: keepIds ? machineId : undefined,
+                position: machineStore[machineId].position,
+                cpus: machineStore[machineId].cpuIds.map((id) => cpuStore[id]),
+                gpus: machineStore[machineId].gpuIds.map((id) => gpuStore[id]),
+                memories: machineStore[machineId].memoryIds.map((id) => memoryStore[id]),
+                storages: machineStore[machineId].storageIds.map((id) => storageStore[id]),
             })),
-        })),
     }
 }
 
diff --git a/frontend/src/sagas/prefabs.js b/frontend/src/sagas/prefabs.js
new file mode 100644
index 00000000..16cf3d62
--- /dev/null
+++ b/frontend/src/sagas/prefabs.js
@@ -0,0 +1,15 @@
+import { call, put, select } from 'redux-saga/effects'
+import { addToStore } from '../actions/objects'
+import { addPrefab } from '../api/routes/prefabs'
+import { getRackById } from './objects'
+
+export function* onAddPrefab(action) {
+    try {
+        const currentRackId = yield select((state) => state.objects.tile[state.interactionLevel.tileId].rackId)
+        const currentRackJson = yield getRackById(currentRackId, false)
+        const prefab = yield call(addPrefab, { name: action.name, rack: currentRackJson })
+        yield put(addToStore('prefab', prefab))
+    } catch (error) {
+        console.error(error)
+    }
+}