From fc316d8306d478fcb863667060c4c65df8ff8ba4 Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Tue, 31 Jul 2018 12:43:48 -0400
Subject: [PATCH] Update actions to use PK when working with nodes

---
 src/ducks/modules/__tests__/network.test.js  | 6 +++---
 src/ducks/modules/__tests__/sessions.test.js | 5 +++--
 src/ducks/modules/network.js                 | 6 +++---
 src/ducks/modules/sessions.js                | 7 ++++---
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/ducks/modules/__tests__/network.test.js b/src/ducks/modules/__tests__/network.test.js
index fea8f45fdb..235104890b 100644
--- a/src/ducks/modules/__tests__/network.test.js
+++ b/src/ducks/modules/__tests__/network.test.js
@@ -90,7 +90,7 @@ describe('network reducer', () => {
         },
         {
           type: actionTypes.REMOVE_NODE,
-          uid: 2,
+          [PK]: 2,
         },
       ),
     ).toEqual({
@@ -121,7 +121,7 @@ describe('network reducer', () => {
       },
       {
         type: actionTypes.TOGGLE_NODE_ATTRIBUTES,
-        uid: 1,
+        [PK]: 1,
         attributes: { stage: 1 },
       },
     );
@@ -136,7 +136,7 @@ describe('network reducer', () => {
       },
       {
         type: actionTypes.TOGGLE_NODE_ATTRIBUTES,
-        uid: 2,
+        [PK]: 2,
         attributes: { stage: 1 },
       },
     );
diff --git a/src/ducks/modules/__tests__/sessions.test.js b/src/ducks/modules/__tests__/sessions.test.js
index f6243e051f..60e5f4c469 100644
--- a/src/ducks/modules/__tests__/sessions.test.js
+++ b/src/ducks/modules/__tests__/sessions.test.js
@@ -3,6 +3,7 @@ import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
 
 import reducer, { actionCreators, actionTypes } from '../sessions';
+import { NodePK } from '../network';
 import uuidv4 from '../../../utils/uuid';
 
 const middlewares = [thunk];
@@ -161,7 +162,7 @@ describe('sessions actions', () => {
     const expectedAction = {
       type: actionTypes.TOGGLE_NODE_ATTRIBUTES,
       sessionId: 'a',
-      uid: 2,
+      [NodePK]: 2,
       attributes: {},
     };
 
@@ -175,7 +176,7 @@ describe('sessions actions', () => {
     const expectedAction = {
       type: actionTypes.REMOVE_NODE,
       sessionId: 'a',
-      uid: 2,
+      [NodePK]: 2,
     };
 
     store.dispatch(actionCreators.removeNode(2));
diff --git a/src/ducks/modules/network.js b/src/ducks/modules/network.js
index a905d60a34..06ecb194cb 100644
--- a/src/ducks/modules/network.js
+++ b/src/ducks/modules/network.js
@@ -66,10 +66,10 @@ export default function reducer(state = initialState, action = {}) {
       };
     }
     case TOGGLE_NODE_ATTRIBUTES: {
-      const attributes = omit(action.attributes, ['uid']);
+      const attributes = omit(action.attributes, [NodePK]);
 
       const updatedNodes = state.nodes.map((node) => {
-        if (node[NodePK] !== action.uid) { return node; }
+        if (node[NodePK] !== action[NodePK]) { return node; }
 
         if (isMatch(node, attributes)) {
           return omit(node, Object.getOwnPropertyNames(attributes));
@@ -95,7 +95,7 @@ export default function reducer(state = initialState, action = {}) {
     case REMOVE_NODE:
       return {
         ...state,
-        nodes: reject(state.nodes, node => node[NodePK] === action.uid),
+        nodes: reject(state.nodes, node => node[NodePK] === action[NodePK]),
       };
     case ADD_EDGE:
       if (edgeExists(state.edges, action.edge)) { return state; }
diff --git a/src/ducks/modules/sessions.js b/src/ducks/modules/sessions.js
index c93288e654..0aacdc4521 100644
--- a/src/ducks/modules/sessions.js
+++ b/src/ducks/modules/sessions.js
@@ -3,11 +3,12 @@ import { Observable } from 'rxjs';
 import { combineEpics } from 'redux-observable';
 
 import uuidv4 from '../../utils/uuid';
-import network, { ADD_NODES, REMOVE_NODE, UPDATE_NODE, TOGGLE_NODE_ATTRIBUTES, ADD_EDGE, TOGGLE_EDGE, REMOVE_EDGE, SET_EGO, UNSET_EGO } from './network';
+import network, { NodePK, ADD_NODES, REMOVE_NODE, UPDATE_NODE, TOGGLE_NODE_ATTRIBUTES, ADD_EDGE, TOGGLE_EDGE, REMOVE_EDGE, SET_EGO, UNSET_EGO } from './network';
 import ApiClient from '../../utils/ApiClient';
 import { protocolIdFromSessionPath } from '../../utils/matchSessionPath';
 import { getPairedServerFactory } from '../../selectors/servers';
 
+
 const ADD_SESSION = 'ADD_SESSION';
 const UPDATE_SESSION = 'UPDATE_SESSION';
 const UPDATE_PROMPT = 'UPDATE_PROMPT';
@@ -124,7 +125,7 @@ const toggleNodeAttributes = (uid, attributes) => (dispatch, getState) => {
   dispatch({
     type: TOGGLE_NODE_ATTRIBUTES,
     sessionId: session,
-    uid,
+    [NodePK]: uid,
     attributes,
   });
 };
@@ -135,7 +136,7 @@ const removeNode = uid => (dispatch, getState) => {
   dispatch({
     type: REMOVE_NODE,
     sessionId: session,
-    uid,
+    [NodePK]: uid,
   });
 };