cluster list and mapById sync

Kitware · Jun 22, 2016 · 96b23f9 · 96b23f9
1 parent efcdcae
commit 96b23f9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/redux/reducers/clusters.js b/src/redux/reducers/clusters.js
@@ -84,10 +84,12 @@ export default function clustersReducer(state = initialState, action) {
       const list = [].concat(state.list);
       const mapById = Object.assign({}, state.mapById);
       mapById[newCluster._id] = newCluster;
+
       if (newCluster.type === 'trad' && list.some((el) => el._id === newCluster._id)) {
         for (let i = 0; i < list.length; i++) {
           if (list[i]._id === newCluster._id) {
-            list[i].status = newCluster.status;
+            list[i] = newCluster;
+            updateIcon(list);
             break;
           }
         }
@@ -178,7 +180,8 @@ export default function clustersReducer(state = initialState, action) {
       if (cluster.type === 'trad') {
         for (let i = 0; i < list.length; i++) {
           if (list[i]._id === action.id) {
-            list[i].status = action.status;
+            list[i] = cluster;
+            updateIcon(list);
             break;
           }
         }

diff --git a/test/redux/clusters.js b/test/redux/clusters.js
@@ -2,6 +2,7 @@ import * as Actions from '../../src/redux/actions/clusters';
 import clustersReducer, { clusterTemplate, initialState } from '../../src/redux/reducers/clusters';
 import client from '../../src/network';
 import * as ClusterHelpers from '../../src/network/helpers/clusters';
+import style        from 'HPCCloudStyle/PageWithMenu.mcss';
 
 import expect from 'expect';
 import thunk from 'redux-thunk';
@@ -26,6 +27,7 @@ describe('cluster actions', () => {
     type: 'trad',
     name: 'myCluster',
     status: 'unknown',
+    classPrefix: '',
     log: [{ entry: 'created...' }, { entry: 'running...' }],
   };
   describe('simple actions', () => {
@@ -171,7 +173,9 @@ describe('cluster actions', () => {
 
       const expectedState = deepClone(givenState);
       expectedState.mapById[myCluster._id].status = newStatus;
+      expectedState.mapById[myCluster._id].classPrefix = style.statusTerminatedIcon;
       expectedState.list[0].status = newStatus;
+      expectedState.list[0].classPrefix = style.statusTerminatedIcon;
 
       const action = { type: Actions.UPDATE_CLUSTER_STATUS, id: cluster._id, status: newStatus };
       expect(clustersReducer(givenState, action))