From 50d736127f6642c62023de6ca11c5a532d98eade Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Sun, 19 May 2019 16:30:18 -0700 Subject: [PATCH 01/18] Fix reloading the page after a status change The `onClick` event of `NavButton` now by default calls `preventDefault` so the navigation does not happen. Signed-off-by: Mcat12 --- src/components/common/NavButton.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/components/common/NavButton.tsx b/src/components/common/NavButton.tsx index b07d6e0..ac5fc02 100644 --- a/src/components/common/NavButton.tsx +++ b/src/components/common/NavButton.tsx @@ -24,7 +24,14 @@ export default ({ onClick = e => e.preventDefault() }: NavButtonProps) => (
  • - + { + e.preventDefault(); + onClick(e); + }} + className="nav-link" + > {name} From 45d64ed92a63894f15302d6501b48d5999f69892 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 00:26:28 +0000 Subject: [PATCH 02/18] Bump fs-extra from 7.0.1 to 8.0.1 Bumps [fs-extra](https://github.com/jprichardson/node-fs-extra) from 7.0.1 to 8.0.1. - [Release notes](https://github.com/jprichardson/node-fs-extra/releases) - [Changelog](https://github.com/jprichardson/node-fs-extra/blob/master/CHANGELOG.md) - [Commits](https://github.com/jprichardson/node-fs-extra/commits) --- package-lock.json | 30 +++++++++++++++++++++++++++--- package.json | 2 +- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9558884..5906cfb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9012,9 +9012,9 @@ } }, "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz", + "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==", "dev": true, "requires": { "graceful-fs": "^4.1.2", @@ -19125,6 +19125,17 @@ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, "fsevents": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.6.tgz", @@ -23048,6 +23059,19 @@ "fs-extra": "^7.0.0", "lodash": ">=3.5 <5", "tapable": "^1.0.0" + }, + "dependencies": { + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + } } }, "webpack-sources": { diff --git a/package.json b/package.json index 1d862b0..bc261cf 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "enzyme-adapter-react-16": "^1.7.1", "faker": "^4.1.0", "fetch-mock": "^7.3.0", - "fs-extra": "^7.0.1", + "fs-extra": "^8.0.1", "jest-enzyme": "^7.0.1", "jest-localstorage-mock": "^2.4.0", "multi-progress": "^2.0.0", From 532da8339cdd1c8a8cc0825cc5dcef5bd8d872c5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 03:55:08 +0000 Subject: [PATCH 03/18] Bump ionicons from 4.5.1 to 4.5.8 Bumps [ionicons](https://github.com/ionic-team/ionicons) from 4.5.1 to 4.5.8. - [Release notes](https://github.com/ionic-team/ionicons/releases) - [Commits](https://github.com/ionic-team/ionicons/compare/v4.5.1...v4.5.8) --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5906cfb..89b1509 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10872,9 +10872,9 @@ "dev": true }, "ionicons": { - "version": "4.5.1", - "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-4.5.1.tgz", - "integrity": "sha512-zqfkjpPKsdzzXePdE03IRw6xt7B6N3fcN/7NepyniuEWhKZLy7YpdZLegEwBmKeciXi7rIcv1O/hHJTdokUwXQ==" + "version": "4.5.8", + "resolved": "https://registry.npmjs.org/ionicons/-/ionicons-4.5.8.tgz", + "integrity": "sha512-Zib/fFGHt+r9tWrvZnrxVj22cO4NVj+ZOb76v5yiOyvb0LSTbbReECDg7lEU8e+YR69qCtWHruStJ+b4G/OWxg==" }, "ip": { "version": "1.1.5", diff --git a/package.json b/package.json index bc261cf..75aaddb 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "i18next": "^13.1.4", "i18next-browser-languagedetector": "^2.2.4", "i18next-xhr-backend": "^2.0.1", - "ionicons": "^4.5.1", + "ionicons": "^4.5.8", "lodash.debounce": "^4.0.8", "moment": "^2.23.0", "prop-types": "^15.6.2", From 60c98b6bd325206215793bacd9b7dc8a1d67d172 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 04:00:55 +0000 Subject: [PATCH 04/18] Bump chart.js from 2.7.3 to 2.8.0 Bumps [chart.js](https://github.com/chartjs/Chart.js) from 2.7.3 to 2.8.0. - [Release notes](https://github.com/chartjs/Chart.js/releases) - [Commits](https://github.com/chartjs/Chart.js/compare/v2.7.3...v2.8.0) --- package-lock.json | 20 ++++++++++---------- package.json | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 89b1509..e26690c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4943,27 +4943,27 @@ "dev": true }, "chart.js": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.7.3.tgz", - "integrity": "sha512-3+7k/DbR92m6BsMUYP6M0dMsMVZpMnwkUyNSAbqolHKsbIzH2Q4LWVEHHYq7v0fmEV8whXE0DrjANulw9j2K5g==", + "version": "2.8.0", + "resolved": "https://registry.npmjs.org/chart.js/-/chart.js-2.8.0.tgz", + "integrity": "sha512-Di3wUL4BFvqI5FB5K26aQ+hvWh8wnP9A3DWGvXHVkO13D3DSnaSsdZx29cXlEsYKVkn1E2az+ZYFS4t0zi8x0w==", "requires": { "chartjs-color": "^2.1.0", "moment": "^2.10.2" } }, "chartjs-color": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.2.0.tgz", - "integrity": "sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chartjs-color/-/chartjs-color-2.3.0.tgz", + "integrity": "sha512-hEvVheqczsoHD+fZ+tfPUE+1+RbV6b+eksp2LwAhwRTVXEjCSEavvk+Hg3H6SZfGlPh/UfmWKGIvZbtobOEm3g==", "requires": { - "chartjs-color-string": "^0.5.0", + "chartjs-color-string": "^0.6.0", "color-convert": "^0.5.3" } }, "chartjs-color-string": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.5.0.tgz", - "integrity": "sha512-amWNvCOXlOUYxZVDSa0YOab5K/lmEhbFNKI55PWc4mlv28BDzA7zaoQTGxSBgJMHIW+hGX8YUrvw/FH4LyhwSQ==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz", + "integrity": "sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==", "requires": { "color-name": "^1.0.0" } diff --git a/package.json b/package.json index 75aaddb..96b014a 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "@fortawesome/fontawesome-free": "^5.6.3", "bootstrap": "^4.3.1", "bootstrap-daterangepicker": "^3.0.3", - "chart.js": "^2.7.3", + "chart.js": "^2.8.0", "i18next": "^13.1.4", "i18next-browser-languagedetector": "^2.2.4", "i18next-xhr-backend": "^2.0.1", From 8166461263f7109795c134ab5c21b1a364155ee3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 04:13:23 +0000 Subject: [PATCH 05/18] Bump react-transition-group from 2.5.3 to 4.0.1 Bumps [react-transition-group](https://github.com/reactjs/react-transition-group) from 2.5.3 to 4.0.1. - [Release notes](https://github.com/reactjs/react-transition-group/releases) - [Changelog](https://github.com/reactjs/react-transition-group/blob/master/CHANGELOG.md) - [Commits](https://github.com/reactjs/react-transition-group/compare/v2.5.3...v4.0.1) --- package-lock.json | 110 ++++++++++++++++++++++++++++++++++++++++++---- package.json | 2 +- 2 files changed, 102 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index e26690c..ef61deb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1071,7 +1071,6 @@ "version": "7.1.5", "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.1.5.tgz", "integrity": "sha512-xKnPpXG/pvK1B90JkwwxSGii90rQGKtzcMt2gI5G6+M0REXaq6rOHsGC2ay6/d0Uje7zzvSzjEzfR3ENhFlrfA==", - "dev": true, "requires": { "regenerator-runtime": "^0.12.0" }, @@ -1079,8 +1078,7 @@ "regenerator-runtime": { "version": "0.12.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", - "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==", - "dev": true + "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" } } }, @@ -1323,6 +1321,22 @@ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.2.tgz", "integrity": "sha512-NdBPF/RVwPW6jr0NCILuyN9RiqLo2b1mddWHkUL+VnvcB7dzlnBJ1bXYntjpTGOgkZiiLWj2JxmOr7eGE3qK6g==" }, + "dom-helpers": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", + "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", + "requires": { + "@babel/runtime": "^7.1.2" + } + }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, "reactstrap": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-7.1.0.tgz", @@ -1337,6 +1351,19 @@ "react-lifecycles-compat": "^3.0.4", "react-popper": "^0.10.4", "react-transition-group": "^2.3.1" + }, + "dependencies": { + "react-transition-group": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", + "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", + "requires": { + "dom-helpers": "^3.4.0", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2", + "react-lifecycles-compat": "^3.0.4" + } + } } }, "regenerator-runtime": { @@ -18975,6 +19002,37 @@ "prop-types-extra": "^1.0.1", "react-transition-group": "^2.2.0", "warning": "^3.0.0" + }, + "dependencies": { + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, + "react-transition-group": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", + "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", + "requires": { + "dom-helpers": "^3.4.0", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2", + "react-lifecycles-compat": "^3.0.4" + }, + "dependencies": { + "dom-helpers": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", + "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", + "requires": { + "@babel/runtime": "^7.1.2" + } + } + } + } } }, "react-perfect-scrollbar": { @@ -19180,16 +19238,23 @@ } }, "react-transition-group": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.5.3.tgz", - "integrity": "sha512-2DGFck6h99kLNr8pOFk+z4Soq3iISydwOFeeEVPjTN6+Y01CmvbWmnN02VuTWyFdnRtIDPe+wy2q6Ui8snBPZg==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.0.1.tgz", + "integrity": "sha512-SsLcBYhO4afXJC9esL8XMxi/y0ZvEc7To0TvtrBELqzpjXQHPZOTxvuPh2/4EhYc0uSMfp2SExIxsyJ0pBdNzg==", "requires": { - "dom-helpers": "^3.3.1", + "dom-helpers": "^3.4.0", "loose-envify": "^1.4.0", - "prop-types": "^15.6.2", - "react-lifecycles-compat": "^3.0.4" + "prop-types": "^15.6.2" }, "dependencies": { + "dom-helpers": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", + "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", + "requires": { + "@babel/runtime": "^7.1.2" + } + }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -19224,6 +19289,33 @@ "regenerator-runtime": "^0.12.0" } }, + "dom-helpers": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", + "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", + "requires": { + "@babel/runtime": "^7.1.2" + } + }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, + "react-transition-group": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", + "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", + "requires": { + "dom-helpers": "^3.4.0", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2", + "react-lifecycles-compat": "^3.0.4" + } + }, "regenerator-runtime": { "version": "0.12.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", diff --git a/package.json b/package.json index 96b014a..87f404a 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "react-i18next": "^9.0.7", "react-router-dom": "^4.3.1", "react-table": "^6.8.6", - "react-transition-group": "^2.5.3", + "react-transition-group": "^4.0.1", "reactstrap": "^7.1.0", "sha.js": "^2.4.11", "simple-line-icons": "^2.4.1" From 369c64fd2240eb6e2294b40dd203be34f483f844 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Sun, 26 May 2019 21:16:41 -0700 Subject: [PATCH 06/18] Remove react-transition-group This dependency was never directly used, but is used by other dependencies. As it is not directly used, we should allow the libraries to choose the correct version instead of us. Signed-off-by: Mcat12 --- package-lock.json | 28 ---------------------------- package.json | 1 - 2 files changed, 29 deletions(-) diff --git a/package-lock.json b/package-lock.json index ef61deb..26e0ba3 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19237,34 +19237,6 @@ } } }, - "react-transition-group": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.0.1.tgz", - "integrity": "sha512-SsLcBYhO4afXJC9esL8XMxi/y0ZvEc7To0TvtrBELqzpjXQHPZOTxvuPh2/4EhYc0uSMfp2SExIxsyJ0pBdNzg==", - "requires": { - "dom-helpers": "^3.4.0", - "loose-envify": "^1.4.0", - "prop-types": "^15.6.2" - }, - "dependencies": { - "dom-helpers": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", - "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", - "requires": { - "@babel/runtime": "^7.1.2" - } - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - } - } - }, "reactstrap": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-7.1.0.tgz", diff --git a/package.json b/package.json index 87f404a..8181de2 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,6 @@ "react-i18next": "^9.0.7", "react-router-dom": "^4.3.1", "react-table": "^6.8.6", - "react-transition-group": "^4.0.1", "reactstrap": "^7.1.0", "sha.js": "^2.4.11", "simple-line-icons": "^2.4.1" From edf4cb428a68d0190c4d64f6e15dee0267af1df5 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 04:21:27 +0000 Subject: [PATCH 07/18] Bump react-table from 6.8.6 to 6.10.0 Bumps [react-table](https://github.com/react-tools/react-table) from 6.8.6 to 6.10.0. - [Release notes](https://github.com/react-tools/react-table/releases) - [Changelog](https://github.com/tannerlinsley/react-table/blob/master/CHANGELOG.md) - [Commits](https://github.com/react-tools/react-table/commits) --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 26e0ba3..884508f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19210,9 +19210,9 @@ } }, "react-table": { - "version": "6.8.6", - "resolved": "https://registry.npmjs.org/react-table/-/react-table-6.8.6.tgz", - "integrity": "sha1-oK2LSDkxkFLVvvwBJgP7Fh5S7eM=", + "version": "6.10.0", + "resolved": "https://registry.npmjs.org/react-table/-/react-table-6.10.0.tgz", + "integrity": "sha512-s/mQLI1+mNvlae45MfAZyZ04YIT3jUzWJqx34s0tfwpDdgJkpeK6vyzwMUkKFCpGODBxpjBOekYZzcEmk+2FiQ==", "requires": { "classnames": "^2.2.5" } diff --git a/package.json b/package.json index 8181de2..113aecb 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "react-dom": "^16.8.6", "react-i18next": "^9.0.7", "react-router-dom": "^4.3.1", - "react-table": "^6.8.6", + "react-table": "^6.10.0", "reactstrap": "^7.1.0", "sha.js": "^2.4.11", "simple-line-icons": "^2.4.1" From da6a257c6b22dbfdf21232ff461d1ada6270d234 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 13:40:52 +0000 Subject: [PATCH 08/18] Bump typescript from 3.2.4 to 3.4.5 Bumps [typescript](https://github.com/Microsoft/TypeScript) from 3.2.4 to 3.4.5. - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Commits](https://github.com/Microsoft/TypeScript/compare/v3.2.4...v3.4.5) --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 884508f..79f68da 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21999,9 +21999,9 @@ "dev": true }, "typescript": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz", - "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==", + "version": "3.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz", + "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index 113aecb..d6de43e 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "prettier": "^1.15.3", "react-scripts": "^3.0.1", "react-test-renderer": "^16.8.6", - "typescript": "^3.2.4" + "typescript": "^3.4.5" }, "dependencies": { "@coreui/coreui": "^2.1.9", From f026d39c9e560bd9dc17d660382069eec34d5617 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 20:39:03 +0000 Subject: [PATCH 09/18] Bump enzyme-adapter-react-16 from 1.7.1 to 1.13.2 Bumps [enzyme-adapter-react-16](https://github.com/airbnb/enzyme/tree/HEAD/packages/enzyme-adapter-react-16) from 1.7.1 to 1.13.2. - [Release notes](https://github.com/airbnb/enzyme/releases) - [Changelog](https://github.com/airbnb/enzyme/blob/master/CHANGELOG.md) - [Commits](https://github.com/airbnb/enzyme/commits/enzyme-adapter-react-16@1.13.2/packages/enzyme-adapter-react-16) --- package-lock.json | 328 +++++++++++++++++++++++++++++++++++++++++++--- package.json | 2 +- 2 files changed, 310 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 79f68da..594f1b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3207,6 +3207,61 @@ "integrity": "sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==", "dev": true }, + "airbnb-prop-types": { + "version": "2.13.2", + "resolved": "https://registry.npmjs.org/airbnb-prop-types/-/airbnb-prop-types-2.13.2.tgz", + "integrity": "sha512-2FN6DlHr6JCSxPPi25EnqGaXC4OC3/B3k1lCd6MMYrZ51/Gf/1qDfaR+JElzWa+Tl7cY2aYOlsYJGFeQyVHIeQ==", + "dev": true, + "requires": { + "array.prototype.find": "^2.0.4", + "function.prototype.name": "^1.1.0", + "has": "^1.0.3", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object.assign": "^4.1.0", + "object.entries": "^1.1.0", + "prop-types": "^15.7.2", + "prop-types-exact": "^1.2.0", + "react-is": "^16.8.6" + }, + "dependencies": { + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "dev": true, + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + }, + "react-is": { + "version": "16.8.6", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", + "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==", + "dev": true + } + } + }, "ajv": { "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", @@ -3697,6 +3752,82 @@ "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", "dev": true }, + "array.prototype.find": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array.prototype.find/-/array.prototype.find-2.1.0.tgz", + "integrity": "sha512-Wn41+K1yuO5p7wRZDl7890c3xvv5UBrfVXTVIe28rSQb6LS0fZMDrQB6PAcxQFRFy6vJTLDc3A2+3CjQdzVKRg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.13.0" + }, + "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "es-abstract": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", + "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.0", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "is-callable": "^1.1.4", + "is-regex": "^1.0.4", + "object-keys": "^1.0.12" + } + }, + "es-to-primitive": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", + "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, + "is-callable": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", + "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", + "dev": true + }, + "is-symbol": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", + "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "dev": true, + "requires": { + "has-symbols": "^1.0.0" + } + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + } + } + }, "array.prototype.flat": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz", @@ -6951,44 +7082,175 @@ } }, "enzyme-adapter-react-16": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.7.1.tgz", - "integrity": "sha512-OQXKgfHWyHN3sFu2nKj3mhgRcqIPIJX6aOzq5AHVFES4R9Dw/vCBZFMPyaG81g2AZ5DogVh39P3MMNUbqNLTcw==", + "version": "1.13.2", + "resolved": "https://registry.npmjs.org/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.13.2.tgz", + "integrity": "sha512-h0neTuAAFfQUgEZ+PPHVIMDFJ9+CGafI8AjojNlSVh4Fd1pLDgtl2OeVkm4yKF7RSgzrPAwugq4JW8Jjo2iRJA==", "dev": true, "requires": { - "enzyme-adapter-utils": "^1.9.0", - "function.prototype.name": "^1.1.0", + "enzyme-adapter-utils": "^1.12.0", + "has": "^1.0.3", "object.assign": "^4.1.0", - "object.values": "^1.0.4", - "prop-types": "^15.6.2", - "react-is": "^16.6.1", - "react-test-renderer": "^16.0.0-0" + "object.values": "^1.1.0", + "prop-types": "^15.7.2", + "react-is": "^16.8.6", + "react-test-renderer": "^16.0.0-0", + "semver": "^5.7.0" }, "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "es-abstract": { + "version": "1.13.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", + "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.0", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "is-callable": "^1.1.4", + "is-regex": "^1.0.4", + "object-keys": "^1.0.12" + } + }, + "es-to-primitive": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", + "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, + "is-callable": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", + "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", + "dev": true + }, + "is-symbol": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", + "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "dev": true, + "requires": { + "has-symbols": "^1.0.0" + } + }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + }, + "object.values": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz", + "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.12.0", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "dev": true, + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + }, "react-is": { - "version": "16.7.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.7.0.tgz", - "integrity": "sha512-Z0VRQdF4NPDoI0tsXVMLkJLiwEBa+RP66g0xDHxgxysxSoCUccSten4RTF/UFvZF1dZvZ9Zu1sx+MDXwcOR34g==", + "version": "16.8.6", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", + "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==", + "dev": true + }, + "semver": { + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true } } }, "enzyme-adapter-utils": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.9.1.tgz", - "integrity": "sha512-LWc88BbKztLXlpRf5Ba/pSMJRaNezAwZBvis3N/IuB65ltZEh2E2obWU9B36pAbw7rORYeBUuqc79OL17ZzN1A==", + "version": "1.12.0", + "resolved": "https://registry.npmjs.org/enzyme-adapter-utils/-/enzyme-adapter-utils-1.12.0.tgz", + "integrity": "sha512-wkZvE0VxcFx/8ZsBw0iAbk3gR1d9hK447ebnSYBf95+r32ezBq+XDSAvRErkc4LZosgH8J7et7H7/7CtUuQfBA==", "dev": true, "requires": { + "airbnb-prop-types": "^2.13.2", "function.prototype.name": "^1.1.0", "object.assign": "^4.1.0", - "prop-types": "^15.6.2", + "object.fromentries": "^2.0.0", + "prop-types": "^15.7.2", "semver": "^5.6.0" }, "dependencies": { + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, + "prop-types": { + "version": "15.7.2", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", + "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", + "dev": true, + "requires": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.8.1" + } + }, + "react-is": { + "version": "16.8.6", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", + "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==", + "dev": true + }, "semver": { - "version": "5.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz", - "integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==", + "version": "5.7.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", + "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==", "dev": true } } @@ -18306,6 +18568,28 @@ "object-assign": "^4.1.1" } }, + "prop-types-exact": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/prop-types-exact/-/prop-types-exact-1.2.0.tgz", + "integrity": "sha512-K+Tk3Kd9V0odiXFP9fwDHUYRyvK3Nun3GVyPapSIs5OBkITAm15W0CPFD/YKTkMUAbc0b9CUwRQp2ybiBIq+eA==", + "dev": true, + "requires": { + "has": "^1.0.3", + "object.assign": "^4.1.0", + "reflect.ownkeys": "^0.2.0" + }, + "dependencies": { + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + } + } + }, "prop-types-extra": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.0.tgz", @@ -19441,6 +19725,12 @@ "strip-indent": "^1.0.1" } }, + "reflect.ownkeys": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz", + "integrity": "sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=", + "dev": true + }, "regenerate": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", diff --git a/package.json b/package.json index d6de43e..2a577a1 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@types/reactstrap": "^6.4.4", "@types/sha.js": "^2.4.0", "enzyme": "^3.8.0", - "enzyme-adapter-react-16": "^1.7.1", + "enzyme-adapter-react-16": "^1.13.2", "faker": "^4.1.0", "fetch-mock": "^7.3.0", "fs-extra": "^8.0.1", From c8e654b2cf4cc68d0ade879f4f563f885cc2fc37 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 20:47:21 +0000 Subject: [PATCH 10/18] Bump @types/chart.js from 2.7.42 to 2.7.52 Bumps [@types/chart.js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chart.js) from 2.7.42 to 2.7.52. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chart.js) --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 594f1b7..e8cfccd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2615,9 +2615,9 @@ } }, "@types/chart.js": { - "version": "2.7.42", - "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.7.42.tgz", - "integrity": "sha512-+0v+PV2J9wsV7u36Vqt5Oke7ugtiZqNeYJgNk5mgNMkEkqtjxo2Q9N5Q9znHlgmXeOTfQL6e1sfcAbTnPHAzlA==", + "version": "2.7.52", + "resolved": "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.7.52.tgz", + "integrity": "sha512-h4Md9c0FYPoqHyPeo3sG+wBIDFGz6GubulKUopsmFkSSW2ieyI2phjlj+FjqzTwhrWwR9dbw/HlCW3axj+tWug==", "dev": true }, "@types/cheerio": { diff --git a/package.json b/package.json index 2a577a1..36af7d6 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "private": true, "homepage": ".", "devDependencies": { - "@types/chart.js": "^2.7.42", + "@types/chart.js": "^2.7.52", "@types/enzyme": "^3.9.3", "@types/enzyme-adapter-react-16": "^1.0.5", "@types/fetch-mock": "^7.2.1", From 29f1a4e2d81980b21843f04cd51140e42e6d3c88 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Mon, 27 May 2019 13:54:36 -0700 Subject: [PATCH 11/18] Fix type errors in chart tooltip callbacks Signed-off-by: Mcat12 --- src/components/dashboard/ClientsGraph.tsx | 3 ++- src/components/dashboard/QueriesGraph.tsx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/dashboard/ClientsGraph.tsx b/src/components/dashboard/ClientsGraph.tsx index 3ad42f2..dccaade 100644 --- a/src/components/dashboard/ClientsGraph.tsx +++ b/src/components/dashboard/ClientsGraph.tsx @@ -52,7 +52,8 @@ class ClientsGraph extends Component { }, callbacks: { title: tooltipItem => { - const time = tooltipItem[0].xLabel!.match(/(\d?\d):?(\d?\d?)/); + const timeStr = tooltipItem[0].xLabel! as string; + const time = timeStr.match(/(\d?\d):?(\d?\d?)/); const hour = parseInt(time![1], 10); const minute = parseInt(time![2], 10) || 0; const from = padNumber(hour) + ":" + padNumber(minute - 5) + ":00"; diff --git a/src/components/dashboard/QueriesGraph.tsx b/src/components/dashboard/QueriesGraph.tsx index 759bfb9..41c2546 100644 --- a/src/components/dashboard/QueriesGraph.tsx +++ b/src/components/dashboard/QueriesGraph.tsx @@ -70,7 +70,8 @@ class QueriesGraph extends Component { mode: "x-axis", callbacks: { title: tooltipItem => { - const time = tooltipItem[0].xLabel!.match(/(\d?\d):?(\d?\d?)/); + const timeStr = tooltipItem[0].xLabel! as string; + const time = timeStr.match(/(\d?\d):?(\d?\d?)/); const hour = parseInt(time![1], 10); const minute = parseInt(time![2], 10) || 0; const from = padNumber(hour) + ":" + padNumber(minute - 5) + ":00"; From acf1225e23949426510711d111b459a281451a70 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 21:07:08 +0000 Subject: [PATCH 12/18] Bump react-router-dom from 4.3.1 to 5.0.0 Bumps [react-router-dom](https://github.com/ReactTraining/react-router) from 4.3.1 to 5.0.0. - [Release notes](https://github.com/ReactTraining/react-router/releases) - [Commits](https://github.com/ReactTraining/react-router/compare/v4.3.1...v5.0.0) --- package-lock.json | 160 +++++++++++++++++++++++++++++----------------- package.json | 2 +- 2 files changed, 103 insertions(+), 59 deletions(-) diff --git a/package-lock.json b/package-lock.json index e8cfccd..f95aba7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1329,6 +1329,19 @@ "@babel/runtime": "^7.1.2" } }, + "hoist-non-react-statics": { + "version": "2.5.5", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz", + "integrity": "sha512-rqcy4pJo55FTTLWt+bU8ukscqHeE/e9KWvsOW2b/a3afxQZhwkQdT1rPPCJ0rYXdj4vNcasY8zHTH+jF/qStxw==" + }, + "invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "requires": { + "loose-envify": "^1.0.0" + } + }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -1337,6 +1350,33 @@ "js-tokens": "^3.0.0 || ^4.0.0" } }, + "react-router": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz", + "integrity": "sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==", + "requires": { + "history": "^4.7.2", + "hoist-non-react-statics": "^2.5.0", + "invariant": "^2.2.4", + "loose-envify": "^1.3.1", + "path-to-regexp": "^1.7.0", + "prop-types": "^15.6.1", + "warning": "^4.0.1" + } + }, + "react-router-dom": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.3.1.tgz", + "integrity": "sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==", + "requires": { + "history": "^4.7.2", + "invariant": "^2.2.4", + "loose-envify": "^1.3.1", + "prop-types": "^15.6.1", + "react-router": "^4.3.1", + "warning": "^4.0.1" + } + }, "reactstrap": { "version": "7.1.0", "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-7.1.0.tgz", @@ -1370,6 +1410,14 @@ "version": "0.12.1", "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" + }, + "warning": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "requires": { + "loose-envify": "^1.0.0" + } } } }, @@ -10338,15 +10386,16 @@ "dev": true }, "history": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/history/-/history-4.7.2.tgz", - "integrity": "sha512-1zkBRWW6XweO0NBcjiphtVJVsIQ+SXF29z9DVkceeaSLVMFXHool+fdCZD4spDCfZJCILPILc3bm7Bc+HRi0nA==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/history/-/history-4.9.0.tgz", + "integrity": "sha512-H2DkjCjXf0Op9OAr6nJ56fcRkTSNrUiv41vNJ6IswJjif6wlpZK0BTfFbi7qK9dXLSYZxkq5lBsj3vUjlYBYZA==", "requires": { - "invariant": "^2.2.1", + "@babel/runtime": "^7.1.2", "loose-envify": "^1.2.0", "resolve-pathname": "^2.2.0", - "value-equal": "^0.4.0", - "warning": "^3.0.0" + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0", + "value-equal": "^0.4.0" } }, "hmac-drbg": { @@ -10361,9 +10410,19 @@ } }, "hoist-non-react-statics": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-2.5.0.tgz", - "integrity": "sha512-6Bl6XsDT1ntE0lHbIhr4Kp2PGcleGZ66qu5Jqk8lc0Xc/IeG6gVLmwUGs/K0Us+L8VWoKgj0uWdPMataOsm31w==" + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz", + "integrity": "sha512-0XsbTXxgiaCDYDIWFcwkmerZPSwywfUqYmwT4jzewKTQSWoE6FCMoUVOeBJWK3E/CrWbxRG3m5GzY4lnIwGRBA==", + "requires": { + "react-is": "^16.7.0" + }, + "dependencies": { + "react-is": { + "version": "16.8.6", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", + "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==" + } + } }, "hosted-git-info": { "version": "2.5.0", @@ -19338,66 +19397,41 @@ } }, "react-router": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-4.3.1.tgz", - "integrity": "sha512-yrvL8AogDh2X42Dt9iknk4wF4V8bWREPirFfS9gLU1huk6qK41sg7Z/1S81jjTrGHxa3B8R3J6xIkDAA6CVarg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-5.0.0.tgz", + "integrity": "sha512-6EQDakGdLG/it2x9EaCt9ZpEEPxnd0OCLBHQ1AcITAAx7nCnyvnzf76jKWG1s2/oJ7SSviUgfWHofdYljFexsA==", "requires": { - "history": "^4.7.2", - "hoist-non-react-statics": "^2.5.0", - "invariant": "^2.2.4", + "@babel/runtime": "^7.1.2", + "create-react-context": "^0.2.2", + "history": "^4.9.0", + "hoist-non-react-statics": "^3.1.0", "loose-envify": "^1.3.1", "path-to-regexp": "^1.7.0", - "prop-types": "^15.6.1", - "warning": "^4.0.1" + "prop-types": "^15.6.2", + "react-is": "^16.6.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" }, "dependencies": { - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "requires": { - "loose-envify": "^1.0.0" - } - }, - "warning": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.1.tgz", - "integrity": "sha512-rAVtTNZw+cQPjvGp1ox0XC5Q2IBFyqoqh+QII4J/oguyu83Bax1apbo2eqB8bHRS+fqYUBagys6lqUoVwKSmXQ==", - "requires": { - "loose-envify": "^1.0.0" - } + "react-is": { + "version": "16.8.6", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", + "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==" } } }, "react-router-dom": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-4.3.1.tgz", - "integrity": "sha512-c/MlywfxDdCp7EnB7YfPMOfMD3tOtIjrQlj/CKfNMBxdmpJP8xcz5P/UAFn3JbnQCNUxsHyVVqllF9LhgVyFCA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-5.0.0.tgz", + "integrity": "sha512-wSpja5g9kh5dIteZT3tUoggjnsa+TPFHSMrpHXMpFsaHhQkm/JNVGh2jiF9Dkh4+duj4MKCkwO6H08u6inZYgQ==", "requires": { - "history": "^4.7.2", - "invariant": "^2.2.4", + "@babel/runtime": "^7.1.2", + "history": "^4.9.0", "loose-envify": "^1.3.1", - "prop-types": "^15.6.1", - "react-router": "^4.3.1", - "warning": "^4.0.1" - }, - "dependencies": { - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "requires": { - "loose-envify": "^1.0.0" - } - }, - "warning": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.1.tgz", - "integrity": "sha512-rAVtTNZw+cQPjvGp1ox0XC5Q2IBFyqoqh+QII4J/oguyu83Bax1apbo2eqB8bHRS+fqYUBagys6lqUoVwKSmXQ==", - "requires": { - "loose-envify": "^1.0.0" - } - } + "prop-types": "^15.6.2", + "react-router": "5.0.0", + "tiny-invariant": "^1.0.2", + "tiny-warning": "^1.0.0" } }, "react-scripts": { @@ -22070,6 +22104,16 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tiny-invariant": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.0.4.tgz", + "integrity": "sha512-lMhRd/djQJ3MoaHEBrw8e2/uM4rs9YMNk0iOr8rHQ0QdbM7D4l0gFl3szKdeixrlyfm9Zqi4dxHCM2qVG8ND5g==" + }, + "tiny-warning": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.2.tgz", + "integrity": "sha512-rru86D9CpQRLvsFG5XFdy0KdLAvjdQDyZCsRcuu60WtzFylDM3eAWSxEVz5kzL2Gp544XiUvPbVKtOA/txLi9Q==" + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", diff --git a/package.json b/package.json index 36af7d6..effaf8c 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "react-chartjs-2": "^2.7.4", "react-dom": "^16.8.6", "react-i18next": "^9.0.7", - "react-router-dom": "^4.3.1", + "react-router-dom": "^5.0.0", "react-table": "^6.10.0", "reactstrap": "^7.1.0", "sha.js": "^2.4.11", From c34b9b9be38172d7e6c081f35ecd9a0f0ae42eb0 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Mon, 27 May 2019 14:27:50 -0700 Subject: [PATCH 13/18] Fix react-table crash when no action is available for a row The render method was not returning anything if nothing was to be shown, but it should have been returning null. This was introduced in a previous dependency upgrade, but was only found while testing this one. See tannerlinsley/react-table#1286 Signed-off-by: Mcat12 --- src/components/log/QueryLog.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/components/log/QueryLog.tsx b/src/components/log/QueryLog.tsx index 16aa3fb..ab11b26 100644 --- a/src/components/log/QueryLog.tsx +++ b/src/components/log/QueryLog.tsx @@ -528,7 +528,7 @@ const columns = (t: i18next.TranslationFunction) => [ // Not explicitly blocked (or is whitelisted), but could be blocked. // This includes externally blocked. - if ([2, 3, 6].includes(data.row.status)) + if ([2, 3, 6].includes(data.row.status)) { return ( ); + } + + return null; } } ]; From c92a1eb3c1e5130d030bab854a855cdf24d3759b Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 21:32:37 +0000 Subject: [PATCH 14/18] Bump reactstrap from 7.1.0 to 8.0.0 Bumps [reactstrap](https://github.com/reactstrap/reactstrap) from 7.1.0 to 8.0.0. - [Release notes](https://github.com/reactstrap/reactstrap/releases) - [Changelog](https://github.com/reactstrap/reactstrap/blob/master/CHANGELOG.md) - [Commits](https://github.com/reactstrap/reactstrap/compare/7.1.0...8.0.0) --- package-lock.json | 89 +++++++++++++++++++++++++++++------------------ package.json | 2 +- 2 files changed, 57 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index f95aba7..cdbb10c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19555,30 +19555,17 @@ } } }, - "reactstrap": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-7.1.0.tgz", - "integrity": "sha512-wtc4RkgnGn1TsZ0AxOZ2OqT+b8YmCWZj/tErPujWLepxzlEEhveZGC+uDerdaHVSAzJUP2DTk605iper7hutQQ==", + "react-transition-group": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", + "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", "requires": { - "@babel/runtime": "^7.2.0", - "classnames": "^2.2.3", - "lodash.isfunction": "^3.0.9", - "lodash.isobject": "^3.0.2", - "lodash.tonumber": "^4.0.3", - "prop-types": "^15.5.8", - "react-lifecycles-compat": "^3.0.4", - "react-popper": "^0.10.4", - "react-transition-group": "^2.3.1" + "dom-helpers": "^3.4.0", + "loose-envify": "^1.4.0", + "prop-types": "^15.6.2", + "react-lifecycles-compat": "^3.0.4" }, "dependencies": { - "@babel/runtime": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.2.0.tgz", - "integrity": "sha512-oouEibCbHMVdZSDlJBO6bZmID/zA/G/Qx3H1d3rSNPTD+L8UNKvCat7aKWSJ74zYbm5zWGh0GQN0hKj8zYFTCg==", - "requires": { - "regenerator-runtime": "^0.12.0" - } - }, "dom-helpers": { "version": "3.4.0", "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", @@ -19594,22 +19581,58 @@ "requires": { "js-tokens": "^3.0.0 || ^4.0.0" } - }, - "react-transition-group": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz", - "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==", + } + } + }, + "reactstrap": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/reactstrap/-/reactstrap-8.0.0.tgz", + "integrity": "sha512-Rd7MyaFnZZXe1lbeBlgkxzyv+u7Z/ots0yYoO6ijT7/0uGsNwB1ch2h2t7Tf6u05jpbTFlLD+lyBEER0eibcQw==", + "requires": { + "@babel/runtime": "^7.2.0", + "classnames": "^2.2.3", + "lodash.isfunction": "^3.0.9", + "lodash.isobject": "^3.0.2", + "lodash.tonumber": "^4.0.3", + "prop-types": "^15.5.8", + "react-lifecycles-compat": "^3.0.4", + "react-popper": "^1.3.3", + "react-transition-group": "^2.3.1" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.4.5", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.4.5.tgz", + "integrity": "sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==", "requires": { - "dom-helpers": "^3.4.0", - "loose-envify": "^1.4.0", - "prop-types": "^15.6.2", - "react-lifecycles-compat": "^3.0.4" + "regenerator-runtime": "^0.13.2" + } + }, + "react-popper": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.3.tgz", + "integrity": "sha512-ynMZBPkXONPc5K4P5yFWgZx5JGAUIP3pGGLNs58cfAPgK67olx7fmLp+AdpZ0+GoQ+ieFDa/z4cdV6u7sioH6w==", + "requires": { + "@babel/runtime": "^7.1.2", + "create-react-context": "<=0.2.2", + "popper.js": "^1.14.4", + "prop-types": "^15.6.1", + "typed-styles": "^0.0.7", + "warning": "^4.0.2" } }, "regenerator-runtime": { - "version": "0.12.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz", - "integrity": "sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==" + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz", + "integrity": "sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==" + }, + "warning": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "requires": { + "loose-envify": "^1.0.0" + } } } }, diff --git a/package.json b/package.json index effaf8c..d68f7c8 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "react-i18next": "^9.0.7", "react-router-dom": "^5.0.0", "react-table": "^6.10.0", - "reactstrap": "^7.1.0", + "reactstrap": "^8.0.0", "sha.js": "^2.4.11", "simple-line-icons": "^2.4.1" }, From 7207c4719864effd2a6d766e3ec530f9f7719257 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" Date: Mon, 27 May 2019 21:38:33 +0000 Subject: [PATCH 15/18] Bump @types/reactstrap from 6.4.4 to 8.0.1 Bumps [@types/reactstrap](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/reactstrap) from 6.4.4 to 8.0.1. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/reactstrap) Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index cdbb10c..bbb01f7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2876,9 +2876,9 @@ } }, "@types/reactstrap": { - "version": "6.4.4", - "resolved": "https://registry.npmjs.org/@types/reactstrap/-/reactstrap-6.4.4.tgz", - "integrity": "sha512-UlR5HIitjdbce/+INRwvqq6UZEjpB0hCnbTBalZbTCLGKqWQDZcCxsy5+R/IJFb+Hv6zmGsz6TlDwnikK9D7IQ==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@types/reactstrap/-/reactstrap-8.0.1.tgz", + "integrity": "sha512-Gn3u6zAFxfBcxDxEMbyUC/A+zS8KpKNg/gKjdFLHug+sG4XOMUaychNiA5buRLeh0r3s+amsjD+xrX8gT612YA==", "dev": true, "requires": { "@types/react": "*", diff --git a/package.json b/package.json index d68f7c8..df873ec 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "@types/react-dom": "^16.8.2", "@types/react-router-dom": "^4.3.3", "@types/react-table": "^6.8.1", - "@types/reactstrap": "^6.4.4", + "@types/reactstrap": "^8.0.1", "@types/sha.js": "^2.4.0", "enzyme": "^3.8.0", "enzyme-adapter-react-16": "^1.13.2", From b3352edbf8ee373b11178fb070863a4e82278c80 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Mon, 27 May 2019 17:21:18 -0700 Subject: [PATCH 16/18] Add missing return type for validation functions Signed-off-by: Mcat12 --- src/util/validate.tsx | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/util/validate.tsx b/src/util/validate.tsx index cbdd01a..f6ea274 100644 --- a/src/util/validate.tsx +++ b/src/util/validate.tsx @@ -8,7 +8,7 @@ * This file is copyright under the latest version of the EUPL. * Please see LICENSE file for your rights under this license. */ -export function isValidHostname(hostname: string) { +export function isValidHostname(hostname: string): boolean { // Must not exceed 253 characters total if (hostname.length > 253) return false; // Each segment must not exceed 63 characters @@ -28,7 +28,7 @@ export function isValidHostname(hostname: string) { ); } -export function isValidDomain(domain: string) { +export function isValidDomain(domain: string): boolean { // Make sure it's a fully qualified domain const split = domain.split("."); // Has to have at least 2 segments, of at least 1 character each @@ -36,13 +36,13 @@ export function isValidDomain(domain: string) { return isValidHostname(domain); } -export function isPositiveNumber(input: string) { +export function isPositiveNumber(input: string): boolean { // Because parseInt has limitations, e.g. parseInt("15ex") is parsed to 15 // Caution, does not work with negative numbers, replace with /^(\-|\+)?([0-9])$/ if needed return /^[0-9]+$/.test(input); } -export function isValidRegex(regex: string) { +export function isValidRegex(regex: string): boolean { try { new RegExp(regex); } catch (e) { @@ -57,7 +57,7 @@ export function isValidRegex(regex: string) { * @param address {string} the address to check * @returns {boolean} if the address is a valid IPv4 address */ -export function isValidIpv4(address: string) { +export function isValidIpv4(address: string): boolean { const segments = address.split("."); // Must have 4 segments @@ -80,7 +80,7 @@ export function isValidIpv4(address: string) { * @returns {boolean} if the address is a valid IPv4 address and the port * (if it exists) is valid. */ -export function isValidIpv4OptionalPort(address: string) { +export function isValidIpv4OptionalPort(address: string): boolean { const split = address.split(":"); const ipv4 = split[0]; From 6bb15d607dafb3ab0b07520abbbfccab6079b165 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Mon, 27 May 2019 17:40:48 -0700 Subject: [PATCH 17/18] Add isValidIpv6OptionalPort Signed-off-by: Mcat12 --- src/util/__tests__/validate.test.tsx | 33 ++++++++++++++++++++++++++++ src/util/validate.tsx | 14 ++++++++++++ 2 files changed, 47 insertions(+) diff --git a/src/util/__tests__/validate.test.tsx b/src/util/__tests__/validate.test.tsx index 3e9eb34..58f5bf0 100644 --- a/src/util/__tests__/validate.test.tsx +++ b/src/util/__tests__/validate.test.tsx @@ -13,6 +13,7 @@ import { isValidDomain, isValidIpv4, isValidIpv4OptionalPort, + isValidIpv6OptionalPort, isValidRegex } from "../validate"; @@ -227,4 +228,36 @@ describe("Testing the validation functions", () => { expect(isValidIpv4OptionalPort("127.0.0.1#53")).toBe(false); }); }); + + describe("isValidIpv6OptionalPort", () => { + it("passes 1fff:0:a88:85a3::ac1f", () => { + expect(isValidIpv6OptionalPort("1fff:0:a88:85a3::ac1f")).toBe(true); + }); + + it("passes ::1", () => { + expect(isValidIpv6OptionalPort("::1")).toBe(true); + }); + + it("passes [::1]:5353", () => { + expect(isValidIpv6OptionalPort("[::1]:5353")).toBe(true); + }); + + it("passes [1fff:0:a88:85a3::ac1f]:8001", () => { + expect(isValidIpv6OptionalPort("[1fff:0:a88:85a3::ac1f]:8001")).toBe( + true + ); + }); + + it("fails 192.168.1.1", () => { + expect(isValidIpv6OptionalPort("192.168.1.1")).toBe(false); + }); + + it("fails 192.168.1.1:53", () => { + expect(isValidIpv6OptionalPort("192.168.1.1:53")).toBe(false); + }); + + it("fails [::1]", () => { + expect(isValidIpv6OptionalPort("[::1]")).toBe(false); + }); + }); }); diff --git a/src/util/validate.tsx b/src/util/validate.tsx index f6ea274..b428ece 100644 --- a/src/util/validate.tsx +++ b/src/util/validate.tsx @@ -94,3 +94,17 @@ export function isValidIpv4OptionalPort(address: string): boolean { split.length === 1 || (split.length === 2 && isPositiveNumber(split[1])) ); } + +/** + * Check if the string is a valid IPv6 address, and it can contain an optional + * port. This function does not do a thorough check of the IPv6 address; the + * backend will check it in detail. + * Examples: + * 1fff:0:a88:85a3::ac1f + * [1fff:0:a88:85a3::ac1f]:8001 + * + * @param address The IPv6 address + */ +export function isValidIpv6OptionalPort(address: string): boolean { + return /^(\[[a-fA-F0-9:]+]:\d+|[a-fA-F0-9:]+)$/.test(address); +} From ede891c9e1ed9d8b37f320f18ff12ab4b0b3b6a9 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Mon, 27 May 2019 17:47:32 -0700 Subject: [PATCH 18/18] Allow IPv6 upstreams in the DNS settings Signed-off-by: Mcat12 --- src/components/settings/DnsList.tsx | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/components/settings/DnsList.tsx b/src/components/settings/DnsList.tsx index 5668536..1c696ef 100644 --- a/src/components/settings/DnsList.tsx +++ b/src/components/settings/DnsList.tsx @@ -12,7 +12,10 @@ import React from "react"; import { ListGroup } from "reactstrap"; import DnsListItem from "./DnsListItem"; import DnsListNewItem from "./DnsListNewItem"; -import { isValidIpv4OptionalPort } from "../../util/validate"; +import { + isValidIpv4OptionalPort, + isValidIpv6OptionalPort +} from "../../util/validate"; export interface DnsListProps { upstreams: Array; @@ -27,8 +30,15 @@ export interface DnsListProps { * @param upstreams the list of current upstreams * @returns {boolean} if the upstream address is unique and valid */ -export const isAddressValid = (address: string, upstreams: Array) => - !upstreams.includes(address) && isValidIpv4OptionalPort(address); +export const isAddressValid = ( + address: string, + upstreams: Array +): boolean => { + return ( + !upstreams.includes(address) && + (isValidIpv4OptionalPort(address) || isValidIpv6OptionalPort(address)) + ); +}; const DnsList = ({ upstreams, onAdd, onRemove }: DnsListProps) => (