Merge branch 'master' into dependabot/npm_and_yarn/deep-object-diff-1.1.9

Author: jthrilly

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,7 @@ on:
 jobs:
   analyze:
     name: Analyze
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     permissions:
       actions: read
       contents: read

.github/workflows/dist.yml

@@ -9,12 +9,15 @@ on:
 
 jobs:
   dist:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-
+      # Set python version to 2.x due to node-gyp and sass
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '2.7.18'
       # Set node version
       - uses: actions/setup-node@v2
         with:

.github/workflows/main.yml

@@ -9,12 +9,15 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-
+      # Set python version to 2.x due to node-gyp and sass
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '2.7.18'
       # Set node version
       - uses: actions/setup-node@v2
         with:
@@ -43,12 +46,15 @@ jobs:
 
   build:
     needs: test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: recursive
-
+      # Set python version to 2.x due to node-gyp and sass
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '2.7.18'
       # Set node version
       - uses: actions/setup-node@v2
         with:

SECURITY.md

@@ -8,4 +8,4 @@ Security updates will only be issued for the most recent version(s) of the softw
 
 ## Reporting a Vulnerability
 
-To report a security issue to us, please contact info@networkcanvas.com. We will work with you to resolve the issue.
+To report a security issue to us, please help us to troubleshoot it by creating a topic on our [community page](https://community.networkcanvas.com). We will work with you to resolve the issue.

config.xml

@@ -1,8 +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.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">
+<widget android-versionCode="6229" id="org.codaco.NetworkCanvasInterviewer6" ios-CFBundleIdentifier="org.codaco.networkCanvasInterviewerBusiness" ios-CFBundleVersion="6229" 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">
   <name>Network Canvas Interviewer</name>
   <description>
         A tool for conducting Network Canvas Interviews.
@@ -35,6 +32,15 @@
     <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/supports-screens">
       <supports-screens android:anyDensity="false" android:largeScreens="true" android:normalScreens="false" android:requiresSmallestWidthDp="600" android:resizeable="false" android:smallScreens="false" android:xlargeScreens="true"/>
     </edit-config>
+    <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application/activity">
+      <activity android:exported="true"/>
+    </edit-config>
+    <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application/provider">
+      <provider android:exported="true"/>
+    </edit-config>
+    <edit-config file="app/src/main/AndroidManifest.xml" mode="merge" target="/manifest/application/receiver">
+      <receiver android:exported="true"/>
+    </edit-config>
   </platform>
   <platform name="ios">
     <allow-navigation href="*"/>
@@ -76,11 +82,9 @@
   <preference name="iosPersistentFileLocation" value="Library"/>
   <preference name="AllowInlineMediaPlayback" value="true"/>
   <preference name="android-minSdkVersion" value="24"/>
-  <preference name="android-targetSdkVersion" value="30"/>
+  <preference name="android-targetSdkVersion" value="31"/>
   <plugin name="cordova-plugin-file-transfer" spec="^1.7.1"/>
-  <plugin name="cordova-plugin-whitelist" spec="^1.3.3"/>
   <plugin name="cordova-plugin-device" spec="^2.0.2"/>
-  <plugin name="cordova-plugin-x-socialsharing" spec="^5.6.4"/>
   <plugin name="cordova-plugin-zeroconf" spec="^1.4.1"/>
   <plugin name="cordova-plugin-ionic-keyboard" spec="^2.2.0"/>
   <plugin name="cordova-plugin-inappbrowser" spec="~4.0.0"/>
@@ -90,5 +94,4 @@
   <plugin name="cordova-plugin-network-canvas-client" spec="https://github.com/complexdatacollective/cordova-plugin-network-canvas-client.git"/>
   <plugin name="cordova-sqlite-storage" spec="6.0.0"/>
   <engine name="ios" spec="~5.1.1"/>
-  <engine name="android" spec="~8.1.0"/>
-</widget>
+</widget>

package-lock.json

@@ -77,10 +77,13 @@
     "connected-react-router": "^6.8.0",
     "cordova-android": "~8.1.0",
     "cordova-ios": "~5.1.1",
+    "cordova-plugin-androidx-adapter": "~1.1.3",
     "cordova-plugin-app-version": "~0.1.14",
     "cordova-plugin-file": "~5.0.0",
     "cordova-plugin-ionic-keyboard": "2.2.0",
+    "cordova-plugin-keyboard": "~1.2.0",
     "cordova-plugin-network-canvas-client": "github:complexdatacollective/cordova-plugin-network-canvas-client",
+    "cordova-plugin-x-socialsharing-android12": "~6.0.5",
     "cross-env": "^5.2.0",
     "css-loader": "^3.4.2",
     "csvtojson": "^2.0.8",
@@ -95,7 +98,7 @@
     "enzyme": "^3.11.0",
     "enzyme-adapter-react-16": "^1.6.0",
     "enzyme-to-json": "^3.4.3",
-    "es6-promise-plugin": "^4.2.2",
+    "es6-promise-plugin": "~4.2.2",
     "eslint": "^7.0.0",
     "eslint-config-airbnb": "^18.2.1",
     "eslint-config-react-app": "^6.0.0",
@@ -306,18 +309,19 @@
       "cordova-plugin-ionic-keyboard": {},
       "cordova-plugin-fullscreen": {},
       "cordova-plugin-zeroconf": {},
-      "cordova-plugin-x-socialsharing": {
-        "ANDROID_SUPPORT_V4_VERSION": "24.1.1+",
-        "PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION": "This app requires photo library access to function properly.",
-        "PHOTO_LIBRARY_USAGE_DESCRIPTION": "This app requires photo library access to function properly."
-      },
       "cordova-plugin-inappbrowser": {},
       "cordova-plugin-chooser": {},
       "cordova-plugin-network-information": {},
       "cordova-plugin-wkwebview-engine": {},
       "cordova-plugin-network-canvas-client": {},
       "cordova-sqlite-storage": {},
-      "cordova-plugin-file": {}
+      "cordova-plugin-file": {},
+      "cordova-plugin-keyboard": {},
+      "cordova-plugin-x-socialsharing-android12": {
+        "PHOTO_LIBRARY_ADD_USAGE_DESCRIPTION": "This app requires photo library access to function properly.",
+        "PHOTO_LIBRARY_USAGE_DESCRIPTION": "This app requires photo library access to function properly."
+      },
+      "cordova-plugin-androidx-adapter": {}
     }
   }
-}
+}

package.json

@@ -1,7 +1,7 @@
 const PROTOCOL_EXTENSION = '.netcanvas';
 
 // Target protocol schema version. Used to determine compatibility & migration
-const APP_SCHEMA_VERSION = 8;
+const APP_SCHEMA_VERSION = 7;
 
 const DEVICE_API_VERSION = '2'; // X-Device-API-Version
 

src/config.js

@@ -26,12 +26,12 @@ const fadeVariants = {
 };
 
 const optionsVariants = {
-  show: { opacity: 1, transition: { delay: 0.35, duration: 0.25 } },
-  hide: { opacity: 0, transition: { delay: 0.35, duration: 0.25 } },
+  show: { opacity: 1, transition: { delay: 0.15, duration: 0.25 } },
+  hide: { opacity: 0, transition: { delay: 0.15, duration: 0.25 } },
 };
 
 const choiceVariants = {
-  show: { opacity: 1, translateY: '0%', transition: { delay: 0.25, type: 'spring' } },
+  show: { opacity: 1, translateY: '0%', transition: { delay: 0.15, type: 'spring' } },
   hide: { opacity: 0, translateY: '120%' },
 };
 

src/containers/Interfaces/DyadCensus/DyadCensus.js

@@ -8,7 +8,7 @@ const animationTarget = -50;
 
 const pairTransition = {
   duration: 0.5,
-  delay: 0.35,
+  delay: 0.15,
   when: 'afterChildren',
 };