Merge pull request #615 from codaco/feature/ensure-uids

Ensure uids exist for all nodes in app
complexdatacollective · Aug 1, 2018 · 7388bc3 · 7388bc3
2 parents 522e307 + fc316d8
commit 7388bc3
Show file tree

Hide file tree

Showing 46 changed files with 320 additions and 445 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git 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": ".",

diff --git 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
@@ -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);
 
@@ -23,7 +24,7 @@ const CardList = (props) => {
     onDeleteCard,
     onToggleCard,
     selected,
-    uid,
+    getKey,
   } = props;
 
   const classNames = cx('card-list', className);
@@ -32,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}
@@ -62,7 +63,7 @@ CardList.propTypes = {
   onDeleteCard: PropTypes.func,
   onToggleCard: PropTypes.func,
   selected: PropTypes.func,
-  uid: PropTypes.func,
+  getKey: PropTypes.func,
 };
 
 CardList.defaultProps = {
@@ -75,7 +76,7 @@ CardList.defaultProps = {
   onDeleteCard: null,
   onToggleCard: () => {},
   selected: () => false,
-  uid: node => node.uid,
+  getKey: node => node[NodePK],
 };
 
 export default compose(

diff --git 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/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
@@ -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, NodePK, 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
@@ -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));
 
@@ -92,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;
 
@@ -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}
               >