Merge branch 'candidate' into GH-1964-drop-third-form-column

.github/renovate.json

@@ -19,7 +19,8 @@
       "allowedVersions": "/^.*\\.jre8$/"
     },
     {
-      "packageNames": ["autoprefixer", "draft-js", "leaflet", "fullcalendar"],
+      "packageNames": ["autoprefixer", "draft-js", "leaflet", "react-tooltip"],
+      "packagePatterns": ["^@fullcalendar/"],
       "enabled": false
     }
   ],

.github/workflows/build-gradle.yml

@@ -25,20 +25,22 @@ jobs:
         channel: anet-notifications
         status: STARTED
         color: warning
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
     - uses: actions/setup-java@v1
       with:
         java-version: 1.8
     - run: echo "CHROMEDRIVER_FILEPATH=$CHROMEWEBDRIVER/chromedriver" >> $GITHUB_ENV
     - name: cache gradle
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
         restore-keys: |
           ${{ runner.os }}-gradle-
     - name: cache node
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: ./client/node_modules/.cache
         key: ${{ runner.os }}-node
@@ -49,7 +51,7 @@ jobs:
       id: yarn-cache-dir-path
       run: echo "::set-output name=dir::$(./gradlew -q yarn_cache_dir)"
     - name: cache yarn
-      uses: actions/cache@v1
+      uses: actions/cache@v2
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
         key: ${{ runner.os }}-yarn-${{ hashFiles('client/yarn.lock') }}
@@ -105,18 +107,22 @@ jobs:
         channel: anet-notifications
         status: STARTED
         color: warning
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
     - uses: actions/setup-java@v1
       with:
         java-version: 1.8
     - run: echo "CHROMEDRIVER_FILEPATH=$CHROMEWEBDRIVER/chromedriver" >> $GITHUB_ENV
-    - uses: actions/cache@v1
+    - name: cache gradle
+      uses: actions/cache@v2
       with:
         path: ~/.gradle/caches
         key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
         restore-keys: |
           ${{ runner.os }}-gradle-
-    - uses: actions/cache@v1
+    - name: cache node
+      uses: actions/cache@v2
       with:
         path: ./client/node_modules/.cache
         key: ${{ runner.os }}-node
@@ -126,7 +132,8 @@ jobs:
     - name: Get yarn cache directory path
       id: yarn-cache-dir-path
       run: echo "::set-output name=dir::$(./gradlew -q yarn_cache_dir)"
-    - uses: actions/cache@v1
+    - name: cache yarn
+      uses: actions/cache@v2
       with:
         path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
         key: ${{ runner.os }}-yarn-${{ hashFiles('client/yarn.lock') }}

.github/workflows/shiftleft-analysis.yml

@@ -11,7 +11,7 @@ jobs:
     # Scan runs on ubuntu, mac and windows
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v2
     # Instructions
     # 1. Setup JDK, Node.js, Python etc depending on your project type
     # 2. Compile or build the project before invoking scan

build.gradle

@@ -60,21 +60,21 @@ repositories {
 // In this section you declare the dependencies for your production and test code
 dependencies {
 	// The production code uses the SLF4J logging API at compile time
-	implementation 'io.dropwizard:dropwizard-core:2.0.15'
-	implementation 'io.dropwizard:dropwizard-jdbi3:2.0.15'
-	implementation 'io.dropwizard:dropwizard-migrations:2.0.15'
-	implementation 'io.dropwizard:dropwizard-auth:2.0.15'
-	implementation 'io.dropwizard:dropwizard-views-freemarker:2.0.15'
+	implementation 'io.dropwizard:dropwizard-core:2.0.16'
+	implementation 'io.dropwizard:dropwizard-jdbi3:2.0.16'
+	implementation 'io.dropwizard:dropwizard-migrations:2.0.16'
+	implementation 'io.dropwizard:dropwizard-auth:2.0.16'
+	implementation 'io.dropwizard:dropwizard-views-freemarker:2.0.16'
 	implementation 'io.dropwizard-bundles:dropwizard-configurable-assets-bundle:1.3.5'
 
-	implementation 'ru.vyarus.guicey:guicey-jdbi3:5.1.0-2'
+	implementation 'ru.vyarus.guicey:guicey-jdbi3:5.2.0-1'
 	implementation 'com.google.guava:guava:30.0-jre' // Pick the non-Android version of Guice
 	implementation 'commons-collections:commons-collections:3.2.2'
 
 	// Supported databases:
 	implementation 'com.microsoft.sqlserver:mssql-jdbc:8.4.1.jre8'
 	implementation 'org.postgresql:postgresql:42.2.18' // If using postgresql
-	implementation 'org.liquibase:liquibase-core:4.2.0'
+	implementation 'org.liquibase:liquibase-core:4.2.1'
 
 	// For caching domain users (used in every request in the AuthenticationFilter)
 	implementation 'org.ehcache:ehcache:3.9.0'
@@ -94,7 +94,7 @@ dependencies {
 	// Used for converting GraphQL request output to XML:
 	implementation 'com.github.javadev:underscore-lodash:1.26'
 	// For JSON schema validation
-	implementation 'com.networknt:json-schema-validator:1.0.44'
+	implementation 'com.networknt:json-schema-validator:1.0.45'
 
 	// used for writing Excel documents
 	implementation 'org.apache.poi:poi:4.1.2'
@@ -106,8 +106,8 @@ dependencies {
 	// For fast and simple image scaling
 	implementation 'net.coobird:thumbnailator:0.4.13'
 
-	testImplementation 'io.dropwizard:dropwizard-testing:2.0.15'
-	testImplementation 'io.dropwizard:dropwizard-client:2.0.15'
+	testImplementation 'io.dropwizard:dropwizard-testing:2.0.16'
+	testImplementation 'io.dropwizard:dropwizard-client:2.0.16'
 	testImplementation 'org.apache.commons:commons-io:1.3.2'
 
 	testImplementation 'org.assertj:assertj-core:3.18.1'

client/.storybook/preview.js

@@ -2,5 +2,12 @@ import "bootstrap/dist/css/bootstrap.css"
 import "index.css"
 
 export const parameters = {
-  actions: { argTypesRegex: "^on[A-Z].*" }
+  actions: { argTypesRegex: "^on[A-Z].*" },
+  options: {
+    // Sort stories alphabetically
+    storySort: (a, b) =>
+      a[1].kind === b[1].kind
+        ? 0
+        : a[1].id.localeCompare(b[1].id, undefined, { numeric: true })
+  }
 }

client/config/wdio.config.js

@@ -140,7 +140,7 @@ const config = {
   mochaOpts: {
     ui: "bdd",
     compilers: ["js:@babel/register"],
-    timeout: 90000
+    timeout: 180000
   },
   //
   // =====

client/config/webpack.common.js

@@ -1,4 +1,5 @@
 const merge = require("webpack-merge")
+const CircularDependencyPlugin = require("circular-dependency-plugin")
 const ContextReplacementPlugin = require("webpack/lib/ContextReplacementPlugin")
 const CopyWebpackPlugin = require("copy-webpack-plugin")
 const webpack = require("webpack")
@@ -101,6 +102,17 @@ module.exports = {
       new webpack.DefinePlugin({
         "process.env.NODE_ENV": JSON.stringify(process.env.NODE_ENV)
       }),
+      new CircularDependencyPlugin({
+        // exclude detection of files based on a RegExp
+        exclude: /node_modules/,
+        // add errors to webpack instead of warnings
+        failOnError: true,
+        // allow import cycles that include an asyncronous import,
+        // e.g. via import(/* webpackMode: "weak" */ './file.js')
+        allowAsyncCycles: false,
+        // set the current working directory for displaying module paths
+        cwd: process.cwd()
+      }),
       new ContextReplacementPlugin(/moment[\\/]locale$/, /^\.\/(en)$/),
       new CopyWebpackPlugin({
         patterns: [{ from: "public", globOptions: { ignore: ["index.html"] } }]

client/package.json

@@ -4,7 +4,7 @@
   "private": true,
   "homepage": "/assets/client",
   "devDependencies": {
-    "@babel/core": "7.12.3",
+    "@babel/core": "7.12.9",
     "@babel/eslint-parser": "7.12.1",
     "@babel/plugin-proposal-class-properties": "7.12.1",
     "@babel/plugin-proposal-decorators": "7.12.1",
@@ -15,49 +15,50 @@
     "@babel/plugin-proposal-json-strings": "7.12.1",
     "@babel/plugin-proposal-logical-assignment-operators": "7.12.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.12.1",
-    "@babel/plugin-proposal-numeric-separator": "7.12.5",
-    "@babel/plugin-proposal-optional-chaining": "7.12.1",
+    "@babel/plugin-proposal-numeric-separator": "7.12.7",
+    "@babel/plugin-proposal-optional-chaining": "7.12.7",
     "@babel/plugin-proposal-pipeline-operator": "7.12.1",
     "@babel/plugin-proposal-throw-expressions": "7.12.1",
     "@babel/plugin-syntax-dynamic-import": "7.8.3",
     "@babel/plugin-syntax-import-meta": "7.10.4",
     "@babel/plugin-transform-proto-to-assign": "7.12.1",
-    "@babel/preset-react": "7.12.5",
+    "@babel/preset-react": "7.12.7",
     "@babel/register": "7.12.1",
     "@babel/runtime": "7.12.5",
-    "@storybook/addon-essentials": "6.0.28",
-    "@storybook/addon-links": "6.0.28",
-    "@storybook/react": "6.0.28",
+    "@storybook/addon-essentials": "6.1.10",
+    "@storybook/addon-links": "6.1.10",
+    "@storybook/react": "6.1.10",
     "@testing-library/jest-dom": "5.11.6",
-    "@testing-library/react": "11.1.2",
-    "@wdio/browserstack-service": "6.8.0",
-    "@wdio/cli": "6.8.1",
-    "@wdio/local-runner": "6.8.1",
-    "@wdio/mocha-framework": "6.8.0",
+    "@testing-library/react": "11.2.2",
+    "@wdio/browserstack-service": "6.10.4",
+    "@wdio/cli": "6.10.5",
+    "@wdio/local-runner": "6.10.5",
+    "@wdio/mocha-framework": "6.10.4",
     "@wdio/spec-reporter": "6.8.1",
-    "@wdio/sync": "6.8.0",
+    "@wdio/sync": "6.10.4",
     "aigle": "1.14.1",
     "autoprefixer": "9.8.6",
-    "ava": "3.13.0",
+    "ava": "3.14.0",
     "babel-jest": "26.6.3",
-    "babel-loader": "8.2.1",
+    "babel-loader": "8.2.2",
     "babel-preset-react-app": "10.0.0",
     "cache-loader": "4.1.0",
     "chai": "4.2.0",
     "chalk": "4.1.0",
-    "chromedriver": "86.0.0",
+    "chromedriver": "87.0.2",
+    "circular-dependency-plugin": "5.2.2",
     "clean-webpack-plugin": "3.0.0",
     "colors": "1.4.0",
-    "config": "3.3.2",
-    "copy-webpack-plugin": "6.3.1",
+    "config": "3.3.3",
+    "copy-webpack-plugin": "6.4.0",
     "countries-list": "2.5.6",
     "cross-fetch": "3.0.6",
     "cross-spawn": "7.0.3",
     "css-loader": "5.0.1",
     "dotenv": "8.2.0",
-    "eslint": "7.13.0",
+    "eslint": "7.15.0",
     "eslint-config-react-app": "6.0.0",
-    "eslint-config-standard": "16.0.1",
+    "eslint-config-standard": "16.0.2",
     "eslint-config-standard-react": "11.0.1",
     "eslint-loader": "4.0.2",
     "eslint-plugin-chai-expect": "2.2.0",
@@ -76,23 +77,23 @@
     "handlebars-loader": "1.7.1",
     "html-loader": "1.3.2",
     "html-webpack-plugin": "4.5.0",
-    "i18n-iso-countries": "6.2.2",
+    "i18n-iso-countries": "6.3.0",
     "ignore-loader": "0.1.2",
     "jest": "26.6.3",
-    "js-yaml": "3.14.0",
+    "js-yaml": "3.14.1",
     "json-loader": "0.5.7",
     "moment-timezone": "0.5.32",
-    "postcss": "8.1.7",
-    "postcss-flexbugs-fixes": "4.2.1",
-    "postcss-loader": "4.0.4",
-    "prettier": "2.1.2",
+    "postcss": "8.2.0",
+    "postcss-flexbugs-fixes": "5.0.2",
+    "postcss-loader": "4.1.0",
+    "prettier": "2.2.1",
     "react-is": "16.13.1",
     "react-test-renderer": "16.14.0",
-    "selenium-webdriver": "4.0.0-alpha.7",
+    "selenium-webdriver": "4.0.0-alpha.8",
     "style-loader": "2.0.0",
     "thread-loader": "3.0.1",
     "wdio-chromedriver-service": "6.0.4",
-    "webdriverio": "6.8.1",
+    "webdriverio": "6.10.5",
     "webpack": "4.44.2",
     "webpack-cli": "4.2.0",
     "webpack-dev-server": "3.11.0",
@@ -103,37 +104,37 @@
     "@apollo/react-hooks": "3.1.5",
     "@blueprintjs/core": "3.36.0",
     "@blueprintjs/datetime": "3.20.0",
-    "@emotion/core": "10.1.1",
-    "@emotion/styled": "10.0.27",
+    "@emotion/react": "11.1.2",
+    "@emotion/styled": "11.0.0",
     "@fullcalendar/core": "4.4.2",
     "@fullcalendar/daygrid": "4.4.2",
     "@fullcalendar/interaction": "4.4.2",
     "@fullcalendar/list": "4.4.2",
     "@fullcalendar/react": "4.4.2",
     "@fullcalendar/timegrid": "4.4.2",
-    "@projectstorm/react-diagrams-core": "6.2.0",
-    "@projectstorm/react-diagrams-defaults": "6.2.0",
-    "@projectstorm/react-diagrams-routing": "6.2.0",
+    "@projectstorm/react-diagrams-core": "6.3.0",
+    "@projectstorm/react-diagrams-defaults": "6.3.0",
+    "@projectstorm/react-diagrams-routing": "6.3.0",
     "apollo-boost": "0.4.9",
     "bootstrap": "3.4.1",
-    "change-case": "4.1.1",
+    "change-case": "4.1.2",
     "classnames": "2.2.6",
     "closest": "0.0.1",
-    "core-js": "3.7.0",
-    "d3": "6.2.0",
+    "core-js": "3.8.1",
+    "d3": "6.3.0",
     "dagre": "0.8.5",
     "draft-convert": "2.1.10",
     "draft-js": "0.10.5",
     "draft-js-buttons": "2.0.2",
     "draft-js-side-toolbar-plugin": "3.0.2",
     "draftail": "1.3.0",
     "email-addresses": "3.1.0",
-    "file-saver": "2.0.2",
+    "file-saver": "2.0.5",
     "formik": "2.2.5",
-    "graphiql": "1.0.6",
+    "graphiql": "1.1.0",
     "graphql": "15.4.0",
     "hopscotch": "0.3.1",
-    "html-react-parser": "0.14.1",
+    "html-react-parser": "0.14.2",
     "jsonpath-plus": "4.0.0",
     "leaflet": "1.6.0",
     "leaflet-defaulticon-compatibility": "0.1.1",
@@ -142,7 +143,6 @@
     "leaflet.markercluster": "1.4.1",
     "locale-compare-polyfill": "0.0.2",
     "lodash": "4.17.20",
-    "mathjs": "7.6.0",
     "mgrs": "1.0.0",
     "milsymbol": "2.0.0",
     "ml-matrix": "6.5.3",
@@ -166,16 +166,16 @@
     "react-router-dom": "5.2.0",
     "react-scroll": "1.8.1",
     "react-svg-text": "0.1.2",
-    "react-tag-input": "6.4.3",
-    "react-toastify": "6.1.0",
+    "react-tag-input": "6.4.6",
+    "react-toastify": "6.2.0",
     "react-tooltip": "4.2.10",
     "react-ultimate-pagination": "1.2.0",
     "react-use-dimensions": "1.2.1",
     "redux": "4.0.5",
     "redux-persist": "6.0.0",
     "resize-observer-polyfill": "1.5.1",
     "use-debounce": "5.1.0",
-    "yup": "0.29.3"
+    "yup": "0.31.0"
   },
   "resolutions": {
     "leaflet": "1.6.0"
@@ -284,7 +284,6 @@
       "standard"
     ],
     "rules": {
-      "default-param-last": "off",
       "eqeqeq": [
         "error",
         "always"