From 6605a143d6c6a1417d55f7a63d1697fdad2c828d Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Tue, 24 Jul 2018 17:13:13 -0400
Subject: [PATCH 01/12] Update package lock (lingering changes)

---
 package-lock.json | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a162def2fc..bd52a7a867 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
     "name": "network-canvas",
-    "version": "4.0.0-alpha.4",
+    "version": "4.0.0-alpha.5",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -3195,7 +3195,7 @@
                 },
                 "ansi": {
                     "version": "0.3.1",
-                    "resolved": "https://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
+                    "resolved": "http://registry.npmjs.org/ansi/-/ansi-0.3.1.tgz",
                     "integrity": "sha1-DELU+xcWDVqa8eSEus4cZpIsGyE="
                 },
                 "balanced-match": {
@@ -3215,7 +3215,7 @@
                 },
                 "bplist-parser": {
                     "version": "0.1.1",
-                    "resolved": "https://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
+                    "resolved": "http://registry.npmjs.org/bplist-parser/-/bplist-parser-0.1.1.tgz",
                     "integrity": "sha1-1g1dzCDLptx+HymbNdPh+V2vuuY=",
                     "requires": {
                         "big-integer": "1.6.26"
@@ -3232,7 +3232,7 @@
                 },
                 "concat-map": {
                     "version": "0.0.1",
-                    "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+                    "resolved": "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
                     "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
                 },
                 "cordova-common": {
@@ -3257,12 +3257,12 @@
                 },
                 "cordova-registry-mapper": {
                     "version": "1.1.15",
-                    "resolved": "https://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz",
+                    "resolved": "http://registry.npmjs.org/cordova-registry-mapper/-/cordova-registry-mapper-1.1.15.tgz",
                     "integrity": "sha1-4kS5GFuBdUc7/2B5MkkFEV+D3Hw="
                 },
                 "elementtree": {
                     "version": "0.1.6",
-                    "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
+                    "resolved": "http://registry.npmjs.org/elementtree/-/elementtree-0.1.6.tgz",
                     "integrity": "sha1-KsTEbqMFFsjEy9teOsdBjlkt4gw=",
                     "requires": {
                         "sax": "0.3.5"
@@ -3270,7 +3270,7 @@
                 },
                 "glob": {
                     "version": "5.0.15",
-                    "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
+                    "resolved": "http://registry.npmjs.org/glob/-/glob-5.0.15.tgz",
                     "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=",
                     "requires": {
                         "inflight": "1.0.6",
@@ -3282,7 +3282,7 @@
                 },
                 "inflight": {
                     "version": "1.0.6",
-                    "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+                    "resolved": "http://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
                     "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
                     "requires": {
                         "once": "1.4.0",
@@ -3291,12 +3291,12 @@
                 },
                 "inherits": {
                     "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+                    "resolved": "http://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
                     "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
                 },
                 "lodash": {
                     "version": "3.10.1",
-                    "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
+                    "resolved": "http://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz",
                     "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y="
                 },
                 "minimatch": {
@@ -3309,7 +3309,7 @@
                 },
                 "nopt": {
                     "version": "3.0.6",
-                    "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+                    "resolved": "http://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
                     "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
                     "requires": {
                         "abbrev": "1.1.1"
@@ -3317,7 +3317,7 @@
                 },
                 "once": {
                     "version": "1.4.0",
-                    "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+                    "resolved": "http://registry.npmjs.org/once/-/once-1.4.0.tgz",
                     "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
                     "requires": {
                         "wrappy": "1.0.2"
@@ -3325,12 +3325,12 @@
                 },
                 "os-homedir": {
                     "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+                    "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
                     "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
                 },
                 "os-tmpdir": {
                     "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+                    "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
                     "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ="
                 },
                 "osenv": {
@@ -3344,12 +3344,12 @@
                 },
                 "path-is-absolute": {
                     "version": "1.0.1",
-                    "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+                    "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
                     "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
                 },
                 "plist": {
                     "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/plist/-/plist-1.2.0.tgz",
+                    "resolved": "http://registry.npmjs.org/plist/-/plist-1.2.0.tgz",
                     "integrity": "sha1-CEtQk93JJQbiWfh0uNmxr7jHlZM=",
                     "requires": {
                         "base64-js": "0.0.8",
@@ -3360,7 +3360,7 @@
                 },
                 "properties-parser": {
                     "version": "0.2.3",
-                    "resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz",
+                    "resolved": "http://registry.npmjs.org/properties-parser/-/properties-parser-0.2.3.tgz",
                     "integrity": "sha1-91kSVfcHq7/yJ8e1a2N9uwNzoQ8="
                 },
                 "q": {
@@ -3380,17 +3380,17 @@
                 },
                 "shelljs": {
                     "version": "0.5.3",
-                    "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
+                    "resolved": "http://registry.npmjs.org/shelljs/-/shelljs-0.5.3.tgz",
                     "integrity": "sha1-xUmCuZbHbvDB5rWfvcWCX1txMRM="
                 },
                 "underscore": {
                     "version": "1.8.3",
-                    "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
+                    "resolved": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz",
                     "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI="
                 },
                 "unorm": {
                     "version": "1.4.1",
-                    "resolved": "https://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
+                    "resolved": "http://registry.npmjs.org/unorm/-/unorm-1.4.1.tgz",
                     "integrity": "sha1-NkIA1fE2RsqLzURJAnEzVhR5IwA="
                 },
                 "util-deprecate": {
@@ -3400,7 +3400,7 @@
                 },
                 "wrappy": {
                     "version": "1.0.2",
-                    "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+                    "resolved": "http://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
                     "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
                 },
                 "xmlbuilder": {
@@ -3413,7 +3413,7 @@
                 },
                 "xmldom": {
                     "version": "0.1.27",
-                    "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
+                    "resolved": "http://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
                     "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
                 }
             }

From ac1ed89894481a949865960bbc5b7ff31ea25cf8 Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Tue, 24 Jul 2018 13:11:05 -0400
Subject: [PATCH 02/12] Use `uid` for node primary key

New nodes are no longer given an `id` prop. Edges in the network
refer to the primary key (uid).
---
 .../ConcentricCircles/ConcentricCircles.js    |   8 +-
 .../ConcentricCircles/NodeLayout.js           |   4 +-
 .../ConcentricCircles.test.js.snap            |   2 +-
 src/containers/__tests__/Field.test.js        |  14 +-
 .../__snapshots__/Field.test.js.snap          | 211 ------------------
 src/ducks/modules/__tests__/network.test.js   |  26 ++-
 src/ducks/modules/network.js                  |  29 +--
 src/selectors/sociogram.js                    |   4 +-
 src/utils/__mocks__/uuid.js                   |   9 +
 src/utils/uidGenerator.js                     |   9 -
 10 files changed, 50 insertions(+), 266 deletions(-)
 create mode 100644 src/utils/__mocks__/uuid.js
 delete mode 100644 src/utils/uidGenerator.js

diff --git a/src/containers/ConcentricCircles/ConcentricCircles.js b/src/containers/ConcentricCircles/ConcentricCircles.js
index 3c4525f439..5a776b334d 100644
--- a/src/containers/ConcentricCircles/ConcentricCircles.js
+++ b/src/containers/ConcentricCircles/ConcentricCircles.js
@@ -5,7 +5,7 @@ import NodeLayout from './NodeLayout';
 import EdgeLayout from './EdgeLayout';
 import Background from './Background';
 
-const Sociogram = ({ stage, prompt }) => (
+const ConcentricCircles = ({ stage, prompt }) => (
   <div className="sociogram">
     <Background stage={stage} prompt={prompt} />
     {
@@ -27,11 +27,11 @@ const Sociogram = ({ stage, prompt }) => (
   </div>
 );
 
-Sociogram.propTypes = {
+ConcentricCircles.propTypes = {
   stage: PropTypes.object.isRequired,
   prompt: PropTypes.object.isRequired,
 };
 
-export { Sociogram };
+export { ConcentricCircles };
 
-export default Sociogram;
+export default ConcentricCircles;
diff --git a/src/containers/ConcentricCircles/NodeLayout.js b/src/containers/ConcentricCircles/NodeLayout.js
index 5a420b75be..9cb1ae7fe2 100644
--- a/src/containers/ConcentricCircles/NodeLayout.js
+++ b/src/containers/ConcentricCircles/NodeLayout.js
@@ -84,7 +84,7 @@ class NodeLayout extends Component {
 
     if (!allowSelect) { return; }
 
-    this.connectNode(node.id);
+    this.connectNode(node.uid);
 
     this.toggleHighlightAttributes(node.uid);
 
@@ -130,7 +130,7 @@ class NodeLayout extends Component {
   isLinking(node) {
     return this.props.allowSelect &&
       this.props.canCreateEdge &&
-      node.id === this.state.connectFrom;
+      node.uid === this.state.connectFrom;
   }
 
   render() {
diff --git a/src/containers/ConcentricCircles/__tests__/__snapshots__/ConcentricCircles.test.js.snap b/src/containers/ConcentricCircles/__tests__/__snapshots__/ConcentricCircles.test.js.snap
index f0350c3fe6..847b31ac97 100644
--- a/src/containers/ConcentricCircles/__tests__/__snapshots__/ConcentricCircles.test.js.snap
+++ b/src/containers/ConcentricCircles/__tests__/__snapshots__/ConcentricCircles.test.js.snap
@@ -4,7 +4,7 @@ exports[`<ConcentricCircles /> renders ok 1`] = `
 ShallowWrapper {
   "length": 1,
   Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <Sociogram
+  Symbol(enzyme.__unrendered__): <ConcentricCircles
     prompt={
       Object {
         "sociogram": Object {
diff --git a/src/containers/__tests__/Field.test.js b/src/containers/__tests__/Field.test.js
index e09e552f68..9ca7cb1f96 100644
--- a/src/containers/__tests__/Field.test.js
+++ b/src/containers/__tests__/Field.test.js
@@ -15,19 +15,13 @@ const validation = {
   minLength: 2,
 };
 
-jest.mock('uuid');
-
 const reduxFormFieldProperties = { input: { name: 'foo', value: '' }, meta: { invalid: false } };
 
 describe('getInputComponent()', () => {
-  it('should return renderable component', () => {
-    const Input = getInputComponent('Alphanumeric');
-
-    const subject = shallow((
-      <Input {...reduxFormFieldProperties} />
-    ));
-
-    expect(subject).toMatchSnapshot();
+  it('should return a dom input', () => {
+    const Input = getInputComponent();
+    const subject = shallow(<Input {...reduxFormFieldProperties} />);
+    expect(subject.find('input')).toHaveLength(1);
   });
 });
 
diff --git a/src/containers/__tests__/__snapshots__/Field.test.js.snap b/src/containers/__tests__/__snapshots__/Field.test.js.snap
index d70a5d9eab..2bbcedfc8c 100644
--- a/src/containers/__tests__/__snapshots__/Field.test.js.snap
+++ b/src/containers/__tests__/__snapshots__/Field.test.js.snap
@@ -56,214 +56,3 @@ ShallowWrapper {
   },
 }
 `;
-
-exports[`getInputComponent() should return renderable component 1`] = `
-ShallowWrapper {
-  "length": 1,
-  Symbol(enzyme.__root__): [Circular],
-  Symbol(enzyme.__unrendered__): <TextInput
-    autoFocus={false}
-    className=""
-    fieldLabel={null}
-    hidden={false}
-    input={
-      Object {
-        "name": "foo",
-        "value": "",
-      }
-    }
-    label={null}
-    meta={
-      Object {
-        "invalid": false,
-      }
-    }
-    placeholder=""
-    type="text"
-  />,
-  Symbol(enzyme.__renderer__): Object {
-    "batchedUpdates": [Function],
-    "getNode": [Function],
-    "render": [Function],
-    "simulateEvent": [Function],
-    "unmount": [Function],
-  },
-  Symbol(enzyme.__node__): Object {
-    "instance": null,
-    "key": undefined,
-    "nodeType": "host",
-    "props": Object {
-      "children": Array [
-        <h4>
-          
-        </h4>,
-        <div
-          className="form-field form-field-text"
-        >
-          <input
-            autoFocus={false}
-            className="form-field-text__input"
-            id={undefined}
-            name="foo"
-            placeholder={null}
-            type="text"
-            value=""
-          />
-        </div>,
-      ],
-      "className": "form-field-container",
-      "hidden": false,
-    },
-    "ref": null,
-    "rendered": Array [
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": "",
-        },
-        "ref": null,
-        "rendered": "",
-        "type": "h4",
-      },
-      Object {
-        "instance": null,
-        "key": undefined,
-        "nodeType": "host",
-        "props": Object {
-          "children": Array [
-            <input
-              autoFocus={false}
-              className="form-field-text__input"
-              id={undefined}
-              name="foo"
-              placeholder={null}
-              type="text"
-              value=""
-            />,
-            false,
-          ],
-          "className": "form-field form-field-text",
-        },
-        "ref": null,
-        "rendered": Array [
-          Object {
-            "instance": null,
-            "key": undefined,
-            "nodeType": "host",
-            "props": Object {
-              "autoFocus": false,
-              "className": "form-field-text__input",
-              "id": undefined,
-              "name": "foo",
-              "placeholder": null,
-              "type": "text",
-              "value": "",
-            },
-            "ref": null,
-            "rendered": null,
-            "type": "input",
-          },
-          false,
-        ],
-        "type": "div",
-      },
-    ],
-    "type": "div",
-  },
-  Symbol(enzyme.__nodes__): Array [
-    Object {
-      "instance": null,
-      "key": undefined,
-      "nodeType": "host",
-      "props": Object {
-        "children": Array [
-          <h4>
-            
-          </h4>,
-          <div
-            className="form-field form-field-text"
-          >
-            <input
-              autoFocus={false}
-              className="form-field-text__input"
-              id={undefined}
-              name="foo"
-              placeholder={null}
-              type="text"
-              value=""
-            />
-          </div>,
-        ],
-        "className": "form-field-container",
-        "hidden": false,
-      },
-      "ref": null,
-      "rendered": Array [
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": "",
-          },
-          "ref": null,
-          "rendered": "",
-          "type": "h4",
-        },
-        Object {
-          "instance": null,
-          "key": undefined,
-          "nodeType": "host",
-          "props": Object {
-            "children": Array [
-              <input
-                autoFocus={false}
-                className="form-field-text__input"
-                id={undefined}
-                name="foo"
-                placeholder={null}
-                type="text"
-                value=""
-              />,
-              false,
-            ],
-            "className": "form-field form-field-text",
-          },
-          "ref": null,
-          "rendered": Array [
-            Object {
-              "instance": null,
-              "key": undefined,
-              "nodeType": "host",
-              "props": Object {
-                "autoFocus": false,
-                "className": "form-field-text__input",
-                "id": undefined,
-                "name": "foo",
-                "placeholder": null,
-                "type": "text",
-                "value": "",
-              },
-              "ref": null,
-              "rendered": null,
-              "type": "input",
-            },
-            false,
-          ],
-          "type": "div",
-        },
-      ],
-      "type": "div",
-    },
-  ],
-  Symbol(enzyme.__options__): Object {
-    "adapter": ReactSixteenAdapter {
-      "options": Object {
-        "enableComponentDidUpdateOnSetState": true,
-      },
-    },
-  },
-}
-`;
diff --git a/src/ducks/modules/__tests__/network.test.js b/src/ducks/modules/__tests__/network.test.js
index 5a407cd73c..3c0fe93ece 100644
--- a/src/ducks/modules/__tests__/network.test.js
+++ b/src/ducks/modules/__tests__/network.test.js
@@ -8,7 +8,7 @@ const mockState = {
   edges: [],
 };
 
-const UIDPattern = /[0-9]+_[0-9]+/;
+const UIDPattern = /[a-f\d]+-/;
 
 describe('network reducer', () => {
   it('should return the initial state', () => {
@@ -31,7 +31,7 @@ describe('network reducer', () => {
     expect(newState.nodes[0]).toEqual({ id: 1, name: 'baz' });
 
     const newNode = newState.nodes[1];
-    expect(newNode.id).toEqual(2);
+    // expect(newNode.id).toEqual(2);
     expect(newNode.name).toEqual('foo');
     expect(newNode.uid).toMatch(UIDPattern);
   });
@@ -40,7 +40,7 @@ describe('network reducer', () => {
     const newState = reducer(
       {
         ...mockState,
-        nodes: [{ id: 1, name: 'baz' }],
+        nodes: [{ uid: 1, name: 'baz' }],
       },
       {
         type: actionTypes.ADD_NODES,
@@ -49,14 +49,20 @@ describe('network reducer', () => {
     );
 
     expect(newState.nodes.length).toBe(3);
-    expect(newState.nodes[0]).toEqual({ id: 1, name: 'baz' });
+    expect(newState.nodes[0]).toEqual({ uid: 1, name: 'baz' });
+    expect(newState.nodes[1]).toMatchObject({ name: 'foo', uid: expect.stringMatching(UIDPattern) });
+    expect(newState.nodes[2]).toMatchObject({ name: 'bar', uid: expect.stringMatching(UIDPattern) });
+  });
 
-    const node1 = newState.nodes[1];
-    const node2 = newState.nodes[2];
-    expect(node1).toMatchObject({ name: 'foo', id: 2 });
-    expect(node1.uid).toMatch(UIDPattern);
-    expect(node2).toMatchObject({ name: 'bar', id: 3 });
-    expect(node2.uid).toMatch(UIDPattern);
+  it('preserves UID when adding a node', () => {
+    const newState = reducer(
+      mockState,
+      {
+        type: actionTypes.ADD_NODES,
+        nodes: [{ name: 'foo', uid: '22' }],
+      },
+    );
+    expect(newState.nodes[0].uid).toEqual('22');
   });
 
   it('should support additionalAttributes for ADD_NODES', () => {
diff --git a/src/ducks/modules/network.js b/src/ducks/modules/network.js
index af26570611..91406f1872 100644
--- a/src/ducks/modules/network.js
+++ b/src/ducks/modules/network.js
@@ -1,4 +1,6 @@
-import { maxBy, reject, findIndex, isMatch, omit } from 'lodash';
+import { reject, findIndex, isMatch, omit } from 'lodash';
+
+import uuidv4 from '../../utils/uuid';
 
 export const ADD_NODES = 'ADD_NODES';
 export const REMOVE_NODE = 'REMOVE_NODE';
@@ -23,10 +25,10 @@ export function nextUid(nodes, index = 1) {
 
 // We use these internally to uniquely identify nodes accross network data only
 // (previous data is immutable)
-function nextId(nodes) {
-  if (nodes.length === 0) { return 1; }
-  return maxBy(nodes, 'id').id + 1;
-}
+// function nextId(nodes) {
+//   if (nodes.length === 0) { return 1; }
+//   return maxBy(nodes, 'id').id + 1;
+// }
 
 function flipEdge(edge) {
   return { from: edge.to, to: edge.from, type: edge.type };
@@ -40,24 +42,18 @@ function edgeExists(edges, edge) {
 }
 
 function getNodesWithBatchAdd(oldNodes, newNodes, additionalAttributes) {
-  let nodes = oldNodes;
-  newNodes.forEach((newNode) => {
-    const id = nextId(nodes);
-    const uid = nextUid(nodes);
-    // Provided uid can override generated one, but not id
-    nodes = [...nodes, { uid, ...newNode, ...additionalAttributes, id }];
-  });
-  return nodes;
+  const withAttrs = newNode => ({ ...additionalAttributes, uid: uuidv4(), ...newNode });
+  return oldNodes.concat(newNodes.map(withAttrs));
 }
 
 function getUpdatedNodes(nodes, updatedNode, full) {
+  // TODO: uid is unique; just find.
   const updatedNodes = nodes.map((node) => {
     if (node.uid !== updatedNode.uid) { return node; }
 
     if (full) {
       return {
         ...updatedNode,
-        id: node.id,
         uid: node.uid,
       };
     }
@@ -65,7 +61,6 @@ function getUpdatedNodes(nodes, updatedNode, full) {
     return {
       ...node,
       ...updatedNode,
-      id: node.id,
       uid: node.uid,
     };
   });
@@ -81,8 +76,9 @@ export default function reducer(state = initialState, action = {}) {
       };
     }
     case TOGGLE_NODE_ATTRIBUTES: {
-      const attributes = omit(action.attributes, ['uid', 'id']);
+      const attributes = omit(action.attributes, ['uid']);
 
+      // TODO: uid is unique; just find.
       const updatedNodes = state.nodes.map((node) => {
         if (node.uid !== action.uid) { return node; }
 
@@ -108,7 +104,6 @@ export default function reducer(state = initialState, action = {}) {
       };
     }
     case REMOVE_NODE:
-      // TODO: Shouldn't this use node.id?
       return {
         ...state,
         nodes: reject(state.nodes, node => node.uid === action.uid),
diff --git a/src/selectors/sociogram.js b/src/selectors/sociogram.js
index 465af135b9..6b6b42de7e 100644
--- a/src/selectors/sociogram.js
+++ b/src/selectors/sociogram.js
@@ -121,8 +121,8 @@ export const makeGetNextUnplacedNode = () => {
 };
 
 const edgeCoords = (edge, { nodes, layoutVariable }) => {
-  const from = find(nodes, ['id', edge.from]);
-  const to = find(nodes, ['id', edge.to]);
+  const from = find(nodes, ['uid', edge.from]);
+  const to = find(nodes, ['uid', edge.to]);
 
   if (!from || !to) { return { from: null, to: null }; }
 
diff --git a/src/utils/__mocks__/uuid.js b/src/utils/__mocks__/uuid.js
new file mode 100644
index 0000000000..659413d084
--- /dev/null
+++ b/src/utils/__mocks__/uuid.js
@@ -0,0 +1,9 @@
+/* eslint-env jest */
+const uuidv4 = jest.fn(() => {
+  // Fake uuids
+  const bytes = Array.from(Array(16), () => Math.floor(Math.random() * 256));
+  const s = bytes.map(b => b.toString(16).padStart(2, '0')).join('');
+  return `${s.slice(0, 8)}-${s.slice(8, 12)}-${s.slice(12, 16)}-${s.slice(16, 20)}-${s.slice(20)}`;
+});
+
+export default uuidv4;
diff --git a/src/utils/uidGenerator.js b/src/utils/uidGenerator.js
deleted file mode 100644
index 5235da80f2..0000000000
--- a/src/utils/uidGenerator.js
+++ /dev/null
@@ -1,9 +0,0 @@
-function* uidGenerator() {
-  let i = 1;
-  for (;;) {
-    yield i;
-    i += 1;
-  }
-}
-
-export default uidGenerator;

From e0f8728fae7b2837f9f64ada4c681c999ebf7168 Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Tue, 24 Jul 2018 16:13:29 -0400
Subject: [PATCH 03/12] Define primary key field dynamically

Eventually, this will be user-configurable.

Actions and UI-specific meta continue to use `uid`.
---
 .../development.netcanvas/protocol.json       | 10 ++---
 src/components/CardList.js                    |  4 +-
 src/components/ListSelect.js                  | 10 +++--
 src/components/NodeList.js                    |  5 ++-
 src/components/OrdinalBinBucket.js            |  3 +-
 .../ConcentricCircles/NodeLayout.js           | 13 ++++---
 .../Interfaces/NameGeneratorList.js           |  8 +++-
 src/containers/Search/Search.js               |  1 +
 src/ducks/modules/__tests__/network.test.js   | 37 +++++++++----------
 src/ducks/modules/network.js                  | 28 ++++----------
 src/selectors/name-generator.js               |  6 +--
 src/selectors/sociogram.js                    |  6 +--
 12 files changed, 64 insertions(+), 67 deletions(-)

diff --git a/public/protocols/development.netcanvas/protocol.json b/public/protocols/development.netcanvas/protocol.json
index 3f87102196..3580e18e29 100644
--- a/public/protocols/development.netcanvas/protocol.json
+++ b/public/protocols/development.netcanvas/protocol.json
@@ -482,35 +482,35 @@
     "previousInterview": {
       "nodes": [
         {
-          "uid": "previous_1",
+          "uid": "person_1",
           "type": "person",
           "name": "Anita",
           "nickname": "Annie",
           "age": "23"
         },
         {
-          "uid": "previous_2",
+          "uid": "person_2",
           "type": "person",
           "name": "Barry",
           "nickname": "Baz",
           "age": "23"
         },
         {
-          "uid": "previous_3",
+          "uid": "person_3",
           "type": "person",
           "name": "Carlito",
           "nickname": "Carl",
           "age": "23"
         },
         {
-          "uid": "previous_4",
+          "uid": "person_4",
           "type": "person",
           "name": "Dee",
           "nickname": "Dee",
           "age": "23"
         },
         {
-          "uid": "previous_5",
+          "uid": "person_5",
           "type": "person",
           "name": "Eugine",
           "nickname": "Eu",
diff --git a/src/components/CardList.js b/src/components/CardList.js
index e08204cb6b..4f35b539b4 100644
--- a/src/components/CardList.js
+++ b/src/components/CardList.js
@@ -6,6 +6,7 @@ import cx from 'classnames';
 import { scrollable, selectable } from '../behaviours';
 import { Card } from '.';
 import { Icon } from '../ui/components';
+import { NodePK } from '../ducks/modules/network';
 
 const EnhancedCard = selectable(Card);
 
@@ -75,7 +76,8 @@ CardList.defaultProps = {
   onDeleteCard: null,
   onToggleCard: () => {},
   selected: () => false,
-  uid: node => node.uid,
+  // FIXME: no longer needed once externalData sorted; see Search.
+  uid: node => node[NodePK],
 };
 
 export default compose(
diff --git a/src/components/ListSelect.js b/src/components/ListSelect.js
index 200b5dbf98..48de483b36 100644
--- a/src/components/ListSelect.js
+++ b/src/components/ListSelect.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 
 import { Button } from '../ui/components';
 import { CardList } from '.';
+import { NodePK } from '../ducks/modules/network';
 
 class ListSelect extends Component {
   constructor(props) {
@@ -82,7 +83,7 @@ class ListSelect extends Component {
   /**
     * @param {object} node
     */
-  selected = node => !!this.props.selectedNodes.find(current => current.uid === node.uid);
+  selected = node => !!this.props.selectedNodes.find(current => current[NodePK] === node[NodePK]);
 
   /**
     * @param property to sort by
@@ -129,11 +130,12 @@ class ListSelect extends Component {
     * @param {object} node
     */
   toggleCard = (node) => {
-    const index = this.props.selectedNodes.findIndex(current => current.uid === node.uid);
+    const matchingPK = n => n[NodePK] === node[NodePK];
+    const index = this.props.selectedNodes.findIndex(matchingPK);
     if (index !== -1) {
-      this.props.onRemoveNode(this.props.nodes.find(current => current.uid === node.uid));
+      this.props.onRemoveNode(this.props.nodes.find(matchingPK));
     } else {
-      this.props.onSubmitNode(this.props.nodes.find(current => current.uid === node.uid));
+      this.props.onSubmitNode(this.props.nodes.find(matchingPK));
     }
   };
 
diff --git a/src/components/NodeList.js b/src/components/NodeList.js
index 2695abbf85..28cd9d904a 100644
--- a/src/components/NodeList.js
+++ b/src/components/NodeList.js
@@ -15,6 +15,7 @@ import {
   MonitorDragSource,
 } from '../behaviours/DragAndDrop';
 import sortOrder from '../utils/sortOrder';
+import { NodePK } from '../ducks/modules/network';
 
 const EnhancedNode = DragSource(selectable(Node));
 
@@ -98,7 +99,7 @@ class NodeList extends Component {
       exit,
     } = this.state;
 
-    const isSource = !!find(nodes, ['uid', get(meta, 'uid', null)]);
+    const isSource = !!find(nodes, [NodePK, get(meta, 'uid', null)]);
     const isValidTarget = !isSource && willAccept;
     const isHovering = isValidTarget && isOver;
 
@@ -118,7 +119,7 @@ class NodeList extends Component {
         {
           nodes.map((node, index) => (
             <NodeTransition
-              key={`${node.uid}`}
+              key={`${node[NodePK]}`}
               index={index}
               stagger={stagger}
             >
diff --git a/src/components/OrdinalBinBucket.js b/src/components/OrdinalBinBucket.js
index 5a00a752fc..dd7bb9cc37 100644
--- a/src/components/OrdinalBinBucket.js
+++ b/src/components/OrdinalBinBucket.js
@@ -15,6 +15,7 @@ import {
   MonitorDragSource,
 } from '../behaviours/DragAndDrop';
 import sortOrder from '../utils/sortOrder';
+import { NodePK } from '../ducks/modules/network';
 
 const EnhancedNode = DragSource(selectable(Node));
 
@@ -115,7 +116,7 @@ class OrdinalBinBucket extends Component {
           nodes.map((node, index) => (
             index < 3 && (
               <NodeTransition
-                key={`${node.uid}`}
+                key={`${node[NodePK]}`}
                 index={index}
                 stagger={stagger}
               >
diff --git a/src/containers/ConcentricCircles/NodeLayout.js b/src/containers/ConcentricCircles/NodeLayout.js
index 9cb1ae7fe2..8bbdb14a83 100644
--- a/src/containers/ConcentricCircles/NodeLayout.js
+++ b/src/containers/ConcentricCircles/NodeLayout.js
@@ -8,6 +8,7 @@ import LayoutNode from './LayoutNode';
 import { withBounds } from '../../behaviours';
 import { makeGetSociogramOptions, makeGetPlacedNodes } from '../../selectors/sociogram';
 import { actionCreators as sessionsActions } from '../../ducks/modules/sessions';
+import { NodePK } from '../../ducks/modules/network';
 import { DropTarget } from '../../behaviours/DragAndDrop';
 import sociogramOptionsProps from './propTypes';
 
@@ -30,7 +31,7 @@ const dropHandlers = compose(
     accepts: () => ({ meta }) => meta.itemType === 'POSITIONED_NODE',
     onDrop: props => (item) => {
       props.updateNode({
-        uid: item.meta.uid,
+        [NodePK]: item.meta[NodePK],
         [props.layoutVariable]: relativeCoords(props, item),
       });
 
@@ -41,7 +42,7 @@ const dropHandlers = compose(
       if (!has(item.meta, props.layoutVariable)) { return; }
 
       props.updateNode({
-        uid: item.meta.uid,
+        [NodePK]: item.meta[NodePK],
         [props.layoutVariable]: relativeCoords(props, item),
       });
     },
@@ -84,9 +85,9 @@ class NodeLayout extends Component {
 
     if (!allowSelect) { return; }
 
-    this.connectNode(node.uid);
+    this.connectNode(node[NodePK]);
 
-    this.toggleHighlightAttributes(node.uid);
+    this.toggleHighlightAttributes(node[NodePK]);
 
     this.forceUpdate();
   }
@@ -130,7 +131,7 @@ class NodeLayout extends Component {
   isLinking(node) {
     return this.props.allowSelect &&
       this.props.canCreateEdge &&
-      node.uid === this.state.connectFrom;
+      node[NodePK] === this.state.connectFrom;
   }
 
   render() {
@@ -148,7 +149,7 @@ class NodeLayout extends Component {
 
           return (
             <LayoutNode
-              key={node.uid}
+              key={node[NodePK]}
               node={node}
               layoutVariable={layoutVariable}
               onSelected={() => this.onSelected(node)}
diff --git a/src/containers/Interfaces/NameGeneratorList.js b/src/containers/Interfaces/NameGeneratorList.js
index bd20ff84d2..a463ac812c 100644
--- a/src/containers/Interfaces/NameGeneratorList.js
+++ b/src/containers/Interfaces/NameGeneratorList.js
@@ -6,6 +6,7 @@ import { differenceBy } from 'lodash';
 
 import withPrompt from '../../behaviours/withPrompt';
 import { actionCreators as sessionsActions } from '../../ducks/modules/sessions';
+import { NodePK } from '../../ducks/modules/network';
 import { makeNetworkNodesForOtherPrompts, networkNodes } from '../../selectors/interface';
 import { getDataByPrompt, getCardDisplayLabel, getCardAdditionalProperties, getSortDirectionDefault, getSortFields, getSortOrderDefault, makeGetPromptNodeAttributes } from '../../selectors/name-generator';
 import { PromptSwiper } from '../../containers';
@@ -32,7 +33,7 @@ class NameGeneratorList extends Component {
   }
 
   onRemoveNode = (item) => {
-    this.props.removeNode(item.uid);
+    this.props.removeNode(item[NodePK]);
   }
 
   label = node => `${node[this.props.labelKey]}`;
@@ -114,7 +115,10 @@ function makeMapStateToProps() {
   return function mapStateToProps(state, props) {
     let nodesForList = getDataByPrompt(state, props);
     if (!props.stage.showExistingNodes) {
-      nodesForList = differenceBy(getDataByPrompt(state, props), networkNodesForOtherPrompts(state, props), 'uid');
+      nodesForList = differenceBy(
+        getDataByPrompt(state, props),
+        networkNodesForOtherPrompts(state, props),
+        NodePK);
     }
 
     return {
diff --git a/src/containers/Search/Search.js b/src/containers/Search/Search.js
index 41e9dd4eb1..d5989b804a 100644
--- a/src/containers/Search/Search.js
+++ b/src/containers/Search/Search.js
@@ -121,6 +121,7 @@ class Search extends Component {
    * @param  {object} result A search result
    * @return {string} a unique identifier for the result
    */
+  // FIXME: Get rid of this once externalData sorted.
   uniqueKeyForResult(result) {
     const displayFields = [
       result[this.props.primaryDisplayField],
diff --git a/src/ducks/modules/__tests__/network.test.js b/src/ducks/modules/__tests__/network.test.js
index 3c0fe93ece..235104890b 100644
--- a/src/ducks/modules/__tests__/network.test.js
+++ b/src/ducks/modules/__tests__/network.test.js
@@ -1,6 +1,6 @@
 /* eslint-env jest */
 
-import reducer, { actionTypes } from '../network';
+import reducer, { actionTypes, NodePK as PK } from '../network';
 
 const mockState = {
   ego: {},
@@ -31,16 +31,15 @@ describe('network reducer', () => {
     expect(newState.nodes[0]).toEqual({ id: 1, name: 'baz' });
 
     const newNode = newState.nodes[1];
-    // expect(newNode.id).toEqual(2);
     expect(newNode.name).toEqual('foo');
-    expect(newNode.uid).toMatch(UIDPattern);
+    expect(newNode[PK]).toMatch(UIDPattern);
   });
 
   it('should handle ADD_NODES', () => {
     const newState = reducer(
       {
         ...mockState,
-        nodes: [{ uid: 1, name: 'baz' }],
+        nodes: [{ [PK]: 1, name: 'baz' }],
       },
       {
         type: actionTypes.ADD_NODES,
@@ -49,9 +48,9 @@ describe('network reducer', () => {
     );
 
     expect(newState.nodes.length).toBe(3);
-    expect(newState.nodes[0]).toEqual({ uid: 1, name: 'baz' });
-    expect(newState.nodes[1]).toMatchObject({ name: 'foo', uid: expect.stringMatching(UIDPattern) });
-    expect(newState.nodes[2]).toMatchObject({ name: 'bar', uid: expect.stringMatching(UIDPattern) });
+    expect(newState.nodes[0]).toEqual({ [PK]: 1, name: 'baz' });
+    expect(newState.nodes[1]).toMatchObject({ name: 'foo', [PK]: expect.stringMatching(UIDPattern) });
+    expect(newState.nodes[2]).toMatchObject({ name: 'bar', [PK]: expect.stringMatching(UIDPattern) });
   });
 
   it('preserves UID when adding a node', () => {
@@ -59,10 +58,10 @@ describe('network reducer', () => {
       mockState,
       {
         type: actionTypes.ADD_NODES,
-        nodes: [{ name: 'foo', uid: '22' }],
+        nodes: [{ name: 'foo', [PK]: '22' }],
       },
     );
-    expect(newState.nodes[0].uid).toEqual('22');
+    expect(newState.nodes[0][PK]).toEqual('22');
   });
 
   it('should support additionalAttributes for ADD_NODES', () => {
@@ -87,16 +86,16 @@ describe('network reducer', () => {
       reducer(
         {
           ...mockState,
-          nodes: [{ uid: 1, name: 'foo' }, { uid: 2, name: 'bar' }, { uid: 3, name: 'baz' }],
+          nodes: [{ [PK]: 1, name: 'foo' }, { [PK]: 2, name: 'bar' }, { [PK]: 3, name: 'baz' }],
         },
         {
           type: actionTypes.REMOVE_NODE,
-          uid: 2,
+          [PK]: 2,
         },
       ),
     ).toEqual({
       ...mockState,
-      nodes: [{ uid: 1, name: 'foo' }, { uid: 3, name: 'baz' }],
+      nodes: [{ [PK]: 1, name: 'foo' }, { [PK]: 3, name: 'baz' }],
     });
   });
 
@@ -104,25 +103,25 @@ describe('network reducer', () => {
     const newState = reducer(
       {
         ...mockState,
-        nodes: [{ uid: 1, id: 1, name: 'baz' }],
+        nodes: [{ [PK]: 1, id: 1, name: 'baz' }],
       },
       {
         type: actionTypes.UPDATE_NODE,
-        node: { uid: 1, name: 'foo' },
+        node: { [PK]: 1, name: 'foo' },
       },
     );
-    expect(newState.nodes[0]).toEqual({ uid: 1, id: 1, name: 'foo' });
+    expect(newState.nodes[0]).toEqual({ [PK]: 1, id: 1, name: 'foo' });
   });
 
   it('should handle TOGGLE_NODE_ATTRIBUTES', () => {
     const newState = reducer(
       {
         ...mockState,
-        nodes: [{ uid: 1, name: 'foo' }, { uid: 2, name: 'bar' }],
+        nodes: [{ [PK]: 1, name: 'foo' }, { [PK]: 2, name: 'bar' }],
       },
       {
         type: actionTypes.TOGGLE_NODE_ATTRIBUTES,
-        uid: 1,
+        [PK]: 1,
         attributes: { stage: 1 },
       },
     );
@@ -133,11 +132,11 @@ describe('network reducer', () => {
     const secondState = reducer(
       {
         ...mockState,
-        nodes: [{ uid: 1, stage: 1, name: 'foo' }, { uid: 2, stage: 1, name: 'bar' }],
+        nodes: [{ [PK]: 1, stage: 1, name: 'foo' }, { [PK]: 2, stage: 1, name: 'bar' }],
       },
       {
         type: actionTypes.TOGGLE_NODE_ATTRIBUTES,
-        uid: 2,
+        [PK]: 2,
         attributes: { stage: 1 },
       },
     );
diff --git a/src/ducks/modules/network.js b/src/ducks/modules/network.js
index 91406f1872..61ee475b83 100644
--- a/src/ducks/modules/network.js
+++ b/src/ducks/modules/network.js
@@ -2,6 +2,8 @@ import { reject, findIndex, isMatch, omit } from 'lodash';
 
 import uuidv4 from '../../utils/uuid';
 
+export const NodePK = 'uid';
+
 export const ADD_NODES = 'ADD_NODES';
 export const REMOVE_NODE = 'REMOVE_NODE';
 export const UPDATE_NODE = 'UPDATE_NODE';
@@ -18,18 +20,6 @@ const initialState = {
   edges: [],
 };
 
-// We use these internally to uniquely identify nodes accross previous data / network data
-export function nextUid(nodes, index = 1) {
-  return `${Date.now()}_${nodes.length + index}`;
-}
-
-// We use these internally to uniquely identify nodes accross network data only
-// (previous data is immutable)
-// function nextId(nodes) {
-//   if (nodes.length === 0) { return 1; }
-//   return maxBy(nodes, 'id').id + 1;
-// }
-
 function flipEdge(edge) {
   return { from: edge.to, to: edge.from, type: edge.type };
 }
@@ -42,26 +32,25 @@ function edgeExists(edges, edge) {
 }
 
 function getNodesWithBatchAdd(oldNodes, newNodes, additionalAttributes) {
-  const withAttrs = newNode => ({ ...additionalAttributes, uid: uuidv4(), ...newNode });
+  const withAttrs = newNode => ({ ...additionalAttributes, [NodePK]: uuidv4(), ...newNode });
   return oldNodes.concat(newNodes.map(withAttrs));
 }
 
 function getUpdatedNodes(nodes, updatedNode, full) {
-  // TODO: uid is unique; just find.
   const updatedNodes = nodes.map((node) => {
-    if (node.uid !== updatedNode.uid) { return node; }
+    if (node[NodePK] !== updatedNode[NodePK]) { return node; }
 
     if (full) {
       return {
         ...updatedNode,
-        uid: node.uid,
+        [NodePK]: node[NodePK],
       };
     }
 
     return {
       ...node,
       ...updatedNode,
-      uid: node.uid,
+      [NodePK]: node[NodePK],
     };
   });
   return updatedNodes;
@@ -78,9 +67,8 @@ export default function reducer(state = initialState, action = {}) {
     case TOGGLE_NODE_ATTRIBUTES: {
       const attributes = omit(action.attributes, ['uid']);
 
-      // TODO: uid is unique; just find.
       const updatedNodes = state.nodes.map((node) => {
-        if (node.uid !== action.uid) { return node; }
+        if (node[NodePK] !== action.uid) { return node; }
 
         if (isMatch(node, attributes)) {
           return omit(node, Object.getOwnPropertyNames(attributes));
@@ -106,7 +94,7 @@ export default function reducer(state = initialState, action = {}) {
     case REMOVE_NODE:
       return {
         ...state,
-        nodes: reject(state.nodes, node => node.uid === action.uid),
+        nodes: reject(state.nodes, node => node[NodePK] === action.uid),
       };
     case ADD_EDGE:
       if (edgeExists(state.edges, action.edge)) { return state; }
diff --git a/src/selectors/name-generator.js b/src/selectors/name-generator.js
index d39746033d..0b71db8a5c 100644
--- a/src/selectors/name-generator.js
+++ b/src/selectors/name-generator.js
@@ -4,8 +4,6 @@ import { createSelector } from 'reselect';
 import { has, get } from 'lodash';
 import { makeGetSubject, makeGetIds, makeGetNodeType, makeGetAdditionalAttributes } from './interface';
 import { getExternalData, protocolRegistry } from './protocol';
-import { nextUid } from '../ducks/modules/network';
-
 
 // Selectors that are specific to the name generator
 
@@ -75,11 +73,11 @@ export const getSortDirectionDefault = createSelector(
   sortOptions => get(sortOptions, ['sortOrder', 0, 'direction'], ''),
 );
 
+// FIXME: add back uid to all external data
 export const getDataByPrompt = createSelector(
   getExternalData,
   getDatasourceKey,
-  (externalData, key) => externalData[key].nodes.map(
-    (node, index) => ({ uid: nextUid(externalData[key].nodes, index), ...node })),
+  (externalData, key) => externalData[key].nodes,
 );
 
 export const makeGetNodeIconName = () => createSelector(
diff --git a/src/selectors/sociogram.js b/src/selectors/sociogram.js
index 6b6b42de7e..2d13b30aac 100644
--- a/src/selectors/sociogram.js
+++ b/src/selectors/sociogram.js
@@ -2,7 +2,6 @@
 
 import { createSelector } from 'reselect';
 import {
-  find,
   filter,
   has,
   get,
@@ -18,6 +17,7 @@ import {
 import { networkEdges, makeGetDisplayVariable, makeNetworkNodesForSubject } from './interface';
 import { createDeepEqualSelector } from './utils';
 import sortOrder from '../utils/sortOrder';
+import { NodePK } from '../ducks/modules/network';
 
 // Selectors that are specific to the name generator
 
@@ -121,8 +121,8 @@ export const makeGetNextUnplacedNode = () => {
 };
 
 const edgeCoords = (edge, { nodes, layoutVariable }) => {
-  const from = find(nodes, ['uid', edge.from]);
-  const to = find(nodes, ['uid', edge.to]);
+  const from = nodes.find(n => n[NodePK] === edge.from);
+  const to = nodes.find(n => n[NodePK] === edge.to);
 
   if (!from || !to) { return { from: null, to: null }; }
 

From ed7595691d46876285aa22700ed73e1f2d4d3cd7 Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Tue, 24 Jul 2018 17:12:22 -0400
Subject: [PATCH 04/12] Add object-hash dependency

License: MIT
https://github.com/puleos/object-hash/blob/v1.3.0/LICENSE
---
 package-lock.json | 3 +--
 package.json      | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bd52a7a867..b949bb345c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12841,8 +12841,7 @@
         "object-hash": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.0.tgz",
-            "integrity": "sha512-05KzQ70lSeGSrZJQXE5wNDiTkBJDlUT/myi6RX9dVIvz7a7Qh4oH93BQdiPMn27nldYvVQCKMUaM83AfizZlsQ==",
-            "dev": true
+            "integrity": "sha512-05KzQ70lSeGSrZJQXE5wNDiTkBJDlUT/myi6RX9dVIvz7a7Qh4oH93BQdiPMn27nldYvVQCKMUaM83AfizZlsQ=="
         },
         "object-inspect": {
             "version": "1.5.0",
diff --git a/package.json b/package.json
index cfbe65a9d2..2cbfb06fc9 100644
--- a/package.json
+++ b/package.json
@@ -159,6 +159,7 @@
         "cordova-plugin-wkwebview-engine": "^1.1.4",
         "cordova-plugin-x-socialsharing": "^5.2.1",
         "cordova-plugin-zeroconf": "^1.3.3",
+        "object-hash": "^1.3.0",
         "react-id-swiper": "^1.6.4"
     },
     "homepage": ".",

From e8ba0134c5c60074e656df4caa0e10f5400ce9be Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Tue, 24 Jul 2018 17:12:49 -0400
Subject: [PATCH 05/12] Ensure primary keys on external data

---
 src/containers/NodePanels.js                  |  2 +-
 .../Search/__tests__/Search.test.js           |  2 +-
 src/ducks/modules/externalData.js             | 41 +++++++++++++++++++
 src/ducks/modules/protocol.js                 |  3 +-
 src/ducks/modules/rootReducer.js              |  2 +
 src/selectors/__tests__/externalData.test.js  | 23 +++++++++++
 .../__tests__/name-generator.test.js          | 10 ++---
 src/selectors/__tests__/protocol.test.js      |  5 ---
 src/selectors/__tests__/search.test.js        | 16 +++-----
 src/selectors/externalData.js                 |  7 ++++
 src/selectors/name-generator.js               |  4 +-
 src/selectors/node-provider.js                |  2 +-
 src/selectors/protocol.js                     |  5 ---
 src/selectors/search.js                       |  2 +-
 14 files changed, 92 insertions(+), 32 deletions(-)
 create mode 100644 src/ducks/modules/externalData.js
 create mode 100644 src/selectors/__tests__/externalData.test.js
 create mode 100644 src/selectors/externalData.js

diff --git a/src/containers/NodePanels.js b/src/containers/NodePanels.js
index 60cd143bf8..548369f705 100644
--- a/src/containers/NodePanels.js
+++ b/src/containers/NodePanels.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import { includes, map, differenceBy } from 'lodash';
 import { getNodeLabelFunction, networkNodes, makeNetworkNodesForOtherPrompts } from '../selectors/interface';
-import { getExternalData } from '../selectors/protocol';
+import { getExternalData } from '../selectors/externalData';
 import { actionCreators as sessionsActions } from '../ducks/modules/sessions';
 import { makeGetPromptNodeAttributes, makeGetPanelConfiguration } from '../selectors/name-generator';
 import { Panel, Panels, NodeList } from '../components/';
diff --git a/src/containers/Search/__tests__/Search.test.js b/src/containers/Search/__tests__/Search.test.js
index a5d61f319f..aa459025ec 100644
--- a/src/containers/Search/__tests__/Search.test.js
+++ b/src/containers/Search/__tests__/Search.test.js
@@ -20,8 +20,8 @@ jest.mock('fuse.js', () => jest.fn(() => (
 const mockReduxState = {
   protocol: {
     variableRegistry: {},
-    externalData: {},
   },
+  externalData: {},
   search: {
     collapsed: false,
   },
diff --git a/src/ducks/modules/externalData.js b/src/ducks/modules/externalData.js
new file mode 100644
index 0000000000..7b510f1034
--- /dev/null
+++ b/src/ducks/modules/externalData.js
@@ -0,0 +1,41 @@
+import objectHash from 'object-hash';
+
+import { actionTypes } from './protocol';
+import { NodePK } from './network';
+
+const initialState = null;
+
+const dataWithNodePKs = (externalData) => {
+  const cleanedData = {};
+  if (!externalData) {
+    return externalData;
+  }
+  Object.entries(externalData).forEach(([key, val]) => {
+    if (val.nodes) {
+      cleanedData[key] = {
+        ...val,
+        nodes: val.nodes.map((node) => {
+          // Allow `0` as an ID; may be numeric
+          if (!node[NodePK] && node[NodePK] !== 0) {
+            return { ...node, [NodePK]: objectHash(node) };
+          }
+          return node;
+        }),
+      };
+    } else {
+      cleanedData[key] = val;
+    }
+  });
+  return cleanedData;
+};
+
+export default function reducer(state = initialState, action = {}) {
+  switch (action.type) {
+    case actionTypes.SET_PROTOCOL:
+      return {
+        ...dataWithNodePKs(action.protocol.externalData) || {},
+      };
+    default:
+      return state;
+  }
+}
diff --git a/src/ducks/modules/protocol.js b/src/ducks/modules/protocol.js
index ce4e7143f5..b063ed348d 100644
--- a/src/ducks/modules/protocol.js
+++ b/src/ducks/modules/protocol.js
@@ -1,5 +1,6 @@
 import { combineEpics } from 'redux-observable';
 import { Observable } from 'rxjs';
+import { omit } from 'lodash';
 import { loadProtocol, importProtocol, downloadProtocol, loadFactoryProtocol } from '../../utils/protocol';
 import { actionTypes as SessionActionTypes } from './session';
 
@@ -47,7 +48,7 @@ export default function reducer(state = initialState, action = {}) {
     case SET_PROTOCOL:
       return {
         ...state,
-        ...action.protocol,
+        ...omit(action.protocol, 'externalData'),
         path: action.path,
         isLoaded: true,
         isLoading: false,
diff --git a/src/ducks/modules/rootReducer.js b/src/ducks/modules/rootReducer.js
index 4fa2933574..e85bfbc1c7 100644
--- a/src/ducks/modules/rootReducer.js
+++ b/src/ducks/modules/rootReducer.js
@@ -2,6 +2,7 @@ import { combineReducers } from 'redux';
 import { routerReducer } from 'react-router-redux';
 import { reducer as formReducer } from 'redux-form';
 
+import externalData from './externalData';
 import sessions from './sessions';
 import session from './session';
 import device from './device';
@@ -19,6 +20,7 @@ const appReducer = combineReducers({
   session,
   sessions,
   device,
+  externalData,
   protocol,
   protocols,
   modals,
diff --git a/src/selectors/__tests__/externalData.test.js b/src/selectors/__tests__/externalData.test.js
new file mode 100644
index 0000000000..f2bd7c6deb
--- /dev/null
+++ b/src/selectors/__tests__/externalData.test.js
@@ -0,0 +1,23 @@
+/* eslint-env jest */
+import { getExternalData } from '../externalData';
+
+const externalData = {
+  baz: 'bar',
+};
+
+const mockState = {
+  externalData,
+};
+
+const emptyState = {
+  externalData: null,
+};
+
+describe('protocol selector', () => {
+  describe('memoed selectors', () => {
+    it('should get external data', () => {
+      expect(getExternalData(mockState)).toEqual(externalData);
+      expect(getExternalData(emptyState)).toEqual(null);
+    });
+  });
+});
diff --git a/src/selectors/__tests__/name-generator.test.js b/src/selectors/__tests__/name-generator.test.js
index 2d47f1ec25..15424e3177 100644
--- a/src/selectors/__tests__/name-generator.test.js
+++ b/src/selectors/__tests__/name-generator.test.js
@@ -45,11 +45,6 @@ const externalNode = {
 };
 
 const mockProtocol = {
-  externalData: {
-    schoolPupils: {
-      nodes: [externalNode],
-    },
-  },
   variableRegistry: {
     node: {
       person: {
@@ -82,6 +77,11 @@ const edges = [{ to: 'bar', from: 'foo' }, { to: 'asdf', from: 'qwerty' }];
 const mockState = {
   network: { nodes, edges },
   protocol: mockProtocol,
+  externalData: {
+    schoolPupils: {
+      nodes: [externalNode],
+    },
+  },
 };
 
 describe('name generator selector', () => {
diff --git a/src/selectors/__tests__/protocol.test.js b/src/selectors/__tests__/protocol.test.js
index d666963d3e..8f54e0dd10 100644
--- a/src/selectors/__tests__/protocol.test.js
+++ b/src/selectors/__tests__/protocol.test.js
@@ -49,11 +49,6 @@ describe('protocol selector', () => {
       expect(Protocol.protocolForms(emptyState)).toEqual(undefined);
     });
 
-    it('should get external data', () => {
-      expect(Protocol.getExternalData(mockState)).toEqual(externalData);
-      expect(Protocol.getExternalData(emptyState)).toEqual(undefined);
-    });
-
     it('should get node color', () => {
       const selected = Protocol.makeGetNodeColor();
       expect(selected(mockState, mockProps)).toEqual('node-color-seq-2');
diff --git a/src/selectors/__tests__/search.test.js b/src/selectors/__tests__/search.test.js
index 128040096c..f90b62aa53 100644
--- a/src/selectors/__tests__/search.test.js
+++ b/src/selectors/__tests__/search.test.js
@@ -16,7 +16,12 @@ const externalNode = {
   age: 23,
 };
 
-const mockProtocol = {
+const mockProps = {
+  options: {},
+  dataSource: 'schoolPupils',
+};
+
+const mockState = {
   externalData: {
     schoolPupils: {
       nodes: [externalNode, {
@@ -26,15 +31,6 @@ const mockProtocol = {
   },
 };
 
-const mockProps = {
-  options: {},
-  dataSource: 'schoolPupils',
-};
-
-const mockState = {
-  protocol: mockProtocol,
-};
-
 describe('search', () => {
   describe('memoed selectors', () => {
     it('should makeGetFuse', () => {
diff --git a/src/selectors/externalData.js b/src/selectors/externalData.js
new file mode 100644
index 0000000000..7e2c0b929f
--- /dev/null
+++ b/src/selectors/externalData.js
@@ -0,0 +1,7 @@
+/* eslint-disable import/prefer-default-export */
+import { createDeepEqualSelector } from './utils';
+
+export const getExternalData = createDeepEqualSelector(
+  state => state.externalData,
+  protocolData => protocolData,
+);
diff --git a/src/selectors/name-generator.js b/src/selectors/name-generator.js
index 0b71db8a5c..a2d0a86e63 100644
--- a/src/selectors/name-generator.js
+++ b/src/selectors/name-generator.js
@@ -3,7 +3,8 @@
 import { createSelector } from 'reselect';
 import { has, get } from 'lodash';
 import { makeGetSubject, makeGetIds, makeGetNodeType, makeGetAdditionalAttributes } from './interface';
-import { getExternalData, protocolRegistry } from './protocol';
+import { protocolRegistry } from './protocol';
+import { getExternalData } from './externalData';
 
 // Selectors that are specific to the name generator
 
@@ -73,7 +74,6 @@ export const getSortDirectionDefault = createSelector(
   sortOptions => get(sortOptions, ['sortOrder', 0, 'direction'], ''),
 );
 
-// FIXME: add back uid to all external data
 export const getDataByPrompt = createSelector(
   getExternalData,
   getDatasourceKey,
diff --git a/src/selectors/node-provider.js b/src/selectors/node-provider.js
index f49cfaa8d6..b41c98769d 100644
--- a/src/selectors/node-provider.js
+++ b/src/selectors/node-provider.js
@@ -3,7 +3,7 @@
 import { createSelector } from 'reselect';
 import { differenceBy } from 'lodash';
 import { networkNodes, makeNetworkNodesForOtherPrompts } from './interface';
-import { getExternalData } from './protocol';
+import { getExternalData } from './externalData';
 
 const propDataSource = (_, props) => props.dataSource;
 
diff --git a/src/selectors/protocol.js b/src/selectors/protocol.js
index 13e87bcb9b..4c6e2784a0 100644
--- a/src/selectors/protocol.js
+++ b/src/selectors/protocol.js
@@ -18,11 +18,6 @@ export const protocolForms = createDeepEqualSelector(
   forms => forms,
 );
 
-export const getExternalData = createDeepEqualSelector(
-  state => state.protocol.externalData,
-  protocolData => protocolData,
-);
-
 export const getRemoteProtocolId = createDeepEqualSelector(
   state => state.protocol && state.protocol.type !== 'factory' && state.protocol.name,
   remoteName => nameDigest(remoteName) || null,
diff --git a/src/selectors/search.js b/src/selectors/search.js
index 116ed8b811..e201ce6bcc 100644
--- a/src/selectors/search.js
+++ b/src/selectors/search.js
@@ -2,7 +2,7 @@
 import Fuse from 'fuse.js';
 import { createSelector } from 'reselect';
 
-import { getExternalData } from './protocol';
+import { getExternalData } from './externalData';
 
 // The value of this key should point to an attribute in the protocol's externalData.
 const getDatasourceKey = (_, props) => props.dataSourceKey;

From 2bb0164e12dea5e85b87819286910a0445443f29 Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Tue, 24 Jul 2018 20:07:57 -0400
Subject: [PATCH 06/12] Remove unneeded uid refs from components

Clarify use of key in CardList, and arbitrary ID key in SessionList.
---
 src/components/CardList.js                    |  9 +++---
 .../__snapshots__/CardList-test.js.snap       |  8 ++---
 src/containers/Search/Search.js               | 29 ++-----------------
 src/containers/Setup/SessionList.js           | 13 +++++----
 4 files changed, 17 insertions(+), 42 deletions(-)

diff --git a/src/components/CardList.js b/src/components/CardList.js
index 4f35b539b4..eeb2beecaa 100644
--- a/src/components/CardList.js
+++ b/src/components/CardList.js
@@ -24,7 +24,7 @@ const CardList = (props) => {
     onDeleteCard,
     onToggleCard,
     selected,
-    uid,
+    getKey,
   } = props;
 
   const classNames = cx('card-list', className);
@@ -33,7 +33,7 @@ const CardList = (props) => {
     <div className={classNames}>
       {
         nodes.map(node => (
-          <span className="card-list__content" key={uid(node)}>
+          <span className="card-list__content" key={getKey(node)}>
             <EnhancedCard
               label={label(node)}
               multiselect={multiselect}
@@ -63,7 +63,7 @@ CardList.propTypes = {
   onDeleteCard: PropTypes.func,
   onToggleCard: PropTypes.func,
   selected: PropTypes.func,
-  uid: PropTypes.func,
+  getKey: PropTypes.func,
 };
 
 CardList.defaultProps = {
@@ -76,8 +76,7 @@ CardList.defaultProps = {
   onDeleteCard: null,
   onToggleCard: () => {},
   selected: () => false,
-  // FIXME: no longer needed once externalData sorted; see Search.
-  uid: node => node[NodePK],
+  getKey: node => node[NodePK],
 };
 
 export default compose(
diff --git a/src/components/__tests__/__snapshots__/CardList-test.js.snap b/src/components/__tests__/__snapshots__/CardList-test.js.snap
index ed46f3d71c..f4cd71bcb9 100644
--- a/src/components/__tests__/__snapshots__/CardList-test.js.snap
+++ b/src/components/__tests__/__snapshots__/CardList-test.js.snap
@@ -45,6 +45,7 @@ ShallowWrapper {
         className=""
         compact={false}
         details={[Function]}
+        getKey={[Function]}
         label={[Function]}
         multiselect={true}
         nodes={
@@ -70,7 +71,6 @@ ShallowWrapper {
         onToggleCard={[Function]}
         scrollTop={[Function]}
         selected={[Function]}
-        uid={[Function]}
       />,
       "className": "scrollable",
     },
@@ -83,6 +83,7 @@ ShallowWrapper {
         "className": "",
         "compact": false,
         "details": [Function],
+        "getKey": [Function],
         "label": [Function],
         "multiselect": true,
         "nodes": Array [
@@ -106,7 +107,6 @@ ShallowWrapper {
         "onToggleCard": [Function],
         "scrollTop": [Function],
         "selected": [Function],
-        "uid": [Function],
       },
       "ref": null,
       "rendered": null,
@@ -124,6 +124,7 @@ ShallowWrapper {
           className=""
           compact={false}
           details={[Function]}
+          getKey={[Function]}
           label={[Function]}
           multiselect={true}
           nodes={
@@ -149,7 +150,6 @@ ShallowWrapper {
           onToggleCard={[Function]}
           scrollTop={[Function]}
           selected={[Function]}
-          uid={[Function]}
         />,
         "className": "scrollable",
       },
@@ -162,6 +162,7 @@ ShallowWrapper {
           "className": "",
           "compact": false,
           "details": [Function],
+          "getKey": [Function],
           "label": [Function],
           "multiselect": true,
           "nodes": Array [
@@ -185,7 +186,6 @@ ShallowWrapper {
           "onToggleCard": [Function],
           "scrollTop": [Function],
           "selected": [Function],
-          "uid": [Function],
         },
         "ref": null,
         "rendered": null,
diff --git a/src/containers/Search/Search.js b/src/containers/Search/Search.js
index d5989b804a..dea31326b1 100644
--- a/src/containers/Search/Search.js
+++ b/src/containers/Search/Search.js
@@ -9,6 +9,7 @@ import SearchTransition from '../../components/Transition/Search';
 import SearchResults from './SearchResults';
 import AddCountButton from '../../components/AddCountButton';
 import { actionCreators as searchActions } from '../../ducks/modules/search';
+import { NodePK } from '../../ducks/modules/network';
 import { makeGetFuse } from '../../selectors/search';
 
 /**
@@ -110,36 +111,13 @@ class Search extends Component {
     });
   }
 
-  /**
-   * A result is considered unique only if it presents some disambiguating
-   * information to the user (i.e., its combination of display attributes is unique).
-   *
-   * The `uid` attribute cannot be used to determine uniqueness: once an item
-   * from external data (having no `uid`) is added to the network, it will have
-   * a `uid`.
-   *
-   * @param  {object} result A search result
-   * @return {string} a unique identifier for the result
-   */
-  // FIXME: Get rid of this once externalData sorted.
-  uniqueKeyForResult(result) {
-    const displayFields = [
-      result[this.props.primaryDisplayField],
-      ...this.props.additionalAttributes.map(prop => prop.variable),
-    ];
-    return displayFields.map(field => result[field]).join('.');
-  }
-
-  // See uniqueness discussion at uniqueKeyForResult.
   // If false, suppress candidate from appearing in search results —
   // for example, if the node has already been selected.
   // Assumption:
   //   `excludedNodes` size is small, but search set may be large,
   //   and so preferable to filter found results dynamically.
   isAllowedResult(candidate) {
-    const uid = this.uniqueKeyForResult.bind(this);
-    const candidateUid = uid(candidate);
-    return this.props.excludedNodes.every(excluded => uid(excluded) !== candidateUid);
+    return this.props.excludedNodes.every(excluded => excluded[NodePK] !== candidate[NodePK]);
   }
 
   render() {
@@ -182,7 +160,6 @@ class Search extends Component {
     const getLabel = result => result[primaryDisplayField];
     const getSelected = result => this.state.selectedResults.indexOf(result) > -1;
     const getDetails = result => additionalAttributes.map(attr => toDetail(result, attr));
-    const getUid = result => this.uniqueKeyForResult(result);
 
     return (
       <SearchTransition
@@ -198,8 +175,6 @@ class Search extends Component {
           <SearchResults
             hasInput={hasInput}
             results={this.state.searchResults}
-
-            uid={getUid}
             label={getLabel}
             details={getDetails}
             selected={getSelected}
diff --git a/src/containers/Setup/SessionList.js b/src/containers/Setup/SessionList.js
index c7b030089b..14e0c79bce 100644
--- a/src/containers/Setup/SessionList.js
+++ b/src/containers/Setup/SessionList.js
@@ -12,7 +12,7 @@ import { protocolsByPath } from '../../selectors/protocols';
 import { CardList } from '../../components';
 import { matchSessionPath } from '../../utils/matchSessionPath';
 
-const shortUid = uid => (uid || '').replace(/-.*/, '');
+const shortId = uuid => (uuid || '').replace(/-.*/, '');
 
 const displayDate = timestamp => timestamp && new Date(timestamp).toLocaleString(undefined, { year: 'numeric', month: 'numeric', day: 'numeric' });
 
@@ -46,8 +46,8 @@ const emptyView = (
   */
 class SessionList extends Component {
   onClickLoadSession = (session) => {
-    const pathname = this.props.getSessionPath(session.uid);
-    this.props.setSession(session.uid);
+    const pathname = this.props.getSessionPath(session.uuid);
+    this.props.setSession(session.uuid);
     this.props.loadSession(pathname);
   }
 
@@ -56,7 +56,7 @@ class SessionList extends Component {
 
     // Display most recent first, and filter out any session that doesn't have a protocol
     const sessionList = Object.keys(sessions)
-      .map(key => ({ uid: key, value: sessions[key] }))
+      .map(key => ({ uuid: key, value: sessions[key] }))
       .filter(s => s.value.protocolPath);
     sessionList.sort((a, b) => b.value.updatedAt - a.value.updatedAt);
 
@@ -72,12 +72,13 @@ class SessionList extends Component {
           onDeleteCard={(data) => {
             // eslint-disable-next-line no-alert
             if (confirm('Delete this interview?')) {
-              removeSession(data.uid);
+              removeSession(data.uuid);
             }
           }}
-          label={sessionInfo => shortUid(sessionInfo.uid)}
+          label={sessionInfo => shortId(sessionInfo.uuid)}
           nodes={sessionList}
           onToggleCard={this.onClickLoadSession}
+          getKey={sessionInfo => sessionInfo.uuid}
           details={(sessionInfo) => {
             const session = sessionInfo.value;
             const info = pathInfo(session.path);

From 893ff0d4e1438041e26db4f9e064693c5f860b3e Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Wed, 25 Jul 2018 12:18:15 -0400
Subject: [PATCH 07/12] Update uid hardcode in additional cases

Drag/drop "meta" is currently set directly from node props; these always
represent nodes, so can make use of the PK directly.
---
 src/components/NodeBin.js          |  3 ++-
 src/components/NodeList.js         |  2 +-
 src/components/OrdinalBinBucket.js |  2 +-
 src/containers/NodePanels.js       | 13 +++++++------
 src/containers/OrdinalBins.js      |  3 ++-
 src/ducks/modules/network.js       |  1 +
 src/selectors/node-provider.js     |  3 ++-
 src/utils/Network.js               |  3 ++-
 8 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/components/NodeBin.js b/src/components/NodeBin.js
index 23d5a80b32..ff0fc46b54 100644
--- a/src/components/NodeBin.js
+++ b/src/components/NodeBin.js
@@ -5,6 +5,7 @@ import { compose, withProps } from 'recompose';
 import PropTypes from 'prop-types';
 import cx from 'classnames';
 import { actionCreators as sessionsActions } from '../ducks/modules/sessions';
+import { NodePK } from '../ducks/modules/network';
 import { DropTarget, MonitorDropTarget } from '../behaviours/DragAndDrop';
 
 /**
@@ -43,7 +44,7 @@ export default compose(
   connect(null, mapDispatchToProps),
   withProps(props => ({
     accepts: ({ meta }) => meta.itemType === 'EXISTING_NODE',
-    onDrop: ({ meta }) => props.removeNode(meta.uid),
+    onDrop: ({ meta }) => props.removeNode(meta[NodePK]),
   })),
   DropTarget,
   MonitorDropTarget(['isOver', 'willAccept']),
diff --git a/src/components/NodeList.js b/src/components/NodeList.js
index 28cd9d904a..6b4b86870d 100644
--- a/src/components/NodeList.js
+++ b/src/components/NodeList.js
@@ -99,7 +99,7 @@ class NodeList extends Component {
       exit,
     } = this.state;
 
-    const isSource = !!find(nodes, [NodePK, get(meta, 'uid', null)]);
+    const isSource = !!find(nodes, [NodePK, get(meta, NodePK, null)]);
     const isValidTarget = !isSource && willAccept;
     const isHovering = isValidTarget && isOver;
 
diff --git a/src/components/OrdinalBinBucket.js b/src/components/OrdinalBinBucket.js
index dd7bb9cc37..58631c2799 100644
--- a/src/components/OrdinalBinBucket.js
+++ b/src/components/OrdinalBinBucket.js
@@ -93,7 +93,7 @@ class OrdinalBinBucket extends Component {
       exit,
     } = this.state;
 
-    const isSource = !!find(nodes, ['uid', get(meta, 'uid', null)]);
+    const isSource = !!find(nodes, [NodePK, get(meta, NodePK, null)]);
     const isValidTarget = !isSource && willAccept;
     const isHovering = isValidTarget && isOver;
 
diff --git a/src/containers/NodePanels.js b/src/containers/NodePanels.js
index 548369f705..c7c6418517 100644
--- a/src/containers/NodePanels.js
+++ b/src/containers/NodePanels.js
@@ -6,6 +6,7 @@ import { includes, map, differenceBy } from 'lodash';
 import { getNodeLabelFunction, networkNodes, makeNetworkNodesForOtherPrompts } from '../selectors/interface';
 import { getExternalData } from '../selectors/externalData';
 import { actionCreators as sessionsActions } from '../ducks/modules/sessions';
+import { NodePK } from '../ducks/modules/network';
 import { makeGetPromptNodeAttributes, makeGetPanelConfiguration } from '../selectors/name-generator';
 import { Panel, Panels, NodeList } from '../components/';
 import { getCSSVariableAsString } from '../utils/CSSVariables';
@@ -52,9 +53,9 @@ class NodePanels extends PureComponent {
 
   onDrop = ({ meta }, dataSource) => {
     if (dataSource === 'existing') {
-      this.props.toggleNodeAttributes(meta.uid, { ...this.props.activePromptAttributes });
+      this.props.toggleNodeAttributes(meta[NodePK], { ...this.props.activePromptAttributes });
     } else {
-      this.props.removeNode(meta.uid);
+      this.props.removeNode(meta[NodePK]);
     }
   }
 
@@ -112,13 +113,13 @@ class NodePanels extends PureComponent {
 const getNodesForDataSource = ({ nodes, existingNodes, externalData, dataSource }) => (
   dataSource === 'existing' ?
     existingNodes :
-    differenceBy(externalData[dataSource].nodes, nodes, 'uid')
+    differenceBy(externalData[dataSource].nodes, nodes, NodePK)
 );
 
 const getOriginNodeIds = ({ existingNodes, externalData, dataSource }) => (
   dataSource === 'existing' ?
-    map(existingNodes, 'uid') :
-    map(externalData[dataSource].nodes, 'uid')
+    map(existingNodes, NodePK) :
+    map(externalData[dataSource].nodes, NodePK)
 );
 
 function makeMapStateToProps() {
@@ -155,7 +156,7 @@ function makeMapStateToProps() {
           ) :
           ({ meta }) => (
             meta.itemType === 'EXISTING_NODE' &&
-            includes(originNodeIds, meta.uid)
+            includes(originNodeIds, meta[NodePK])
           );
 
         return {
diff --git a/src/containers/OrdinalBins.js b/src/containers/OrdinalBins.js
index ebed68f494..d35f7c40bc 100644
--- a/src/containers/OrdinalBins.js
+++ b/src/containers/OrdinalBins.js
@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 import color from 'color';
 import { getNodeLabelFunction, makeNetworkNodesForSubject, makeGetOrdinalValues, makeGetPromptVariable } from '../selectors/interface';
 import { actionCreators as sessionsActions } from '../ducks/modules/sessions';
+import { NodePK } from '../ducks/modules/network';
 import { NodeList } from '../components/';
 import { MonitorDragSource } from '../behaviours/DragAndDrop';
 import { getCSSVariableAsString } from '../utils/CSSVariables';
@@ -63,7 +64,7 @@ class OrdinalBins extends PureComponent {
 
       const newValue = {};
       newValue[this.props.activePromptVariable] = bin.value;
-      this.props.toggleNodeAttributes(meta.uid, newValue);
+      this.props.toggleNodeAttributes(meta[NodePK], newValue);
     };
 
     const accentColor = this.calculateAccentColor(index, missingValue);
diff --git a/src/ducks/modules/network.js b/src/ducks/modules/network.js
index 61ee475b83..92d3741e4c 100644
--- a/src/ducks/modules/network.js
+++ b/src/ducks/modules/network.js
@@ -2,6 +2,7 @@ import { reject, findIndex, isMatch, omit } from 'lodash';
 
 import uuidv4 from '../../utils/uuid';
 
+// Primary key used on node data
 export const NodePK = 'uid';
 
 export const ADD_NODES = 'ADD_NODES';
diff --git a/src/selectors/node-provider.js b/src/selectors/node-provider.js
index b41c98769d..17cdfec120 100644
--- a/src/selectors/node-provider.js
+++ b/src/selectors/node-provider.js
@@ -4,6 +4,7 @@ import { createSelector } from 'reselect';
 import { differenceBy } from 'lodash';
 import { networkNodes, makeNetworkNodesForOtherPrompts } from './interface';
 import { getExternalData } from './externalData';
+import { NodePK } from '../ducks/modules/network';
 
 const propDataSource = (_, props) => props.dataSource;
 
@@ -23,6 +24,6 @@ export const makeGetProviderNodes = () => {
     networkNodesForOtherPrompts,
     getExternalData,
     (dataSource, nodes, existingNodes, externalData) =>
-      (dataSource === 'existing' ? existingNodes : differenceBy(externalData[dataSource].nodes, nodes, 'uid')),
+      (dataSource === 'existing' ? existingNodes : differenceBy(externalData[dataSource].nodes, nodes, NodePK)),
   );
 };
diff --git a/src/utils/Network.js b/src/utils/Network.js
index f9c11ce336..120134209e 100644
--- a/src/utils/Network.js
+++ b/src/utils/Network.js
@@ -1,4 +1,5 @@
 import { filter, differenceBy } from 'lodash';
+import { NodePK } from '../ducks/modules/network';
 
 const nodeIncludesAttributes = (network, attributes) => {
   const nodes = filter(network.nodes, attributes);
@@ -10,7 +11,7 @@ const nodeIncludesAttributes = (network, attributes) => {
 };
 
 const difference = (source, target) => {
-  const nodes = differenceBy(source.nodes, target.nodes, 'uid');
+  const nodes = differenceBy(source.nodes, target.nodes, NodePK);
 
   return {
     ...source, // TODO: filter edge etc.

From f27ddce692821c998f633613928e290a92b88b45 Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Wed, 25 Jul 2018 14:20:21 -0400
Subject: [PATCH 08/12] Support custom primary keys in external data

---
 .../development.netcanvas/protocol.json       | 66 ++++++++++---------
 .../modules/__tests__/externalData.test.js    | 54 +++++++++++++++
 src/ducks/modules/externalData.js             | 23 ++++++-
 3 files changed, 111 insertions(+), 32 deletions(-)
 create mode 100644 src/ducks/modules/__tests__/externalData.test.js

diff --git a/public/protocols/development.netcanvas/protocol.json b/public/protocols/development.netcanvas/protocol.json
index 3580e18e29..e92f441041 100644
--- a/public/protocols/development.netcanvas/protocol.json
+++ b/public/protocols/development.netcanvas/protocol.json
@@ -130,6 +130,11 @@
             "description": "Type",
             "type": "text"
           },
+          "studentId": {
+            "label": "Unique id for students",
+            "description": "This key is used in an external data source",
+            "type": "text"
+          },
           "uid": {
             "label": "Unique id",
             "description": "Unique id",
@@ -737,212 +742,213 @@
       ]
     },
     "schoolPupils": {
+      "nodes_primary_key": "studentId",
       "nodes": [
         {
-          "uid": "person_1",
+          "studentId": "person_1",
           "type": "person",
           "name": "F. Anita",
           "nickname": "Annie",
           "age": "23"
         },
         {
-          "uid": "person_2",
+          "studentId": "person_2",
           "type": "person",
           "name": "H. Barry",
           "nickname": "Baz",
           "age": "31"
         },
         {
-          "uid": "person_3",
+          "studentId": "person_3",
           "type": "person",
           "name": "Carlito",
           "nickname": "Carl",
           "age": "25"
         },
         {
-          "uid": "person_4",
+          "studentId": "person_4",
           "type": "person",
           "name": "Dee",
           "nickname": "Dee",
           "age": "72"
         },
         {
-          "uid": "person_5",
+          "studentId": "person_5",
           "type": "person",
           "name": "A. Eugine",
           "nickname": "Eu",
           "age": "27"
         },
         {
-          "uid": "person_6",
+          "studentId": "person_6",
           "type": "person",
           "name": "Gerald",
           "nickname": "Gary",
           "age": "33"
         },
         {
-          "uid": "person_7",
+          "studentId": "person_7",
           "type": "person",
           "name": "Hannah L.",
           "nickname": "Hannah",
           "age": "81"
         },
         {
-          "uid": "person_8",
+          "studentId": "person_8",
           "type": "person",
           "name": "Isabella",
           "nickname": "Izzy",
           "age": "25"
         },
         {
-          "uid": "person_9",
+          "studentId": "person_9",
           "type": "person",
           "name": "Jacob",
           "nickname": "Jake",
           "age": "52"
         },
         {
-          "uid": "person_10",
+          "studentId": "person_10",
           "type": "person",
           "name": "Kaylee",
           "nickname": "Lee",
           "age": "57"
         },
         {
-          "uid": "person_11",
+          "studentId": "person_11",
           "type": "person",
           "name": "Lily",
           "nickname": "Lil",
           "age": "93"
         },
         {
-          "uid": "person_12",
+          "studentId": "person_12",
           "type": "person",
           "name": "Michael",
           "nickname": "Mike",
           "age": "91"
         },
         {
-          "uid": "person_13",
+          "studentId": "person_13",
           "type": "person",
           "name": "Noah",
           "nickname": "Nole",
           "age": "65"
         },
         {
-          "uid": "person_14",
+          "studentId": "person_14",
           "type": "person",
           "name": "K. Olivia",
           "nickname": "Olivia",
           "age": "42"
         },
         {
-          "uid": "person_15",
+          "studentId": "person_15",
           "type": "person",
           "name": "Penelope",
           "nickname": "Nellie",
           "age": "47"
         },
         {
-          "uid": "person_16",
+          "studentId": "person_16",
           "type": "person",
           "name": "Quentin",
           "nickname": "Quinn",
           "age": "33"
         },
         {
-          "uid": "person_17",
+          "studentId": "person_17",
           "type": "person",
           "name": "Y. Randall",
           "nickname": "Randy",
           "age": "51"
         },
         {
-          "uid": "person_18",
+          "studentId": "person_18",
           "type": "person",
           "name": "Sophia",
           "nickname": "Fia",
           "age": "85"
         },
         {
-          "uid": "person_19",
+          "studentId": "person_19",
           "type": "person",
           "name": "Tatiana",
           "nickname": "Ana",
           "age": "72"
         },
         {
-          "uid": "person_20",
+          "studentId": "person_20",
           "type": "person",
           "name": "Uriel",
           "nickname": "Uri",
           "age": "17"
         },
         {
-          "uid": "person_21",
+          "studentId": "person_21",
           "type": "person",
           "name": "Vanessa",
           "nickname": "Ness",
           "age": "56"
         },
         {
-          "uid": "person_22",
+          "studentId": "person_22",
           "type": "person",
           "name": "William",
           "nickname": "Bill",
           "age": "61"
         },
         {
-          "uid": "person_23",
+          "studentId": "person_23",
           "type": "person",
           "name": "Xavier",
           "nickname": "X",
           "age": "65"
         },
         {
-          "uid": "person_24",
+          "studentId": "person_24",
           "type": "person",
           "name": "Yolanda",
           "nickname": "Landa",
           "age": "29"
         },
         {
-          "uid": "person_25",
+          "studentId": "person_25",
           "type": "person",
           "name": "T. Zoe",
           "nickname": "Zoe",
           "age": "87"
         },
         {
-          "uid": "person_26",
+          "studentId": "person_26",
           "type": "person",
           "name": "Fernando",
           "nickname": "Finn",
           "age": "63"
         },
         {
-          "uid": "person_27",
+          "studentId": "person_27",
           "type": "person",
           "name": "Daniella",
           "nickname": "Dani",
           "age": "71"
         },
         {
-          "uid": "person_28",
+          "studentId": "person_28",
           "type": "person",
           "name": "P. Samuel",
           "nickname": "Sammy",
           "age": "20"
         },
         {
-          "uid": "person_29",
+          "studentId": "person_29",
           "type": "person",
           "name": "Brooklyn",
           "nickname": "Brook",
           "age": "24"
         },
         {
-          "uid": "person_30",
+          "studentId": "person_30",
           "type": "person",
           "name": "Christopher",
           "nickname": "Topher",
diff --git a/src/ducks/modules/__tests__/externalData.test.js b/src/ducks/modules/__tests__/externalData.test.js
new file mode 100644
index 0000000000..a86d65127b
--- /dev/null
+++ b/src/ducks/modules/__tests__/externalData.test.js
@@ -0,0 +1,54 @@
+/* eslint-env jest */
+import reducer from '../externalData';
+
+const initialState = null;
+
+const actionWithData = externalData => ({
+  type: 'SET_PROTOCOL',
+  protocol: {
+    externalData,
+  },
+});
+
+describe('the externalData reducer', () => {
+  it('returns the initial state', () => {
+    expect(reducer(undefined, {})).toEqual(initialState);
+  });
+
+  it('sets the state after protocol import', () => {
+    const data = { students: { nodes: [] } };
+    const newState = reducer(initialState, actionWithData(data));
+    expect(newState).toEqual(data);
+  });
+
+  it('assigns a UID to new data', () => {
+    const data = { students: { nodes: [{ name: 'a' }] } };
+    const newState = reducer(initialState, actionWithData(data));
+    expect(newState.students.nodes[0]).toMatchObject({ uid: expect.any(String) });
+  });
+
+  it('uses consistent hashing for IDs', () => {
+    const data = { students: { nodes: [{ name: 'a' }, { name: 'a' }] } };
+    const newState = reducer(initialState, actionWithData(data));
+    expect(newState.students.nodes[0].uid).toBeDefined();
+    expect(newState.students.nodes[0]).toEqual(newState.students.nodes[1]);
+  });
+
+  it('preserves existing UIDs', () => {
+    const data = { students: { nodes: [{ name: 'a', uid: 54321 }] } };
+    const newState = reducer(initialState, actionWithData(data));
+    expect(newState.students.nodes[0]).toMatchObject({ uid: 54321 });
+  });
+
+  it('Copies from existing PKs if available', () => {
+    const data = { students: { nodes_primary_key: 'studentId', nodes: [{ name: 'a', studentId: 98765 }] } };
+    const newState = reducer(initialState, actionWithData(data));
+    expect(newState.students.nodes[0]).toMatchObject({ uid: 98765, studentId: 98765 });
+  });
+
+  it('Generates UID if custom PK missing', () => {
+    const data = { students: { nodes_primary_key: 'studentId', nodes: [{ name: 'a' }] } };
+    const newState = reducer(initialState, actionWithData(data));
+    expect(newState.students.nodes[0]).toMatchObject({ uid: expect.any(String) });
+  });
+});
diff --git a/src/ducks/modules/externalData.js b/src/ducks/modules/externalData.js
index 7b510f1034..6a59318de4 100644
--- a/src/ducks/modules/externalData.js
+++ b/src/ducks/modules/externalData.js
@@ -5,6 +5,23 @@ import { NodePK } from './network';
 
 const initialState = null;
 
+// Name of the property a protocol uses to define a PK field on external data
+// Example:
+//   "schoolPupils": { "nodes_primary_key": "studentId", "nodes": [...] }
+const customPKProp = 'nodes_primary_key';
+
+/**
+ * @private
+ * All external data nodes must be identified in the app with a primary key (== NodePK).
+ * Each external data source may define its own primary key (in protocol.json).
+ * This function makes no restrictions on the data type of custom primary keys.
+ *
+ * For each object in an external data set's collection of nodes:
+ * - If the object is missing a PK, we assign it one (to the [NodePK] prop)
+ *   + The assigned PK is equal to the hash of the object contents, so is consistent across imports
+ *   + A PK is missing if it is falsy, and not equal to 0. (`0` is allowed as an identifier.)
+ * - If the object has a PK, but uses a custom prop for PK, we copy the PK value to [NodePK]
+ */
 const dataWithNodePKs = (externalData) => {
   const cleanedData = {};
   if (!externalData) {
@@ -12,12 +29,14 @@ const dataWithNodePKs = (externalData) => {
   }
   Object.entries(externalData).forEach(([key, val]) => {
     if (val.nodes) {
+      const pkName = val[customPKProp] || NodePK;
       cleanedData[key] = {
         ...val,
         nodes: val.nodes.map((node) => {
-          // Allow `0` as an ID; may be numeric
-          if (!node[NodePK] && node[NodePK] !== 0) {
+          if (!node[pkName] && node[pkName] !== 0) {
             return { ...node, [NodePK]: objectHash(node) };
+          } else if (pkName !== NodePK) {
+            return { ...node, [NodePK]: node[pkName] };
           }
           return node;
         }),

From 3a65b2153a6d49f78e5d3526156a182330e8d285 Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Fri, 27 Jul 2018 06:31:21 -0400
Subject: [PATCH 09/12] Use camel case for primary key

---
 public/protocols/development.netcanvas/protocol.json | 2 +-
 src/ducks/modules/__tests__/externalData.test.js     | 4 ++--
 src/ducks/modules/externalData.js                    | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/protocols/development.netcanvas/protocol.json b/public/protocols/development.netcanvas/protocol.json
index e92f441041..73b8e2a16a 100644
--- a/public/protocols/development.netcanvas/protocol.json
+++ b/public/protocols/development.netcanvas/protocol.json
@@ -742,7 +742,7 @@
       ]
     },
     "schoolPupils": {
-      "nodes_primary_key": "studentId",
+      "nodesPrimaryKey": "studentId",
       "nodes": [
         {
           "studentId": "person_1",
diff --git a/src/ducks/modules/__tests__/externalData.test.js b/src/ducks/modules/__tests__/externalData.test.js
index a86d65127b..3fcec4ae82 100644
--- a/src/ducks/modules/__tests__/externalData.test.js
+++ b/src/ducks/modules/__tests__/externalData.test.js
@@ -41,13 +41,13 @@ describe('the externalData reducer', () => {
   });
 
   it('Copies from existing PKs if available', () => {
-    const data = { students: { nodes_primary_key: 'studentId', nodes: [{ name: 'a', studentId: 98765 }] } };
+    const data = { students: { nodesPrimaryKey: 'studentId', nodes: [{ name: 'a', studentId: 98765 }] } };
     const newState = reducer(initialState, actionWithData(data));
     expect(newState.students.nodes[0]).toMatchObject({ uid: 98765, studentId: 98765 });
   });
 
   it('Generates UID if custom PK missing', () => {
-    const data = { students: { nodes_primary_key: 'studentId', nodes: [{ name: 'a' }] } };
+    const data = { students: { nodesPrimaryKey: 'studentId', nodes: [{ name: 'a' }] } };
     const newState = reducer(initialState, actionWithData(data));
     expect(newState.students.nodes[0]).toMatchObject({ uid: expect.any(String) });
   });
diff --git a/src/ducks/modules/externalData.js b/src/ducks/modules/externalData.js
index 6a59318de4..47f4783b22 100644
--- a/src/ducks/modules/externalData.js
+++ b/src/ducks/modules/externalData.js
@@ -7,8 +7,8 @@ const initialState = null;
 
 // Name of the property a protocol uses to define a PK field on external data
 // Example:
-//   "schoolPupils": { "nodes_primary_key": "studentId", "nodes": [...] }
-const customPKProp = 'nodes_primary_key';
+//   "schoolPupils": { "nodesPrimaryKey": "studentId", "nodes": [...] }
+const customPKProp = 'nodesPrimaryKey';
 
 /**
  * @private

From d40b96db50a06725d9ff5962db0a44eb7cf31b58 Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Mon, 30 Jul 2018 09:03:00 -0400
Subject: [PATCH 10/12] Fix graphml export format

Translate uid to id attribute in xml
---
 src/utils/ExportData.js                         | 13 +++++++------
 src/utils/__tests__/ExportData.test.js          | 17 +++++++++++++----
 .../__snapshots__/ExportData.test.js.snap       |  2 +-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/utils/ExportData.js b/src/utils/ExportData.js
index 22f122eafb..bd81e7cece 100644
--- a/src/utils/ExportData.js
+++ b/src/utils/ExportData.js
@@ -1,6 +1,7 @@
 import { findKey, forInRight, isNil, join } from 'lodash';
 
 import saveFile from './SaveFile';
+import { NodePK } from '../ducks/modules/network';
 
 const setUpXml = () => {
   const xmlDoc = '<?xml version="1.0" encoding="UTF-8"?>\n' +
@@ -146,8 +147,8 @@ const addElements = (graph, uri, dataList, type, excludeList, variableRegistry,
   extra: false) => {
   dataList.forEach((dataElement, index) => {
     const domElement = document.createElementNS(uri, type);
-    if (dataElement.id) {
-      domElement.setAttribute('id', dataElement.id);
+    if (dataElement[NodePK]) {
+      domElement.setAttribute('id', dataElement[NodePK]);
     } else {
       domElement.setAttribute('id', index);
     }
@@ -199,8 +200,8 @@ const createGraphML = (networkData, variableRegistry, openErrorDialog) => {
   });
 
   // generate keys for attributes
-  let missingVariables = generateKeys(graph, graphML, networkData.nodes, 'node', ['id'], variableRegistry, layoutVariable);
-  missingVariables = missingVariables.concat(generateKeys(graph, graphML, networkData.edges, 'edge', ['from', 'to', 'id'], variableRegistry));
+  let missingVariables = generateKeys(graph, graphML, networkData.nodes, 'node', [NodePK], variableRegistry, layoutVariable);
+  missingVariables = missingVariables.concat(generateKeys(graph, graphML, networkData.edges, 'edge', ['from', 'to'], variableRegistry));
   if (missingVariables.length > 0) {
     // hard fail if checking the registry fails
     // remove this to fall back to using "text" for unknowns
@@ -209,8 +210,8 @@ const createGraphML = (networkData, variableRegistry, openErrorDialog) => {
   }
 
   // add nodes and edges to graph
-  addElements(graph, graphML.namespaceURI, networkData.nodes, 'node', ['id'], variableRegistry, layoutVariable);
-  addElements(graph, graphML.namespaceURI, networkData.edges, 'edge', ['from', 'to', 'id'], variableRegistry, null, true);
+  addElements(graph, graphML.namespaceURI, networkData.nodes, 'node', [NodePK], variableRegistry, layoutVariable);
+  addElements(graph, graphML.namespaceURI, networkData.edges, 'edge', ['from', 'to'], variableRegistry, null, true);
 
   return saveFile(xmlToString(xml), openErrorDialog, 'graphml', ['graphml'], 'networkcanvas.graphml', 'text/xml',
     { message: 'Your network canvas graphml file.', subject: 'network canvas export' });
diff --git a/src/utils/__tests__/ExportData.test.js b/src/utils/__tests__/ExportData.test.js
index cff63432df..477d1c5ac6 100644
--- a/src/utils/__tests__/ExportData.test.js
+++ b/src/utils/__tests__/ExportData.test.js
@@ -1,6 +1,7 @@
 /* eslint-env jest */
 import saveFile from '../SaveFile';
 import ExportData from '../ExportData';
+import { NodePK } from '../../ducks/modules/network';
 
 function mockSerializeToString() {
   return { serializeToString: xmlData => xmlData.documentElement.outerHTML };
@@ -42,11 +43,11 @@ const variableRegistry = {
 const sessionA = {
   network: {
     edges: [
-      { id: 1, type: 'friend', to: 1, from: 2, connected: true },
+      { type: 'friend', to: 1, from: 2, connected: true },
     ],
     edgo: {},
     nodes: [
-      { id: 1,
+      { [NodePK]: 1,
         type: 'person',
         name: 'soAndSo',
         aString: 'content',
@@ -60,7 +61,7 @@ const sessionA = {
         aLayout: { x: 0.4134, y: 0.2356 },
         aLocation: { latitude: 41.799756, longitude: -87.66443 },
       },
-      { id: 2,
+      { [NodePK]: 2,
         type: 'person',
         name: 'whoDunnit',
         aString: 'Another Content',
@@ -74,7 +75,7 @@ const sessionA = {
         aLayout: { x: 0.3434, y: 0.3156 },
         aLocation: { latitude: 44.9756, longitude: 18.443 },
       },
-      { id: 3,
+      { [NodePK]: 3,
         type: 'person',
         name: 'whatsErName',
         aString: 'More Content',
@@ -97,4 +98,12 @@ describe('export data function', () => {
     const xmlResult = ExportData(sessionA.network, variableRegistry, () => {});
     expect(xmlResult).toMatchSnapshot();
   });
+
+  it('translates node primary key to "id" attribute', () => {
+    const xml = ExportData(sessionA.network, variableRegistry, () => {});
+    const doc = new DOMParser().parseFromString(xml, 'application/xml');
+    const node = doc.querySelector('graph node:first-child');
+    expect(node.id).toEqual(`${sessionA.network.nodes[0][NodePK]}`);
+    expect(node.querySelector(`[key="${NodePK}"]`)).toBe(null);
+  });
 });
diff --git a/src/utils/__tests__/__snapshots__/ExportData.test.js.snap b/src/utils/__tests__/__snapshots__/ExportData.test.js.snap
index 641761d96c..b1ce450ec5 100644
--- a/src/utils/__tests__/__snapshots__/ExportData.test.js.snap
+++ b/src/utils/__tests__/__snapshots__/ExportData.test.js.snap
@@ -4,6 +4,6 @@ exports[`export data function should create valid xml for network data 1`] = `
 "<graphml xmlns=\\"http://graphml.graphdrawing.org/xmlns\\" xmlns:xsi=\\"http://www.w3.org/2001/XMLSchema-instance\\" xsi:schemaLocation=\\"http://graphml.graphdrawing.org/xmlns
 http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd\\">
   <key id=\\"x\\" attr.name=\\"x\\" attr.type=\\"double\\" for=\\"node\\"></key><key id=\\"y\\" attr.name=\\"y\\" attr.type=\\"double\\" for=\\"node\\"></key><key id=\\"type\\" attr.name=\\"type\\" attr.type=\\"string\\" for=\\"node\\"></key><key id=\\"name\\" attr.name=\\"name\\" attr.type=\\"string\\" for=\\"node\\"></key><key id=\\"aString\\" attr.name=\\"aString\\" attr.type=\\"string\\" for=\\"node\\"></key><key id=\\"aNumber\\" attr.name=\\"aNumber\\" attr.type=\\"integer\\" for=\\"node\\"></key><key id=\\"bNumber\\" attr.name=\\"bNumber\\" attr.type=\\"double\\" for=\\"node\\"></key><key id=\\"cNumber\\" attr.name=\\"cNumber\\" attr.type=\\"double\\" for=\\"node\\"></key><key id=\\"aBoolean\\" attr.name=\\"aBoolean\\" attr.type=\\"boolean\\" for=\\"node\\"></key><key id=\\"aDatetime\\" attr.name=\\"aDatetime\\" attr.type=\\"string\\" for=\\"node\\"></key><key id=\\"aCategorical\\" attr.name=\\"aCategorical\\" attr.type=\\"string\\" for=\\"node\\"></key><key id=\\"aOrdinal\\" attr.name=\\"aOrdinal\\" attr.type=\\"integer\\" for=\\"node\\"></key><key id=\\"aLayoutX\\" attr.name=\\"aLayoutX\\" attr.type=\\"double\\" for=\\"node\\"></key><key id=\\"aLayoutY\\" attr.name=\\"aLayoutY\\" attr.type=\\"double\\" for=\\"node\\"></key><key id=\\"aLocation\\" attr.name=\\"aLocation\\" attr.type=\\"string\\" for=\\"node\\"></key><key id=\\"type\\" attr.name=\\"type\\" attr.type=\\"string\\" for=\\"edge\\"></key><key id=\\"connected\\" attr.name=\\"connected\\" attr.type=\\"boolean\\" for=\\"edge\\"></key><graph edgedefault=\\"undirected\\">
- <node id=\\"1\\"><data key=\\"type\\">person</data><data key=\\"name\\">soAndSo</data><data key=\\"aString\\">content</data><data key=\\"aNumber\\">123</data><data key=\\"bNumber\\">0.33</data><data key=\\"cNumber\\">3</data><data key=\\"aBoolean\\">true</data><data key=\\"aDatetime\\">1529349451847</data><data key=\\"aCategorical\\">24</data><data key=\\"aOrdinal\\">1</data><data key=\\"aLayoutX\\">0.4134</data><data key=\\"aLayoutY\\">0.2356</data><data key=\\"aLocation\\">{\\"latitude\\":41.799756,\\"longitude\\":-87.66443}</data><data key=\\"x\\">423.3216</data><data key=\\"y\\">587.0591999999999</data></node><node id=\\"2\\"><data key=\\"type\\">person</data><data key=\\"name\\">whoDunnit</data><data key=\\"aString\\">Another Content</data><data key=\\"aNumber\\">456</data><data key=\\"bNumber\\">1.8</data><data key=\\"cNumber\\">33</data><data key=\\"aBoolean\\">false</data><data key=\\"aDatetime\\">1529343481847</data><data key=\\"aCategorical\\">77</data><data key=\\"aOrdinal\\">2</data><data key=\\"aLayoutX\\">0.3434</data><data key=\\"aLayoutY\\">0.3156</data><data key=\\"aLocation\\">{\\"latitude\\":44.9756,\\"longitude\\":18.443}</data><data key=\\"x\\">351.6416</data><data key=\\"y\\">525.6192</data></node><node id=\\"3\\"><data key=\\"type\\">person</data><data key=\\"name\\">whatsErName</data><data key=\\"aString\\">More Content</data><data key=\\"aNumber\\">789</data><data key=\\"bNumber\\">0.43</data><data key=\\"cNumber\\">0.1</data><data key=\\"aBoolean\\">true</data><data key=\\"aDatetime\\">1579349481847</data><data key=\\"aCategorical\\">34</data><data key=\\"aOrdinal\\">-1</data><data key=\\"aLayoutX\\">0.1134</data><data key=\\"aLayoutY\\">0.7356</data><data key=\\"aLocation\\">{\\"latitude\\":13.9756,\\"longitude\\":-27.443}</data><data key=\\"x\\">116.1216</data><data key=\\"y\\">203.05919999999998</data></node><edge id=\\"1\\" source=\\"2\\" target=\\"1\\"><data key=\\"type\\">friend</data><data key=\\"connected\\">true</data></edge></graph>
+ <node id=\\"1\\"><data key=\\"type\\">person</data><data key=\\"name\\">soAndSo</data><data key=\\"aString\\">content</data><data key=\\"aNumber\\">123</data><data key=\\"bNumber\\">0.33</data><data key=\\"cNumber\\">3</data><data key=\\"aBoolean\\">true</data><data key=\\"aDatetime\\">1529349451847</data><data key=\\"aCategorical\\">24</data><data key=\\"aOrdinal\\">1</data><data key=\\"aLayoutX\\">0.4134</data><data key=\\"aLayoutY\\">0.2356</data><data key=\\"aLocation\\">{\\"latitude\\":41.799756,\\"longitude\\":-87.66443}</data><data key=\\"x\\">423.3216</data><data key=\\"y\\">587.0591999999999</data></node><node id=\\"2\\"><data key=\\"type\\">person</data><data key=\\"name\\">whoDunnit</data><data key=\\"aString\\">Another Content</data><data key=\\"aNumber\\">456</data><data key=\\"bNumber\\">1.8</data><data key=\\"cNumber\\">33</data><data key=\\"aBoolean\\">false</data><data key=\\"aDatetime\\">1529343481847</data><data key=\\"aCategorical\\">77</data><data key=\\"aOrdinal\\">2</data><data key=\\"aLayoutX\\">0.3434</data><data key=\\"aLayoutY\\">0.3156</data><data key=\\"aLocation\\">{\\"latitude\\":44.9756,\\"longitude\\":18.443}</data><data key=\\"x\\">351.6416</data><data key=\\"y\\">525.6192</data></node><node id=\\"3\\"><data key=\\"type\\">person</data><data key=\\"name\\">whatsErName</data><data key=\\"aString\\">More Content</data><data key=\\"aNumber\\">789</data><data key=\\"bNumber\\">0.43</data><data key=\\"cNumber\\">0.1</data><data key=\\"aBoolean\\">true</data><data key=\\"aDatetime\\">1579349481847</data><data key=\\"aCategorical\\">34</data><data key=\\"aOrdinal\\">-1</data><data key=\\"aLayoutX\\">0.1134</data><data key=\\"aLayoutY\\">0.7356</data><data key=\\"aLocation\\">{\\"latitude\\":13.9756,\\"longitude\\":-27.443}</data><data key=\\"x\\">116.1216</data><data key=\\"y\\">203.05919999999998</data></node><edge id=\\"0\\" source=\\"2\\" target=\\"1\\"><data key=\\"type\\">friend</data><data key=\\"connected\\">true</data></edge></graph>
  </graphml>"
 `;

From 214d0e1dcce292c24ecb27308eb46bb4f9dd7b1e Mon Sep 17 00:00:00 2001
From: Bryan Fox <git@bryfox.com>
Date: Tue, 31 Jul 2018 12:36:35 -0400
Subject: [PATCH 11/12] Ignore external primary keys on nodes

Update internal key to _uid
---
 .../development.netcanvas/protocol.json       | 66 +++++++++----------
 .../__tests__/NodeLayout.test.js              |  9 +--
 .../__snapshots__/NodeLayout.test.js.snap     | 10 +--
 .../modules/__tests__/externalData.test.js    | 23 +------
 src/ducks/modules/__tests__/network.test.js   |  6 +-
 src/ducks/modules/externalData.js             | 18 +----
 src/ducks/modules/network.js                  |  2 +-
 7 files changed, 48 insertions(+), 86 deletions(-)

diff --git a/public/protocols/development.netcanvas/protocol.json b/public/protocols/development.netcanvas/protocol.json
index 73b8e2a16a..3580e18e29 100644
--- a/public/protocols/development.netcanvas/protocol.json
+++ b/public/protocols/development.netcanvas/protocol.json
@@ -130,11 +130,6 @@
             "description": "Type",
             "type": "text"
           },
-          "studentId": {
-            "label": "Unique id for students",
-            "description": "This key is used in an external data source",
-            "type": "text"
-          },
           "uid": {
             "label": "Unique id",
             "description": "Unique id",
@@ -742,213 +737,212 @@
       ]
     },
     "schoolPupils": {
-      "nodesPrimaryKey": "studentId",
       "nodes": [
         {
-          "studentId": "person_1",
+          "uid": "person_1",
           "type": "person",
           "name": "F. Anita",
           "nickname": "Annie",
           "age": "23"
         },
         {
-          "studentId": "person_2",
+          "uid": "person_2",
           "type": "person",
           "name": "H. Barry",
           "nickname": "Baz",
           "age": "31"
         },
         {
-          "studentId": "person_3",
+          "uid": "person_3",
           "type": "person",
           "name": "Carlito",
           "nickname": "Carl",
           "age": "25"
         },
         {
-          "studentId": "person_4",
+          "uid": "person_4",
           "type": "person",
           "name": "Dee",
           "nickname": "Dee",
           "age": "72"
         },
         {
-          "studentId": "person_5",
+          "uid": "person_5",
           "type": "person",
           "name": "A. Eugine",
           "nickname": "Eu",
           "age": "27"
         },
         {
-          "studentId": "person_6",
+          "uid": "person_6",
           "type": "person",
           "name": "Gerald",
           "nickname": "Gary",
           "age": "33"
         },
         {
-          "studentId": "person_7",
+          "uid": "person_7",
           "type": "person",
           "name": "Hannah L.",
           "nickname": "Hannah",
           "age": "81"
         },
         {
-          "studentId": "person_8",
+          "uid": "person_8",
           "type": "person",
           "name": "Isabella",
           "nickname": "Izzy",
           "age": "25"
         },
         {
-          "studentId": "person_9",
+          "uid": "person_9",
           "type": "person",
           "name": "Jacob",
           "nickname": "Jake",
           "age": "52"
         },
         {
-          "studentId": "person_10",
+          "uid": "person_10",
           "type": "person",
           "name": "Kaylee",
           "nickname": "Lee",
           "age": "57"
         },
         {
-          "studentId": "person_11",
+          "uid": "person_11",
           "type": "person",
           "name": "Lily",
           "nickname": "Lil",
           "age": "93"
         },
         {
-          "studentId": "person_12",
+          "uid": "person_12",
           "type": "person",
           "name": "Michael",
           "nickname": "Mike",
           "age": "91"
         },
         {
-          "studentId": "person_13",
+          "uid": "person_13",
           "type": "person",
           "name": "Noah",
           "nickname": "Nole",
           "age": "65"
         },
         {
-          "studentId": "person_14",
+          "uid": "person_14",
           "type": "person",
           "name": "K. Olivia",
           "nickname": "Olivia",
           "age": "42"
         },
         {
-          "studentId": "person_15",
+          "uid": "person_15",
           "type": "person",
           "name": "Penelope",
           "nickname": "Nellie",
           "age": "47"
         },
         {
-          "studentId": "person_16",
+          "uid": "person_16",
           "type": "person",
           "name": "Quentin",
           "nickname": "Quinn",
           "age": "33"
         },
         {
-          "studentId": "person_17",
+          "uid": "person_17",
           "type": "person",
           "name": "Y. Randall",
           "nickname": "Randy",
           "age": "51"
         },
         {
-          "studentId": "person_18",
+          "uid": "person_18",
           "type": "person",
           "name": "Sophia",
           "nickname": "Fia",
           "age": "85"
         },
         {
-          "studentId": "person_19",
+          "uid": "person_19",
           "type": "person",
           "name": "Tatiana",
           "nickname": "Ana",
           "age": "72"
         },
         {
-          "studentId": "person_20",
+          "uid": "person_20",
           "type": "person",
           "name": "Uriel",
           "nickname": "Uri",
           "age": "17"
         },
         {
-          "studentId": "person_21",
+          "uid": "person_21",
           "type": "person",
           "name": "Vanessa",
           "nickname": "Ness",
           "age": "56"
         },
         {
-          "studentId": "person_22",
+          "uid": "person_22",
           "type": "person",
           "name": "William",
           "nickname": "Bill",
           "age": "61"
         },
         {
-          "studentId": "person_23",
+          "uid": "person_23",
           "type": "person",
           "name": "Xavier",
           "nickname": "X",
           "age": "65"
         },
         {
-          "studentId": "person_24",
+          "uid": "person_24",
           "type": "person",
           "name": "Yolanda",
           "nickname": "Landa",
           "age": "29"
         },
         {
-          "studentId": "person_25",
+          "uid": "person_25",
           "type": "person",
           "name": "T. Zoe",
           "nickname": "Zoe",
           "age": "87"
         },
         {
-          "studentId": "person_26",
+          "uid": "person_26",
           "type": "person",
           "name": "Fernando",
           "nickname": "Finn",
           "age": "63"
         },
         {
-          "studentId": "person_27",
+          "uid": "person_27",
           "type": "person",
           "name": "Daniella",
           "nickname": "Dani",
           "age": "71"
         },
         {
-          "studentId": "person_28",
+          "uid": "person_28",
           "type": "person",
           "name": "P. Samuel",
           "nickname": "Sammy",
           "age": "20"
         },
         {
-          "studentId": "person_29",
+          "uid": "person_29",
           "type": "person",
           "name": "Brooklyn",
           "nickname": "Brook",
           "age": "24"
         },
         {
-          "studentId": "person_30",
+          "uid": "person_30",
           "type": "person",
           "name": "Christopher",
           "nickname": "Topher",
diff --git a/src/containers/ConcentricCircles/__tests__/NodeLayout.test.js b/src/containers/ConcentricCircles/__tests__/NodeLayout.test.js
index 23e990878e..82d0503927 100644
--- a/src/containers/ConcentricCircles/__tests__/NodeLayout.test.js
+++ b/src/containers/ConcentricCircles/__tests__/NodeLayout.test.js
@@ -3,12 +3,13 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 import { NodeLayout } from '../NodeLayout';
+import { NodePK } from '../../../ducks/modules/network';
 
 const layout = 'foo';
 
 const mockProps = {
   nodes: [
-    { bar: 'buzz', uid: 123, [layout]: { x: 0, y: 0 } },
+    { bar: 'buzz', [NodePK]: 123, [layout]: { x: 0, y: 0 } },
   ],
   updateNode: () => {},
   toggleEdge: () => {},
@@ -47,12 +48,12 @@ describe('<NodeLayout />', () => {
 
     component.setProps({
       ...mockProps,
-      nodes: [{ bar: 'buzz', uid: 123 }],
+      nodes: [{ bar: 'buzz', [NodePK]: 123 }],
     });
 
     component.setProps({
       ...mockProps,
-      nodes: [{ bar: 'buzz', uid: 123 }, { bar: 'bing', uid: 456 }],
+      nodes: [{ bar: 'buzz', [NodePK]: 123 }, { bar: 'bing', [NodePK]: 456 }],
     });
 
     expect(componentDidUpdate.mock.calls.length).toEqual(1);
@@ -69,7 +70,7 @@ describe('<NodeLayout />', () => {
 
     component.setProps({
       ...mockProps,
-      nodes: [{ bar: 'buzz', uid: 123 }],
+      nodes: [{ bar: 'buzz', [NodePK]: 123 }],
     });
 
     component.setProps({
diff --git a/src/containers/ConcentricCircles/__tests__/__snapshots__/NodeLayout.test.js.snap b/src/containers/ConcentricCircles/__tests__/__snapshots__/NodeLayout.test.js.snap
index 8dd3d3f00f..cb85b45261 100644
--- a/src/containers/ConcentricCircles/__tests__/__snapshots__/NodeLayout.test.js.snap
+++ b/src/containers/ConcentricCircles/__tests__/__snapshots__/NodeLayout.test.js.snap
@@ -19,12 +19,12 @@ ShallowWrapper {
     nodes={
       Array [
         Object {
+          "_uid": 123,
           "bar": "buzz",
           "foo": Object {
             "x": 0,
             "y": 0,
           },
-          "uid": 123,
         },
       ]
     }
@@ -58,12 +58,12 @@ ShallowWrapper {
           linking={false}
           node={
             Object {
+              "_uid": 123,
               "bar": "buzz",
               "foo": Object {
                 "x": 0,
                 "y": 0,
               },
-              "uid": 123,
             }
           }
           onSelected={[Function]}
@@ -86,12 +86,12 @@ ShallowWrapper {
           "layoutVariable": "foo",
           "linking": false,
           "node": Object {
+            "_uid": 123,
             "bar": "buzz",
             "foo": Object {
               "x": 0,
               "y": 0,
             },
-            "uid": 123,
           },
           "onSelected": [Function],
           "selected": false,
@@ -119,12 +119,12 @@ ShallowWrapper {
             linking={false}
             node={
               Object {
+                "_uid": 123,
                 "bar": "buzz",
                 "foo": Object {
                   "x": 0,
                   "y": 0,
                 },
-                "uid": 123,
               }
             }
             onSelected={[Function]}
@@ -147,12 +147,12 @@ ShallowWrapper {
             "layoutVariable": "foo",
             "linking": false,
             "node": Object {
+              "_uid": 123,
               "bar": "buzz",
               "foo": Object {
                 "x": 0,
                 "y": 0,
               },
-              "uid": 123,
             },
             "onSelected": [Function],
             "selected": false,
diff --git a/src/ducks/modules/__tests__/externalData.test.js b/src/ducks/modules/__tests__/externalData.test.js
index 3fcec4ae82..f47697371a 100644
--- a/src/ducks/modules/__tests__/externalData.test.js
+++ b/src/ducks/modules/__tests__/externalData.test.js
@@ -1,5 +1,6 @@
 /* eslint-env jest */
 import reducer from '../externalData';
+import { NodePK } from '../network';
 
 const initialState = null;
 
@@ -24,31 +25,13 @@ describe('the externalData reducer', () => {
   it('assigns a UID to new data', () => {
     const data = { students: { nodes: [{ name: 'a' }] } };
     const newState = reducer(initialState, actionWithData(data));
-    expect(newState.students.nodes[0]).toMatchObject({ uid: expect.any(String) });
+    expect(newState.students.nodes[0]).toMatchObject({ [NodePK]: expect.any(String) });
   });
 
   it('uses consistent hashing for IDs', () => {
     const data = { students: { nodes: [{ name: 'a' }, { name: 'a' }] } };
     const newState = reducer(initialState, actionWithData(data));
-    expect(newState.students.nodes[0].uid).toBeDefined();
+    expect(newState.students.nodes[0][NodePK]).toBeDefined();
     expect(newState.students.nodes[0]).toEqual(newState.students.nodes[1]);
   });
-
-  it('preserves existing UIDs', () => {
-    const data = { students: { nodes: [{ name: 'a', uid: 54321 }] } };
-    const newState = reducer(initialState, actionWithData(data));
-    expect(newState.students.nodes[0]).toMatchObject({ uid: 54321 });
-  });
-
-  it('Copies from existing PKs if available', () => {
-    const data = { students: { nodesPrimaryKey: 'studentId', nodes: [{ name: 'a', studentId: 98765 }] } };
-    const newState = reducer(initialState, actionWithData(data));
-    expect(newState.students.nodes[0]).toMatchObject({ uid: 98765, studentId: 98765 });
-  });
-
-  it('Generates UID if custom PK missing', () => {
-    const data = { students: { nodesPrimaryKey: 'studentId', nodes: [{ name: 'a' }] } };
-    const newState = reducer(initialState, actionWithData(data));
-    expect(newState.students.nodes[0]).toMatchObject({ uid: expect.any(String) });
-  });
 });
diff --git a/src/ducks/modules/__tests__/network.test.js b/src/ducks/modules/__tests__/network.test.js
index 235104890b..fea8f45fdb 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,
-          [PK]: 2,
+          uid: 2,
         },
       ),
     ).toEqual({
@@ -121,7 +121,7 @@ describe('network reducer', () => {
       },
       {
         type: actionTypes.TOGGLE_NODE_ATTRIBUTES,
-        [PK]: 1,
+        uid: 1,
         attributes: { stage: 1 },
       },
     );
@@ -136,7 +136,7 @@ describe('network reducer', () => {
       },
       {
         type: actionTypes.TOGGLE_NODE_ATTRIBUTES,
-        [PK]: 2,
+        uid: 2,
         attributes: { stage: 1 },
       },
     );
diff --git a/src/ducks/modules/externalData.js b/src/ducks/modules/externalData.js
index 47f4783b22..2452bc2809 100644
--- a/src/ducks/modules/externalData.js
+++ b/src/ducks/modules/externalData.js
@@ -5,22 +5,14 @@ import { NodePK } from './network';
 
 const initialState = null;
 
-// Name of the property a protocol uses to define a PK field on external data
-// Example:
-//   "schoolPupils": { "nodesPrimaryKey": "studentId", "nodes": [...] }
-const customPKProp = 'nodesPrimaryKey';
-
 /**
  * @private
  * All external data nodes must be identified in the app with a primary key (== NodePK).
- * Each external data source may define its own primary key (in protocol.json).
- * This function makes no restrictions on the data type of custom primary keys.
  *
  * For each object in an external data set's collection of nodes:
  * - If the object is missing a PK, we assign it one (to the [NodePK] prop)
  *   + The assigned PK is equal to the hash of the object contents, so is consistent across imports
  *   + A PK is missing if it is falsy, and not equal to 0. (`0` is allowed as an identifier.)
- * - If the object has a PK, but uses a custom prop for PK, we copy the PK value to [NodePK]
  */
 const dataWithNodePKs = (externalData) => {
   const cleanedData = {};
@@ -29,17 +21,9 @@ const dataWithNodePKs = (externalData) => {
   }
   Object.entries(externalData).forEach(([key, val]) => {
     if (val.nodes) {
-      const pkName = val[customPKProp] || NodePK;
       cleanedData[key] = {
         ...val,
-        nodes: val.nodes.map((node) => {
-          if (!node[pkName] && node[pkName] !== 0) {
-            return { ...node, [NodePK]: objectHash(node) };
-          } else if (pkName !== NodePK) {
-            return { ...node, [NodePK]: node[pkName] };
-          }
-          return node;
-        }),
+        nodes: val.nodes.map(node => ({ ...node, [NodePK]: objectHash(node) })),
       };
     } else {
       cleanedData[key] = val;
diff --git a/src/ducks/modules/network.js b/src/ducks/modules/network.js
index 92d3741e4c..a905d60a34 100644
--- a/src/ducks/modules/network.js
+++ b/src/ducks/modules/network.js
@@ -3,7 +3,7 @@ import { reject, findIndex, isMatch, omit } from 'lodash';
 import uuidv4 from '../../utils/uuid';
 
 // Primary key used on node data
-export const NodePK = 'uid';
+export const NodePK = '_uid';
 
 export const ADD_NODES = 'ADD_NODES';
 export const REMOVE_NODE = 'REMOVE_NODE';

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 12/12] 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,
   });
 };