From 85901acea556c69891b13ab7299cd62445292c7a Mon Sep 17 00:00:00 2001
From: Georgios Andreadis <info@gandreadis.com>
Date: Wed, 1 Jul 2020 14:02:06 +0200
Subject: Fix simulation interface

---
 frontend/src/components/simulations/SimulationActionButtons.js | 2 +-
 frontend/src/components/simulations/SimulationAuthList.js      | 2 +-
 frontend/src/components/simulations/SimulationAuthRow.js       | 2 +-
 frontend/src/reducers/objects.js                               | 2 +-
 frontend/src/sagas/simulations.js                              | 3 ++-
 frontend/src/sagas/users.js                                    | 7 +++----
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'frontend')

diff --git a/frontend/src/components/simulations/SimulationActionButtons.js b/frontend/src/components/simulations/SimulationActionButtons.js
index 6d2e5831..515047c4 100644
--- a/frontend/src/components/simulations/SimulationActionButtons.js
+++ b/frontend/src/components/simulations/SimulationActionButtons.js
@@ -29,7 +29,7 @@ const SimulationActionButtons = ({ simulationId, onViewUsers, onDelete }) => (
 )
 
 SimulationActionButtons.propTypes = {
-    simulationId: PropTypes.number.isRequired,
+    simulationId: PropTypes.string.isRequired,
     onViewUsers: PropTypes.func,
     onDelete: PropTypes.func,
 }
diff --git a/frontend/src/components/simulations/SimulationAuthList.js b/frontend/src/components/simulations/SimulationAuthList.js
index dce7fb5c..c760d08f 100644
--- a/frontend/src/components/simulations/SimulationAuthList.js
+++ b/frontend/src/components/simulations/SimulationAuthList.js
@@ -26,7 +26,7 @@ const SimulationAuthList = ({ authorizations }) => {
                     {authorizations.map(authorization => (
                         <SimulationAuthRow
                             simulationAuth={authorization}
-                            key={authorization.simulation.id}
+                            key={authorization.simulation._id}
                         />
                     ))}
                     </tbody>
diff --git a/frontend/src/components/simulations/SimulationAuthRow.js b/frontend/src/components/simulations/SimulationAuthRow.js
index b647db69..0e9c36da 100644
--- a/frontend/src/components/simulations/SimulationAuthRow.js
+++ b/frontend/src/components/simulations/SimulationAuthRow.js
@@ -21,7 +21,7 @@ const SimulationAuthRow = ({ simulationAuth }) => (
       />
             {AUTH_DESCRIPTION_MAP[simulationAuth.authorizationLevel]}
         </td>
-        <SimulationActions simulationId={simulationAuth.simulation.id}/>
+        <SimulationActions simulationId={simulationAuth.simulation._id}/>
     </tr>
 )
 
diff --git a/frontend/src/reducers/objects.js b/frontend/src/reducers/objects.js
index 2e9644d0..1dc1e7e8 100644
--- a/frontend/src/reducers/objects.js
+++ b/frontend/src/reducers/objects.js
@@ -35,7 +35,7 @@ export const objects = combineReducers({
 })
 
 function object(type) {
-    return objectWithId(type, object => object.id)
+    return objectWithId(type, object => object._id)
 }
 
 function objectWithId(type, getId) {
diff --git a/frontend/src/sagas/simulations.js b/frontend/src/sagas/simulations.js
index 9e914b85..b57fac95 100644
--- a/frontend/src/sagas/simulations.js
+++ b/frontend/src/sagas/simulations.js
@@ -21,9 +21,10 @@ export function* onSimulationAdd(action) {
         yield put(addToStore('simulation', simulation))
 
         const authorization = {
-            simulationId: simulation.id,
+            simulationId: simulation._id,
             userId: action.userId,
             authorizationLevel: 'OWN',
+            simulation,
         }
         yield put(addToStore('authorization', authorization))
         yield put(
diff --git a/frontend/src/sagas/users.js b/frontend/src/sagas/users.js
index fb5197d1..a10887a0 100644
--- a/frontend/src/sagas/users.js
+++ b/frontend/src/sagas/users.js
@@ -13,7 +13,7 @@ export function* onFetchLoggedInUser(action) {
             performTokenSignIn,
             action.payload.authToken,
         )
-        console.log(tokenResponse)
+
         let userId = tokenResponse.userId
 
         if (tokenResponse.isNewUser) {
@@ -33,14 +33,13 @@ export function* onFetchAuthorizationsOfCurrentUser(action) {
         const user = yield call(fetchAndStoreUser, action.userId)
 
         for (const authorization of user.authorizations) {
+            authorization.userId = action.userId
             yield put(addToStore('authorization', authorization))
-
             yield fetchAndStoreSimulation(authorization.simulationId)
-            yield fetchAndStoreUser(authorization.userId)
         }
 
         const authorizationIds = user.authorizations.map(authorization => [
-            authorization.userId,
+            action.userId,
             authorization.simulationId,
         ])
 
-- 
cgit v1.2.3