From 22bd94620841e624ff0c18bae4d1500db0532282 Mon Sep 17 00:00:00 2001 From: Eric Sorenson Date: Mon, 17 Dec 2018 09:19:53 -0600 Subject: [PATCH 1/7] upgrades --- efcms-service/package-lock.json | 16 +-- efcms-service/package.json | 2 +- shared/package-lock.json | 26 ++-- web-client/package-lock.json | 238 +++++++++++++++++++++----------- web-client/package.json | 8 +- 5 files changed, 180 insertions(+), 110 deletions(-) diff --git a/efcms-service/package-lock.json b/efcms-service/package-lock.json index 45b021781e7..5a308690be3 100644 --- a/efcms-service/package-lock.json +++ b/efcms-service/package-lock.json @@ -854,9 +854,9 @@ "dev": true }, "aws-sdk": { - "version": "2.376.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.376.0.tgz", - "integrity": "sha512-7/xsLzgF0GJIFTy2qPmn+dFLQoBpWponm+FS9aHUmjI0UMiTieBJzHUSZ8BHIY/4JukBLc3B5hL5evW+NS4pzw==", + "version": "2.377.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.377.0.tgz", + "integrity": "sha512-VvqHqacyro+6pb/sRj4b9ow1RCmk5Dm9JN95xm8D84LihUuHgVweCEJHM6/mclWHHSp1IZYuTxIA7UqFsvVauA==", "dev": true, "requires": { "buffer": "4.9.1", @@ -1466,7 +1466,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -14775,7 +14775,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -16210,7 +16210,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -16413,7 +16413,7 @@ }, "sprintf-js": { "version": "1.0.3", - "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, @@ -16549,7 +16549,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { diff --git a/efcms-service/package.json b/efcms-service/package.json index df4e6460171..d4d4de7a95c 100644 --- a/efcms-service/package.json +++ b/efcms-service/package.json @@ -9,7 +9,7 @@ "license": "CC0-1.0", "devDependencies": { "artillery": "^1.6.0-25", - "aws-sdk": "^2.375.0", + "aws-sdk": "^2.377.0", "aws-sdk-mock": "^4.2.0", "chai": "^4.1.2", "chai-string": "^1.4.0", diff --git a/shared/package-lock.json b/shared/package-lock.json index 21a142cf9af..4056a844fd3 100644 --- a/shared/package-lock.json +++ b/shared/package-lock.json @@ -453,7 +453,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -473,7 +473,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { @@ -2984,7 +2984,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -3004,7 +3004,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { @@ -4476,7 +4476,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -4542,7 +4542,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { @@ -7157,7 +7157,7 @@ }, "resolve": { "version": "1.1.7", - "resolved": "http://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", "dev": true }, @@ -7372,7 +7372,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -7392,7 +7392,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { @@ -7883,7 +7883,7 @@ }, "split2": { "version": "0.2.1", - "resolved": "http://registry.npmjs.org/split2/-/split2-0.2.1.tgz", + "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz", "integrity": "sha1-At2smtwD7Au3jBKC7Aecpuha6QA=", "dev": true, "requires": { @@ -7892,7 +7892,7 @@ }, "sprintf-js": { "version": "1.0.3", - "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, @@ -8333,7 +8333,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "dev": true, "requires": { @@ -8353,7 +8353,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "dev": true, "requires": { diff --git a/web-client/package-lock.json b/web-client/package-lock.json index b72f523a0f8..6a7f9004682 100644 --- a/web-client/package-lock.json +++ b/web-client/package-lock.json @@ -30,17 +30,17 @@ } }, "@babel/core": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.2.0.tgz", - "integrity": "sha512-7pvAdC4B+iKjFFp9Ztj0QgBndJ++qaMeonT185wAqUnhipw8idm9Rv1UMyBuKtYjfl6ORNkgEgcsYLfHX/GpLw==", + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.2.2.tgz", + "integrity": "sha512-59vB0RWt09cAct5EIe58+NzGP4TFSD3Bz//2/ELy3ZeTeKF6VTD1AXlH8BGGbCX0PuobZBsIzO7IAI9PH67eKw==", "requires": { "@babel/code-frame": "^7.0.0", - "@babel/generator": "^7.2.0", + "@babel/generator": "^7.2.2", "@babel/helpers": "^7.2.0", - "@babel/parser": "^7.2.0", - "@babel/template": "^7.1.2", - "@babel/traverse": "^7.1.6", - "@babel/types": "^7.2.0", + "@babel/parser": "^7.2.2", + "@babel/template": "^7.2.2", + "@babel/traverse": "^7.2.2", + "@babel/types": "^7.2.2", "convert-source-map": "^1.1.0", "debug": "^4.1.0", "json5": "^2.1.0", @@ -50,6 +50,59 @@ "source-map": "^0.5.0" }, "dependencies": { + "@babel/generator": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.2.2.tgz", + "integrity": "sha512-I4o675J/iS8k+P38dvJ3IBGqObLXyQLTxtrR4u9cSUJOURvafeEWb/pFMOTwtNrmq73mJzyF6ueTbO1BtN0Zeg==", + "requires": { + "@babel/types": "^7.2.2", + "jsesc": "^2.5.1", + "lodash": "^4.17.10", + "source-map": "^0.5.0", + "trim-right": "^1.0.1" + } + }, + "@babel/parser": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.2.2.tgz", + "integrity": "sha512-UNTmQ5cSLDeBGBl+s7JeowkqIHgmFAGBnLDdIzFmUNSuS5JF0XBcN59jsh/vJO/YjfsBqMxhMjoFGmNExmf0FA==" + }, + "@babel/template": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.2.2.tgz", + "integrity": "sha512-zRL0IMM02AUDwghf5LMSSDEz7sBCO2YnNmpg3uWTZj/v1rcG2BmQUvaGU8GhU8BvfMh1k2KIAYZ7Ji9KXPUg7g==", + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/parser": "^7.2.2", + "@babel/types": "^7.2.2" + } + }, + "@babel/traverse": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.2.2.tgz", + "integrity": "sha512-E5Bn9FSwHpSkUhthw/XEuvFZxIgrqb9M8cX8j5EUQtrUG5DQUy6bFyl7G7iQ1D1Czudor+xkmp81JbLVVM0Sjg==", + "requires": { + "@babel/code-frame": "^7.0.0", + "@babel/generator": "^7.2.2", + "@babel/helper-function-name": "^7.1.0", + "@babel/helper-split-export-declaration": "^7.0.0", + "@babel/parser": "^7.2.2", + "@babel/types": "^7.2.2", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.10" + } + }, + "@babel/types": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.2.2.tgz", + "integrity": "sha512-fKCuD6UFUMkR541eDWL+2ih/xFZBXPOg/7EQFeTluMDebfqR4jrpaCjLhkWlQS4hT6nRa2PMEgXKbRB5/H2fpg==", + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.10", + "to-fast-properties": "^2.0.0" + } + }, "debug": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz", @@ -1065,7 +1118,7 @@ }, "JSONStream": { "version": "0.8.4", - "resolved": "http://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-0.8.4.tgz", "integrity": "sha1-kWV9/m/4V0gwZhMrRhi2Lo9Ih70=", "requires": { "jsonparse": "0.0.5", @@ -1162,9 +1215,9 @@ } }, "ajv": { - "version": "6.6.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.1.tgz", - "integrity": "sha512-ZoJjft5B+EJBjUyu9C9Hc0OZyPZSSlOF+plzouTrg6UlA8f+e/n8NIgBFG/9tppJtpPWfthHakK7juJdNDODww==", + "version": "6.6.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.6.2.tgz", + "integrity": "sha512-FBHEW6Jf5TB9MGBgUUA9XHkTbjXYfAUjY43ACMfmdMRHniyoMHjHjzD50OK8LGDWQwp4rWEsIq5kEqq7rvIM1g==", "requires": { "fast-deep-equal": "^2.0.1", "fast-json-stable-stringify": "^2.0.0", @@ -1289,7 +1342,7 @@ }, "array-equal": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" }, "array-filter": { @@ -1304,7 +1357,7 @@ }, "array-flatten": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, "array-foreach": { @@ -1397,7 +1450,7 @@ }, "util": { "version": "0.10.3", - "resolved": "http://registry.npmjs.org/util/-/util-0.10.3.tgz", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", "requires": { "inherits": "2.0.1" @@ -1464,16 +1517,33 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" }, "autoprefixer": { - "version": "9.4.2", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.2.tgz", - "integrity": "sha512-tYQYJvZvqlJCzF+BLC//uAcdT/Yy4ik9bwZRXr/EehUJ/bjjpTthsWTy8dpowdoIE1sLCDf1ch4Eb2cOSzZC9w==", + "version": "9.4.3", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.4.3.tgz", + "integrity": "sha512-/XSnzDepRkAU//xLcXA/lUWxpsBuw0WiriAHOqnxkuCtzLhaz+fL4it4gp20BQ8n5SyLzK/FOc7A0+u/rti2FQ==", "requires": { - "browserslist": "^4.3.5", - "caniuse-lite": "^1.0.30000914", + "browserslist": "^4.3.6", + "caniuse-lite": "^1.0.30000921", "normalize-range": "^0.1.2", "num2fraction": "^1.2.2", "postcss": "^7.0.6", "postcss-value-parser": "^3.3.1" + }, + "dependencies": { + "browserslist": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.6.tgz", + "integrity": "sha512-kMGKs4BTzRWviZ8yru18xBpx+CyHG9eqgRbj9XbE3IMgtczf4aiA0Y1YCpVdvUieKGZ03kolSPXqTcscBCb9qw==", + "requires": { + "caniuse-lite": "^1.0.30000921", + "electron-to-chromium": "^1.3.92", + "node-releases": "^1.1.1" + } + }, + "electron-to-chromium": { + "version": "1.3.92", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.92.tgz", + "integrity": "sha512-En051LMzMl3/asMWGZEtU808HOoVWIpmmZx1Ep8N+TT9e7z/X8RcLeBU2kLSNLGQ+5SuKELzMx+MVuTBXk6Q9w==" + } } }, "aws-sign2": { @@ -1572,7 +1642,7 @@ "dependencies": { "jsesc": { "version": "1.3.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=" } } @@ -2131,7 +2201,7 @@ }, "regexpu-core": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", "requires": { "regenerate": "^1.2.1", @@ -2500,7 +2570,7 @@ }, "bindings": { "version": "1.2.1", - "resolved": "http://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz", "integrity": "sha1-FK1hE4EtLTfXLme0ystLtyZQXxE=" }, "bluebird": { @@ -2583,7 +2653,7 @@ }, "brfs": { "version": "1.6.1", - "resolved": "http://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz", + "resolved": "https://registry.npmjs.org/brfs/-/brfs-1.6.1.tgz", "integrity": "sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==", "requires": { "quote-stream": "^1.0.1", @@ -2599,7 +2669,7 @@ }, "browser-pack": { "version": "6.1.0", - "resolved": "http://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz", + "resolved": "https://registry.npmjs.org/browser-pack/-/browser-pack-6.1.0.tgz", "integrity": "sha512-erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==", "requires": { "JSONStream": "^1.0.3", @@ -2641,7 +2711,7 @@ "dependencies": { "resolve": { "version": "1.1.7", - "resolved": "http://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=" } } @@ -2780,12 +2850,12 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "timers-browserify": { "version": "1.4.2", - "resolved": "http://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz", "integrity": "sha1-ycWLV1voQHN1y14kYtrO50NZ9B0=", "requires": { "process": "~0.11.0" @@ -2987,7 +3057,7 @@ }, "callsites": { "version": "0.2.0", - "resolved": "http://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz", "integrity": "sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=" }, "camelcase": { @@ -3572,7 +3642,7 @@ }, "color-string": { "version": "0.3.0", - "resolved": "http://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", + "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", "requires": { "color-name": "^1.0.0" @@ -3582,7 +3652,7 @@ }, "colors": { "version": "1.1.2", - "resolved": "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=" }, "combine-source-map": { @@ -3872,12 +3942,12 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "through2": { "version": "0.6.5", - "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "requires": { "readable-stream": ">=1.0.33-1 <1.1.0-0", @@ -3942,7 +4012,7 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" } } @@ -4428,7 +4498,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" } } @@ -4445,7 +4515,7 @@ }, "deps-sort": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/deps-sort/-/deps-sort-2.0.0.tgz", "integrity": "sha1-CRckkC6EZYJg65EHSMzNGvbiH7U=", "requires": { "JSONStream": "^1.0.3", @@ -4684,7 +4754,7 @@ }, "source-map": { "version": "0.4.4", - "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "requires": { "amdefine": ">=0.0.4" @@ -4692,7 +4762,7 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "supports-color": { @@ -4705,7 +4775,7 @@ }, "through2": { "version": "0.6.5", - "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "requires": { "readable-stream": ">=1.0.33-1 <1.1.0-0", @@ -4757,7 +4827,7 @@ "dependencies": { "domelementtype": { "version": "1.1.3", - "resolved": "http://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=" } } @@ -5324,7 +5394,7 @@ }, "expand-range": { "version": "1.8.2", - "resolved": "http://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", "requires": { "fill-range": "^2.1.0" @@ -6833,7 +6903,7 @@ }, "htmlescape": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/htmlescape/-/htmlescape-1.1.1.tgz", "integrity": "sha1-OgPtwiFLyjtmQko+eVk0lQnLA1E=" }, "htmlnano": { @@ -7468,7 +7538,7 @@ "dependencies": { "ansi-escapes": { "version": "3.1.0", - "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==" }, "ansi-regex": { @@ -7642,7 +7712,7 @@ }, "is-accessor-descriptor": { "version": "0.1.6", - "resolved": "http://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", "requires": { "kind-of": "^3.0.2" @@ -7731,7 +7801,7 @@ }, "is-data-descriptor": { "version": "0.1.4", - "resolved": "http://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", "requires": { "kind-of": "^3.0.2" @@ -8164,7 +8234,7 @@ "dependencies": { "ansi-escapes": { "version": "3.1.0", - "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==" }, "ansi-regex": { @@ -8992,7 +9062,7 @@ "dependencies": { "callsites": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=" }, "slash": { @@ -9030,7 +9100,7 @@ "dependencies": { "ansi-escapes": { "version": "3.1.0", - "resolved": "http://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.1.0.tgz", "integrity": "sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==" } } @@ -9232,12 +9302,12 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "through2": { "version": "0.6.5", - "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "requires": { "readable-stream": ">=1.0.33-1 <1.1.0-0", @@ -9311,7 +9381,7 @@ }, "labeled-stream-splicer": { "version": "2.0.1", - "resolved": "http://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz", + "resolved": "https://registry.npmjs.org/labeled-stream-splicer/-/labeled-stream-splicer-2.0.1.tgz", "integrity": "sha512-MC94mHZRvJ3LfykJlTUipBqenZz1pacOZEMhhQ8dMGcDHs0SBE5GbsavUXV7YtP3icBW17W0Zy1I0lfASmo9Pg==", "requires": { "inherits": "^2.0.1", @@ -9371,12 +9441,12 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "through2": { "version": "0.6.5", - "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "requires": { "readable-stream": ">=1.0.33-1 <1.1.0-0", @@ -10317,7 +10387,7 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" } } @@ -10393,9 +10463,9 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, "nightwatch": { - "version": "1.0.15", - "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-1.0.15.tgz", - "integrity": "sha512-PksSlRPg+jsAb3/YdY0z4mVyTWSrf+tY9Ua1nbcqJH177mTDEcZhbJ6ITgwC3gsAPPDBK2lIM6McDgRQU37XeA==", + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/nightwatch/-/nightwatch-1.0.16.tgz", + "integrity": "sha512-nqn+349qw88dbS/PCGbrDt1+PEtNV05brZOHilUnfZZ3Txpbmuhb9Z88tiNsNKv5pKxvWorUZz+B76eXH0EuEQ==", "requires": { "assertion-error": "^1.1.0", "chai-nightwatch": "0.2.1", @@ -10849,7 +10919,7 @@ }, "os-homedir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" }, "os-locale": { @@ -10890,7 +10960,7 @@ }, "os-tmpdir": { "version": "1.0.2", - "resolved": "http://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" }, "osenv": { @@ -11111,7 +11181,7 @@ }, "pako": { "version": "0.2.9", - "resolved": "http://registry.npmjs.org/pako/-/pako-0.2.9.tgz", + "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz", "integrity": "sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=" }, "parcel-bundler": { @@ -11366,7 +11436,7 @@ }, "path-browserify": { "version": "0.0.0", - "resolved": "http://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", + "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=" }, "path-dirname": { @@ -11381,7 +11451,7 @@ }, "path-is-absolute": { "version": "1.0.1", - "resolved": "http://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-is-inside": { @@ -13059,7 +13129,7 @@ "dependencies": { "jsesc": { "version": "0.5.0", - "resolved": "http://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=" } } @@ -13220,7 +13290,7 @@ }, "require-uncached": { "version": "1.0.3", - "resolved": "http://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz", "integrity": "sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=", "requires": { "caller-path": "^0.1.0", @@ -13295,7 +13365,7 @@ }, "rgba-regex": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz", "integrity": "sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=" }, "right-align": { @@ -13533,7 +13603,7 @@ }, "safe-regex": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "requires": { "ret": "~0.1.10" @@ -14025,7 +14095,7 @@ }, "split2": { "version": "0.2.1", - "resolved": "http://registry.npmjs.org/split2/-/split2-0.2.1.tgz", + "resolved": "https://registry.npmjs.org/split2/-/split2-0.2.1.tgz", "integrity": "sha1-At2smtwD7Au3jBKC7Aecpuha6QA=", "requires": { "through2": "~0.6.1" @@ -14049,12 +14119,12 @@ }, "string_decoder": { "version": "0.10.31", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=" }, "through2": { "version": "0.6.5", - "resolved": "http://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", "requires": { "readable-stream": ">=1.0.33-1 <1.1.0-0", @@ -14065,7 +14135,7 @@ }, "sprintf-js": { "version": "1.0.3", - "resolved": "http://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sshpk": { @@ -14184,7 +14254,7 @@ }, "stream-browserify": { "version": "2.0.1", - "resolved": "http://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", "requires": { "inherits": "~2.0.1", @@ -14223,7 +14293,7 @@ }, "stream-splicer": { "version": "2.0.0", - "resolved": "http://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz", + "resolved": "https://registry.npmjs.org/stream-splicer/-/stream-splicer-2.0.0.tgz", "integrity": "sha1-G2O+Q4oTPktnHMGTUZdgAXWRDYM=", "requires": { "inherits": "^2.0.1", @@ -14288,7 +14358,7 @@ }, "string_decoder": { "version": "1.1.1", - "resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "requires": { "safe-buffer": "~5.1.0" @@ -14323,7 +14393,7 @@ }, "strip-eof": { "version": "1.0.0", - "resolved": "http://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" }, "strip-indent": { @@ -14593,7 +14663,7 @@ }, "camelcase-keys": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "requires": { "camelcase": "^2.0.0", @@ -14710,7 +14780,7 @@ }, "meow": { "version": "3.7.0", - "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "requires": { "camelcase-keys": "^2.0.0", @@ -14752,7 +14822,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" }, "postcss": { @@ -15175,7 +15245,7 @@ }, "camelcase-keys": { "version": "2.1.0", - "resolved": "http://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", + "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", "requires": { "camelcase": "^2.0.0", @@ -15292,7 +15362,7 @@ }, "meow": { "version": "3.7.0", - "resolved": "http://registry.npmjs.org/meow/-/meow-3.7.0.tgz", + "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", "requires": { "camelcase-keys": "^2.0.0", @@ -15334,7 +15404,7 @@ }, "pify": { "version": "2.3.0", - "resolved": "http://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=" }, "postcss": { @@ -15931,7 +16001,7 @@ }, "syntax-error": { "version": "1.4.0", - "resolved": "http://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz", + "resolved": "https://registry.npmjs.org/syntax-error/-/syntax-error-1.4.0.tgz", "integrity": "sha512-YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w==", "requires": { "acorn-node": "^1.2.0" @@ -16243,7 +16313,7 @@ }, "tough-cookie": { "version": "2.3.4", - "resolved": "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "requires": { "punycode": "^1.4.1" @@ -16301,7 +16371,7 @@ }, "tty-browserify": { "version": "0.0.0", - "resolved": "http://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=" }, "tunnel-agent": { @@ -16893,7 +16963,7 @@ }, "vm-browserify": { "version": "0.0.4", - "resolved": "http://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", "requires": { "indexof": "0.0.1" diff --git a/web-client/package.json b/web-client/package.json index 0f4bc3ce946..d0274aefc44 100644 --- a/web-client/package.json +++ b/web-client/package.json @@ -53,7 +53,7 @@ "homepage": "https://github.com/ustaxcourt/ef-cms#readme", "dependencies": { "@babel/cli": "^7.2.0", - "@babel/core": "^7.2.0", + "@babel/core": "^7.2.2", "@babel/polyfill": "^7.0.0", "@babel/preset-env": "^7.2.0", "@babel/preset-react": "^7.0.0", @@ -63,8 +63,8 @@ "@fortawesome/free-solid-svg-icons": "^5.6.1", "@fortawesome/react-fontawesome": "^0.1.3", "acorn": "^6.0.4", - "ajv": "^6.6.1", - "autoprefixer": "^9.4.2", + "ajv": "^6.6.2", + "autoprefixer": "^9.4.3", "axios": "^0.18.0", "axios-mock-adapter": "^1.15.0", "babel-core": "^7.0.0-bridge.0", @@ -88,7 +88,7 @@ "jest": "^23.6.0", "lodash": "^4.17.11", "moment": "^2.23.0", - "nightwatch": "^1.0.15", + "nightwatch": "^1.0.16", "nock": "^10.0.4", "pa11y-ci": "^2.1.1", "parcel-bundler": "^1.10.3", From b2cc8114b0384b097819ad238be61f743d666125 Mon Sep 17 00:00:00 2001 From: Eric Sorenson Date: Mon, 17 Dec 2018 09:44:49 -0600 Subject: [PATCH 2/7] formattedSearchParams no longer needed --- .../src/presenter/computeds/formattedSearchParams.js | 7 ------- .../src/presenter/sequences/submitSearchSequence.js | 6 ++++-- web-client/src/presenter/state.js | 2 -- web-client/src/tests/computeds.test.js | 12 ------------ 4 files changed, 4 insertions(+), 23 deletions(-) delete mode 100644 web-client/src/presenter/computeds/formattedSearchParams.js diff --git a/web-client/src/presenter/computeds/formattedSearchParams.js b/web-client/src/presenter/computeds/formattedSearchParams.js deleted file mode 100644 index 4f96f1b7e06..00000000000 --- a/web-client/src/presenter/computeds/formattedSearchParams.js +++ /dev/null @@ -1,7 +0,0 @@ -import { state } from 'cerebral'; - -export const formattedSearchParams = get => { - let searchTerm = get(state.searchTerm); - // noop - return searchTerm; -}; diff --git a/web-client/src/presenter/sequences/submitSearchSequence.js b/web-client/src/presenter/sequences/submitSearchSequence.js index 132a39bdb7a..b46250531da 100644 --- a/web-client/src/presenter/sequences/submitSearchSequence.js +++ b/web-client/src/presenter/sequences/submitSearchSequence.js @@ -1,4 +1,6 @@ +import { set } from 'cerebral/factories'; +import { state, props } from 'cerebral'; + import navigateToCaseDetail from '../actions/navigateToCaseDetailAction'; -import formatSearchParams from '../actions/formatSearchParamsAction'; -export default [formatSearchParams, navigateToCaseDetail]; +export default [set(props.caseId, state.searchTerm), navigateToCaseDetail]; diff --git a/web-client/src/presenter/state.js b/web-client/src/presenter/state.js index 51b3749404a..04e93983b9f 100644 --- a/web-client/src/presenter/state.js +++ b/web-client/src/presenter/state.js @@ -2,7 +2,6 @@ import { formattedCaseDetail, formattedCases, } from './computeds/formattedCaseDetail'; -import { formattedSearchParams } from './computeds/formattedSearchParams'; export default { path: '/', @@ -73,5 +72,4 @@ export default { cases: [], formattedCaseDetail, formattedCases, - formattedSearchParams, }; diff --git a/web-client/src/tests/computeds.test.js b/web-client/src/tests/computeds.test.js index 4409f01aa13..8fa5d6d51e8 100644 --- a/web-client/src/tests/computeds.test.js +++ b/web-client/src/tests/computeds.test.js @@ -6,8 +6,6 @@ import { formattedCases, } from '../presenter/computeds/formattedCaseDetail'; -import { formattedSearchParams } from '../presenter/computeds/formattedSearchParams'; - describe('formatted case details computed', () => { it('formats the date', () => { const result = runCompute(formattedCaseDetail, { @@ -37,13 +35,3 @@ describe('formatted case details computed', () => { expect(result[0].respondent.formattedName).toContain('test 123'); }); }); - -describe('formatted search parameters computed', () => { - it('formats a docket number search param', () => { - const result = runCompute(formattedSearchParams, { - state: { searchTerm: '101-18' }, - }); - // currently noop - assert.equal(result, '101-18'); - }); -}); From 6f8b3354395a876edf3bdb6241ba65ef285e725a Mon Sep 17 00:00:00 2001 From: Eric Sorenson Date: Mon, 17 Dec 2018 10:18:46 -0600 Subject: [PATCH 3/7] cleanup --- web-client/src/applicationContext.js | 32 +++++++++++++------------- web-client/src/tests/computeds.test.js | 1 - 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/web-client/src/applicationContext.js b/web-client/src/applicationContext.js index 3b25e67fce3..d7e3488856a 100644 --- a/web-client/src/applicationContext.js +++ b/web-client/src/applicationContext.js @@ -1,24 +1,24 @@ const { + getDocument, + uploadDocument, uploadPdf, uploadPdfsForNewCase, - uploadDocument, - getDocument, } = require('../../shared/src/persistence/awsS3Persistence'); import { createCase } from '../../shared/src/proxies/createCaseProxy'; +import { downloadDocumentFile } from '../../shared/src/business/useCases/downloadDocumentFile.interactor'; +import { fileAnswer } from '../../shared/src/business/useCases/respondent/fileAnswer.interactor'; +import { fileAnswerUpdateCase } from '../../shared/src/proxies/fileAnswerUpdateCaseProxy'; +import { fileStipulatedDecision } from '../../shared/src/business/useCases/respondent/fileStipulatedDecision.interactor'; +import { fileStipulatedDecisionUpdateCase } from '../../shared/src/proxies/fileStipulatedDecisionUpdateCaseProxy'; import { getCase } from '../../shared/src/proxies/getCaseProxy'; import { getCasesByStatus } from '../../shared/src/proxies/getCasesByStatusProxy'; import { getCasesByUser } from '../../shared/src/proxies/getCasesByUserProxy'; +import { getCasesForRespondent } from '../../shared/src/proxies/respondent/getCasesForRespondentProxy'; import { getUser } from '../../shared/src/business/useCases/getUser.interactor'; import { sendPetitionToIRS } from '../../shared/src/proxies/sendPetitionToIRSProxy'; import { updateCase } from '../../shared/src/proxies/updateCaseProxy'; import { uploadCasePdfs } from '../../shared/src/business/useCases/uploadCasePdfs.interactor'; -import { fileAnswer } from '../../shared/src/business/useCases/respondent/fileAnswer.interactor'; -import { getCasesForRespondent } from '../../shared/src/proxies/respondent/getCasesForRespondentProxy'; -import { downloadDocumentFile } from '../../shared/src/business/useCases/downloadDocumentFile.interactor'; -import { fileStipulatedDecision } from '../../shared/src/business/useCases/respondent/fileStipulatedDecision.interactor'; -import { fileAnswerUpdateCase } from '../../shared/src/proxies/fileAnswerUpdateCaseProxy'; -import { fileStipulatedDecisionUpdateCase } from '../../shared/src/proxies/fileStipulatedDecisionUpdateCaseProxy'; import Case from '../../shared/src/business/entities/Case'; @@ -31,28 +31,28 @@ const applicationContext = { }, getPersistenceGateway: () => { return { - uploadPdf, getDocument, - uploadPdfsForNewCase, - uploadDocument, saveCase: updateCase, + uploadDocument, + uploadPdf, + uploadPdfsForNewCase, }; }, getUseCases: () => { return { createCase, + downloadDocumentFile, + fileAnswer, + fileAnswerUpdateCase, + fileStipulatedDecisionUpdateCase, getCase, getCasesByStatus, getCasesByUser, + getCasesForRespondent, getUser, sendPetitionToIRS, updateCase, uploadCasePdfs, - fileAnswer, - getCasesForRespondent, - downloadDocumentFile, - fileAnswerUpdateCase, - fileStipulatedDecisionUpdateCase, }; }, getUseCaseForDocumentUpdate: (documentType, role) => { diff --git a/web-client/src/tests/computeds.test.js b/web-client/src/tests/computeds.test.js index 8fa5d6d51e8..e3f217d3ad4 100644 --- a/web-client/src/tests/computeds.test.js +++ b/web-client/src/tests/computeds.test.js @@ -1,5 +1,4 @@ import { runCompute } from 'cerebral/test'; -import assert from 'assert'; import { formattedCaseDetail, From 32198fb8081d703d3ad01a9413cf8f12f0b11226 Mon Sep 17 00:00:00 2001 From: Eric Sorenson Date: Mon, 17 Dec 2018 10:30:36 -0600 Subject: [PATCH 4/7] happy path --- web-client/src/applicationContext.js | 7 ---- .../presenter/actions/getCasesByUserAction.js | 21 +++-------- .../presenter/actions/getCasesNewAction.js | 23 ++++-------- .../actions/sendPetitionToIrsAction.js | 33 ++++++----------- .../src/presenter/actions/updateCaseAction.js | 37 +++++++------------ 5 files changed, 38 insertions(+), 83 deletions(-) diff --git a/web-client/src/applicationContext.js b/web-client/src/applicationContext.js index d7e3488856a..ec0dbd0ba89 100644 --- a/web-client/src/applicationContext.js +++ b/web-client/src/applicationContext.js @@ -22,9 +22,6 @@ import { uploadCasePdfs } from '../../shared/src/business/useCases/uploadCasePdf import Case from '../../shared/src/business/entities/Case'; -/** - * Context for the prod environment - */ const applicationContext = { getBaseUrl: () => { return process.env.API_URL || 'http://localhost:3000/v1'; @@ -62,8 +59,6 @@ const applicationContext = { return fileAnswerUpdateCase; case Case.documentTypes.stipulatedDecision: return fileStipulatedDecisionUpdateCase; - default: - return updateCase; } } }, @@ -74,8 +69,6 @@ const applicationContext = { return fileAnswer; case Case.documentTypes.stipulatedDecision: return fileStipulatedDecision; - default: - return updateCase; } } }, diff --git a/web-client/src/presenter/actions/getCasesByUserAction.js b/web-client/src/presenter/actions/getCasesByUserAction.js index 20bf57daecb..773e3fa45a4 100644 --- a/web-client/src/presenter/actions/getCasesByUserAction.js +++ b/web-client/src/presenter/actions/getCasesByUserAction.js @@ -4,19 +4,10 @@ import _ from 'lodash'; export default async ({ applicationContext, get, path }) => { const useCases = applicationContext.getUseCases(); const userId = get(state.user.userId); - try { - let caseList = await useCases.getCasesByUser({ - applicationContext, - userId, - }); - caseList = _.orderBy(caseList, 'createdAt', 'desc'); - return path.success({ caseList }); - } catch (e) { - return path.error({ - alertError: { - title: 'Cases not found', - message: 'There was a problem getting the cases', - }, - }); - } + let caseList = await useCases.getCasesByUser({ + applicationContext, + userId, + }); + caseList = _.orderBy(caseList, 'createdAt', 'desc'); + return path.success({ caseList }); }; diff --git a/web-client/src/presenter/actions/getCasesNewAction.js b/web-client/src/presenter/actions/getCasesNewAction.js index 50d0dfcd176..906b440f9a7 100644 --- a/web-client/src/presenter/actions/getCasesNewAction.js +++ b/web-client/src/presenter/actions/getCasesNewAction.js @@ -3,20 +3,11 @@ import _ from 'lodash'; export default async ({ applicationContext, get, path }) => { const useCases = applicationContext.getUseCases(); - try { - let caseList = await useCases.getCasesByStatus({ - applicationContext, - userId: get(state.user.token), - status: 'new', - }); - caseList = _.orderBy(caseList, 'createdAt', 'asc'); - return path.success({ caseList }); - } catch (e) { - return path.error({ - alertError: { - title: 'Cases not found', - message: 'There was a problem getting the cases', - }, - }); - } + let caseList = await useCases.getCasesByStatus({ + applicationContext, + userId: get(state.user.token), + status: 'new', + }); + caseList = _.orderBy(caseList, 'createdAt', 'asc'); + return path.success({ caseList }); }; diff --git a/web-client/src/presenter/actions/sendPetitionToIrsAction.js b/web-client/src/presenter/actions/sendPetitionToIrsAction.js index e7d8dbd1fe9..70e4cb50072 100644 --- a/web-client/src/presenter/actions/sendPetitionToIrsAction.js +++ b/web-client/src/presenter/actions/sendPetitionToIrsAction.js @@ -4,25 +4,16 @@ import moment from 'moment'; export default async ({ applicationContext, get, path, props }) => { const useCases = applicationContext.getUseCases(); - try { - const irsSendDate = await useCases.sendPetitionToIRS({ - caseId: get(state.caseDetail).caseId, - userId: get(state.user.token), - applicationContext, - }); - props.docketNumber = get(state.caseDetail).docketNumber; - return path.success({ - alertSuccess: { - title: 'Successfully served to IRS', - message: moment(irsSendDate).format('L LT'), - }, - }); - } catch (error) { - return path.error({ - alertError: { - title: 'Error', - message: error.response.data, - }, - }); - } + const irsSendDate = await useCases.sendPetitionToIRS({ + caseId: get(state.caseDetail).caseId, + userId: get(state.user.token), + applicationContext, + }); + props.docketNumber = get(state.caseDetail).docketNumber; + return path.success({ + alertSuccess: { + title: 'Successfully served to IRS', + message: moment(irsSendDate).format('L LT'), + }, + }); }; diff --git a/web-client/src/presenter/actions/updateCaseAction.js b/web-client/src/presenter/actions/updateCaseAction.js index 5fe08f719aa..d335cd81bbb 100644 --- a/web-client/src/presenter/actions/updateCaseAction.js +++ b/web-client/src/presenter/actions/updateCaseAction.js @@ -2,29 +2,18 @@ import { state } from 'cerebral'; export default async ({ applicationContext, get, path }) => { const useCases = applicationContext.getUseCases(); - try { - const caseDetail = await useCases.updateCase({ - applicationContext, - caseToUpdate: get(state.caseDetail), - userId: get(state.user.token), - }); - return path.success({ - caseDetail, - alertSuccess: { - title: 'Success', - message: - 'Case ' + - get(state.formattedCaseDetail).docketNumber + - ' has been updated.', - }, - }); - } catch (error) { - return path.error({ - alertError: { - title: 'Error', - message: error.response.data, - }, - }); - } + const caseDetail = await useCases.updateCase({ + applicationContext, + caseToUpdate: get(state.caseDetail), + userId: get(state.user.token), + }); + + return path.success({ + caseDetail, + alertSuccess: { + title: 'Success', + message: `Case ${caseDetail.docketNumber} has been updated.`, + }, + }); }; From 27b239023d42082e75bddcf74e7f53c42f83eba7 Mon Sep 17 00:00:00 2001 From: Eric Sorenson Date: Mon, 17 Dec 2018 12:12:44 -0600 Subject: [PATCH 5/7] case detail view helper --- .../src/presenter/computeds/caseDetailHelper.js | 15 +++++++++++++++ .../presenter/computeds/formattedCaseDetail.js | 12 +++--------- web-client/src/views/CaseDetailInternal.jsx | 17 ++++++++++------- web-client/src/views/CaseDetailRespondent.jsx | 6 ++++-- 4 files changed, 32 insertions(+), 18 deletions(-) create mode 100644 web-client/src/presenter/computeds/caseDetailHelper.js diff --git a/web-client/src/presenter/computeds/caseDetailHelper.js b/web-client/src/presenter/computeds/caseDetailHelper.js new file mode 100644 index 00000000000..abbf655539e --- /dev/null +++ b/web-client/src/presenter/computeds/caseDetailHelper.js @@ -0,0 +1,15 @@ +import { state } from 'cerebral'; + +export default get => { + const caseDetail = get(state.caseDetail); + const form = get(state.form); + + return { + showDocumentStatus: !caseDetail.irsSendDate, + showIrsServedDate: !!caseDetail.irsSendDate, + showPayGovIdInput: form.paymentType == 'payGov', + showPaymentOptions: !(caseDetail.payGovId && !form.paymentType), + showActionRequired: !caseDetail.payGovId, + showPaymentRecord: caseDetail.payGovId && !form.paymentType, + }; +}; diff --git a/web-client/src/presenter/computeds/formattedCaseDetail.js b/web-client/src/presenter/computeds/formattedCaseDetail.js index 95d1eb893be..12e25439c3d 100644 --- a/web-client/src/presenter/computeds/formattedCaseDetail.js +++ b/web-client/src/presenter/computeds/formattedCaseDetail.js @@ -8,7 +8,7 @@ const formatDocument = result => { result.isStatusServed = result.status === 'served'; }; -const formatCase = (caseDetail, form) => { +const formatCase = caseDetail => { const result = _.cloneDeep(caseDetail); if (result.documents) result.documents.map(formatDocument); @@ -16,16 +16,11 @@ const formatCase = (caseDetail, form) => { result.respondent.formattedName = `${result.respondent.name} ${ result.respondent.barNumber }`; + result.createdAtFormatted = moment(result.createdAt).format('L'); result.irsDateFormatted = moment(result.irsDate).format('L LT'); result.payGovDateFormatted = moment(result.payGovDate).format('L'); - result.showDocumentStatus = !result.irsSendDate; - result.showIrsServedDate = !!result.irsSendDate; - result.showPayGovIdInput = form.paymentType == 'payGov'; - result.showPaymentOptions = !(caseDetail.payGovId && !form.paymentType); - result.showActionRequired = !caseDetail.payGovId; - result.showPaymentRecord = result.payGovId && !form.paymentType; result.datePetitionSentToIrsMessage = `Respondent served ${ result.irsDateFormatted }`; @@ -43,6 +38,5 @@ export const formattedCases = get => { export const formattedCaseDetail = get => { const caseDetail = get(state.caseDetail); - const form = get(state.form); - return formatCase(caseDetail, form); + return formatCase(caseDetail); }; diff --git a/web-client/src/views/CaseDetailInternal.jsx b/web-client/src/views/CaseDetailInternal.jsx index e1edacfd13c..a16cafde1f4 100644 --- a/web-client/src/views/CaseDetailInternal.jsx +++ b/web-client/src/views/CaseDetailInternal.jsx @@ -12,6 +12,7 @@ export default connect( { caseDetail: state.formattedCaseDetail, currentTab: state.currentTab, + helper: state.caseDetailHelper, submitSendToIrsSequence: sequences.submitToIrsSequence, submitUpdateCaseSequence: sequences.submitUpdateCaseSequence, updateCaseValueSequence: sequences.updateCaseValueSequence, @@ -22,8 +23,9 @@ export default connect( function CaseDetail({ caseDetail, currentTab, - submitUpdateCaseSequence, + helper, submitSendToIrsSequence, + submitUpdateCaseSequence, updateCaseValueSequence, updateCurrentTabSequence, updateFormValueSequence, @@ -91,8 +93,9 @@ export default connect( {currentTab == 'Docket Record' && (
- {!caseDetail.showIrsServedDate && ( + {!helper.showIrsServedDate && (