From 697a4be020d58e7d93966dd577fa590d73bf8d34 Mon Sep 17 00:00:00 2001 From: jc0b Date: Mon, 27 Jul 2020 16:48:51 +0200 Subject: Create prefabs from topologies --- frontend/src/sagas/prefabs.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 frontend/src/sagas/prefabs.js (limited to 'frontend/src/sagas/prefabs.js') diff --git a/frontend/src/sagas/prefabs.js b/frontend/src/sagas/prefabs.js new file mode 100644 index 00000000..94570404 --- /dev/null +++ b/frontend/src/sagas/prefabs.js @@ -0,0 +1,17 @@ +import {call, put, select} from "redux-saga/effects"; +import {addToStore} from "../actions/objects"; +import {addPrefab} from "../api/routes/prefabs"; +import {getTopologyAsObject} from "./objects"; + +export function* onAddPrefab(action) { + try { + const currentRackId = yield select((state) => state.objects.tile[state.interactionLevel.tileId].rack._id) + const currentRackJson = yield call(getTopologyAsObject, currentRackId) + //TODO: yield call the function in saga to export the specific part of the topology + const prefab = yield call(addPrefab, { name: action.name, rack: currentRackJson }) + yield put(addToStore('prefab', prefab)) + + } catch (error) { + console.error(error) + } +} -- cgit v1.2.3 From 39aa5c22d893769fcfa8501eaa95c82014906a2a Mon Sep 17 00:00:00 2001 From: jc0b Date: Tue, 28 Jul 2020 17:49:17 +0200 Subject: Some debugging stuff --- frontend/src/sagas/prefabs.js | 1 + 1 file changed, 1 insertion(+) (limited to 'frontend/src/sagas/prefabs.js') diff --git a/frontend/src/sagas/prefabs.js b/frontend/src/sagas/prefabs.js index 94570404..1756095c 100644 --- a/frontend/src/sagas/prefabs.js +++ b/frontend/src/sagas/prefabs.js @@ -5,6 +5,7 @@ import {getTopologyAsObject} from "./objects"; export function* onAddPrefab(action) { try { + //console.log("DEBUG: " + state.objects.tile[state.interactionLevel.tileId].rack._id) const currentRackId = yield select((state) => state.objects.tile[state.interactionLevel.tileId].rack._id) const currentRackJson = yield call(getTopologyAsObject, currentRackId) //TODO: yield call the function in saga to export the specific part of the topology -- cgit v1.2.3 From 488d9ae5df13dcea208fc5cb3d609e0a9472bf53 Mon Sep 17 00:00:00 2001 From: jc0b Date: Tue, 28 Jul 2020 20:40:48 +0200 Subject: More stuff for review --- frontend/src/sagas/prefabs.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'frontend/src/sagas/prefabs.js') diff --git a/frontend/src/sagas/prefabs.js b/frontend/src/sagas/prefabs.js index 1756095c..80ba2f80 100644 --- a/frontend/src/sagas/prefabs.js +++ b/frontend/src/sagas/prefabs.js @@ -5,7 +5,8 @@ import {getTopologyAsObject} from "./objects"; export function* onAddPrefab(action) { try { - //console.log("DEBUG: " + state.objects.tile[state.interactionLevel.tileId].rack._id) + const state = yield select((state) => state) + console.log("DEBUG: " + state.objects.tile[state.interactionLevel.tileId].rack._id) const currentRackId = yield select((state) => state.objects.tile[state.interactionLevel.tileId].rack._id) const currentRackJson = yield call(getTopologyAsObject, currentRackId) //TODO: yield call the function in saga to export the specific part of the topology -- cgit v1.2.3 From cd93fc94b2bf4e7b10f168c7dd04a7affba60f33 Mon Sep 17 00:00:00 2001 From: jc0b Date: Wed, 29 Jul 2020 11:53:57 +0200 Subject: Debugging RoomStore --- frontend/src/sagas/prefabs.js | 1 - 1 file changed, 1 deletion(-) (limited to 'frontend/src/sagas/prefabs.js') diff --git a/frontend/src/sagas/prefabs.js b/frontend/src/sagas/prefabs.js index 80ba2f80..93af105a 100644 --- a/frontend/src/sagas/prefabs.js +++ b/frontend/src/sagas/prefabs.js @@ -9,7 +9,6 @@ export function* onAddPrefab(action) { console.log("DEBUG: " + state.objects.tile[state.interactionLevel.tileId].rack._id) const currentRackId = yield select((state) => state.objects.tile[state.interactionLevel.tileId].rack._id) const currentRackJson = yield call(getTopologyAsObject, currentRackId) - //TODO: yield call the function in saga to export the specific part of the topology const prefab = yield call(addPrefab, { name: action.name, rack: currentRackJson }) yield put(addToStore('prefab', prefab)) -- cgit v1.2.3 From b817af6802c1168f17f87308aa922bee5f629a24 Mon Sep 17 00:00:00 2001 From: jc0b Date: Wed, 29 Jul 2020 17:31:31 +0200 Subject: Adding prefabs works now --- frontend/src/sagas/prefabs.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'frontend/src/sagas/prefabs.js') diff --git a/frontend/src/sagas/prefabs.js b/frontend/src/sagas/prefabs.js index 93af105a..1c21215a 100644 --- a/frontend/src/sagas/prefabs.js +++ b/frontend/src/sagas/prefabs.js @@ -1,14 +1,17 @@ import {call, put, select} from "redux-saga/effects"; import {addToStore} from "../actions/objects"; import {addPrefab} from "../api/routes/prefabs"; -import {getTopologyAsObject} from "./objects"; +import {getRackById, getTopologyAsObject} from "./objects"; export function* onAddPrefab(action) { try { - const state = yield select((state) => state) - console.log("DEBUG: " + state.objects.tile[state.interactionLevel.tileId].rack._id) - const currentRackId = yield select((state) => state.objects.tile[state.interactionLevel.tileId].rack._id) - const currentRackJson = yield call(getTopologyAsObject, currentRackId) + // const state = yield select((state) => state) + // console.log("DEBUG: tileId = " + state.interactionLevel.tileId) + // console.log(state.objects.tile[state.interactionLevel.tileId]) + // console.log("DEBUG: " + state.objects.tile[state.interactionLevel.tileId].rackId) + const currentRackId = yield select((state) => state.objects.tile[state.interactionLevel.tileId].rackId) + console.log("DEBUG: currentRackId = " + currentRackId) + const currentRackJson = yield getRackById(currentRackId, false) const prefab = yield call(addPrefab, { name: action.name, rack: currentRackJson }) yield put(addToStore('prefab', prefab)) -- cgit v1.2.3 From 24ab4cdd1f07f99abb7b64866fba7122fad86bf9 Mon Sep 17 00:00:00 2001 From: jc0b Date: Wed, 29 Jul 2020 17:34:11 +0200 Subject: Code cleanup --- frontend/src/sagas/prefabs.js | 5 ----- 1 file changed, 5 deletions(-) (limited to 'frontend/src/sagas/prefabs.js') diff --git a/frontend/src/sagas/prefabs.js b/frontend/src/sagas/prefabs.js index 1c21215a..ea84fdfd 100644 --- a/frontend/src/sagas/prefabs.js +++ b/frontend/src/sagas/prefabs.js @@ -5,12 +5,7 @@ import {getRackById, getTopologyAsObject} from "./objects"; export function* onAddPrefab(action) { try { - // const state = yield select((state) => state) - // console.log("DEBUG: tileId = " + state.interactionLevel.tileId) - // console.log(state.objects.tile[state.interactionLevel.tileId]) - // console.log("DEBUG: " + state.objects.tile[state.interactionLevel.tileId].rackId) const currentRackId = yield select((state) => state.objects.tile[state.interactionLevel.tileId].rackId) - console.log("DEBUG: currentRackId = " + currentRackId) const currentRackJson = yield getRackById(currentRackId, false) const prefab = yield call(addPrefab, { name: action.name, rack: currentRackJson }) yield put(addToStore('prefab', prefab)) -- cgit v1.2.3 From d5ba9d54bea49a1433c5d8f3759eecf180250241 Mon Sep 17 00:00:00 2001 From: jc0b Date: Wed, 29 Jul 2020 17:38:12 +0200 Subject: Fix frontend build failure --- frontend/src/sagas/prefabs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'frontend/src/sagas/prefabs.js') diff --git a/frontend/src/sagas/prefabs.js b/frontend/src/sagas/prefabs.js index ea84fdfd..287a3cf8 100644 --- a/frontend/src/sagas/prefabs.js +++ b/frontend/src/sagas/prefabs.js @@ -1,7 +1,7 @@ import {call, put, select} from "redux-saga/effects"; import {addToStore} from "../actions/objects"; import {addPrefab} from "../api/routes/prefabs"; -import {getRackById, getTopologyAsObject} from "./objects"; +import {getRackById} from "./objects"; export function* onAddPrefab(action) { try { -- cgit v1.2.3 From ac5b33c83f38f9b2799c0f2a871b86052121e8ac Mon Sep 17 00:00:00 2001 From: jc0b Date: Wed, 29 Jul 2020 17:42:27 +0200 Subject: yarn format on prefabs --- frontend/src/sagas/prefabs.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'frontend/src/sagas/prefabs.js') diff --git a/frontend/src/sagas/prefabs.js b/frontend/src/sagas/prefabs.js index 287a3cf8..16cf3d62 100644 --- a/frontend/src/sagas/prefabs.js +++ b/frontend/src/sagas/prefabs.js @@ -1,7 +1,7 @@ -import {call, put, select} from "redux-saga/effects"; -import {addToStore} from "../actions/objects"; -import {addPrefab} from "../api/routes/prefabs"; -import {getRackById} from "./objects"; +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 { @@ -9,7 +9,6 @@ export function* onAddPrefab(action) { 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) } -- cgit v1.2.3