diff --git a/package-lock.json b/package-lock.json index 7c1a06a262..8edec5596d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -27,6 +27,7 @@ "d3-scale": "^4.0.2", "d3-shape": "^3.2.0", "downshift": "^9.0.7", + "eslint-plugin-header": "^3.1.1", "fast-deep-equal": "^3.1.3", "fast-xml-parser": "^4.4.1", "history": "^4.10.1", @@ -96,7 +97,6 @@ "version": "1.2.6", "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -2684,7 +2684,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, "dependencies": { "eslint-visitor-keys": "^3.3.0" }, @@ -2699,7 +2698,6 @@ "version": "4.10.0", "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", - "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -2708,7 +2706,6 @@ "version": "2.1.4", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", - "dev": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -2731,7 +2728,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2741,7 +2737,6 @@ "version": "13.24.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, "dependencies": { "type-fest": "^0.20.2" }, @@ -2756,7 +2751,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -2768,7 +2762,6 @@ "version": "8.57.0", "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", - "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -2843,7 +2836,6 @@ "version": "0.11.14", "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", - "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^2.0.2", "debug": "^4.3.1", @@ -2857,7 +2849,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2867,7 +2858,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -2879,7 +2869,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", - "dev": true, "engines": { "node": ">=12.22" }, @@ -2891,8 +2880,7 @@ "node_modules/@humanwhocodes/object-schema": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "dev": true + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==" }, "node_modules/@isaacs/cliui": { "version": "8.0.2", @@ -3128,7 +3116,6 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", - "dev": true, "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -3141,7 +3128,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", - "dev": true, "engines": { "node": ">= 8" } @@ -3150,7 +3136,6 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "dev": true, "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -4423,8 +4408,7 @@ "node_modules/@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", - "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==" }, "node_modules/@visx/axis": { "version": "3.10.1", @@ -4774,7 +4758,6 @@ "version": "8.11.3", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", - "dev": true, "bin": { "acorn": "bin/acorn" }, @@ -4786,7 +4769,6 @@ "version": "5.3.2", "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", - "dev": true, "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -4807,7 +4789,6 @@ "version": "6.12.6", "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", - "dev": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -4850,7 +4831,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "dev": true, "engines": { "node": ">=8" } @@ -4859,7 +4839,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -4886,8 +4865,7 @@ "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, "node_modules/aria-hidden": { "version": "1.2.4", @@ -5438,7 +5416,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -5541,7 +5518,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, "dependencies": { "color-name": "~1.1.4" }, @@ -5552,8 +5528,7 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/colorette": { "version": "2.0.20", @@ -5588,8 +5563,7 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "node_modules/convert-source-map": { "version": "2.0.0", @@ -5656,7 +5630,6 @@ "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -6001,8 +5974,7 @@ "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" }, "node_modules/deepmerge": { "version": "4.3.1", @@ -6093,7 +6065,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "dev": true, "dependencies": { "esutils": "^2.0.2" }, @@ -6405,7 +6376,6 @@ "version": "8.57.0", "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", - "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -6600,7 +6570,6 @@ "version": "7.2.2", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", - "dev": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -6616,7 +6585,6 @@ "version": "3.4.3", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -6628,7 +6596,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6638,7 +6605,6 @@ "version": "13.24.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", - "dev": true, "dependencies": { "type-fest": "^0.20.2" }, @@ -6653,7 +6619,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -6665,7 +6630,6 @@ "version": "9.6.1", "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", - "dev": true, "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -6695,7 +6659,6 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", - "dev": true, "dependencies": { "estraverse": "^5.1.0" }, @@ -6707,7 +6670,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", - "dev": true, "dependencies": { "estraverse": "^5.2.0" }, @@ -6719,7 +6681,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", - "dev": true, "engines": { "node": ">=4.0" } @@ -6865,14 +6826,12 @@ "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, "node_modules/fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" }, "node_modules/fast-xml-parser": { "version": "4.4.1", @@ -6899,7 +6858,6 @@ "version": "1.17.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", - "dev": true, "dependencies": { "reusify": "^1.0.4" } @@ -6914,7 +6872,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", - "dev": true, "dependencies": { "flat-cache": "^3.0.4" }, @@ -6943,7 +6900,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", - "dev": true, "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -6959,7 +6915,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", - "dev": true, "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -6972,8 +6927,7 @@ "node_modules/flatted": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", - "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", - "dev": true + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==" }, "node_modules/for-each": { "version": "0.3.3", @@ -7035,8 +6989,7 @@ "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" }, "node_modules/fsevents": { "version": "2.3.3", @@ -7172,7 +7125,6 @@ "version": "7.2.3", "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "dev": true, "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -7192,7 +7144,6 @@ "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", - "dev": true, "dependencies": { "is-glob": "^4.0.3" }, @@ -7204,7 +7155,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7214,7 +7164,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, "dependencies": { "brace-expansion": "^1.1.7" }, @@ -7279,8 +7228,7 @@ "node_modules/graphemer": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" }, "node_modules/has-bigints": { "version": "1.0.2", @@ -7295,7 +7243,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, "engines": { "node": ">=8" } @@ -7661,7 +7608,6 @@ "version": "5.3.1", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", - "dev": true, "engines": { "node": ">= 4" } @@ -7694,7 +7640,6 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", - "dev": true, "engines": { "node": ">=0.8.19" } @@ -7712,7 +7657,6 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -7721,8 +7665,7 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/internal-slot": { "version": "1.0.7", @@ -7908,7 +7851,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -7956,7 +7898,6 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", - "dev": true, "dependencies": { "is-extglob": "^2.1.1" }, @@ -8016,7 +7957,6 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", - "dev": true, "engines": { "node": ">=8" } @@ -8172,8 +8112,7 @@ "node_modules/isexe": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", - "dev": true + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/istanbul-lib-coverage": { "version": "3.2.2", @@ -8292,7 +8231,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", - "dev": true, "dependencies": { "argparse": "^2.0.1" }, @@ -8354,8 +8292,7 @@ "node_modules/json-buffer": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==" }, "node_modules/json-parse-better-errors": { "version": "1.0.2", @@ -8371,8 +8308,7 @@ "node_modules/json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" }, "node_modules/json-stable-stringify": { "version": "1.1.1", @@ -8395,8 +8331,7 @@ "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" }, "node_modules/json-stable-stringify/node_modules/isarray": { "version": "2.0.5", @@ -8443,7 +8378,6 @@ "version": "4.5.4", "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", - "dev": true, "dependencies": { "json-buffer": "3.0.1" } @@ -8452,7 +8386,6 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", - "dev": true, "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -8653,7 +8586,6 @@ "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", - "dev": true, "dependencies": { "p-locate": "^5.0.0" }, @@ -8677,8 +8609,7 @@ "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" }, "node_modules/log-update": { "version": "5.0.1", @@ -8997,8 +8928,7 @@ "node_modules/natural-compare": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" }, "node_modules/nice-try": { "version": "1.0.5", @@ -9212,7 +9142,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "dev": true, "dependencies": { "wrappy": "1" } @@ -9236,7 +9165,6 @@ "version": "0.9.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", - "dev": true, "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -9262,7 +9190,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", - "dev": true, "dependencies": { "yocto-queue": "^0.1.0" }, @@ -9277,7 +9204,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", - "dev": true, "dependencies": { "p-limit": "^3.0.2" }, @@ -9347,7 +9273,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true, "engines": { "node": ">=8" } @@ -9356,7 +9281,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", - "dev": true, "engines": { "node": ">=0.10.0" } @@ -9365,7 +9289,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "dev": true, "engines": { "node": ">=8" } @@ -9584,7 +9507,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", - "dev": true, "engines": { "node": ">= 0.8.0" } @@ -9679,7 +9601,6 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", - "dev": true, "engines": { "node": ">=6" } @@ -9719,7 +9640,6 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, "funding": [ { "type": "github", @@ -10315,7 +10235,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -10331,7 +10250,6 @@ "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, "dependencies": { "glob": "^7.1.3" }, @@ -10403,7 +10321,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, "funding": [ { "type": "github", @@ -10568,7 +10485,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, "dependencies": { "shebang-regex": "^3.0.0" }, @@ -10580,7 +10496,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", - "dev": true, "engines": { "node": ">=8" } @@ -10926,7 +10841,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "dependencies": { "ansi-regex": "^5.0.1" }, @@ -10984,7 +10898,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, "engines": { "node": ">=8" }, @@ -11033,7 +10946,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -11131,8 +11043,7 @@ "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" }, "node_modules/tiny-case": { "version": "1.0.3", @@ -11264,7 +11175,6 @@ "version": "0.4.0", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", - "dev": true, "dependencies": { "prelude-ls": "^1.2.1" }, @@ -11276,7 +11186,6 @@ "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "dev": true, "engines": { "node": ">=10" }, @@ -11471,7 +11380,6 @@ "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", - "dev": true, "dependencies": { "punycode": "^2.1.0" } @@ -12099,7 +12007,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", - "dev": true, "dependencies": { "isexe": "^2.0.0" }, @@ -12317,8 +12224,7 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/ws": { "version": "8.18.0", @@ -12374,7 +12280,6 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", - "dev": true, "engines": { "node": ">=10" }, diff --git a/package.json b/package.json index 50bce7f799..a52411dfda 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "d3-scale": "^4.0.2", "d3-shape": "^3.2.0", "downshift": "^9.0.7", + "eslint-plugin-header": "^3.1.1", "fast-deep-equal": "^3.1.3", "fast-xml-parser": "^4.4.1", "history": "^4.10.1", diff --git a/src/__tests__/version.js b/src/__tests__/version.js index 64250bf0b4..d167bfe53a 100644 --- a/src/__tests__/version.js +++ b/src/__tests__/version.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import {RELEASE_VERSION} from '../version'; diff --git a/src/gmp/cancel.js b/src/gmp/cancel.js index ad5640df28..83ff6003dd 100644 --- a/src/gmp/cancel.js +++ b/src/gmp/cancel.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - /* * The CancelToken class is based on the cancelable-promises tc39 proposal * diff --git a/src/gmp/collection/collectioncounts.js b/src/gmp/collection/collectioncounts.js index 3e0d484897..4c4cf0b157 100644 --- a/src/gmp/collection/collectioncounts.js +++ b/src/gmp/collection/collectioncounts.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from '../utils/identity'; import {parseInt} from '../parser.js'; diff --git a/src/gmp/commands/certbund.js b/src/gmp/commands/certbund.js index 3fef66dd2b..55b21c5c8a 100644 --- a/src/gmp/commands/certbund.js +++ b/src/gmp/commands/certbund.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import InfoEntitiesCommand from './infoentities'; diff --git a/src/gmp/commands/convert.js b/src/gmp/commands/convert.js index 608836c61d..f79d589685 100644 --- a/src/gmp/commands/convert.js +++ b/src/gmp/commands/convert.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import logger from 'gmp/log'; import {trace} from 'gmp/utils/trace'; diff --git a/src/gmp/commands/cves.js b/src/gmp/commands/cves.js index abc74fb857..ed00ae13db 100644 --- a/src/gmp/commands/cves.js +++ b/src/gmp/commands/cves.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import InfoEntitiesCommand from './infoentities'; diff --git a/src/gmp/commands/dfncert.js b/src/gmp/commands/dfncert.js index 71b6ca6c59..5838200f9d 100644 --- a/src/gmp/commands/dfncert.js +++ b/src/gmp/commands/dfncert.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import InfoEntitiesCommand from './infoentities'; diff --git a/src/gmp/commands/entity.js b/src/gmp/commands/entity.js index ac1f787b56..71e0f3f28e 100644 --- a/src/gmp/commands/entity.js +++ b/src/gmp/commands/entity.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import logger from 'gmp/log'; diff --git a/src/gmp/commands/http.js b/src/gmp/commands/http.js index ff0c2fbcdf..9df4fcd88f 100644 --- a/src/gmp/commands/http.js +++ b/src/gmp/commands/http.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - class HttpCommand { constructor(http, params = {}) { this.http = http; diff --git a/src/gmp/commands/infoentities.js b/src/gmp/commands/infoentities.js index 3038203448..439a73b598 100644 --- a/src/gmp/commands/infoentities.js +++ b/src/gmp/commands/infoentities.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import { parseCollectionList, parseInfoEntities, diff --git a/src/gmp/commands/license.js b/src/gmp/commands/license.js index 1c617b269e..3a0e41146f 100644 --- a/src/gmp/commands/license.js +++ b/src/gmp/commands/license.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import registerCommand from 'gmp/command'; import {License} from 'gmp/models/license'; diff --git a/src/gmp/commands/nvt.js b/src/gmp/commands/nvt.js index b29964d1dc..a4bc99685d 100644 --- a/src/gmp/commands/nvt.js +++ b/src/gmp/commands/nvt.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import InfoEntitiesCommand from './infoentities'; diff --git a/src/gmp/commands/nvtfamilies.js b/src/gmp/commands/nvtfamilies.js index 76b33593bf..753c201f47 100644 --- a/src/gmp/commands/nvtfamilies.js +++ b/src/gmp/commands/nvtfamilies.js @@ -19,9 +19,8 @@ export class NvtFamiliesCommand extends GmpCommand { get(params, options) { return this.httpGet(params, options).then(response => { const {data} = response; - const { - family: families, - } = data.get_nvt_families.get_nvt_families_response.families; + const {family: families} = + data.get_nvt_families.get_nvt_families_response.families; return response.set( map(families, family => ({ name: family.name, diff --git a/src/gmp/commands/policies.js b/src/gmp/commands/policies.js index c9c3ea926e..4f10ab08f9 100644 --- a/src/gmp/commands/policies.js +++ b/src/gmp/commands/policies.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import logger from 'gmp/log'; import {forEach, map} from 'gmp/utils/array'; diff --git a/src/gmp/commands/resourcenames.js b/src/gmp/commands/resourcenames.js index b5dc7ab76f..9bc2f959e6 100644 --- a/src/gmp/commands/resourcenames.js +++ b/src/gmp/commands/resourcenames.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import registerCommand from 'gmp/command'; import ResourceName from 'gmp/models/resourcename'; diff --git a/src/gmp/commands/roles.js b/src/gmp/commands/roles.js index 9eeb14fce9..8301a3a0ff 100644 --- a/src/gmp/commands/roles.js +++ b/src/gmp/commands/roles.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import registerCommand from 'gmp/command'; import logger from 'gmp/log'; diff --git a/src/gmp/commands/scanconfigs.js b/src/gmp/commands/scanconfigs.js index 0c81b4c81e..03424cc99a 100644 --- a/src/gmp/commands/scanconfigs.js +++ b/src/gmp/commands/scanconfigs.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import logger from 'gmp/log'; import {forEach, map} from 'gmp/utils/array'; diff --git a/src/gmp/commands/testing.js b/src/gmp/commands/testing.js index d79eb11911..88aef23f09 100644 --- a/src/gmp/commands/testing.js +++ b/src/gmp/commands/testing.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {testing} from '@gsa/testing'; import Response from 'gmp/http/response'; diff --git a/src/gmp/gmp.js b/src/gmp/gmp.js index fa52a2b89a..463afccb7f 100644 --- a/src/gmp/gmp.js +++ b/src/gmp/gmp.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import {isEmpty} from 'gmp/utils/string'; diff --git a/src/gmp/gmpsettings.js b/src/gmp/gmpsettings.js index 6896c70b0b..0a262fbd53 100644 --- a/src/gmp/gmpsettings.js +++ b/src/gmp/gmpsettings.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from './utils/identity'; export const DEFAULT_RELOAD_INTERVAL = 15 * 1000; // fifteen seconds diff --git a/src/gmp/http/transform/default.js b/src/gmp/http/transform/default.js index 6c0063fa92..acdd35041b 100644 --- a/src/gmp/http/transform/default.js +++ b/src/gmp/http/transform/default.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - const noop = arg => arg; const noopObject = { diff --git a/src/gmp/http/transform/xml.js b/src/gmp/http/transform/xml.js index 566c6989bb..5ad4f218c8 100644 --- a/src/gmp/http/transform/xml.js +++ b/src/gmp/http/transform/xml.js @@ -9,22 +9,24 @@ import {isDefined} from 'gmp/utils/identity'; import Rejection from 'gmp/http//rejection'; -export const success = transform => (response, options = {}) => { - try { - return transform(response); - } catch (error) { - throw new Rejection( - response.xhr, - Rejection.REASON_ERROR, - _( - 'An error occurred while converting gmp response to js for ' + - 'url {{- url}}', - {url: options.url}, - ), - error, - ); - } -}; +export const success = + transform => + (response, options = {}) => { + try { + return transform(response); + } catch (error) { + throw new Rejection( + response.xhr, + Rejection.REASON_ERROR, + _( + 'An error occurred while converting gmp response to js for ' + + 'url {{- url}}', + {url: options.url}, + ), + error, + ); + } + }; export const rejection = transform => (rej, options) => { if (rej.isError && rej.isError()) { diff --git a/src/gmp/http/utils.js b/src/gmp/http/utils.js index 866fec7c81..0d9517252b 100644 --- a/src/gmp/http/utils.js +++ b/src/gmp/http/utils.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; export const buildUrlParams = params => { diff --git a/src/gmp/index.js b/src/gmp/index.js index 5a060cac9c..9f07539914 100644 --- a/src/gmp/index.js +++ b/src/gmp/index.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import Gmp from 'gmp/gmp'; export default Gmp; diff --git a/src/gmp/locale/__tests__/languages.js b/src/gmp/locale/__tests__/languages.js index aadfaee8b2..235e02e65a 100644 --- a/src/gmp/locale/__tests__/languages.js +++ b/src/gmp/locale/__tests__/languages.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import {isString} from 'gmp/utils/identity'; diff --git a/src/gmp/locale/lang.js b/src/gmp/locale/lang.js index 176babd4d7..8ba2b07226 100644 --- a/src/gmp/locale/lang.js +++ b/src/gmp/locale/lang.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import i18next from 'i18next'; import HttpBackend from 'i18next-http-backend'; import {initReactI18next} from 'react-i18next'; diff --git a/src/gmp/locale/languages.js b/src/gmp/locale/languages.js index 89a2c0bdde..37777a0c6a 100644 --- a/src/gmp/locale/languages.js +++ b/src/gmp/locale/languages.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - export const BROWSER_LANGUAGE = 'Browser Language'; export const getLanguageCodes = () => Object.keys(Languages); @@ -17,8 +16,8 @@ const Languages = { name: 'English', native_name: 'English', }, - zh_TW: { - name: 'Traditional Chinese', + zh_TW: { + name: 'Traditional Chinese', native_name: '繁體中文', }, }; diff --git a/src/gmp/log.js b/src/gmp/log.js index 64fb8fa7db..49105df4f1 100644 --- a/src/gmp/log.js +++ b/src/gmp/log.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined, isString} from 'gmp/utils/identity'; export const DEFAULT_LOG_LEVEL = 'error'; diff --git a/src/gmp/models/__tests__/alert.js b/src/gmp/models/__tests__/alert.js index 3b24fb4769..cde2afcc88 100644 --- a/src/gmp/models/__tests__/alert.js +++ b/src/gmp/models/__tests__/alert.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import Model from 'gmp/model'; diff --git a/src/gmp/models/__tests__/asset.js b/src/gmp/models/__tests__/asset.js index 737fbd87f9..215a42d523 100644 --- a/src/gmp/models/__tests__/asset.js +++ b/src/gmp/models/__tests__/asset.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import Asset from 'gmp/models/asset'; import {testModel} from 'gmp/models/testing'; diff --git a/src/gmp/models/__tests__/certbund.js b/src/gmp/models/__tests__/certbund.js index a5600f598e..a97e4fc8c3 100644 --- a/src/gmp/models/__tests__/certbund.js +++ b/src/gmp/models/__tests__/certbund.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import CertBundAdv from 'gmp/models/certbund'; diff --git a/src/gmp/models/__tests__/cpe.js b/src/gmp/models/__tests__/cpe.js index 516cf82f9b..15ba18bf73 100644 --- a/src/gmp/models/__tests__/cpe.js +++ b/src/gmp/models/__tests__/cpe.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import Cpe from 'gmp/models/cpe'; diff --git a/src/gmp/models/__tests__/credential.js b/src/gmp/models/__tests__/credential.js index be0f5973e0..c45dc4961d 100644 --- a/src/gmp/models/__tests__/credential.js +++ b/src/gmp/models/__tests__/credential.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import {setLocale} from 'gmp/locale/lang'; diff --git a/src/gmp/models/__tests__/cve.js b/src/gmp/models/__tests__/cve.js index e1893ef3b3..9cb39af35b 100644 --- a/src/gmp/models/__tests__/cve.js +++ b/src/gmp/models/__tests__/cve.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import Cve from 'gmp/models/cve'; diff --git a/src/gmp/models/__tests__/dfncert.js b/src/gmp/models/__tests__/dfncert.js index b33dbb5085..80db18c103 100644 --- a/src/gmp/models/__tests__/dfncert.js +++ b/src/gmp/models/__tests__/dfncert.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import DfnCertAdv from 'gmp/models/dfncert'; diff --git a/src/gmp/models/__tests__/info.js b/src/gmp/models/__tests__/info.js index e3ed5ee218..339dc99b61 100644 --- a/src/gmp/models/__tests__/info.js +++ b/src/gmp/models/__tests__/info.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import Info from 'gmp/models/info'; import {testModel} from 'gmp/models/testing'; diff --git a/src/gmp/models/__tests__/license.js b/src/gmp/models/__tests__/license.js index 464cd2f7b3..074cdf63da 100644 --- a/src/gmp/models/__tests__/license.js +++ b/src/gmp/models/__tests__/license.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import {parseDate} from 'gmp/parser'; diff --git a/src/gmp/models/__tests__/nvt.js b/src/gmp/models/__tests__/nvt.js index 4ec4db115a..e02740d905 100644 --- a/src/gmp/models/__tests__/nvt.js +++ b/src/gmp/models/__tests__/nvt.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import Nvt, {getRefs, hasRefType, getFilteredRefIds} from 'gmp/models/nvt'; diff --git a/src/gmp/models/__tests__/policy.js b/src/gmp/models/__tests__/policy.js index addc40dddd..66f9b6a18e 100644 --- a/src/gmp/models/__tests__/policy.js +++ b/src/gmp/models/__tests__/policy.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import Model from 'gmp/model'; diff --git a/src/gmp/models/__tests__/reportconfig.js b/src/gmp/models/__tests__/reportconfig.js index 55f64a87a1..107a2c9a43 100644 --- a/src/gmp/models/__tests__/reportconfig.js +++ b/src/gmp/models/__tests__/reportconfig.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import ReportConfig from 'gmp/models/reportconfig'; diff --git a/src/gmp/models/__tests__/reportformat.js b/src/gmp/models/__tests__/reportformat.js index e55d9e10b6..8d9aea3eed 100644 --- a/src/gmp/models/__tests__/reportformat.js +++ b/src/gmp/models/__tests__/reportformat.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import Model from 'gmp/model'; diff --git a/src/gmp/models/__tests__/resourcename.js b/src/gmp/models/__tests__/resourcename.js index 1f5095fee6..d8ef304722 100644 --- a/src/gmp/models/__tests__/resourcename.js +++ b/src/gmp/models/__tests__/resourcename.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import {ResourceName} from '../resourcename'; diff --git a/src/gmp/models/__tests__/result.js b/src/gmp/models/__tests__/result.js index 5992b3858a..d7a6018e29 100644 --- a/src/gmp/models/__tests__/result.js +++ b/src/gmp/models/__tests__/result.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import Model from 'gmp/model'; diff --git a/src/gmp/models/__tests__/role.js b/src/gmp/models/__tests__/role.js index da494be04d..d7f8c57c8c 100644 --- a/src/gmp/models/__tests__/role.js +++ b/src/gmp/models/__tests__/role.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import Role from '../role'; diff --git a/src/gmp/models/__tests__/scanconfig.js b/src/gmp/models/__tests__/scanconfig.js index 30ea73d55b..7088043cc4 100644 --- a/src/gmp/models/__tests__/scanconfig.js +++ b/src/gmp/models/__tests__/scanconfig.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import Model from 'gmp/model'; diff --git a/src/gmp/models/__tests__/scanner.js b/src/gmp/models/__tests__/scanner.js index 5f44ac9e59..1512d532dc 100644 --- a/src/gmp/models/__tests__/scanner.js +++ b/src/gmp/models/__tests__/scanner.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect} from '@gsa/testing'; import Model from 'gmp/model'; diff --git a/src/gmp/models/__tests__/schedule.js b/src/gmp/models/__tests__/schedule.js index c0aa60ae3d..87e02aba4d 100644 --- a/src/gmp/models/__tests__/schedule.js +++ b/src/gmp/models/__tests__/schedule.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {describe, test, expect, testing} from '@gsa/testing'; import Model from 'gmp/model'; diff --git a/src/gmp/models/__tests__/vulnerability.js b/src/gmp/models/__tests__/vulnerability.js index f19ef4e70c..7f9404d42f 100644 --- a/src/gmp/models/__tests__/vulnerability.js +++ b/src/gmp/models/__tests__/vulnerability.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import Vulnerability from 'gmp/models/vulnerability'; import {testModel} from 'gmp/models/testing'; diff --git a/src/gmp/models/alert.js b/src/gmp/models/alert.js index be209676ed..fbf3eef5b6 100644 --- a/src/gmp/models/alert.js +++ b/src/gmp/models/alert.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined, isObject} from 'gmp/utils/identity'; import {isEmpty} from 'gmp/utils/string'; import {forEach, map} from 'gmp/utils/array'; diff --git a/src/gmp/models/cpe.js b/src/gmp/models/cpe.js index c7205111a4..5f4d343a12 100644 --- a/src/gmp/models/cpe.js +++ b/src/gmp/models/cpe.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import {isEmpty} from 'gmp/utils/string'; import {map} from 'gmp/utils/array'; diff --git a/src/gmp/models/filter.js b/src/gmp/models/filter.js index 5be78cc63f..630f12939d 100644 --- a/src/gmp/models/filter.js +++ b/src/gmp/models/filter.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined, isString, isArray, hasValue} from 'gmp/utils/identity'; import {forEach, map} from 'gmp/utils/array'; diff --git a/src/gmp/models/filter/convert.js b/src/gmp/models/filter/convert.js index 473f4e3da9..bb18026ded 100644 --- a/src/gmp/models/filter/convert.js +++ b/src/gmp/models/filter/convert.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined, isNumberOrNumberString} from '../../utils/identity'; import {isEmpty} from '../../utils/string'; diff --git a/src/gmp/models/filter/filterterm.js b/src/gmp/models/filter/filterterm.js index c15b1abebe..c63dbd3f41 100644 --- a/src/gmp/models/filter/filterterm.js +++ b/src/gmp/models/filter/filterterm.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from '../../utils/identity'; import convert from './convert.js'; diff --git a/src/gmp/models/filter/keywords.js b/src/gmp/models/filter/keywords.js index 739bc84973..bbc4e8d305 100644 --- a/src/gmp/models/filter/keywords.js +++ b/src/gmp/models/filter/keywords.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - export const EXTRA_KEYWORDS = [ 'apply_overrides', 'delta_states', diff --git a/src/gmp/models/filter/utils.js b/src/gmp/models/filter/utils.js index 0df7df6324..675cb687cb 100644 --- a/src/gmp/models/filter/utils.js +++ b/src/gmp/models/filter/utils.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from '../../utils/identity'; export const filter_string = filter => diff --git a/src/gmp/models/host.js b/src/gmp/models/host.js index c6034b68dc..f9f218068f 100644 --- a/src/gmp/models/host.js +++ b/src/gmp/models/host.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import {isEmpty} from 'gmp/utils/string'; import {forEach, map} from 'gmp/utils/array'; diff --git a/src/gmp/models/info.js b/src/gmp/models/info.js index eb63683578..25df19ccaf 100644 --- a/src/gmp/models/info.js +++ b/src/gmp/models/info.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import Model from 'gmp/model.js'; diff --git a/src/gmp/models/license.js b/src/gmp/models/license.js index 4c90db97e3..82e9b70687 100644 --- a/src/gmp/models/license.js +++ b/src/gmp/models/license.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import _ from 'gmp/locale'; import {parseDate} from 'gmp/parser'; diff --git a/src/gmp/models/nvt.js b/src/gmp/models/nvt.js index c77384eb0e..dc86177851 100644 --- a/src/gmp/models/nvt.js +++ b/src/gmp/models/nvt.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined, isArray, isString} from 'gmp/utils/identity'; import {isEmpty, split} from 'gmp/utils/string'; import {map} from 'gmp/utils/array'; diff --git a/src/gmp/models/permission.js b/src/gmp/models/permission.js index 664b55c042..8912a4d0d5 100644 --- a/src/gmp/models/permission.js +++ b/src/gmp/models/permission.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import {isEmpty} from 'gmp/utils/string'; diff --git a/src/gmp/models/policy.js b/src/gmp/models/policy.js index 50f07388a3..9d0f81d41a 100644 --- a/src/gmp/models/policy.js +++ b/src/gmp/models/policy.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import {forEach, map} from 'gmp/utils/array'; import {isEmpty} from 'gmp/utils/string'; diff --git a/src/gmp/models/report/host.js b/src/gmp/models/report/host.js index b22be1fe19..a892d6d567 100644 --- a/src/gmp/models/report/host.js +++ b/src/gmp/models/report/host.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isArray, isDefined} from 'gmp/utils/identity'; import {isEmpty} from 'gmp/utils/string'; diff --git a/src/gmp/models/report/parser.js b/src/gmp/models/report/parser.js index 65cec48744..5895286acb 100644 --- a/src/gmp/models/report/parser.js +++ b/src/gmp/models/report/parser.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import {isEmpty} from 'gmp/utils/string'; import {filter as filter_func, forEach, map} from 'gmp/utils/array'; diff --git a/src/gmp/models/report/port.js b/src/gmp/models/report/port.js index 8deacf8007..ef39cef5bc 100644 --- a/src/gmp/models/report/port.js +++ b/src/gmp/models/report/port.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from '../../utils/identity'; import {setProperties, parseInt, parseSeverity} from '../../parser'; diff --git a/src/gmp/models/report/report.js b/src/gmp/models/report/report.js index eb3a3addb6..e12aec9f49 100644 --- a/src/gmp/models/report/report.js +++ b/src/gmp/models/report/report.js @@ -36,15 +36,8 @@ class ReportReport extends Model { static parseElement(element) { const copy = super.parseElement(element); - const { - delta, - severity, - scan_start, - scan_end, - task, - scan, - timestamp, - } = element; + const {delta, severity, scan_start, scan_end, task, scan, timestamp} = + element; const filter = parseFilter(element); diff --git a/src/gmp/models/report/tlscertificate.js b/src/gmp/models/report/tlscertificate.js index d2c74b6116..30b67d9304 100644 --- a/src/gmp/models/report/tlscertificate.js +++ b/src/gmp/models/report/tlscertificate.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import {setProperties, parseInt} from 'gmp/parser'; diff --git a/src/gmp/models/result.js b/src/gmp/models/result.js index a6291aa5f2..480420797f 100644 --- a/src/gmp/models/result.js +++ b/src/gmp/models/result.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {forEach, map} from 'gmp/utils/array'; import {isDefined, isString} from 'gmp/utils/identity'; import {isEmpty} from 'gmp/utils/string'; diff --git a/src/gmp/models/scanconfig.js b/src/gmp/models/scanconfig.js index 27bcd87480..59ba4266d8 100644 --- a/src/gmp/models/scanconfig.js +++ b/src/gmp/models/scanconfig.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import {forEach, map} from 'gmp/utils/array'; import {isEmpty} from 'gmp/utils/string'; diff --git a/src/gmp/models/settings.js b/src/gmp/models/settings.js index 20a2bb6e23..929cace9e9 100644 --- a/src/gmp/models/settings.js +++ b/src/gmp/models/settings.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; class Settings { diff --git a/src/gmp/models/testing.js b/src/gmp/models/testing.js index 8f4b0d290f..13ff097fd0 100644 --- a/src/gmp/models/testing.js +++ b/src/gmp/models/testing.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {test, expect} from '@gsa/testing'; import {isDate} from 'gmp/models/date'; diff --git a/src/gmp/models/tlscertificate.js b/src/gmp/models/tlscertificate.js index 7381d8349f..6e3f89132a 100644 --- a/src/gmp/models/tlscertificate.js +++ b/src/gmp/models/tlscertificate.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {_l} from 'gmp/locale/lang'; import Model from 'gmp/model'; diff --git a/src/gmp/models/user.js b/src/gmp/models/user.js index bc2bb3f66d..073b2f4bd5 100644 --- a/src/gmp/models/user.js +++ b/src/gmp/models/user.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined} from 'gmp/utils/identity'; import {isEmpty} from 'gmp/utils/string'; import {map} from 'gmp/utils/array'; diff --git a/src/gmp/parser.js b/src/gmp/parser.js index 2a3c7abc50..375c075404 100644 --- a/src/gmp/parser.js +++ b/src/gmp/parser.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {isDefined, isString, isNumber, isArray} from 'gmp/utils/identity'; import {isEmpty} from 'gmp/utils/string'; diff --git a/src/gmp/timezones.js b/src/gmp/timezones.js index c85e8810ad..eec5a8266c 100644 --- a/src/gmp/timezones.js +++ b/src/gmp/timezones.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - const timezones = [ {name: 'Africa/Abidjan'}, {name: 'Africa/Accra'}, diff --git a/src/gmp/utils/array.js b/src/gmp/utils/array.js index 6690c2556b..c0ea6b3921 100644 --- a/src/gmp/utils/array.js +++ b/src/gmp/utils/array.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {hasValue, isDefined, isArray} from './identity'; export const forEach = (array, func) => { diff --git a/src/gmp/utils/event.js b/src/gmp/utils/event.js index bacf202782..5334082bc3 100644 --- a/src/gmp/utils/event.js +++ b/src/gmp/utils/event.js @@ -36,7 +36,7 @@ export const KeyCode = { */ export const debounce = (func, wait, immediate = false) => { let timeout; - return function(...args) { + return function (...args) { const context = this; const later = () => { timeout = undefined; diff --git a/src/gmp/utils/identity.js b/src/gmp/utils/identity.js index 163f9244ca..0bd9b9aa6e 100644 --- a/src/gmp/utils/identity.js +++ b/src/gmp/utils/identity.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - export const {isArray} = global.Array; export const isDefined = value => value !== undefined; diff --git a/src/gmp/utils/object.js b/src/gmp/utils/object.js index 1e507812b4..41b1626904 100644 --- a/src/gmp/utils/object.js +++ b/src/gmp/utils/object.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - export const exclude = (object, func) => Object.keys(object) .filter(key => !func(key)) diff --git a/src/gmp/utils/trace.js b/src/gmp/utils/trace.js index 91ba78a663..1550e59aa2 100644 --- a/src/gmp/utils/trace.js +++ b/src/gmp/utils/trace.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - /** Return the current stack trace a string */ export const trace = () => { try { diff --git a/src/version.js b/src/version.js index 93c0375919..a7081ca6ed 100644 --- a/src/version.js +++ b/src/version.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - const getMajorMinorVersion = () => { // eslint-disable-next-line no-unused-vars let [major, minor, ...rest] = VERSION.split('.'); diff --git a/src/web/components/badge/__tests__/badge.jsx b/src/web/components/badge/__tests__/badge.jsx index 7a5a0c4b36..680a2fb5e6 100644 --- a/src/web/components/badge/__tests__/badge.jsx +++ b/src/web/components/badge/__tests__/badge.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import {describe, test, expect} from '@gsa/testing'; import {render} from 'web/utils/testing'; diff --git a/src/web/components/certinfo/certinfo.jsx b/src/web/components/certinfo/certinfo.jsx index 926d691d2c..85ab6fa4ed 100644 --- a/src/web/components/certinfo/certinfo.jsx +++ b/src/web/components/certinfo/certinfo.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import _ from 'gmp/locale'; diff --git a/src/web/components/dialog/dialog.jsx b/src/web/components/dialog/dialog.jsx index 77ddd21c89..73e5a6d403 100644 --- a/src/web/components/dialog/dialog.jsx +++ b/src/web/components/dialog/dialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useCallback} from 'react'; import {Modal} from '@greenbone/opensight-ui-components'; diff --git a/src/web/components/form/__tests__/multiselect.jsx b/src/web/components/form/__tests__/multiselect.jsx index f5086df4d3..8722878177 100644 --- a/src/web/components/form/__tests__/multiselect.jsx +++ b/src/web/components/form/__tests__/multiselect.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import {describe, test, expect, testing} from '@gsa/testing'; import {render, screen} from 'web/utils/testing'; diff --git a/src/web/components/form/filefield.jsx b/src/web/components/form/filefield.jsx index de93ec124e..b57235271c 100644 --- a/src/web/components/form/filefield.jsx +++ b/src/web/components/form/filefield.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useCallback} from 'react'; import {FileInput} from '@greenbone/opensight-ui-components'; diff --git a/src/web/components/form/multiselect.jsx b/src/web/components/form/multiselect.jsx index c356699fc9..1b378eb75f 100644 --- a/src/web/components/form/multiselect.jsx +++ b/src/web/components/form/multiselect.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useCallback} from 'react'; import { diff --git a/src/web/components/form/numberfield.jsx b/src/web/components/form/numberfield.jsx index fd3d417bb1..d9ef22bf90 100644 --- a/src/web/components/form/numberfield.jsx +++ b/src/web/components/form/numberfield.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useCallback} from 'react'; import {NumberInput} from '@mantine/core'; diff --git a/src/web/components/form/select.jsx b/src/web/components/form/select.jsx index 17e61e47e1..e62946126f 100644 --- a/src/web/components/form/select.jsx +++ b/src/web/components/form/select.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import {useCallback, forwardRef} from 'react'; import {Loader} from '@mantine/core'; diff --git a/src/web/components/form/textarea.jsx b/src/web/components/form/textarea.jsx index a04fc272dc..4ae340cfe2 100644 --- a/src/web/components/form/textarea.jsx +++ b/src/web/components/form/textarea.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import {Textarea as GreenboneTextArea} from '@greenbone/opensight-ui-components'; diff --git a/src/web/components/form/textfield.jsx b/src/web/components/form/textfield.jsx index 1a7339dca2..0954894f12 100644 --- a/src/web/components/form/textfield.jsx +++ b/src/web/components/form/textfield.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import {Input} from '@greenbone/opensight-ui-components'; diff --git a/src/web/components/form/timezoneselect.jsx b/src/web/components/form/timezoneselect.jsx index 3207c5dc4f..281002d107 100644 --- a/src/web/components/form/timezoneselect.jsx +++ b/src/web/components/form/timezoneselect.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useMemo} from 'react'; import {map} from 'gmp/utils/array'; diff --git a/src/web/components/icon/testing.jsx b/src/web/components/icon/testing.jsx index c41c8aaf54..a0b9b125f6 100644 --- a/src/web/components/icon/testing.jsx +++ b/src/web/components/icon/testing.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import {test, expect, testing} from '@gsa/testing'; import {render, fireEvent, act} from 'web/utils/testing'; diff --git a/src/web/components/img/product.jsx b/src/web/components/img/product.jsx index 0744170572..ee07631bf3 100644 --- a/src/web/components/img/product.jsx +++ b/src/web/components/img/product.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import styled from 'styled-components'; diff --git a/src/web/components/link/manuallink.jsx b/src/web/components/link/manuallink.jsx index c53a43df39..ce6d915cf3 100644 --- a/src/web/components/link/manuallink.jsx +++ b/src/web/components/link/manuallink.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import {getLocale} from 'gmp/locale/lang'; diff --git a/src/web/components/notification/licensenotification.jsx b/src/web/components/notification/licensenotification.jsx index 3e9e30c0d8..bd389bd86c 100644 --- a/src/web/components/notification/licensenotification.jsx +++ b/src/web/components/notification/licensenotification.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import _ from 'gmp/locale'; diff --git a/src/web/components/powerfilter/dialog.jsx b/src/web/components/powerfilter/dialog.jsx index 32d5884e2e..ebec58535c 100644 --- a/src/web/components/powerfilter/dialog.jsx +++ b/src/web/components/powerfilter/dialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import withFilterDialog from 'web/components/powerfilter/withFilterDialog'; diff --git a/src/web/components/powerfilter/severitylevelsgroup.jsx b/src/web/components/powerfilter/severitylevelsgroup.jsx index aae6ebeead..c8a2d8005f 100644 --- a/src/web/components/powerfilter/severitylevelsgroup.jsx +++ b/src/web/components/powerfilter/severitylevelsgroup.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useCallback} from 'react'; import {isDefined} from 'gmp/utils/identity'; diff --git a/src/web/components/provider/licenseprovider.jsx b/src/web/components/provider/licenseprovider.jsx index 14492eb5f8..61a24221b5 100644 --- a/src/web/components/provider/licenseprovider.jsx +++ b/src/web/components/provider/licenseprovider.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useEffect, useState} from 'react'; import useGmp from 'web/hooks/useGmp'; diff --git a/src/web/entities/filterprovider.jsx b/src/web/entities/filterprovider.jsx index 689fdbf4bc..786e38cce2 100644 --- a/src/web/entities/filterprovider.jsx +++ b/src/web/entities/filterprovider.jsx @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import React from 'react'; import Loading from 'web/components/loading/loading'; diff --git a/src/web/pages/alerts/emailmethodpart.jsx b/src/web/pages/alerts/emailmethodpart.jsx index 7d3713171d..915e9c7e99 100644 --- a/src/web/pages/alerts/emailmethodpart.jsx +++ b/src/web/pages/alerts/emailmethodpart.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useState} from 'react'; import {selectSaveId} from 'gmp/utils/id'; diff --git a/src/web/pages/audits/dialog.jsx b/src/web/pages/audits/dialog.jsx index 7a4a65ea13..0b1f49cc50 100644 --- a/src/web/pages/audits/dialog.jsx +++ b/src/web/pages/audits/dialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import styled from 'styled-components'; diff --git a/src/web/pages/cves/details.jsx b/src/web/pages/cves/details.jsx index dafde48567..14e815520f 100644 --- a/src/web/pages/cves/details.jsx +++ b/src/web/pages/cves/details.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import {_, _l} from 'gmp/locale/lang'; diff --git a/src/web/pages/cves/filterdialog.jsx b/src/web/pages/cves/filterdialog.jsx index 88bd914aa9..4c55a0e036 100644 --- a/src/web/pages/cves/filterdialog.jsx +++ b/src/web/pages/cves/filterdialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import PropTypes from 'web/utils/proptypes'; import DefaultFilterDialog from 'web/components/powerfilter/dialog'; diff --git a/src/web/pages/cves/row.jsx b/src/web/pages/cves/row.jsx index e820241956..7e6cbe0984 100644 --- a/src/web/pages/cves/row.jsx +++ b/src/web/pages/cves/row.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import {_} from 'gmp/locale/lang'; diff --git a/src/web/pages/hosts/filterdialog.jsx b/src/web/pages/hosts/filterdialog.jsx index 724477690f..5affe47dac 100644 --- a/src/web/pages/hosts/filterdialog.jsx +++ b/src/web/pages/hosts/filterdialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import PropTypes from 'web/utils/proptypes'; import DefaultFilterDialog from 'web/components/powerfilter/dialog'; diff --git a/src/web/pages/notes/filterdialog.jsx b/src/web/pages/notes/filterdialog.jsx index 179bf27681..de2e7812e3 100644 --- a/src/web/pages/notes/filterdialog.jsx +++ b/src/web/pages/notes/filterdialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import PropTypes from 'web/utils/proptypes'; diff --git a/src/web/pages/nvts/filterdialog.jsx b/src/web/pages/nvts/filterdialog.jsx index 048649b882..ca75e89806 100644 --- a/src/web/pages/nvts/filterdialog.jsx +++ b/src/web/pages/nvts/filterdialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import PropTypes from 'web/utils/proptypes'; import DefaultFilterDialog from 'web/components/powerfilter/dialog'; diff --git a/src/web/pages/nvts/row.jsx b/src/web/pages/nvts/row.jsx index 03c588b224..f655cfd8ef 100644 --- a/src/web/pages/nvts/row.jsx +++ b/src/web/pages/nvts/row.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import Filter from 'gmp/models/filter.js'; diff --git a/src/web/pages/operatingsystems/filterdialog.jsx b/src/web/pages/operatingsystems/filterdialog.jsx index 426fca8443..e799ad4850 100644 --- a/src/web/pages/operatingsystems/filterdialog.jsx +++ b/src/web/pages/operatingsystems/filterdialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import PropTypes from 'web/utils/proptypes'; import DefaultFilterDialog from 'web/components/powerfilter/dialog'; diff --git a/src/web/pages/permissions/dialog.jsx b/src/web/pages/permissions/dialog.jsx index 6451ae0431..124a172b3c 100644 --- a/src/web/pages/permissions/dialog.jsx +++ b/src/web/pages/permissions/dialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import Model from 'gmp/model'; diff --git a/src/web/pages/permissions/multipledialog.jsx b/src/web/pages/permissions/multipledialog.jsx index 8f5908bdab..992af0acef 100644 --- a/src/web/pages/permissions/multipledialog.jsx +++ b/src/web/pages/permissions/multipledialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import styled from 'styled-components'; diff --git a/src/web/pages/portlists/filterdialog.jsx b/src/web/pages/portlists/filterdialog.jsx index 6f73a08f4a..33054637ed 100644 --- a/src/web/pages/portlists/filterdialog.jsx +++ b/src/web/pages/portlists/filterdialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import PropTypes from 'web/utils/proptypes'; import DefaultFilterDialog from 'web/components/powerfilter/dialog'; diff --git a/src/web/pages/reportconfigs/__tests__/component.jsx b/src/web/pages/reportconfigs/__tests__/component.jsx index aa02c760ee..7ca19fb944 100644 --- a/src/web/pages/reportconfigs/__tests__/component.jsx +++ b/src/web/pages/reportconfigs/__tests__/component.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import {describe, test, expect, testing} from '@gsa/testing'; import ReportConfig from 'gmp/models/reportconfig'; diff --git a/src/web/pages/reportformats/dialog.jsx b/src/web/pages/reportformats/dialog.jsx index d0e100a33e..faa4a42771 100644 --- a/src/web/pages/reportformats/dialog.jsx +++ b/src/web/pages/reportformats/dialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useCallback} from 'react'; import {isDefined, isArray, hasValue} from 'gmp/utils/identity'; diff --git a/src/web/pages/reports/detailsfilterdialog.jsx b/src/web/pages/reports/detailsfilterdialog.jsx index cc4f0a2ca4..4adb4cc7ba 100644 --- a/src/web/pages/reports/detailsfilterdialog.jsx +++ b/src/web/pages/reports/detailsfilterdialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import PropTypes from 'web/utils/proptypes'; diff --git a/src/web/pages/reports/downloadreportdialog.jsx b/src/web/pages/reports/downloadreportdialog.jsx index ad5597cf91..1df0ce774c 100644 --- a/src/web/pages/reports/downloadreportdialog.jsx +++ b/src/web/pages/reports/downloadreportdialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useState} from 'react'; import {NO_VALUE, YES_VALUE} from 'gmp/parser'; diff --git a/src/web/pages/scanners/dialog.jsx b/src/web/pages/scanners/dialog.jsx index 3447835d77..8be1583cd7 100644 --- a/src/web/pages/scanners/dialog.jsx +++ b/src/web/pages/scanners/dialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useCallback} from 'react'; import {filter, map} from 'gmp/utils/array'; diff --git a/src/web/pages/schedules/monthdaysselect.jsx b/src/web/pages/schedules/monthdaysselect.jsx index 2520cfd4bf..a10b213f5c 100644 --- a/src/web/pages/schedules/monthdaysselect.jsx +++ b/src/web/pages/schedules/monthdaysselect.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useCallback} from 'react'; import {isDefined} from 'gmp/utils/identity'; diff --git a/src/web/pages/schedules/weekdayselect.jsx b/src/web/pages/schedules/weekdayselect.jsx index 7a4be174fc..6f625843d7 100644 --- a/src/web/pages/schedules/weekdayselect.jsx +++ b/src/web/pages/schedules/weekdayselect.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useCallback} from 'react'; import {isDefined} from 'gmp/utils/identity'; diff --git a/src/web/pages/tlscertificates/filterdialog.jsx b/src/web/pages/tlscertificates/filterdialog.jsx index 6e102c4d1f..f8ea18db00 100644 --- a/src/web/pages/tlscertificates/filterdialog.jsx +++ b/src/web/pages/tlscertificates/filterdialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import PropTypes from 'web/utils/proptypes'; import DefaultFilterDialog from 'web/components/powerfilter/dialog'; diff --git a/src/web/pages/users/dialog.jsx b/src/web/pages/users/dialog.jsx index e36b33333d..a29173f02e 100644 --- a/src/web/pages/users/dialog.jsx +++ b/src/web/pages/users/dialog.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React, {useState} from 'react'; import {isDefined} from 'gmp/utils/identity'; diff --git a/src/web/pages/users/listpage.jsx b/src/web/pages/users/listpage.jsx index 12b5592448..2f5e73d6c8 100644 --- a/src/web/pages/users/listpage.jsx +++ b/src/web/pages/users/listpage.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import {connect} from 'react-redux'; diff --git a/src/web/pages/usersettings/defaultspart.jsx b/src/web/pages/usersettings/defaultspart.jsx index 6dc0402bd1..43ca958eb1 100644 --- a/src/web/pages/usersettings/defaultspart.jsx +++ b/src/web/pages/usersettings/defaultspart.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import FormGroup from 'web/components/form/formgroup'; diff --git a/src/web/pages/usersettings/usersettingspage.jsx b/src/web/pages/usersettings/usersettingspage.jsx index 4779ea55ea..113ede4961 100644 --- a/src/web/pages/usersettings/usersettingspage.jsx +++ b/src/web/pages/usersettings/usersettingspage.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import React from 'react'; import {connect} from 'react-redux'; diff --git a/src/web/store/dashboard/data/loader.js b/src/web/store/dashboard/data/loader.js index 52354b6a56..6cfa8e27a8 100644 --- a/src/web/store/dashboard/data/loader.js +++ b/src/web/store/dashboard/data/loader.js @@ -27,28 +27,28 @@ export const loaderPropTypes = { filter: PropTypes.filter, }; -export const loadFunc = (func, id) => ({dataId = id, ...props}) => ( - dispatch, - getState, -) => { - const rootState = getState(); - const state = getDashboardData(rootState); - - const {filter} = props; - - if (state.getIsLoading(dataId, filter)) { - // we are already loading data - return Promise.resolve(); - } +export const loadFunc = + (func, id) => + ({dataId = id, ...props}) => + (dispatch, getState) => { + const rootState = getState(); + const state = getDashboardData(rootState); + + const {filter} = props; + + if (state.getIsLoading(dataId, filter)) { + // we are already loading data + return Promise.resolve(); + } - dispatch(requestDashboardData(dataId, filter)); + dispatch(requestDashboardData(dataId, filter)); - const promise = func(props); - return promise.then( - data => dispatch(receivedDashboardData(dataId, data, filter)), - error => dispatch(receivedDashboardError(dataId, error, filter)), - ); -}; + const promise = func(props); + return promise.then( + data => dispatch(receivedDashboardData(dataId, data, filter)), + error => dispatch(receivedDashboardError(dataId, error, filter)), + ); + }; class Loader extends React.Component { constructor(...args) { @@ -145,10 +145,7 @@ const mapDispatchToProps = (dispatch, {load, ...props}) => ({ export default compose( withGmp, withSubscription, - connect( - mapStateToProps, - mapDispatchToProps, - ), + connect(mapStateToProps, mapDispatchToProps), )(Loader); // vim: set ts=2 sw=2 tw=80: diff --git a/src/web/store/dashboard/settings/actions.js b/src/web/store/dashboard/settings/actions.js index 5f809b9e22..8641bbd096 100644 --- a/src/web/store/dashboard/settings/actions.js +++ b/src/web/store/dashboard/settings/actions.js @@ -111,23 +111,19 @@ export const loadSettings = gmp => (id, defaults) => (dispatch, getState) => { dispatch(loadDashboardSettingsRequest(id)); - return gmp.dashboard - .getSetting(id) - .then( - ({data}) => dispatch(loadDashboardSettingsSuccess(id, data, defaults)), - error => dispatch(loadDashboardSettingsError(id, error)), - ); + return gmp.dashboard.getSetting(id).then( + ({data}) => dispatch(loadDashboardSettingsSuccess(id, data, defaults)), + error => dispatch(loadDashboardSettingsError(id, error)), + ); }; export const saveSettings = gmp => (id, settings) => dispatch => { dispatch(saveDashboardSettingsRequest(id, settings)); - return gmp.dashboard - .saveSetting(id, settings) - .then( - () => dispatch(saveDashboardSettingsSuccess(id)), - error => dispatch(saveDashboardSettingsError(id, error)), - ); + return gmp.dashboard.saveSetting(id, settings).then( + () => dispatch(saveDashboardSettingsSuccess(id)), + error => dispatch(saveDashboardSettingsError(id, error)), + ); }; export const resetSettings = gmp => id => (dispatch, getState) => { @@ -137,12 +133,10 @@ export const resetSettings = gmp => id => (dispatch, getState) => { dispatch(resetDashboardSettingsRequest(id, defaults)); - return gmp.dashboard - .saveSetting(id, defaults) - .then( - () => dispatch(resetDashboardSettingsSuccess(id)), - error => dispatch(resetDashboardSettingsError(id, error)), - ); + return gmp.dashboard.saveSetting(id, defaults).then( + () => dispatch(resetDashboardSettingsSuccess(id)), + error => dispatch(resetDashboardSettingsError(id, error)), + ); }; // vim: set ts=2 sw=2 tw=80: diff --git a/src/web/store/entities/report/actions.js b/src/web/store/entities/report/actions.js index 264f97e7b4..50bf796acf 100644 --- a/src/web/store/entities/report/actions.js +++ b/src/web/store/entities/report/actions.js @@ -41,116 +41,112 @@ export const reportActions = { }), }; -export const loadReport = gmp => ( - id, - {filter, details = true, force = false} = {}, -) => (dispatch, getState) => { - const rootState = getState(); - const state = reportSelector(rootState); - - if (!force && state.isLoadingEntity(id, filter)) { - // we are already loading data - return Promise.resolve(); - } - - dispatch(reportActions.request(id, filter)); - - return gmp.report - .get({id}, {filter, details}) - .then( - response => response.data, - error => { - dispatch(reportActions.error(id, error, filter)); - return Promise.reject(error); - }, - ) - .then(data => { - dispatch(reportActions.success(id, data, filter)); - return data; - }); -}; - -export const loadReportWithThreshold = gmp => (id, {filter} = {}) => ( - dispatch, - getState, -) => { - const rootState = getState(); - const state = reportSelector(rootState); - - if (state.isLoadingEntity(id, filter)) { - // we are already loading data - return Promise.resolve(); - } - - dispatch(reportActions.request(id, filter)); - - const {reportResultsThreshold: threshold} = gmp.settings; - return gmp.report - .get({id}, {filter, details: false}) - .then( - response => response.data, - error => { - dispatch(reportActions.error(id, error, filter)); - return Promise.reject(error); - }, - ) - .then(report => { - const fullReport = - isDefined(report) && - isDefined(report.report) && - isDefined(report.report.results) && - report.report.results.counts.filtered < threshold; - - dispatch(reportActions.success(id, report, filter)); - - if (fullReport) { - return loadReport(gmp)(id, {filter, details: true, force: true})( - dispatch, - getState, - ); - } - }); -}; - -export const loadReportIfNeeded = gmp => ( - id, - {filter, details = false} = {}, -) => (dispatch, getState) => { - // loads the small report (without details) if these information are not - // yet in the store. resolve() otherwise - const rootState = getState(); - const state = reportSelector(rootState); - - if (isDefined(state.getEntity(id, filter))) { - // we are already loading data or have it in the store - return Promise.resolve(); - } - return loadReport(gmp)(id, {filter, details})(dispatch, getState); -}; +export const loadReport = + gmp => + (id, {filter, details = true, force = false} = {}) => + (dispatch, getState) => { + const rootState = getState(); + const state = reportSelector(rootState); + + if (!force && state.isLoadingEntity(id, filter)) { + // we are already loading data + return Promise.resolve(); + } + + dispatch(reportActions.request(id, filter)); + + return gmp.report + .get({id}, {filter, details}) + .then( + response => response.data, + error => { + dispatch(reportActions.error(id, error, filter)); + return Promise.reject(error); + }, + ) + .then(data => { + dispatch(reportActions.success(id, data, filter)); + return data; + }); + }; + +export const loadReportWithThreshold = + gmp => + (id, {filter} = {}) => + (dispatch, getState) => { + const rootState = getState(); + const state = reportSelector(rootState); + + if (state.isLoadingEntity(id, filter)) { + // we are already loading data + return Promise.resolve(); + } + + dispatch(reportActions.request(id, filter)); + + const {reportResultsThreshold: threshold} = gmp.settings; + return gmp.report + .get({id}, {filter, details: false}) + .then( + response => response.data, + error => { + dispatch(reportActions.error(id, error, filter)); + return Promise.reject(error); + }, + ) + .then(report => { + const fullReport = + isDefined(report) && + isDefined(report.report) && + isDefined(report.report.results) && + report.report.results.counts.filtered < threshold; + + dispatch(reportActions.success(id, report, filter)); + + if (fullReport) { + return loadReport(gmp)(id, {filter, details: true, force: true})( + dispatch, + getState, + ); + } + }); + }; + +export const loadReportIfNeeded = + gmp => + (id, {filter, details = false} = {}) => + (dispatch, getState) => { + // loads the small report (without details) if these information are not + // yet in the store. resolve() otherwise + const rootState = getState(); + const state = reportSelector(rootState); + + if (isDefined(state.getEntity(id, filter))) { + // we are already loading data or have it in the store + return Promise.resolve(); + } + return loadReport(gmp)(id, {filter, details})(dispatch, getState); + }; export const deltaReportActions = createEntityLoadingActions('deltaReport'); -export const loadDeltaReport = gmp => (id, deltaId, filter) => ( - dispatch, - getState, -) => { - const rootState = getState(); - const state = deltaReportSelector(rootState); +export const loadDeltaReport = + gmp => (id, deltaId, filter) => (dispatch, getState) => { + const rootState = getState(); + const state = deltaReportSelector(rootState); - if (state.isLoading(id, deltaId)) { - // we are already loading data - return Promise.resolve(); - } + if (state.isLoading(id, deltaId)) { + // we are already loading data + return Promise.resolve(); + } - const identifier = deltaReportIdentifier(id, deltaId); + const identifier = deltaReportIdentifier(id, deltaId); - dispatch(deltaReportActions.request(identifier)); + dispatch(deltaReportActions.request(identifier)); - return gmp.report - .getDelta({id}, {id: deltaId}, {filter}) - .then( + return gmp.report.getDelta({id}, {id: deltaId}, {filter}).then( response => dispatch(deltaReportActions.success(identifier, response.data)), error => dispatch(deltaReportActions.error(identifier, error)), ); -}; + }; diff --git a/src/web/store/entities/utils/actions.js b/src/web/store/entities/utils/actions.js index 22802157b3..ea5c5a172e 100644 --- a/src/web/store/entities/utils/actions.js +++ b/src/web/store/entities/utils/actions.js @@ -69,88 +69,90 @@ export const entityDeleteActions = { }), }; -export const createLoadEntities = ({ - selector, - actions, - entityType, -}) => gmp => filter => (dispatch, getState) => { - const rootState = getState(); - const state = selector(rootState); - - if (state.isLoadingEntities(filter)) { - // we are already loading data - return Promise.resolve(); - } - - dispatch(actions.request(filter)); - - return gmp[pluralizeType(entityType)].get({filter}).then( - response => { - const {data, meta} = response; - const {filter: loadedFilter, counts} = meta; - return dispatch(actions.success(data, filter, loadedFilter, counts)); - }, - error => dispatch(actions.error(error, filter)), - ); -}; - -export const createLoadAllEntities = ({ - selector, - actions, - entityType, -}) => gmp => filter => (dispatch, getState) => { - const rootState = getState(); - const state = selector(rootState); - - if (isDefined(filter)) { - filter = isDefined(filter.toFilterString) - ? filter.all() - : Filter.fromString(filter).all(); - } else { - filter = ALL_FILTER; - } - - if (state.isLoadingEntities(filter)) { - // we are already loading data - return Promise.resolve(); - } - dispatch(actions.request(filter)); - - return gmp[pluralizeType(entityType)].get({filter}).then( - response => { - const {data, meta} = response; - const {filter: loadedFilter, counts} = meta; - return dispatch(actions.success(data, filter, loadedFilter, counts)); - }, - error => dispatch(actions.error(error, filter)), - ); -}; +export const createLoadEntities = + ({selector, actions, entityType}) => + gmp => + filter => + (dispatch, getState) => { + const rootState = getState(); + const state = selector(rootState); + + if (state.isLoadingEntities(filter)) { + // we are already loading data + return Promise.resolve(); + } + + dispatch(actions.request(filter)); + + return gmp[pluralizeType(entityType)].get({filter}).then( + response => { + const {data, meta} = response; + const {filter: loadedFilter, counts} = meta; + return dispatch(actions.success(data, filter, loadedFilter, counts)); + }, + error => dispatch(actions.error(error, filter)), + ); + }; + +export const createLoadAllEntities = + ({selector, actions, entityType}) => + gmp => + filter => + (dispatch, getState) => { + const rootState = getState(); + const state = selector(rootState); + + if (isDefined(filter)) { + filter = isDefined(filter.toFilterString) + ? filter.all() + : Filter.fromString(filter).all(); + } else { + filter = ALL_FILTER; + } + + if (state.isLoadingEntities(filter)) { + // we are already loading data + return Promise.resolve(); + } + dispatch(actions.request(filter)); + + return gmp[pluralizeType(entityType)].get({filter}).then( + response => { + const {data, meta} = response; + const {filter: loadedFilter, counts} = meta; + return dispatch(actions.success(data, filter, loadedFilter, counts)); + }, + error => dispatch(actions.error(error, filter)), + ); + }; -export const createLoadEntity = ({ - selector, - actions, - entityType, -}) => gmp => id => (dispatch, getState) => { - const rootState = getState(); - const state = selector(rootState); +export const createLoadEntity = + ({selector, actions, entityType}) => + gmp => + id => + (dispatch, getState) => { + const rootState = getState(); + const state = selector(rootState); - if (state.isLoadingEntity(id)) { - // we are already loading data - return Promise.resolve(); - } + if (state.isLoadingEntity(id)) { + // we are already loading data + return Promise.resolve(); + } - dispatch(actions.request(id)); + dispatch(actions.request(id)); - return gmp[entityType] - .get({id}) - .then( + return gmp[entityType].get({id}).then( response => dispatch(actions.success(id, response.data)), error => dispatch(actions.error(id, error)), ); -}; - -export const createDeleteEntity = ({entityType}) => gmp => id => dispatch => - gmp[entityType] - .delete({id}) - .then(() => dispatch(entityDeleteActions.success(entityType, id))); + }; + +export const createDeleteEntity = + ({entityType}) => + gmp => + id => + dispatch => + gmp[entityType] + .delete({id}) + .then(() => dispatch(entityDeleteActions.success(entityType, id))); // vim: set ts=2 sw=2 tw=80: diff --git a/src/web/store/usersettings/defaultfilters/actions.js b/src/web/store/usersettings/defaultfilters/actions.js index c369d8ac2a..8fda6778bb 100644 --- a/src/web/store/usersettings/defaultfilters/actions.js +++ b/src/web/store/usersettings/defaultfilters/actions.js @@ -33,45 +33,43 @@ export const defaultFilterLoadingActions = { }), }; -export const loadUserSettingsDefaultFilter = gmp => entityType => ( - dispatch, - getState, -) => { - const rootState = getState(); - const selector = getUserSettingsDefaultFilter(rootState, entityType); +export const loadUserSettingsDefaultFilter = + gmp => entityType => (dispatch, getState) => { + const rootState = getState(); + const selector = getUserSettingsDefaultFilter(rootState, entityType); - if (selector.isLoading()) { - // we are already loading data - return Promise.resolve(); - } + if (selector.isLoading()) { + // we are already loading data + return Promise.resolve(); + } - dispatch(defaultFilterLoadingActions.request(entityType)); + dispatch(defaultFilterLoadingActions.request(entityType)); - const settingId = DEFAULT_FILTER_SETTINGS[entityType]; + const settingId = DEFAULT_FILTER_SETTINGS[entityType]; - return gmp.user - .getSetting(settingId) - .then(resp => { - const {data: setting} = resp; - return isDefined(setting) ? setting.value : undefined; - }) - .then(filterId => - isDefined(filterId) && filterId !== 0 - ? gmp.filter.get({id: filterId}) - : null, - ) - .then(resp => { - if (resp === null) { - dispatch(defaultFilterLoadingActions.success(entityType, null)); - } else { - dispatch(defaultFilterLoadingActions.success(entityType, resp.data)); - } - }) - .catch(err => { - if (isDefined(err)) { - dispatch(defaultFilterLoadingActions.error(entityType, err)); - } - }); -}; + return gmp.user + .getSetting(settingId) + .then(resp => { + const {data: setting} = resp; + return isDefined(setting) ? setting.value : undefined; + }) + .then(filterId => + isDefined(filterId) && filterId !== 0 + ? gmp.filter.get({id: filterId}) + : null, + ) + .then(resp => { + if (resp === null) { + dispatch(defaultFilterLoadingActions.success(entityType, null)); + } else { + dispatch(defaultFilterLoadingActions.success(entityType, resp.data)); + } + }) + .catch(err => { + if (isDefined(err)) { + dispatch(defaultFilterLoadingActions.error(entityType, err)); + } + }); + }; // vim: set ts=2 sw=2 two=80: diff --git a/src/web/store/usersettings/defaults/actions.js b/src/web/store/usersettings/defaults/actions.js index 167f21dbd3..29ffd2fb68 100644 --- a/src/web/store/usersettings/defaults/actions.js +++ b/src/web/store/usersettings/defaults/actions.js @@ -41,12 +41,10 @@ export const loadUserSettingDefaults = gmp => () => (dispatch, getState) => { dispatch(loadingActions.request()); - return gmp.user - .currentSettings() - .then( - response => dispatch(loadingActions.success(response.data)), - err => dispatch(loadingActions.error(err)), - ); + return gmp.user.currentSettings().then( + response => dispatch(loadingActions.success(response.data)), + err => dispatch(loadingActions.error(err)), + ); }; export const loadUserSettingDefault = gmp => id => (dispatch, getState) => { diff --git a/src/web/store/utils.js b/src/web/store/utils.js index f8a0ce2dba..08d7c3baef 100644 --- a/src/web/store/utils.js +++ b/src/web/store/utils.js @@ -3,7 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ - import {hasValue} from 'gmp/utils/identity'; /** @@ -24,19 +23,21 @@ export const filterIdentifier = filter => * * @returns {Function} A new combined reducer function */ -export const combineReducers = reducers => (state = {}, action) => { - let hasChanged = false; - const nextState = {}; - - for (const [name, reducer] of Object.entries(reducers)) { - const prevStateForReducer = state[name]; - const nextStateForReducers = reducer(prevStateForReducer, action); - - nextState[name] = nextStateForReducers; - hasChanged = hasChanged || prevStateForReducer !== nextStateForReducers; - } - - return hasChanged ? nextState : state; -}; +export const combineReducers = + reducers => + (state = {}, action) => { + let hasChanged = false; + const nextState = {}; + + for (const [name, reducer] of Object.entries(reducers)) { + const prevStateForReducer = state[name]; + const nextStateForReducers = reducer(prevStateForReducer, action); + + nextState[name] = nextStateForReducers; + hasChanged = hasChanged || prevStateForReducer !== nextStateForReducers; + } + + return hasChanged ? nextState : state; + }; // vim: set ts=2 sw=2 tw=80: diff --git a/src/web/wizard/advancedtaskwizard.jsx b/src/web/wizard/advancedtaskwizard.jsx index 4f99362f58..19c4568fe0 100644 --- a/src/web/wizard/advancedtaskwizard.jsx +++ b/src/web/wizard/advancedtaskwizard.jsx @@ -3,6 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-or-later */ + import {useState} from 'react'; import { diff --git a/vite.config.ts b/vite.config.ts index 8938afe0ab..1b108a9fe5 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -52,6 +52,7 @@ export default defineConfig({ port: 8080, }, build: { + outDir: 'build', minify: 'terser', terserOptions: { mangle: false,