Merge branch 'feature/mongodb-migration' of github.com:atlarge-research/opendc-dev into feature/mongodb-migration

2 files changed, 4 insertions, 4 deletions

diff --git a/frontend/src/containers/experiments/ExperimentListContainer.js b/frontend/src/containers/experiments/ExperimentListContainer.js
index fc8f203b..0b3b70ca 100644
--- a/frontend/src/containers/experiments/ExperimentListContainer.js
+++ b/frontend/src/containers/experiments/ExperimentListContainer.js
@@ -3,8 +3,8 @@ import ExperimentListComponent from '../../components/experiments/ExperimentList
 
 const mapStateToProps = state => {
     if (
-        state.currentSimulationId === '-1' ||
-        !('experimentIds' in state.objects.simulation[state.currentSimulationId])
+        state.currentProjectId === '-1' ||
+        !('experimentIds' in state.objects.project[state.currentProjectId])
     ) {
         return {
             loading: true,
@@ -13,7 +13,7 @@ const mapStateToProps = state => {
     }
 
     const experimentIds =
-        state.objects.simulation[state.currentSimulationId].experimentIds
+        state.objects.project[state.currentProjectId].experimentIds
     if (experimentIds) {
         return {
             experimentIds,
diff --git a/frontend/src/containers/experiments/ExperimentRowContainer.js b/frontend/src/containers/experiments/ExperimentRowContainer.js
index 523c0747..87d8af67 100644
--- a/frontend/src/containers/experiments/ExperimentRowContainer.js
+++ b/frontend/src/containers/experiments/ExperimentRowContainer.js
@@ -13,7 +13,7 @@ const mapStateToProps = (state, ownProps) => {
 
     return {
         experiment,
-        simulationId: state.currentSimulationId,
+        projectId: state.currentProjectId,
     }
 }