Merge pull request #1212 from complexdatacollective/feature/two-mode-sociogram-2

Feature/two mode sociogram 2

Author: jthrilly

babel.config.js

@@ -12,5 +12,6 @@ module.exports = {
       },
     ],
     '@babel/plugin-proposal-json-strings',
+    '@babel/plugin-proposal-nullish-coalescing-operator',
   ],
 };

config.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<widget android-versionCode="6199" id="org.codaco.NetworkCanvasInterviewer6" ios-CFBundleIdentifier="org.codaco.networkCanvasInterviewerBusiness" ios-CFBundleVersion="6199" version="6.3.2"
+<widget android-versionCode="6199" id="org.codaco.NetworkCanvasInterviewer6" ios-CFBundleIdentifier="org.codaco.networkCanvasInterviewerBusiness" ios-CFBundleVersion="6199" version="6.4.0"
   xmlns="http://www.w3.org/ns/widgets"
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:cdv="http://cordova.apache.org/ns/1.0">

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "network-canvas-interviewer",
-  "version": "6.3.2",
+  "version": "6.4.0",
   "productName": "Network Canvas Interviewer",
   "description": "A tool for conducting Network Canvas Interviews.",
   "author": "Complex Data Collective",
@@ -21,7 +21,7 @@
     "build:ios": "cross-env NC_TARGET_PLATFORM=ios node scripts/build.js && cordova prepare ios",
     "lint": "eslint src && eslint public",
     "sass-lint": "sass-lint -vc .sass-lint.yml",
-    "test": "node scripts/test.js --env=jsdom",
+    "test": "node scripts/test.js",
     "test:integration": "cross-env TEST_ENV=development jest --config=integration-tests/jest.config.js --runInBand",
     "test:integration:ci": "jest --config=integration-tests/jest.config.js --runInBand",
     "test:integration:docker": "docker-compose run integration_tests",
@@ -48,6 +48,7 @@
     "@babel/eslint-parser": "~7.13.10",
     "@babel/plugin-proposal-class-properties": "7.7.4",
     "@babel/plugin-proposal-json-strings": "7.7.4",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "~7.18.6",
     "@babel/plugin-syntax-dynamic-import": "7.7.4",
     "@babel/plugin-syntax-import-meta": "7.7.4",
     "@babel/preset-env": "7.10.4",
@@ -277,7 +278,7 @@
       "<rootDir>/integration-tests",
       "<rootDir>/platforms"
     ],
-    "testEnvironment": "node",
+    "testEnvironment": "jsdom",
     "testURL": "http://localhost",
     "transform": {
       "/node_modules/(?!codaco/ui).+\\.js$": "<rootDir>/node_modules/babel-jest",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "network-canvas-interviewer",
-  "version": "6.3.2",
+  "version": "6.4.0",
   "productName": "Network Canvas Interviewer",
   "description": "A tool for conducting Network Canvas Interviews.",
   "author": "Complex Data Collective",

public/package.json

@@ -1,6 +1,6 @@
 import { connect } from 'react-redux';
-import { get } from 'lodash';
 import { getAssetManifest } from '../selectors/protocol';
+import { get } from '../utils/lodash-replacements';
 
 const mapStateToProps = (state, { asset }) => {
   const assetManifest = getAssetManifest(state);

src/behaviours/AssetMetaProvider.js

@@ -116,7 +116,7 @@ const dragSource = (WrappedComponent) => ({
         allowDrag={allowDrag}
         scrollDirection={scrollDirection}
       />
-      { preview && (
+      {preview && (
         <div
           ref={previewRef}
           style={{

src/behaviours/DragAndDrop/DragSource.js

@@ -3,9 +3,9 @@ import {
   compose, lifecycle, withState, setPropTypes, mapProps,
 } from 'recompose';
 import PropTypes from 'prop-types';
-import { get } from 'lodash';
 import { getAssetManifest } from '../selectors/protocol';
 import getMediaAssetUrl from '../utils/protocol/getMediaAssetUrl';
+import { get } from '../utils/lodash-replacements';
 
 // curry asset fetcher with protocol path from state
 const mapStateToProps = (state) => ({

src/behaviours/injectAssetUrl.js

@@ -2,10 +2,10 @@ import React, { Component } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import PropTypes from 'prop-types';
-import { get } from 'lodash';
 import { actionCreators as sessionsActions } from '../ducks/modules/sessions';
 import { getPromptIndexForCurrentSession } from '../selectors/session';
 import { getProtocolStages } from '../selectors/protocol';
+import { get } from '../utils/lodash-replacements';
 
 export default function withPrompt(WrappedComponent) {
   class WithPrompt extends Component {

src/behaviours/withPrompt.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { map, isEqual } from 'lodash';
 import ConcaveMan from 'concaveman';
-import { entityAttributesProperty } from '../../ducks/modules/network';
+import { entityAttributesProperty } from '@codaco/shared-consts';
 
 export class ConvexHull extends Component {
   shouldComponentUpdate(nextProps) {