Merge branch 'candidate-2.1' into GH-1243

build.gradle

@@ -61,7 +61,7 @@ dependencies {
 	// For JSON schema validation
 	compile 'com.github.everit-org.json-schema:org.everit.json.schema:1.11.0'
 
-	compile 'com.microsoft.sqlserver:mssql-jdbc:7.2.0.jre8'
+	compile 'com.microsoft.sqlserver:mssql-jdbc:7.2.1.jre8'
 
 	// used for writing Excel documents
 	compile group: 'org.apache.poi', name: 'poi', version: '4.0.1'
@@ -311,7 +311,7 @@ buildscript {
 	}
 	dependencies {
 		classpath "org.kordamp:markdown-gradle-plugin:1.2.0"
-		classpath 'com.bmuschko:gradle-docker-plugin:4.4.0'
+		classpath 'com.bmuschko:gradle-docker-plugin:4.4.1'
 		classpath "com.moowork.gradle:gradle-node-plugin:1.2.0"
 	}
 }

client/package.json

@@ -5,7 +5,7 @@
   "proxy": "http://localhost:8080",
   "homepage": "/assets/client",
   "devDependencies": {
-    "artillery": "^1.6.0-24",
+    "artillery": "^1.6.0-27",
     "autobind-decorator": "^2.4.0",
     "autoprefixer": "^9.4.7",
     "ava": "^0.25.0",
@@ -27,18 +27,17 @@
     "css-loader": "^2.1.0",
     "dotenv": "^6.2.0",
     "eslint": "^4.18.2",
-    "eslint-config-react-app": "^3.0.6",
+    "eslint-config-react-app": "^3.0.7",
     "eslint-loader": "^2.0.0",
     "eslint-plugin-flowtype": "^2.50.3",
     "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-jsx-a11y": "^6.2.1",
     "eslint-plugin-react": "^7.12.4",
     "faker": "^4.1.0",
     "file-loader": "^3.0.1",
-    "formik": "^1.4.3",
-    "git-describe": "^4.0.3",
+    "git-describe": "^4.0.4",
     "graphql-cli": "^3.0.9",
-    "handlebars": "^4.0.12",
+    "handlebars": "^4.1.0",
     "handlebars-loader": "^1.7.1",
     "html-loader": "^0.5.5",
     "html-webpack-plugin": "^3.0.7",
@@ -47,7 +46,7 @@
     "json-loader": "^0.5.7",
     "postcss-flexbugs-fixes": "^4.1.0",
     "postcss-loader": "^3.0.0",
-    "react-test-renderer": "^16.7.0",
+    "react-test-renderer": "^16.8.2",
     "selenium-webdriver": "^4.0.0-alpha.1",
     "style-loader": "^0.23.1",
     "uuid": "^3.3.2",
@@ -57,25 +56,26 @@
     "wdio-mocha-framework": "^0.6.4",
     "wdio-spec-reporter": "^0.1.5",
     "webdriverio": "^4.14.1",
-    "webpack": "^4.29.2",
+    "webpack": "^4.29.5",
     "webpack-cleanup-plugin": "^0.5.1",
     "webpack-cli": "^3.2.3",
     "webpack-dev-server": "^3.1.14",
     "webpack-merge": "^4.2.1"
   },
   "dependencies": {
-    "@blueprintjs/core": "^3.12.0",
-    "@blueprintjs/datetime": "^3.7.0",
+    "@blueprintjs/core": "^3.13.0",
+    "@blueprintjs/datetime": "^3.7.1",
     "bootstrap": "^3.4.0",
     "change-case": "^3.1.0",
     "classnames": "^2.2.6",
-    "core-js": "^2.6.3",
+    "core-js": "^2.6.5",
     "create-react-class": "^15.6.3",
-    "d3": "^5.8.2",
+    "d3": "^5.9.1",
     "draft-convert": "^2.1.4",
     "draft-js": "^0.10.5",
     "email-addresses": "^3.0.2",
     "file-saver": "^1.3.3",
+    "formik": "^1.5.1",
     "graphiql": "^0.12.0",
     "graphql": "^0.13.2",
     "hopscotch": "^0.3.1",
@@ -90,13 +90,13 @@
     "object-assign": "^4.1.1",
     "pluralize": "^7.0.0",
     "promise": "^8.0.2",
-    "prop-types": "^15.6.2",
-    "react": "^16.7.0",
+    "prop-types": "^15.7.2",
+    "react": "^16.8.2",
     "react-autosuggest-ie11-compatible": "https://github.com/VassilIordanov/react-autosuggest-ie11-compatible/releases/download/v9.4.2/react-autosuggest-ie11-compatible.tar.gz",
     "react-bootstrap": "^0.32.4",
     "react-confirm-bootstrap": "^5.3.0",
     "react-container-dimensions": "^1.4.1",
-    "react-dom": "^16.7.0",
+    "react-dom": "^16.8.2",
     "react-mosaic-component": "^2.0.0",
     "react-notification-badge": "^1.4.0",
     "react-redux": "^6.0.0",

client/src/models/Report.js

@@ -163,8 +163,8 @@ export default class Report extends Model {
 		return Report.isPending(this.state)
 	}
 
-	static isReleased() {
-		return this.state === Report.STATE.RELEASED
+	static isReleased(state) {
+		return state === Report.STATE.RELEASED
 	}
 
 	isReleased() {
@@ -179,8 +179,8 @@ export default class Report extends Model {
 		return Report.isRejected(this.state)
 	}
 
-	static isCancelled() {
-		return this.state === Report.STATE.CANCELLED
+	static isCancelled(state) {
+		return state === Report.STATE.CANCELLED
 	}
 
 	isCancelled() {