From d552087781d04c44e7a62a9b8a46282c30604daa Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:24:11 +0530 Subject: [PATCH 01/33] Added Husky For Pre-Commit Hooks Signed-off-by: Adithya Krishna --- .husky/pre-commit | 4 + .husky/pre-push | 4 + package.json | 23 ++--- yarn.lock | 210 ++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 210 insertions(+), 31 deletions(-) create mode 100755 .husky/pre-commit create mode 100755 .husky/pre-push diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 000000000..d19bb4c23 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +./hooks/pre-commit diff --git a/.husky/pre-push b/.husky/pre-push new file mode 100755 index 000000000..2bd9dcce3 --- /dev/null +++ b/.husky/pre-push @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +./hooks/pre-push $1 diff --git a/package.json b/package.json index 07c577e4a..cf4e32d63 100644 --- a/package.json +++ b/package.json @@ -41,22 +41,6 @@ "build-storybook": "build-storybook -s public", "gencopy": "node scripts/copyrightsScript.js && prettier --write ./scripts/copyrights.js" }, - "eslintConfig": { - "extends": [ - "react-app", - "react-app/jest" - ], - "overrides": [ - { - "files": [ - "**/*.stories.*" - ], - "rules": { - "import/no-anonymous-default-export": "off" - } - } - ] - }, "browserslist": { "production": [ ">0.2%", @@ -87,8 +71,13 @@ "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-react-hooks": "^1.7.0", + "husky": "^7.0.0", "jest-fetch-mock": "3.0.3", + "lint-staged": "^11.0.0", "prettier": "^2.6.2" }, - "packageManager": "yarn@3.2.1" + "packageManager": "yarn@3.2.1", + "lint-staged": { + "*.ts*": "eslint --ignore-path .gitignore --cache --fix" + } } diff --git a/yarn.lock b/yarn.lock index d4bf3e0e6..a72cd48dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5025,7 +5025,7 @@ __metadata: languageName: node linkType: hard -"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.1": +"ansi-escapes@npm:^4.2.1, ansi-escapes@npm:^4.3.0, ansi-escapes@npm:^4.3.1": version: 4.3.2 resolution: "ansi-escapes@npm:4.3.2" dependencies: @@ -6712,6 +6712,15 @@ __metadata: languageName: node linkType: hard +"cli-cursor@npm:^3.1.0": + version: 3.1.0 + resolution: "cli-cursor@npm:3.1.0" + dependencies: + restore-cursor: ^3.1.0 + checksum: 2692784c6cd2fd85cfdbd11f53aea73a463a6d64a77c3e098b2b4697a20443f430c220629e1ca3b195ea5ac4a97a74c2ee411f3807abf6df2b66211fec0c0a29 + languageName: node + linkType: hard + "cli-table3@npm:^0.6.1": version: 0.6.2 resolution: "cli-table3@npm:0.6.2" @@ -6725,6 +6734,16 @@ __metadata: languageName: node linkType: hard +"cli-truncate@npm:2.1.0, cli-truncate@npm:^2.1.0": + version: 2.1.0 + resolution: "cli-truncate@npm:2.1.0" + dependencies: + slice-ansi: ^3.0.0 + string-width: ^4.2.0 + checksum: bf1e4e6195392dc718bf9cd71f317b6300dc4a9191d052f31046b8773230ece4fa09458813bf0e3455a5e68c0690d2ea2c197d14a8b85a7b5e01c97f4b5feb5d + languageName: node + linkType: hard + "cliui@npm:^5.0.0": version: 5.0.0 resolution: "cliui@npm:5.0.0" @@ -6879,6 +6898,20 @@ __metadata: languageName: node linkType: hard +"colorette@npm:^1.4.0": + version: 1.4.0 + resolution: "colorette@npm:1.4.0" + checksum: 01c3c16058b182a4ab4c126a65a75faa4d38a20fa7c845090b25453acec6c371bb2c5dceb0a2338511f17902b9d1a9af0cadd8509c9403894b79311032c256c3 + languageName: node + linkType: hard + +"colorette@npm:^2.0.16": + version: 2.0.19 + resolution: "colorette@npm:2.0.19" + checksum: 888cf5493f781e5fcf54ce4d49e9d7d698f96ea2b2ef67906834bb319a392c667f9ec69f4a10e268d2946d13a9503d2d19b3abaaaf174e3451bfe91fb9d82427 + languageName: node + linkType: hard + "combined-stream@npm:^1.0.8": version: 1.0.8 resolution: "combined-stream@npm:1.0.8" @@ -6916,6 +6949,13 @@ __metadata: languageName: node linkType: hard +"commander@npm:^8.2.0": + version: 8.3.0 + resolution: "commander@npm:8.3.0" + checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0 + languageName: node + linkType: hard + "common-path-prefix@npm:^3.0.0": version: 3.0.0 resolution: "common-path-prefix@npm:3.0.0" @@ -7170,7 +7210,7 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:^7.0.0": +"cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1": version: 7.0.1 resolution: "cosmiconfig@npm:7.0.1" dependencies: @@ -7743,7 +7783,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.3": +"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -8408,7 +8448,7 @@ __metadata: languageName: node linkType: hard -"enquirer@npm:^2.3.5": +"enquirer@npm:^2.3.5, enquirer@npm:^2.3.6": version: 2.3.6 resolution: "enquirer@npm:2.3.6" dependencies: @@ -9742,9 +9782,11 @@ __metadata: eslint-plugin-jsx-a11y: ^6.5.1 eslint-plugin-prettier: ^3.4.0 eslint-plugin-react-hooks: ^1.7.0 + husky: ^7.0.0 jest-fetch-mock: 3.0.3 jquery: ^3.6.0 js-cookie: ^2.2.1 + lint-staged: ^11.0.0 prettier: ^2.6.2 prop-types: ^15.8.1 query-string: ^7.1.1 @@ -10859,6 +10901,15 @@ __metadata: languageName: node linkType: hard +"husky@npm:^7.0.0": + version: 7.0.4 + resolution: "husky@npm:7.0.4" + bin: + husky: lib/bin.js + checksum: c6ec4af63da2c9522da8674a20ad9b48362cc92704896cc8a58c6a2a39d797feb2b806f93fbd83a6d653fbdceb2c3b6e0b602c6b2e8565206ffc2882ef7db9e9 + languageName: node + linkType: hard + "hyphenate-style-name@npm:^1.0.3": version: 1.0.4 resolution: "hyphenate-style-name@npm:1.0.4" @@ -12885,6 +12936,51 @@ __metadata: languageName: node linkType: hard +"lint-staged@npm:^11.0.0": + version: 11.2.6 + resolution: "lint-staged@npm:11.2.6" + dependencies: + cli-truncate: 2.1.0 + colorette: ^1.4.0 + commander: ^8.2.0 + cosmiconfig: ^7.0.1 + debug: ^4.3.2 + enquirer: ^2.3.6 + execa: ^5.1.1 + listr2: ^3.12.2 + micromatch: ^4.0.4 + normalize-path: ^3.0.0 + please-upgrade-node: ^3.2.0 + string-argv: 0.3.1 + stringify-object: 3.3.0 + supports-color: 8.1.1 + bin: + lint-staged: bin/lint-staged.js + checksum: b9071621db351c553579bd18df3d80fb753f851c4f1f72db0aaf12e713eab25b6d8a044dab2957817de7da02054a63f7725a49c763aee09295133f0d554f4d3f + languageName: node + linkType: hard + +"listr2@npm:^3.12.2": + version: 3.14.0 + resolution: "listr2@npm:3.14.0" + dependencies: + cli-truncate: ^2.1.0 + colorette: ^2.0.16 + log-update: ^4.0.0 + p-map: ^4.0.0 + rfdc: ^1.3.0 + rxjs: ^7.5.1 + through: ^2.3.8 + wrap-ansi: ^7.0.0 + peerDependencies: + enquirer: ">= 2.3.0 < 3" + peerDependenciesMeta: + enquirer: + optional: true + checksum: fdb8b2d6bdf5df9371ebd5082bee46c6d0ca3d1e5f2b11fbb5a127839855d5f3da9d4968fce94f0a5ec67cac2459766abbb1faeef621065ebb1829b11ef9476d + languageName: node + linkType: hard + "load-json-file@npm:^1.0.0": version: 1.1.0 resolution: "load-json-file@npm:1.1.0" @@ -13090,6 +13186,18 @@ __metadata: languageName: node linkType: hard +"log-update@npm:^4.0.0": + version: 4.0.0 + resolution: "log-update@npm:4.0.0" + dependencies: + ansi-escapes: ^4.3.0 + cli-cursor: ^3.1.0 + slice-ansi: ^4.0.0 + wrap-ansi: ^6.2.0 + checksum: ae2f85bbabc1906034154fb7d4c4477c79b3e703d22d78adee8b3862fa913942772e7fa11713e3d96fb46de4e3cabefbf5d0a544344f03b58d3c4bff52aa9eb2 + languageName: node + linkType: hard + "loglevel@npm:^1.6.8": version: 1.8.0 resolution: "loglevel@npm:1.8.0" @@ -14943,6 +15051,15 @@ __metadata: languageName: node linkType: hard +"please-upgrade-node@npm:^3.2.0": + version: 3.2.0 + resolution: "please-upgrade-node@npm:3.2.0" + dependencies: + semver-compare: ^1.0.0 + checksum: d87c41581a2a022fbe25965a97006238cd9b8cbbf49b39f78d262548149a9d30bd2bdf35fec3d810e0001e630cd46ef13c7e19c389dea8de7e64db271a2381bb + languageName: node + linkType: hard + "pnp-webpack-plugin@npm:1.6.4": version: 1.6.4 resolution: "pnp-webpack-plugin@npm:1.6.4" @@ -17322,6 +17439,16 @@ __metadata: languageName: node linkType: hard +"restore-cursor@npm:^3.1.0": + version: 3.1.0 + resolution: "restore-cursor@npm:3.1.0" + dependencies: + onetime: ^5.1.0 + signal-exit: ^3.0.2 + checksum: f877dd8741796b909f2a82454ec111afb84eb45890eb49ac947d87991379406b3b83ff9673a46012fca0d7844bb989f45cc5b788254cf1a39b6b5a9659de0630 + languageName: node + linkType: hard + "ret@npm:~0.1.10": version: 0.1.15 resolution: "ret@npm:0.1.15" @@ -17360,6 +17487,13 @@ __metadata: languageName: node linkType: hard +"rfdc@npm:^1.3.0": + version: 1.3.0 + resolution: "rfdc@npm:1.3.0" + checksum: fb2ba8512e43519983b4c61bd3fa77c0f410eff6bae68b08614437bc3f35f91362215f7b4a73cbda6f67330b5746ce07db5dd9850ad3edc91271ad6deea0df32 + languageName: node + linkType: hard + "rgb-regex@npm:^1.0.1": version: 1.0.1 resolution: "rgb-regex@npm:1.0.1" @@ -17481,6 +17615,15 @@ __metadata: languageName: node linkType: hard +"rxjs@npm:^7.5.1": + version: 7.5.7 + resolution: "rxjs@npm:7.5.7" + dependencies: + tslib: ^2.1.0 + checksum: edabcdb73b0f7e0f5f6e05c2077aff8c52222ac939069729704357d6406438acca831c24210db320aba269e86dbe1a400f3769c89101791885121a342fb15d9c + languageName: node + linkType: hard + "safe-buffer@npm:5.1.1": version: 5.1.1 resolution: "safe-buffer@npm:5.1.1" @@ -17655,6 +17798,13 @@ __metadata: languageName: node linkType: hard +"semver-compare@npm:^1.0.0": + version: 1.0.0 + resolution: "semver-compare@npm:1.0.0" + checksum: dd1d7e2909744cf2cf71864ac718efc990297f9de2913b68e41a214319e70174b1d1793ac16e31183b128c2b9812541300cb324db8168e6cf6b570703b171c68 + languageName: node + linkType: hard + "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0": version: 5.7.1 resolution: "semver@npm:5.7.1" @@ -17952,6 +18102,17 @@ __metadata: languageName: node linkType: hard +"slice-ansi@npm:^3.0.0": + version: 3.0.0 + resolution: "slice-ansi@npm:3.0.0" + dependencies: + ansi-styles: ^4.0.0 + astral-regex: ^2.0.0 + is-fullwidth-code-point: ^3.0.0 + checksum: 5ec6d022d12e016347e9e3e98a7eb2a592213a43a65f1b61b74d2c78288da0aded781f665807a9f3876b9daa9ad94f64f77d7633a0458876c3a4fdc4eb223f24 + languageName: node + linkType: hard + "slice-ansi@npm:^4.0.0": version: 4.0.0 resolution: "slice-ansi@npm:4.0.0" @@ -18375,6 +18536,13 @@ __metadata: languageName: node linkType: hard +"string-argv@npm:0.3.1": + version: 0.3.1 + resolution: "string-argv@npm:0.3.1" + checksum: efbd0289b599bee808ce80820dfe49c9635610715429c6b7cc50750f0437e3c2f697c81e5c390208c13b5d5d12d904a1546172a88579f6ee5cbaaaa4dc9ec5cf + languageName: node + linkType: hard + "string-length@npm:^4.0.1": version: 4.0.2 resolution: "string-length@npm:4.0.2" @@ -18492,7 +18660,7 @@ __metadata: languageName: node linkType: hard -"stringify-object@npm:^3.3.0": +"stringify-object@npm:3.3.0, stringify-object@npm:^3.3.0": version: 3.3.0 resolution: "stringify-object@npm:3.3.0" dependencies: @@ -18667,6 +18835,15 @@ __metadata: languageName: node linkType: hard +"supports-color@npm:8.1.1, supports-color@npm:^8.0.0": + version: 8.1.1 + resolution: "supports-color@npm:8.1.1" + dependencies: + has-flag: ^4.0.0 + checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406 + languageName: node + linkType: hard + "supports-color@npm:^5.3.0, supports-color@npm:^5.5.0": version: 5.5.0 resolution: "supports-color@npm:5.5.0" @@ -18694,15 +18871,6 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:^8.0.0": - version: 8.1.1 - resolution: "supports-color@npm:8.1.1" - dependencies: - has-flag: ^4.0.0 - checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406 - languageName: node - linkType: hard - "supports-hyperlinks@npm:^2.0.0": version: 2.2.0 resolution: "supports-hyperlinks@npm:2.2.0" @@ -18983,6 +19151,13 @@ __metadata: languageName: node linkType: hard +"through@npm:^2.3.8": + version: 2.3.8 + resolution: "through@npm:2.3.8" + checksum: a38c3e059853c494af95d50c072b83f8b676a9ba2818dcc5b108ef252230735c54e0185437618596c790bbba8fcdaef5b290405981ffa09dce67b1f1bf190cbd + languageName: node + linkType: hard + "thunky@npm:^1.0.2": version: 1.1.0 resolution: "thunky@npm:1.1.0" @@ -19193,6 +19368,13 @@ __metadata: languageName: node linkType: hard +"tslib@npm:^2.1.0": + version: 2.4.1 + resolution: "tslib@npm:2.4.1" + checksum: 19480d6e0313292bd6505d4efe096a6b31c70e21cf08b5febf4da62e95c265c8f571f7b36fcc3d1a17e068032f59c269fab3459d6cd3ed6949eafecf64315fca + languageName: node + linkType: hard + "tsutils@npm:^3.17.1, tsutils@npm:^3.21.0": version: 3.21.0 resolution: "tsutils@npm:3.21.0" From caa80ac7818eec3beaa803f88fcc2d08bf2aa2ec Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:24:30 +0530 Subject: [PATCH 02/33] Updated to one eslint config Signed-off-by: Adithya Krishna --- .eslintrc.json | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 5c9d93158..0f0f4ff4b 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -5,7 +5,10 @@ "es2021": true, "jest": true }, - "extends": ["airbnb", "plugin:prettier/recommended"], + "extends": [ + "airbnb", + "plugin:prettier/recommended" + ], "parserOptions": { "ecmaFeatures": { "jsx": true @@ -37,6 +40,14 @@ "prefer-destructuring": ["error", { "object": true, "array": false }], "react/require-default-props": 0, "jsx-a11y/control-has-associated-label": 0, - "react/jsx-props-no-spreading": 0 - } -} + "react/jsx-props-no-spreading": 0, + "import/no-anonymous-default-export": "off" + }, + "overrides": [ + { + "files": [ + "**/*.stories.*" + ] + } + ] +} \ No newline at end of file From 30d3b1dba9d3fd25347691f7c4cd581c8b5f6a4d Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:25:12 +0530 Subject: [PATCH 03/33] Updated to async function Signed-off-by: Adithya Krishna --- src/components/Footer/index.jsx | 17 +++++++++-------- src/services/info.js | 22 ++++++++++------------ 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx index cb93134eb..59ca21dd0 100644 --- a/src/components/Footer/index.jsx +++ b/src/components/Footer/index.jsx @@ -24,14 +24,15 @@ const Footer = () => { const [version, setVersion] = useState( getSessionStorage("fossologyVersion") || null ); - const fetchVersion = () => { - return getFossologyVersion() - .then((res) => { - setSessionStorage("fossologyVersion", res); - setVersion(res); - return res; - }) - .catch(() => null); + const fetchVersion = async () => { + try { + const res = await getFossologyVersion(); + setSessionStorage("fossologyVersion", res); + setVersion(res); + return res; + } catch { + return null; + } }; useEffect(() => { if (!version) { diff --git a/src/services/info.js b/src/services/info.js index 54ddd3242..057fef04a 100644 --- a/src/services/info.js +++ b/src/services/info.js @@ -18,18 +18,16 @@ import { getInfoApi } from "api/info"; -export const getInfo = () => { - return getInfoApi().then((res) => { - return res; - }); +export const getInfo = async () => { + const res = await getInfoApi(); + return res; }; -export const getFossologyVersion = () => { - return getInfoApi().then((res) => { - return { - ...res?.fossology, - buildDate: new Date(res?.fossology?.buildDate).toLocaleString(), - commitDate: new Date(res?.fossology?.commitDate).toLocaleString(), - }; - }); +export const getFossologyVersion = async () => { + const res = await getInfoApi(); + return { + ...res?.fossology, + buildDate: new Date(res?.fossology?.buildDate).toLocaleString(), + commitDate: new Date(res?.fossology?.commitDate).toLocaleString(), + }; }; From f6661868940479ba087e7e6694d93303062c07aa Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:27:59 +0530 Subject: [PATCH 04/33] Moved tests to seperate directory Signed-off-by: Adithya Krishna --- src/api/{ => __tests__}/auth.test.js | 0 src/api/{ => __tests__}/browse.test.js | 0 src/api/{ => __tests__}/folders.test.js | 0 src/api/{ => __tests__}/groups.test.js | 0 src/api/{ => __tests__}/info.test.js | 0 src/api/{ => __tests__}/jobs.test.js | 0 src/api/{ => __tests__}/licenses.test.js | 0 src/api/{ => __tests__}/maintenance.test.js | 0 src/api/{ => __tests__}/organizeUploads.test.js | 0 src/api/{ => __tests__}/search.test.js | 0 src/api/{ => __tests__}/sendRequest.test.js | 0 src/api/{ => __tests__}/upload.test.js | 0 src/api/{ => __tests__}/users.test.js | 0 13 files changed, 0 insertions(+), 0 deletions(-) rename src/api/{ => __tests__}/auth.test.js (100%) rename src/api/{ => __tests__}/browse.test.js (100%) rename src/api/{ => __tests__}/folders.test.js (100%) rename src/api/{ => __tests__}/groups.test.js (100%) rename src/api/{ => __tests__}/info.test.js (100%) rename src/api/{ => __tests__}/jobs.test.js (100%) rename src/api/{ => __tests__}/licenses.test.js (100%) rename src/api/{ => __tests__}/maintenance.test.js (100%) rename src/api/{ => __tests__}/organizeUploads.test.js (100%) rename src/api/{ => __tests__}/search.test.js (100%) rename src/api/{ => __tests__}/sendRequest.test.js (100%) rename src/api/{ => __tests__}/upload.test.js (100%) rename src/api/{ => __tests__}/users.test.js (100%) diff --git a/src/api/auth.test.js b/src/api/__tests__/auth.test.js similarity index 100% rename from src/api/auth.test.js rename to src/api/__tests__/auth.test.js diff --git a/src/api/browse.test.js b/src/api/__tests__/browse.test.js similarity index 100% rename from src/api/browse.test.js rename to src/api/__tests__/browse.test.js diff --git a/src/api/folders.test.js b/src/api/__tests__/folders.test.js similarity index 100% rename from src/api/folders.test.js rename to src/api/__tests__/folders.test.js diff --git a/src/api/groups.test.js b/src/api/__tests__/groups.test.js similarity index 100% rename from src/api/groups.test.js rename to src/api/__tests__/groups.test.js diff --git a/src/api/info.test.js b/src/api/__tests__/info.test.js similarity index 100% rename from src/api/info.test.js rename to src/api/__tests__/info.test.js diff --git a/src/api/jobs.test.js b/src/api/__tests__/jobs.test.js similarity index 100% rename from src/api/jobs.test.js rename to src/api/__tests__/jobs.test.js diff --git a/src/api/licenses.test.js b/src/api/__tests__/licenses.test.js similarity index 100% rename from src/api/licenses.test.js rename to src/api/__tests__/licenses.test.js diff --git a/src/api/maintenance.test.js b/src/api/__tests__/maintenance.test.js similarity index 100% rename from src/api/maintenance.test.js rename to src/api/__tests__/maintenance.test.js diff --git a/src/api/organizeUploads.test.js b/src/api/__tests__/organizeUploads.test.js similarity index 100% rename from src/api/organizeUploads.test.js rename to src/api/__tests__/organizeUploads.test.js diff --git a/src/api/search.test.js b/src/api/__tests__/search.test.js similarity index 100% rename from src/api/search.test.js rename to src/api/__tests__/search.test.js diff --git a/src/api/sendRequest.test.js b/src/api/__tests__/sendRequest.test.js similarity index 100% rename from src/api/sendRequest.test.js rename to src/api/__tests__/sendRequest.test.js diff --git a/src/api/upload.test.js b/src/api/__tests__/upload.test.js similarity index 100% rename from src/api/upload.test.js rename to src/api/__tests__/upload.test.js diff --git a/src/api/users.test.js b/src/api/__tests__/users.test.js similarity index 100% rename from src/api/users.test.js rename to src/api/__tests__/users.test.js From 528b8906549ee0bf9adb32edc3f41b0ac927a0af Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:28:12 +0530 Subject: [PATCH 05/33] Updated husky config Signed-off-by: Adithya Krishna --- .husky/pre-commit | 4 ---- .husky/pre-push | 4 ---- package.json | 8 +++++++- 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 100755 .husky/pre-commit delete mode 100755 .husky/pre-push diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100755 index d19bb4c23..000000000 --- a/.husky/pre-commit +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -./hooks/pre-commit diff --git a/.husky/pre-push b/.husky/pre-push deleted file mode 100755 index 2bd9dcce3..000000000 --- a/.husky/pre-push +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -./hooks/pre-push $1 diff --git a/package.json b/package.json index cf4e32d63..2db84e743 100644 --- a/package.json +++ b/package.json @@ -79,5 +79,11 @@ "packageManager": "yarn@3.2.1", "lint-staged": { "*.ts*": "eslint --ignore-path .gitignore --cache --fix" - } + }, + "husky": { + "hooks": { + "pre-commit": "npm run lint:check", + "pre-push": "npm run lint" + } + } } From 1ab72f9df6a8ab3b1e4908f9e25782d522fa974d Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:28:30 +0530 Subject: [PATCH 06/33] Updated husky config Signed-off-by: Adithya Krishna --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 2db84e743..2d5568aff 100644 --- a/package.json +++ b/package.json @@ -81,9 +81,9 @@ "*.ts*": "eslint --ignore-path .gitignore --cache --fix" }, "husky": { - "hooks": { - "pre-commit": "npm run lint:check", - "pre-push": "npm run lint" - } + "hooks": { + "pre-commit": "npm run lint:check", + "pre-push": "npm run lint" } + } } From 8e61f71d726e60f990370d03f47538aee89eef7c Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:31:07 +0530 Subject: [PATCH 07/33] Updated lint staged config Signed-off-by: Adithya Krishna --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 2d5568aff..a00b7ea04 100644 --- a/package.json +++ b/package.json @@ -78,11 +78,11 @@ }, "packageManager": "yarn@3.2.1", "lint-staged": { - "*.ts*": "eslint --ignore-path .gitignore --cache --fix" + "src/**/*.{js,jsx}": "eslint src/ --fix" }, "husky": { "hooks": { - "pre-commit": "npm run lint:check", + "pre-commit": "lint-staged", "pre-push": "npm run lint" } } From fa50e325c6b81062251eddaf768b037ab1130447 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:31:44 +0530 Subject: [PATCH 08/33] Husky Lint Check Signed-off-by: Adithya Krishna --- src/components/Footer/index.jsx | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx index 59ca21dd0..b411064dd 100644 --- a/src/components/Footer/index.jsx +++ b/src/components/Footer/index.jsx @@ -21,9 +21,9 @@ import { getFossologyVersion } from "services/info"; import { getSessionStorage, setSessionStorage } from "shared/storageHelper"; const Footer = () => { - const [version, setVersion] = useState( - getSessionStorage("fossologyVersion") || null - ); + const [version, setVersion] = useState( + getSessionStorage("fossologyVersion") || null + ); const fetchVersion = async () => { try { const res = await getFossologyVersion(); @@ -40,14 +40,14 @@ const Footer = () => { } }, []); return ( -
- Version: [{version?.version}], Branch: [{version?.branchName}], Commit: [ - {`#${version?.commitHash}`}] {version?.commitDate} built @{" "} - {version?.buildDate} -
+
+ Version: [{version?.version}], Branch: [{version?.branchName}], Commit: [ + {`#${version?.commitHash}`}] {version?.commitDate} built @{" "} + {version?.buildDate} +
); }; From bf458a93f518f15e764210cc2123a7d299df1b88 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:32:27 +0530 Subject: [PATCH 09/33] Lint Check - v2 --- src/components/Footer/index.jsx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx index b411064dd..ebaf2e88f 100644 --- a/src/components/Footer/index.jsx +++ b/src/components/Footer/index.jsx @@ -21,10 +21,10 @@ import { getFossologyVersion } from "services/info"; import { getSessionStorage, setSessionStorage } from "shared/storageHelper"; const Footer = () => { - const [version, setVersion] = useState( - getSessionStorage("fossologyVersion") || null - ); - const fetchVersion = async () => { + const [version, setVersion] = useState( + getSessionStorage("fossologyVersion") || null + ); + const fetchVersion = async () => { try { const res = await getFossologyVersion(); setSessionStorage("fossologyVersion", res); @@ -40,14 +40,14 @@ const Footer = () => { } }, []); return ( -
- Version: [{version?.version}], Branch: [{version?.branchName}], Commit: [ - {`#${version?.commitHash}`}] {version?.commitDate} built @{" "} - {version?.buildDate} -
+
+ Version: [{version?.version}], Branch: [{version?.branchName}], Commit: [ + {`#${version?.commitHash}`}] {version?.commitDate} built @{" "} + {version?.buildDate} +
); }; From 7b879c566df30f839474b39d30ad145a93475dba Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:34:33 +0530 Subject: [PATCH 10/33] Husky Lint Check - v2 Signed-off-by: Adithya Krishna --- package.json | 24 ++++++++++++------------ src/components/Footer/index.jsx | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index a00b7ea04..5c7825290 100644 --- a/package.json +++ b/package.json @@ -34,13 +34,22 @@ "eject": "react-scripts eject", "format": "prettier --write .", "format:check": "prettier --check .", - "lint": "eslint src/ --fix", - "lint:check": "eslint src/", + "lint": "eslint --ignore-path .gitignore src/ --fix", + "lint:check": "eslint --ignore-path .gitignore src/", "fix:all": "yarn lint && yarn format", "storybook": "start-storybook -p 6006 -s public", "build-storybook": "build-storybook -s public", "gencopy": "node scripts/copyrightsScript.js && prettier --write ./scripts/copyrights.js" }, + "lint-staged": { + "src/**/*.{js,jsx}": "eslint src/ --fix" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged", + "pre-push": "yarn run fix:all" + } + }, "browserslist": { "production": [ ">0.2%", @@ -76,14 +85,5 @@ "lint-staged": "^11.0.0", "prettier": "^2.6.2" }, - "packageManager": "yarn@3.2.1", - "lint-staged": { - "src/**/*.{js,jsx}": "eslint src/ --fix" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged", - "pre-push": "npm run lint" - } - } + "packageManager": "yarn@3.2.1" } diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx index ebaf2e88f..d9380dccd 100644 --- a/src/components/Footer/index.jsx +++ b/src/components/Footer/index.jsx @@ -41,12 +41,12 @@ const Footer = () => { }, []); return (
Version: [{version?.version}], Branch: [{version?.branchName}], Commit: [ {`#${version?.commitHash}`}] {version?.commitDate} built @{" "} - {version?.buildDate} + { version?.buildDate}
); }; From 8e3361096f0a3a9b936a09eaaca1eff0fb3e12c2 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:36:10 +0530 Subject: [PATCH 11/33] Husky Lint Check - v3 --- package.json | 2 +- src/components/Footer/index.jsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 5c7825290..11d6adaeb 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "husky": { "hooks": { "pre-commit": "lint-staged", - "pre-push": "yarn run fix:all" + "pre-push": "yarn run lint" } }, "browserslist": { diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx index d9380dccd..b4fa6bd4e 100644 --- a/src/components/Footer/index.jsx +++ b/src/components/Footer/index.jsx @@ -27,7 +27,7 @@ const Footer = () => { const fetchVersion = async () => { try { const res = await getFossologyVersion(); - setSessionStorage("fossologyVersion", res); + setSessionStorage("fossologyVersion", res); setVersion(res); return res; } catch { @@ -36,7 +36,7 @@ const Footer = () => { }; useEffect(() => { if (!version) { - fetchVersion(); + fetchVersion(); } }, []); return ( From dd8adc6db5a73297dffaac31f4df07d6923e9795 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:37:33 +0530 Subject: [PATCH 12/33] Husky Lint Check - v4 Signed-off-by: Adithya Krishna --- package.json | 2 +- src/components/Footer/index.jsx | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 11d6adaeb..50866f9df 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "gencopy": "node scripts/copyrightsScript.js && prettier --write ./scripts/copyrights.js" }, "lint-staged": { - "src/**/*.{js,jsx}": "eslint src/ --fix" + "src/**/*.{js,jsx}": "npm run lint:check" }, "husky": { "hooks": { diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx index b4fa6bd4e..4511e816a 100644 --- a/src/components/Footer/index.jsx +++ b/src/components/Footer/index.jsx @@ -28,8 +28,8 @@ const Footer = () => { try { const res = await getFossologyVersion(); setSessionStorage("fossologyVersion", res); - setVersion(res); - return res; + setVersion(res); + return res; } catch { return null; } @@ -44,7 +44,7 @@ const Footer = () => { className="primary-color-wrapper text-center font-size-small py-3" id="footer" > - Version: [{version?.version}], Branch: [{version?.branchName}], Commit: [ + Version: [ {version?.version}], Branch: [{version?.branchName}], Commit: [ {`#${version?.commitHash}`}] {version?.commitDate} built @{" "} { version?.buildDate} From f3df2bb8a14d207abee502729b577051c528c07b Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 17:37:55 +0530 Subject: [PATCH 13/33] Husky Lint Check - v5 Signed-off-by: Adithya Krishna --- package.json | 2 +- src/components/Footer/index.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 50866f9df..d84ffefb3 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "gencopy": "node scripts/copyrightsScript.js && prettier --write ./scripts/copyrights.js" }, "lint-staged": { - "src/**/*.{js,jsx}": "npm run lint:check" + "src/**/*.{js,jsx}": "yarn run lint:check" }, "husky": { "hooks": { diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx index 4511e816a..886cd02cc 100644 --- a/src/components/Footer/index.jsx +++ b/src/components/Footer/index.jsx @@ -44,7 +44,7 @@ const Footer = () => { className="primary-color-wrapper text-center font-size-small py-3" id="footer" > - Version: [ {version?.version}], Branch: [{version?.branchName}], Commit: [ + Version: [ {version?.version}], Branch: [{version?.branchName}], Commit: [ {`#${version?.commitHash}`}] {version?.commitDate} built @{" "} { version?.buildDate} From bd8a68b538b4469463e012cdff0da79f1c243f75 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 18:38:37 +0530 Subject: [PATCH 14/33] Fixed eslint errors and added new rules Signed-off-by: Adithya Krishna --- .eslintignore | 13 +- .eslintrc.json | 34 ++- package.json | 13 +- scripts/{copyrights.js => copyrights.json} | 4 +- scripts/copyrightsScript.js | 11 +- src/App.jsx | 22 +- src/Routes.jsx | 4 +- src/api/__tests__/auth.test.js | 4 +- src/api/__tests__/browse.test.js | 4 +- src/api/__tests__/folders.test.js | 4 +- src/api/__tests__/groups.test.js | 2 +- src/api/__tests__/info.test.js | 2 +- src/api/__tests__/jobs.test.js | 4 +- src/api/__tests__/licenses.test.js | 2 +- src/api/__tests__/maintenance.test.js | 2 +- src/api/__tests__/organizeUploads.test.js | 6 +- src/api/__tests__/search.test.js | 2 +- src/api/__tests__/sendRequest.test.js | 4 +- src/api/__tests__/upload.test.js | 4 +- src/api/__tests__/users.test.js | 2 +- src/api/auth.js | 8 +- src/api/browse.js | 3 +- src/api/folders.js | 1 - src/api/groups.js | 1 - src/api/jobs.js | 1 - src/api/licenses.js | 1 - src/api/maintenance.js | 1 - src/api/organizeUploads.js | 1 - src/api/search.js | 3 +- src/api/sendRequest.js | 3 +- src/api/upload.js | 3 +- src/api/users.js | 1 - src/components/BrowseUploadsHeader/index.jsx | 9 +- .../DarkThemeToggle/DarkThemeToggle.jsx | 4 +- src/components/Footer/index.jsx | 18 +- src/components/Header/index.jsx | 45 ++-- .../Modals/DeleteConfirmation/index.jsx | 3 +- src/components/Table/index.jsx | 8 +- src/components/Table/tests/index.test.jsx | 1 + src/components/Title/index.jsx | 3 +- src/components/TreeContainer/index.jsx | 5 +- .../Upload/CommonFields/AccessLevel/index.jsx | 5 +- .../Upload/CommonFields/IgnoreScm/index.jsx | 5 +- .../CommonFields/LicenseDecider/index.jsx | 5 +- .../CommonFields/OptionalAnalysis/index.jsx | 5 +- .../Upload/CommonFields/UploadReuse/index.jsx | 11 +- src/components/Upload/CommonFields/index.jsx | 7 +- src/components/Widgets/Alert/index.jsx | 2 +- src/components/Widgets/Button/index.jsx | 2 +- src/components/Widgets/Image/index.jsx | 2 +- src/components/Widgets/Input/index.jsx | 2 +- src/components/Widgets/Modal/index.jsx | 7 +- src/components/Widgets/TextIcon/index.jsx | 2 +- src/components/Widgets/Tooltip/index.jsx | 2 +- src/components/Widgets/index.jsx | 1 + src/context/index.jsx | 5 +- src/index.jsx | 1 + src/pages/Admin/Group/Create/index.jsx | 7 +- src/pages/Admin/Group/Delete/index.jsx | 14 +- src/pages/Admin/License/Create/index.jsx | 6 +- .../Admin/License/SelectLicense/index.jsx | 3 +- src/pages/Admin/Mantainance/index.jsx | 3 +- src/pages/Admin/Users/Add/index.jsx | 14 +- src/pages/Admin/Users/Delete/index.jsx | 10 +- src/pages/Admin/Users/Edit/index.jsx | 15 +- src/pages/Admin/Users/Edit/token_space.jsx | 12 +- src/pages/Browse/index.jsx | 26 +- src/pages/BrowseUploads/Copyright/index.jsx | 12 +- src/pages/BrowseUploads/Ecc/index.jsx | 8 +- src/pages/BrowseUploads/FileBrowser/index.jsx | 8 +- .../BrowseUploads/LicenseBrowser/index.jsx | 15 +- .../BrowseUploads/SoftwareHeritage/index.jsx | 8 +- src/pages/ErrorPage/index.jsx | 8 +- src/pages/Help/About/index.jsx | 6 +- src/pages/Help/LicenseBrowser/index.jsx | 3 +- src/pages/Help/Overview/index.jsx | 12 +- src/pages/Help/ThirdPartyLicenses/index.jsx | 8 +- src/pages/Home/Features.jsx | 12 +- src/pages/Home/index.jsx | 25 +- src/pages/Home/index.test.jsx | 2 +- src/pages/Jobs/AllJobs/index.jsx | 14 +- src/pages/Jobs/MyRecentJobs/index.jsx | 14 +- src/pages/Jobs/ScheduleAgents/index.jsx | 11 +- src/pages/Organize/Folder/Create/index.jsx | 10 +- src/pages/Organize/Folder/Delete/index.jsx | 10 +- src/pages/Organize/Folder/Edit/index.jsx | 10 +- src/pages/Organize/Folder/Move/index.jsx | 10 +- src/pages/Organize/Folder/Unlink/index.jsx | 10 +- .../License/CandidateLicense/index.jsx | 12 +- src/pages/Organize/License/Create/index.jsx | 7 +- src/pages/Organize/Uploads/Delete/index.jsx | 9 +- src/pages/Organize/Uploads/Edit/index.jsx | 6 +- src/pages/Organize/Uploads/Move/index.jsx | 12 +- src/pages/Search/index.jsx | 9 +- src/pages/Upload/File/index.jsx | 21 +- src/pages/Upload/ImportReport/index.jsx | 9 +- src/pages/Upload/Instructions/index.jsx | 11 +- src/pages/Upload/OneShotAnalysis/index.jsx | 4 +- src/pages/Upload/OneShotCopyright/index.jsx | 4 +- src/pages/Upload/OneShotMonk/index.jsx | 4 +- src/pages/Upload/Server/index.jsx | 18 +- src/pages/Upload/Url/index.jsx | 23 +- src/pages/Upload/Vcs/index.jsx | 24 +- src/services/folders.js | 4 +- src/services/groups.js | 4 +- src/services/jobs.js | 8 +- src/services/licenses.js | 2 +- src/services/organizeUploads.js | 4 +- src/services/upload.js | 6 +- src/services/users.js | 8 +- src/shared/AdminLayout.jsx | 9 +- src/shared/PrivateLayout.jsx | 9 +- src/shared/PublicLayout.jsx | 7 +- src/shared/authHelper.js | 2 +- src/stories/Alert.stories.jsx | 11 +- src/stories/Button.jsx | 5 +- src/stories/Button.stories.jsx | 11 +- src/stories/Header.jsx | 5 +- src/stories/Image.stories.jsx | 11 +- src/stories/Input.stories.jsx | 11 +- src/stories/Page.jsx | 5 +- src/stories/Page.stories.jsx | 2 +- src/stories/TextIcon.stories.jsx | 11 +- src/stories/Tooltip.stories.jsx | 11 +- src/testingUtils/renderComponent.jsx | 9 +- yarn.lock | 254 +++++++++++++++++- 126 files changed, 677 insertions(+), 561 deletions(-) rename scripts/{copyrights.js => copyrights.json} (99%) diff --git a/.eslintignore b/.eslintignore index 987d6277f..fe8cbe26b 100644 --- a/.eslintignore +++ b/.eslintignore @@ -16,9 +16,18 @@ package-lock.json .min.js .min.css -#Dockerfile +# Dockerfile .dockerignore Dockerfile.dev Dockerfile docker-compose.yml -docker-compose.dev.yml \ No newline at end of file +docker-compose.dev.yml + +# Storybook Files +**.stories.js +**.stories.jsx + +# Other Files +**/*.svg +**/*.css +/src/assets/ \ No newline at end of file diff --git a/.eslintrc.json b/.eslintrc.json index 0f0f4ff4b..fd53f6125 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -7,16 +7,22 @@ }, "extends": [ "airbnb", - "plugin:prettier/recommended" + "plugin:prettier/recommended", + "plugin:json/recommended" ], + "parser": "@babel/eslint-parser", "parserOptions": { "ecmaFeatures": { "jsx": true }, "ecmaVersion": 12, - "sourceType": "module" + "sourceType": "module", + "requireConfigFile": false, + "babelOptions": { + "presets": ["@babel/preset-react"] + } }, - "plugins": ["react"], + "plugins": ["react", "react-hooks", "prettier", "simple-import-sort"], "settings": { "react": { "version": "detect" @@ -33,7 +39,11 @@ "prettier/prettier": [ "error", { - "endOfLine": "auto" + "endOfLine": "auto", + "semi": true, + "singleQuote": false, + "tabWidth": 2, + "useTabs": false } ], "no-plusplus": ["error", { "allowForLoopAfterthoughts": true }], @@ -41,13 +51,11 @@ "react/require-default-props": 0, "jsx-a11y/control-has-associated-label": 0, "react/jsx-props-no-spreading": 0, - "import/no-anonymous-default-export": "off" - }, - "overrides": [ - { - "files": [ - "**/*.stories.*" - ] - } - ] + "import/no-anonymous-default-export": 0, + "import/prefer-default-export": 0, + "react/react-in-jsx-scope": "off", + "simple-import-sort/imports": "error", + "react/jsx-filename-extension": 0, + "json/*": ["warn", {"allowComments": true}] + } } \ No newline at end of file diff --git a/package.json b/package.json index d84ffefb3..9987b0e17 100644 --- a/package.json +++ b/package.json @@ -34,15 +34,17 @@ "eject": "react-scripts eject", "format": "prettier --write .", "format:check": "prettier --check .", - "lint": "eslint --ignore-path .gitignore src/ --fix", - "lint:check": "eslint --ignore-path .gitignore src/", + "lint": "eslint --ignore-path .eslintignore '**/*.{js,jsx}*' --fix", + "lint:check": "eslint --ignore-path .eslintignore '**/*.{js,jsx}*'", "fix:all": "yarn lint && yarn format", "storybook": "start-storybook -p 6006 -s public", "build-storybook": "build-storybook -s public", "gencopy": "node scripts/copyrightsScript.js && prettier --write ./scripts/copyrights.js" }, "lint-staged": { - "src/**/*.{js,jsx}": "yarn run lint:check" + "src/**/*.{js,jsx}": [ + "yarn run lint:check" + ] }, "husky": { "hooks": { @@ -66,6 +68,8 @@ "babel-loader": "8.1.0" }, "devDependencies": { + "@babel/eslint-parser": "^7.19.1", + "@babel/preset-react": "^7.18.6", "@storybook/addon-actions": "^6.5.5", "@storybook/addon-essentials": "^6.5.5", "@storybook/addon-links": "^6.5.5", @@ -77,9 +81,12 @@ "eslint-config-airbnb": "18.2.1", "eslint-config-prettier": "^8.5.0", "eslint-plugin-import": "^2.26.0", + "eslint-plugin-json": "^3.1.0", "eslint-plugin-jsx-a11y": "^6.5.1", "eslint-plugin-prettier": "^3.4.0", + "eslint-plugin-react": "^7.24.0", "eslint-plugin-react-hooks": "^1.7.0", + "eslint-plugin-simple-import-sort": "^7.0.0", "husky": "^7.0.0", "jest-fetch-mock": "3.0.3", "lint-staged": "^11.0.0", diff --git a/scripts/copyrights.js b/scripts/copyrights.json similarity index 99% rename from scripts/copyrights.js rename to scripts/copyrights.json index 03bfbca7e..85bd7e43e 100644 --- a/scripts/copyrights.js +++ b/scripts/copyrights.json @@ -252,5 +252,5 @@ "Copyright (C) Siemens AG, 2014", "Copyright (C) Siemens AG, 2014-2019", "Copyright (C) TNG Technology Consulting GmbH 2016, maximilian.huber@tngtech.com", - "Copyright (C) TNG Technology Consulting GmbH 2016-2017, maximilian.huber@tngtech.com", -]; + "Copyright (C) TNG Technology Consulting GmbH 2016-2017, maximilian.huber@tngtech.com" +] diff --git a/scripts/copyrightsScript.js b/scripts/copyrightsScript.js index e7d8ce0a9..aaca63d9e 100644 --- a/scripts/copyrightsScript.js +++ b/scripts/copyrightsScript.js @@ -17,23 +17,24 @@ */ // eslint-disable-next-line import/no-extraneous-dependencies -const csv = require("csv-parser"); -const fs = require("fs"); +import csv from "csv-parser"; +import { createReadStream, writeFile } from "fs"; const copyrights = []; -fs.createReadStream("scripts/copyrights.csv") +createReadStream("scripts/copyrights.csv") .pipe(csv()) .on("data", (data) => { copyrights.push(data.copyright); }) .on("end", () => { const uniqueCopyrights = [...new Set(copyrights)].sort(); - fs.writeFile( - "scripts/copyrights.js", + writeFile( + "scripts/copyrights.json", JSON.stringify(uniqueCopyrights), (err) => { if (err) { + /* eslint-disable-next-line no-console */ console.log("Unable to parse the CSV to generate copyrights array"); } } diff --git a/src/App.jsx b/src/App.jsx index 355736ac8..2c37f421a 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -17,26 +17,22 @@ */ // React Imports -import React, { useContext, useEffect } from "react"; - -// Theme Provider -import { ThemeProvider } from "styled-components"; -import { lightTheme, darkTheme } from "styles/theme"; - -// GlobalContext -import { GlobalContext, GlobalProvider } from "context"; - -// Routes -import Routes from "Routes"; - // eslint-disable-next-line import/no-extraneous-dependencies import "popper.js"; - // Global CSS (Bootstrap, Tree View of Folders, Custom Styling) import "bootstrap/dist/css/bootstrap.min.css"; import "react-virtualized-tree/lib/main.css"; import "styles/global.css"; + +// GlobalContext +import { GlobalContext, GlobalProvider } from "context"; +import React, { useContext, useEffect } from "react"; +// Routes +import Routes from "Routes"; +// Theme Provider +import { ThemeProvider } from "styled-components"; import GlobalStyles from "styles/globalStyle"; +import { darkTheme, lightTheme } from "styles/theme"; function App() { const { state } = useContext(GlobalContext); diff --git a/src/Routes.jsx b/src/Routes.jsx index 05f9f3a02..182bf1176 100644 --- a/src/Routes.jsx +++ b/src/Routes.jsx @@ -17,9 +17,9 @@ */ // React imports -import React from "react"; import routes from "constants/routes"; -import { BrowserRouter, Switch, Route } from "react-router-dom"; +import React from "react"; +import { BrowserRouter, Route, Switch } from "react-router-dom"; // Guards imports const PublicLayout = React.lazy(() => import("shared/PublicLayout")); diff --git a/src/api/__tests__/auth.test.js b/src/api/__tests__/auth.test.js index c76370f46..0897372ac 100644 --- a/src/api/__tests__/auth.test.js +++ b/src/api/__tests__/auth.test.js @@ -13,12 +13,12 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import sendRequest from "api/sendRequest"; import fetchTokenApi from "api/auth"; +import sendRequest from "api/sendRequest"; import { tokenExpiryDays, tokenScope } from "constants/auth"; +import endpoints from "constants/endpoints"; import * as helper from "shared/helper"; import { getDate } from "shared/helper"; -import endpoints from "constants/endpoints"; jest.mock("api/sendRequest"); diff --git a/src/api/__tests__/browse.test.js b/src/api/__tests__/browse.test.js index 9a2251415..4b8d3f136 100644 --- a/src/api/__tests__/browse.test.js +++ b/src/api/__tests__/browse.test.js @@ -13,10 +13,10 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import sendRequest from "api/sendRequest"; import getBrowseDataApi from "api/browse"; -import { getToken } from "shared/authHelper"; +import sendRequest from "api/sendRequest"; import endpoints from "constants/endpoints"; +import { getToken } from "shared/authHelper"; jest.mock("api/sendRequest"); diff --git a/src/api/__tests__/folders.test.js b/src/api/__tests__/folders.test.js index 042bdd4ae..3929330f0 100644 --- a/src/api/__tests__/folders.test.js +++ b/src/api/__tests__/folders.test.js @@ -13,7 +13,6 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import sendRequest from "api/sendRequest"; import { createFolderApi, deleteFolderApi, @@ -22,8 +21,9 @@ import { getSingleFolderApi, moveCopyFolderApi, } from "api/folders"; -import { getToken } from "shared/authHelper"; +import sendRequest from "api/sendRequest"; import endpoints from "constants/endpoints"; +import { getToken } from "shared/authHelper"; jest.mock("api/sendRequest"); diff --git a/src/api/__tests__/groups.test.js b/src/api/__tests__/groups.test.js index 6074be0ab..859cd42f9 100644 --- a/src/api/__tests__/groups.test.js +++ b/src/api/__tests__/groups.test.js @@ -13,9 +13,9 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import { createGroupApi, getAllGroupsApi } from "api/groups"; import sendRequest from "api/sendRequest"; import endpoints from "constants/endpoints"; -import { createGroupApi, getAllGroupsApi } from "api/groups"; import { getToken } from "shared/authHelper"; jest.mock("api/sendRequest"); diff --git a/src/api/__tests__/info.test.js b/src/api/__tests__/info.test.js index ab4639819..1f33da11d 100644 --- a/src/api/__tests__/info.test.js +++ b/src/api/__tests__/info.test.js @@ -13,9 +13,9 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import { getHealthApi, getInfoApi } from "api/info"; import sendRequest from "api/sendRequest"; import endpoints from "constants/endpoints"; -import { getHealthApi, getInfoApi } from "api/info"; jest.mock("api/sendRequest"); diff --git a/src/api/__tests__/jobs.test.js b/src/api/__tests__/jobs.test.js index 46c51b873..b31334a4e 100644 --- a/src/api/__tests__/jobs.test.js +++ b/src/api/__tests__/jobs.test.js @@ -13,14 +13,14 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import sendRequest from "api/sendRequest"; -import endpoints from "constants/endpoints"; import { downloadReportApi, getJobApi, scheduleAnalysisApi, scheduleReportApi, } from "api/jobs"; +import sendRequest from "api/sendRequest"; +import endpoints from "constants/endpoints"; import { getToken } from "shared/authHelper"; jest.mock("api/sendRequest"); diff --git a/src/api/__tests__/licenses.test.js b/src/api/__tests__/licenses.test.js index 9e8b68738..b51f82787 100644 --- a/src/api/__tests__/licenses.test.js +++ b/src/api/__tests__/licenses.test.js @@ -13,10 +13,10 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import { createCandidateLicenseApi, getAllLicenseApi } from "api/licenses"; import sendRequest from "api/sendRequest"; import endpoints from "constants/endpoints"; import { getToken } from "shared/authHelper"; -import { createCandidateLicenseApi, getAllLicenseApi } from "api/licenses"; jest.mock("api/sendRequest"); diff --git a/src/api/__tests__/maintenance.test.js b/src/api/__tests__/maintenance.test.js index 401c8c882..686de955f 100644 --- a/src/api/__tests__/maintenance.test.js +++ b/src/api/__tests__/maintenance.test.js @@ -14,10 +14,10 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import { createMaintenanceApi } from "api/maintenance"; import sendRequest from "api/sendRequest"; import endpoints from "constants/endpoints"; import { getToken } from "shared/authHelper"; -import { createMaintenanceApi } from "api/maintenance"; jest.mock("api/sendRequest"); diff --git a/src/api/__tests__/organizeUploads.test.js b/src/api/__tests__/organizeUploads.test.js index a86589852..a3b1c77a6 100644 --- a/src/api/__tests__/organizeUploads.test.js +++ b/src/api/__tests__/organizeUploads.test.js @@ -13,15 +13,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import sendRequest from "api/sendRequest"; -import endpoints from "constants/endpoints"; -import { getToken } from "shared/authHelper"; import { copyUploadApi, deleteUploadsApi, getUploadsByFolderIdApi, moveUploadApi, } from "api/organizeUploads"; +import sendRequest from "api/sendRequest"; +import endpoints from "constants/endpoints"; +import { getToken } from "shared/authHelper"; jest.mock("api/sendRequest"); diff --git a/src/api/__tests__/search.test.js b/src/api/__tests__/search.test.js index 06fb176af..ed197a112 100644 --- a/src/api/__tests__/search.test.js +++ b/src/api/__tests__/search.test.js @@ -13,10 +13,10 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import searchApi from "api/search"; import sendRequest from "api/sendRequest"; import endpoints from "constants/endpoints"; import { getToken } from "shared/authHelper"; -import searchApi from "api/search"; jest.mock("api/sendRequest"); diff --git a/src/api/__tests__/sendRequest.test.js b/src/api/__tests__/sendRequest.test.js index ddd854782..eb5d79922 100644 --- a/src/api/__tests__/sendRequest.test.js +++ b/src/api/__tests__/sendRequest.test.js @@ -13,11 +13,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import sendRequest from "api/sendRequest"; import { disableFetchMocks, enableFetchMocks } from "jest-fetch-mock"; import { stringify } from "query-string"; -import { setLocalStorage } from "shared/storageHelper"; import { logout } from "shared/authHelper"; -import sendRequest from "api/sendRequest"; +import { setLocalStorage } from "shared/storageHelper"; jest.mock("shared/storageHelper", () => ({ getLocalStorage: jest.fn(), diff --git a/src/api/__tests__/upload.test.js b/src/api/__tests__/upload.test.js index 7228c04f8..de66201e3 100644 --- a/src/api/__tests__/upload.test.js +++ b/src/api/__tests__/upload.test.js @@ -14,14 +14,14 @@ */ import sendRequest from "api/sendRequest"; -import endpoints from "constants/endpoints"; -import { getToken } from "shared/authHelper"; import { createUploadApi, createUploadUrlApi, createUploadVcsApi, getUploadByIdApi, } from "api/upload"; +import endpoints from "constants/endpoints"; +import { getToken } from "shared/authHelper"; jest.mock("api/sendRequest"); diff --git a/src/api/__tests__/users.test.js b/src/api/__tests__/users.test.js index a06be2076..1d9de1d2c 100644 --- a/src/api/__tests__/users.test.js +++ b/src/api/__tests__/users.test.js @@ -14,9 +14,9 @@ */ import sendRequest from "api/sendRequest"; +import { deleteUserApi, getAllUsersApi, getUserSelfApi } from "api/users"; import endpoints from "constants/endpoints"; import { getToken } from "shared/authHelper"; -import { deleteUserApi, getAllUsersApi, getUserSelfApi } from "api/users"; jest.mock("api/sendRequest"); diff --git a/src/api/auth.js b/src/api/auth.js index dbbd22eae..61cdb49ad 100644 --- a/src/api/auth.js +++ b/src/api/auth.js @@ -16,13 +16,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import endpoints from "constants/endpoints"; - // Constants for the user login -import { tokenNameLength, tokenScope, tokenExpiryDays } from "constants/auth"; - +import { tokenExpiryDays, tokenNameLength, tokenScope } from "constants/auth"; +import endpoints from "constants/endpoints"; // Helper functions for generating random string and getting date in the requied format -import { randomString, getDate } from "shared/helper"; +import { getDate, randomString } from "shared/helper"; // Function for calling the fetch function for the APIs import sendRequest from "./sendRequest"; diff --git a/src/api/browse.js b/src/api/browse.js index 3469a9310..68aad9e52 100644 --- a/src/api/browse.js +++ b/src/api/browse.js @@ -16,9 +16,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import PropTypes from "prop-types"; import endpoints from "constants/endpoints"; - +import PropTypes from "prop-types"; // Getting Authorization Token import { getToken } from "shared/authHelper"; diff --git a/src/api/folders.js b/src/api/folders.js index bd3080c83..5a332c354 100644 --- a/src/api/folders.js +++ b/src/api/folders.js @@ -17,7 +17,6 @@ */ import endpoints from "constants/endpoints"; - // Getting Authorization Token import { getToken } from "shared/authHelper"; diff --git a/src/api/groups.js b/src/api/groups.js index 42775cc6a..de0498a87 100644 --- a/src/api/groups.js +++ b/src/api/groups.js @@ -17,7 +17,6 @@ */ import endpoints from "constants/endpoints"; - // Getting Authorization Token import { getToken } from "shared/authHelper"; diff --git a/src/api/jobs.js b/src/api/jobs.js index 0534e057c..a078de0c9 100644 --- a/src/api/jobs.js +++ b/src/api/jobs.js @@ -17,7 +17,6 @@ */ import endpoints from "constants/endpoints"; - // Getting Authorization Token import { getToken } from "shared/authHelper"; diff --git a/src/api/licenses.js b/src/api/licenses.js index 1326e7f3a..0874abdc3 100644 --- a/src/api/licenses.js +++ b/src/api/licenses.js @@ -17,7 +17,6 @@ */ import endpoints from "constants/endpoints"; - // Getting Authorization Token import { getToken } from "shared/authHelper"; diff --git a/src/api/maintenance.js b/src/api/maintenance.js index bcd0f4f37..2c42b5c52 100644 --- a/src/api/maintenance.js +++ b/src/api/maintenance.js @@ -17,7 +17,6 @@ */ import endpoints from "constants/endpoints"; - // Getting Authorization Token import { getToken } from "shared/authHelper"; diff --git a/src/api/organizeUploads.js b/src/api/organizeUploads.js index 2edf2d368..121bfc8a3 100644 --- a/src/api/organizeUploads.js +++ b/src/api/organizeUploads.js @@ -17,7 +17,6 @@ */ import endpoints from "constants/endpoints"; - // Getting Authorization Token import { getToken } from "shared/authHelper"; diff --git a/src/api/search.js b/src/api/search.js index 4efce26ef..2d7ef0044 100644 --- a/src/api/search.js +++ b/src/api/search.js @@ -16,9 +16,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import PropTypes from "prop-types"; import endpoints from "constants/endpoints"; - +import PropTypes from "prop-types"; // Getting Authorization Token import { getToken } from "shared/authHelper"; diff --git a/src/api/sendRequest.js b/src/api/sendRequest.js index c80a765da..59d259282 100644 --- a/src/api/sendRequest.js +++ b/src/api/sendRequest.js @@ -16,10 +16,9 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import messages from "constants/messages"; import { stringify } from "query-string"; import { logout } from "shared/authHelper"; -import messages from "constants/messages"; - // Helper function for setting the item in Localstorage import { getLocalStorage, setLocalStorage } from "shared/storageHelper"; diff --git a/src/api/upload.js b/src/api/upload.js index 64783b2c3..5e272abe7 100644 --- a/src/api/upload.js +++ b/src/api/upload.js @@ -16,9 +16,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import PropTypes from "prop-types"; import endpoints from "constants/endpoints"; - +import PropTypes from "prop-types"; // Getting Authorization Token import { getToken } from "shared/authHelper"; diff --git a/src/api/users.js b/src/api/users.js index b3c41d404..b6216e65b 100644 --- a/src/api/users.js +++ b/src/api/users.js @@ -17,7 +17,6 @@ */ import endpoints from "constants/endpoints"; - // Getting Authorization Token import { getToken } from "shared/authHelper"; diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx index c0876837f..b44b3d8b1 100644 --- a/src/components/BrowseUploadsHeader/index.jsx +++ b/src/components/BrowseUploadsHeader/index.jsx @@ -17,15 +17,12 @@ */ // React Imports +// Routes for all the pages +import routes from "constants/routes"; import React from "react"; -import { Link, useLocation } from "react-router-dom"; - // React Bootstrap Imports import { Navbar } from "react-bootstrap"; - -// Routes for all the pages -import routes from "constants/routes"; - +import { Link, useLocation } from "react-router-dom"; // Helper Functions import { isAuth } from "shared/authHelper"; diff --git a/src/components/DarkThemeToggle/DarkThemeToggle.jsx b/src/components/DarkThemeToggle/DarkThemeToggle.jsx index 7e9e09b2b..4bb8788bd 100644 --- a/src/components/DarkThemeToggle/DarkThemeToggle.jsx +++ b/src/components/DarkThemeToggle/DarkThemeToggle.jsx @@ -1,10 +1,10 @@ /* eslint-disable jsx-a11y/label-has-associated-control */ -import React, { useContext } from "react"; import "./DarkThemeToggle.css"; -import { MoonStarsFill, BrightnessHighFill } from "react-bootstrap-icons"; // Global Context for theme import { GlobalContext } from "context"; +import React, { useContext } from "react"; +import { BrightnessHighFill, MoonStarsFill } from "react-bootstrap-icons"; const DarkThemeToggle = () => { const { state, setTheme } = useContext(GlobalContext); diff --git a/src/components/Footer/index.jsx b/src/components/Footer/index.jsx index 886cd02cc..f781e021e 100644 --- a/src/components/Footer/index.jsx +++ b/src/components/Footer/index.jsx @@ -16,7 +16,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; +import React, { useEffect, useState } from "react"; import { getFossologyVersion } from "services/info"; import { getSessionStorage, setSessionStorage } from "shared/storageHelper"; @@ -24,29 +24,29 @@ const Footer = () => { const [version, setVersion] = useState( getSessionStorage("fossologyVersion") || null ); - const fetchVersion = async () => { + const fetchVersion = async () => { try { const res = await getFossologyVersion(); - setSessionStorage("fossologyVersion", res); - setVersion(res); - return res; + setSessionStorage("fossologyVersion", res); + setVersion(res); + return res; } catch { return null; } }; useEffect(() => { if (!version) { - fetchVersion(); + fetchVersion(); } }, []); return (
- Version: [ {version?.version}], Branch: [{version?.branchName}], Commit: [ + Version: [ {version?.version}], Branch: [{version?.branchName}], Commit: [ {`#${version?.commitHash}`}] {version?.commitDate} built @{" "} - { version?.buildDate} + {version?.buildDate}
); }; diff --git a/src/components/Header/index.jsx b/src/components/Header/index.jsx index e2faf5459..27e6caa5e 100644 --- a/src/components/Header/index.jsx +++ b/src/components/Header/index.jsx @@ -17,46 +17,39 @@ */ // React Imports -import React, { useState } from "react"; -import { useHistory, Link, useLocation } from "react-router-dom"; +// custom css +import "./index.css"; +// Assets +import logo from "assets/images/logo.svg"; +// Widgets +import Image from "components/Widgets/Image"; +import TextIcon from "components/Widgets/TextIcon"; +// External Link for documention +import externalLinks from "constants/externalLinks"; +// Routes for all the pages +import routes from "constants/routes"; +import React, { useState } from "react"; // React Bootstrap Imports import { - Navbar, - Nav, - NavDropdown, Dropdown, DropdownButton, + Nav, + Navbar, + NavDropdown, } from "react-bootstrap"; -import { QuestionCircleFill, PersonCircle } from "react-bootstrap-icons"; - +import { PersonCircle, QuestionCircleFill } from "react-bootstrap-icons"; +import { Link, useHistory, useLocation } from "react-router-dom"; // List of all accessible groups import { getAllGroups } from "services/groups"; - -// Widgets -import Image from "components/Widgets/Image"; -import TextIcon from "components/Widgets/TextIcon"; - -// Assets -import logo from "assets/images/logo.svg"; - -// Routes for all the pages -import routes from "constants/routes"; - -// External Link for documention -import externalLinks from "constants/externalLinks"; - // Helper Functions -import { logout, isAuth, getUserName, isAdmin } from "shared/authHelper"; -import { getLocalStorage, setLocalStorage } from "shared/storageHelper"; +import { getUserName, isAdmin, isAuth, logout } from "shared/authHelper"; import { getNameInitials } from "shared/helper"; +import { getLocalStorage, setLocalStorage } from "shared/storageHelper"; // Dark Theme Toggle Button import DarkThemeToggle from "../DarkThemeToggle/DarkThemeToggle"; -// custom css -import "./index.css"; - const Header = () => { const [currentGroup, setCurrentGroup] = useState( getLocalStorage("currentGroup") || getLocalStorage("user")?.default_group diff --git a/src/components/Modals/DeleteConfirmation/index.jsx b/src/components/Modals/DeleteConfirmation/index.jsx index 565c2e31d..f604db181 100644 --- a/src/components/Modals/DeleteConfirmation/index.jsx +++ b/src/components/Modals/DeleteConfirmation/index.jsx @@ -1,6 +1,7 @@ -import React from "react"; import PropTypes from "prop-types"; +import React from "react"; import Spinner from "react-bootstrap/Spinner"; + import { Button } from "../../Widgets"; const DeleteConfirmation = ({ callBack, loading }) => { diff --git a/src/components/Table/index.jsx b/src/components/Table/index.jsx index c4b177783..01832b3cb 100644 --- a/src/components/Table/index.jsx +++ b/src/components/Table/index.jsx @@ -16,11 +16,13 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import { useTable, usePagination, useRowSelect, useSortBy } from "react-table"; +import "./index.css"; + import CloseIcon from "assets/images/close.png"; +import React from "react"; +import { usePagination, useRowSelect, useSortBy, useTable } from "react-table"; + import IndeterminateCheckbox from "./IndeterminateCheckbox"; -import "./index.css"; /* eslint-disable react/prop-types */ const Table = ({ columns, data }) => { diff --git a/src/components/Table/tests/index.test.jsx b/src/components/Table/tests/index.test.jsx index c361956cb..db855e9f0 100644 --- a/src/components/Table/tests/index.test.jsx +++ b/src/components/Table/tests/index.test.jsx @@ -20,6 +20,7 @@ import React from "react"; import ReactDOM from "react-dom"; import { randomString } from "shared/helper"; import makeData from "shared/makeData"; + import Table from "../index"; const columns = [ diff --git a/src/components/Title/index.jsx b/src/components/Title/index.jsx index 2aecfe985..d11209e14 100644 --- a/src/components/Title/index.jsx +++ b/src/components/Title/index.jsx @@ -16,9 +16,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; import PropTypes from "prop-types"; - +import React from "react"; // For the title of all the pages import { Helmet } from "react-helmet"; diff --git a/src/components/TreeContainer/index.jsx b/src/components/TreeContainer/index.jsx index e55210e31..fe29096f9 100644 --- a/src/components/TreeContainer/index.jsx +++ b/src/components/TreeContainer/index.jsx @@ -16,10 +16,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState } from "react"; +import "./index.css"; + import PropTypes from "prop-types"; +import React, { useState } from "react"; import Tree, { renderers } from "react-virtualized-tree"; -import "./index.css"; const TreeContainer = ({ data, handleClick, folderCount }) => { const { Expandable } = renderers; diff --git a/src/components/Upload/CommonFields/AccessLevel/index.jsx b/src/components/Upload/CommonFields/AccessLevel/index.jsx index 6c18e9ac1..354bba621 100644 --- a/src/components/Upload/CommonFields/AccessLevel/index.jsx +++ b/src/components/Upload/CommonFields/AccessLevel/index.jsx @@ -16,11 +16,10 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import PropTypes from "prop-types"; - // Widgets import { InputContainer, Tooltip } from "components/Widgets"; +import PropTypes from "prop-types"; +import React from "react"; function AccessLevel({ accessLevel, handleChange }) { return ( diff --git a/src/components/Upload/CommonFields/IgnoreScm/index.jsx b/src/components/Upload/CommonFields/IgnoreScm/index.jsx index 0981ff5f5..6d51cb987 100644 --- a/src/components/Upload/CommonFields/IgnoreScm/index.jsx +++ b/src/components/Upload/CommonFields/IgnoreScm/index.jsx @@ -16,11 +16,10 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import PropTypes from "prop-types"; - // Widgets import { InputContainer, Tooltip } from "components/Widgets"; +import PropTypes from "prop-types"; +import React from "react"; function IgnoreScm({ ignoreScm, handleChange }) { return ( diff --git a/src/components/Upload/CommonFields/LicenseDecider/index.jsx b/src/components/Upload/CommonFields/LicenseDecider/index.jsx index 28028c670..10eefa7ae 100644 --- a/src/components/Upload/CommonFields/LicenseDecider/index.jsx +++ b/src/components/Upload/CommonFields/LicenseDecider/index.jsx @@ -16,11 +16,10 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import PropTypes from "prop-types"; - // Widgets import { InputContainer, Tooltip } from "components/Widgets"; +import PropTypes from "prop-types"; +import React from "react"; function LicenseDecider({ decider, handleChange }) { return ( diff --git a/src/components/Upload/CommonFields/OptionalAnalysis/index.jsx b/src/components/Upload/CommonFields/OptionalAnalysis/index.jsx index b69885b92..f8ecd3984 100644 --- a/src/components/Upload/CommonFields/OptionalAnalysis/index.jsx +++ b/src/components/Upload/CommonFields/OptionalAnalysis/index.jsx @@ -16,11 +16,10 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import PropTypes from "prop-types"; - // Widgets import InputContainer from "components/Widgets/Input"; +import PropTypes from "prop-types"; +import React from "react"; function OptionalAnalysis({ analysis, handleChange }) { return ( diff --git a/src/components/Upload/CommonFields/UploadReuse/index.jsx b/src/components/Upload/CommonFields/UploadReuse/index.jsx index cd77da9ab..314e14484 100644 --- a/src/components/Upload/CommonFields/UploadReuse/index.jsx +++ b/src/components/Upload/CommonFields/UploadReuse/index.jsx @@ -16,18 +16,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import PropTypes from "prop-types"; - // Widgets import { InputContainer, Tooltip } from "components/Widgets"; - +import messages from "constants/messages"; +import PropTypes from "prop-types"; +import React, { useEffect, useState } from "react"; // Required services for calling APIs import { getAllFolders } from "services/folders"; -import { getUploadsFolderId } from "services/organizeUploads"; import { getAllGroups } from "services/groups"; - -import messages from "constants/messages"; +import { getUploadsFolderId } from "services/organizeUploads"; const UploadReuse = ({ reuse, handleChange }) => { const initialGroupList = [{ id: 3, name: "fossy" }]; diff --git a/src/components/Upload/CommonFields/index.jsx b/src/components/Upload/CommonFields/index.jsx index 1f8c8668e..61c449c04 100644 --- a/src/components/Upload/CommonFields/index.jsx +++ b/src/components/Upload/CommonFields/index.jsx @@ -16,12 +16,13 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; import PropTypes from "prop-types"; -import IgnoreScm from "./IgnoreScm"; +import React from "react"; + import AccessLevel from "./AccessLevel"; -import OptionalAnalysis from "./OptionalAnalysis"; +import IgnoreScm from "./IgnoreScm"; import LicenseDecider from "./LicenseDecider"; +import OptionalAnalysis from "./OptionalAnalysis"; import UploadReuse from "./UploadReuse"; function CommonFields({ diff --git a/src/components/Widgets/Alert/index.jsx b/src/components/Widgets/Alert/index.jsx index abc207655..f4cde931b 100644 --- a/src/components/Widgets/Alert/index.jsx +++ b/src/components/Widgets/Alert/index.jsx @@ -16,8 +16,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; import PropTypes from "prop-types"; +import React from "react"; const Alert = ({ message, type, setShow }) => { return ( diff --git a/src/components/Widgets/Button/index.jsx b/src/components/Widgets/Button/index.jsx index 8c27ebe5d..7efb590dc 100644 --- a/src/components/Widgets/Button/index.jsx +++ b/src/components/Widgets/Button/index.jsx @@ -16,8 +16,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; import PropTypes from "prop-types"; +import React from "react"; import styles from "styled-components"; const Button = ({ diff --git a/src/components/Widgets/Image/index.jsx b/src/components/Widgets/Image/index.jsx index 19490cedf..23dababaa 100644 --- a/src/components/Widgets/Image/index.jsx +++ b/src/components/Widgets/Image/index.jsx @@ -16,8 +16,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; import PropTypes from "prop-types"; +import React from "react"; const Image = ({ src, alt, style, className, width, height, align }) => { return ( diff --git a/src/components/Widgets/Input/index.jsx b/src/components/Widgets/Input/index.jsx index 5a9722626..32d781f9a 100644 --- a/src/components/Widgets/Input/index.jsx +++ b/src/components/Widgets/Input/index.jsx @@ -16,8 +16,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; import PropTypes from "prop-types"; +import React from "react"; const InputContainer = ({ type, diff --git a/src/components/Widgets/Modal/index.jsx b/src/components/Widgets/Modal/index.jsx index 6ec66a3a2..d52194274 100644 --- a/src/components/Widgets/Modal/index.jsx +++ b/src/components/Widgets/Modal/index.jsx @@ -16,12 +16,13 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +// css +import "./index.css"; + import PropTypes from "prop-types"; import React from "react"; -import { Button } from ".."; -// css -import "./index.css"; +import { Button } from ".."; const Modal = ({ show, setShow, children }) => { return ( diff --git a/src/components/Widgets/TextIcon/index.jsx b/src/components/Widgets/TextIcon/index.jsx index 1582bc7a2..89a493ac6 100644 --- a/src/components/Widgets/TextIcon/index.jsx +++ b/src/components/Widgets/TextIcon/index.jsx @@ -16,9 +16,9 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import PropTypes from "prop-types"; import React, { useContext } from "react"; import { ThemeContext } from "styled-components"; -import PropTypes from "prop-types"; const TextIcon = ({ text, className }) => { const themeContext = useContext(ThemeContext); diff --git a/src/components/Widgets/Tooltip/index.jsx b/src/components/Widgets/Tooltip/index.jsx index 6466bd306..636c12649 100644 --- a/src/components/Widgets/Tooltip/index.jsx +++ b/src/components/Widgets/Tooltip/index.jsx @@ -16,8 +16,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; import PropTypes from "prop-types"; +import React from "react"; const Tooltip = ({ title }) => { return ( diff --git a/src/components/Widgets/index.jsx b/src/components/Widgets/index.jsx index 9d2fe3907..8c5eb68ae 100644 --- a/src/components/Widgets/index.jsx +++ b/src/components/Widgets/index.jsx @@ -17,6 +17,7 @@ */ import Spinner from "react-bootstrap/Spinner"; + import Alert from "./Alert"; import Button from "./Button"; import Image from "./Image"; diff --git a/src/context/index.jsx b/src/context/index.jsx index a638dc2cf..8ed0fd1ba 100644 --- a/src/context/index.jsx +++ b/src/context/index.jsx @@ -16,11 +16,10 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState } from "react"; import PropTypes from "prop-types"; - +import React, { useState } from "react"; // Helper Functions for setting and getting the item from localstorage -import { setLocalStorage, getLocalStorage } from "shared/storageHelper"; +import { getLocalStorage, setLocalStorage } from "shared/storageHelper"; // Initial state const initialState = { diff --git a/src/index.jsx b/src/index.jsx index ce5fbb492..a2035336b 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -18,6 +18,7 @@ import React, { Suspense } from "react"; import ReactDOM from "react-dom"; + import App from "./App"; import reportWebVitals from "./reportWebVitals"; diff --git a/src/pages/Admin/Group/Create/index.jsx b/src/pages/Admin/Group/Create/index.jsx index 52a206056..1f865c92c 100644 --- a/src/pages/Admin/Group/Create/index.jsx +++ b/src/pages/Admin/Group/Create/index.jsx @@ -16,15 +16,12 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - +import messages from "constants/messages"; +import React, { useState } from "react"; // Required functions for calling APIs import { createGroup } from "services/groups"; diff --git a/src/pages/Admin/Group/Delete/index.jsx b/src/pages/Admin/Group/Delete/index.jsx index a40f7c2d3..8fe68b6f1 100644 --- a/src/pages/Admin/Group/Delete/index.jsx +++ b/src/pages/Admin/Group/Delete/index.jsx @@ -16,21 +16,17 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useEffect, useState } from "react"; -import messages from "constants/messages"; - -// Jquery for handling modal -import $ from "jquery"; - +import DeleteConfirmation from "components/Modals/DeleteConfirmation"; // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer } from "components/Widgets"; - +import messages from "constants/messages"; +// Jquery for handling modal +import $ from "jquery"; +import React, { useEffect, useState } from "react"; // Required functions for calling APIs import { deleteGroup, fetchAllDeletableGroups } from "services/groups"; -import DeleteConfirmation from "components/Modals/DeleteConfirmation"; const DeleteGroup = () => { const initialMessage = { diff --git a/src/pages/Admin/License/Create/index.jsx b/src/pages/Admin/License/Create/index.jsx index 4c312761c..d5ffb8653 100644 --- a/src/pages/Admin/License/Create/index.jsx +++ b/src/pages/Admin/License/Create/index.jsx @@ -16,13 +16,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - // Title import Title from "components/Title"; - // Widgets -import { InputContainer, Button } from "components/Widgets"; +import { Button, InputContainer } from "components/Widgets"; +import React from "react"; const AddLicense = () => { const options = [ diff --git a/src/pages/Admin/License/SelectLicense/index.jsx b/src/pages/Admin/License/SelectLicense/index.jsx index 378523497..ba337556b 100644 --- a/src/pages/Admin/License/SelectLicense/index.jsx +++ b/src/pages/Admin/License/SelectLicense/index.jsx @@ -16,10 +16,9 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - // Title import Title from "components/Title"; +import React from "react"; const SelectLicense = () => { return ( diff --git a/src/pages/Admin/Mantainance/index.jsx b/src/pages/Admin/Mantainance/index.jsx index 763c9d024..75e481780 100644 --- a/src/pages/Admin/Mantainance/index.jsx +++ b/src/pages/Admin/Mantainance/index.jsx @@ -14,12 +14,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState } from "react"; - // Title import Title from "components/Title"; import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; import { initialMantainanceFields, initialMessage } from "constants/constants"; +import React, { useState } from "react"; import createMaintenance from "services/maintenance"; const ManageMantainance = () => { diff --git a/src/pages/Admin/Users/Add/index.jsx b/src/pages/Admin/Users/Add/index.jsx index 3fd8dfbdb..7745612fe 100644 --- a/src/pages/Admin/Users/Add/index.jsx +++ b/src/pages/Admin/Users/Add/index.jsx @@ -16,18 +16,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useEffect, useState } from "react"; import Title from "components/Title"; - -// widgets -import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - -// services -import { getAllFolders } from "services/folders"; - // predefined common fields components import CommonFields from "components/Upload/CommonFields"; - +// widgets +import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; // constants import { accessLevels, @@ -35,6 +28,9 @@ import { bucketPool, initialAddUserData, } from "constants/constants"; +import React, { useEffect, useState } from "react"; +// services +import { getAllFolders } from "services/folders"; import { addUser } from "services/users"; const AddUser = () => { diff --git a/src/pages/Admin/Users/Delete/index.jsx b/src/pages/Admin/Users/Delete/index.jsx index 149450432..2538c4aa5 100644 --- a/src/pages/Admin/Users/Delete/index.jsx +++ b/src/pages/Admin/Users/Delete/index.jsx @@ -16,18 +16,14 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; // Required functions for calling APIs -import { getAllUsersName, deleteUser } from "services/users"; - +import { deleteUser, getAllUsersName } from "services/users"; // Helper function for error handling import { handleError } from "shared/helper"; diff --git a/src/pages/Admin/Users/Edit/index.jsx b/src/pages/Admin/Users/Edit/index.jsx index faf4d2b5a..7b2181096 100644 --- a/src/pages/Admin/Users/Edit/index.jsx +++ b/src/pages/Admin/Users/Edit/index.jsx @@ -16,18 +16,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useEffect, useState } from "react"; import Title from "components/Title"; - -// widgets -import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - -// services -import { getAllFolders } from "services/folders"; - // predefined common fields components import CommonFields from "components/Upload/CommonFields"; - +// widgets +import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; // constants import { accessLevels, @@ -36,8 +29,12 @@ import { initialAddUserData, userStatus, } from "constants/constants"; +import React, { useEffect, useState } from "react"; +// services +import { getAllFolders } from "services/folders"; import { editUserById, getAllUsersName, getUserById } from "services/users"; import { isAdmin } from "shared/authHelper"; + import TokenSpace from "./token_space"; const EditUser = () => { diff --git a/src/pages/Admin/Users/Edit/token_space.jsx b/src/pages/Admin/Users/Edit/token_space.jsx index 4b0d8c802..1a4fd33fa 100644 --- a/src/pages/Admin/Users/Edit/token_space.jsx +++ b/src/pages/Admin/Users/Edit/token_space.jsx @@ -16,21 +16,19 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; +// css +import "./index.css"; // widgets import { Button, InputContainer, Spinner } from "components/Widgets"; import Modal from "components/Widgets/Modal"; import PropTypes from "prop-types"; - +import React, { useEffect, useState } from "react"; +import { Col, Form, Row } from "react-bootstrap"; +import { createToken, getTokens } from "services/users"; // utils import formatDate from "utils"; -// css -import "./index.css"; -import { createToken, getTokens } from "services/users"; -import { Col, Form, Row } from "react-bootstrap"; - const TokenSpace = ({ setMessage, setShowMessage }) => { // local states const [loading, setLoading] = useState(false); diff --git a/src/pages/Browse/index.jsx b/src/pages/Browse/index.jsx index 637ec49e9..12c8a8fe7 100644 --- a/src/pages/Browse/index.jsx +++ b/src/pages/Browse/index.jsx @@ -17,37 +17,33 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import routes from "constants/routes"; -import { Link, useHistory } from "react-router-dom"; +import Pagination from "@material-ui/lab/Pagination"; import arrayToTree from "array-to-tree"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - -// Widgets -import { InputContainer, Alert } from "components/Widgets"; - // Tree View of folders import TreeContainer from "components/TreeContainer"; - +// Widgets +import { Alert, InputContainer } from "components/Widgets"; +import messages from "constants/messages"; +import routes from "constants/routes"; +import React, { useEffect, useState } from "react"; +import { Link, useHistory } from "react-router-dom"; // Required functions for calling APIs import getBrowseData from "services/browse"; import { getAllFolders } from "services/folders"; -import { scheduleReport, downloadReport } from "services/jobs"; +import { downloadReport, scheduleReport } from "services/jobs"; import { getFileNameFromContentDispostionHeader, handleError, } from "shared/helper"; -import Pagination from "@material-ui/lab/Pagination"; import { - statusOptions, - entriesOptions, - assignOptions, actionsOptions, + assignOptions, + entriesOptions, initialMessage, + statusOptions, } from "../../constants/constants"; const Browse = () => { diff --git a/src/pages/BrowseUploads/Copyright/index.jsx b/src/pages/BrowseUploads/Copyright/index.jsx index dba0cbcc2..28f070c3e 100644 --- a/src/pages/BrowseUploads/Copyright/index.jsx +++ b/src/pages/BrowseUploads/Copyright/index.jsx @@ -16,17 +16,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import styled from "styled-components"; - -// Title -import Title from "components/Title"; - // Header import BrowseUploadsHeader from "components/BrowseUploadsHeader"; +import Table from "components/Table"; +// Title +import Title from "components/Title"; +import React from "react"; import { randomString } from "shared/helper"; import makeData from "shared/makeData"; -import Table from "components/Table"; +import styled from "styled-components"; const schema = () => { return { diff --git a/src/pages/BrowseUploads/Ecc/index.jsx b/src/pages/BrowseUploads/Ecc/index.jsx index 88c793964..d7522fc2e 100644 --- a/src/pages/BrowseUploads/Ecc/index.jsx +++ b/src/pages/BrowseUploads/Ecc/index.jsx @@ -16,13 +16,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - -// Title -import Title from "components/Title"; - // Header import BrowseUploadsHeader from "components/BrowseUploadsHeader"; +// Title +import Title from "components/Title"; +import React from "react"; const Ecc = () => { return ( diff --git a/src/pages/BrowseUploads/FileBrowser/index.jsx b/src/pages/BrowseUploads/FileBrowser/index.jsx index 97e9bf7ce..93a175e20 100644 --- a/src/pages/BrowseUploads/FileBrowser/index.jsx +++ b/src/pages/BrowseUploads/FileBrowser/index.jsx @@ -16,13 +16,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - -// Title -import Title from "components/Title"; - // Header import BrowseUploadsHeader from "components/BrowseUploadsHeader"; +// Title +import Title from "components/Title"; +import React from "react"; const FileBrowser = () => { return ( diff --git a/src/pages/BrowseUploads/LicenseBrowser/index.jsx b/src/pages/BrowseUploads/LicenseBrowser/index.jsx index 6cface0e4..c67499ddf 100644 --- a/src/pages/BrowseUploads/LicenseBrowser/index.jsx +++ b/src/pages/BrowseUploads/LicenseBrowser/index.jsx @@ -16,21 +16,16 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import { useParams } from "react-router-dom"; - +// Header +import BrowseUploadsHeader from "components/BrowseUploadsHeader"; // Title import Title from "components/Title"; - // Widgets import { Alert } from "components/Widgets"; - -// Header -import BrowseUploadsHeader from "components/BrowseUploadsHeader"; - +import React, { useEffect, useState } from "react"; +import { useParams } from "react-router-dom"; // Required functions for calling APIs -import { getUploadSummary, getUploadLicense } from "services/upload"; - +import { getUploadLicense, getUploadSummary } from "services/upload"; // Helper function for error handling import { handleError } from "shared/helper"; diff --git a/src/pages/BrowseUploads/SoftwareHeritage/index.jsx b/src/pages/BrowseUploads/SoftwareHeritage/index.jsx index 25f100ca7..4012ba5d0 100644 --- a/src/pages/BrowseUploads/SoftwareHeritage/index.jsx +++ b/src/pages/BrowseUploads/SoftwareHeritage/index.jsx @@ -16,13 +16,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - -// Title -import Title from "components/Title"; - // Header import BrowseUploadsHeader from "components/BrowseUploadsHeader"; +// Title +import Title from "components/Title"; +import React from "react"; const SoftwareHeritage = () => { return ( diff --git a/src/pages/ErrorPage/index.jsx b/src/pages/ErrorPage/index.jsx index cc21f66dc..c26643936 100644 --- a/src/pages/ErrorPage/index.jsx +++ b/src/pages/ErrorPage/index.jsx @@ -16,12 +16,12 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import messages from "constants/messages"; +import routes from "constants/routes"; import React from "react"; -import styles from "styled-components"; -import { Link } from "react-router-dom"; import { ExclamationTriangleFill } from "react-bootstrap-icons"; -import routes from "constants/routes"; -import messages from "constants/messages"; +import { Link } from "react-router-dom"; +import styles from "styled-components"; const ErrorPage = () => { return ( diff --git a/src/pages/Help/About/index.jsx b/src/pages/Help/About/index.jsx index b4c2dd83b..fe9c632bc 100644 --- a/src/pages/Help/About/index.jsx +++ b/src/pages/Help/About/index.jsx @@ -16,14 +16,12 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - // Title import Title from "components/Title"; - +import externalLinks from "constants/externalLinks"; // Copyrights array import copyrights from "data/copyright"; -import externalLinks from "constants/externalLinks"; +import React from "react"; const About = () => { return ( diff --git a/src/pages/Help/LicenseBrowser/index.jsx b/src/pages/Help/LicenseBrowser/index.jsx index 0a308393a..b74638f77 100644 --- a/src/pages/Help/LicenseBrowser/index.jsx +++ b/src/pages/Help/LicenseBrowser/index.jsx @@ -16,10 +16,9 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - // Title import Title from "components/Title"; +import React from "react"; const LicenseBrowser = () => { return ( diff --git a/src/pages/Help/Overview/index.jsx b/src/pages/Help/Overview/index.jsx index e674186d5..a0ae66964 100644 --- a/src/pages/Help/Overview/index.jsx +++ b/src/pages/Help/Overview/index.jsx @@ -16,20 +16,16 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - +import fossologyFlow from "assets/images/fossologyFlow.svg"; +// Assets +import microscope from "assets/images/microscope.svg"; // Title import Title from "components/Title"; - // Widgets import Image from "components/Widgets/Image"; - -// Assets -import microscope from "assets/images/microscope.svg"; -import fossologyFlow from "assets/images/fossologyFlow.svg"; - // External Link import externalLinks from "constants/externalLinks"; +import React from "react"; const Overview = () => { return ( diff --git a/src/pages/Help/ThirdPartyLicenses/index.jsx b/src/pages/Help/ThirdPartyLicenses/index.jsx index 7dc604b82..ebc28c58a 100644 --- a/src/pages/Help/ThirdPartyLicenses/index.jsx +++ b/src/pages/Help/ThirdPartyLicenses/index.jsx @@ -16,16 +16,14 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; +// CSS Imports +import "./index.css"; // Title import Title from "components/Title"; - // Routes import routes from "constants/routes"; - -// CSS Imports -import "./index.css"; +import React from "react"; const ThirdPartyLicenses = () => { return ( diff --git a/src/pages/Home/Features.jsx b/src/pages/Home/Features.jsx index d308b358e..cc1c510d0 100644 --- a/src/pages/Home/Features.jsx +++ b/src/pages/Home/Features.jsx @@ -16,15 +16,13 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - -// Widgets -import Image from "components/Widgets/Image"; - +import report from "assets/images/report.svg"; +import scan from "assets/images/scan.svg"; // Assets import upload from "assets/images/upload.svg"; -import scan from "assets/images/scan.svg"; -import report from "assets/images/report.svg"; +// Widgets +import Image from "components/Widgets/Image"; +import React from "react"; const Features = () => { // Features Array diff --git a/src/pages/Home/index.jsx b/src/pages/Home/index.jsx index 3416a9830..a15f94780 100644 --- a/src/pages/Home/index.jsx +++ b/src/pages/Home/index.jsx @@ -17,34 +17,27 @@ */ // React Imports -import React, { useState, useEffect } from "react"; - // Title import Title from "components/Title"; - +// Widgets +import { Alert, Button, Spinner } from "components/Widgets"; +// Routes +import routes from "constants/routes"; +import PropTypes from "prop-types"; +import queryString from "query-string"; +import React, { useEffect, useState } from "react"; +import { Col, Form, Row } from "react-bootstrap"; // External library imports import { useHistory } from "react-router-dom"; -import { Form, Row, Col } from "react-bootstrap"; -import queryString from "query-string"; -import PropTypes from "prop-types"; - // Required functions for calling APIs import fetchToken from "services/auth"; -import { getUserSelf } from "services/users"; import { fetchAllGroups } from "services/groups"; - -// Routes -import routes from "constants/routes"; - +import { getUserSelf } from "services/users"; // Helper function for user authentication import { isAuth } from "shared/authHelper"; -// Widgets -import { Alert, Button, Spinner } from "components/Widgets"; - // Features cards import Features from "./Features"; - // CSS imports import LoginForm from "./style"; diff --git a/src/pages/Home/index.test.jsx b/src/pages/Home/index.test.jsx index 7e7afe338..068335139 100644 --- a/src/pages/Home/index.test.jsx +++ b/src/pages/Home/index.test.jsx @@ -16,8 +16,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import renderComponent from "testingUtils/renderComponent"; import Home from "pages/Home"; +import renderComponent from "testingUtils/renderComponent"; test("matches Home snapshot", () => { const { asFragment } = renderComponent(Home); diff --git a/src/pages/Jobs/AllJobs/index.jsx b/src/pages/Jobs/AllJobs/index.jsx index 3d48ba64e..2ea851e93 100644 --- a/src/pages/Jobs/AllJobs/index.jsx +++ b/src/pages/Jobs/AllJobs/index.jsx @@ -17,18 +17,16 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useEffect, useState } from "react"; - +import Pagination from "@material-ui/lab/Pagination"; // Title import Title from "components/Title"; - -// Required functions for API and Error handling -import { handleError } from "shared/helper"; -import { initialMessage, entriesOptions } from "constants/constants"; +import { Alert, InputContainer } from "components/Widgets"; +import { entriesOptions, initialMessage } from "constants/constants"; import messages from "constants/messages"; -import { InputContainer, Alert } from "components/Widgets"; +import React, { useEffect, useState } from "react"; import { getAllAdminJob } from "services/jobs"; -import Pagination from "@material-ui/lab/Pagination"; +// Required functions for API and Error handling +import { handleError } from "shared/helper"; const AllJobs = () => { const initialState = { diff --git a/src/pages/Jobs/MyRecentJobs/index.jsx b/src/pages/Jobs/MyRecentJobs/index.jsx index 41537df14..075182d97 100644 --- a/src/pages/Jobs/MyRecentJobs/index.jsx +++ b/src/pages/Jobs/MyRecentJobs/index.jsx @@ -17,18 +17,16 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useEffect, useState } from "react"; - +import Pagination from "@material-ui/lab/Pagination"; // Title import Title from "components/Title"; - -// Required functions for API and Error handling -import { handleError } from "shared/helper"; -import { initialMessage, entriesOptions } from "constants/constants"; +import { Alert, InputContainer } from "components/Widgets"; +import { entriesOptions, initialMessage } from "constants/constants"; import messages from "constants/messages"; -import { InputContainer, Alert } from "components/Widgets"; +import React, { useEffect, useState } from "react"; import { getAllJob } from "services/jobs"; -import Pagination from "@material-ui/lab/Pagination"; +// Required functions for API and Error handling +import { handleError } from "shared/helper"; const MyRecentJobs = () => { const initialState = { diff --git a/src/pages/Jobs/ScheduleAgents/index.jsx b/src/pages/Jobs/ScheduleAgents/index.jsx index d8240be71..cf2ec2986 100644 --- a/src/pages/Jobs/ScheduleAgents/index.jsx +++ b/src/pages/Jobs/ScheduleAgents/index.jsx @@ -16,23 +16,18 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - // Common Fields for all the Uploads import CommonFields from "components/Upload/CommonFields"; - // Widgets import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; +import getBrowseData from "services/browse"; // Required functions for calling APIs import { getAllFolders } from "services/folders"; import { scheduleAnalysis } from "services/jobs"; -import getBrowseData from "services/browse"; - // Loading the default agents list import { defaultAgentsList, getLocalStorage } from "shared/storageHelper"; diff --git a/src/pages/Organize/Folder/Create/index.jsx b/src/pages/Organize/Folder/Create/index.jsx index 9a6a220d5..10c2a067a 100644 --- a/src/pages/Organize/Folder/Create/index.jsx +++ b/src/pages/Organize/Folder/Create/index.jsx @@ -16,18 +16,14 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; // Required functions for calling APIs -import { getAllFolders, createFolder } from "services/folders"; - +import { createFolder, getAllFolders } from "services/folders"; // Helper function for error handling import { handleError } from "shared/helper"; diff --git a/src/pages/Organize/Folder/Delete/index.jsx b/src/pages/Organize/Folder/Delete/index.jsx index 3fd657f83..8e237a41b 100644 --- a/src/pages/Organize/Folder/Delete/index.jsx +++ b/src/pages/Organize/Folder/Delete/index.jsx @@ -16,18 +16,14 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; // Required functions for calling APIs -import { getAllFolders, deleteFolder } from "services/folders"; - +import { deleteFolder, getAllFolders } from "services/folders"; // Helper function for error handling import { handleError } from "shared/helper"; diff --git a/src/pages/Organize/Folder/Edit/index.jsx b/src/pages/Organize/Folder/Edit/index.jsx index 460d759b1..39e92d39a 100644 --- a/src/pages/Organize/Folder/Edit/index.jsx +++ b/src/pages/Organize/Folder/Edit/index.jsx @@ -16,18 +16,14 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; // Required functions for calling APIs -import { getAllFolders, editFolder, getSingleFolder } from "services/folders"; - +import { editFolder, getAllFolders, getSingleFolder } from "services/folders"; // Helper function for error handling import { handleError } from "shared/helper"; diff --git a/src/pages/Organize/Folder/Move/index.jsx b/src/pages/Organize/Folder/Move/index.jsx index d94d0dd08..ec025607e 100644 --- a/src/pages/Organize/Folder/Move/index.jsx +++ b/src/pages/Organize/Folder/Move/index.jsx @@ -16,18 +16,14 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer } from "components/Widgets"; - +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; // Required functions for calling APIs -import { getAllFolders, moveFolder, copyFolder } from "services/folders"; - +import { copyFolder, getAllFolders, moveFolder } from "services/folders"; // Helper function for error handling import { handleError } from "shared/helper"; diff --git a/src/pages/Organize/Folder/Unlink/index.jsx b/src/pages/Organize/Folder/Unlink/index.jsx index 7f52e4c37..7b46df6d9 100644 --- a/src/pages/Organize/Folder/Unlink/index.jsx +++ b/src/pages/Organize/Folder/Unlink/index.jsx @@ -16,18 +16,14 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; // Required functions for calling APIs -import { getAllFolders, deleteFolder } from "services/folders"; - +import { deleteFolder, getAllFolders } from "services/folders"; // Helper function for error handling import { handleError } from "shared/helper"; diff --git a/src/pages/Organize/License/CandidateLicense/index.jsx b/src/pages/Organize/License/CandidateLicense/index.jsx index 6af168642..a37919801 100644 --- a/src/pages/Organize/License/CandidateLicense/index.jsx +++ b/src/pages/Organize/License/CandidateLicense/index.jsx @@ -16,20 +16,16 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useEffect, useState } from "react"; -import { useHistory } from "react-router-dom"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer } from "components/Widgets"; - -// Required functions for calling APIs -import { getAllLicense } from "services/licenses"; - // Routes import routes from "constants/routes"; +import React, { useEffect, useState } from "react"; +import { useHistory } from "react-router-dom"; +// Required functions for calling APIs +import { getAllLicense } from "services/licenses"; const AdviceLicenses = () => { const history = useHistory(); diff --git a/src/pages/Organize/License/Create/index.jsx b/src/pages/Organize/License/Create/index.jsx index 600d9400b..944a01926 100644 --- a/src/pages/Organize/License/Create/index.jsx +++ b/src/pages/Organize/License/Create/index.jsx @@ -16,15 +16,12 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - +import messages from "constants/messages"; +import React, { useState } from "react"; // Required functions for calling APIs import { createCandidateLicense } from "services/licenses"; diff --git a/src/pages/Organize/Uploads/Delete/index.jsx b/src/pages/Organize/Uploads/Delete/index.jsx index c5cc190dc..b1fc62fd9 100644 --- a/src/pages/Organize/Uploads/Delete/index.jsx +++ b/src/pages/Organize/Uploads/Delete/index.jsx @@ -16,20 +16,17 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; // Required functions for calling APIs import { getAllFolders } from "services/folders"; import { - getUploadsFolderId, deleteUploadsbyId, + getUploadsFolderId, } from "services/organizeUploads"; const UploadDelete = () => { diff --git a/src/pages/Organize/Uploads/Edit/index.jsx b/src/pages/Organize/Uploads/Edit/index.jsx index aa81bd59a..660a0a38e 100644 --- a/src/pages/Organize/Uploads/Edit/index.jsx +++ b/src/pages/Organize/Uploads/Edit/index.jsx @@ -16,19 +16,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer } from "components/Widgets"; - +import React, { useEffect, useState } from "react"; // Required functions for calling APIs import { getAllFolders } from "services/folders"; import { getUploadsFolderId } from "services/organizeUploads"; import { getUploadById } from "services/upload"; - // Helper function for error handling import { handleError } from "shared/helper"; diff --git a/src/pages/Organize/Uploads/Move/index.jsx b/src/pages/Organize/Uploads/Move/index.jsx index e16d737ad..68bb6668f 100644 --- a/src/pages/Organize/Uploads/Move/index.jsx +++ b/src/pages/Organize/Uploads/Move/index.jsx @@ -16,23 +16,19 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; +import { getAllFolders } from "services/folders"; // Required functions for calling APIs import { - moveUpload, copyUpload, getUploadsFolderId, + moveUpload, } from "services/organizeUploads"; -import { getAllFolders } from "services/folders"; - // Helper function for error handling import { handleError } from "shared/helper"; diff --git a/src/pages/Search/index.jsx b/src/pages/Search/index.jsx index 6ee700a9a..09e357387 100644 --- a/src/pages/Search/index.jsx +++ b/src/pages/Search/index.jsx @@ -16,22 +16,19 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState } from "react"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - +import React, { useState } from "react"; // Required functions for calling APIs import search from "services/search"; // Required constants import { - initialState, - initialMessageSearch, entriesOptions, + initialMessageSearch, + initialState, } from "../../constants/constants"; const Search = () => { diff --git a/src/pages/Upload/File/index.jsx b/src/pages/Upload/File/index.jsx index 98418a246..4ead52289 100644 --- a/src/pages/Upload/File/index.jsx +++ b/src/pages/Upload/File/index.jsx @@ -16,31 +16,26 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - -// Widgets -import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - // Common Fields for all the Uploads import CommonFields from "components/Upload/CommonFields"; - +// Widgets +import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; +import { getAllFolders } from "services/folders"; +import { scheduleAnalysis } from "services/jobs"; // Required functions for calling APIs import { createUploadFile } from "services/upload"; -import { scheduleAnalysis } from "services/jobs"; -import { getAllFolders } from "services/folders"; - // Helper function for error handling import { handleError } from "shared/helper"; // constants import { - initialStateFile, - initialScanFileDataFile, initialFolderListFile, + initialScanFileDataFile, + initialStateFile, } from "../../../constants/constants"; const UploadFile = () => { diff --git a/src/pages/Upload/ImportReport/index.jsx b/src/pages/Upload/ImportReport/index.jsx index 4c251edf7..794db6290 100644 --- a/src/pages/Upload/ImportReport/index.jsx +++ b/src/pages/Upload/ImportReport/index.jsx @@ -17,20 +17,17 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useEffect, useState } from "react"; - // Title import Title from "components/Title"; - // Widgets import { Alert, Button, InputContainer } from "components/Widgets"; - // constants import { initialMessage, initialStateImportReport } from "constants/constants"; -import { getAllFolders } from "services/folders"; -import { getUploadsFolderId } from "services/organizeUploads"; +import React, { useEffect, useState } from "react"; import { useHistory, useLocation } from "react-router-dom"; +import { getAllFolders } from "services/folders"; import { importReport } from "services/jobs"; +import { getUploadsFolderId } from "services/organizeUploads"; const ImportReport = () => { // States for setting the folder and upload list diff --git a/src/pages/Upload/Instructions/index.jsx b/src/pages/Upload/Instructions/index.jsx index 4a95b2a30..d592a828b 100644 --- a/src/pages/Upload/Instructions/index.jsx +++ b/src/pages/Upload/Instructions/index.jsx @@ -16,17 +16,14 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import { Link } from "react-router-dom"; - // Title import Title from "components/Title"; - -// Routes -import routes from "constants/routes"; - // External Links import externalLinks from "constants/externalLinks"; +// Routes +import routes from "constants/routes"; +import React from "react"; +import { Link } from "react-router-dom"; const Instructions = () => { return ( diff --git a/src/pages/Upload/OneShotAnalysis/index.jsx b/src/pages/Upload/OneShotAnalysis/index.jsx index 650ddf04d..55d320731 100644 --- a/src/pages/Upload/OneShotAnalysis/index.jsx +++ b/src/pages/Upload/OneShotAnalysis/index.jsx @@ -16,13 +16,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - // Title import Title from "components/Title"; - // Widgets import { Button, InputContainer } from "components/Widgets"; +import React from "react"; const OneShotAnalysis = () => { const handleSubmit = (e) => { diff --git a/src/pages/Upload/OneShotCopyright/index.jsx b/src/pages/Upload/OneShotCopyright/index.jsx index c98c1e243..be9da93b3 100644 --- a/src/pages/Upload/OneShotCopyright/index.jsx +++ b/src/pages/Upload/OneShotCopyright/index.jsx @@ -16,13 +16,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - // Title import Title from "components/Title"; - // Widgets import { Button, InputContainer } from "components/Widgets"; +import React from "react"; const OneShotCopyright = () => { const handleSubmit = (e) => { diff --git a/src/pages/Upload/OneShotMonk/index.jsx b/src/pages/Upload/OneShotMonk/index.jsx index 292fa3acc..3005b7e09 100644 --- a/src/pages/Upload/OneShotMonk/index.jsx +++ b/src/pages/Upload/OneShotMonk/index.jsx @@ -16,13 +16,11 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; - // Title import Title from "components/Title"; - // Widgets import { Button, InputContainer } from "components/Widgets"; +import React from "react"; const OneShotMonk = () => { const handleSubmit = (e) => { diff --git a/src/pages/Upload/Server/index.jsx b/src/pages/Upload/Server/index.jsx index 2dd3f047d..f512e7cbe 100644 --- a/src/pages/Upload/Server/index.jsx +++ b/src/pages/Upload/Server/index.jsx @@ -16,25 +16,21 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; - -// Widgets -import { Alert, Button, InputContainer } from "components/Widgets"; - +// Title +import Title from "components/Title"; // Common Fields for all the Uploads import CommonFields from "components/Upload/CommonFields"; - +// Widgets +import { Alert, Button, InputContainer } from "components/Widgets"; +import React, { useEffect, useState } from "react"; // Required functions for calling APIs import { getAllFolders } from "services/folders"; -// Title -import Title from "components/Title"; - // constants import { - initialStateUploadFromServer, - initialScanFileData, initialFolderList, + initialScanFileData, + initialStateUploadFromServer, } from "../../../constants/constants"; const UploadFromServer = () => { diff --git a/src/pages/Upload/Url/index.jsx b/src/pages/Upload/Url/index.jsx index c54da5c9f..996b69373 100644 --- a/src/pages/Upload/Url/index.jsx +++ b/src/pages/Upload/Url/index.jsx @@ -16,30 +16,25 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - -// Widgets -import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - // Common Fields for all the Uploads import CommonFields from "components/Upload/CommonFields"; - -// Required functions for calling APIs -import { getAllFolders } from "services/folders"; -import { createUploadUrl, getUploadById } from "services/upload"; -import { scheduleAnalysis } from "services/jobs"; - +// Widgets +import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; // constants import { - initialScanFileData, initialFolderList, + initialScanFileData, initialStateUrl, initialUrlData, } from "constants/constants"; +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; +// Required functions for calling APIs +import { getAllFolders } from "services/folders"; +import { scheduleAnalysis } from "services/jobs"; +import { createUploadUrl, getUploadById } from "services/upload"; const UploadFromUrl = () => { // Upload Id required for scheduling Analysis diff --git a/src/pages/Upload/Vcs/index.jsx b/src/pages/Upload/Vcs/index.jsx index 006b373a6..e7b27effe 100644 --- a/src/pages/Upload/Vcs/index.jsx +++ b/src/pages/Upload/Vcs/index.jsx @@ -16,32 +16,26 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React, { useState, useEffect } from "react"; -import messages from "constants/messages"; - // Title import Title from "components/Title"; - -// Widgets -import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; - // Common Fields for all the Uploads import CommonFields from "components/Upload/CommonFields"; - -// Required functions for calling APIs -import { getAllFolders } from "services/folders"; -import { createUploadVcs, getUploadById } from "services/upload"; -import { scheduleAnalysis } from "services/jobs"; - +// Widgets +import { Alert, Button, InputContainer, Spinner } from "components/Widgets"; // Default Agents list import { - initialScanFileData, initialFolderList, + initialScanFileData, initialStateVcs, initialVcsData, typeVcs, } from "constants/constants"; - +import messages from "constants/messages"; +import React, { useEffect, useState } from "react"; +// Required functions for calling APIs +import { getAllFolders } from "services/folders"; +import { scheduleAnalysis } from "services/jobs"; +import { createUploadVcs, getUploadById } from "services/upload"; // Helper function for error handling import { handleError } from "shared/helper"; diff --git a/src/services/folders.js b/src/services/folders.js index 56560cecb..acd7e4394 100644 --- a/src/services/folders.js +++ b/src/services/folders.js @@ -17,11 +17,11 @@ */ import { - getAllFoldersApi, - getSingleFolderApi, createFolderApi, deleteFolderApi, editFolderApi, + getAllFoldersApi, + getSingleFolderApi, moveCopyFolderApi, } from "api/folders"; diff --git a/src/services/groups.js b/src/services/groups.js index d44995940..1c51a4a08 100644 --- a/src/services/groups.js +++ b/src/services/groups.js @@ -18,12 +18,12 @@ */ import { - getAllGroupsApi, createGroupApi, deleteGroupApi, getAllDeletableGroupsApi, + getAllGroupsApi, } from "api/groups"; -import { setLocalStorage, getLocalStorage } from "shared/storageHelper"; +import { getLocalStorage, setLocalStorage } from "shared/storageHelper"; // Fetching all the groups export const getAllGroups = () => { diff --git a/src/services/jobs.js b/src/services/jobs.js index e6507b2a3..30f6e7809 100644 --- a/src/services/jobs.js +++ b/src/services/jobs.js @@ -18,13 +18,13 @@ */ import { - getJobApi, - scheduleAnalysisApi, - scheduleReportApi, downloadReportApi, - getAllJobApi, getAllAdminJobApi, + getAllJobApi, + getJobApi, importReportApi, + scheduleAnalysisApi, + scheduleReportApi, } from "api/jobs"; import { getReportIdFromUrl } from "shared/helper"; import { getLocalStorage } from "shared/storageHelper"; diff --git a/src/services/licenses.js b/src/services/licenses.js index 23c5f96b0..6dbc48e65 100644 --- a/src/services/licenses.js +++ b/src/services/licenses.js @@ -16,7 +16,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getAllLicenseApi, createCandidateLicenseApi } from "api/licenses"; +import { createCandidateLicenseApi, getAllLicenseApi } from "api/licenses"; // Fetching the licenses with their kind i.e (candidate, main, all) export const getAllLicense = (licenseData) => { diff --git a/src/services/organizeUploads.js b/src/services/organizeUploads.js index 7fd2de4e5..6541c9996 100644 --- a/src/services/organizeUploads.js +++ b/src/services/organizeUploads.js @@ -17,10 +17,10 @@ */ import { - getUploadsByFolderIdApi, + copyUploadApi, deleteUploadsApi, + getUploadsByFolderIdApi, moveUploadApi, - copyUploadApi, } from "api/organizeUploads"; // Getting uploads with folder id diff --git a/src/services/upload.js b/src/services/upload.js index c1b091a21..818b5c003 100644 --- a/src/services/upload.js +++ b/src/services/upload.js @@ -15,11 +15,11 @@ import { createUploadApi, - getUploadByIdApi, - createUploadVcsApi, createUploadUrlApi, - getUploadSummaryApi, + createUploadVcsApi, + getUploadByIdApi, getUploadLicenseApi, + getUploadSummaryApi, } from "api/upload"; // Create Uploads from File diff --git a/src/services/users.js b/src/services/users.js index 7fde1f2d7..534b8bcf2 100644 --- a/src/services/users.js +++ b/src/services/users.js @@ -18,13 +18,13 @@ import fetchTokenApi from "api/auth"; import { - getUserSelfApi, - getAllUsersApi, - deleteUserApi, addUserApi, - getUserByIdAapi, + deleteUserApi, editUserByIdApi, + getAllUsersApi, getTokensApi, + getUserByIdAapi, + getUserSelfApi, } from "api/users"; import { setLocalStorage } from "shared/storageHelper"; diff --git a/src/shared/AdminLayout.jsx b/src/shared/AdminLayout.jsx index 6d2cfb368..72064e6cf 100644 --- a/src/shared/AdminLayout.jsx +++ b/src/shared/AdminLayout.jsx @@ -17,15 +17,14 @@ */ // React Imports -import React from "react"; -import { withRouter, Route, Redirect } from "react-router-dom"; -import PropTypes from "prop-types"; - // Header import Header from "components/Header"; - // Helper Functions import routes from "constants/routes"; +import PropTypes from "prop-types"; +import React from "react"; +import { Redirect, Route, withRouter } from "react-router-dom"; + import { isAdmin, isAuth } from "./authHelper"; const AdminLayout = ({ component: Component, ...rest }) => ( diff --git a/src/shared/PrivateLayout.jsx b/src/shared/PrivateLayout.jsx index 87e1a62cf..619128a2c 100644 --- a/src/shared/PrivateLayout.jsx +++ b/src/shared/PrivateLayout.jsx @@ -17,15 +17,14 @@ */ // React Imports -import React from "react"; -import { withRouter, Route, Redirect } from "react-router-dom"; -import PropTypes from "prop-types"; - // Header import Header from "components/Header"; - // Helper Functions import routes from "constants/routes"; +import PropTypes from "prop-types"; +import React from "react"; +import { Redirect, Route, withRouter } from "react-router-dom"; + import { isAuth } from "./authHelper"; const PrivateLayout = ({ component: Component, ...rest }) => ( diff --git a/src/shared/PublicLayout.jsx b/src/shared/PublicLayout.jsx index da46d9f5e..77c93e7b9 100644 --- a/src/shared/PublicLayout.jsx +++ b/src/shared/PublicLayout.jsx @@ -17,12 +17,11 @@ */ // React Imports -import React from "react"; -import { withRouter, Route } from "react-router-dom"; -import PropTypes from "prop-types"; - // Header import Header from "components/Header"; +import PropTypes from "prop-types"; +import React from "react"; +import { Route, withRouter } from "react-router-dom"; const PublicLayout = ({ component: Component, ...rest }) => ( (
diff --git a/src/stories/Image.stories.jsx b/src/stories/Image.stories.jsx index 02ab9afe6..1c8edc684 100644 --- a/src/stories/Image.stories.jsx +++ b/src/stories/Image.stories.jsx @@ -16,14 +16,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import { ThemeProvider } from "styled-components"; -import { lightTheme, darkTheme } from "styles/theme"; -import { GlobalProvider } from "context"; -import GlobalStyles from "styles/globalStyle"; import "bootstrap/dist/css/bootstrap.min.css"; import "styles/global.css"; + import { Image } from "components/Widgets"; +import { GlobalProvider } from "context"; +import React from "react"; +import { ThemeProvider } from "styled-components"; +import GlobalStyles from "styles/globalStyle"; +import { darkTheme, lightTheme } from "styles/theme"; export default { title: "Components/Widgets/Image", diff --git a/src/stories/Input.stories.jsx b/src/stories/Input.stories.jsx index 99d1b0058..36c294290 100644 --- a/src/stories/Input.stories.jsx +++ b/src/stories/Input.stories.jsx @@ -16,14 +16,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import { ThemeProvider } from "styled-components"; -import { lightTheme, darkTheme } from "styles/theme"; -import { GlobalProvider } from "context"; -import GlobalStyles from "styles/globalStyle"; import "bootstrap/dist/css/bootstrap.min.css"; import "styles/global.css"; + import { InputContainer } from "components/Widgets"; +import { GlobalProvider } from "context"; +import React from "react"; +import { ThemeProvider } from "styled-components"; +import GlobalStyles from "styles/globalStyle"; +import { darkTheme, lightTheme } from "styles/theme"; export default { title: "Components/Widgets/Input", diff --git a/src/stories/Page.jsx b/src/stories/Page.jsx index 13ab2964f..25513220d 100644 --- a/src/stories/Page.jsx +++ b/src/stories/Page.jsx @@ -1,8 +1,9 @@ -import React from "react"; +import "./page.css"; + import PropTypes from "prop-types"; +import React from "react"; import { Header } from "./Header"; -import "./page.css"; export const Page = ({ user, onLogin, onLogout, onCreateAccount }) => (
diff --git a/src/stories/Page.stories.jsx b/src/stories/Page.stories.jsx index cdb90c402..a655475ff 100644 --- a/src/stories/Page.stories.jsx +++ b/src/stories/Page.stories.jsx @@ -1,7 +1,7 @@ import React from "react"; -import { Page } from "./Page"; import * as HeaderStories from "./Header.stories"; +import { Page } from "./Page"; export default { title: "Example/Page", diff --git a/src/stories/TextIcon.stories.jsx b/src/stories/TextIcon.stories.jsx index bb64e8ef1..4545f31ad 100644 --- a/src/stories/TextIcon.stories.jsx +++ b/src/stories/TextIcon.stories.jsx @@ -16,14 +16,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import { ThemeProvider } from "styled-components"; -import { lightTheme, darkTheme } from "styles/theme"; -import { GlobalProvider } from "context"; -import GlobalStyles from "styles/globalStyle"; import "bootstrap/dist/css/bootstrap.min.css"; import "styles/global.css"; + import TextIcon from "components/Widgets/TextIcon/index"; +import { GlobalProvider } from "context"; +import React from "react"; +import { ThemeProvider } from "styled-components"; +import GlobalStyles from "styles/globalStyle"; +import { darkTheme, lightTheme } from "styles/theme"; export default { title: "Components/Widgets/TextIcon", diff --git a/src/stories/Tooltip.stories.jsx b/src/stories/Tooltip.stories.jsx index 574f0f57a..b0d13e34f 100644 --- a/src/stories/Tooltip.stories.jsx +++ b/src/stories/Tooltip.stories.jsx @@ -16,14 +16,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import { ThemeProvider } from "styled-components"; -import { lightTheme, darkTheme } from "styles/theme"; -import { GlobalProvider } from "context"; -import GlobalStyles from "styles/globalStyle"; import "bootstrap/dist/css/bootstrap.min.css"; import "styles/global.css"; + import { Tooltip } from "components/Widgets"; +import { GlobalProvider } from "context"; +import React from "react"; +import { ThemeProvider } from "styled-components"; +import GlobalStyles from "styles/globalStyle"; +import { darkTheme, lightTheme } from "styles/theme"; export default { title: "Components/Widgets/Tooltip", diff --git a/src/testingUtils/renderComponent.jsx b/src/testingUtils/renderComponent.jsx index 37cc36b1f..f2ca005fb 100644 --- a/src/testingUtils/renderComponent.jsx +++ b/src/testingUtils/renderComponent.jsx @@ -14,14 +14,15 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import React from "react"; -import { render } from "@testing-library/react"; -import { ThemeProvider } from "styled-components"; -import { lightTheme } from "styles/theme"; import "bootstrap/dist/css/bootstrap.min.css"; import "react-virtualized-tree/lib/main.css"; import "styles/global.css"; + +import { render } from "@testing-library/react"; +import React from "react"; +import { ThemeProvider } from "styled-components"; import GlobalStyles from "styles/globalStyle"; +import { lightTheme } from "styles/theme"; const initialTheme = { theme: "light", diff --git a/yarn.lock b/yarn.lock index a72cd48dc..5038beb4b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -120,6 +120,20 @@ __metadata: languageName: node linkType: hard +"@babel/eslint-parser@npm:^7.19.1": + version: 7.19.1 + resolution: "@babel/eslint-parser@npm:7.19.1" + dependencies: + "@nicolo-ribaudo/eslint-scope-5-internals": 5.1.1-v1 + eslint-visitor-keys: ^2.1.0 + semver: ^6.3.0 + peerDependencies: + "@babel/core": ">=7.11.0" + eslint: ^7.5.0 || ^8.0.0 + checksum: 6d5360f62f25ed097250657deb1bc4c4f51a5f5f2fe456e98cda13727753fdf7a11a109b4cfa03ef0dd6ced3beaeb703b76193c1141e29434d1f91f1bac0517d + languageName: node + linkType: hard + "@babel/generator@npm:^7.12.1, @babel/generator@npm:^7.12.11, @babel/generator@npm:^7.12.5, @babel/generator@npm:^7.18.2": version: 7.18.2 resolution: "@babel/generator@npm:7.18.2" @@ -140,6 +154,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-annotate-as-pure@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/helper-annotate-as-pure@npm:7.18.6" + dependencies: + "@babel/types": ^7.18.6 + checksum: 88ccd15ced475ef2243fdd3b2916a29ea54c5db3cd0cfabf9d1d29ff6e63b7f7cd1c27264137d7a40ac2e978b9b9a542c332e78f40eb72abe737a7400788fc1b + languageName: node + linkType: hard + "@babel/helper-builder-binary-assignment-operator-visitor@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-builder-binary-assignment-operator-visitor@npm:7.16.7" @@ -282,6 +305,15 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-imports@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/helper-module-imports@npm:7.18.6" + dependencies: + "@babel/types": ^7.18.6 + checksum: f393f8a3b3304b1b7a288a38c10989de754f01d29caf62ce7c4e5835daf0a27b81f3ac687d9d2780d39685aae7b55267324b512150e7b2be967b0c493b6a1def + languageName: node + linkType: hard + "@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.18.0": version: 7.18.0 resolution: "@babel/helper-module-transforms@npm:7.18.0" @@ -321,6 +353,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.19.0": + version: 7.20.2 + resolution: "@babel/helper-plugin-utils@npm:7.20.2" + checksum: f6cae53b7fdb1bf3abd50fa61b10b4470985b400cc794d92635da1e7077bb19729f626adc0741b69403d9b6e411cddddb9c0157a709cc7c4eeb41e663be5d74b + languageName: node + linkType: hard + "@babel/helper-remap-async-to-generator@npm:^7.16.8": version: 7.16.8 resolution: "@babel/helper-remap-async-to-generator@npm:7.16.8" @@ -372,6 +411,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-string-parser@npm:^7.19.4": + version: 7.19.4 + resolution: "@babel/helper-string-parser@npm:7.19.4" + checksum: b2f8a3920b30dfac81ec282ac4ad9598ea170648f8254b10f475abe6d944808fb006aab325d3eb5a8ad3bea8dfa888cfa6ef471050dae5748497c110ec060943 + languageName: node + linkType: hard + "@babel/helper-validator-identifier@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-validator-identifier@npm:7.16.7" @@ -379,6 +425,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-identifier@npm:^7.19.1": + version: 7.19.1 + resolution: "@babel/helper-validator-identifier@npm:7.19.1" + checksum: 0eca5e86a729162af569b46c6c41a63e18b43dbe09fda1d2a3c8924f7d617116af39cac5e4cd5d431bb760b4dca3c0970e0c444789b1db42bcf1fa41fbad0a3a + languageName: node + linkType: hard + "@babel/helper-validator-option@npm:^7.16.7": version: 7.16.7 resolution: "@babel/helper-validator-option@npm:7.16.7" @@ -386,6 +439,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-option@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/helper-validator-option@npm:7.18.6" + checksum: f9cc6eb7cc5d759c5abf006402180f8d5e4251e9198197428a97e05d65eb2f8ae5a0ce73b1dfd2d35af41d0eb780627a64edf98a4e71f064eeeacef8de58f2cf + languageName: node + linkType: hard + "@babel/helper-wrap-function@npm:^7.16.8": version: 7.16.8 resolution: "@babel/helper-wrap-function@npm:7.16.8" @@ -836,6 +896,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-syntax-jsx@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/plugin-syntax-jsx@npm:7.18.6" + dependencies: + "@babel/helper-plugin-utils": ^7.18.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 6d37ea972970195f1ffe1a54745ce2ae456e0ac6145fae9aa1480f297248b262ea6ebb93010eddb86ebfacb94f57c05a1fc5d232b9a67325b09060299d515c67 + languageName: node + linkType: hard + "@babel/plugin-syntax-logical-assignment-operators@npm:^7.10.4, @babel/plugin-syntax-logical-assignment-operators@npm:^7.8.3": version: 7.10.4 resolution: "@babel/plugin-syntax-logical-assignment-operators@npm:7.10.4" @@ -1247,6 +1318,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-display-name@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/plugin-transform-react-display-name@npm:7.18.6" + dependencies: + "@babel/helper-plugin-utils": ^7.18.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 51c087ab9e41ef71a29335587da28417536c6f816c292e092ffc0e0985d2f032656801d4dd502213ce32481f4ba6c69402993ffa67f0818a07606ff811e4be49 + languageName: node + linkType: hard + "@babel/plugin-transform-react-jsx-development@npm:^7.16.7": version: 7.16.7 resolution: "@babel/plugin-transform-react-jsx-development@npm:7.16.7" @@ -1258,6 +1340,17 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-jsx-development@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/plugin-transform-react-jsx-development@npm:7.18.6" + dependencies: + "@babel/plugin-transform-react-jsx": ^7.18.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: ec9fa65db66f938b75c45e99584367779ac3e0af8afc589187262e1337c7c4205ea312877813ae4df9fb93d766627b8968d74ac2ba702e4883b1dbbe4953ecee + languageName: node + linkType: hard + "@babel/plugin-transform-react-jsx@npm:^7.12.12, @babel/plugin-transform-react-jsx@npm:^7.16.7, @babel/plugin-transform-react-jsx@npm:^7.17.12": version: 7.17.12 resolution: "@babel/plugin-transform-react-jsx@npm:7.17.12" @@ -1273,6 +1366,21 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-jsx@npm:^7.18.6": + version: 7.19.0 + resolution: "@babel/plugin-transform-react-jsx@npm:7.19.0" + dependencies: + "@babel/helper-annotate-as-pure": ^7.18.6 + "@babel/helper-module-imports": ^7.18.6 + "@babel/helper-plugin-utils": ^7.19.0 + "@babel/plugin-syntax-jsx": ^7.18.6 + "@babel/types": ^7.19.0 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: d7d6f0b8f24b1f6b7cf8062c4e91c59af82489a993e51859bd49c2d62a2d2b77fd40b02a9a1d0e6d874cf4ce56a05fa3564b964587d00c94ebc62593524052ec + languageName: node + linkType: hard + "@babel/plugin-transform-react-pure-annotations@npm:^7.16.7": version: 7.18.0 resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.18.0" @@ -1285,6 +1393,18 @@ __metadata: languageName: node linkType: hard +"@babel/plugin-transform-react-pure-annotations@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/plugin-transform-react-pure-annotations@npm:7.18.6" + dependencies: + "@babel/helper-annotate-as-pure": ^7.18.6 + "@babel/helper-plugin-utils": ^7.18.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 97c4873d409088f437f9084d084615948198dd87fc6723ada0e7e29c5a03623c2f3e03df3f52e7e7d4d23be32a08ea00818bff302812e48713c706713bd06219 + languageName: node + linkType: hard + "@babel/plugin-transform-regenerator@npm:^7.18.0": version: 7.18.0 resolution: "@babel/plugin-transform-regenerator@npm:7.18.0" @@ -1545,6 +1665,22 @@ __metadata: languageName: node linkType: hard +"@babel/preset-react@npm:^7.18.6": + version: 7.18.6 + resolution: "@babel/preset-react@npm:7.18.6" + dependencies: + "@babel/helper-plugin-utils": ^7.18.6 + "@babel/helper-validator-option": ^7.18.6 + "@babel/plugin-transform-react-display-name": ^7.18.6 + "@babel/plugin-transform-react-jsx": ^7.18.6 + "@babel/plugin-transform-react-jsx-development": ^7.18.6 + "@babel/plugin-transform-react-pure-annotations": ^7.18.6 + peerDependencies: + "@babel/core": ^7.0.0-0 + checksum: 540d9cf0a0cc0bb07e6879994e6fb7152f87dafbac880b56b65e2f528134c7ba33e0cd140b58700c77b2ebf4c81fa6468fed0ba391462d75efc7f8c1699bb4c3 + languageName: node + linkType: hard + "@babel/preset-typescript@npm:^7.12.7, @babel/preset-typescript@npm:^7.16.0": version: 7.17.12 resolution: "@babel/preset-typescript@npm:7.17.12" @@ -1631,6 +1767,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.18.6, @babel/types@npm:^7.19.0": + version: 7.20.2 + resolution: "@babel/types@npm:7.20.2" + dependencies: + "@babel/helper-string-parser": ^7.19.4 + "@babel/helper-validator-identifier": ^7.19.1 + to-fast-properties: ^2.0.0 + checksum: 57e76e5f21876135f481bfd4010c87f2d38196bb0a2bc60a28d6e55e3afa90cdd9accf164e4cb71bdfb620517fa0a0cb5600cdce36c21d59fdaccfbb899c024c + languageName: node + linkType: hard + "@base2/pretty-print-object@npm:1.0.1": version: 1.0.1 resolution: "@base2/pretty-print-object@npm:1.0.1" @@ -2260,6 +2407,15 @@ __metadata: languageName: node linkType: hard +"@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1": + version: 5.1.1-v1 + resolution: "@nicolo-ribaudo/eslint-scope-5-internals@npm:5.1.1-v1" + dependencies: + eslint-scope: 5.1.1 + checksum: f2e3b2d6a6e2d9f163ca22105910c9f850dc4897af0aea3ef0a5886b63d8e1ba6505b71c99cb78a3bba24a09557d601eb21c8dede3f3213753fcfef364eb0e57 + languageName: node + linkType: hard + "@nodelib/fs.scandir@npm:2.1.5": version: 2.1.5 resolution: "@nodelib/fs.scandir@npm:2.1.5" @@ -8826,6 +8982,16 @@ __metadata: languageName: node linkType: hard +"eslint-plugin-json@npm:^3.1.0": + version: 3.1.0 + resolution: "eslint-plugin-json@npm:3.1.0" + dependencies: + lodash: ^4.17.21 + vscode-json-languageservice: ^4.1.6 + checksum: bc7fa4c2e1fdac4365e499bd24ecdf6cddeb6bb647ea9543f214fd811559345a3c1a944b78ff1d3e4b6a49980bcea592f0d58b26a41e05e451e222bb43322cac + languageName: node + linkType: hard + "eslint-plugin-jsx-a11y@npm:^6.3.1, eslint-plugin-jsx-a11y@npm:^6.5.1": version: 6.5.1 resolution: "eslint-plugin-jsx-a11y@npm:6.5.1" @@ -8905,6 +9071,39 @@ __metadata: languageName: node linkType: hard +"eslint-plugin-react@npm:^7.24.0": + version: 7.31.10 + resolution: "eslint-plugin-react@npm:7.31.10" + dependencies: + array-includes: ^3.1.5 + array.prototype.flatmap: ^1.3.0 + doctrine: ^2.1.0 + estraverse: ^5.3.0 + jsx-ast-utils: ^2.4.1 || ^3.0.0 + minimatch: ^3.1.2 + object.entries: ^1.1.5 + object.fromentries: ^2.0.5 + object.hasown: ^1.1.1 + object.values: ^1.1.5 + prop-types: ^15.8.1 + resolve: ^2.0.0-next.3 + semver: ^6.3.0 + string.prototype.matchall: ^4.0.7 + peerDependencies: + eslint: ^3 || ^4 || ^5 || ^6 || ^7 || ^8 + checksum: f013669c296483559a760648fa06425f161b1aff93c668f14c4561c933d22a7836b745b88a795c53cab929c71513d5fd1f2ffdddff915709f01b77ac25f5b71b + languageName: node + linkType: hard + +"eslint-plugin-simple-import-sort@npm:^7.0.0": + version: 7.0.0 + resolution: "eslint-plugin-simple-import-sort@npm:7.0.0" + peerDependencies: + eslint: ">=5.0.0" + checksum: 6aacb7179c213cd2081950630368d1f3b1dcb4f5674d8b989fe7839e7b317ee521d74761676e8b1a7cab49f20405dbcc9aac05358ae804e6bcba6cbf1daccb3d + languageName: node + linkType: hard + "eslint-plugin-testing-library@npm:^3.9.2": version: 3.10.2 resolution: "eslint-plugin-testing-library@npm:3.10.2" @@ -8963,7 +9162,7 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^2.0.0": +"eslint-visitor-keys@npm:^2.0.0, eslint-visitor-keys@npm:^2.1.0": version: 2.1.0 resolution: "eslint-visitor-keys@npm:2.1.0" checksum: e3081d7dd2611a35f0388bbdc2f5da60b3a3c5b8b6e928daffff7391146b434d691577aa95064c8b7faad0b8a680266bcda0a42439c18c717b80e6718d7e267d @@ -9761,6 +9960,8 @@ __metadata: version: 0.0.0-use.local resolution: "fossologyui@workspace:." dependencies: + "@babel/eslint-parser": ^7.19.1 + "@babel/preset-react": ^7.18.6 "@material-ui/core": ^4.12.4 "@material-ui/lab": ^4.0.0-alpha.61 "@storybook/addon-actions": ^6.5.5 @@ -9779,9 +9980,12 @@ __metadata: eslint-config-airbnb: 18.2.1 eslint-config-prettier: ^8.5.0 eslint-plugin-import: ^2.26.0 + eslint-plugin-json: ^3.1.0 eslint-plugin-jsx-a11y: ^6.5.1 eslint-plugin-prettier: ^3.4.0 + eslint-plugin-react: ^7.24.0 eslint-plugin-react-hooks: ^1.7.0 + eslint-plugin-simple-import-sort: ^7.0.0 husky: ^7.0.0 jest-fetch-mock: 3.0.3 jquery: ^3.6.0 @@ -12682,6 +12886,13 @@ __metadata: languageName: node linkType: hard +"jsonc-parser@npm:^3.0.0": + version: 3.2.0 + resolution: "jsonc-parser@npm:3.2.0" + checksum: 946dd9a5f326b745aa326d48a7257e3f4a4b62c5e98ec8e49fa2bdd8d96cef7e6febf1399f5c7016114fd1f68a1c62c6138826d5d90bc650448e3cf0951c53c7 + languageName: node + linkType: hard + "jsonfile@npm:^4.0.0": version: 4.0.0 resolution: "jsonfile@npm:4.0.0" @@ -20015,6 +20226,47 @@ __metadata: languageName: node linkType: hard +"vscode-json-languageservice@npm:^4.1.6": + version: 4.2.1 + resolution: "vscode-json-languageservice@npm:4.2.1" + dependencies: + jsonc-parser: ^3.0.0 + vscode-languageserver-textdocument: ^1.0.3 + vscode-languageserver-types: ^3.16.0 + vscode-nls: ^5.0.0 + vscode-uri: ^3.0.3 + checksum: 46b7f17d81e750bde854eb2dffb8d6effb6ab3765ce6482828b033a52800c5bd33e23b14634229227d1c42976c3ebbdb4cfa57e95da84b28e2d861008e541d07 + languageName: node + linkType: hard + +"vscode-languageserver-textdocument@npm:^1.0.3": + version: 1.0.7 + resolution: "vscode-languageserver-textdocument@npm:1.0.7" + checksum: 6018a8b2c87aeb6441419431909e9161e9659d214814193b029ca2b30d8b097d23538e4930942ef78f1440f52c57a93f7597144736b79ba1abd9f1a53c2ffbc0 + languageName: node + linkType: hard + +"vscode-languageserver-types@npm:^3.16.0": + version: 3.17.2 + resolution: "vscode-languageserver-types@npm:3.17.2" + checksum: ef2d862d22f622b64de0f428773d50a5928ec6cdd485960a7564ebe4fd4a3c8bcd956f29eb15bc45a0f353846e62f39f6c764d2ab85ce774b8724411ba84342f + languageName: node + linkType: hard + +"vscode-nls@npm:^5.0.0": + version: 5.2.0 + resolution: "vscode-nls@npm:5.2.0" + checksum: c9f43c0f85000b3008fc4a3a8fc122e580f4f0402a77186c6c0f3219ca8ac258f4893c7a563d66f097a6da09951d7f5a7e6295d3e21dcbaec707937c9089b5a8 + languageName: node + linkType: hard + +"vscode-uri@npm:^3.0.3": + version: 3.0.6 + resolution: "vscode-uri@npm:3.0.6" + checksum: 8b6a36553d089309c09f7aa2ca8dae321a1cb7ff5dcab35f0914d5155d3110722bdb6de67dcb727df15fecd83221d11bb4ab1274a9116b9ccc05b86cefe60dfc + languageName: node + linkType: hard + "w3c-hr-time@npm:^1.0.2": version: 1.0.2 resolution: "w3c-hr-time@npm:1.0.2" From de86d4170d2f283d034bac25c25b2e703357b25b Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 18:44:58 +0530 Subject: [PATCH 15/33] Check Husky - v1 Signed-off-by: Adithya Krishna --- scripts/copyrightsScript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/copyrightsScript.js b/scripts/copyrightsScript.js index aaca63d9e..848c094e3 100644 --- a/scripts/copyrightsScript.js +++ b/scripts/copyrightsScript.js @@ -25,7 +25,7 @@ const copyrights = []; createReadStream("scripts/copyrights.csv") .pipe(csv()) .on("data", (data) => { - copyrights.push(data.copyright); + copyrights.push(data.copyright); }) .on("end", () => { const uniqueCopyrights = [...new Set(copyrights)].sort(); From 010db70292924ebd6ff3b7d0ee5db2a8b67b8ea2 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 18:47:27 +0530 Subject: [PATCH 16/33] Check Husky - v2 --- scripts/copyrightsScript.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/copyrightsScript.js b/scripts/copyrightsScript.js index 848c094e3..047d4d56c 100644 --- a/scripts/copyrightsScript.js +++ b/scripts/copyrightsScript.js @@ -30,7 +30,7 @@ createReadStream("scripts/copyrights.csv") .on("end", () => { const uniqueCopyrights = [...new Set(copyrights)].sort(); writeFile( - "scripts/copyrights.json", + "scripts/copyrights.json", JSON.stringify(uniqueCopyrights), (err) => { if (err) { From eb097c96f36b3d61a09dcbe7d421ed059709d27b Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 18:49:58 +0530 Subject: [PATCH 17/33] Added Husky Config Signed-off-by: Adithya Krishna --- .husky/_/husky.sh | 29 +++++++++++++++++++++++++++++ .husky/pre-commit | 4 ++++ .husky/pre-push | 4 ++++ package.json | 6 ------ 4 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 .husky/_/husky.sh create mode 100755 .husky/pre-commit create mode 100755 .husky/pre-push diff --git a/.husky/_/husky.sh b/.husky/_/husky.sh new file mode 100644 index 000000000..5f7c17c20 --- /dev/null +++ b/.husky/_/husky.sh @@ -0,0 +1,29 @@ +#!/bin/sh +if [ -z "$husky_skip_init" ]; then + debug () { + [ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1" + } + + readonly hook_name="$(basename "$0")" + debug "starting $hook_name..." + + if [ "$HUSKY" = "0" ]; then + debug "HUSKY env variable is set to 0, skipping hook" + exit 0 + fi + + if [ -f ~/.huskyrc ]; then + debug "sourcing ~/.huskyrc" + . ~/.huskyrc + fi + + export readonly husky_skip_init=1 + sh -e "$0" "$@" + exitCode="$?" + + if [ $exitCode != 0 ]; then + echo "husky - $hook_name hook exited with code $exitCode (error)" + fi + + exit $exitCode +fi diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100755 index 000000000..d19bb4c23 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +./hooks/pre-commit diff --git a/.husky/pre-push b/.husky/pre-push new file mode 100755 index 000000000..2bd9dcce3 --- /dev/null +++ b/.husky/pre-push @@ -0,0 +1,4 @@ +#!/bin/sh +. "$(dirname "$0")/_/husky.sh" + +./hooks/pre-push $1 diff --git a/package.json b/package.json index 9987b0e17..58750543a 100644 --- a/package.json +++ b/package.json @@ -46,12 +46,6 @@ "yarn run lint:check" ] }, - "husky": { - "hooks": { - "pre-commit": "lint-staged", - "pre-push": "yarn run lint" - } - }, "browserslist": { "production": [ ">0.2%", From 4fba315ade1d7e50b2f0ce342ce46e2bbd0c3893 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 18:52:30 +0530 Subject: [PATCH 18/33] Updated Husky Signed-off-by: Adithya Krishna --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 58750543a..039f33936 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,8 @@ "fix:all": "yarn lint && yarn format", "storybook": "start-storybook -p 6006 -s public", "build-storybook": "build-storybook -s public", - "gencopy": "node scripts/copyrightsScript.js && prettier --write ./scripts/copyrights.js" + "gencopy": "node scripts/copyrightsScript.js && prettier --write ./scripts/copyrights.js", + "prepare": "husky install" }, "lint-staged": { "src/**/*.{js,jsx}": [ From 942bd7be549ec0fb4ae4a1ea0b09274cefe90be7 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 18:53:28 +0530 Subject: [PATCH 19/33] Updated Husky - v2 Signed-off-by: Adithya Krishna --- .husky/_/husky.sh | 29 ----------------------------- .husky/pre-commit | 5 +---- .husky/pre-push | 5 +---- 3 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 .husky/_/husky.sh diff --git a/.husky/_/husky.sh b/.husky/_/husky.sh deleted file mode 100644 index 5f7c17c20..000000000 --- a/.husky/_/husky.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -if [ -z "$husky_skip_init" ]; then - debug () { - [ "$HUSKY_DEBUG" = "1" ] && echo "husky (debug) - $1" - } - - readonly hook_name="$(basename "$0")" - debug "starting $hook_name..." - - if [ "$HUSKY" = "0" ]; then - debug "HUSKY env variable is set to 0, skipping hook" - exit 0 - fi - - if [ -f ~/.huskyrc ]; then - debug "sourcing ~/.huskyrc" - . ~/.huskyrc - fi - - export readonly husky_skip_init=1 - sh -e "$0" "$@" - exitCode="$?" - - if [ $exitCode != 0 ]; then - echo "husky - $hook_name hook exited with code $exitCode (error)" - fi - - exit $exitCode -fi diff --git a/.husky/pre-commit b/.husky/pre-commit index d19bb4c23..965b10947 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -./hooks/pre-commit +yarn run lint-staged \ No newline at end of file diff --git a/.husky/pre-push b/.husky/pre-push index 2bd9dcce3..caf55ba5e 100755 --- a/.husky/pre-push +++ b/.husky/pre-push @@ -1,4 +1 @@ -#!/bin/sh -. "$(dirname "$0")/_/husky.sh" - -./hooks/pre-push $1 +yarn run lint \ No newline at end of file From 9f00cb5ef62f9bdff5371e0bed9a3725404b2e2c Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 18:54:14 +0530 Subject: [PATCH 20/33] Updated Husky - v3 Signed-off-by: Adithya Krishna --- package.json | 2 +- scripts/copyrightsScript.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 039f33936..f296a3a02 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "prepare": "husky install" }, "lint-staged": { - "src/**/*.{js,jsx}": [ + "src/": [ "yarn run lint:check" ] }, diff --git a/scripts/copyrightsScript.js b/scripts/copyrightsScript.js index 047d4d56c..aaca63d9e 100644 --- a/scripts/copyrightsScript.js +++ b/scripts/copyrightsScript.js @@ -25,12 +25,12 @@ const copyrights = []; createReadStream("scripts/copyrights.csv") .pipe(csv()) .on("data", (data) => { - copyrights.push(data.copyright); + copyrights.push(data.copyright); }) .on("end", () => { const uniqueCopyrights = [...new Set(copyrights)].sort(); writeFile( - "scripts/copyrights.json", + "scripts/copyrights.json", JSON.stringify(uniqueCopyrights), (err) => { if (err) { From 0b55b63d014cd41669a5338f4c88bbb6e005d740 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 18:58:14 +0530 Subject: [PATCH 21/33] CHeck Husky - v4 Signed-off-by: Adithya Krishna --- package.json | 13 +- scripts/copyrightsScript.js | 6 +- yarn.lock | 287 ++++++++++++++++++++++++++---------- 3 files changed, 223 insertions(+), 83 deletions(-) diff --git a/package.json b/package.json index f296a3a02..34c6b54b3 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,12 @@ "prepare": "husky install" }, "lint-staged": { - "src/": [ - "yarn run lint:check" - ] + "*.js": "yarn run lint:check" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } }, "browserslist": { "production": [ @@ -82,9 +85,9 @@ "eslint-plugin-react": "^7.24.0", "eslint-plugin-react-hooks": "^1.7.0", "eslint-plugin-simple-import-sort": "^7.0.0", - "husky": "^7.0.0", + "husky": "^8.0.2", "jest-fetch-mock": "3.0.3", - "lint-staged": "^11.0.0", + "lint-staged": "^13.0.3", "prettier": "^2.6.2" }, "packageManager": "yarn@3.2.1" diff --git a/scripts/copyrightsScript.js b/scripts/copyrightsScript.js index aaca63d9e..891ddd422 100644 --- a/scripts/copyrightsScript.js +++ b/scripts/copyrightsScript.js @@ -25,17 +25,17 @@ const copyrights = []; createReadStream("scripts/copyrights.csv") .pipe(csv()) .on("data", (data) => { - copyrights.push(data.copyright); + copyrights.push(data.copyright); }) .on("end", () => { const uniqueCopyrights = [...new Set(copyrights)].sort(); writeFile( "scripts/copyrights.json", - JSON.stringify(uniqueCopyrights), + JSON.stringify(uniqueCopyrights), (err) => { if (err) { /* eslint-disable-next-line no-console */ - console.log("Unable to parse the CSV to generate copyrights array"); + console.log("Unable to parse the CSV to generate copyrights array"); } } ); diff --git a/yarn.lock b/yarn.lock index 5038beb4b..15946ab97 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5229,6 +5229,13 @@ __metadata: languageName: node linkType: hard +"ansi-regex@npm:^6.0.1": + version: 6.0.1 + resolution: "ansi-regex@npm:6.0.1" + checksum: 1ff8b7667cded1de4fa2c9ae283e979fc87036864317da86a2e546725f96406746411d0d85e87a2d12fa5abd715d90006de7fa4fa0477c92321ad3b4c7d4e169 + languageName: node + linkType: hard + "ansi-styles@npm:^3.2.0, ansi-styles@npm:^3.2.1": version: 3.2.1 resolution: "ansi-styles@npm:3.2.1" @@ -5254,6 +5261,13 @@ __metadata: languageName: node linkType: hard +"ansi-styles@npm:^6.0.0": + version: 6.2.1 + resolution: "ansi-styles@npm:6.2.1" + checksum: ef940f2f0ced1a6347398da88a91da7930c33ecac3c77b72c5905f8b8fe402c52e6fde304ff5347f616e27a742da3f1dc76de98f6866c69251ad0b07a66776d9 + languageName: node + linkType: hard + "ansi-to-html@npm:^0.6.11": version: 0.6.15 resolution: "ansi-to-html@npm:0.6.15" @@ -6890,7 +6904,7 @@ __metadata: languageName: node linkType: hard -"cli-truncate@npm:2.1.0, cli-truncate@npm:^2.1.0": +"cli-truncate@npm:^2.1.0": version: 2.1.0 resolution: "cli-truncate@npm:2.1.0" dependencies: @@ -6900,6 +6914,16 @@ __metadata: languageName: node linkType: hard +"cli-truncate@npm:^3.1.0": + version: 3.1.0 + resolution: "cli-truncate@npm:3.1.0" + dependencies: + slice-ansi: ^5.0.0 + string-width: ^5.0.0 + checksum: c3243e41974445691c63f8b405df1d5a24049dc33d324fe448dc572e561a7b772ae982692900b1a5960901cc4fc7def25a629b9c69a4208ee89d12ab3332617a + languageName: node + linkType: hard + "cliui@npm:^5.0.0": version: 5.0.0 resolution: "cliui@npm:5.0.0" @@ -7054,14 +7078,7 @@ __metadata: languageName: node linkType: hard -"colorette@npm:^1.4.0": - version: 1.4.0 - resolution: "colorette@npm:1.4.0" - checksum: 01c3c16058b182a4ab4c126a65a75faa4d38a20fa7c845090b25453acec6c371bb2c5dceb0a2338511f17902b9d1a9af0cadd8509c9403894b79311032c256c3 - languageName: node - linkType: hard - -"colorette@npm:^2.0.16": +"colorette@npm:^2.0.16, colorette@npm:^2.0.17": version: 2.0.19 resolution: "colorette@npm:2.0.19" checksum: 888cf5493f781e5fcf54ce4d49e9d7d698f96ea2b2ef67906834bb319a392c667f9ec69f4a10e268d2946d13a9503d2d19b3abaaaf174e3451bfe91fb9d82427 @@ -7105,10 +7122,10 @@ __metadata: languageName: node linkType: hard -"commander@npm:^8.2.0": - version: 8.3.0 - resolution: "commander@npm:8.3.0" - checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0 +"commander@npm:^9.3.0": + version: 9.4.1 + resolution: "commander@npm:9.4.1" + checksum: bfb18e325a5bdf772763c2213d5c7d9e77144d944124e988bcd8e5e65fb6d45d5d4e86b09155d0f2556c9a59c31e428720e57968bcd050b2306e910a0bf3cf13 languageName: node linkType: hard @@ -7366,7 +7383,7 @@ __metadata: languageName: node linkType: hard -"cosmiconfig@npm:^7.0.0, cosmiconfig@npm:^7.0.1": +"cosmiconfig@npm:^7.0.0": version: 7.0.1 resolution: "cosmiconfig@npm:7.0.1" dependencies: @@ -7939,7 +7956,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.2, debug@npm:^4.3.3": +"debug@npm:4, debug@npm:^4.0.1, debug@npm:^4.1.0, debug@npm:^4.1.1, debug@npm:^4.3.1, debug@npm:^4.3.3, debug@npm:^4.3.4": version: 4.3.4 resolution: "debug@npm:4.3.4" dependencies: @@ -8469,6 +8486,13 @@ __metadata: languageName: node linkType: hard +"eastasianwidth@npm:^0.2.0": + version: 0.2.0 + resolution: "eastasianwidth@npm:0.2.0" + checksum: 7d00d7cd8e49b9afa762a813faac332dee781932d6f2c848dc348939c4253f1d4564341b7af1d041853bc3f32c2ef141b58e0a4d9862c17a7f08f68df1e0f1ed + languageName: node + linkType: hard + "ee-first@npm:1.1.1": version: 1.1.1 resolution: "ee-first@npm:1.1.1" @@ -8604,7 +8628,7 @@ __metadata: languageName: node linkType: hard -"enquirer@npm:^2.3.5, enquirer@npm:^2.3.6": +"enquirer@npm:^2.3.5": version: 2.3.6 resolution: "enquirer@npm:2.3.6" dependencies: @@ -9416,6 +9440,23 @@ __metadata: languageName: node linkType: hard +"execa@npm:^6.1.0": + version: 6.1.0 + resolution: "execa@npm:6.1.0" + dependencies: + cross-spawn: ^7.0.3 + get-stream: ^6.0.1 + human-signals: ^3.0.1 + is-stream: ^3.0.0 + merge-stream: ^2.0.0 + npm-run-path: ^5.1.0 + onetime: ^6.0.0 + signal-exit: ^3.0.7 + strip-final-newline: ^3.0.0 + checksum: 1a4af799839134f5c72eb63d525b87304c1114a63aa71676c91d57ccef2e26f2f53e14c11384ab11c4ec479be1efa83d11c8190e00040355c2c5c3364327fa8e + languageName: node + linkType: hard + "exit@npm:^0.1.2": version: 0.1.2 resolution: "exit@npm:0.1.2" @@ -9986,11 +10027,11 @@ __metadata: eslint-plugin-react: ^7.24.0 eslint-plugin-react-hooks: ^1.7.0 eslint-plugin-simple-import-sort: ^7.0.0 - husky: ^7.0.0 + husky: ^8.0.2 jest-fetch-mock: 3.0.3 jquery: ^3.6.0 js-cookie: ^2.2.1 - lint-staged: ^11.0.0 + lint-staged: ^13.0.3 prettier: ^2.6.2 prop-types: ^15.8.1 query-string: ^7.1.1 @@ -10285,7 +10326,7 @@ __metadata: languageName: node linkType: hard -"get-stream@npm:^6.0.0": +"get-stream@npm:^6.0.0, get-stream@npm:^6.0.1": version: 6.0.1 resolution: "get-stream@npm:6.0.1" checksum: e04ecece32c92eebf5b8c940f51468cd53554dcbb0ea725b2748be583c9523d00128137966afce410b9b051eb2ef16d657cd2b120ca8edafcf5a65e81af63cad @@ -11096,6 +11137,13 @@ __metadata: languageName: node linkType: hard +"human-signals@npm:^3.0.1": + version: 3.0.1 + resolution: "human-signals@npm:3.0.1" + checksum: f252a7769c8094a5c9dc6772816bdb417b188820b04c8b42d0fc468e03a0ba905b1dd07afabe9385cc83504af1ccc2b985cd1e4aeeeb8e0029896c5af2e6f354 + languageName: node + linkType: hard + "humanize-ms@npm:^1.2.1": version: 1.2.1 resolution: "humanize-ms@npm:1.2.1" @@ -11105,12 +11153,12 @@ __metadata: languageName: node linkType: hard -"husky@npm:^7.0.0": - version: 7.0.4 - resolution: "husky@npm:7.0.4" +"husky@npm:^8.0.2": + version: 8.0.2 + resolution: "husky@npm:8.0.2" bin: husky: lib/bin.js - checksum: c6ec4af63da2c9522da8674a20ad9b48362cc92704896cc8a58c6a2a39d797feb2b806f93fbd83a6d653fbdceb2c3b6e0b602c6b2e8565206ffc2882ef7db9e9 + checksum: e101656fcb56163d610488f186448c78b132626aa427094489d886ce9374955a90274912b0f3a34af3326eaa74977883b032e5f701d7aaf4554daa5a7931be43 languageName: node linkType: hard @@ -11692,6 +11740,13 @@ __metadata: languageName: node linkType: hard +"is-fullwidth-code-point@npm:^4.0.0": + version: 4.0.0 + resolution: "is-fullwidth-code-point@npm:4.0.0" + checksum: 8ae89bf5057bdf4f57b346fb6c55e9c3dd2549983d54191d722d5c739397a903012cc41a04ee3403fd872e811243ef91a7c5196da7b5841dc6b6aae31a264a8d + languageName: node + linkType: hard + "is-function@npm:^1.0.2": version: 1.0.2 resolution: "is-function@npm:1.0.2" @@ -11935,6 +11990,13 @@ __metadata: languageName: node linkType: hard +"is-stream@npm:^3.0.0": + version: 3.0.0 + resolution: "is-stream@npm:3.0.0" + checksum: 172093fe99119ffd07611ab6d1bcccfe8bc4aa80d864b15f43e63e54b7abc71e779acd69afdb854c4e2a67fdc16ae710e370eda40088d1cfc956a50ed82d8f16 + languageName: node + linkType: hard + "is-string@npm:^1.0.5, is-string@npm:^1.0.7": version: 1.0.7 resolution: "is-string@npm:1.0.7" @@ -13140,6 +13202,13 @@ __metadata: languageName: node linkType: hard +"lilconfig@npm:2.0.5": + version: 2.0.5 + resolution: "lilconfig@npm:2.0.5" + checksum: f7bb9e42656f06930ad04e583026f087508ae408d3526b8b54895e934eb2a966b7aafae569656f2c79a29fe6d779b3ec44ba577e80814734c8655d6f71cdf2d1 + languageName: node + linkType: hard + "lines-and-columns@npm:^1.1.6": version: 1.2.4 resolution: "lines-and-columns@npm:1.2.4" @@ -13147,40 +13216,39 @@ __metadata: languageName: node linkType: hard -"lint-staged@npm:^11.0.0": - version: 11.2.6 - resolution: "lint-staged@npm:11.2.6" +"lint-staged@npm:^13.0.3": + version: 13.0.3 + resolution: "lint-staged@npm:13.0.3" dependencies: - cli-truncate: 2.1.0 - colorette: ^1.4.0 - commander: ^8.2.0 - cosmiconfig: ^7.0.1 - debug: ^4.3.2 - enquirer: ^2.3.6 - execa: ^5.1.1 - listr2: ^3.12.2 - micromatch: ^4.0.4 + cli-truncate: ^3.1.0 + colorette: ^2.0.17 + commander: ^9.3.0 + debug: ^4.3.4 + execa: ^6.1.0 + lilconfig: 2.0.5 + listr2: ^4.0.5 + micromatch: ^4.0.5 normalize-path: ^3.0.0 - please-upgrade-node: ^3.2.0 - string-argv: 0.3.1 - stringify-object: 3.3.0 - supports-color: 8.1.1 + object-inspect: ^1.12.2 + pidtree: ^0.6.0 + string-argv: ^0.3.1 + yaml: ^2.1.1 bin: lint-staged: bin/lint-staged.js - checksum: b9071621db351c553579bd18df3d80fb753f851c4f1f72db0aaf12e713eab25b6d8a044dab2957817de7da02054a63f7725a49c763aee09295133f0d554f4d3f + checksum: 53d585007df06e162febab6b0836b55016d902586a267823c8a1158529d8c742dc7297e523f7023dff02250bef3eb0d6934f4ec4f9961adfc2ebbed5f54162d0 languageName: node linkType: hard -"listr2@npm:^3.12.2": - version: 3.14.0 - resolution: "listr2@npm:3.14.0" +"listr2@npm:^4.0.5": + version: 4.0.5 + resolution: "listr2@npm:4.0.5" dependencies: cli-truncate: ^2.1.0 colorette: ^2.0.16 log-update: ^4.0.0 p-map: ^4.0.0 rfdc: ^1.3.0 - rxjs: ^7.5.1 + rxjs: ^7.5.5 through: ^2.3.8 wrap-ansi: ^7.0.0 peerDependencies: @@ -13188,7 +13256,7 @@ __metadata: peerDependenciesMeta: enquirer: optional: true - checksum: fdb8b2d6bdf5df9371ebd5082bee46c6d0ca3d1e5f2b11fbb5a127839855d5f3da9d4968fce94f0a5ec67cac2459766abbb1faeef621065ebb1829b11ef9476d + checksum: 7af31851abe25969ef0581c6db808117e36af15b131401795182427769d9824f451ba9e8aff6ccd25b6a4f6c8796f816292caf08e5f1f9b1775e8e9c313dc6c5 languageName: node linkType: hard @@ -13787,7 +13855,7 @@ __metadata: languageName: node linkType: hard -"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4": +"micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5": version: 4.0.5 resolution: "micromatch@npm:4.0.5" dependencies: @@ -13850,6 +13918,13 @@ __metadata: languageName: node linkType: hard +"mimic-fn@npm:^4.0.0": + version: 4.0.0 + resolution: "mimic-fn@npm:4.0.0" + checksum: 995dcece15ee29aa16e188de6633d43a3db4611bcf93620e7e62109ec41c79c0f34277165b8ce5e361205049766e371851264c21ac64ca35499acb5421c2ba56 + languageName: node + linkType: hard + "min-document@npm:^2.19.0": version: 2.19.0 resolution: "min-document@npm:2.19.0" @@ -14424,6 +14499,15 @@ __metadata: languageName: node linkType: hard +"npm-run-path@npm:^5.1.0": + version: 5.1.0 + resolution: "npm-run-path@npm:5.1.0" + dependencies: + path-key: ^4.0.0 + checksum: dc184eb5ec239d6a2b990b43236845332ef12f4e0beaa9701de724aa797fe40b6bbd0157fb7639d24d3ab13f5d5cf22d223a19c6300846b8126f335f788bee66 + languageName: node + linkType: hard + "npmlog@npm:^5.0.1": version: 5.0.1 resolution: "npmlog@npm:5.0.1" @@ -14498,7 +14582,7 @@ __metadata: languageName: node linkType: hard -"object-inspect@npm:^1.12.0, object-inspect@npm:^1.9.0": +"object-inspect@npm:^1.12.0, object-inspect@npm:^1.12.2, object-inspect@npm:^1.9.0": version: 1.12.2 resolution: "object-inspect@npm:1.12.2" checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2 @@ -14655,6 +14739,15 @@ __metadata: languageName: node linkType: hard +"onetime@npm:^6.0.0": + version: 6.0.0 + resolution: "onetime@npm:6.0.0" + dependencies: + mimic-fn: ^4.0.0 + checksum: 0846ce78e440841335d4e9182ef69d5762e9f38aa7499b19f42ea1c4cd40f0b4446094c455c713f9adac3f4ae86f613bb5e30c99e52652764d06a89f709b3788 + languageName: node + linkType: hard + "open@npm:^7.0.2, open@npm:^7.0.3": version: 7.4.2 resolution: "open@npm:7.4.2" @@ -15091,6 +15184,13 @@ __metadata: languageName: node linkType: hard +"path-key@npm:^4.0.0": + version: 4.0.0 + resolution: "path-key@npm:4.0.0" + checksum: 8e6c314ae6d16b83e93032c61020129f6f4484590a777eed709c4a01b50e498822b00f76ceaf94bc64dbd90b327df56ceadce27da3d83393790f1219e07721d7 + languageName: node + linkType: hard + "path-parse@npm:^1.0.6, path-parse@npm:^1.0.7": version: 1.0.7 resolution: "path-parse@npm:1.0.7" @@ -15182,6 +15282,15 @@ __metadata: languageName: node linkType: hard +"pidtree@npm:^0.6.0": + version: 0.6.0 + resolution: "pidtree@npm:0.6.0" + bin: + pidtree: bin/pidtree.js + checksum: 8fbc073ede9209dd15e80d616e65eb674986c93be49f42d9ddde8dbbd141bb53d628a7ca4e58ab5c370bb00383f67d75df59a9a226dede8fa801267a7030c27a + languageName: node + linkType: hard + "pify@npm:^2.0.0": version: 2.3.0 resolution: "pify@npm:2.3.0" @@ -15262,15 +15371,6 @@ __metadata: languageName: node linkType: hard -"please-upgrade-node@npm:^3.2.0": - version: 3.2.0 - resolution: "please-upgrade-node@npm:3.2.0" - dependencies: - semver-compare: ^1.0.0 - checksum: d87c41581a2a022fbe25965a97006238cd9b8cbbf49b39f78d262548149a9d30bd2bdf35fec3d810e0001e630cd46ef13c7e19c389dea8de7e64db271a2381bb - languageName: node - linkType: hard - "pnp-webpack-plugin@npm:1.6.4": version: 1.6.4 resolution: "pnp-webpack-plugin@npm:1.6.4" @@ -17826,7 +17926,7 @@ __metadata: languageName: node linkType: hard -"rxjs@npm:^7.5.1": +"rxjs@npm:^7.5.5": version: 7.5.7 resolution: "rxjs@npm:7.5.7" dependencies: @@ -18009,13 +18109,6 @@ __metadata: languageName: node linkType: hard -"semver-compare@npm:^1.0.0": - version: 1.0.0 - resolution: "semver-compare@npm:1.0.0" - checksum: dd1d7e2909744cf2cf71864ac718efc990297f9de2913b68e41a214319e70174b1d1793ac16e31183b128c2b9812541300cb324db8168e6cf6b570703b171c68 - languageName: node - linkType: hard - "semver@npm:2 || 3 || 4 || 5, semver@npm:^5.4.1, semver@npm:^5.5.0, semver@npm:^5.6.0": version: 5.7.1 resolution: "semver@npm:5.7.1" @@ -18335,6 +18428,16 @@ __metadata: languageName: node linkType: hard +"slice-ansi@npm:^5.0.0": + version: 5.0.0 + resolution: "slice-ansi@npm:5.0.0" + dependencies: + ansi-styles: ^6.0.0 + is-fullwidth-code-point: ^4.0.0 + checksum: 7e600a2a55e333a21ef5214b987c8358fe28bfb03c2867ff2cbf919d62143d1812ac27b4297a077fdaf27a03da3678e49551c93e35f9498a3d90221908a1180e + languageName: node + linkType: hard + "smart-buffer@npm:^4.2.0": version: 4.2.0 resolution: "smart-buffer@npm:4.2.0" @@ -18747,7 +18850,7 @@ __metadata: languageName: node linkType: hard -"string-argv@npm:0.3.1": +"string-argv@npm:^0.3.1": version: 0.3.1 resolution: "string-argv@npm:0.3.1" checksum: efbd0289b599bee808ce80820dfe49c9635610715429c6b7cc50750f0437e3c2f697c81e5c390208c13b5d5d12d904a1546172a88579f6ee5cbaaaa4dc9ec5cf @@ -18793,6 +18896,17 @@ __metadata: languageName: node linkType: hard +"string-width@npm:^5.0.0": + version: 5.1.2 + resolution: "string-width@npm:5.1.2" + dependencies: + eastasianwidth: ^0.2.0 + emoji-regex: ^9.2.2 + strip-ansi: ^7.0.1 + checksum: 7369deaa29f21dda9a438686154b62c2c5f661f8dda60449088f9f980196f7908fc39fdd1803e3e01541970287cf5deae336798337e9319a7055af89dafa7193 + languageName: node + linkType: hard + "string.prototype.matchall@npm:^4.0.0 || ^3.0.1, string.prototype.matchall@npm:^4.0.7": version: 4.0.7 resolution: "string.prototype.matchall@npm:4.0.7" @@ -18871,7 +18985,7 @@ __metadata: languageName: node linkType: hard -"stringify-object@npm:3.3.0, stringify-object@npm:^3.3.0": +"stringify-object@npm:^3.3.0": version: 3.3.0 resolution: "stringify-object@npm:3.3.0" dependencies: @@ -18918,6 +19032,15 @@ __metadata: languageName: node linkType: hard +"strip-ansi@npm:^7.0.1": + version: 7.0.1 + resolution: "strip-ansi@npm:7.0.1" + dependencies: + ansi-regex: ^6.0.1 + checksum: 257f78fa433520e7f9897722731d78599cb3fce29ff26a20a5e12ba4957463b50a01136f37c43707f4951817a75e90820174853d6ccc240997adc5df8f966039 + languageName: node + linkType: hard + "strip-bom@npm:^2.0.0": version: 2.0.0 resolution: "strip-bom@npm:2.0.0" @@ -18965,6 +19088,13 @@ __metadata: languageName: node linkType: hard +"strip-final-newline@npm:^3.0.0": + version: 3.0.0 + resolution: "strip-final-newline@npm:3.0.0" + checksum: 23ee263adfa2070cd0f23d1ac14e2ed2f000c9b44229aec9c799f1367ec001478469560abefd00c5c99ee6f0b31c137d53ec6029c53e9f32a93804e18c201050 + languageName: node + linkType: hard + "strip-indent@npm:^1.0.1": version: 1.0.1 resolution: "strip-indent@npm:1.0.1" @@ -19046,15 +19176,6 @@ __metadata: languageName: node linkType: hard -"supports-color@npm:8.1.1, supports-color@npm:^8.0.0": - version: 8.1.1 - resolution: "supports-color@npm:8.1.1" - dependencies: - has-flag: ^4.0.0 - checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406 - languageName: node - linkType: hard - "supports-color@npm:^5.3.0, supports-color@npm:^5.5.0": version: 5.5.0 resolution: "supports-color@npm:5.5.0" @@ -19082,6 +19203,15 @@ __metadata: languageName: node linkType: hard +"supports-color@npm:^8.0.0": + version: 8.1.1 + resolution: "supports-color@npm:8.1.1" + dependencies: + has-flag: ^4.0.0 + checksum: c052193a7e43c6cdc741eb7f378df605636e01ad434badf7324f17fb60c69a880d8d8fcdcb562cf94c2350e57b937d7425ab5b8326c67c2adc48f7c87c1db406 + languageName: node + linkType: hard + "supports-hyperlinks@npm:^2.0.0": version: 2.2.0 resolution: "supports-hyperlinks@npm:2.2.0" @@ -21142,6 +21272,13 @@ __metadata: languageName: node linkType: hard +"yaml@npm:^2.1.1": + version: 2.1.3 + resolution: "yaml@npm:2.1.3" + checksum: 91316062324a93f9cb547469092392e7d004ff8f70c40fecb420f042a4870b2181557350da56c92f07bd44b8f7a252b0be26e6ade1f548e1f4351bdd01c9d3c7 + languageName: node + linkType: hard + "yargs-parser@npm:^13.1.2": version: 13.1.2 resolution: "yargs-parser@npm:13.1.2" From 2491cc92c2117bf3191ef4782995300a7e1b9386 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 19:00:33 +0530 Subject: [PATCH 22/33] CHeck Husky - v5 Signed-off-by: Adithya Krishna --- .husky/pre-commit | 1 - .husky/pre-push | 1 - package.json | 5 +++-- scripts/copyrightsScript.js | 4 ++-- src/components/BrowseUploadsHeader/index.jsx | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) delete mode 100755 .husky/pre-commit delete mode 100755 .husky/pre-push diff --git a/.husky/pre-commit b/.husky/pre-commit deleted file mode 100755 index 965b10947..000000000 --- a/.husky/pre-commit +++ /dev/null @@ -1 +0,0 @@ -yarn run lint-staged \ No newline at end of file diff --git a/.husky/pre-push b/.husky/pre-push deleted file mode 100755 index caf55ba5e..000000000 --- a/.husky/pre-push +++ /dev/null @@ -1 +0,0 @@ -yarn run lint \ No newline at end of file diff --git a/package.json b/package.json index 34c6b54b3..4ea9de33d 100644 --- a/package.json +++ b/package.json @@ -43,11 +43,12 @@ "prepare": "husky install" }, "lint-staged": { - "*.js": "yarn run lint:check" + "*.{js,jsx}*": "yarn run lint:check" }, "husky": { "hooks": { - "pre-commit": "lint-staged" + "pre-commit": "lint-staged", + "pre-push": "yarn run lint" } }, "browserslist": { diff --git a/scripts/copyrightsScript.js b/scripts/copyrightsScript.js index 891ddd422..5b416fdf9 100644 --- a/scripts/copyrightsScript.js +++ b/scripts/copyrightsScript.js @@ -18,7 +18,7 @@ // eslint-disable-next-line import/no-extraneous-dependencies import csv from "csv-parser"; -import { createReadStream, writeFile } from "fs"; + import { createReadStream, writeFile } from "fs"; const copyrights = []; @@ -29,7 +29,7 @@ createReadStream("scripts/copyrights.csv") }) .on("end", () => { const uniqueCopyrights = [...new Set(copyrights)].sort(); - writeFile( + writeFile( "scripts/copyrights.json", JSON.stringify(uniqueCopyrights), (err) => { diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx index b44b3d8b1..256eccfc4 100644 --- a/src/components/BrowseUploadsHeader/index.jsx +++ b/src/components/BrowseUploadsHeader/index.jsx @@ -18,7 +18,7 @@ // React Imports // Routes for all the pages -import routes from "constants/routes"; +import routes from "constants/routes"; import React from "react"; // React Bootstrap Imports import { Navbar } from "react-bootstrap"; @@ -30,7 +30,7 @@ const Header = () => { const location = useLocation(); return ( <> - +
From 3c233d8fc850c84f8208ac15f2089cbab13fd82c Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 19:01:07 +0530 Subject: [PATCH 23/33] CHeck Husky - v6 Signed-off-by: Adithya Krishna --- src/components/BrowseUploadsHeader/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx index 256eccfc4..43969c0f6 100644 --- a/src/components/BrowseUploadsHeader/index.jsx +++ b/src/components/BrowseUploadsHeader/index.jsx @@ -30,7 +30,7 @@ const Header = () => { const location = useLocation(); return ( <> - +
From 48baa0eb4b0808d17b91af64f8594cba377becb7 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 19:02:21 +0530 Subject: [PATCH 24/33] Updated Husky Signed-off-by: Adithya Krishna --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 4ea9de33d..63ba19c30 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,8 @@ "prepare": "husky install" }, "lint-staged": { - "*.{js,jsx}*": "yarn run lint:check" + "*.js": "yarn run lint:check", + "*.jsx": "yarn run lint:check" }, "husky": { "hooks": { From d4289b87e8dde6996d85c0d361f3af0e765e84d8 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 19:02:31 +0530 Subject: [PATCH 25/33] Check Husky - v6 Signed-off-by: Adithya Krishna --- src/components/BrowseUploadsHeader/index.jsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx index 43969c0f6..d35a1fe4c 100644 --- a/src/components/BrowseUploadsHeader/index.jsx +++ b/src/components/BrowseUploadsHeader/index.jsx @@ -30,7 +30,7 @@ const Header = () => { const location = useLocation(); return ( <> - +
@@ -45,9 +45,9 @@ const Header = () => { : "browse-uploads-nav-item" } > - Software Heritage + Software Heritage - Date: Thu, 10 Nov 2022 19:03:00 +0530 Subject: [PATCH 26/33] Check Husky - v67 Signed-off-by: Adithya Krishna --- package.json | 3 +-- src/components/BrowseUploadsHeader/index.jsx | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 63ba19c30..039198b73 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,7 @@ }, "husky": { "hooks": { - "pre-commit": "lint-staged", - "pre-push": "yarn run lint" + "pre-commit": "lint-staged" } }, "browserslist": { diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx index d35a1fe4c..a143945e5 100644 --- a/src/components/BrowseUploadsHeader/index.jsx +++ b/src/components/BrowseUploadsHeader/index.jsx @@ -47,7 +47,7 @@ const Header = () => { > Software Heritage - Date: Thu, 10 Nov 2022 19:04:49 +0530 Subject: [PATCH 27/33] Check Husky - v8 Signed-off-by: Adithya Krishna --- src/components/BrowseUploadsHeader/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx index a143945e5..4d318863f 100644 --- a/src/components/BrowseUploadsHeader/index.jsx +++ b/src/components/BrowseUploadsHeader/index.jsx @@ -25,7 +25,7 @@ import { Navbar } from "react-bootstrap"; import { Link, useLocation } from "react-router-dom"; // Helper Functions import { isAuth } from "shared/authHelper"; - + const Header = () => { const location = useLocation(); return ( From 7c1f91b629df47a26936d962d085e753e3fa97e2 Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 19:05:32 +0530 Subject: [PATCH 28/33] Finalize Husky Signed-off-by: Adithya Krishna --- package.json | 5 ----- src/components/BrowseUploadsHeader/index.jsx | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 039198b73..a646b8947 100644 --- a/package.json +++ b/package.json @@ -46,11 +46,6 @@ "*.js": "yarn run lint:check", "*.jsx": "yarn run lint:check" }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - }, "browserslist": { "production": [ ">0.2%", diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx index 4d318863f..b44b3d8b1 100644 --- a/src/components/BrowseUploadsHeader/index.jsx +++ b/src/components/BrowseUploadsHeader/index.jsx @@ -18,19 +18,19 @@ // React Imports // Routes for all the pages -import routes from "constants/routes"; +import routes from "constants/routes"; import React from "react"; // React Bootstrap Imports import { Navbar } from "react-bootstrap"; import { Link, useLocation } from "react-router-dom"; // Helper Functions import { isAuth } from "shared/authHelper"; - + const Header = () => { const location = useLocation(); return ( <> - +
@@ -45,9 +45,9 @@ const Header = () => { : "browse-uploads-nav-item" } > - Software Heritage + Software Heritage - Date: Thu, 10 Nov 2022 19:08:19 +0530 Subject: [PATCH 29/33] Finalize Husky with Hooks Signed-off-by: Adithya Krishna --- .husky/pre-commit | 1 + .husky/pre-push | 1 + src/components/BrowseUploadsHeader/index.jsx | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 .husky/pre-commit create mode 100644 .husky/pre-push diff --git a/.husky/pre-commit b/.husky/pre-commit new file mode 100644 index 000000000..965b10947 --- /dev/null +++ b/.husky/pre-commit @@ -0,0 +1 @@ +yarn run lint-staged \ No newline at end of file diff --git a/.husky/pre-push b/.husky/pre-push new file mode 100644 index 000000000..caf55ba5e --- /dev/null +++ b/.husky/pre-push @@ -0,0 +1 @@ +yarn run lint \ No newline at end of file diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx index b44b3d8b1..37f913633 100644 --- a/src/components/BrowseUploadsHeader/index.jsx +++ b/src/components/BrowseUploadsHeader/index.jsx @@ -27,7 +27,7 @@ import { Link, useLocation } from "react-router-dom"; import { isAuth } from "shared/authHelper"; const Header = () => { - const location = useLocation(); + const location = useLocation(); return ( <> From b936923bc529df50265d1c4c7201ef7824115a9d Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 19:09:02 +0530 Subject: [PATCH 30/33] Finalize Husky with Hooks - Test Signed-off-by: Adithya Krishna --- src/components/BrowseUploadsHeader/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx index 37f913633..ce3146a4f 100644 --- a/src/components/BrowseUploadsHeader/index.jsx +++ b/src/components/BrowseUploadsHeader/index.jsx @@ -25,7 +25,7 @@ import { Navbar } from "react-bootstrap"; import { Link, useLocation } from "react-router-dom"; // Helper Functions import { isAuth } from "shared/authHelper"; - + const Header = () => { const location = useLocation(); return ( From d85064237c0ad53b55f37001fa8465f984ba281c Mon Sep 17 00:00:00 2001 From: Adithya Krishna Date: Thu, 10 Nov 2022 19:09:50 +0530 Subject: [PATCH 31/33] Finalize Husky with Hooks - Test Signed-off-by: Adithya Krishna --- .husky/pre-push | 1 - package.json | 4 ++-- src/components/BrowseUploadsHeader/index.jsx | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 .husky/pre-push diff --git a/.husky/pre-push b/.husky/pre-push deleted file mode 100644 index caf55ba5e..000000000 --- a/.husky/pre-push +++ /dev/null @@ -1 +0,0 @@ -yarn run lint \ No newline at end of file diff --git a/package.json b/package.json index a646b8947..b1fec6a57 100644 --- a/package.json +++ b/package.json @@ -43,8 +43,8 @@ "prepare": "husky install" }, "lint-staged": { - "*.js": "yarn run lint:check", - "*.jsx": "yarn run lint:check" + "*.js": "yarn run lint", + "*.jsx": "yarn run lint" }, "browserslist": { "production": [ diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx index ce3146a4f..29b786395 100644 --- a/src/components/BrowseUploadsHeader/index.jsx +++ b/src/components/BrowseUploadsHeader/index.jsx @@ -25,11 +25,11 @@ import { Navbar } from "react-bootstrap"; import { Link, useLocation } from "react-router-dom"; // Helper Functions import { isAuth } from "shared/authHelper"; - + const Header = () => { const location = useLocation(); return ( - <> + <> @@ -37,7 +37,7 @@ const Header = () => { {/* Checking whether the user is authenticated */} {isAuth() && ( <> - Date: Thu, 10 Nov 2022 19:12:05 +0530 Subject: [PATCH 32/33] Finalize Husky with Hook Signed-off-by: Adithya Krishna --- scripts/copyrightsScript.js | 10 +++++----- src/components/BrowseUploadsHeader/index.jsx | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/copyrightsScript.js b/scripts/copyrightsScript.js index 5b416fdf9..aaca63d9e 100644 --- a/scripts/copyrightsScript.js +++ b/scripts/copyrightsScript.js @@ -18,24 +18,24 @@ // eslint-disable-next-line import/no-extraneous-dependencies import csv from "csv-parser"; - import { createReadStream, writeFile } from "fs"; +import { createReadStream, writeFile } from "fs"; const copyrights = []; createReadStream("scripts/copyrights.csv") .pipe(csv()) .on("data", (data) => { - copyrights.push(data.copyright); + copyrights.push(data.copyright); }) .on("end", () => { const uniqueCopyrights = [...new Set(copyrights)].sort(); - writeFile( + writeFile( "scripts/copyrights.json", - JSON.stringify(uniqueCopyrights), + JSON.stringify(uniqueCopyrights), (err) => { if (err) { /* eslint-disable-next-line no-console */ - console.log("Unable to parse the CSV to generate copyrights array"); + console.log("Unable to parse the CSV to generate copyrights array"); } } ); diff --git a/src/components/BrowseUploadsHeader/index.jsx b/src/components/BrowseUploadsHeader/index.jsx index 29b786395..72e6c40b8 100644 --- a/src/components/BrowseUploadsHeader/index.jsx +++ b/src/components/BrowseUploadsHeader/index.jsx @@ -16,9 +16,9 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -// React Imports // Routes for all the pages import routes from "constants/routes"; +// React Imports import React from "react"; // React Bootstrap Imports import { Navbar } from "react-bootstrap"; @@ -27,9 +27,9 @@ import { Link, useLocation } from "react-router-dom"; import { isAuth } from "shared/authHelper"; const Header = () => { - const location = useLocation(); + const location = useLocation(); return ( - <> + <> @@ -37,7 +37,7 @@ const Header = () => { {/* Checking whether the user is authenticated */} {isAuth() && ( <> - Date: Thu, 10 Nov 2022 19:14:24 +0530 Subject: [PATCH 33/33] Updated Husky Install Script Signed-off-by: Adithya Krishna --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b1fec6a57..4ac9ea5b5 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "storybook": "start-storybook -p 6006 -s public", "build-storybook": "build-storybook -s public", "gencopy": "node scripts/copyrightsScript.js && prettier --write ./scripts/copyrights.js", - "prepare": "husky install" + "postinstall": "husky install" }, "lint-staged": { "*.js": "yarn run lint",