diff options
1599 files changed, 3698 insertions, 10238 deletions
diff --git a/server/sonar-ui-common/.eslintrc b/server/sonar-ui-common/.eslintrc deleted file mode 100644 index f3c47f9df45..00000000000 --- a/server/sonar-ui-common/.eslintrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "sonarqube" -} diff --git a/server/sonar-ui-common/build.gradle b/server/sonar-ui-common/build.gradle deleted file mode 100644 index ab94ef9534c..00000000000 --- a/server/sonar-ui-common/build.gradle +++ /dev/null @@ -1,65 +0,0 @@ -description = 'SonarSource :: Sonar UI Common' - -sonarqube { - properties { - property "sonar.sources", "components,helpers" - property "sonar.exclusions", "**/__tests__/**" - property "sonar.test", "components,helpers" - property "sonar.test.inclusions", "**/__tests__/**" - property "sonar.eslint.reportPaths", "eslint-report.json" - property "sonar.coverage.exclusions", "components/icons/*,helpers/testUtils.ts,helpers/keycodes.ts" - property "sonar.javascript.lcov.reportPaths", "build/coverage/lcov.info" - property "sonar.eslint.reportPaths", "build/eslint-report.json" - } -} - -yarn_run { - ['config', 'scripts', 'components', 'helpers'].each { - inputs.dir(it).withPathSensitivity(PathSensitivity.RELATIVE) - } - ['package.json', 'tsconfig.json', 'yarn.lock'].each { - inputs.file(it).withPathSensitivity(PathSensitivity.RELATIVE) - } - outputs.cacheIf { true } - args = ['build'] - ignoreExitValue = false -} - -"yarn_check-ci" { - // Note that outputs are not relocatable, because contain absolute paths, and that's why inputs are not relativized - ['config', 'scripts', 'components', 'helpers'].each { - inputs.dir(it) - } - ['package.json', 'yarn.lock', 'tsconfig.json'].each { - inputs.file(it) - } - - dependsOn(yarn) -} - -"yarn_validate-ci" { - // Note that outputs are not relocatable, because contain absolute paths, and that's why inputs are not relativized - ['config', 'scripts', 'components', 'helpers'].each { - inputs.dir(it) - } - ['.eslintrc', 'package.json', 'yarn.lock', 'tsconfig.json'].each { - inputs.file(it) - } - outputs.file("build/eslint-report.json") - outputs.dir("build/coverage") - outputs.cacheIf { true } - - dependsOn(yarn) -} - -def sources = fileTree(dir: "components") + fileTree(dir: "config") + fileTree(dir: "helpers") - -task licenseCheckWeb(type: com.hierynomus.gradle.license.tasks.LicenseCheck) { - source = sources -} -licenseMain.dependsOn licenseCheckWeb - -task licenseFormatWeb(type: com.hierynomus.gradle.license.tasks.LicenseFormat) { - source = sources -} -licenseFormat.dependsOn licenseFormatWeb
\ No newline at end of file diff --git a/server/sonar-ui-common/package.json b/server/sonar-ui-common/package.json deleted file mode 100644 index ac8c5bf6843..00000000000 --- a/server/sonar-ui-common/package.json +++ /dev/null @@ -1,154 +0,0 @@ -{ - "name": "sonar-ui-common", - "version": "1.0.33", - "description": "Common UI lib for SonarQube and SonarCloud", - "repository": "SonarSource/sonar-ui-common", - "license": "LGPL-3.0", - "types": "types.d.ts", - "dependencies": { - "@types/react-select": "1.2.6", - "classnames": "2.2.6", - "clipboard": "2.0.6", - "d3-array": "2.4.0", - "d3-hierarchy": "1.1.9", - "d3-scale": "3.2.1", - "d3-selection": "1.4.1", - "d3-shape": "1.3.7", - "d3-zoom": "1.8.3", - "date-fns": "1.30.1", - "formik": "1.2.0", - "history": "3.3.0", - "prop-types": "15.7.2", - "react-draggable": "4.2.0", - "react-intl": "2.8.0", - "react-modal": "3.8.2", - "react-router": "3.2.1", - "react-select": "1.2.1", - "react-virtualized": "9.21.0" - }, - "peerDependencies": { - "@emotion/core": "^10.0.17", - "@emotion/styled": "^10.0.17", - "emotion-theming": "^10.0.19", - "lodash": "^4.17.21", - "react": "^16.8.6", - "react-dom": "^16.8.6" - }, - "devDependencies": { - "@emotion/core": "10.0.17", - "@emotion/styled": "10.0.17", - "@types/classnames": "2.2.8", - "@types/clipboard": "2.0.1", - "@types/d3-array": "1.2.4", - "@types/d3-hierarchy": "1.1.4", - "@types/d3-scale": "2.0.2", - "@types/d3-selection": "1.3.2", - "@types/d3-shape": "1.2.4", - "@types/d3-zoom": "1.7.3", - "@types/enzyme": "3.10.5", - "@types/jest": "25.2.1", - "@types/lodash": "4.14.159", - "@types/react": "16.8.23", - "@types/react-dom": "16.8.4", - "@types/react-intl": "2.3.17", - "@types/react-modal": "3.8.2", - "@types/react-router": "3.0.20", - "@types/react-virtualized": "9.21.0", - "@typescript-eslint/parser": "2.29.0", - "cpy-cli": "2.0.0", - "date-fns": "1.30.1", - "diff": "4.0.1", - "emotion-theming": "10.0.19", - "enzyme": "3.11.0", - "enzyme-adapter-react-16": "1.15.2", - "enzyme-to-json": "3.4.4", - "eslint": "6.8.0", - "eslint-config-sonarqube": "0.6.1", - "eslint-plugin-import": "2.20.1", - "eslint-plugin-jest": "23.8.2", - "eslint-plugin-jsx-a11y": "6.2.3", - "eslint-plugin-promise": "4.2.1", - "eslint-plugin-react": "7.19.0", - "eslint-plugin-react-hooks": "2.5.1", - "eslint-plugin-sonarjs": "0.5.0", - "globby": "10.0.1", - "jest": "25.4.0", - "jest-emotion": "10.0.32", - "lodash": "4.17.21", - "prettier": "2.0.4", - "react": "16.8.6", - "react-dom": "16.8.6", - "react-router": "3.2.1", - "react-test-renderer": "16.8.6", - "ts-jest": "25.4.0", - "typescript": "3.8.3", - "whatwg-fetch": "3.0.0" - }, - "scripts": { - "clean": "rm -rf build/dist", - "build": "sh scripts/build.sh", - "package": "yarn build && cd build/dist && yarn pack", - "test": "jest", - "format": "prettier --write --list-different \"{,!(build|node_modules)/**/}*.{ts,tsx,css}\"", - "format-check": "prettier --list-different \"{,!(build|node_modules)/**/}*.{ts,tsx,css}\"", - "lint": "eslint --ext ts,tsx --quiet \"{,!(build|node_modules)/**/}*.{ts,tsx}\"", - "lint-report": "eslint --ext ts,tsx -f json -o build/eslint-report.json \"{,!(build|node_modules)/**/}*.{ts,tsx}\"", - "ts-check": "tsc --noEmit", - "validate": "yarn ts-check && yarn lint && yarn format-check && yarn test", - "validate-ci": "yarn lint-report && yarn test --coverage", - "check-ci": "yarn ts-check && yarn format-check" - }, - "engines": { - "node": ">=10.15.3", - "yarn": ">=1.15.2" - }, - "jest": { - "coverageDirectory": "<rootDir>/build/coverage", - "collectCoverageFrom": [ - "{components,helpers}/**/*.{ts,tsx,js}", - "!helpers/{keycodes,testUtils}.{ts,tsx}" - ], - "coverageReporters": [ - "lcovonly", - "text" - ], - "globals": { - "ts-jest": { - "diagnostics": false - } - }, - "moduleFileExtensions": [ - "ts", - "tsx", - "js" - ], - "moduleNameMapper": { - "^.+\\.(md|jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/config/jest/FileStub.js", - "^.+\\.css$": "<rootDir>/config/jest/CSSStub.js" - }, - "setupFiles": [ - "<rootDir>/config/jest/SetupTestEnvironment.js", - "<rootDir>/config/jest/SetupEnzyme.js", - "<rootDir>/config/jest/SetupSUC.ts" - ], - "snapshotSerializers": [ - "enzyme-to-json/serializer", - "jest-emotion" - ], - "testPathIgnorePatterns": [ - "<rootDir>/build", - "<rootDir>/config", - "<rootDir>/node_modules", - "<rootDir>/scripts" - ], - "testRegex": "(/__tests__/.*|\\-test)\\.(ts|tsx)$", - "transform": { - "\\.(ts|tsx)$": "ts-jest" - } - }, - "prettier": { - "jsxBracketSameLine": true, - "printWidth": 100, - "singleQuote": true - } -} diff --git a/server/sonar-ui-common/scripts/build.sh b/server/sonar-ui-common/scripts/build.sh deleted file mode 100755 index acc1c39dbcc..00000000000 --- a/server/sonar-ui-common/scripts/build.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash - -yarn clean -yarn tsc -cp package.json README.md types.d.ts build/dist -yarn cpy 'components/**/*.css' 'build/dist' --parents diff --git a/server/sonar-ui-common/tsconfig.json b/server/sonar-ui-common/tsconfig.json deleted file mode 100644 index 5d6424e5b26..00000000000 --- a/server/sonar-ui-common/tsconfig.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "compilerOptions": { - "allowJs": false, - "checkJs": false, - "noUnusedLocals": true, - "noUnusedParameters": true, - "strict": true, - "strictFunctionTypes": false, - "module": "commonjs", - "target": "es5", - "lib": ["es2018", "dom"], - "outDir": "build/dist", - "jsx": "react", - "moduleResolution": "node", - "removeComments": true, - "sourceMap": true, - "declaration": true, - "rootDir": "./", - "baseUrl": "." - }, - "include": ["components", "helpers", "types.d.ts"] -} diff --git a/server/sonar-ui-common/types.d.ts b/server/sonar-ui-common/types.d.ts deleted file mode 100644 index 8ed1448ef45..00000000000 --- a/server/sonar-ui-common/types.d.ts +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Sonar UI Common - * Copyright (C) 2019-2020 SonarSource SA - * mailto:info AT sonarsource DOT com - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 3 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -declare namespace T { - export type Dict<T> = { [key: string]: T }; - export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>; - - // Type ordered alphabetically to prevent merge conflicts - - export type IssueType = 'BUG' | 'VULNERABILITY' | 'CODE_SMELL' | 'SECURITY_HOTSPOT'; - - export type RawQuery = T.Dict<any>; - - export namespace Chart { - export interface Point { - x: Date; - y: number | string | undefined; - } - - export interface Serie { - data: Point[]; - name: string; - translatedName: string; - type: string; - } - } -} diff --git a/server/sonar-ui-common/yarn.lock b/server/sonar-ui-common/yarn.lock deleted file mode 100644 index f209156493a..00000000000 --- a/server/sonar-ui-common/yarn.lock +++ /dev/null @@ -1,6545 +0,0 @@ -# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. -# yarn lockfile v1 - - -"@babel/code-frame@^7.0.0": - version "7.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8" - integrity sha1-BuKrGb21NThVWaq7W6WXKUgoAPg= - dependencies: - "@babel/highlight" "^7.0.0" - -"@babel/code-frame@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" - integrity sha1-M+JZA9dIEYFTThLsCiXxa2/PQZ4= - dependencies: - "@babel/highlight" "^7.8.3" - -"@babel/core@^7.1.0": - version "7.5.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/core/-/core-7.5.4.tgz#4c32df7ad5a58e9ea27ad025c11276324e0b4ddd" - integrity sha1-TDLfetWljp6ietAlwRJ2Mk4LTd0= - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.5.0" - "@babel/helpers" "^7.5.4" - "@babel/parser" "^7.5.0" - "@babel/template" "^7.4.4" - "@babel/traverse" "^7.5.0" - "@babel/types" "^7.5.0" - convert-source-map "^1.1.0" - debug "^4.1.0" - json5 "^2.1.0" - lodash "^4.17.11" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/core@^7.7.5": - version "7.9.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/core/-/core-7.9.0.tgz#ac977b538b77e132ff706f3b8a4dbad09c03c56e" - integrity sha1-rJd7U4t34TL/cG87ik260JwDxW4= - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.9.0" - "@babel/helper-module-transforms" "^7.9.0" - "@babel/helpers" "^7.9.0" - "@babel/parser" "^7.9.0" - "@babel/template" "^7.8.6" - "@babel/traverse" "^7.9.0" - "@babel/types" "^7.9.0" - convert-source-map "^1.7.0" - debug "^4.1.0" - gensync "^1.0.0-beta.1" - json5 "^2.1.2" - lodash "^4.17.13" - resolve "^1.3.2" - semver "^5.4.1" - source-map "^0.5.0" - -"@babel/generator@^7.5.0": - version "7.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/generator/-/generator-7.5.0.tgz#f20e4b7a91750ee8b63656073d843d2a736dca4a" - integrity sha1-8g5LepF1Dui2NlYHPYQ9KnNtyko= - dependencies: - "@babel/types" "^7.5.0" - jsesc "^2.5.1" - lodash "^4.17.11" - source-map "^0.5.0" - trim-right "^1.0.1" - -"@babel/generator@^7.9.0", "@babel/generator@^7.9.5": - version "7.9.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/generator/-/generator-7.9.5.tgz#27f0917741acc41e6eaaced6d68f96c3fa9afaf9" - integrity sha1-J/CRd0GsxB5uqs7W1o+Ww/qa+vk= - dependencies: - "@babel/types" "^7.9.5" - jsesc "^2.5.1" - lodash "^4.17.13" - source-map "^0.5.0" - -"@babel/helper-function-name@^7.1.0": - version "7.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz#a0ceb01685f73355d4360c1247f582bfafc8ff53" - integrity sha1-oM6wFoX3M1XUNgwSR/WCv6/I/1M= - dependencies: - "@babel/helper-get-function-arity" "^7.0.0" - "@babel/template" "^7.1.0" - "@babel/types" "^7.0.0" - -"@babel/helper-function-name@^7.9.5": - version "7.9.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz#2b53820d35275120e1874a82e5aabe1376920a5c" - integrity sha1-K1OCDTUnUSDhh0qC5aq+E3aSClw= - dependencies: - "@babel/helper-get-function-arity" "^7.8.3" - "@babel/template" "^7.8.3" - "@babel/types" "^7.9.5" - -"@babel/helper-get-function-arity@^7.0.0": - version "7.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz#83572d4320e2a4657263734113c42868b64e49c3" - integrity sha1-g1ctQyDipGVyY3NBE8QoaLZOScM= - dependencies: - "@babel/types" "^7.0.0" - -"@babel/helper-get-function-arity@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" - integrity sha1-uJS5R70AQ4HOY+odufCFR+kgq9U= - dependencies: - "@babel/types" "^7.8.3" - -"@babel/helper-member-expression-to-functions@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz#659b710498ea6c1d9907e0c73f206eee7dadc24c" - integrity sha1-ZZtxBJjqbB2ZB+DHPyBu7n2twkw= - dependencies: - "@babel/types" "^7.8.3" - -"@babel/helper-module-imports@^7.0.0": - version "7.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-module-imports/-/helper-module-imports-7.0.0.tgz#96081b7111e486da4d2cd971ad1a4fe216cc2e3d" - integrity sha1-lggbcRHkhtpNLNlxrRpP4hbMLj0= - dependencies: - "@babel/types" "^7.0.0" - -"@babel/helper-module-imports@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz#7fe39589b39c016331b6b8c3f441e8f0b1419498" - integrity sha1-f+OVibOcAWMxtrjD9EHo8LFBlJg= - dependencies: - "@babel/types" "^7.8.3" - -"@babel/helper-module-transforms@^7.9.0": - version "7.9.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz#43b34dfe15961918707d247327431388e9fe96e5" - integrity sha1-Q7NN/hWWGRhwfSRzJ0MTiOn+luU= - dependencies: - "@babel/helper-module-imports" "^7.8.3" - "@babel/helper-replace-supers" "^7.8.6" - "@babel/helper-simple-access" "^7.8.3" - "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/template" "^7.8.6" - "@babel/types" "^7.9.0" - lodash "^4.17.13" - -"@babel/helper-optimise-call-expression@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz#7ed071813d09c75298ef4f208956006b6111ecb9" - integrity sha1-ftBxgT0Jx1KY708giVYAa2ER7Lk= - dependencies: - "@babel/types" "^7.8.3" - -"@babel/helper-plugin-utils@^7.0.0": - version "7.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz#bbb3fbee98661c569034237cc03967ba99b4f250" - integrity sha1-u7P77phmHFaQNCN8wDlnupm08lA= - -"@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670" - integrity sha1-nqKTvhm6vA9S/4yoizTDYRsghnA= - -"@babel/helper-replace-supers@^7.8.6": - version "7.8.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz#5ada744fd5ad73203bf1d67459a27dcba67effc8" - integrity sha1-Wtp0T9WtcyA78dZ0WaJ9y6Z+/8g= - dependencies: - "@babel/helper-member-expression-to-functions" "^7.8.3" - "@babel/helper-optimise-call-expression" "^7.8.3" - "@babel/traverse" "^7.8.6" - "@babel/types" "^7.8.6" - -"@babel/helper-simple-access@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz#7f8109928b4dab4654076986af575231deb639ae" - integrity sha1-f4EJkotNq0ZUB2mGr1dSMd62Oa4= - dependencies: - "@babel/template" "^7.8.3" - "@babel/types" "^7.8.3" - -"@babel/helper-split-export-declaration@^7.4.4": - version "7.4.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz#ff94894a340be78f53f06af038b205c49d993677" - integrity sha1-/5SJSjQL549T8GrwOLIFxJ2ZNnc= - dependencies: - "@babel/types" "^7.4.4" - -"@babel/helper-split-export-declaration@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9" - integrity sha1-ManzAHD5E2inGCzwX4MXgQZfx6k= - dependencies: - "@babel/types" "^7.8.3" - -"@babel/helper-validator-identifier@^7.9.0", "@babel/helper-validator-identifier@^7.9.5": - version "7.9.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz#90977a8e6fbf6b431a7dc31752eee233bf052d80" - integrity sha1-kJd6jm+/a0MafcMXUu7iM78FLYA= - -"@babel/helpers@^7.5.4": - version "7.5.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helpers/-/helpers-7.5.4.tgz#2f00608aa10d460bde0ccf665d6dcf8477357cf0" - integrity sha1-LwBgiqENRgveDM9mXW3PhHc1fPA= - dependencies: - "@babel/template" "^7.4.4" - "@babel/traverse" "^7.5.0" - "@babel/types" "^7.5.0" - -"@babel/helpers@^7.9.0": - version "7.9.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/helpers/-/helpers-7.9.2.tgz#b42a81a811f1e7313b88cba8adc66b3d9ae6c09f" - integrity sha1-tCqBqBHx5zE7iMuorcZrPZrmwJ8= - dependencies: - "@babel/template" "^7.8.3" - "@babel/traverse" "^7.9.0" - "@babel/types" "^7.9.0" - -"@babel/highlight@^7.0.0": - version "7.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/highlight/-/highlight-7.5.0.tgz#56d11312bd9248fa619591d02472be6e8cb32540" - integrity sha1-VtETEr2SSPphlZHQJHK+boyzJUA= - dependencies: - chalk "^2.0.0" - esutils "^2.0.2" - js-tokens "^4.0.0" - -"@babel/highlight@^7.8.3": - version "7.9.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/highlight/-/highlight-7.9.0.tgz#4e9b45ccb82b79607271b2979ad82c7b68163079" - integrity sha1-TptFzLgreWBycbKXmtgse2gWMHk= - dependencies: - "@babel/helper-validator-identifier" "^7.9.0" - chalk "^2.0.0" - js-tokens "^4.0.0" - -"@babel/parser@^7.1.0", "@babel/parser@^7.4.4", "@babel/parser@^7.5.0": - version "7.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/parser/-/parser-7.5.0.tgz#3e0713dff89ad6ae37faec3b29dcfc5c979770b7" - integrity sha1-PgcT3/ia1q43+uw7Kdz8XJeXcLc= - -"@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.9.0": - version "7.9.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/parser/-/parser-7.9.4.tgz#68a35e6b0319bbc014465be43828300113f2f2e8" - integrity sha1-aKNeawMZu8AURlvkOCgwARPy8ug= - -"@babel/plugin-syntax-async-generators@^7.8.4": - version "7.8.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d" - integrity sha1-qYP7Gusuw/btBCohD2QOkOeG/g0= - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-bigint@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz#4c9a6f669f5d0cdf1b90a1671e9a146be5300cea" - integrity sha1-TJpvZp9dDN8bkKFnHpoUa+UwDOo= - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-class-properties@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.8.3.tgz#6cb933a8872c8d359bfde69bbeaae5162fd1e8f7" - integrity sha1-bLkzqIcsjTWb/eabvqrlFi/R6Pc= - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-json-strings@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a" - integrity sha1-AcohtmjNghjJ5kDLbdiMVBKyyWo= - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-logical-assignment-operators@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.8.3.tgz#3995d7d7ffff432f6ddc742b47e730c054599897" - integrity sha1-OZXX1///Qy9t3HQrR+cwwFRZmJc= - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9" - integrity sha1-Fn7XA2iIYIH3S1w2xlqIwDtm0ak= - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-numeric-separator@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz#0e3fb63e09bea1b11e96467271c8308007e7c41f" - integrity sha1-Dj+2Pgm+obEelkZyccgwgAfnxB8= - dependencies: - "@babel/helper-plugin-utils" "^7.8.3" - -"@babel/plugin-syntax-object-rest-spread@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871" - integrity sha1-YOIl7cvZimQDMqLnLdPmbxr1WHE= - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-catch-binding@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1" - integrity sha1-YRGiZbz7Ag6579D9/X0mQCue1sE= - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/plugin-syntax-optional-chaining@^7.8.3": - version "7.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a" - integrity sha1-T2nCq5UWfgGAzVM2YT+MV4j31Io= - dependencies: - "@babel/helper-plugin-utils" "^7.8.0" - -"@babel/runtime-corejs3@^7.8.3": - version "7.9.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz#26fe4aa77e9f1ecef9b776559bbb8e84d34284b7" - integrity sha1-Jv5Kp36fHs75t3ZVm7uOhNNChLc= - dependencies: - core-js-pure "^3.0.0" - regenerator-runtime "^0.13.4" - -"@babel/runtime@^7.1.2": - version "7.5.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/runtime/-/runtime-7.5.4.tgz#cb7d1ad7c6d65676e66b47186577930465b5271b" - integrity sha1-y30a18bWVnbma0cYZXeTBGW1Jxs= - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/runtime@^7.4.2", "@babel/runtime@^7.5.5": - version "7.6.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/runtime/-/runtime-7.6.0.tgz#4fc1d642a9fd0299754e8b5de62c631cf5568205" - integrity sha1-T8HWQqn9Apl1Totd5ixjHPVWggU= - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/runtime@^7.4.5": - version "7.8.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308" - integrity sha1-159aIED3yqJNU+VjqtScvAVYEwg= - dependencies: - regenerator-runtime "^0.13.2" - -"@babel/template@^7.1.0", "@babel/template@^7.4.4": - version "7.4.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/template/-/template-7.4.4.tgz#f4b88d1225689a08f5bc3a17483545be9e4ed237" - integrity sha1-9LiNEiVomgj1vDoXSDVFvp5O0jc= - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/parser" "^7.4.4" - "@babel/types" "^7.4.4" - -"@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6": - version "7.8.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" - integrity sha1-hrIq8V+CjfsIZHT5ZNzD45xDzis= - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/parser" "^7.8.6" - "@babel/types" "^7.8.6" - -"@babel/traverse@^7.1.0", "@babel/traverse@^7.5.0": - version "7.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/traverse/-/traverse-7.5.0.tgz#4216d6586854ef5c3c4592dab56ec7eb78485485" - integrity sha1-QhbWWGhU71w8RZLatW7H63hIVIU= - dependencies: - "@babel/code-frame" "^7.0.0" - "@babel/generator" "^7.5.0" - "@babel/helper-function-name" "^7.1.0" - "@babel/helper-split-export-declaration" "^7.4.4" - "@babel/parser" "^7.5.0" - "@babel/types" "^7.5.0" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.11" - -"@babel/traverse@^7.7.4", "@babel/traverse@^7.8.6", "@babel/traverse@^7.9.0": - version "7.9.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/traverse/-/traverse-7.9.5.tgz#6e7c56b44e2ac7011a948c21e283ddd9d9db97a2" - integrity sha1-bnxWtE4qxwEalIwh4oPd2dnbl6I= - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.9.5" - "@babel/helper-function-name" "^7.9.5" - "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/parser" "^7.9.0" - "@babel/types" "^7.9.5" - debug "^4.1.0" - globals "^11.1.0" - lodash "^4.17.13" - -"@babel/types@^7.0.0", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.5.0": - version "7.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/types/-/types-7.5.0.tgz#e47d43840c2e7f9105bc4d3a2c371b4d0c7832ab" - integrity sha1-5H1DhAwuf5EFvE06LDcbTQx4Mqs= - dependencies: - esutils "^2.0.2" - lodash "^4.17.11" - to-fast-properties "^2.0.0" - -"@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.9.0", "@babel/types@^7.9.5": - version "7.9.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@babel/types/-/types-7.9.5.tgz#89231f82915a8a566a703b3b20133f73da6b9444" - integrity sha1-iSMfgpFailZqcDs7IBM/c9prlEQ= - dependencies: - "@babel/helper-validator-identifier" "^7.9.5" - lodash "^4.17.13" - to-fast-properties "^2.0.0" - -"@bcoe/v8-coverage@^0.2.3": - version "0.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" - integrity sha1-daLotRy3WKdVPWgEpZMteqznXDk= - -"@cnakazawa/watch@^1.0.3": - version "1.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@cnakazawa/watch/-/watch-1.0.3.tgz#099139eaec7ebf07a27c1786a3ff64f39464d2ef" - integrity sha1-CZE56ux+vweifBeGo/9k85Rk0u8= - dependencies: - exec-sh "^0.3.2" - minimist "^1.2.0" - -"@emotion/cache@^10.0.17": - version "10.0.17" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/cache/-/cache-10.0.17.tgz#3491a035f62f276620d586677bfc3d4fad0b8472" - integrity sha1-NJGgNfYvJ2Yg1YZne/w9T60LhHI= - dependencies: - "@emotion/sheet" "0.9.3" - "@emotion/stylis" "0.8.4" - "@emotion/utils" "0.11.2" - "@emotion/weak-memoize" "0.2.3" - -"@emotion/core@10.0.17": - version "10.0.17" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/core/-/core-10.0.17.tgz#3367376709721f4ee2068cff54ba581d362789d8" - integrity sha1-M2c3ZwlyH07iBoz/VLpYHTYnidg= - dependencies: - "@babel/runtime" "^7.5.5" - "@emotion/cache" "^10.0.17" - "@emotion/css" "^10.0.14" - "@emotion/serialize" "^0.11.10" - "@emotion/sheet" "0.9.3" - "@emotion/utils" "0.11.2" - -"@emotion/css@^10.0.14": - version "10.0.14" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/css/-/css-10.0.14.tgz#95dacabdd0e22845d1a1b0b5968d9afa34011139" - integrity sha1-ldrKvdDiKEXRobC1lo2a+jQBETk= - dependencies: - "@emotion/serialize" "^0.11.8" - "@emotion/utils" "0.11.2" - babel-plugin-emotion "^10.0.14" - -"@emotion/hash@0.7.2": - version "0.7.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/hash/-/hash-0.7.2.tgz#53211e564604beb9befa7a4400ebf8147473eeef" - integrity sha1-UyEeVkYEvrm++npEAOv4FHRz7u8= - -"@emotion/is-prop-valid@0.8.2": - version "0.8.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/is-prop-valid/-/is-prop-valid-0.8.2.tgz#b9692080da79041683021fcc32f96b40c54c59dc" - integrity sha1-uWkggNp5BBaDAh/MMvlrQMVMWdw= - dependencies: - "@emotion/memoize" "0.7.2" - -"@emotion/memoize@0.7.2": - version "0.7.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/memoize/-/memoize-0.7.2.tgz#7f4c71b7654068dfcccad29553520f984cc66b30" - integrity sha1-f0xxt2VAaN/MytKVU1IPmEzGazA= - -"@emotion/serialize@^0.11.10", "@emotion/serialize@^0.11.8": - version "0.11.10" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/serialize/-/serialize-0.11.10.tgz#53207dba7e28bd96928fc2a37e20b31b712bf9a2" - integrity sha1-UyB9un4ovZaSj8KjfiCzG3Er+aI= - dependencies: - "@emotion/hash" "0.7.2" - "@emotion/memoize" "0.7.2" - "@emotion/unitless" "0.7.4" - "@emotion/utils" "0.11.2" - csstype "^2.5.7" - -"@emotion/sheet@0.9.3": - version "0.9.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/sheet/-/sheet-0.9.3.tgz#689f135ecf87d3c650ed0c4f5ddcbe579883564a" - integrity sha1-aJ8TXs+H08ZQ7QxPXdy+V5iDVko= - -"@emotion/styled-base@^10.0.17": - version "10.0.17" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/styled-base/-/styled-base-10.0.17.tgz#701af0cd256be2977db8d67c33630f542e460b85" - integrity sha1-cBrwzSVr4pd9uNZ8M2MPVC5GC4U= - dependencies: - "@babel/runtime" "^7.5.5" - "@emotion/is-prop-valid" "0.8.2" - "@emotion/serialize" "^0.11.10" - "@emotion/utils" "0.11.2" - -"@emotion/styled@10.0.17": - version "10.0.17" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/styled/-/styled-10.0.17.tgz#0cd38b8b36259541f2c6717fc22607a120623654" - integrity sha1-DNOLizYllUHyxnF/wiYHoSBiNlQ= - dependencies: - "@emotion/styled-base" "^10.0.17" - babel-plugin-emotion "^10.0.17" - -"@emotion/stylis@0.8.4": - version "0.8.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/stylis/-/stylis-0.8.4.tgz#6c51afdf1dd0d73666ba09d2eb6c25c220d6fe4c" - integrity sha1-bFGv3x3Q1zZmugnS62wlwiDW/kw= - -"@emotion/unitless@0.7.4": - version "0.7.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/unitless/-/unitless-0.7.4.tgz#a87b4b04e5ae14a88d48ebef15015f6b7d1f5677" - integrity sha1-qHtLBOWuFKiNSOvvFQFfa30fVnc= - -"@emotion/utils@0.11.2": - version "0.11.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/utils/-/utils-0.11.2.tgz#713056bfdffb396b0a14f1c8f18e7b4d0d200183" - integrity sha1-cTBWv9/7OWsKFPHI8Y57TQ0gAYM= - -"@emotion/weak-memoize@0.2.3": - version "0.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/weak-memoize/-/weak-memoize-0.2.3.tgz#dfa0c92efe44a1d1a7974fb49ffeb40ef2da5a27" - integrity sha1-36DJLv5EodGnl0+0n/60DvLaWic= - -"@emotion/weak-memoize@0.2.4": - version "0.2.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@emotion/weak-memoize/-/weak-memoize-0.2.4.tgz#622a72bebd1e3f48d921563b4b60a762295a81fc" - integrity sha1-Yipyvr0eP0jZIVY7S2CnYilagfw= - -"@istanbuljs/load-nyc-config@^1.0.0": - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz#10602de5570baea82f8afbfa2630b24e7a8cfe5b" - integrity sha1-EGAt5VcLrqgvivv6JjCyTnqM/ls= - dependencies: - camelcase "^5.3.1" - find-up "^4.1.0" - js-yaml "^3.13.1" - resolve-from "^5.0.0" - -"@istanbuljs/schema@^0.1.2": - version "0.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" - integrity sha1-JlIL8Jq+SlZEzVQU43ElqJVCQd0= - -"@jest/console@^25.4.0": - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@jest/console/-/console-25.4.0.tgz#e2760b532701137801ba824dcff6bc822c961bac" - integrity sha1-4nYLUycBE3gBuoJNz/a8giyWG6w= - dependencies: - "@jest/types" "^25.4.0" - chalk "^3.0.0" - jest-message-util "^25.4.0" - jest-util "^25.4.0" - slash "^3.0.0" - -"@jest/core@^25.4.0": - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@jest/core/-/core-25.4.0.tgz#cc1fe078df69b8f0fbb023bb0bcee23ef3b89411" - integrity sha1-zB/geN9puPD7sCO7C87iPvO4lBE= - dependencies: - "@jest/console" "^25.4.0" - "@jest/reporters" "^25.4.0" - "@jest/test-result" "^25.4.0" - "@jest/transform" "^25.4.0" - "@jest/types" "^25.4.0" - ansi-escapes "^4.2.1" - chalk "^3.0.0" - exit "^0.1.2" - graceful-fs "^4.2.3" - jest-changed-files "^25.4.0" - jest-config "^25.4.0" - jest-haste-map "^25.4.0" - jest-message-util "^25.4.0" - jest-regex-util "^25.2.6" - jest-resolve "^25.4.0" - jest-resolve-dependencies "^25.4.0" - jest-runner "^25.4.0" - jest-runtime "^25.4.0" - jest-snapshot "^25.4.0" - jest-util "^25.4.0" - jest-validate "^25.4.0" - jest-watcher "^25.4.0" - micromatch "^4.0.2" - p-each-series "^2.1.0" - realpath-native "^2.0.0" - rimraf "^3.0.0" - slash "^3.0.0" - strip-ansi "^6.0.0" - -"@jest/environment@^25.4.0": - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@jest/environment/-/environment-25.4.0.tgz#45071f525f0d8c5a51ed2b04fd42b55a8f0c7cb3" - integrity sha1-RQcfUl8NjFpR7SsE/UK1Wo8MfLM= - dependencies: - "@jest/fake-timers" "^25.4.0" - "@jest/types" "^25.4.0" - jest-mock "^25.4.0" - -"@jest/fake-timers@^25.4.0": - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@jest/fake-timers/-/fake-timers-25.4.0.tgz#3a9a4289ba836abd084953dca406389a57e00fbd" - integrity sha1-OppCibqDar0ISVPcpAY4mlfgD70= - dependencies: - "@jest/types" "^25.4.0" - jest-message-util "^25.4.0" - jest-mock "^25.4.0" - jest-util "^25.4.0" - lolex "^5.0.0" - -"@jest/reporters@^25.4.0": - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@jest/reporters/-/reporters-25.4.0.tgz#836093433b32ce4e866298af2d6fcf6ed351b0b0" - integrity sha1-g2CTQzsyzk6GYpivLW/PbtNRsLA= - dependencies: - "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^25.4.0" - "@jest/test-result" "^25.4.0" - "@jest/transform" "^25.4.0" - "@jest/types" "^25.4.0" - chalk "^3.0.0" - collect-v8-coverage "^1.0.0" - exit "^0.1.2" - glob "^7.1.2" - istanbul-lib-coverage "^3.0.0" - istanbul-lib-instrument "^4.0.0" - istanbul-lib-report "^3.0.0" - istanbul-lib-source-maps "^4.0.0" - istanbul-reports "^3.0.2" - jest-haste-map "^25.4.0" - jest-resolve "^25.4.0" - jest-util "^25.4.0" - jest-worker "^25.4.0" - slash "^3.0.0" - source-map "^0.6.0" - string-length "^3.1.0" - terminal-link "^2.0.0" - v8-to-istanbul "^4.1.3" - optionalDependencies: - node-notifier "^6.0.0" - -"@jest/source-map@^25.2.6": - version "25.2.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@jest/source-map/-/source-map-25.2.6.tgz#0ef2209514c6d445ebccea1438c55647f22abb4c" - integrity sha1-DvIglRTG1EXrzOoUOMVWR/Iqu0w= - dependencies: - callsites "^3.0.0" - graceful-fs "^4.2.3" - source-map "^0.6.0" - -"@jest/test-result@^25.4.0": - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@jest/test-result/-/test-result-25.4.0.tgz#6f2ec2c8da9981ef013ad8651c1c6f0cb20c6324" - integrity sha1-by7CyNqZge8BOthlHBxvDLIMYyQ= - dependencies: - "@jest/console" "^25.4.0" - "@jest/types" "^25.4.0" - "@types/istanbul-lib-coverage" "^2.0.0" - collect-v8-coverage "^1.0.0" - -"@jest/test-sequencer@^25.4.0": - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@jest/test-sequencer/-/test-sequencer-25.4.0.tgz#2b96f9d37f18dc3336b28e3c8070f97f9f55f43b" - integrity sha1-K5b5038Y3DM2so48gHD5f59V9Ds= - dependencies: - "@jest/test-result" "^25.4.0" - jest-haste-map "^25.4.0" - jest-runner "^25.4.0" - jest-runtime "^25.4.0" - -"@jest/transform@^25.4.0": - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@jest/transform/-/transform-25.4.0.tgz#eef36f0367d639e2fd93dccd758550377fbb9962" - integrity sha1-7vNvA2fWOeL9k9zNdYVQN3+7mWI= - dependencies: - "@babel/core" "^7.1.0" - "@jest/types" "^25.4.0" - babel-plugin-istanbul "^6.0.0" - chalk "^3.0.0" - convert-source-map "^1.4.0" - fast-json-stable-stringify "^2.0.0" - graceful-fs "^4.2.3" - jest-haste-map "^25.4.0" - jest-regex-util "^25.2.6" - jest-util "^25.4.0" - micromatch "^4.0.2" - pirates "^4.0.1" - realpath-native "^2.0.0" - slash "^3.0.0" - source-map "^0.6.1" - write-file-atomic "^3.0.0" - -"@jest/types@^25.4.0": - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@jest/types/-/types-25.4.0.tgz#5afeb8f7e1cba153a28e5ac3c9fe3eede7206d59" - integrity sha1-Wv649+HLoVOijlrDyf4+7ecgbVk= - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^15.0.0" - chalk "^3.0.0" - -"@mrmlnc/readdir-enhanced@^2.2.1": - version "2.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde" - integrity sha1-UkryQNGjYFJ7cwR17PoTRKpUDd4= - dependencies: - call-me-maybe "^1.0.1" - glob-to-regexp "^0.3.0" - -"@nodelib/fs.scandir@2.1.1": - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@nodelib/fs.scandir/-/fs.scandir-2.1.1.tgz#7fa8fed654939e1a39753d286b48b4836d00e0eb" - integrity sha1-f6j+1lSTnho5dT0oa0i0g20A4Os= - dependencies: - "@nodelib/fs.stat" "2.0.1" - run-parallel "^1.1.9" - -"@nodelib/fs.stat@2.0.1", "@nodelib/fs.stat@^2.0.1": - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@nodelib/fs.stat/-/fs.stat-2.0.1.tgz#814f71b1167390cfcb6a6b3d9cdeb0951a192c14" - integrity sha1-gU9xsRZzkM/Lams9nN6wlRoZLBQ= - -"@nodelib/fs.stat@^1.1.2": - version "1.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" - integrity sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs= - -"@nodelib/fs.walk@^1.2.1": - version "1.2.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@nodelib/fs.walk/-/fs.walk-1.2.2.tgz#6a6450c5e17012abd81450eb74949a4d970d2807" - integrity sha1-amRQxeFwEqvYFFDrdJSaTZcNKAc= - dependencies: - "@nodelib/fs.scandir" "2.1.1" - fastq "^1.6.0" - -"@sinonjs/commons@^1.7.0": - version "1.7.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@sinonjs/commons/-/commons-1.7.2.tgz#505f55c74e0272b43f6c52d81946bed7058fc0e2" - integrity sha1-UF9Vx04CcrQ/bFLYGUa+1wWPwOI= - dependencies: - type-detect "4.0.8" - -"@types/babel__core@^7.1.7": - version "7.1.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89" - integrity sha1-HaytiEA2SlfJjQ3UhVxt03Usa4k= - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - "@types/babel__generator" "*" - "@types/babel__template" "*" - "@types/babel__traverse" "*" - -"@types/babel__generator@*": - version "7.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc" - integrity sha1-0hEqayH61gDXZ0J0KTyF3ODLR/w= - dependencies: - "@babel/types" "^7.0.0" - -"@types/babel__template@*": - version "7.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/babel__template/-/babel__template-7.0.2.tgz#4ff63d6b52eddac1de7b975a5223ed32ecea9307" - integrity sha1-T/Y9a1Lt2sHee5daUiPtMuzqkwc= - dependencies: - "@babel/parser" "^7.1.0" - "@babel/types" "^7.0.0" - -"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6": - version "7.0.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/babel__traverse/-/babel__traverse-7.0.7.tgz#2496e9ff56196cc1429c72034e07eab6121b6f3f" - integrity sha1-JJbp/1YZbMFCnHIDTgfqthIbbz8= - dependencies: - "@babel/types" "^7.3.0" - -"@types/cheerio@*": - version "0.22.12" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/cheerio/-/cheerio-0.22.12.tgz#93c050401d4935a5376e8b352965f7458bed5340" - integrity sha1-k8BQQB1JNaU3bos1KWX3RYvtU0A= - dependencies: - "@types/node" "*" - -"@types/classnames@2.2.8": - version "2.2.8" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/classnames/-/classnames-2.2.8.tgz#17139e1e1104203572caa4368f6796f6225b70b4" - integrity sha1-FxOeHhEEIDVyyqQ2j2eW9iJbcLQ= - -"@types/clipboard@2.0.1": - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/clipboard/-/clipboard-2.0.1.tgz#75a74086c293d75b12bc93ff13bc7797fef05a40" - integrity sha1-dadAhsKT11sSvJP/E7x3l/7wWkA= - -"@types/color-name@^1.1.1": - version "1.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" - integrity sha1-HBJhu+qhCoBVu8XYq4S3sq/IRqA= - -"@types/d3-array@1.2.4": - version "1.2.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/d3-array/-/d3-array-1.2.4.tgz#7088445c8717ba1fba416a1df7bbd11cc72a3763" - integrity sha1-cIhEXIcXuh+6QWod97vRHMcqN2M= - -"@types/d3-color@*": - version "1.2.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/d3-color/-/d3-color-1.2.2.tgz#80cf7cfff7401587b8f89307ba36fe4a576bc7cf" - integrity sha1-gM98//dAFYe4+JMHujb+Sldrx88= - -"@types/d3-hierarchy@1.1.4": - version "1.1.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/d3-hierarchy/-/d3-hierarchy-1.1.4.tgz#b04dfcb1f2074da789ada10fe4942d13f0bce421" - integrity sha1-sE38sfIHTaeJraEP5JQtE/C85CE= - -"@types/d3-interpolate@*": - version "1.3.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/d3-interpolate/-/d3-interpolate-1.3.1.tgz#1c280511f622de9b0b47d463fa55f9a4fd6f5fc8" - integrity sha1-HCgFEfYi3psLR9Rj+lX5pP1vX8g= - dependencies: - "@types/d3-color" "*" - -"@types/d3-path@*": - version "1.0.8" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/d3-path/-/d3-path-1.0.8.tgz#48e6945a8ff43ee0a1ce85c8cfa2337de85c7c79" - integrity sha1-SOaUWo/0PuChzoXIz6IzfehcfHk= - -"@types/d3-scale@2.0.2": - version "2.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/d3-scale/-/d3-scale-2.0.2.tgz#61145948aa1a52ab31384766cd013308699112b3" - integrity sha1-YRRZSKoaUqsxOEdmzQEzCGmRErM= - dependencies: - "@types/d3-time" "*" - -"@types/d3-selection@*": - version "1.4.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/d3-selection/-/d3-selection-1.4.1.tgz#fa1f8710a6b5d7cfe5c6caa61d161be7cae4a022" - integrity sha1-+h+HEKa118/lxsqmHRYb58rkoCI= - -"@types/d3-selection@1.3.2": - version "1.3.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/d3-selection/-/d3-selection-1.3.2.tgz#dd5661a560ba9ce3aba823c424b8d4a1bc7e833f" - integrity sha1-3VZhpWC6nOOrqCPEJLjUobx+gz8= - -"@types/d3-shape@1.2.4": - version "1.2.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/d3-shape/-/d3-shape-1.2.4.tgz#e65585f2254d83ae42c47af2e730dd9b97952996" - integrity sha1-5lWF8iVNg65CxHry5zDdm5eVKZY= - dependencies: - "@types/d3-path" "*" - -"@types/d3-time@*": - version "1.0.10" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/d3-time/-/d3-time-1.0.10.tgz#d338c7feac93a98a32aac875d1100f92c7b61f4f" - integrity sha1-0zjH/qyTqYoyqsh10RAPkse2H08= - -"@types/d3-zoom@1.7.3": - version "1.7.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/d3-zoom/-/d3-zoom-1.7.3.tgz#ed9421551328157f70edabc401d8c91c38d360d9" - integrity sha1-7ZQhVRMoFX9w7avEAdjJHDjTYNk= - dependencies: - "@types/d3-interpolate" "*" - "@types/d3-selection" "*" - -"@types/enzyme@3.10.5": - version "3.10.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/enzyme/-/enzyme-3.10.5.tgz#fe7eeba3550369eed20e7fb565bfb74eec44f1f0" - integrity sha1-/n7ro1UDae7SDn+1Zb+3TuxE8fA= - dependencies: - "@types/cheerio" "*" - "@types/react" "*" - -"@types/eslint-visitor-keys@^1.0.0": - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" - integrity sha1-HuMNeVRMqE1o1LPNsK9PIFZj3S0= - -"@types/events@*": - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7" - integrity sha1-KGLz9Yqaf3w+eNefEw3U1xwlwqc= - -"@types/glob@^7.1.1": - version "7.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575" - integrity sha1-qlmhxuP7xCHgfM0xqUTDDrpSFXU= - dependencies: - "@types/events" "*" - "@types/minimatch" "*" - "@types/node" "*" - -"@types/history@^3": - version "3.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/history/-/history-3.2.3.tgz#2416fee5cac641da2d05a905de5af5cb50162f60" - integrity sha1-JBb+5crGQdotBakF3lr1y1AWL2A= - -"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff" - integrity sha1-QplbRG25pIoRoH7Ag0mahg6ROP8= - -"@types/istanbul-lib-report@*": - version "1.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c" - integrity sha1-5Ucef6M8YTWN04QmGJwDelhDO4w= - dependencies: - "@types/istanbul-lib-coverage" "*" - -"@types/istanbul-reports@^1.1.1": - version "1.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz#7a8cbf6a406f36c8add871625b278eaf0b0d255a" - integrity sha1-eoy/akBvNsit2HFiWyeOrwsNJVo= - dependencies: - "@types/istanbul-lib-coverage" "*" - "@types/istanbul-lib-report" "*" - -"@types/jest@25.2.1": - version "25.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/jest/-/jest-25.2.1.tgz#9544cd438607955381c1bdbdb97767a249297db5" - integrity sha1-lUTNQ4YHlVOBwb29uXdnokkpfbU= - dependencies: - jest-diff "^25.2.1" - pretty-format "^25.2.1" - -"@types/jest@^23.0.2": - version "23.3.14" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/jest/-/jest-23.3.14.tgz#37daaf78069e7948520474c87b80092ea912520a" - integrity sha1-N9qveAaeeUhSBHTIe4AJLqkSUgo= - -"@types/json-schema@^7.0.3": - version "7.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636" - integrity sha1-vf1p1h5GTcyBslFZwnDXWnPBpjY= - -"@types/lodash@4.14.159": - version "4.14.159" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/lodash/-/lodash-4.14.159.tgz#61089719dc6fdd9c5cb46efc827f2571d1517065" - integrity sha1-YQiXGdxv3ZxctG78gn8lcdFRcGU= - -"@types/minimatch@*": - version "3.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha1-PcoOPzOyAPx9ETnAzZbBJoyt/Z0= - -"@types/node@*": - version "12.6.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/node/-/node-12.6.3.tgz#44d507c5634f85e7164707ca36bba21b5213d487" - integrity sha1-RNUHxWNPhecWRwfKNruiG1IT1Ic= - -"@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha1-5IbQ2XOW15vu3QpuM/RTT/a0lz4= - -"@types/prettier@^1.19.0": - version "1.19.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/prettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" - integrity sha1-M1CYSfjmeeSt0ViVn9sIZEDpVT8= - -"@types/prop-types@*": - version "15.7.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/prop-types/-/prop-types-15.7.1.tgz#f1a11e7babb0c3cad68100be381d1e064c68f1f6" - integrity sha1-8aEee6uww8rWgQC+OB0eBkxo8fY= - -"@types/react-dom@16.8.4": - version "16.8.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/react-dom/-/react-dom-16.8.4.tgz#7fb7ba368857c7aa0f4e4511c4710ca2c5a12a88" - integrity sha1-f7e6NohXx6oPTkURxHEMosWhKog= - dependencies: - "@types/react" "*" - -"@types/react-intl@2.3.17": - version "2.3.17" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/react-intl/-/react-intl-2.3.17.tgz#e1fc6e46e8af58bdef9531259d509380a8a99e8e" - integrity sha1-4fxuRuivWL3vlTElnVCTgKipno4= - -"@types/react-modal@3.8.2": - version "3.8.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/react-modal/-/react-modal-3.8.2.tgz#401309e624cde522d65c3ef04918dbe325383598" - integrity sha1-QBMJ5iTN5SLWXD7wSRjb4yU4NZg= - dependencies: - "@types/react" "*" - -"@types/react-router@3.0.20": - version "3.0.20" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/react-router/-/react-router-3.0.20.tgz#a711682475ccef70ad9ad9e459859380221e6ee6" - integrity sha1-pxFoJHXM73CtmtnkWYWTgCIebuY= - dependencies: - "@types/history" "^3" - "@types/react" "*" - -"@types/react-select@1.2.6": - version "1.2.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/react-select/-/react-select-1.2.6.tgz#8a9579705e04b2c15ce529379402980d80e9d243" - integrity sha1-ipV5cF4EssFc5Sk3lAKYDYDp0kM= - dependencies: - "@types/react" "*" - -"@types/react-virtualized@9.21.0": - version "9.21.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/react-virtualized/-/react-virtualized-9.21.0.tgz#5889c62ddb23628252a4612b0af0d39777d3a889" - integrity sha1-WInGLdsjYoJSpGErCvDTl3fTqIk= - dependencies: - "@types/prop-types" "*" - "@types/react" "*" - -"@types/react@*", "@types/react@16.8.23": - version "16.8.23" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/react/-/react-16.8.23.tgz#ec6be3ceed6353a20948169b6cb4c97b65b97ad2" - integrity sha1-7Gvjzu1jU6IJSBabbLTJe2W5etI= - dependencies: - "@types/prop-types" "*" - csstype "^2.2.0" - -"@types/stack-utils@^1.0.1": - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" - integrity sha1-CoUdO9lkmPolwzq3J47TvWXwbD4= - -"@types/yargs-parser@*": - version "15.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" - integrity sha1-yz+fdBhp4gzOMw/765JxWQSDiC0= - -"@types/yargs@^15.0.0": - version "15.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@types/yargs/-/yargs-15.0.4.tgz#7e5d0f8ca25e9d5849f2ea443cf7c402decd8299" - integrity sha1-fl0PjKJenVhJ8upEPPfEAt7Ngpk= - dependencies: - "@types/yargs-parser" "*" - -"@typescript-eslint/experimental-utils@2.29.0": - version "2.29.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@typescript-eslint/experimental-utils/-/experimental-utils-2.29.0.tgz#3cb8060de9265ba131625a96bbfec31ba6d4a0fe" - integrity sha1-PLgGDekmW6ExYlqWu/7DG6bUoP4= - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.29.0" - eslint-scope "^5.0.0" - eslint-utils "^2.0.0" - -"@typescript-eslint/experimental-utils@^2.5.0": - version "2.18.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@typescript-eslint/experimental-utils/-/experimental-utils-2.18.0.tgz#e4eab839082030282496c1439bbf9fdf2a4f3da8" - integrity sha1-5Oq4OQggMCgklsFDm7+f3ypPPag= - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.18.0" - eslint-scope "^5.0.0" - -"@typescript-eslint/parser@2.29.0": - version "2.29.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@typescript-eslint/parser/-/parser-2.29.0.tgz#6e3c4e21ed6393dc05b9d8b47f0b7e731ef21c9c" - integrity sha1-bjxOIe1jk9wFudi0fwt+cx7yHJw= - dependencies: - "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.29.0" - "@typescript-eslint/typescript-estree" "2.29.0" - eslint-visitor-keys "^1.1.0" - -"@typescript-eslint/typescript-estree@2.18.0": - version "2.18.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@typescript-eslint/typescript-estree/-/typescript-estree-2.18.0.tgz#cfbd16ed1b111166617d718619c19b62764c8460" - integrity sha1-z70W7RsREWZhfXGGGcGbYnZMhGA= - dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^6.3.0" - tsutils "^3.17.1" - -"@typescript-eslint/typescript-estree@2.29.0": - version "2.29.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/@typescript-eslint/typescript-estree/-/typescript-estree-2.29.0.tgz#1be6612bb02fc37ac9f466521c1459a4744e8d3a" - integrity sha1-G+ZhK7Avw3rJ9GZSHBRZpHROjTo= - dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^6.3.0" - tsutils "^3.17.1" - -abab@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/abab/-/abab-2.0.0.tgz#aba0ab4c5eee2d4c79d3487d85450fb2376ebb0f" - integrity sha1-q6CrTF7uLUx500h9hUUPsjduuw8= - -acorn-globals@^4.3.2: - version "4.3.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/acorn-globals/-/acorn-globals-4.3.4.tgz#9fa1926addc11c97308c4e66d7add0d40c3272e7" - integrity sha1-n6GSat3BHJcwjE5m163Q1Awycuc= - dependencies: - acorn "^6.0.1" - acorn-walk "^6.0.1" - -acorn-jsx@^5.2.0: - version "5.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/acorn-jsx/-/acorn-jsx-5.2.0.tgz#4c66069173d6fdd68ed85239fc256226182b2ebe" - integrity sha1-TGYGkXPW/daO2FI5/CViJhgrLr4= - -acorn-walk@^6.0.1: - version "6.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c" - integrity sha1-Ejy487hMIXHx9/slJhWxx4prGow= - -acorn@^6.0.1: - version "6.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/acorn/-/acorn-6.2.0.tgz#67f0da2fc339d6cfb5d6fb244fd449f33cd8bbe3" - integrity sha1-Z/DaL8M51s+11vskT9RJ8zzYu+M= - -acorn@^7.1.0, acorn@^7.1.1: - version "7.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" - integrity sha1-41Zo3gtALzWd5RXFSCoaufiaab8= - -airbnb-prop-types@^2.15.0: - version "2.15.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/airbnb-prop-types/-/airbnb-prop-types-2.15.0.tgz#5287820043af1eb469f5b0af0d6f70da6c52aaef" - integrity sha1-UoeCAEOvHrRp9bCvDW9w2mxSqu8= - dependencies: - array.prototype.find "^2.1.0" - function.prototype.name "^1.1.1" - has "^1.0.3" - is-regex "^1.0.4" - object-is "^1.0.1" - object.assign "^4.1.0" - object.entries "^1.1.0" - prop-types "^15.7.2" - prop-types-exact "^1.2.0" - react-is "^16.9.0" - -ajv@^6.10.0: - version "6.12.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" - integrity sha1-xinF7O0XuvMUQ3kY0tqIyZ1ZWM0= - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^6.10.2, ajv@^6.5.5: - version "6.10.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52" - integrity sha1-086gTWsBeyiUrWkED+yLYj60vVI= - dependencies: - fast-deep-equal "^2.0.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ansi-escapes@^4.2.1: - version "4.3.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha1-pcR8xDGB8fOP/XB2g3cA05VSKmE= - dependencies: - type-fest "^0.11.0" - -ansi-regex@^4.1.0: - version "4.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997" - integrity sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc= - -ansi-regex@^5.0.0: - version "5.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" - integrity sha1-OIU59VF5vzkznIGvMKZU1p+Hy3U= - -ansi-styles@^3.2.0, ansi-styles@^3.2.1: - version "3.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" - integrity sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0= - dependencies: - color-convert "^1.9.0" - -ansi-styles@^4.0.0, ansi-styles@^4.1.0: - version "4.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" - integrity sha1-kK51xCTQCNJiTFvynq0xd+v881k= - dependencies: - "@types/color-name" "^1.1.1" - color-convert "^2.0.1" - -anymatch@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb" - integrity sha1-vLJLTzeTTZqnrBe0ra+J58du8us= - dependencies: - micromatch "^3.1.4" - normalize-path "^2.1.1" - -anymatch@^3.0.3: - version "3.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142" - integrity sha1-xV7PAhheJGklk5kxDBc84xIzsUI= - dependencies: - normalize-path "^3.0.0" - picomatch "^2.0.4" - -argparse@^1.0.7: - version "1.0.10" - resolved "https://repox.jfrog.io/repox/api/npm/npm/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" - integrity sha1-vNZ5HqWuCXJeF+WtmIE0zUCz2RE= - dependencies: - sprintf-js "~1.0.2" - -aria-query@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc" - integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w= - dependencies: - ast-types-flow "0.0.7" - commander "^2.11.0" - -arr-diff@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" - integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA= - -arr-flatten@^1.1.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1" - integrity sha1-NgSLv/TntH4TZkQxbJlmnqWukfE= - -arr-union@^3.1.0: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" - integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= - -array-equal@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93" - integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM= - -array-filter@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array-filter/-/array-filter-1.0.0.tgz#baf79e62e6ef4c2a4c0b831232daffec251f9d83" - integrity sha1-uveeYubvTCpMC4MSMtr/7CUfnYM= - -array-find-index@^1.0.1: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" - integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= - -array-includes@^3.0.3: - version "3.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" - integrity sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.7.0" - -array-includes@^3.1.1: - version "3.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" - integrity sha1-zdZ+aFK9+cEhVGB4ZzIlXtJFk0g= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0" - is-string "^1.0.5" - -array-union@^1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array-union/-/array-union-1.0.2.tgz#9a34410e4f4e3da23dea375be5be70f24778ec39" - integrity sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk= - dependencies: - array-uniq "^1.0.1" - -array-union@^2.1.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" - integrity sha1-t5hCCtvrHego2ErNii4j0+/oXo0= - -array-uniq@^1.0.1: - version "1.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" - integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= - -array-unique@^0.3.2: - version "0.3.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" - integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= - -array.prototype.find@^2.1.0: - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array.prototype.find/-/array.prototype.find-2.1.1.tgz#3baca26108ca7affb08db06bf0be6cb3115a969c" - integrity sha1-O6yiYQjKev+wjbBr8L5ssxFalpw= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.4" - -array.prototype.flat@^1.2.1: - version "1.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array.prototype.flat/-/array.prototype.flat-1.2.1.tgz#812db8f02cad24d3fab65dd67eabe3b8903494a4" - integrity sha1-gS248CytJNP6tl3WfqvjuJA0lKQ= - dependencies: - define-properties "^1.1.2" - es-abstract "^1.10.0" - function-bind "^1.1.1" - -array.prototype.flat@^1.2.3: - version "1.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" - integrity sha1-DegrQmsDGNv9uUAInjiwQ9N/bHs= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - -arrify@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" - integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0= - -asap@~2.0.3: - version "2.0.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" - integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY= - -asn1@~0.2.3: - version "0.2.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha1-jSR136tVO7M+d7VOWeiAu4ziMTY= - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - -assign-symbols@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367" - integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c= - -ast-types-flow@0.0.7, ast-types-flow@^0.0.7: - version "0.0.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad" - integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0= - -astral-regex@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" - integrity sha1-bIw/uCfdQ+45GPJ7gngqt2WKb9k= - -asynckit@^0.4.0: - version "0.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" - integrity sha1-x57Zf380y48robyXkLzDZkdLS3k= - -atob@^2.1.1: - version "2.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" - integrity sha1-bZUX654DDSQ2ZmZR6GvZ9vE1M8k= - -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - -aws4@^1.8.0: - version "1.8.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f" - integrity sha1-8OAD2cqef1nHpQiUXXsu+aBKVC8= - -axobject-query@^2.0.2: - version "2.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/axobject-query/-/axobject-query-2.0.2.tgz#ea187abe5b9002b377f925d8bf7d1c561adf38f9" - integrity sha1-6hh6vluQArN3+SXYv30cVhrfOPk= - dependencies: - ast-types-flow "0.0.7" - -babel-jest@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/babel-jest/-/babel-jest-25.4.0.tgz#409eb3e2ddc2ad9a92afdbb00991f1633f8018d0" - integrity sha1-QJ6z4t3CrZqSr9uwCZHxYz+AGNA= - dependencies: - "@jest/transform" "^25.4.0" - "@jest/types" "^25.4.0" - "@types/babel__core" "^7.1.7" - babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^25.4.0" - chalk "^3.0.0" - slash "^3.0.0" - -babel-plugin-emotion@^10.0.14, babel-plugin-emotion@^10.0.17: - version "10.0.17" - resolved "https://repox.jfrog.io/repox/api/npm/npm/babel-plugin-emotion/-/babel-plugin-emotion-10.0.17.tgz#5673fbed7b1ed61b4b98d5530f33c8a4d1b08484" - integrity sha1-VnP77Xse1htLmNVTDzPIpNGwhIQ= - dependencies: - "@babel/helper-module-imports" "^7.0.0" - "@emotion/hash" "0.7.2" - "@emotion/memoize" "0.7.2" - "@emotion/serialize" "^0.11.10" - babel-plugin-macros "^2.0.0" - babel-plugin-syntax-jsx "^6.18.0" - convert-source-map "^1.5.0" - escape-string-regexp "^1.0.5" - find-root "^1.1.0" - source-map "^0.5.7" - -babel-plugin-istanbul@^6.0.0: - version "6.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz#e159ccdc9af95e0b570c75b4573b7c34d671d765" - integrity sha1-4VnM3Jr5XgtXDHW0Vzt8NNZx12U= - dependencies: - "@babel/helper-plugin-utils" "^7.0.0" - "@istanbuljs/load-nyc-config" "^1.0.0" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-instrument "^4.0.0" - test-exclude "^6.0.0" - -babel-plugin-jest-hoist@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.4.0.tgz#0c122c1b93fb76f52d2465be2e8069e798e9d442" - integrity sha1-DBIsG5P7dvUtJGW+LoBp55jp1EI= - dependencies: - "@types/babel__traverse" "^7.0.6" - -babel-plugin-macros@^2.0.0: - version "2.6.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/babel-plugin-macros/-/babel-plugin-macros-2.6.1.tgz#41f7ead616fc36f6a93180e89697f69f51671181" - integrity sha1-Qffq1hb8NvapMYDolpf2n1FnEYE= - dependencies: - "@babel/runtime" "^7.4.2" - cosmiconfig "^5.2.0" - resolve "^1.10.0" - -babel-plugin-syntax-jsx@^6.18.0: - version "6.18.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946" - integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY= - -babel-preset-current-node-syntax@^0.1.2: - version "0.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6" - integrity sha1-+0pMUf44ymD+3h3HSrNeuEPLQdY= - dependencies: - "@babel/plugin-syntax-async-generators" "^7.8.4" - "@babel/plugin-syntax-bigint" "^7.8.3" - "@babel/plugin-syntax-class-properties" "^7.8.3" - "@babel/plugin-syntax-json-strings" "^7.8.3" - "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3" - "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" - "@babel/plugin-syntax-numeric-separator" "^7.8.3" - "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" - "@babel/plugin-syntax-optional-chaining" "^7.8.3" - -babel-preset-jest@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/babel-preset-jest/-/babel-preset-jest-25.4.0.tgz#10037cc32b751b994b260964629e49dc479abf4c" - integrity sha1-EAN8wyt1G5lLJglkYp5J3Eeav0w= - dependencies: - babel-plugin-jest-hoist "^25.4.0" - babel-preset-current-node-syntax "^0.1.2" - -babel-runtime@^6.26.0: - version "6.26.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" - integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= - dependencies: - core-js "^2.4.0" - regenerator-runtime "^0.11.0" - -balanced-match@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= - -base@^0.11.1: - version "0.11.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f" - integrity sha1-e95c7RRbbVUakNuH+DxVi060io8= - dependencies: - cache-base "^1.0.1" - class-utils "^0.3.5" - component-emitter "^1.2.1" - define-property "^1.0.0" - isobject "^3.0.1" - mixin-deep "^1.2.0" - pascalcase "^0.1.1" - -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - -boolbase@~1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" - integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= - -brace-expansion@^1.1.7: - version "1.1.11" - resolved "https://repox.jfrog.io/repox/api/npm/npm/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd" - integrity sha1-PH/L9SnYcibz0vUrlm/1Jx60Qd0= - dependencies: - balanced-match "^1.0.0" - concat-map "0.0.1" - -braces@^2.3.1: - version "2.3.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" - integrity sha1-WXn9PxTNUxVl5fot8av/8d+u5yk= - dependencies: - arr-flatten "^1.1.0" - array-unique "^0.3.2" - extend-shallow "^2.0.1" - fill-range "^4.0.0" - isobject "^3.0.1" - repeat-element "^1.1.2" - snapdragon "^0.8.1" - snapdragon-node "^2.0.1" - split-string "^3.0.2" - to-regex "^3.0.1" - -braces@^3.0.1: - version "3.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" - integrity sha1-NFThpGLujVmeI23zNs2epPiv4Qc= - dependencies: - fill-range "^7.0.1" - -browser-process-hrtime@^0.1.2: - version "0.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4" - integrity sha1-YW8A+u8d9+wbW/nP4r3DFw8mx7Q= - -browser-resolve@^1.11.3: - version "1.11.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/browser-resolve/-/browser-resolve-1.11.3.tgz#9b7cbb3d0f510e4cb86bdbd796124d28b5890af6" - integrity sha1-m3y7PQ9RDky4a9vXlhJNKLWJCvY= - dependencies: - resolve "1.1.7" - -bs-logger@0.x: - version "0.2.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/bs-logger/-/bs-logger-0.2.6.tgz#eb7d365307a72cf974cc6cda76b68354ad336bd8" - integrity sha1-6302UwenLPl0zGzadraDVK0za9g= - dependencies: - fast-json-stable-stringify "2.x" - -bser@^2.0.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/bser/-/bser-2.1.0.tgz#65fc784bf7f87c009b973c12db6546902fa9c7b5" - integrity sha1-Zfx4S/f4fACblzwS22VGkC+px7U= - dependencies: - node-int64 "^0.4.0" - -buffer-from@1.x, buffer-from@^1.0.0: - version "1.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8= - -cache-base@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2" - integrity sha1-Cn9GQWgxyLZi7jb+TnxZ129marI= - dependencies: - collection-visit "^1.0.0" - component-emitter "^1.2.1" - get-value "^2.0.6" - has-value "^1.0.0" - isobject "^3.0.1" - set-value "^2.0.0" - to-object-path "^0.3.0" - union-value "^1.0.0" - unset-value "^1.0.0" - -call-me-maybe@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b" - integrity sha1-JtII6onje1y95gJQoV8DHBak1ms= - -caller-callsite@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134" - integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ= - dependencies: - callsites "^2.0.0" - -caller-path@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4" - integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ= - dependencies: - caller-callsite "^2.0.0" - -callsites@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" - integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= - -callsites@^3.0.0: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" - integrity sha1-s2MKvYlDQy9Us/BRkjjjPNffL3M= - -camelcase-keys@^4.0.0: - version "4.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/camelcase-keys/-/camelcase-keys-4.2.0.tgz#a2aa5fb1af688758259c32c141426d78923b9b77" - integrity sha1-oqpfsa9oh1glnDLBQUJteJI7m3c= - dependencies: - camelcase "^4.1.0" - map-obj "^2.0.0" - quick-lru "^1.0.0" - -camelcase@^4.1.0: - version "4.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd" - integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0= - -camelcase@^5.0.0, camelcase@^5.3.1: - version "5.3.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" - integrity sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA= - -capture-exit@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4" - integrity sha1-+5U7+uvreB9iiYI52rtCbQilCaQ= - dependencies: - rsvp "^4.8.4" - -caseless@~0.12.0: - version "0.12.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - -chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1: - version "2.4.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" - integrity sha1-zUJUFnelQzPPVBpJEIwUMrRMlCQ= - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/chalk/-/chalk-3.0.0.tgz#3f73c2bf526591f574cc492c51e2456349f844e4" - integrity sha1-P3PCv1JlkfV0zEksUeJFY0n4ROQ= - dependencies: - ansi-styles "^4.1.0" - supports-color "^7.1.0" - -chardet@^0.7.0: - version "0.7.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e" - integrity sha1-kAlISfCTfy7twkJdDSip5fDLrZ4= - -cheerio@^1.0.0-rc.3: - version "1.0.0-rc.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cheerio/-/cheerio-1.0.0-rc.3.tgz#094636d425b2e9c0f4eb91a46c05630c9a1a8bf6" - integrity sha1-CUY21CWy6cD065GkbAVjDJoai/Y= - dependencies: - css-select "~1.2.0" - dom-serializer "~0.1.1" - entities "~1.1.1" - htmlparser2 "^3.9.1" - lodash "^4.15.0" - parse5 "^3.0.1" - -ci-info@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" - integrity sha1-Z6npZL4xpR4V5QENWObxKDQAL0Y= - -class-utils@^0.3.5: - version "0.3.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" - integrity sha1-+TNprouafOAv1B+q0MqDAzGQxGM= - dependencies: - arr-union "^3.1.0" - define-property "^0.2.5" - isobject "^3.0.0" - static-extend "^0.1.1" - -classnames@2.2.6, classnames@^2.2.3, classnames@^2.2.4, classnames@^2.2.5: - version "2.2.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" - integrity sha1-Q5Nb/90pHzJtrQogUwmzjQD2UM4= - -cli-cursor@^3.1.0: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307" - integrity sha1-JkMFp65JDR0Dvwybp8kl0XU68wc= - dependencies: - restore-cursor "^3.1.0" - -cli-width@^2.0.0: - version "2.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= - -clipboard@2.0.6: - version "2.0.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/clipboard/-/clipboard-2.0.6.tgz#52921296eec0fdf77ead1749421b21c968647376" - integrity sha1-UpISlu7A/fd+rRdJQhshyWhkc3Y= - dependencies: - good-listener "^1.2.2" - select "^1.1.2" - tiny-emitter "^2.0.0" - -cliui@^6.0.0: - version "6.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" - integrity sha1-UR1wLAxOQcoVbX0OlgIfI+EyJbE= - dependencies: - string-width "^4.2.0" - strip-ansi "^6.0.0" - wrap-ansi "^6.2.0" - -co@^4.6.0: - version "4.6.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184" - integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ= - -collect-v8-coverage@^1.0.0: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59" - integrity sha1-zCyOlPwYu9/+ZNZTRXDIpnOyf1k= - -collection-visit@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0" - integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA= - dependencies: - map-visit "^1.0.0" - object-visit "^1.0.0" - -color-convert@^1.9.0: - version "1.9.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" - integrity sha1-u3GFBpDh8TZWfeYp0tVHHe2kweg= - dependencies: - color-name "1.1.3" - -color-convert@^2.0.1: - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" - integrity sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM= - dependencies: - color-name "~1.1.4" - -color-name@1.1.3: - version "1.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" - integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= - -color-name@~1.1.4: - version "1.1.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" - integrity sha1-wqCah6y95pVD3m9j+jmVyCbFNqI= - -combined-stream@^1.0.6, combined-stream@~1.0.6: - version "1.0.8" - resolved "https://repox.jfrog.io/repox/api/npm/npm/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" - integrity sha1-w9RaizT9cwYxoRCoolIGgrMdWn8= - dependencies: - delayed-stream "~1.0.0" - -commander@^2.11.0, commander@^2.19.0: - version "2.20.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422" - integrity sha1-1YuytcHuj4ew00ACfp6U4iLFpCI= - -component-emitter@^1.2.1: - version "1.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" - integrity sha1-FuQHD7qK4ptnnyIVhT7hgasuq8A= - -concat-map@0.0.1: - version "0.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" - integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s= - -contains-path@^0.1.0: - version "0.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a" - integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= - -convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0: - version "1.6.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20" - integrity sha1-UbU3qMQ+DwTewZk7/83VBOdYrCA= - dependencies: - safe-buffer "~5.1.1" - -convert-source-map@^1.6.0, convert-source-map@^1.7.0: - version "1.7.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" - integrity sha1-F6LLiC1/d9NJBYXizmxSRCSjpEI= - dependencies: - safe-buffer "~5.1.1" - -copy-descriptor@^0.1.0: - version "0.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" - integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= - -core-js-pure@^3.0.0: - version "3.6.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/core-js-pure/-/core-js-pure-3.6.5.tgz#c79e75f5e38dbc85a662d91eea52b8256d53b813" - integrity sha1-x5519eONvIWmYtke6lK4JW1TuBM= - -core-js@^1.0.0: - version "1.2.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" - integrity sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY= - -core-js@^2.4.0: - version "2.6.9" - resolved "https://repox.jfrog.io/repox/api/npm/npm/core-js/-/core-js-2.6.9.tgz#6b4b214620c834152e179323727fc19741b084f2" - integrity sha1-a0shRiDINBUuF5Mjcn/Bl0GwhPI= - -core-util-is@1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= - -cosmiconfig@^5.2.0: - version "5.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" - integrity sha1-BA9yaAnFked6F8CjYmykW08Wixo= - dependencies: - import-fresh "^2.0.0" - is-directory "^0.3.1" - js-yaml "^3.13.1" - parse-json "^4.0.0" - -cp-file@^6.1.0: - version "6.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d" - integrity sha1-QNXqSh3vKprN0HulwLAkbvc9wQ0= - dependencies: - graceful-fs "^4.1.2" - make-dir "^2.0.0" - nested-error-stacks "^2.0.0" - pify "^4.0.1" - safe-buffer "^5.0.1" - -cpy-cli@2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cpy-cli/-/cpy-cli-2.0.0.tgz#13f1528a231605c52ee7b7f74848e4be82253274" - integrity sha1-E/FSiiMWBcUu57f3SEjkvoIlMnQ= - dependencies: - cpy "^7.0.0" - meow "^5.0.0" - -cpy@^7.0.0: - version "7.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cpy/-/cpy-7.3.0.tgz#62f2847986b4ff9d029710568a49e9a9ab5a210e" - integrity sha1-YvKEeYa0/50ClxBWiknpqataIQ4= - dependencies: - arrify "^1.0.1" - cp-file "^6.1.0" - globby "^9.2.0" - nested-error-stacks "^2.1.0" - -create-react-class@^15.5.1: - version "15.6.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036" - integrity sha1-LXMjf7P5cK5uvgEanmb0bbyoADY= - dependencies: - fbjs "^0.8.9" - loose-envify "^1.3.1" - object-assign "^4.1.1" - -create-react-context@^0.2.2: - version "0.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/create-react-context/-/create-react-context-0.2.3.tgz#9ec140a6914a22ef04b8b09b7771de89567cb6f3" - integrity sha1-nsFAppFKIu8EuLCbd3HeiVZ8tvM= - dependencies: - fbjs "^0.8.0" - gud "^1.0.0" - -cross-spawn@^6.0.0, cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha1-Sl7Hxk364iw6FBJNus3uhG2Ay8Q= - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^7.0.0: - version "7.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cross-spawn/-/cross-spawn-7.0.2.tgz#d0d7dcfa74e89115c7619f4f721a94e1fdb716d6" - integrity sha1-0Nfc+nTokRXHYZ9PchqU4f23FtY= - dependencies: - path-key "^3.1.0" - shebang-command "^2.0.0" - which "^2.0.1" - -css-select@~1.2.0: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" - integrity sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg= - dependencies: - boolbase "~1.0.0" - css-what "2.1" - domutils "1.5.1" - nth-check "~1.0.1" - -css-what@2.1: - version "2.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2" - integrity sha1-ptdgRXM2X+dGhsPzEcVlE9iChfI= - -css@^2.2.1: - version "2.2.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" - integrity sha1-xkZ1XHOXHyu6amAeLPL9cbEpiSk= - dependencies: - inherits "^2.0.3" - source-map "^0.6.1" - source-map-resolve "^0.5.2" - urix "^0.1.0" - -cssom@^0.4.1: - version "0.4.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10" - integrity sha1-WmbPk9LQtmHYC/akT7ZfXC5OChA= - -cssom@~0.3.6: - version "0.3.8" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" - integrity sha1-nxJ29bK0Y/IRTT8sdSUK+MGjb0o= - -cssstyle@^2.0.0: - version "2.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/cssstyle/-/cssstyle-2.2.0.tgz#e4c44debccd6b7911ed617a4395e5754bba59992" - integrity sha1-5MRN68zWt5Ee1hekOV5XVLulmZI= - dependencies: - cssom "~0.3.6" - -csstype@^2.2.0, csstype@^2.5.7: - version "2.6.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/csstype/-/csstype-2.6.6.tgz#c34f8226a94bbb10c32cc0d714afdf942291fc41" - integrity sha1-w0+CJqlLuxDDLMDXFK/flCKR/EE= - -currently-unhandled@^0.4.1: - version "0.4.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" - integrity sha1-mI3zP+qxke95mmE2nddsF635V+o= - dependencies: - array-find-index "^1.0.1" - -"d3-array@1.2.0 - 2", d3-array@2.4.0: - version "2.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-array/-/d3-array-2.4.0.tgz#87f8b9ad11088769c82b5ea846bcb1cc9393f242" - integrity sha1-h/i5rREIh2nIK16oRryxzJOT8kI= - -d3-color@1: - version "1.2.8" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-color/-/d3-color-1.2.8.tgz#4eaf9b60ef188c893fcf8b28f3546aafebfbd9f4" - integrity sha1-Tq+bYO8YjIk/z4so81Rqr+v72fQ= - -d3-dispatch@1: - version "1.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-dispatch/-/d3-dispatch-1.0.5.tgz#e25c10a186517cd6c82dd19ea018f07e01e39015" - integrity sha1-4lwQoYZRfNbILdGeoBjwfgHjkBU= - -d3-drag@1: - version "1.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-drag/-/d3-drag-1.2.3.tgz#46e206ad863ec465d88c588098a1df444cd33c64" - integrity sha1-RuIGrYY+xGXYjFiAmKHfREzTPGQ= - dependencies: - d3-dispatch "1" - d3-selection "1" - -d3-ease@1: - version "1.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-ease/-/d3-ease-1.0.5.tgz#8ce59276d81241b1b72042d6af2d40e76d936ffb" - integrity sha1-jOWSdtgSQbG3IELWry1A522Tb/s= - -d3-format@1: - version "1.3.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-format/-/d3-format-1.3.2.tgz#6a96b5e31bcb98122a30863f7d92365c00603562" - integrity sha1-apa14xvLmBIqMIY/fZI2XABgNWI= - -d3-hierarchy@1.1.9: - version "1.1.9" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz#2f6bee24caaea43f8dc37545fa01628559647a83" - integrity sha1-L2vuJMqupD+Nw3VF+gFihVlkeoM= - -d3-interpolate@1: - version "1.3.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-interpolate/-/d3-interpolate-1.3.2.tgz#417d3ebdeb4bc4efcc8fd4361c55e4040211fd68" - integrity sha1-QX0+vetLxO/Mj9Q2HFXkBAIR/Wg= - dependencies: - d3-color "1" - -d3-interpolate@^1.2.0: - version "1.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-interpolate/-/d3-interpolate-1.4.0.tgz#526e79e2d80daa383f9e0c1c1c7dcc0f0583e987" - integrity sha1-Um554tgNqjg/ngwcHH3MDwWD6Yc= - dependencies: - d3-color "1" - -d3-path@1: - version "1.0.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-path/-/d3-path-1.0.7.tgz#8de7cd693a75ac0b5480d3abaccd94793e58aae8" - integrity sha1-jefNaTp1rAtUgNOrrM2UeT5Yqug= - -d3-scale@3.2.1: - version "3.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-scale/-/d3-scale-3.2.1.tgz#da1684adce7261b4bc7a76fe193d887f0e909e69" - integrity sha1-2haErc5yYbS8enb+GT2Ifw6Qnmk= - dependencies: - d3-array "1.2.0 - 2" - d3-format "1" - d3-interpolate "^1.2.0" - d3-time "1" - d3-time-format "2" - -d3-selection@1, d3-selection@^1.1.0: - version "1.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-selection/-/d3-selection-1.4.0.tgz#ab9ac1e664cf967ebf1b479cc07e28ce9908c474" - integrity sha1-q5rB5mTPln6/G0ecwH4ozpkIxHQ= - -d3-selection@1.4.1: - version "1.4.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-selection/-/d3-selection-1.4.1.tgz#98eedbbe085fbda5bafa2f9e3f3a2f4d7d622a98" - integrity sha1-mO7bvghfvaW6+i+ePzovTX1iKpg= - -d3-shape@1.3.7: - version "1.3.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-shape/-/d3-shape-1.3.7.tgz#df63801be07bc986bc54f63789b4fe502992b5d7" - integrity sha1-32OAG+B7yYa8VPY3ibT+UCmStdc= - dependencies: - d3-path "1" - -d3-time-format@2: - version "2.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-time-format/-/d3-time-format-2.1.3.tgz#ae06f8e0126a9d60d6364eac5b1533ae1bac826b" - integrity sha1-rgb44BJqnWDWNk6sWxUzrhusgms= - dependencies: - d3-time "1" - -d3-time@1: - version "1.0.11" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-time/-/d3-time-1.0.11.tgz#1d831a3e25cd189eb256c17770a666368762bbce" - integrity sha1-HYMaPiXNGJ6yVsF3cKZmNodiu84= - -d3-timer@1: - version "1.0.9" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-timer/-/d3-timer-1.0.9.tgz#f7bb8c0d597d792ff7131e1c24a36dd471a471ba" - integrity sha1-97uMDVl9eS/3Ex4cJKNt1HGkcbo= - -d3-transition@1: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-transition/-/d3-transition-1.2.0.tgz#f538c0e21b2aa1f05f3e965f8567e81284b3b2b8" - integrity sha1-9TjA4hsqofBfPpZfhWfoEoSzsrg= - dependencies: - d3-color "1" - d3-dispatch "1" - d3-ease "1" - d3-interpolate "1" - d3-selection "^1.1.0" - d3-timer "1" - -d3-zoom@1.8.3: - version "1.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/d3-zoom/-/d3-zoom-1.8.3.tgz#b6a3dbe738c7763121cd05b8a7795ffe17f4fc0a" - integrity sha1-tqPb5zjHdjEhzQW4p3lf/hf0/Ao= - dependencies: - d3-dispatch "1" - d3-drag "1" - d3-interpolate "1" - d3-selection "1" - d3-transition "1" - -damerau-levenshtein@^1.0.4: - version "1.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz#780cf7144eb2e8dbd1c3bb83ae31100ccc31a414" - integrity sha1-eAz3FE6y6NvRw7uDrjEQDMwxpBQ= - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" - -data-urls@^1.1.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/data-urls/-/data-urls-1.1.0.tgz#15ee0582baa5e22bb59c77140da8f9c76963bbfe" - integrity sha1-Fe4Fgrql4iu1nHcUDaj5x2lju/4= - dependencies: - abab "^2.0.0" - whatwg-mimetype "^2.2.0" - whatwg-url "^7.0.0" - -date-fns@1.30.1: - version "1.30.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" - integrity sha1-LnG/CxGRU9u0zE6I2epaz7UNwFw= - -debug@^2.2.0, debug@^2.3.3, debug@^2.6.9: - version "2.6.9" - resolved "https://repox.jfrog.io/repox/api/npm/npm/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha1-XRKFFd8TT/Mn6QpMk/Tgd6U2NB8= - dependencies: - ms "2.0.0" - -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: - version "4.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" - integrity sha1-O3ImAlUQnGtYnO4FDx1RYTlmR5E= - dependencies: - ms "^2.1.1" - -decamelize-keys@^1.0.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9" - integrity sha1-0XGoeTMlKAfrPLYdwcFEXQeN8tk= - dependencies: - decamelize "^1.1.0" - map-obj "^1.0.0" - -decamelize@^1.1.0, decamelize@^1.2.0: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" - integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= - -decode-uri-component@^0.2.0: - version "0.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" - integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU= - -deep-is@~0.1.3: - version "0.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" - integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= - -deepmerge@^2.1.1: - version "2.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170" - integrity sha1-XT/yKgHAD2RUBaL7wX0HeKGAEXA= - -deepmerge@^4.2.2: - version "4.2.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955" - integrity sha1-RNLqNnm49NT/ujPwPYZfwee/SVU= - -define-properties@^1.1.2, define-properties@^1.1.3: - version "1.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1" - integrity sha1-z4jabL7ib+bbcJT2HYcMvYTO6fE= - dependencies: - object-keys "^1.0.12" - -define-property@^0.2.5: - version "0.2.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" - integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY= - dependencies: - is-descriptor "^0.1.0" - -define-property@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6" - integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY= - dependencies: - is-descriptor "^1.0.0" - -define-property@^2.0.2: - version "2.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d" - integrity sha1-1Flono1lS6d+AqgX+HENcCyxbp0= - dependencies: - is-descriptor "^1.0.2" - isobject "^3.0.1" - -delayed-stream@~1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" - integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk= - -delegate@^3.1.2: - version "3.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/delegate/-/delegate-3.2.0.tgz#b66b71c3158522e8ab5744f720d8ca0c2af59166" - integrity sha1-tmtxwxWFIuirV0T3INjKDCr1kWY= - -detect-newline@^3.0.0: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651" - integrity sha1-V29d/GOuGhkv8ZLYrTr2MImRtlE= - -diff-sequences@^25.2.6: - version "25.2.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" - integrity sha1-X0Z8AO3TU1K3vKRteSfWDmh6dt0= - -diff@4.0.1: - version "4.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/diff/-/diff-4.0.1.tgz#0c667cb467ebbb5cea7f14f135cc2dba7780a8ff" - integrity sha1-DGZ8tGfru1zqfxTxNcwtuneAqP8= - -dir-glob@^2.2.2: - version "2.2.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/dir-glob/-/dir-glob-2.2.2.tgz#fa09f0694153c8918b18ba0deafae94769fc50c4" - integrity sha1-+gnwaUFTyJGLGLoN6vrpR2n8UMQ= - dependencies: - path-type "^3.0.0" - -dir-glob@^3.0.1: - version "3.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" - integrity sha1-Vtv3PZkqSpO6FYT0U0Bj/S5BcX8= - dependencies: - path-type "^4.0.0" - -discontinuous-range@1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/discontinuous-range/-/discontinuous-range-1.0.0.tgz#e38331f0844bba49b9a9cb71c771585aab1bc65a" - integrity sha1-44Mx8IRLukm5qctxx3FYWqsbxlo= - -doctrine@1.5.0: - version "1.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa" - integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo= - dependencies: - esutils "^2.0.2" - isarray "^1.0.0" - -doctrine@^2.1.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" - integrity sha1-XNAfwQFiG0LEzX9dGmYkNxbT850= - dependencies: - esutils "^2.0.2" - -doctrine@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" - integrity sha1-rd6+rXKmV023g2OdyHoSF3OXOWE= - dependencies: - esutils "^2.0.2" - -"dom-helpers@^2.4.0 || ^3.0.0": - version "3.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/dom-helpers/-/dom-helpers-3.4.0.tgz#e9b369700f959f62ecde5a6babde4bccd9169af8" - integrity sha1-6bNpcA+Vn2Ls3lprq95LzNkWmvg= - dependencies: - "@babel/runtime" "^7.1.2" - -dom-serializer@0, dom-serializer@~0.1.1: - version "0.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0" - integrity sha1-HsQFnihLq+027sKUHUqXChic58A= - dependencies: - domelementtype "^1.3.0" - entities "^1.1.1" - -domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1: - version "1.3.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" - integrity sha1-0EjESzew0Qp/Kj1f7j9DM9eQSB8= - -domexception@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90" - integrity sha1-k3RCZEymoxJh7zbj7Gd/6AVYLJA= - dependencies: - webidl-conversions "^4.0.2" - -domhandler@^2.3.0: - version "2.4.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" - integrity sha1-iAUJfpM9ZehVRvcm1g9euItE+AM= - dependencies: - domelementtype "1" - -domutils@1.5.1: - version "1.5.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf" - integrity sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8= - dependencies: - dom-serializer "0" - domelementtype "1" - -domutils@^1.5.1: - version "1.7.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" - integrity sha1-Vuo0HoNOBuZ0ivehyyXaZ+qfjCo= - dependencies: - dom-serializer "0" - domelementtype "1" - -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - -emoji-regex@^7.0.2: - version "7.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" - integrity sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY= - -emoji-regex@^8.0.0: - version "8.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" - integrity sha1-6Bj9ac5cz8tARZT4QpY79TFkzDc= - -emotion-theming@10.0.19: - version "10.0.19" - resolved "https://repox.jfrog.io/repox/api/npm/npm/emotion-theming/-/emotion-theming-10.0.19.tgz#66d13db74fccaefad71ba57c915b306cf2250295" - integrity sha1-ZtE9t0/MrvrXG6V8kVswbPIlApU= - dependencies: - "@babel/runtime" "^7.5.5" - "@emotion/weak-memoize" "0.2.4" - hoist-non-react-statics "^3.3.0" - -encoding@^0.1.11: - version "0.1.12" - resolved "https://repox.jfrog.io/repox/api/npm/npm/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" - integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s= - dependencies: - iconv-lite "~0.4.13" - -end-of-stream@^1.1.0: - version "1.4.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43" - integrity sha1-7SljTRm6ukY7bOa4CjchPqtx7EM= - dependencies: - once "^1.4.0" - -entities@^1.1.1, entities@~1.1.1: - version "1.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" - integrity sha1-vfpzUplmTfr9NFKe1PhSKidf6lY= - -enzyme-adapter-react-16@1.15.2: - version "1.15.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz#b16db2f0ea424d58a808f9df86ab6212895a4501" - integrity sha1-sW2y8OpCTVioCPnfhqtiEolaRQE= - dependencies: - enzyme-adapter-utils "^1.13.0" - enzyme-shallow-equal "^1.0.1" - has "^1.0.3" - object.assign "^4.1.0" - object.values "^1.1.1" - prop-types "^15.7.2" - react-is "^16.12.0" - react-test-renderer "^16.0.0-0" - semver "^5.7.0" - -enzyme-adapter-utils@^1.13.0: - version "1.13.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz#01c885dde2114b4690bf741f8dc94cee3060eb78" - integrity sha1-AciF3eIRS0aQv3QfjclM7jBg63g= - dependencies: - airbnb-prop-types "^2.15.0" - function.prototype.name "^1.1.2" - object.assign "^4.1.0" - object.fromentries "^2.0.2" - prop-types "^15.7.2" - semver "^5.7.1" - -enzyme-shallow-equal@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.1.tgz#7afe03db3801c9b76de8440694096412a8d9d49e" - integrity sha1-ev4D2zgBybdt6EQGlAlkEqjZ1J4= - dependencies: - has "^1.0.3" - object-is "^1.0.2" - -enzyme-to-json@3.4.4: - version "3.4.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/enzyme-to-json/-/enzyme-to-json-3.4.4.tgz#b30726c59091d273521b6568c859e8831e94d00e" - integrity sha1-swcmxZCR0nNSG2VoyFnogx6U0A4= - dependencies: - lodash "^4.17.15" - react-is "^16.12.0" - -enzyme@3.11.0: - version "3.11.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/enzyme/-/enzyme-3.11.0.tgz#71d680c580fe9349f6f5ac6c775bc3e6b7a79c28" - integrity sha1-cdaAxYD+k0n29axsd1vD5rennCg= - dependencies: - array.prototype.flat "^1.2.3" - cheerio "^1.0.0-rc.3" - enzyme-shallow-equal "^1.0.1" - function.prototype.name "^1.1.2" - has "^1.0.3" - html-element-map "^1.2.0" - is-boolean-object "^1.0.1" - is-callable "^1.1.5" - is-number-object "^1.0.4" - is-regex "^1.0.5" - is-string "^1.0.5" - is-subset "^0.1.1" - lodash.escape "^4.0.1" - lodash.isequal "^4.5.0" - object-inspect "^1.7.0" - object-is "^1.0.2" - object.assign "^4.1.0" - object.entries "^1.1.1" - object.values "^1.1.1" - raf "^3.4.1" - rst-selector-parser "^2.2.3" - string.prototype.trim "^1.2.1" - -error-ex@^1.2.0, error-ex@^1.3.1: - version "1.3.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf" - integrity sha1-tKxAZIEH/c3PriQvQovqihTU8b8= - dependencies: - is-arrayish "^0.2.1" - -es-abstract@^1.10.0, es-abstract@^1.12.0, es-abstract@^1.7.0: - version "1.13.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9" - integrity sha1-rIYUX91QmdjdSVWMy6Lq+biOJOk= - dependencies: - es-to-primitive "^1.2.0" - function-bind "^1.1.1" - has "^1.0.3" - is-callable "^1.1.4" - is-regex "^1.0.4" - object-keys "^1.0.12" - -es-abstract@^1.17.0: - version "1.17.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/es-abstract/-/es-abstract-1.17.5.tgz#d8c9d1d66c8981fb9200e2251d799eee92774ae9" - integrity sha1-2MnR1myJgfuSAOIlHXme7pJ3Suk= - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.1.5" - is-regex "^1.0.5" - object-inspect "^1.7.0" - object-keys "^1.1.1" - object.assign "^4.1.0" - string.prototype.trimleft "^2.1.1" - string.prototype.trimright "^2.1.1" - -es-abstract@^1.17.0-next.1, es-abstract@^1.17.4: - version "1.17.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" - integrity sha1-467fGXBrIOfCWUw1/A1XYFp54YQ= - dependencies: - es-to-primitive "^1.2.1" - function-bind "^1.1.1" - has "^1.0.3" - has-symbols "^1.0.1" - is-callable "^1.1.5" - is-regex "^1.0.5" - object-inspect "^1.7.0" - object-keys "^1.1.1" - object.assign "^4.1.0" - string.prototype.trimleft "^2.1.1" - string.prototype.trimright "^2.1.1" - -es-to-primitive@^1.2.0: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377" - integrity sha1-7fckeAM0VujdqO8J4ArZZQcH83c= - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -es-to-primitive@^1.2.1: - version "1.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a" - integrity sha1-5VzUyc3BiLzvsDs2bHNjI/xciYo= - dependencies: - is-callable "^1.1.4" - is-date-object "^1.0.1" - is-symbol "^1.0.2" - -escape-string-regexp@^1.0.5: - version "1.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" - integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= - -escodegen@^1.11.1: - version "1.14.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/escodegen/-/escodegen-1.14.1.tgz#ba01d0c8278b5e95a9a45350142026659027a457" - integrity sha1-ugHQyCeLXpWppFNQFCAmZZAnpFc= - dependencies: - esprima "^4.0.1" - estraverse "^4.2.0" - esutils "^2.0.2" - optionator "^0.8.1" - optionalDependencies: - source-map "~0.6.1" - -eslint-config-sonarqube@0.6.1: - version "0.6.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-config-sonarqube/-/eslint-config-sonarqube-0.6.1.tgz#6779dfd643341e9688c4181800403bd26544d584" - integrity sha1-Z3nf1kM0HpaIxBgYAEA70mVE1YQ= - -eslint-import-resolver-node@^0.3.2: - version "0.3.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz#58f15fb839b8d0576ca980413476aab2472db66a" - integrity sha1-WPFfuDm40FdsqYBBNHaqskcttmo= - dependencies: - debug "^2.6.9" - resolve "^1.5.0" - -eslint-module-utils@^2.4.1: - version "2.5.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708" - integrity sha1-eHj3UEgk4bhX3SUFtZqOXtompwg= - dependencies: - debug "^2.6.9" - pkg-dir "^2.0.0" - -eslint-plugin-import@2.20.1: - version "2.20.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3" - integrity sha1-gCQjGW3LEdnOhDWl/AKm07RpObM= - dependencies: - array-includes "^3.0.3" - array.prototype.flat "^1.2.1" - contains-path "^0.1.0" - debug "^2.6.9" - doctrine "1.5.0" - eslint-import-resolver-node "^0.3.2" - eslint-module-utils "^2.4.1" - has "^1.0.3" - minimatch "^3.0.4" - object.values "^1.1.0" - read-pkg-up "^2.0.0" - resolve "^1.12.0" - -eslint-plugin-jest@23.8.2: - version "23.8.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-plugin-jest/-/eslint-plugin-jest-23.8.2.tgz#6f28b41c67ef635f803ebd9e168f6b73858eb8d4" - integrity sha1-byi0HGfvY1+APr2eFo9rc4WOuNQ= - dependencies: - "@typescript-eslint/experimental-utils" "^2.5.0" - -eslint-plugin-jsx-a11y@6.2.3: - version "6.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz#b872a09d5de51af70a97db1eea7dc933043708aa" - integrity sha1-uHKgnV3lGvcKl9se6n3JMwQ3CKo= - dependencies: - "@babel/runtime" "^7.4.5" - aria-query "^3.0.0" - array-includes "^3.0.3" - ast-types-flow "^0.0.7" - axobject-query "^2.0.2" - damerau-levenshtein "^1.0.4" - emoji-regex "^7.0.2" - has "^1.0.3" - jsx-ast-utils "^2.2.1" - -eslint-plugin-promise@4.2.1: - version "4.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" - integrity sha1-hF/YsiYK2PglZMEiL85ErXHZQYo= - -eslint-plugin-react-hooks@2.5.1: - version "2.5.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz#4ef5930592588ce171abeb26f400c7fbcbc23cd0" - integrity sha1-TvWTBZJYjOFxq+sm9ADH+8vCPNA= - -eslint-plugin-react@7.19.0: - version "7.19.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-plugin-react/-/eslint-plugin-react-7.19.0.tgz#6d08f9673628aa69c5559d33489e855d83551666" - integrity sha1-bQj5ZzYoqmnFVZ0zSJ6FXYNVFmY= - dependencies: - array-includes "^3.1.1" - doctrine "^2.1.0" - has "^1.0.3" - jsx-ast-utils "^2.2.3" - object.entries "^1.1.1" - object.fromentries "^2.0.2" - object.values "^1.1.1" - prop-types "^15.7.2" - resolve "^1.15.1" - semver "^6.3.0" - string.prototype.matchall "^4.0.2" - xregexp "^4.3.0" - -eslint-plugin-sonarjs@0.5.0: - version "0.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-plugin-sonarjs/-/eslint-plugin-sonarjs-0.5.0.tgz#ce17b2daba65a874c2862213a9e38e8986ad7d7d" - integrity sha1-zhey2rplqHTChiITqeOOiYatfX0= - -eslint-scope@^5.0.0: - version "5.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" - integrity sha1-6HyIh8c+jR7ITxylkWRcNYv8j7k= - dependencies: - esrecurse "^4.1.0" - estraverse "^4.1.1" - -eslint-utils@^1.4.3: - version "1.4.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" - integrity sha1-dP7HxU0Hdrb2fgJRBAtYBlZOmB8= - dependencies: - eslint-visitor-keys "^1.1.0" - -eslint-utils@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd" - integrity sha1-e+HMcPJ6cqds0UqmmLyr7WiQ4c0= - dependencies: - eslint-visitor-keys "^1.1.0" - -eslint-visitor-keys@^1.1.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" - integrity sha1-4qgs6oT/JGrW+1f5veW0ZiFFnsI= - -eslint@6.8.0: - version "6.8.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" - integrity sha1-YiYtZylzn5J1cjgkMC+yJ8jJP/s= - dependencies: - "@babel/code-frame" "^7.0.0" - ajv "^6.10.0" - chalk "^2.1.0" - cross-spawn "^6.0.5" - debug "^4.0.1" - doctrine "^3.0.0" - eslint-scope "^5.0.0" - eslint-utils "^1.4.3" - eslint-visitor-keys "^1.1.0" - espree "^6.1.2" - esquery "^1.0.1" - esutils "^2.0.2" - file-entry-cache "^5.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" - globals "^12.1.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - inquirer "^7.0.0" - is-glob "^4.0.0" - js-yaml "^3.13.1" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" - lodash "^4.17.14" - minimatch "^3.0.4" - mkdirp "^0.5.1" - natural-compare "^1.4.0" - optionator "^0.8.3" - progress "^2.0.0" - regexpp "^2.0.1" - semver "^6.1.2" - strip-ansi "^5.2.0" - strip-json-comments "^3.0.1" - table "^5.2.3" - text-table "^0.2.0" - v8-compile-cache "^2.0.3" - -espree@^6.1.2: - version "6.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" - integrity sha1-d/xy4f10SiBSwg84pbV1gy6Cc0o= - dependencies: - acorn "^7.1.1" - acorn-jsx "^5.2.0" - eslint-visitor-keys "^1.1.0" - -esprima@^4.0.0, esprima@^4.0.1: - version "4.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" - integrity sha1-E7BM2z5sXRnfkatph6hpVhmwqnE= - -esquery@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708" - integrity sha1-QGxRZYsfWZGl+bYrHcJbAOPlxwg= - dependencies: - estraverse "^4.0.0" - -esrecurse@^4.1.0: - version "4.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" - integrity sha1-AHo7n9vCs7uH5IeeoZyS/b05Qs8= - dependencies: - estraverse "^4.1.0" - -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: - version "4.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" - integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM= - -esutils@^2.0.2: - version "2.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" - integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs= - -exec-sh@^0.3.2: - version "0.3.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b" - integrity sha1-ZzjeLrfI5nHQNmrqCw24xvfXORs= - -execa@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" - integrity sha1-xiNqW7TfbW8V6I5/AXeYIWdJ3dg= - dependencies: - cross-spawn "^6.0.0" - get-stream "^4.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - -execa@^3.2.0: - version "3.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89" - integrity sha1-wI7UVQ72XYWPrCaf/IVyRG8364k= - dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" - is-stream "^2.0.0" - merge-stream "^2.0.0" - npm-run-path "^4.0.0" - onetime "^5.1.0" - p-finally "^2.0.0" - signal-exit "^3.0.2" - strip-final-newline "^2.0.0" - -exenv@^1.2.0: - version "1.2.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/exenv/-/exenv-1.2.2.tgz#2ae78e85d9894158670b03d47bec1f03bd91bb9d" - integrity sha1-KueOhdmJQVhnCwPUe+wfA72Ru50= - -exit@^0.1.2: - version "0.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c" - integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw= - -expand-brackets@^2.1.4: - version "2.1.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622" - integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI= - dependencies: - debug "^2.3.3" - define-property "^0.2.5" - extend-shallow "^2.0.1" - posix-character-classes "^0.1.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -expect@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/expect/-/expect-25.4.0.tgz#0b16c17401906d1679d173e59f0d4580b22f8dc8" - integrity sha1-CxbBdAGQbRZ50XPlnw1FgLIvjcg= - dependencies: - "@jest/types" "^25.4.0" - ansi-styles "^4.0.0" - jest-get-type "^25.2.6" - jest-matcher-utils "^25.4.0" - jest-message-util "^25.4.0" - jest-regex-util "^25.2.6" - -extend-shallow@^2.0.1: - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f" - integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8= - dependencies: - is-extendable "^0.1.0" - -extend-shallow@^3.0.0, extend-shallow@^3.0.2: - version "3.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8" - integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg= - dependencies: - assign-symbols "^1.0.0" - is-extendable "^1.0.1" - -extend@~3.0.2: - version "3.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha1-+LETa0Bx+9jrFAr/hYsQGewpFfo= - -external-editor@^3.0.3: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" - integrity sha1-ywP3QL764D6k0oPK7SdBqD8zVJU= - dependencies: - chardet "^0.7.0" - iconv-lite "^0.4.24" - tmp "^0.0.33" - -extglob@^2.0.4: - version "2.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543" - integrity sha1-rQD+TcYSqSMuhxhxHcXLWrAoVUM= - dependencies: - array-unique "^0.3.2" - define-property "^1.0.0" - expand-brackets "^2.1.4" - extend-shallow "^2.0.1" - fragment-cache "^0.2.1" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= - -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= - -fast-deep-equal@^3.1.1: - version "3.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" - integrity sha1-VFFFB3xQFJHjOxXsQIwpQ3bpSuQ= - -fast-glob@^2.2.6: - version "2.2.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d" - integrity sha1-aVOFfDr6R1//ku5gFdUtpwpM050= - dependencies: - "@mrmlnc/readdir-enhanced" "^2.2.1" - "@nodelib/fs.stat" "^1.1.2" - glob-parent "^3.1.0" - is-glob "^4.0.0" - merge2 "^1.2.3" - micromatch "^3.1.10" - -fast-glob@^3.0.3: - version "3.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fast-glob/-/fast-glob-3.0.4.tgz#d484a41005cb6faeb399b951fd1bd70ddaebb602" - integrity sha1-1ISkEAXLb66zmblR/RvXDdrrtgI= - dependencies: - "@nodelib/fs.stat" "^2.0.1" - "@nodelib/fs.walk" "^1.2.1" - glob-parent "^5.0.0" - is-glob "^4.0.1" - merge2 "^1.2.3" - micromatch "^4.0.2" - -fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2" - integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I= - -fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6: - version "2.0.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" - integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= - -fastq@^1.6.0: - version "1.6.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fastq/-/fastq-1.6.0.tgz#4ec8a38f4ac25f21492673adb7eae9cfef47d1c2" - integrity sha1-Tsijj0rCXyFJJnOtt+rpz+9H0cI= - dependencies: - reusify "^1.0.0" - -fb-watchman@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fb-watchman/-/fb-watchman-2.0.0.tgz#54e9abf7dfa2f26cd9b1636c588c1afc05de5d58" - integrity sha1-VOmr99+i8mzZsWNsWIwa/AXeXVg= - dependencies: - bser "^2.0.0" - -fbjs@^0.8.0, fbjs@^0.8.9: - version "0.8.17" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd" - integrity sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90= - dependencies: - core-js "^1.0.0" - isomorphic-fetch "^2.1.1" - loose-envify "^1.0.0" - object-assign "^4.1.0" - promise "^7.1.1" - setimmediate "^1.0.5" - ua-parser-js "^0.7.18" - -figures@^3.0.0: - version "3.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha1-YlwYvSk8YE3EqN2y/r8MiDQXRq8= - dependencies: - escape-string-regexp "^1.0.5" - -file-entry-cache@^5.0.1: - version "5.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" - integrity sha1-yg9u+m3T1WEzP7FFFQZcL6/fQ5w= - dependencies: - flat-cache "^2.0.1" - -fill-range@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7" - integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc= - dependencies: - extend-shallow "^2.0.1" - is-number "^3.0.0" - repeat-string "^1.6.1" - to-regex-range "^2.1.0" - -fill-range@^7.0.1: - version "7.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" - integrity sha1-GRmmp8df44ssfHflGYU12prN2kA= - dependencies: - to-regex-range "^5.0.1" - -find-root@^1.1.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" - integrity sha1-q8/Iunb3CMQql7PWhbfpRQv7nOQ= - -find-up@^2.0.0, find-up@^2.1.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7" - integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= - dependencies: - locate-path "^2.0.0" - -find-up@^4.0.0, find-up@^4.1.0: - version "4.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19" - integrity sha1-l6/n1s3AvFkoWEt8jXsW6KmqXRk= - dependencies: - locate-path "^5.0.0" - path-exists "^4.0.0" - -flat-cache@^2.0.1: - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" - integrity sha1-XSltbwS9pEpGMKMBQTvbwuwIXsA= - dependencies: - flatted "^2.0.0" - rimraf "2.6.3" - write "1.0.3" - -flatted@^2.0.0: - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" - integrity sha1-aeV8qo8OrLwoHS4stFjUb9tEngg= - -for-in@^1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" - integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA= - -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= - -form-data@~2.3.2: - version "2.3.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha1-3M5SwF9kTymManq5Nr1yTO/786Y= - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - -formik@1.2.0: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/formik/-/formik-1.2.0.tgz#a0daf8512ce2ec18d88ff59a5bb172b0167e85d1" - integrity sha1-oNr4USzi7BjYj/WaW7FysBZ+hdE= - dependencies: - create-react-context "^0.2.2" - deepmerge "^2.1.1" - hoist-non-react-statics "^2.5.5" - lodash.clonedeep "^4.5.0" - lodash.topath "4.5.2" - prop-types "^15.6.1" - react-fast-compare "^1.0.0" - tslib "^1.9.3" - warning "^3.0.0" - -fragment-cache@^0.2.1: - version "0.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" - integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk= - dependencies: - map-cache "^0.2.2" - -fs.realpath@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" - integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= - -fsevents@^2.1.2: - version "2.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/fsevents/-/fsevents-2.1.2.tgz#4c0a1fb34bc68e543b4b82a9ec392bfbda840805" - integrity sha1-TAofs0vGjlQ7S4Kp7Dkr+9qECAU= - -function-bind@^1.1.1: - version "1.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" - integrity sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0= - -function.prototype.name@^1.1.1, function.prototype.name@^1.1.2: - version "1.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/function.prototype.name/-/function.prototype.name-1.1.2.tgz#5cdf79d7c05db401591dfde83e3b70c5123e9a45" - integrity sha1-XN9518BdtAFZHf3oPjtwxRI+mkU= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - functions-have-names "^1.2.0" - -functional-red-black-tree@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" - integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= - -functions-have-names@^1.2.0: - version "1.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/functions-have-names/-/functions-have-names-1.2.1.tgz#a981ac397fa0c9964551402cdc5533d7a4d52f91" - integrity sha1-qYGsOX+gyZZFUUAs3FUz16TVL5E= - -gensync@^1.0.0-beta.1: - version "1.0.0-beta.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269" - integrity sha1-WPQ2H/mH5f9uHnohCCeqNx6qwmk= - -get-caller-file@^2.0.1: - version "2.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" - integrity sha1-T5RBKoLbMvNuOwuXQfipf+sDH34= - -get-stream@^4.0.0: - version "4.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5" - integrity sha1-wbJVV189wh1Zv8ec09K0axw6VLU= - dependencies: - pump "^3.0.0" - -get-stream@^5.0.0: - version "5.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9" - integrity sha1-ASA83JJZf5uQkGfD5lbMH008Tck= - dependencies: - pump "^3.0.0" - -get-value@^2.0.3, get-value@^2.0.6: - version "2.0.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" - integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= - -getpass@^0.1.1: - version "0.1.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - -glob-parent@^3.1.0: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" - integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4= - dependencies: - is-glob "^3.1.0" - path-dirname "^1.0.0" - -glob-parent@^5.0.0: - version "5.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954" - integrity sha1-HcmfDzmwBtPpLCwoQGg4Lwwg6VQ= - dependencies: - is-glob "^4.0.1" - -glob-to-regexp@^0.3.0: - version "0.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" - integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= - -glob@^7.1.1, glob@^7.1.2, glob@^7.1.3: - version "7.1.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255" - integrity sha1-qmCKL2xXetNX4a5aXCbZqNGWklU= - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.4: - version "7.1.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0" - integrity sha1-ZxTGm+4g88PmTE3ZBVU+UytAzcA= - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -glob@^7.1.6: - version "7.1.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha1-FB8zuBp8JJLhJVlDB0gMRmeSeKY= - dependencies: - fs.realpath "^1.0.0" - inflight "^1.0.4" - inherits "2" - minimatch "^3.0.4" - once "^1.3.0" - path-is-absolute "^1.0.0" - -globals@^11.1.0: - version "11.12.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" - integrity sha1-q4eVM4hooLq9hSV1gBjCp+uVxC4= - -globals@^12.1.0: - version "12.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" - integrity sha1-oYgTV2pBsAokqX5/gVkYwuGZJfg= - dependencies: - type-fest "^0.8.1" - -globby@10.0.1: - version "10.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/globby/-/globby-10.0.1.tgz#4782c34cb75dd683351335c5829cc3420e606b22" - integrity sha1-R4LDTLdd1oM1EzXFgpzDQg5gayI= - dependencies: - "@types/glob" "^7.1.1" - array-union "^2.1.0" - dir-glob "^3.0.1" - fast-glob "^3.0.3" - glob "^7.1.3" - ignore "^5.1.1" - merge2 "^1.2.3" - slash "^3.0.0" - -globby@^9.2.0: - version "9.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/globby/-/globby-9.2.0.tgz#fd029a706c703d29bdd170f4b6db3a3f7a7cb63d" - integrity sha1-/QKacGxwPSm90XD0tts6P3p8tj0= - dependencies: - "@types/glob" "^7.1.1" - array-union "^1.0.2" - dir-glob "^2.2.2" - fast-glob "^2.2.6" - glob "^7.1.3" - ignore "^4.0.3" - pify "^4.0.1" - slash "^2.0.0" - -good-listener@^1.2.2: - version "1.2.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50" - integrity sha1-1TswzfkxPf+33JoNR3CWqm0UXFA= - dependencies: - delegate "^3.1.2" - -graceful-fs@^4.1.2: - version "4.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b" - integrity sha1-jY/cc5d8sEEEchy1NmbBymTNMos= - -graceful-fs@^4.2.3: - version "4.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha1-ShL/G2A3bvCYYsIJPt2Qgyi+hCM= - -growly@^1.3.0: - version "1.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" - integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE= - -gud@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/gud/-/gud-1.0.0.tgz#a489581b17e6a70beca9abe3ae57de7a499852c0" - integrity sha1-pIlYGxfmpwvsqavjrlfeekmYUsA= - -har-schema@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.3: - version "5.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - integrity sha1-HvievT5JllV2de7ZiTEQ3DUPoIA= - dependencies: - ajv "^6.5.5" - har-schema "^2.0.0" - -has-flag@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" - integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= - -has-flag@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" - integrity sha1-lEdx/ZyByBJlxNaUGGDaBrtZR5s= - -has-symbols@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" - integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q= - -has-symbols@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8" - integrity sha1-n1IUdYpEGWxAbZvXbOv4HsLdMeg= - -has-value@^0.3.1: - version "0.3.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f" - integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8= - dependencies: - get-value "^2.0.3" - has-values "^0.1.4" - isobject "^2.0.0" - -has-value@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177" - integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc= - dependencies: - get-value "^2.0.6" - has-values "^1.0.0" - isobject "^3.0.0" - -has-values@^0.1.4: - version "0.1.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771" - integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E= - -has-values@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f" - integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8= - dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" - -has@^1.0.1, has@^1.0.3: - version "1.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" - integrity sha1-ci18v8H2qoJB8W3YFOAR4fQeh5Y= - dependencies: - function-bind "^1.1.1" - -history@3.3.0, history@^3.0.0: - version "3.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/history/-/history-3.3.0.tgz#fcedcce8f12975371545d735461033579a6dae9c" - integrity sha1-/O3M6PEpdTcVRdc1RhAzV5ptrpw= - dependencies: - invariant "^2.2.1" - loose-envify "^1.2.0" - query-string "^4.2.2" - warning "^3.0.0" - -hoist-non-react-statics@^2.3.1, hoist-non-react-statics@^2.5.5: - version "2.5.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47" - integrity sha1-xZA89AnA39kI84jmGdhrnBF0y0c= - -hoist-non-react-statics@^3.3.0: - version "3.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b" - integrity sha1-sJF48BIhhPuVrPUl2q7LTY9FlYs= - dependencies: - react-is "^16.7.0" - -hosted-git-info@^2.1.4: - version "2.7.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047" - integrity sha1-l/I2l3vW4SVAiTD/bePuxigewEc= - -html-element-map@^1.2.0: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/html-element-map/-/html-element-map-1.2.0.tgz#dfbb09efe882806af63d990cf6db37993f099f22" - integrity sha1-37sJ7+iCgGr2PZkM9ts3mT8JnyI= - dependencies: - array-filter "^1.0.0" - -html-encoding-sniffer@^1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" - integrity sha1-5w2EuU2lOqN14R/jo1G+ZkLKRvg= - dependencies: - whatwg-encoding "^1.0.1" - -html-escaper@^2.0.0: - version "2.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453" - integrity sha1-39YAJ9o2o238viNiYsAKWCJoFFM= - -htmlparser2@^3.9.1: - version "3.10.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" - integrity sha1-vWedw/WYl7ajS7EHSchVu1OpOS8= - dependencies: - domelementtype "^1.3.1" - domhandler "^2.3.0" - domutils "^1.5.1" - entities "^1.1.1" - inherits "^2.0.1" - readable-stream "^3.1.1" - -http-signature@~1.2.0: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - -human-signals@^1.1.1: - version "1.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" - integrity sha1-xbHNFPUK6uCatsWf5jujOV/k36M= - -iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: - version "0.4.24" - resolved "https://repox.jfrog.io/repox/api/npm/npm/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" - integrity sha1-ICK0sl+93CHS9SSXSkdKr+czkIs= - dependencies: - safer-buffer ">= 2.1.2 < 3" - -ignore@^4.0.3, ignore@^4.0.6: - version "4.0.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" - integrity sha1-dQ49tYYgh7RzfrrIIH/9HvJ7Jfw= - -ignore@^5.1.1: - version "5.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ignore/-/ignore-5.1.2.tgz#e28e584d43ad7e92f96995019cc43b9e1ac49558" - integrity sha1-4o5YTUOtfpL5aZUBnMQ7nhrElVg= - -import-fresh@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546" - integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY= - dependencies: - caller-path "^2.0.0" - resolve-from "^3.0.0" - -import-fresh@^3.0.0: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/import-fresh/-/import-fresh-3.1.0.tgz#6d33fa1dcef6df930fae003446f33415af905118" - integrity sha1-bTP6Hc7235MPrgA0RvM0Fa+QURg= - dependencies: - parent-module "^1.0.0" - resolve-from "^4.0.0" - -import-local@^3.0.2: - version "3.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/import-local/-/import-local-3.0.2.tgz#a8cfd0431d1de4a2199703d003e3e62364fa6db6" - integrity sha1-qM/QQx0d5KIZlwPQA+PmI2T6bbY= - dependencies: - pkg-dir "^4.2.0" - resolve-cwd "^3.0.0" - -imurmurhash@^0.1.4: - version "0.1.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" - integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= - -indent-string@^3.0.0: - version "3.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" - integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= - -inflight@^1.0.4: - version "1.0.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9" - integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk= - dependencies: - once "^1.3.0" - wrappy "1" - -inherits@2, inherits@^2.0.1, inherits@^2.0.3: - version "2.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" - integrity sha1-D6LGT5MpF8NDOg3tVTY6rjdBa3w= - -inquirer@^7.0.0: - version "7.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/inquirer/-/inquirer-7.1.0.tgz#1298a01859883e17c7264b82870ae1034f92dd29" - integrity sha1-EpigGFmIPhfHJkuChwrhA0+S3Sk= - dependencies: - ansi-escapes "^4.2.1" - chalk "^3.0.0" - cli-cursor "^3.1.0" - cli-width "^2.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.15" - mute-stream "0.0.8" - run-async "^2.4.0" - rxjs "^6.5.3" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" - -internal-slot@^1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3" - integrity sha1-nC6fs82OXkJWxvRf4xAGf8+jeKM= - dependencies: - es-abstract "^1.17.0-next.1" - has "^1.0.3" - side-channel "^1.0.2" - -intl-format-cache@^2.0.5: - version "2.2.9" - resolved "https://repox.jfrog.io/repox/api/npm/npm/intl-format-cache/-/intl-format-cache-2.2.9.tgz#fb560de20c549cda20b569cf1ffb6dc62b5b93b4" - integrity sha1-+1YN4gxUnNogtWnPH/ttxitbk7Q= - -intl-messageformat-parser@1.4.0: - version "1.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/intl-messageformat-parser/-/intl-messageformat-parser-1.4.0.tgz#b43d45a97468cadbe44331d74bb1e8dea44fc075" - integrity sha1-tD1FqXRoytvkQzHXS7Ho3qRPwHU= - -intl-messageformat@^2.0.0, intl-messageformat@^2.1.0: - version "2.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/intl-messageformat/-/intl-messageformat-2.2.0.tgz#345bcd46de630b7683330c2e52177ff5eab484fc" - integrity sha1-NFvNRt5jC3aDMwwuUhd/9eq0hPw= - dependencies: - intl-messageformat-parser "1.4.0" - -intl-relativeformat@^2.1.0: - version "2.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/intl-relativeformat/-/intl-relativeformat-2.2.0.tgz#6aca95d019ec8d30b6c5653b6629f9983ea5b6c5" - integrity sha1-asqV0BnsjTC2xWU7Zin5mD6ltsU= - dependencies: - intl-messageformat "^2.0.0" - -invariant@^2.1.1, invariant@^2.2.1: - version "2.2.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - integrity sha1-YQ88ksk1nOHbYW5TgAjSP/NRWOY= - dependencies: - loose-envify "^1.0.0" - -ip-regex@^2.1.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" - integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk= - -is-accessor-descriptor@^0.1.6: - version "0.1.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" - integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY= - dependencies: - kind-of "^3.0.2" - -is-accessor-descriptor@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656" - integrity sha1-FpwvbT3x+ZJhgHI2XJsOofaHhlY= - dependencies: - kind-of "^6.0.0" - -is-arrayish@^0.2.1: - version "0.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" - integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= - -is-boolean-object@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-boolean-object/-/is-boolean-object-1.0.1.tgz#10edc0900dd127697a92f6f9807c7617d68ac48e" - integrity sha1-EO3AkA3RJ2l6kvb5gHx2F9aKxI4= - -is-buffer@^1.1.5: - version "1.1.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be" - integrity sha1-76ouqdqg16suoTqXsritUf776L4= - -is-callable@^1.1.4: - version "1.1.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75" - integrity sha1-HhrfIZ4e62hNaR+dagX/DTCiTXU= - -is-callable@^1.1.5: - version "1.1.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-callable/-/is-callable-1.1.5.tgz#f7e46b596890456db74e7f6e976cb3273d06faab" - integrity sha1-9+RrWWiQRW23Tn9ul2yzJz0G+qs= - -is-ci@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c" - integrity sha1-a8YzQYGBDgS1wis9WJ/cpVAmQEw= - dependencies: - ci-info "^2.0.0" - -is-data-descriptor@^0.1.4: - version "0.1.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" - integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y= - dependencies: - kind-of "^3.0.2" - -is-data-descriptor@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7" - integrity sha1-2Eh2Mh0Oet0DmQQGq7u9NrqSaMc= - dependencies: - kind-of "^6.0.0" - -is-date-object@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16" - integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY= - -is-descriptor@^0.1.0: - version "0.1.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca" - integrity sha1-Nm2CQN3kh8pRgjsaufB6EKeCUco= - dependencies: - is-accessor-descriptor "^0.1.6" - is-data-descriptor "^0.1.4" - kind-of "^5.0.0" - -is-descriptor@^1.0.0, is-descriptor@^1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec" - integrity sha1-OxWXRqZmBLBPjIFSS6NlxfFNhuw= - dependencies: - is-accessor-descriptor "^1.0.0" - is-data-descriptor "^1.0.0" - kind-of "^6.0.2" - -is-directory@^0.3.1: - version "0.3.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1" - integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= - -is-extendable@^0.1.0, is-extendable@^0.1.1: - version "0.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89" - integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik= - -is-extendable@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4" - integrity sha1-p0cPnkJnM9gb2B4RVSZOOjUHyrQ= - dependencies: - is-plain-object "^2.0.4" - -is-extglob@^2.1.0, is-extglob@^2.1.1: - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" - integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= - -is-fullwidth-code-point@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" - integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= - -is-fullwidth-code-point@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" - integrity sha1-8Rb4Bk/pCz94RKOJl8C3UFEmnx0= - -is-generator-fn@^2.0.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118" - integrity sha1-fRQK3DiarzARqPKipM+m+q3/sRg= - -is-glob@^3.1.0: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" - integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo= - dependencies: - is-extglob "^2.1.0" - -is-glob@^4.0.0, is-glob@^4.0.1: - version "4.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" - integrity sha1-dWfb6fL14kZ7x3q4PEopSCQHpdw= - dependencies: - is-extglob "^2.1.1" - -is-number-object@^1.0.4: - version "1.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" - integrity sha1-NqyV50HPGLKD/B3fXoPaeY4+wZc= - -is-number@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195" - integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU= - dependencies: - kind-of "^3.0.2" - -is-number@^7.0.0: - version "7.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" - integrity sha1-dTU0W4lnNNX4DE0GxQlVUnoU8Ss= - -is-plain-obj@^1.1.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e" - integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4= - -is-plain-object@^2.0.3, is-plain-object@^2.0.4: - version "2.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677" - integrity sha1-LBY7P6+xtgbZ0Xko8FwqHDjgdnc= - dependencies: - isobject "^3.0.1" - -is-promise@^2.1.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= - -is-regex@^1.0.4: - version "1.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491" - integrity sha1-VRdIm1RwkbCTDglWVM7SXul+lJE= - dependencies: - has "^1.0.1" - -is-regex@^1.0.5: - version "1.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-regex/-/is-regex-1.0.5.tgz#39d589a358bf18967f726967120b8fc1aed74eae" - integrity sha1-OdWJo1i/GJZ/cmlnEguPwa7XTq4= - dependencies: - has "^1.0.3" - -is-stream@^1.0.1, is-stream@^1.1.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44" - integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= - -is-stream@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha1-venDJoDW+uBBKdasnZIc54FfeOM= - -is-string@^1.0.5: - version "1.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" - integrity sha1-QEk+0ZjvP/R3uMf5L2ROyCpc06Y= - -is-subset@^0.1.1: - version "0.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-subset/-/is-subset-0.1.1.tgz#8a59117d932de1de00f245fcdd39ce43f1e939a6" - integrity sha1-ilkRfZMt4d4A8kX83TnOQ/HpOaY= - -is-symbol@^1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-symbol/-/is-symbol-1.0.2.tgz#a055f6ae57192caee329e7a860118b497a950f38" - integrity sha1-oFX2rlcZLK7jKeeoYBGLSXqVDzg= - dependencies: - has-symbols "^1.0.0" - -is-typedarray@^1.0.0, is-typedarray@~1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" - integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= - -is-windows@^1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" - integrity sha1-0YUOuXkezRjmGCzhKjDzlmNLsZ0= - -is-wsl@^2.1.1: - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d" - integrity sha1-ShwVLUKd89RBZpSY4khtNZbrrx0= - -isarray@1.0.0, isarray@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" - integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= - -isexe@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" - integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= - -isobject@^2.0.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89" - integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk= - dependencies: - isarray "1.0.0" - -isobject@^3.0.0, isobject@^3.0.1: - version "3.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" - integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8= - -isomorphic-fetch@^2.1.1: - version "2.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz#611ae1acf14f5e81f729507472819fe9733558a9" - integrity sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk= - dependencies: - node-fetch "^1.0.1" - whatwg-fetch ">=0.10.0" - -isstream@~0.1.2: - version "0.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= - -istanbul-lib-coverage@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" - integrity sha1-9ZRKN8cLVQsCp4pcOyBVsoDOyOw= - -istanbul-lib-instrument@^4.0.0: - version "4.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6" - integrity sha1-YfE6wsls/vsHb+cTEVbMBZB4dOY= - dependencies: - "@babel/core" "^7.7.5" - "@babel/parser" "^7.7.5" - "@babel/template" "^7.7.4" - "@babel/traverse" "^7.7.4" - "@istanbuljs/schema" "^0.1.2" - istanbul-lib-coverage "^3.0.0" - semver "^6.3.0" - -istanbul-lib-report@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6" - integrity sha1-dRj+UupE3jcvRgp2tezan/tz2KY= - dependencies: - istanbul-lib-coverage "^3.0.0" - make-dir "^3.0.0" - supports-color "^7.1.0" - -istanbul-lib-source-maps@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz#75743ce6d96bb86dc7ee4352cf6366a23f0b1ad9" - integrity sha1-dXQ85tlruG3H7kNSz2Nmoj8LGtk= - dependencies: - debug "^4.1.1" - istanbul-lib-coverage "^3.0.0" - source-map "^0.6.1" - -istanbul-reports@^3.0.2: - version "3.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/istanbul-reports/-/istanbul-reports-3.0.2.tgz#d593210e5000683750cb09fc0644e4b6e27fd53b" - integrity sha1-1ZMhDlAAaDdQywn8BkTktuJ/1Ts= - dependencies: - html-escaper "^2.0.0" - istanbul-lib-report "^3.0.0" - -jest-changed-files@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-changed-files/-/jest-changed-files-25.4.0.tgz#e573db32c2fd47d2b90357ea2eda0622c5c5cbd6" - integrity sha1-5XPbMsL9R9K5A1fqLtoGIsXFy9Y= - dependencies: - "@jest/types" "^25.4.0" - execa "^3.2.0" - throat "^5.0.0" - -jest-cli@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-cli/-/jest-cli-25.4.0.tgz#5dac8be0fece6ce39f0d671395a61d1357322bab" - integrity sha1-XayL4P7ObOOfDWcTlaYdE1cyK6s= - dependencies: - "@jest/core" "^25.4.0" - "@jest/test-result" "^25.4.0" - "@jest/types" "^25.4.0" - chalk "^3.0.0" - exit "^0.1.2" - import-local "^3.0.2" - is-ci "^2.0.0" - jest-config "^25.4.0" - jest-util "^25.4.0" - jest-validate "^25.4.0" - prompts "^2.0.1" - realpath-native "^2.0.0" - yargs "^15.3.1" - -jest-config@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-config/-/jest-config-25.4.0.tgz#56e5df3679a96ff132114b44fb147389c8c0a774" - integrity sha1-VuXfNnmpb/EyEUtE+xRzicjAp3Q= - dependencies: - "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^25.4.0" - "@jest/types" "^25.4.0" - babel-jest "^25.4.0" - chalk "^3.0.0" - deepmerge "^4.2.2" - glob "^7.1.1" - jest-environment-jsdom "^25.4.0" - jest-environment-node "^25.4.0" - jest-get-type "^25.2.6" - jest-jasmine2 "^25.4.0" - jest-regex-util "^25.2.6" - jest-resolve "^25.4.0" - jest-util "^25.4.0" - jest-validate "^25.4.0" - micromatch "^4.0.2" - pretty-format "^25.4.0" - realpath-native "^2.0.0" - -jest-diff@^25.2.1, jest-diff@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-diff/-/jest-diff-25.4.0.tgz#260b70f19a46c283adcad7f081cae71eb784a634" - integrity sha1-Jgtw8ZpGwoOtytfwgcrnHreEpjQ= - dependencies: - chalk "^3.0.0" - diff-sequences "^25.2.6" - jest-get-type "^25.2.6" - pretty-format "^25.4.0" - -jest-docblock@^25.3.0: - version "25.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-docblock/-/jest-docblock-25.3.0.tgz#8b777a27e3477cd77a168c05290c471a575623ef" - integrity sha1-i3d6J+NHfNd6FowFKQxHGldWI+8= - dependencies: - detect-newline "^3.0.0" - -jest-each@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-each/-/jest-each-25.4.0.tgz#ad4e46164764e8e77058f169a0076a7f86f6b7d4" - integrity sha1-rU5GFkdk6OdwWPFpoAdqf4b2t9Q= - dependencies: - "@jest/types" "^25.4.0" - chalk "^3.0.0" - jest-get-type "^25.2.6" - jest-util "^25.4.0" - pretty-format "^25.4.0" - -jest-emotion@10.0.32: - version "10.0.32" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-emotion/-/jest-emotion-10.0.32.tgz#8e36a871911f78841701224a95b7c535c65b70b6" - integrity sha1-jjaocZEfeIQXASJKlbfFNcZbcLY= - dependencies: - "@babel/runtime" "^7.5.5" - "@types/jest" "^23.0.2" - chalk "^2.4.1" - css "^2.2.1" - -jest-environment-jsdom@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-environment-jsdom/-/jest-environment-jsdom-25.4.0.tgz#bbfc7f85bb6ade99089062a830c79cb454565cf0" - integrity sha1-u/x/hbtq3pkIkGKoMMectFRWXPA= - dependencies: - "@jest/environment" "^25.4.0" - "@jest/fake-timers" "^25.4.0" - "@jest/types" "^25.4.0" - jest-mock "^25.4.0" - jest-util "^25.4.0" - jsdom "^15.2.1" - -jest-environment-node@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-environment-node/-/jest-environment-node-25.4.0.tgz#188aef01ae6418e001c03fdd1c299961e1439082" - integrity sha1-GIrvAa5kGOABwD/dHCmZYeFDkII= - dependencies: - "@jest/environment" "^25.4.0" - "@jest/fake-timers" "^25.4.0" - "@jest/types" "^25.4.0" - jest-mock "^25.4.0" - jest-util "^25.4.0" - semver "^6.3.0" - -jest-get-type@^25.2.6: - version "25.2.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-get-type/-/jest-get-type-25.2.6.tgz#0b0a32fab8908b44d508be81681487dbabb8d877" - integrity sha1-Cwoy+riQi0TVCL6BaBSH26u42Hc= - -jest-haste-map@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-haste-map/-/jest-haste-map-25.4.0.tgz#da7c309dd7071e0a80c953ba10a0ec397efb1ae2" - integrity sha1-2nwwndcHHgqAyVO6EKDsOX77GuI= - dependencies: - "@jest/types" "^25.4.0" - anymatch "^3.0.3" - fb-watchman "^2.0.0" - graceful-fs "^4.2.3" - jest-serializer "^25.2.6" - jest-util "^25.4.0" - jest-worker "^25.4.0" - micromatch "^4.0.2" - sane "^4.0.3" - walker "^1.0.7" - which "^2.0.2" - optionalDependencies: - fsevents "^2.1.2" - -jest-jasmine2@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-jasmine2/-/jest-jasmine2-25.4.0.tgz#3d3d19514022e2326e836c2b66d68b4cb63c5861" - integrity sha1-PT0ZUUAi4jJug2wrZtaLTLY8WGE= - dependencies: - "@babel/traverse" "^7.1.0" - "@jest/environment" "^25.4.0" - "@jest/source-map" "^25.2.6" - "@jest/test-result" "^25.4.0" - "@jest/types" "^25.4.0" - chalk "^3.0.0" - co "^4.6.0" - expect "^25.4.0" - is-generator-fn "^2.0.0" - jest-each "^25.4.0" - jest-matcher-utils "^25.4.0" - jest-message-util "^25.4.0" - jest-runtime "^25.4.0" - jest-snapshot "^25.4.0" - jest-util "^25.4.0" - pretty-format "^25.4.0" - throat "^5.0.0" - -jest-leak-detector@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-leak-detector/-/jest-leak-detector-25.4.0.tgz#cf94a160c78e53d810e7b2f40b5fd7ee263375b3" - integrity sha1-z5ShYMeOU9gQ57L0C1/X7iYzdbM= - dependencies: - jest-get-type "^25.2.6" - pretty-format "^25.4.0" - -jest-matcher-utils@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-matcher-utils/-/jest-matcher-utils-25.4.0.tgz#dc3e7aec402a1e567ed80b572b9ad285878895e6" - integrity sha1-3D567EAqHlZ+2AtXK5rShYeIleY= - dependencies: - chalk "^3.0.0" - jest-diff "^25.4.0" - jest-get-type "^25.2.6" - pretty-format "^25.4.0" - -jest-message-util@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-message-util/-/jest-message-util-25.4.0.tgz#2899e8bc43f5317acf8dfdfe89ea237d354fcdab" - integrity sha1-KJnovEP1MXrPjf3+ieojfTVPzas= - dependencies: - "@babel/code-frame" "^7.0.0" - "@jest/types" "^25.4.0" - "@types/stack-utils" "^1.0.1" - chalk "^3.0.0" - micromatch "^4.0.2" - slash "^3.0.0" - stack-utils "^1.0.1" - -jest-mock@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-mock/-/jest-mock-25.4.0.tgz#ded7d64b5328d81d78d2138c825d3a45e30ec8ca" - integrity sha1-3tfWS1Mo2B140hOMgl06ReMOyMo= - dependencies: - "@jest/types" "^25.4.0" - -jest-pnp-resolver@^1.2.1: - version "1.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a" - integrity sha1-7NrmBMB3p/vHDe+21RfDwciYkjo= - -jest-regex-util@^25.2.6: - version "25.2.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-regex-util/-/jest-regex-util-25.2.6.tgz#d847d38ba15d2118d3b06390056028d0f2fd3964" - integrity sha1-2EfTi6FdIRjTsGOQBWAo0PL9OWQ= - -jest-resolve-dependencies@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-resolve-dependencies/-/jest-resolve-dependencies-25.4.0.tgz#783937544cfc40afcc7c569aa54748c4b3f83f5a" - integrity sha1-eDk3VEz8QK/MfFaapUdIxLP4P1o= - dependencies: - "@jest/types" "^25.4.0" - jest-regex-util "^25.2.6" - jest-snapshot "^25.4.0" - -jest-resolve@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-resolve/-/jest-resolve-25.4.0.tgz#6f4540ce0d419c4c720e791e871da32ba4da7a60" - integrity sha1-b0VAzg1BnExyDnkehx2jK6TaemA= - dependencies: - "@jest/types" "^25.4.0" - browser-resolve "^1.11.3" - chalk "^3.0.0" - jest-pnp-resolver "^1.2.1" - read-pkg-up "^7.0.1" - realpath-native "^2.0.0" - resolve "^1.15.1" - slash "^3.0.0" - -jest-runner@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-runner/-/jest-runner-25.4.0.tgz#6ca4a3d52e692bbc081228fa68f750012f1f29e5" - integrity sha1-bKSj1S5pK7wIEij6aPdQAS8fKeU= - dependencies: - "@jest/console" "^25.4.0" - "@jest/environment" "^25.4.0" - "@jest/test-result" "^25.4.0" - "@jest/types" "^25.4.0" - chalk "^3.0.0" - exit "^0.1.2" - graceful-fs "^4.2.3" - jest-config "^25.4.0" - jest-docblock "^25.3.0" - jest-haste-map "^25.4.0" - jest-jasmine2 "^25.4.0" - jest-leak-detector "^25.4.0" - jest-message-util "^25.4.0" - jest-resolve "^25.4.0" - jest-runtime "^25.4.0" - jest-util "^25.4.0" - jest-worker "^25.4.0" - source-map-support "^0.5.6" - throat "^5.0.0" - -jest-runtime@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-runtime/-/jest-runtime-25.4.0.tgz#1e5227a9e2159d26ae27dcd426ca6bc041983439" - integrity sha1-HlInqeIVnSauJ9zUJsprwEGYNDk= - dependencies: - "@jest/console" "^25.4.0" - "@jest/environment" "^25.4.0" - "@jest/source-map" "^25.2.6" - "@jest/test-result" "^25.4.0" - "@jest/transform" "^25.4.0" - "@jest/types" "^25.4.0" - "@types/yargs" "^15.0.0" - chalk "^3.0.0" - collect-v8-coverage "^1.0.0" - exit "^0.1.2" - glob "^7.1.3" - graceful-fs "^4.2.3" - jest-config "^25.4.0" - jest-haste-map "^25.4.0" - jest-message-util "^25.4.0" - jest-mock "^25.4.0" - jest-regex-util "^25.2.6" - jest-resolve "^25.4.0" - jest-snapshot "^25.4.0" - jest-util "^25.4.0" - jest-validate "^25.4.0" - realpath-native "^2.0.0" - slash "^3.0.0" - strip-bom "^4.0.0" - yargs "^15.3.1" - -jest-serializer@^25.2.6: - version "25.2.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-serializer/-/jest-serializer-25.2.6.tgz#3bb4cc14fe0d8358489dbbefbb8a4e708ce039b7" - integrity sha1-O7TMFP4Ng1hInbvvu4pOcIzgObc= - -jest-snapshot@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-snapshot/-/jest-snapshot-25.4.0.tgz#e0b26375e2101413fd2ccb4278a5711b1922545c" - integrity sha1-4LJjdeIQFBP9LMtCeKVxGxkiVFw= - dependencies: - "@babel/types" "^7.0.0" - "@jest/types" "^25.4.0" - "@types/prettier" "^1.19.0" - chalk "^3.0.0" - expect "^25.4.0" - jest-diff "^25.4.0" - jest-get-type "^25.2.6" - jest-matcher-utils "^25.4.0" - jest-message-util "^25.4.0" - jest-resolve "^25.4.0" - make-dir "^3.0.0" - natural-compare "^1.4.0" - pretty-format "^25.4.0" - semver "^6.3.0" - -jest-util@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-util/-/jest-util-25.4.0.tgz#6a093d09d86d2b41ef583e5fe7dd3976346e1acd" - integrity sha1-agk9CdhtK0HvWD5f5905djRuGs0= - dependencies: - "@jest/types" "^25.4.0" - chalk "^3.0.0" - is-ci "^2.0.0" - make-dir "^3.0.0" - -jest-validate@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-validate/-/jest-validate-25.4.0.tgz#2e177a93b716a137110eaf2768f3d9095abd3f38" - integrity sha1-Lhd6k7cWoTcRDq8naPPZCVq9Pzg= - dependencies: - "@jest/types" "^25.4.0" - camelcase "^5.3.1" - chalk "^3.0.0" - jest-get-type "^25.2.6" - leven "^3.1.0" - pretty-format "^25.4.0" - -jest-watcher@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-watcher/-/jest-watcher-25.4.0.tgz#63ec0cd5c83bb9c9d1ac95be7558dd61c995ff05" - integrity sha1-Y+wM1cg7ucnRrJW+dVjdYcmV/wU= - dependencies: - "@jest/test-result" "^25.4.0" - "@jest/types" "^25.4.0" - ansi-escapes "^4.2.1" - chalk "^3.0.0" - jest-util "^25.4.0" - string-length "^3.1.0" - -jest-worker@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest-worker/-/jest-worker-25.4.0.tgz#ee0e2ceee5a36ecddf5172d6d7e0ab00df157384" - integrity sha1-7g4s7uWjbs3fUXLW1+CrAN8Vc4Q= - dependencies: - merge-stream "^2.0.0" - supports-color "^7.0.0" - -jest@25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jest/-/jest-25.4.0.tgz#fb96892c5c4e4a6b9bcb12068849cddf4c5f8cc7" - integrity sha1-+5aJLFxOSmubyxIGiEnN30xfjMc= - dependencies: - "@jest/core" "^25.4.0" - import-local "^3.0.2" - jest-cli "^25.4.0" - -"js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" - integrity sha1-GSA/tZmR35jjoocFDUZHzerzJJk= - -js-yaml@^3.13.1: - version "3.13.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" - integrity sha1-r/FRswv9+o5J4F2iLnQV6d+jeEc= - dependencies: - argparse "^1.0.7" - esprima "^4.0.0" - -jsbn@~0.1.0: - version "0.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - -jsdom@^15.2.1: - version "15.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jsdom/-/jsdom-15.2.1.tgz#d2feb1aef7183f86be521b8c6833ff5296d07ec5" - integrity sha1-0v6xrvcYP4a+UhuMaDP/UpbQfsU= - dependencies: - abab "^2.0.0" - acorn "^7.1.0" - acorn-globals "^4.3.2" - array-equal "^1.0.0" - cssom "^0.4.1" - cssstyle "^2.0.0" - data-urls "^1.1.0" - domexception "^1.0.1" - escodegen "^1.11.1" - html-encoding-sniffer "^1.0.2" - nwsapi "^2.2.0" - parse5 "5.1.0" - pn "^1.1.0" - request "^2.88.0" - request-promise-native "^1.0.7" - saxes "^3.1.9" - symbol-tree "^3.2.2" - tough-cookie "^3.0.1" - w3c-hr-time "^1.0.1" - w3c-xmlserializer "^1.1.2" - webidl-conversions "^4.0.2" - whatwg-encoding "^1.0.5" - whatwg-mimetype "^2.3.0" - whatwg-url "^7.0.0" - ws "^7.0.0" - xml-name-validator "^3.0.0" - -jsesc@^2.5.1: - version "2.5.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4" - integrity sha1-gFZNLkg9rPbo7yCWUKZ98/DCg6Q= - -json-parse-better-errors@^1.0.1: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" - integrity sha1-u4Z8+zRQ5pEHwTHRxRS6s9yLyqk= - -json-schema-traverse@^0.4.1: - version "0.4.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" - integrity sha1-afaofZUTq4u4/mO9sJecRI5oRmA= - -json-schema@0.2.3: - version "0.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - -json-stable-stringify-without-jsonify@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" - integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= - -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - -json5@2.x, json5@^2.1.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/json5/-/json5-2.1.0.tgz#e7a0c62c48285c628d20a10b85c89bb807c32850" - integrity sha1-56DGLEgoXGKNIKELhcibuAfDKFA= - dependencies: - minimist "^1.2.0" - -json5@^2.1.2: - version "2.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/json5/-/json5-2.1.3.tgz#c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43" - integrity sha1-ybD3+pIzv+WAf+ZvzzpWF+1ZfUM= - dependencies: - minimist "^1.2.5" - -jsprim@^1.2.2: - version "1.4.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - -jsx-ast-utils@^2.2.1, jsx-ast-utils@^2.2.3: - version "2.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f" - integrity sha1-ipNk5AJEijzn8U01dzgxDZJIBU8= - dependencies: - array-includes "^3.0.3" - object.assign "^4.1.0" - -kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0: - version "3.2.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64" - integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ= - dependencies: - is-buffer "^1.1.5" - -kind-of@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57" - integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc= - dependencies: - is-buffer "^1.1.5" - -kind-of@^5.0.0: - version "5.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d" - integrity sha1-cpyR4thXt6QZofmqZWhcTDP1hF0= - -kind-of@^6.0.0, kind-of@^6.0.2: - version "6.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" - integrity sha1-ARRrNqYhjmTljzqNZt5df8b20FE= - -kleur@^3.0.2: - version "3.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e" - integrity sha1-p5yezIbuHOP6YgbRIWxQHxR/wH4= - -leven@^3.1.0: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" - integrity sha1-d4kd6DQGTMy6gq54QrtrFKE+1/I= - -levn@^0.3.0, levn@~0.3.0: - version "0.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= - dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" - -lines-and-columns@^1.1.6: - version "1.1.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" - integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= - -load-json-file@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8" - integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg= - dependencies: - graceful-fs "^4.1.2" - parse-json "^2.2.0" - pify "^2.0.0" - strip-bom "^3.0.0" - -load-json-file@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" - integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= - dependencies: - graceful-fs "^4.1.2" - parse-json "^4.0.0" - pify "^3.0.0" - strip-bom "^3.0.0" - -locate-path@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" - integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4= - dependencies: - p-locate "^2.0.0" - path-exists "^3.0.0" - -locate-path@^5.0.0: - version "5.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0" - integrity sha1-Gvujlq/WdqbUJQTQpno6frn2KqA= - dependencies: - p-locate "^4.1.0" - -lodash.clonedeep@^4.5.0: - version "4.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" - integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= - -lodash.escape@^4.0.1: - version "4.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98" - integrity sha1-yQRGkMIeBClL6qUXcS/e0fqI3pg= - -lodash.flattendeep@^4.4.0: - version "4.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2" - integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI= - -lodash.isequal@^4.5.0: - version "4.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0" - integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA= - -lodash.memoize@4.x: - version "4.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= - -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - -lodash.topath@4.5.2: - version "4.5.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/lodash.topath/-/lodash.topath-4.5.2.tgz#3616351f3bba61994a0931989660bd03254fd009" - integrity sha1-NhY1Hzu6YZlKCTGYlmC9AyVP0Ak= - -lodash@4.17.21: - version "4.17.21" - resolved "https://repox.jfrog.io/repox/api/npm/npm/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" - integrity sha1-Z5WRxWTDv/quhFTPCz3zcMPWkRw= - -lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15: - version "4.17.15" - resolved "https://repox.jfrog.io/repox/api/npm/npm/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha1-tEf2ZwoEVbv+7dETku/zMOoJdUg= - -lolex@^5.0.0: - version "5.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/lolex/-/lolex-5.1.2.tgz#953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367" - integrity sha1-lTaU0JjOfAe8XtbQ5CvGwMbVo2c= - dependencies: - "@sinonjs/commons" "^1.7.0" - -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.0, loose-envify@^1.3.1, loose-envify@^1.4.0: - version "1.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" - integrity sha1-ce5R+nvkyuwaY4OffmgtgTLTDK8= - dependencies: - js-tokens "^3.0.0 || ^4.0.0" - -loud-rejection@^1.0.0: - version "1.6.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f" - integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8= - dependencies: - currently-unhandled "^0.4.1" - signal-exit "^3.0.0" - -make-dir@^2.0.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" - integrity sha1-XwMQ4YuL6JjMBwCSlaMK5B6R5vU= - dependencies: - pify "^4.0.1" - semver "^5.6.0" - -make-dir@^3.0.0: - version "3.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/make-dir/-/make-dir-3.0.2.tgz#04a1acbf22221e1d6ef43559f43e05a90dbb4392" - integrity sha1-BKGsvyIiHh1u9DVZ9D4FqQ27Q5I= - dependencies: - semver "^6.0.0" - -make-error@1.x: - version "1.3.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/make-error/-/make-error-1.3.5.tgz#efe4e81f6db28cadd605c70f29c831b58ef776c8" - integrity sha1-7+ToH22yjK3WBccPKcgxtY73dsg= - -makeerror@1.0.x: - version "1.0.11" - resolved "https://repox.jfrog.io/repox/api/npm/npm/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" - integrity sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw= - dependencies: - tmpl "1.0.x" - -map-cache@^0.2.2: - version "0.2.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" - integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8= - -map-obj@^1.0.0: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" - integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= - -map-obj@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/map-obj/-/map-obj-2.0.0.tgz#a65cd29087a92598b8791257a523e021222ac1f9" - integrity sha1-plzSkIepJZi4eRJXpSPgISIqwfk= - -map-visit@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f" - integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48= - dependencies: - object-visit "^1.0.0" - -meow@^5.0.0: - version "5.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/meow/-/meow-5.0.0.tgz#dfc73d63a9afc714a5e371760eb5c88b91078aa4" - integrity sha1-38c9Y6mvxxSl43F2DrXIi5EHiqQ= - dependencies: - camelcase-keys "^4.0.0" - decamelize-keys "^1.0.0" - loud-rejection "^1.0.0" - minimist-options "^3.0.1" - normalize-package-data "^2.3.4" - read-pkg-up "^3.0.0" - redent "^2.0.0" - trim-newlines "^2.0.0" - yargs-parser "^10.0.0" - -merge-stream@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" - integrity sha1-UoI2KaFN0AyXcPtq1H3GMQ8sH2A= - -merge2@^1.2.3: - version "1.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5" - integrity sha1-fumdvWm7ZIFoklPwGEiKG5ArDtU= - -micromatch@4.x, micromatch@^4.0.2: - version "4.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259" - integrity sha1-T8sJmb+fvC/L3SEvbWKbmlbDklk= - dependencies: - braces "^3.0.1" - picomatch "^2.0.5" - -micromatch@^3.1.10, micromatch@^3.1.4: - version "3.1.10" - resolved "https://repox.jfrog.io/repox/api/npm/npm/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" - integrity sha1-cIWbyVyYQJUvNZoGij/En57PrCM= - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - braces "^2.3.1" - define-property "^2.0.2" - extend-shallow "^3.0.2" - extglob "^2.0.4" - fragment-cache "^0.2.1" - kind-of "^6.0.2" - nanomatch "^1.2.9" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.2" - -mime-db@1.40.0: - version "1.40.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32" - integrity sha1-plBX6ZjbCQ9zKmj2wnbTh9QSbDI= - -mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.24" - resolved "https://repox.jfrog.io/repox/api/npm/npm/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81" - integrity sha1-tvjQs+lR77d97eyhlM/20W9nb4E= - dependencies: - mime-db "1.40.0" - -mimic-fn@^2.1.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" - integrity sha1-ftLCzMyvhNP/y3pptXcR/CCDQBs= - -minimatch@^3.0.4: - version "3.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" - integrity sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM= - dependencies: - brace-expansion "^1.1.7" - -minimist-options@^3.0.1: - version "3.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/minimist-options/-/minimist-options-3.0.2.tgz#fba4c8191339e13ecf4d61beb03f070103f3d954" - integrity sha1-+6TIGRM54T7PTWG+sD8HAQPz2VQ= - dependencies: - arrify "^1.0.1" - is-plain-obj "^1.1.0" - -minimist@0.0.8: - version "0.0.8" - resolved "https://repox.jfrog.io/repox/api/npm/npm/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.1.1, minimist@^1.2.0: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= - -minimist@^1.2.5: - version "1.2.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha1-Z9ZgFLZqaoqqDAg8X9WN9OTpdgI= - -mixin-deep@^1.2.0: - version "1.3.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566" - integrity sha1-ESC0PcNZp4Xc5ltVuC4lfM9HlWY= - dependencies: - for-in "^1.0.2" - is-extendable "^1.0.1" - -mkdirp@1.x: - version "1.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" - integrity sha1-PrXtYmInVteaXw4qIh3+utdcL34= - -mkdirp@^0.5.1: - version "0.5.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= - dependencies: - minimist "0.0.8" - -moo@^0.4.3: - version "0.4.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/moo/-/moo-0.4.3.tgz#3f847a26f31cf625a956a87f2b10fbc013bfd10e" - integrity sha1-P4R6JvMc9iWpVqh/KxD7wBO/0Q4= - -ms@2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" - integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= - -ms@^2.1.1: - version "2.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" - integrity sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk= - -mute-stream@0.0.8: - version "0.0.8" - resolved "https://repox.jfrog.io/repox/api/npm/npm/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - integrity sha1-FjDEKyJR/4HiooPelqVJfqkuXg0= - -nanomatch@^1.2.9: - version "1.2.13" - resolved "https://repox.jfrog.io/repox/api/npm/npm/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" - integrity sha1-uHqKpPwN6P5r6IiVs4mD/yZb0Rk= - dependencies: - arr-diff "^4.0.0" - array-unique "^0.3.2" - define-property "^2.0.2" - extend-shallow "^3.0.2" - fragment-cache "^0.2.1" - is-windows "^1.0.2" - kind-of "^6.0.2" - object.pick "^1.3.0" - regex-not "^1.0.0" - snapdragon "^0.8.1" - to-regex "^3.0.1" - -natural-compare@^1.4.0: - version "1.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" - integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= - -nearley@^2.7.10: - version "2.16.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/nearley/-/nearley-2.16.0.tgz#77c297d041941d268290ec84b739d0ee297e83a7" - integrity sha1-d8KX0EGUHSaCkOyEtznQ7il+g6c= - dependencies: - commander "^2.19.0" - moo "^0.4.3" - railroad-diagrams "^1.0.0" - randexp "0.4.6" - semver "^5.4.1" - -nested-error-stacks@^2.0.0, nested-error-stacks@^2.1.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/nested-error-stacks/-/nested-error-stacks-2.1.0.tgz#0fbdcf3e13fe4994781280524f8b96b0cdff9c61" - integrity sha1-D73PPhP+SZR4EoBST4uWsM3/nGE= - -nice-try@^1.0.4: - version "1.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha1-ozeKdpbOfSI+iPybdkvX7xCJ42Y= - -node-fetch@^1.0.1: - version "1.7.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef" - integrity sha1-mA9vcthSEaU0fGsrwYxbhMPrR+8= - dependencies: - encoding "^0.1.11" - is-stream "^1.0.1" - -node-int64@^0.4.0: - version "0.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" - integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= - -node-modules-regexp@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40" - integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= - -node-notifier@^6.0.0: - version "6.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/node-notifier/-/node-notifier-6.0.0.tgz#cea319e06baa16deec8ce5cd7f133c4a46b68e12" - integrity sha1-zqMZ4GuqFt7sjOXNfxM8Ska2jhI= - dependencies: - growly "^1.3.0" - is-wsl "^2.1.1" - semver "^6.3.0" - shellwords "^0.1.1" - which "^1.3.1" - -normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.5.0: - version "2.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8" - integrity sha1-5m2xg4sgDB38IzIl0SyzZSDiNKg= - dependencies: - hosted-git-info "^2.1.4" - resolve "^1.10.0" - semver "2 || 3 || 4 || 5" - validate-npm-package-license "^3.0.1" - -normalize-path@^2.1.1: - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9" - integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk= - dependencies: - remove-trailing-separator "^1.0.1" - -normalize-path@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" - integrity sha1-Dc1p/yOhybEf0JeDFmRKA4ghamU= - -npm-run-path@^2.0.0: - version "2.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" - integrity sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8= - dependencies: - path-key "^2.0.0" - -npm-run-path@^4.0.0: - version "4.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" - integrity sha1-t+zR5e1T2o43pV4cImnguX7XSOo= - dependencies: - path-key "^3.0.0" - -nth-check@~1.0.1: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c" - integrity sha1-sr0pXDfj3VijvwcAN2Zjuk2c8Fw= - dependencies: - boolbase "~1.0.0" - -nwsapi@^2.2.0: - version "2.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7" - integrity sha1-IEh5qePQaP8qVROcLHcngGgaOLc= - -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha1-R6ewFrqmi1+g7PPe4IqFxnmsZFU= - -object-assign@^4.1.0, object-assign@^4.1.1: - version "4.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" - integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= - -object-copy@^0.1.0: - version "0.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c" - integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw= - dependencies: - copy-descriptor "^0.1.0" - define-property "^0.2.5" - kind-of "^3.0.3" - -object-inspect@^1.7.0: - version "1.7.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67" - integrity sha1-9Pa9GBrXfwBrXs5gvQtvOY/3Smc= - -object-is@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object-is/-/object-is-1.0.1.tgz#0aa60ec9989a0b3ed795cf4d06f62cf1ad6539b6" - integrity sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY= - -object-is@^1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4" - integrity sha1-a4DrhP5FFJj2UAeYLwNaW0Re3sQ= - -object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: - version "1.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" - integrity sha1-HEfyct8nfzsdrwYWd9nILiMixg4= - -object-visit@^1.0.0: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" - integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs= - dependencies: - isobject "^3.0.0" - -object.assign@^4.1.0: - version "4.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" - integrity sha1-lovxEA15Vrs8oIbwBvhGs7xACNo= - dependencies: - define-properties "^1.1.2" - function-bind "^1.1.1" - has-symbols "^1.0.0" - object-keys "^1.0.11" - -object.entries@^1.1.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object.entries/-/object.entries-1.1.0.tgz#2024fc6d6ba246aee38bdb0ffd5cfbcf371b7519" - integrity sha1-ICT8bWuiRq7ji9sP/Vz7zzcbdRk= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.12.0" - function-bind "^1.1.1" - has "^1.0.3" - -object.entries@^1.1.1: - version "1.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b" - integrity sha1-7hzwQVPeArsJP+wzaDkA9XzlOZs= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" - has "^1.0.3" - -object.fromentries@^2.0.2: - version "2.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" - integrity sha1-SgnJubs4Q90PiazbUXp5TU81Wsk= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" - has "^1.0.3" - -object.pick@^1.3.0: - version "1.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" - integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c= - dependencies: - isobject "^3.0.1" - -object.values@^1.1.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9" - integrity sha1-v2gQ712j5TJXkOqqK+IT6oRiTak= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.12.0" - function-bind "^1.1.1" - has "^1.0.3" - -object.values@^1.1.1: - version "1.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" - integrity sha1-aKmezeNWt+kpWjxeDOMdyMlT3l4= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" - has "^1.0.3" - -once@^1.3.0, once@^1.3.1, once@^1.4.0: - version "1.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" - integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= - dependencies: - wrappy "1" - -onetime@^5.1.0: - version "5.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" - integrity sha1-//DzyRYX/mK7UBiWNumayKbfe+U= - dependencies: - mimic-fn "^2.1.0" - -optionator@^0.8.1: - version "0.8.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64" - integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q= - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.4" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - wordwrap "~1.0.0" - -optionator@^0.8.3: - version "0.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha1-hPodA2/p08fiHZmIS2ARZ+yPtJU= - dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" - -os-tmpdir@~1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" - integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= - -p-each-series@^2.1.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/p-each-series/-/p-each-series-2.1.0.tgz#961c8dd3f195ea96c747e636b262b800a6b1af48" - integrity sha1-lhyN0/GV6pbHR+Y2smK4AKaxr0g= - -p-finally@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" - integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4= - -p-finally@^2.0.0: - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" - integrity sha1-vW/KqcVZoJa2gIBvTWV7Pw8kBWE= - -p-limit@^1.1.0: - version "1.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" - integrity sha1-uGvV8MJWkJEcdZD8v8IBDVSzzLg= - dependencies: - p-try "^1.0.0" - -p-limit@^2.2.0: - version "2.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" - integrity sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE= - dependencies: - p-try "^2.0.0" - -p-locate@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43" - integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM= - dependencies: - p-limit "^1.1.0" - -p-locate@^4.1.0: - version "4.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07" - integrity sha1-o0KLtwiLOmApL2aRkni3wpetTwc= - dependencies: - p-limit "^2.2.0" - -p-try@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" - integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M= - -p-try@^2.0.0: - version "2.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" - integrity sha1-yyhoVA4xPWHeWPr741zpAE1VQOY= - -parent-module@^1.0.0: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" - integrity sha1-aR0nCeeMefrjoVZiJFLQB2LKqqI= - dependencies: - callsites "^3.0.0" - -parse-json@^2.2.0: - version "2.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9" - integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck= - dependencies: - error-ex "^1.2.0" - -parse-json@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - -parse-json@^5.0.0: - version "5.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" - integrity sha1-c+URTJhtFD76NxLU6iTbmkJm9g8= - dependencies: - "@babel/code-frame" "^7.0.0" - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - lines-and-columns "^1.1.6" - -parse5@5.1.0: - version "5.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/parse5/-/parse5-5.1.0.tgz#c59341c9723f414c452975564c7c00a68d58acd2" - integrity sha1-xZNByXI/QUxFKXVWTHwApo1YrNI= - -parse5@^3.0.1: - version "3.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/parse5/-/parse5-3.0.3.tgz#042f792ffdd36851551cf4e9e066b3874ab45b5c" - integrity sha1-BC95L/3TaFFVHPTp4Gazh0q0W1w= - dependencies: - "@types/node" "*" - -pascalcase@^0.1.1: - version "0.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" - integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ= - -path-dirname@^1.0.0: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0" - integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA= - -path-exists@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" - integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU= - -path-exists@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3" - integrity sha1-UTvb4tO5XXdi6METfvoZXGxhtbM= - -path-is-absolute@^1.0.0: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" - integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= - -path-key@^2.0.0, path-key@^2.0.1: - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" - integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= - -path-key@^3.0.0, path-key@^3.1.0: - version "3.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" - integrity sha1-WB9q3mWMu6ZaDTOA3ndTKVBU83U= - -path-parse@^1.0.6: - version "1.0.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha1-1i27VnlAXXLEc37FhgDp3c8G0kw= - -path-type@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73" - integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM= - dependencies: - pify "^2.0.0" - -path-type@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" - integrity sha1-zvMdyOCho7sNEFwM2Xzzv0f0428= - dependencies: - pify "^3.0.0" - -path-type@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" - integrity sha1-hO0BwKe6OAr+CdkKjBgNzZ0DBDs= - -performance-now@^2.1.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= - -picomatch@^2.0.4: - version "2.2.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha1-IfMz6ba46v8CRo9RRupAbTRfTa0= - -picomatch@^2.0.5: - version "2.0.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6" - integrity sha1-UUFp2MfNC9vuzIomCeNKcWPeafY= - -pify@^2.0.0: - version "2.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" - integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= - -pify@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" - integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= - -pify@^4.0.1: - version "4.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" - integrity sha1-SyzSXFDVmHNcUCkiJP2MbfQeMjE= - -pirates@^4.0.1: - version "4.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87" - integrity sha1-ZDqSyviUVm+RsrmG0sZpUKji+4c= - dependencies: - node-modules-regexp "^1.0.0" - -pkg-dir@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" - integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s= - dependencies: - find-up "^2.1.0" - -pkg-dir@^4.2.0: - version "4.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3" - integrity sha1-8JkTPfft5CLoHR2ESCcO6z5CYfM= - dependencies: - find-up "^4.0.0" - -pn@^1.1.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/pn/-/pn-1.1.0.tgz#e2f4cef0e219f463c179ab37463e4e1ecdccbafb" - integrity sha1-4vTO8OIZ9GPBeas3Rj5OHs3Muvs= - -posix-character-classes@^0.1.0: - version "0.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" - integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= - -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= - -prettier@2.0.4: - version "2.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/prettier/-/prettier-2.0.4.tgz#2d1bae173e355996ee355ec9830a7a1ee05457ef" - integrity sha1-LRuuFz41WZbuNV7Jgwp6HuBUV+8= - -pretty-format@^25.2.1, pretty-format@^25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/pretty-format/-/pretty-format-25.4.0.tgz#c58801bb5c4926ff4a677fe43f9b8b99812c7830" - integrity sha1-xYgBu1xJJv9KZ3/kP5uLmYEseDA= - dependencies: - "@jest/types" "^25.4.0" - ansi-regex "^5.0.0" - ansi-styles "^4.0.0" - react-is "^16.12.0" - -progress@^2.0.0: - version "2.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" - integrity sha1-foz42PW48jnBvGi+tOt4Vn1XLvg= - -promise@^7.1.1: - version "7.3.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" - integrity sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078= - dependencies: - asap "~2.0.3" - -prompts@^2.0.1: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/prompts/-/prompts-2.1.0.tgz#bf90bc71f6065d255ea2bdc0fe6520485c1b45db" - integrity sha1-v5C8cfYGXSVeor3A/mUgSFwbRds= - dependencies: - kleur "^3.0.2" - sisteransi "^1.0.0" - -prop-types-exact@^1.2.0: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/prop-types-exact/-/prop-types-exact-1.2.0.tgz#825d6be46094663848237e3925a98c6e944e9869" - integrity sha1-gl1r5GCUZjhII345JamMbpROmGk= - dependencies: - has "^1.0.3" - object.assign "^4.1.0" - reflect.ownkeys "^0.2.0" - -prop-types@15.7.2, prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: - version "15.7.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha1-UsQedbjIfnK52TYOAga5ncv/psU= - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.8.1" - -psl@^1.1.28: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/psl/-/psl-1.2.0.tgz#df12b5b1b3a30f51c329eacbdef98f3a6e136dc6" - integrity sha1-3xK1sbOjD1HDKerL3vmPOm4TbcY= - -pump@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64" - integrity sha1-tKIRaBW94vTh6mAjVOjHVWUQemQ= - dependencies: - end-of-stream "^1.1.0" - once "^1.3.1" - -punycode@^2.1.0, punycode@^2.1.1: - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" - integrity sha1-tYsBCsQMIsVldhbI0sLALHv0eew= - -qs@~6.5.2: - version "6.5.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha1-yzroBuh0BERYTvFUzo7pjUA/PjY= - -query-string@^4.2.2: - version "4.3.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" - integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= - dependencies: - object-assign "^4.1.0" - strict-uri-encode "^1.0.0" - -quick-lru@^1.0.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/quick-lru/-/quick-lru-1.1.0.tgz#4360b17c61136ad38078397ff11416e186dcfbb8" - integrity sha1-Q2CxfGETatOAeDl/8RQW4Ybc+7g= - -raf@^3.4.1: - version "3.4.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/raf/-/raf-3.4.1.tgz#0742e99a4a6552f445d73e3ee0328af0ff1ede39" - integrity sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk= - dependencies: - performance-now "^2.1.0" - -railroad-diagrams@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/railroad-diagrams/-/railroad-diagrams-1.0.0.tgz#eb7e6267548ddedfb899c1b90e57374559cddb7e" - integrity sha1-635iZ1SN3t+4mcG5Dlc3RVnN234= - -randexp@0.4.6: - version "0.4.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/randexp/-/randexp-0.4.6.tgz#e986ad5e5e31dae13ddd6f7b3019aa7c87f60ca3" - integrity sha1-6YatXl4x2uE93W97MBmqfIf2DKM= - dependencies: - discontinuous-range "1.0.0" - ret "~0.1.10" - -react-dom@16.8.6: - version "16.8.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-dom/-/react-dom-16.8.6.tgz#71d6303f631e8b0097f56165ef608f051ff6e10f" - integrity sha1-cdYwP2MeiwCX9WFl72CPBR/24Q8= - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.13.6" - -react-draggable@4.2.0: - version "4.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-draggable/-/react-draggable-4.2.0.tgz#40cc5209082ca7d613104bf6daf31372cc0e1114" - integrity sha1-QMxSCQgsp9YTEEv22vMTcswOERQ= - dependencies: - classnames "^2.2.5" - prop-types "^15.6.0" - -react-fast-compare@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-fast-compare/-/react-fast-compare-1.0.0.tgz#813a039155e49b43ceffe99528fe5e9d97a6c938" - integrity sha1-gToDkVXkm0PO/+mVKP5enZemyTg= - -react-input-autosize@^2.1.2: - version "2.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-input-autosize/-/react-input-autosize-2.2.1.tgz#ec428fa15b1592994fb5f9aa15bb1eb6baf420f8" - integrity sha1-7EKPoVsVkplPtfmqFbsetrr0IPg= - dependencies: - prop-types "^15.5.8" - -react-intl@2.8.0: - version "2.8.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-intl/-/react-intl-2.8.0.tgz#20b0c1f01d1292427768aa8ec9e51ab7e36503ba" - integrity sha1-ILDB8B0SkkJ3aKqOyeUat+NlA7o= - dependencies: - hoist-non-react-statics "^2.5.5" - intl-format-cache "^2.0.5" - intl-messageformat "^2.1.0" - intl-relativeformat "^2.1.0" - invariant "^2.1.1" - -react-is@^16.12.0, react-is@^16.9.0: - version "16.13.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527" - integrity sha1-DzfDYTw0/ms3zX92Og1ik6sVxSc= - -react-is@^16.7.0: - version "16.9.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb" - integrity sha1-IcqVYTmarQ/xp3AcAWg+jKmB7cs= - -react-is@^16.8.1, react-is@^16.8.6: - version "16.8.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16" - integrity sha1-W7weLSkUHJ+9/tRWND/ivEMKahY= - -react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4: - version "3.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" - integrity sha1-TxonOv38jzSIqMUWv9p4+HI1I2I= - -react-modal@3.8.2: - version "3.8.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-modal/-/react-modal-3.8.2.tgz#c47397a8602beb7aae0059a3b404f20416241d03" - integrity sha1-xHOXqGAr63quAFmjtATyBBYkHQM= - dependencies: - exenv "^1.2.0" - prop-types "^15.5.10" - react-lifecycles-compat "^3.0.0" - warning "^4.0.3" - -react-router@3.2.1: - version "3.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-router/-/react-router-3.2.1.tgz#b9a3279962bdfbe684c8bd0482b81ef288f0f244" - integrity sha1-uaMnmWK9++aEyL0Egrge8ojw8kQ= - dependencies: - create-react-class "^15.5.1" - history "^3.0.0" - hoist-non-react-statics "^2.3.1" - invariant "^2.2.1" - loose-envify "^1.2.0" - prop-types "^15.5.6" - warning "^3.0.0" - -react-select@1.2.1: - version "1.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-select/-/react-select-1.2.1.tgz#a2fe58a569eb14dcaa6543816260b97e538120d1" - integrity sha1-ov5YpWnrFNyqZUOBYmC5flOBINE= - dependencies: - classnames "^2.2.4" - prop-types "^15.5.8" - react-input-autosize "^2.1.2" - -react-test-renderer@16.8.6, react-test-renderer@^16.0.0-0: - version "16.8.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-test-renderer/-/react-test-renderer-16.8.6.tgz#188d8029b8c39c786f998aa3efd3ffe7642d5ba1" - integrity sha1-GI2AKbjDnHhvmYqj79P/52QtW6E= - dependencies: - object-assign "^4.1.1" - prop-types "^15.6.2" - react-is "^16.8.6" - scheduler "^0.13.6" - -react-virtualized@9.21.0: - version "9.21.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react-virtualized/-/react-virtualized-9.21.0.tgz#8267c40ffb48db35b242a36dea85edcf280a6506" - integrity sha1-gmfED/tI2zWyQqNt6oXtzygKZQY= - dependencies: - babel-runtime "^6.26.0" - classnames "^2.2.3" - dom-helpers "^2.4.0 || ^3.0.0" - loose-envify "^1.3.0" - prop-types "^15.6.0" - react-lifecycles-compat "^3.0.4" - -react@16.8.6: - version "16.8.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/react/-/react-16.8.6.tgz#ad6c3a9614fd3a4e9ef51117f54d888da01f2bbe" - integrity sha1-rWw6lhT9Ok6e9REX9U2IjaAfK74= - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.13.6" - -read-pkg-up@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be" - integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4= - dependencies: - find-up "^2.0.0" - read-pkg "^2.0.0" - -read-pkg-up@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" - integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= - dependencies: - find-up "^2.0.0" - read-pkg "^3.0.0" - -read-pkg-up@^7.0.1: - version "7.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" - integrity sha1-86YTV1hFlzOuK5VjgFbhhU5+9Qc= - dependencies: - find-up "^4.1.0" - read-pkg "^5.2.0" - type-fest "^0.8.1" - -read-pkg@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8" - integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg= - dependencies: - load-json-file "^2.0.0" - normalize-package-data "^2.3.2" - path-type "^2.0.0" - -read-pkg@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" - integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= - dependencies: - load-json-file "^4.0.0" - normalize-package-data "^2.3.2" - path-type "^3.0.0" - -read-pkg@^5.2.0: - version "5.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" - integrity sha1-e/KVQ4yloz5WzTDgU7NO5yUMk8w= - dependencies: - "@types/normalize-package-data" "^2.4.0" - normalize-package-data "^2.5.0" - parse-json "^5.0.0" - type-fest "^0.6.0" - -readable-stream@^3.1.1: - version "3.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/readable-stream/-/readable-stream-3.4.0.tgz#a51c26754658e0a3c21dbf59163bd45ba6f447fc" - integrity sha1-pRwmdUZY4KPCHb9ZFjvUW6b0R/w= - dependencies: - inherits "^2.0.3" - string_decoder "^1.1.1" - util-deprecate "^1.0.1" - -realpath-native@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/realpath-native/-/realpath-native-2.0.0.tgz#7377ac429b6e1fd599dc38d08ed942d0d7beb866" - integrity sha1-c3esQptuH9WZ3DjQjtlC0Ne+uGY= - -redent@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/redent/-/redent-2.0.0.tgz#c1b2007b42d57eb1389079b3c8333639d5e1ccaa" - integrity sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo= - dependencies: - indent-string "^3.0.0" - strip-indent "^2.0.0" - -reflect.ownkeys@^0.2.0: - version "0.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460" - integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA= - -regenerator-runtime@^0.11.0: - version "0.11.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" - integrity sha1-vgWtf5v30i4Fb5cmzuUBf78Z4uk= - -regenerator-runtime@^0.13.2: - version "0.13.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447" - integrity sha1-MuWcmm+5saSv8JtJMMotRHc0NEc= - -regenerator-runtime@^0.13.4: - version "0.13.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" - integrity sha1-2Hih0JS0MG0QuQlkhLM+vVXiZpc= - -regex-not@^1.0.0, regex-not@^1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c" - integrity sha1-H07OJ+ALC2XgJHpoEOaoXYOldSw= - dependencies: - extend-shallow "^3.0.2" - safe-regex "^1.1.0" - -regexp.prototype.flags@^1.3.0: - version "1.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" - integrity sha1-erqJs8E6ZFCdq888qNn7ub31y3U= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - -regexpp@^2.0.1: - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" - integrity sha1-jRnTHPYySCtYkEn4KB+T28uk0H8= - -remove-trailing-separator@^1.0.1: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" - integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= - -repeat-element@^1.1.2: - version "1.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha1-eC4NglwMWjuzlzH4Tv7mt0Lmsc4= - -repeat-string@^1.6.1: - version "1.6.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637" - integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc= - -request-promise-core@1.1.3: - version "1.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9" - integrity sha1-6aPAgbUTgN/qZ3M2Bh/qh5qCnuk= - dependencies: - lodash "^4.17.15" - -request-promise-native@^1.0.7: - version "1.0.8" - resolved "https://repox.jfrog.io/repox/api/npm/npm/request-promise-native/-/request-promise-native-1.0.8.tgz#a455b960b826e44e2bf8999af64dff2bfe58cb36" - integrity sha1-pFW5YLgm5E4r+Jma9k3/K/5YyzY= - dependencies: - request-promise-core "1.1.3" - stealthy-require "^1.1.1" - tough-cookie "^2.3.3" - -request@^2.88.0: - version "2.88.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha1-1zyRhzHLWofaBH4gcjQUb2ZNErM= - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - -require-directory@^2.1.1: - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" - integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= - -require-main-filename@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" - integrity sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs= - -resolve-cwd@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d" - integrity sha1-DwB18bslRHZs9zumpuKt/ryxPy0= - dependencies: - resolve-from "^5.0.0" - -resolve-from@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" - integrity sha1-six699nWiBvItuZTM17rywoYh0g= - -resolve-from@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" - integrity sha1-SrzYUq0y3Xuqv+m0DgCjbbXzkuY= - -resolve-from@^5.0.0: - version "5.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" - integrity sha1-w1IlhD3493bfIcV1V7wIfp39/Gk= - -resolve-url@^0.2.1: - version "0.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" - integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= - -resolve@1.1.7: - version "1.1.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b" - integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs= - -resolve@1.x, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.5.0: - version "1.11.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e" - integrity sha1-6hDYEQN2mC/vV434/DC5rDCgej4= - dependencies: - path-parse "^1.0.6" - -resolve@^1.12.0: - version "1.15.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/resolve/-/resolve-1.15.0.tgz#1b7ca96073ebb52e741ffd799f6b39ea462c67f5" - integrity sha1-G3ypYHPrtS50H/15n2s56kYsZ/U= - dependencies: - path-parse "^1.0.6" - -resolve@^1.15.1: - version "1.16.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/resolve/-/resolve-1.16.1.tgz#49fac5d8bacf1fd53f200fa51247ae736175832c" - integrity sha1-SfrF2LrPH9U/IA+lEkeuc2F1gyw= - dependencies: - path-parse "^1.0.6" - -restore-cursor@^3.1.0: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" - integrity sha1-OfZ8VLOnpYzqUjbZXPADQjljH34= - dependencies: - onetime "^5.1.0" - signal-exit "^3.0.2" - -ret@~0.1.10: - version "0.1.15" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" - integrity sha1-uKSCXVvbH8P29Twrwz+BOIaBx7w= - -reusify@^1.0.0: - version "1.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" - integrity sha1-kNo4Kx4SbvwCFG6QhFqI2xKSXXY= - -rimraf@2.6.3: - version "2.6.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab" - integrity sha1-stEE/g2Psnz54KHNqCYt04M8bKs= - dependencies: - glob "^7.1.3" - -rimraf@^3.0.0: - version "3.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" - integrity sha1-8aVAK6YiCtUswSgrrBrjqkn9Bho= - dependencies: - glob "^7.1.3" - -rst-selector-parser@^2.2.3: - version "2.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" - integrity sha1-gbIw6i/MYGbInjRy3nlChdmwPZE= - dependencies: - lodash.flattendeep "^4.4.0" - nearley "^2.7.10" - -rsvp@^4.8.4: - version "4.8.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/rsvp/-/rsvp-4.8.5.tgz#c8f155311d167f68f21e168df71ec5b083113734" - integrity sha1-yPFVMR0Wf2jyHhaN9x7FsIMRNzQ= - -run-async@^2.4.0: - version "2.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/run-async/-/run-async-2.4.0.tgz#e59054a5b86876cfae07f431d18cbaddc594f1e8" - integrity sha1-5ZBUpbhods+uB/Qx0Yy63cWU8eg= - dependencies: - is-promise "^2.1.0" - -run-parallel@^1.1.9: - version "1.1.9" - resolved "https://repox.jfrog.io/repox/api/npm/npm/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" - integrity sha1-yd06fPn0ssS2JE4XOm7YZuYd1nk= - -rxjs@^6.5.3: - version "6.5.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/rxjs/-/rxjs-6.5.5.tgz#c5c884e3094c8cfee31bf27eb87e54ccfc87f9ec" - integrity sha1-xciE4wlMjP7jG/J+uH5UzPyH+ew= - dependencies: - tslib "^1.9.0" - -safe-buffer@^5.0.1, safe-buffer@^5.1.2: - version "5.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" - integrity sha1-t02uxJsRSPiMZLaNSbHoFcHy9Rk= - -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" - integrity sha1-mR7GnSluAxN0fVm9/St0XDX4go0= - -safe-regex@^1.1.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e" - integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4= - dependencies: - ret "~0.1.10" - -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: - version "2.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" - integrity sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo= - -sane@^4.0.3: - version "4.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/sane/-/sane-4.1.0.tgz#ed881fd922733a6c461bc189dc2b6c006f3ffded" - integrity sha1-7Ygf2SJzOmxGG8GJ3CtsAG8//e0= - dependencies: - "@cnakazawa/watch" "^1.0.3" - anymatch "^2.0.0" - capture-exit "^2.0.0" - exec-sh "^0.3.2" - execa "^1.0.0" - fb-watchman "^2.0.0" - micromatch "^3.1.4" - minimist "^1.1.1" - walker "~1.0.5" - -saxes@^3.1.9: - version "3.1.11" - resolved "https://repox.jfrog.io/repox/api/npm/npm/saxes/-/saxes-3.1.11.tgz#d59d1fd332ec92ad98a2e0b2ee644702384b1c5b" - integrity sha1-1Z0f0zLskq2YouCy7mRHAjhLHFs= - dependencies: - xmlchars "^2.1.1" - -scheduler@^0.13.6: - version "0.13.6" - resolved "https://repox.jfrog.io/repox/api/npm/npm/scheduler/-/scheduler-0.13.6.tgz#466a4ec332467b31a91b9bf74e5347072e4cd889" - integrity sha1-RmpOwzJGezGpG5v3TlNHBy5M2Ik= - dependencies: - loose-envify "^1.1.0" - object-assign "^4.1.1" - -select@^1.1.2: - version "1.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d" - integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0= - -"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.6.0, semver@^5.7.0: - version "5.7.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b" - integrity sha1-eQp89v6lRZuslhELKbYEEtyP+Ws= - -semver@6.x, semver@^6.1.2, semver@^6.3.0: - version "6.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" - integrity sha1-7gpkyK9ejO6mdoexM3YeG+y9HT0= - -semver@^5.7.1: - version "5.7.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" - integrity sha1-qVT5Ma66UI0we78Gnv8MAclhFvc= - -semver@^6.0.0: - version "6.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/semver/-/semver-6.2.0.tgz#4d813d9590aaf8a9192693d6c85b9344de5901db" - integrity sha1-TYE9lZCq+KkZJpPWyFuTRN5ZAds= - -set-blocking@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" - integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= - -set-value@^2.0.0, set-value@^2.0.1: - version "2.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b" - integrity sha1-oY1AUw5vB95CKMfe/kInr4ytAFs= - dependencies: - extend-shallow "^2.0.1" - is-extendable "^0.1.1" - is-plain-object "^2.0.3" - split-string "^3.0.1" - -setimmediate@^1.0.5: - version "1.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" - integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= - -shebang-command@^1.2.0: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" - integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo= - dependencies: - shebang-regex "^1.0.0" - -shebang-command@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" - integrity sha1-zNCvT4g1+9wmW4JGGq8MNmY/NOo= - dependencies: - shebang-regex "^3.0.0" - -shebang-regex@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3" - integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM= - -shebang-regex@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" - integrity sha1-rhbxZE2HPsrYQ7AwexQzYtTEIXI= - -shellwords@^0.1.1: - version "0.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b" - integrity sha1-1rkYHBpI05cyTISHHvvPxz/AZUs= - -side-channel@^1.0.2: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" - integrity sha1-310auttOS/SvHNiFK/Ey0veHaUc= - dependencies: - es-abstract "^1.17.0-next.1" - object-inspect "^1.7.0" - -signal-exit@^3.0.0, signal-exit@^3.0.2: - version "3.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d" - integrity sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0= - -sisteransi@^1.0.0: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/sisteransi/-/sisteransi-1.0.2.tgz#ec57d64b6f25c4f26c0e2c7dd23f2d7f12f7e418" - integrity sha1-7FfWS28lxPJsDix90j8tfxL35Bg= - -slash@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44" - integrity sha1-3lUoUaF1nfOo8gZTVEL17E3eq0Q= - -slash@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634" - integrity sha1-ZTm+hwwWWtvVJAIg2+Nh8bxNRjQ= - -slice-ansi@^2.1.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" - integrity sha1-ys12k0YaY3pXiNkqfdT7oGjoFjY= - dependencies: - ansi-styles "^3.2.0" - astral-regex "^1.0.0" - is-fullwidth-code-point "^2.0.0" - -snapdragon-node@^2.0.1: - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b" - integrity sha1-bBdfhv8UvbByRWPo88GwIaKGhTs= - dependencies: - define-property "^1.0.0" - isobject "^3.0.0" - snapdragon-util "^3.0.1" - -snapdragon-util@^3.0.1: - version "3.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2" - integrity sha1-+VZHlIbyrNeXAGk/b3uAXkWrVuI= - dependencies: - kind-of "^3.2.0" - -snapdragon@^0.8.1: - version "0.8.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d" - integrity sha1-ZJIufFZbDhQgS6GqfWlkJ40lGC0= - dependencies: - base "^0.11.1" - debug "^2.2.0" - define-property "^0.2.5" - extend-shallow "^2.0.1" - map-cache "^0.2.2" - source-map "^0.5.6" - source-map-resolve "^0.5.0" - use "^3.1.0" - -source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: - version "0.5.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" - integrity sha1-cuLMNAlVQ+Q7LGKyxMENSpBU8lk= - dependencies: - atob "^2.1.1" - decode-uri-component "^0.2.0" - resolve-url "^0.2.1" - source-map-url "^0.4.0" - urix "^0.1.0" - -source-map-support@^0.5.6: - version "0.5.12" - resolved "https://repox.jfrog.io/repox/api/npm/npm/source-map-support/-/source-map-support-0.5.12.tgz#b4f3b10d51857a5af0138d3ce8003b201613d599" - integrity sha1-tPOxDVGFelrwE4086AA7IBYT1Zk= - dependencies: - buffer-from "^1.0.0" - source-map "^0.6.0" - -source-map-url@^0.4.0: - version "0.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3" - integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM= - -source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7: - version "0.5.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" - integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= - -source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1: - version "0.6.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" - integrity sha1-dHIq8y6WFOnCh6jQu95IteLxomM= - -source-map@^0.7.3: - version "0.7.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" - integrity sha1-UwL4FpAxc1ImVECS5kmB91F1A4M= - -spdx-correct@^3.0.0: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" - integrity sha1-+4PlBERSaPFUsHTiGMh8ADzTHfQ= - dependencies: - spdx-expression-parse "^3.0.0" - spdx-license-ids "^3.0.0" - -spdx-exceptions@^2.1.0: - version "2.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" - integrity sha1-LqRQrudPKom/uUUZwH/Nb0EyKXc= - -spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - integrity sha1-meEZt6XaAOBUkcn6M4t5BII7QdA= - dependencies: - spdx-exceptions "^2.1.0" - spdx-license-ids "^3.0.0" - -spdx-license-ids@^3.0.0: - version "3.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" - integrity sha1-NpS1gEVnpFjTyARYQqY1hjL2JlQ= - -split-string@^3.0.1, split-string@^3.0.2: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2" - integrity sha1-fLCd2jqGWFcFxks5pkZgOGguj+I= - dependencies: - extend-shallow "^3.0.0" - -sprintf-js@~1.0.2: - version "1.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" - integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= - -sshpk@^1.7.0: - version "1.16.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha1-+2YcC+8ps520B2nuOfpwCT1vaHc= - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - -stack-utils@^1.0.1: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/stack-utils/-/stack-utils-1.0.2.tgz#33eba3897788558bebfc2db059dc158ec36cebb8" - integrity sha1-M+ujiXeIVYvr/C2wWdwVjsNs67g= - -static-extend@^0.1.1: - version "0.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6" - integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY= - dependencies: - define-property "^0.2.5" - object-copy "^0.1.0" - -stealthy-require@^1.1.1: - version "1.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" - integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= - -strict-uri-encode@^1.0.0: - version "1.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" - integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM= - -string-length@^3.1.0: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/string-length/-/string-length-3.1.0.tgz#107ef8c23456e187a8abd4a61162ff4ac6e25837" - integrity sha1-EH74wjRW4Yeoq9SmEWL/SsbiWDc= - dependencies: - astral-regex "^1.0.0" - strip-ansi "^5.2.0" - -string-width@^4.1.0: - version "4.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/string-width/-/string-width-4.1.0.tgz#ba846d1daa97c3c596155308063e075ed1c99aff" - integrity sha1-uoRtHaqXw8WWFVMIBj4HXtHJmv8= - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^5.2.0" - -string-width@^4.2.0: - version "4.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" - integrity sha1-lSGCxGzHssMT0VluYjmSvRY7crU= - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.0" - -string.prototype.matchall@^4.0.2: - version "4.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" - integrity sha1-SLtRAyb7n962ozzqqBpuoE73ZI4= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0" - has-symbols "^1.0.1" - internal-slot "^1.0.2" - regexp.prototype.flags "^1.3.0" - side-channel "^1.0.2" - -string.prototype.trim@^1.2.1: - version "1.2.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz#141233dff32c82bfad80684d7e5f0869ee0fb782" - integrity sha1-FBIz3/Msgr+tgGhNfl8Iae4Pt4I= - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" - -string.prototype.trimleft@^2.1.1: - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz#9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74" - integrity sha1-m9uKxqvW1gKxek7TIYcNL43O/HQ= - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" - -string.prototype.trimright@^2.1.1: - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz#440314b15996c866ce8a0341894d45186200c5d9" - integrity sha1-RAMUsVmWyGbOigNBiU1FGGIAxdk= - dependencies: - define-properties "^1.1.3" - function-bind "^1.1.1" - -string_decoder@^1.1.1: - version "1.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d" - integrity sha1-/obnOLGVRK/nBGkkOyoe6SQOro0= - dependencies: - safe-buffer "~5.1.0" - -strip-ansi@^5.2.0: - version "5.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae" - integrity sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4= - dependencies: - ansi-regex "^4.1.0" - -strip-ansi@^6.0.0: - version "6.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" - integrity sha1-CxVx3XZpzNTz4G4U7x7tJiJa5TI= - dependencies: - ansi-regex "^5.0.0" - -strip-bom@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" - integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= - -strip-bom@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/strip-bom/-/strip-bom-4.0.0.tgz#9c3505c1db45bcedca3d9cf7a16f5c5aa3901878" - integrity sha1-nDUFwdtFvO3KPZz3oW9cWqOQGHg= - -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8= - -strip-final-newline@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" - integrity sha1-ibhS+y/L6Tb29LMYevsKEsGrWK0= - -strip-indent@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68" - integrity sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g= - -strip-json-comments@^3.0.1: - version "3.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/strip-json-comments/-/strip-json-comments-3.1.0.tgz#7638d31422129ecf4457440009fba03f9f9ac180" - integrity sha1-djjTFCISns9EV0QACfugP5+awYA= - -supports-color@^5.3.0: - version "5.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" - integrity sha1-4uaaRKyHcveKHsCzW2id9lMO/I8= - dependencies: - has-flag "^3.0.0" - -supports-color@^7.0.0, supports-color@^7.1.0: - version "7.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" - integrity sha1-aOMlkd9z4lrRxLSRCKLsUHliv9E= - dependencies: - has-flag "^4.0.0" - -supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha1-9mPfJSr183xdSbvX7u+p4Lnlnkc= - dependencies: - has-flag "^4.0.0" - supports-color "^7.0.0" - -symbol-tree@^3.2.2: - version "3.2.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" - integrity sha1-QwY30ki6d+B4iDlR+5qg7tfGP6I= - -table@^5.2.3: - version "5.4.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/table/-/table-5.4.3.tgz#1f6a1377966ce70a33230d9457fb48ac173d216b" - integrity sha1-H2oTd5Zs5wozIw2UV/tIrBc9IWs= - dependencies: - ajv "^6.10.2" - lodash "^4.17.14" - slice-ansi "^2.1.0" - string-width "^4.1.0" - -terminal-link@^2.0.0: - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/terminal-link/-/terminal-link-2.1.1.tgz#14a64a27ab3c0df933ea546fba55f2d078edc994" - integrity sha1-FKZKJ6s8Dfkz6lRvulXy0HjtyZQ= - dependencies: - ansi-escapes "^4.2.1" - supports-hyperlinks "^2.0.0" - -test-exclude@^6.0.0: - version "6.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e" - integrity sha1-BKhphmHYBepvopO2y55jrARO8V4= - dependencies: - "@istanbuljs/schema" "^0.1.2" - glob "^7.1.4" - minimatch "^3.0.4" - -text-table@^0.2.0: - version "0.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= - -throat@^5.0.0: - version "5.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b" - integrity sha1-xRmSNYA6rRh1SmZ9ZZtecs4Wdks= - -through@^2.3.6: - version "2.3.8" - resolved "https://repox.jfrog.io/repox/api/npm/npm/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" - integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= - -tiny-emitter@^2.0.0: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423" - integrity sha1-HRpW7fxRxD6GPLtTgqcjMONVVCM= - -tmp@^0.0.33: - version "0.0.33" - resolved "https://repox.jfrog.io/repox/api/npm/npm/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9" - integrity sha1-bTQzWIl2jSGyvNoKonfO07G/rfk= - dependencies: - os-tmpdir "~1.0.2" - -tmpl@1.0.x: - version "1.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" - integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= - -to-fast-properties@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e" - integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4= - -to-object-path@^0.3.0: - version "0.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af" - integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68= - dependencies: - kind-of "^3.0.2" - -to-regex-range@^2.1.0: - version "2.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38" - integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg= - dependencies: - is-number "^3.0.0" - repeat-string "^1.6.1" - -to-regex-range@^5.0.1: - version "5.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4" - integrity sha1-FkjESq58jZiKMmAY7XL1tN0DkuQ= - dependencies: - is-number "^7.0.0" - -to-regex@^3.0.1, to-regex@^3.0.2: - version "3.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce" - integrity sha1-E8/dmzNlUvMLUfM6iuG0Knp1mc4= - dependencies: - define-property "^2.0.2" - extend-shallow "^3.0.2" - regex-not "^1.0.2" - safe-regex "^1.1.0" - -tough-cookie@^2.3.3, tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha1-zZ+yoKodWhK0c72fuW+j3P9lreI= - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - -tough-cookie@^3.0.1: - version "3.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/tough-cookie/-/tough-cookie-3.0.1.tgz#9df4f57e739c26930a018184887f4adb7dca73b2" - integrity sha1-nfT1fnOcJpMKAYGEiH9K233Kc7I= - dependencies: - ip-regex "^2.1.0" - psl "^1.1.28" - punycode "^2.1.1" - -tr46@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/tr46/-/tr46-1.0.1.tgz#a8b13fd6bfd2489519674ccde55ba3693b706d09" - integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= - dependencies: - punycode "^2.1.0" - -trim-newlines@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/trim-newlines/-/trim-newlines-2.0.0.tgz#b403d0b91be50c331dfc4b82eeceb22c3de16d20" - integrity sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA= - -trim-right@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" - integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM= - -ts-jest@25.4.0: - version "25.4.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ts-jest/-/ts-jest-25.4.0.tgz#5ad504299f8541d463a52e93e5e9d76876be0ba4" - integrity sha1-WtUEKZ+FQdRjpS6T5enXaHa+C6Q= - dependencies: - bs-logger "0.x" - buffer-from "1.x" - fast-json-stable-stringify "2.x" - json5 "2.x" - lodash.memoize "4.x" - make-error "1.x" - micromatch "4.x" - mkdirp "1.x" - resolve "1.x" - semver "6.x" - yargs-parser "18.x" - -tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: - version "1.10.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" - integrity sha1-w8GflZc/sKYpc/sJ2Q2WHuQ+XIo= - -tsutils@^3.17.1: - version "3.17.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759" - integrity sha1-7XGZF/EcoN7lhicrKsSeAVot11k= - dependencies: - tslib "^1.8.1" - -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - -type-check@~0.3.2: - version "0.3.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= - dependencies: - prelude-ls "~1.1.2" - -type-detect@4.0.8: - version "4.0.8" - resolved "https://repox.jfrog.io/repox/api/npm/npm/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c" - integrity sha1-dkb7XxiHHPu3dJ5pvTmmOI63RQw= - -type-fest@^0.11.0: - version "0.11.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha1-l6vwhyMQ/tiKXEZrJWgVdhReM/E= - -type-fest@^0.6.0: - version "0.6.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" - integrity sha1-jSojcNPfiG61yQraHFv2GIrPg4s= - -type-fest@^0.8.1: - version "0.8.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" - integrity sha1-CeJJ696FHTseSNJ8EFREZn8XuD0= - -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha1-qX7nqf9CaRufeD/xvFES/j/KkIA= - dependencies: - is-typedarray "^1.0.0" - -typescript@3.8.3: - version "3.8.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/typescript/-/typescript-3.8.3.tgz#409eb8544ea0335711205869ec458ab109ee1061" - integrity sha1-QJ64VE6gM1cRIFhp7EWKsQnuEGE= - -ua-parser-js@^0.7.18: - version "0.7.20" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ua-parser-js/-/ua-parser-js-0.7.20.tgz#7527178b82f6a62a0f243d1f94fd30e3e3c21098" - integrity sha1-dScXi4L2pioPJD0flP0w4+PCEJg= - -union-value@^1.0.0: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847" - integrity sha1-C2/nuDWuzaYcbqTU8CwUIh4QmEc= - dependencies: - arr-union "^3.1.0" - get-value "^2.0.6" - is-extendable "^0.1.1" - set-value "^2.0.1" - -unset-value@^1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" - integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk= - dependencies: - has-value "^0.3.1" - isobject "^3.0.0" - -uri-js@^4.2.2: - version "4.2.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha1-lMVA4f93KVbiKZUHwBCupsiDjrA= - dependencies: - punycode "^2.1.0" - -urix@^0.1.0: - version "0.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72" - integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI= - -use@^3.1.0: - version "3.1.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" - integrity sha1-1QyMrHmhn7wg8pEfVuuXP04QBw8= - -util-deprecate@^1.0.1: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" - integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= - -uuid@^3.3.2: - version "3.3.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" - integrity sha1-G0r0lV6zB3xQHCOHL8ZROBFYcTE= - -v8-compile-cache@^2.0.3: - version "2.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" - integrity sha1-4U3jezGm0ZT1aQ1n78Tn9vxqsw4= - -v8-to-istanbul@^4.1.3: - version "4.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz#22fe35709a64955f49a08a7c7c959f6520ad6f20" - integrity sha1-Iv41cJpklV9JoIp8fJWfZSCtbyA= - dependencies: - "@types/istanbul-lib-coverage" "^2.0.1" - convert-source-map "^1.6.0" - source-map "^0.7.3" - -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://repox.jfrog.io/repox/api/npm/npm/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" - integrity sha1-/JH2uce6FchX9MssXe/uw51PQQo= - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -verror@1.10.0: - version "1.10.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -w3c-hr-time@^1.0.1: - version "1.0.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" - integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU= - dependencies: - browser-process-hrtime "^0.1.2" - -w3c-xmlserializer@^1.1.2: - version "1.1.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz#30485ca7d70a6fd052420a3d12fd90e6339ce794" - integrity sha1-MEhcp9cKb9BSQgo9Ev2Q5jOc55Q= - dependencies: - domexception "^1.0.1" - webidl-conversions "^4.0.2" - xml-name-validator "^3.0.0" - -walker@^1.0.7, walker@~1.0.5: - version "1.0.7" - resolved "https://repox.jfrog.io/repox/api/npm/npm/walker/-/walker-1.0.7.tgz#2f7f9b8fd10d677262b18a884e28d19618e028fb" - integrity sha1-L3+bj9ENZ3JisYqITijRlhjgKPs= - dependencies: - makeerror "1.0.x" - -warning@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/warning/-/warning-3.0.0.tgz#32e5377cb572de4ab04753bdf8821c01ed605b7c" - integrity sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w= - dependencies: - loose-envify "^1.0.0" - -warning@^4.0.3: - version "4.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3" - integrity sha1-Fungd+uKhtavfWSqHgX9hbRnjKM= - dependencies: - loose-envify "^1.0.0" - -webidl-conversions@^4.0.2: - version "4.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" - integrity sha1-qFWYCx8LazWbodXZ+zmulB+qY60= - -whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5: - version "1.0.5" - resolved "https://repox.jfrog.io/repox/api/npm/npm/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0" - integrity sha1-WrrPd3wyFmpR0IXWtPPn0nET3bA= - dependencies: - iconv-lite "0.4.24" - -whatwg-fetch@3.0.0, whatwg-fetch@>=0.10.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" - integrity sha1-/IBORYzEYACbGiuWa8iBfSV4rvs= - -whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: - version "2.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" - integrity sha1-PUseAxLSB5h5+Cav8Y2+7KWWD78= - -whatwg-url@^7.0.0: - version "7.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/whatwg-url/-/whatwg-url-7.0.0.tgz#fde926fa54a599f3adf82dff25a9f7be02dc6edd" - integrity sha1-/ekm+lSlmfOt+C3/Jan3vgLcbt0= - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - -which-module@^2.0.0: - version "2.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" - integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= - -which@^1.2.9, which@^1.3.1: - version "1.3.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha1-pFBD1U9YBTFtqNYvn1CRjT2nCwo= - dependencies: - isexe "^2.0.0" - -which@^2.0.1, which@^2.0.2: - version "2.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" - integrity sha1-fGqN0KY2oDJ+ELWckobu6T8/UbE= - dependencies: - isexe "^2.0.0" - -word-wrap@~1.2.3: - version "1.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" - integrity sha1-YQY29rH3A4kb00dxzLF/uTtHB5w= - -wordwrap@~1.0.0: - version "1.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb" - integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus= - -wrap-ansi@^6.2.0: - version "6.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53" - integrity sha1-6Tk7oHEC5skaOyIUePAlfNKFblM= - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - -wrappy@1: - version "1.0.2" - resolved "https://repox.jfrog.io/repox/api/npm/npm/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" - integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8= - -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha1-Vr1cWlxwSBzRnFcb05q5ZaXeVug= - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - -write@1.0.3: - version "1.0.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3" - integrity sha1-CADhRSO5I6OH5BUSPIZWFqrg9cM= - dependencies: - mkdirp "^0.5.1" - -ws@^7.0.0: - version "7.2.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/ws/-/ws-7.2.3.tgz#a5411e1fb04d5ed0efee76d26d5c46d830c39b46" - integrity sha1-pUEeH7BNXtDv7nbSbVxG2DDDm0Y= - -xml-name-validator@^3.0.0: - version "3.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" - integrity sha1-auc+Bt5NjG5H+fsYH3jWSK1FfGo= - -xmlchars@^2.1.1: - version "2.2.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" - integrity sha1-Bg/hvLf5x2/ioX24apvDq4lCEMs= - -xregexp@^4.3.0: - version "4.3.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/xregexp/-/xregexp-4.3.0.tgz#7e92e73d9174a99a59743f67a4ce879a04b5ae50" - integrity sha1-fpLnPZF0qZpZdD9npM6HmgS1rlA= - dependencies: - "@babel/runtime-corejs3" "^7.8.3" - -y18n@^4.0.0: - version "4.0.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" - integrity sha1-le+U+F7MgdAHwmThkKEg8KPIVms= - -yargs-parser@18.x, yargs-parser@^18.1.1: - version "18.1.3" - resolved "https://repox.jfrog.io/repox/api/npm/npm/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" - integrity sha1-vmjEl1xrKr9GkjawyHA2L6sJp7A= - dependencies: - camelcase "^5.0.0" - decamelize "^1.2.0" - -yargs-parser@^10.0.0: - version "10.1.0" - resolved "https://repox.jfrog.io/repox/api/npm/npm/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" - integrity sha1-cgImW4n36eny5XZeD+c1qQXtuqg= - dependencies: - camelcase "^4.1.0" - -yargs@^15.3.1: - version "15.3.1" - resolved "https://repox.jfrog.io/repox/api/npm/npm/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b" - integrity sha1-lQW0cnY5Y+VK/mAUitJ6MwgY6Ys= - dependencies: - cliui "^6.0.0" - decamelize "^1.2.0" - find-up "^4.1.0" - get-caller-file "^2.0.1" - require-directory "^2.1.1" - require-main-filename "^2.0.0" - set-blocking "^2.0.0" - string-width "^4.2.0" - which-module "^2.0.0" - y18n "^4.0.0" - yargs-parser "^18.1.1" diff --git a/server/sonar-web/build.gradle b/server/sonar-web/build.gradle index 301baf2abed..77194301796 100644 --- a/server/sonar-web/build.gradle +++ b/server/sonar-web/build.gradle @@ -14,10 +14,6 @@ apply plugin: 'com.github.node-gradle.node' def webappDir = "${buildDir}/webapp" -yarn.configure { - dependsOn tasks.getByPath(':server:sonar-ui-common:yarn_run') -} - yarn_run { ['config', 'public', 'scripts', 'src', '../sonar-docs/src'].each { inputs.dir(it).withPathSensitivity(PathSensitivity.RELATIVE) diff --git a/server/sonar-web/jest.config.js b/server/sonar-web/jest.config.js index 8dea5867955..a83d3ab64e2 100644 --- a/server/sonar-web/jest.config.js +++ b/server/sonar-web/jest.config.js @@ -1,6 +1,6 @@ module.exports = { coverageDirectory: '<rootDir>/coverage', - collectCoverageFrom: ['src/main/js/**/*.{ts,tsx,js}'], + collectCoverageFrom: ['src/main/js/**/*.{ts,tsx,js}', '!helpers/{keycodes,testUtils}.{ts,tsx}'], coverageReporters: ['lcovonly', 'text'], globals: { 'ts-jest': { @@ -20,7 +20,7 @@ module.exports = { '<rootDir>/config/jest/SetupEnzyme.js', '<rootDir>/config/jest/SetupTestEnvironment.ts' ], - snapshotSerializers: ['enzyme-to-json/serializer'], + snapshotSerializers: ['enzyme-to-json/serializer', 'jest-emotion'], testPathIgnorePatterns: ['<rootDir>/config', '<rootDir>/node_modules', '<rootDir>/scripts'], testRegex: '(/__tests__/.*|\\-test)\\.(ts|tsx|js)$', transform: { diff --git a/server/sonar-web/src/main/js/api/alm-integrations.ts b/server/sonar-web/src/main/js/api/alm-integrations.ts index aa0b4c6907c..7af1a28cd5f 100644 --- a/server/sonar-web/src/main/js/api/alm-integrations.ts +++ b/server/sonar-web/src/main/js/api/alm-integrations.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { get, getJSON, parseError, post, postJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { get, getJSON, parseError, post, postJSON } from '../sonar-ui-common/helpers/request'; import { AzureProject, AzureRepository, diff --git a/server/sonar-web/src/main/js/api/alm-settings.ts b/server/sonar-web/src/main/js/api/alm-settings.ts index e3c50cb9ce3..8e1751e5f49 100644 --- a/server/sonar-web/src/main/js/api/alm-settings.ts +++ b/server/sonar-web/src/main/js/api/alm-settings.ts @@ -17,6 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +import throwGlobalError from '../app/utils/throwGlobalError'; import { get, getJSON, @@ -24,8 +25,7 @@ import { parseError, parseJSON, post -} from 'sonar-ui-common/helpers/request'; -import throwGlobalError from '../app/utils/throwGlobalError'; +} from '../sonar-ui-common/helpers/request'; import { AlmSettingsBindingDefinitions, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/api/application.ts b/server/sonar-web/src/main/js/api/application.ts index ec51305b535..0eeb3a569f1 100644 --- a/server/sonar-web/src/main/js/api/application.ts +++ b/server/sonar-web/src/main/js/api/application.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request'; import { Application, ApplicationPeriod, ApplicationProject } from '../types/application'; import { Visibility } from '../types/component'; diff --git a/server/sonar-web/src/main/js/api/auth.ts b/server/sonar-web/src/main/js/api/auth.ts index 247cb54c982..f012a7bd381 100644 --- a/server/sonar-web/src/main/js/api/auth.ts +++ b/server/sonar-web/src/main/js/api/auth.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { request } from 'sonar-ui-common/helpers/request'; +import { request } from '../sonar-ui-common/helpers/request'; export function login(login: string, password: string): Promise<Response> { return request('/api/authentication/login') diff --git a/server/sonar-web/src/main/js/api/branches.ts b/server/sonar-web/src/main/js/api/branches.ts index 6e013870568..6068b643b60 100644 --- a/server/sonar-web/src/main/js/api/branches.ts +++ b/server/sonar-web/src/main/js/api/branches.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post } from '../sonar-ui-common/helpers/request'; import { Branch, PullRequest } from '../types/branch-like'; export function getBranches(project: string): Promise<Branch[]> { diff --git a/server/sonar-web/src/main/js/api/ce.ts b/server/sonar-web/src/main/js/api/ce.ts index ae1b198a420..d4f3d15774a 100644 --- a/server/sonar-web/src/main/js/api/ce.ts +++ b/server/sonar-web/src/main/js/api/ce.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, RequestData } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, RequestData } from '../sonar-ui-common/helpers/request'; import { IndexationStatus } from '../types/indexation'; import { Task, TaskWarning } from '../types/tasks'; diff --git a/server/sonar-web/src/main/js/api/component-report.ts b/server/sonar-web/src/main/js/api/component-report.ts index 08f6e7563cc..1904c834053 100644 --- a/server/sonar-web/src/main/js/api/component-report.ts +++ b/server/sonar-web/src/main/js/api/component-report.ts @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; import { getBaseUrl } from '../helpers/system'; +import { getJSON, post } from '../sonar-ui-common/helpers/request'; import { ComponentReportStatus } from '../types/component-report'; export function getReportStatus( diff --git a/server/sonar-web/src/main/js/api/components.ts b/server/sonar-web/src/main/js/api/components.ts index a49e4de9f49..ec2f147b5af 100644 --- a/server/sonar-web/src/main/js/api/components.ts +++ b/server/sonar-web/src/main/js/api/components.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON, RequestData } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request'; import { BranchParameters } from '../types/branch-like'; import { ComponentQualifier, TreeComponent, TreeComponentWithPath } from '../types/component'; diff --git a/server/sonar-web/src/main/js/api/favorites.ts b/server/sonar-web/src/main/js/api/favorites.ts index a641f0d41af..e26c51f1814 100644 --- a/server/sonar-web/src/main/js/api/favorites.ts +++ b/server/sonar-web/src/main/js/api/favorites.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post } from 'sonar-ui-common/helpers/request'; +import { getJSON, post } from '../sonar-ui-common/helpers/request'; export function getFavorites(): Promise<any> { return getJSON('/api/favorites/search'); diff --git a/server/sonar-web/src/main/js/api/issue-filters.ts b/server/sonar-web/src/main/js/api/issue-filters.ts index bfe39555011..8795a2b1900 100644 --- a/server/sonar-web/src/main/js/api/issue-filters.ts +++ b/server/sonar-web/src/main/js/api/issue-filters.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { post } from 'sonar-ui-common/helpers/request'; +import { post } from '../sonar-ui-common/helpers/request'; export function toggleIssueFilter(id: string): Promise<void> { return post('/issues/toggle_fav', { id }); diff --git a/server/sonar-web/src/main/js/api/issues.ts b/server/sonar-web/src/main/js/api/issues.ts index 3f5f88f3948..9b6f002166d 100644 --- a/server/sonar-web/src/main/js/api/issues.ts +++ b/server/sonar-web/src/main/js/api/issues.ts @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON, RequestData } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; import getCoverageStatus from '../components/SourceViewer/helpers/getCoverageStatus'; +import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request'; import { IssueResponse, RawIssuesResponse } from '../types/issues'; type FacetName = diff --git a/server/sonar-web/src/main/js/api/l10n.ts b/server/sonar-web/src/main/js/api/l10n.ts index dd59586b274..579af9e9f82 100644 --- a/server/sonar-web/src/main/js/api/l10n.ts +++ b/server/sonar-web/src/main/js/api/l10n.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON } from 'sonar-ui-common/helpers/request'; +import { getJSON } from '../sonar-ui-common/helpers/request'; import { L10nBundleRequestParams, L10nBundleRequestResponse } from '../types/l10n'; export function fetchL10nBundle( diff --git a/server/sonar-web/src/main/js/api/languages.ts b/server/sonar-web/src/main/js/api/languages.ts index 8423ebad5b2..595254caee7 100644 --- a/server/sonar-web/src/main/js/api/languages.ts +++ b/server/sonar-web/src/main/js/api/languages.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON } from '../sonar-ui-common/helpers/request'; export function getLanguages(): Promise<T.Language[]> { return getJSON('/api/languages/list').then(r => r.languages, throwGlobalError); diff --git a/server/sonar-web/src/main/js/api/marketplace.ts b/server/sonar-web/src/main/js/api/marketplace.ts index 740585766c3..bbc418631d7 100644 --- a/server/sonar-web/src/main/js/api/marketplace.ts +++ b/server/sonar-web/src/main/js/api/marketplace.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON } from '../sonar-ui-common/helpers/request'; export interface License { contactEmail: string; diff --git a/server/sonar-web/src/main/js/api/measures.ts b/server/sonar-web/src/main/js/api/measures.ts index 9c026aca57d..77f6c9e820d 100644 --- a/server/sonar-web/src/main/js/api/measures.ts +++ b/server/sonar-web/src/main/js/api/measures.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON } from '../sonar-ui-common/helpers/request'; import { BranchParameters } from '../types/branch-like'; import { MeasuresAndMetaWithMetrics, diff --git a/server/sonar-web/src/main/js/api/metrics.ts b/server/sonar-web/src/main/js/api/metrics.ts index ab95885760d..bb59e319c18 100644 --- a/server/sonar-web/src/main/js/api/metrics.ts +++ b/server/sonar-web/src/main/js/api/metrics.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON } from '../sonar-ui-common/helpers/request'; export interface MetricsResponse { metrics: T.Metric[]; diff --git a/server/sonar-web/src/main/js/api/nav.ts b/server/sonar-web/src/main/js/api/nav.ts index a5ce57857d6..b73f58f6ac1 100644 --- a/server/sonar-web/src/main/js/api/nav.ts +++ b/server/sonar-web/src/main/js/api/nav.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON } from '../sonar-ui-common/helpers/request'; import { BranchParameters } from '../types/branch-like'; type NavComponent = T.Omit<T.Component, 'alm' | 'qualifier' | 'leakPeriodDate' | 'path' | 'tags'>; diff --git a/server/sonar-web/src/main/js/api/newCodePeriod.ts b/server/sonar-web/src/main/js/api/newCodePeriod.ts index 02b137f1f96..04363c339ee 100644 --- a/server/sonar-web/src/main/js/api/newCodePeriod.ts +++ b/server/sonar-web/src/main/js/api/newCodePeriod.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post } from '../sonar-ui-common/helpers/request'; export function getNewCodePeriod(data?: { project?: string; diff --git a/server/sonar-web/src/main/js/api/notifications.ts b/server/sonar-web/src/main/js/api/notifications.ts index bc49a8a0f7e..0f314c75250 100644 --- a/server/sonar-web/src/main/js/api/notifications.ts +++ b/server/sonar-web/src/main/js/api/notifications.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post } from '../sonar-ui-common/helpers/request'; export function getNotifications(): Promise<{ channels: string[]; diff --git a/server/sonar-web/src/main/js/api/permissions.ts b/server/sonar-web/src/main/js/api/permissions.ts index e5b8191d1ef..a3f1eb716b8 100644 --- a/server/sonar-web/src/main/js/api/permissions.ts +++ b/server/sonar-web/src/main/js/api/permissions.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON, RequestData } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request'; import { BaseSearchProjectsParameters } from './components'; const PAGE_SIZE = 100; diff --git a/server/sonar-web/src/main/js/api/plugins.ts b/server/sonar-web/src/main/js/api/plugins.ts index 553b68572e7..20bf5f1df19 100644 --- a/server/sonar-web/src/main/js/api/plugins.ts +++ b/server/sonar-web/src/main/js/api/plugins.ts @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { findLastIndex } from 'lodash'; -import { getJSON, post } from 'sonar-ui-common/helpers/request'; -import { isDefined } from 'sonar-ui-common/helpers/types'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post } from '../sonar-ui-common/helpers/request'; +import { isDefined } from '../sonar-ui-common/helpers/types'; import { AvailablePlugin, InstalledPlugin, diff --git a/server/sonar-web/src/main/js/api/projectActivity.ts b/server/sonar-web/src/main/js/api/projectActivity.ts index 054eaddea82..ae1c60fde51 100644 --- a/server/sonar-web/src/main/js/api/projectActivity.ts +++ b/server/sonar-web/src/main/js/api/projectActivity.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON, RequestData } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request'; import { BranchParameters } from '../types/branch-like'; export function getProjectActivity( diff --git a/server/sonar-web/src/main/js/api/projectLinks.ts b/server/sonar-web/src/main/js/api/projectLinks.ts index bd856918ea3..59db323b7cd 100644 --- a/server/sonar-web/src/main/js/api/projectLinks.ts +++ b/server/sonar-web/src/main/js/api/projectLinks.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request'; export function getProjectLinks(projectKey: string): Promise<T.ProjectLink[]> { return getJSON('/api/project_links/search', { projectKey }).then(r => r.links, throwGlobalError); diff --git a/server/sonar-web/src/main/js/api/quality-gates.ts b/server/sonar-web/src/main/js/api/quality-gates.ts index ae3114c9a2d..09d54d0d3b1 100644 --- a/server/sonar-web/src/main/js/api/quality-gates.ts +++ b/server/sonar-web/src/main/js/api/quality-gates.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request'; import { BranchParameters } from '../types/branch-like'; import { QualityGateApplicationStatus, QualityGateProjectStatus } from '../types/quality-gates'; diff --git a/server/sonar-web/src/main/js/api/quality-profiles.ts b/server/sonar-web/src/main/js/api/quality-profiles.ts index f9e6698e43d..008aab45ba8 100644 --- a/server/sonar-web/src/main/js/api/quality-profiles.ts +++ b/server/sonar-web/src/main/js/api/quality-profiles.ts @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { map } from 'lodash'; -import { csvEscape } from 'sonar-ui-common/helpers/csv'; -import { getJSON, post, postJSON, RequestData } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; import { Exporter, ProfileChangelogEvent } from '../apps/quality-profiles/types'; +import { csvEscape } from '../sonar-ui-common/helpers/csv'; +import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request'; export interface ProfileActions { associateProjects?: boolean; diff --git a/server/sonar-web/src/main/js/api/rules.ts b/server/sonar-web/src/main/js/api/rules.ts index 3dd2448d96e..4fd9b34b2e1 100644 --- a/server/sonar-web/src/main/js/api/rules.ts +++ b/server/sonar-web/src/main/js/api/rules.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request'; import { GetRulesAppResponse, SearchRulesResponse } from '../types/coding-rules'; export function getRulesApp(): Promise<GetRulesAppResponse> { diff --git a/server/sonar-web/src/main/js/api/security-hotspots.ts b/server/sonar-web/src/main/js/api/security-hotspots.ts index c7b39934fe5..de4135d802f 100644 --- a/server/sonar-web/src/main/js/api/security-hotspots.ts +++ b/server/sonar-web/src/main/js/api/security-hotspots.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post } from '../sonar-ui-common/helpers/request'; import { BranchParameters } from '../types/branch-like'; import { Hotspot, diff --git a/server/sonar-web/src/main/js/api/settings.ts b/server/sonar-web/src/main/js/api/settings.ts index 03946b15832..a4ca10a5fc7 100644 --- a/server/sonar-web/src/main/js/api/settings.ts +++ b/server/sonar-web/src/main/js/api/settings.ts @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { omitBy } from 'lodash'; -import { getJSON, post, postJSON, RequestData } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; import { isCategoryDefinition } from '../apps/settings/utils'; +import { getJSON, post, postJSON, RequestData } from '../sonar-ui-common/helpers/request'; import { BranchParameters } from '../types/branch-like'; import { SettingCategoryDefinition, SettingDefinition, SettingValue } from '../types/settings'; diff --git a/server/sonar-web/src/main/js/api/static.ts b/server/sonar-web/src/main/js/api/static.ts index cfb5ae2e652..8377e101d58 100644 --- a/server/sonar-web/src/main/js/api/static.ts +++ b/server/sonar-web/src/main/js/api/static.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { checkStatus, request } from 'sonar-ui-common/helpers/request'; +import { checkStatus, request } from '../sonar-ui-common/helpers/request'; export function getPluginStaticFileContent(pluginKey: string, staticFilePath: string) { return request(`/static/${pluginKey}/${staticFilePath}`) diff --git a/server/sonar-web/src/main/js/api/system.ts b/server/sonar-web/src/main/js/api/system.ts index 1f1e1b49478..fad5ff026dd 100644 --- a/server/sonar-web/src/main/js/api/system.ts +++ b/server/sonar-web/src/main/js/api/system.ts @@ -17,8 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON, requestTryAndRepeatUntil } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { + getJSON, + post, + postJSON, + requestTryAndRepeatUntil +} from '../sonar-ui-common/helpers/request'; import { SystemUpgrade } from '../types/system'; export function setLogLevel(level: string): Promise<void | Response> { diff --git a/server/sonar-web/src/main/js/api/time-machine.ts b/server/sonar-web/src/main/js/api/time-machine.ts index a088bdbc2e1..0128a2e7e41 100644 --- a/server/sonar-web/src/main/js/api/time-machine.ts +++ b/server/sonar-web/src/main/js/api/time-machine.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON } from '../sonar-ui-common/helpers/request'; import { BranchParameters } from '../types/branch-like'; interface TimeMachineResponse { diff --git a/server/sonar-web/src/main/js/api/user-tokens.ts b/server/sonar-web/src/main/js/api/user-tokens.ts index d0ca7855f5f..76dec9b30c3 100644 --- a/server/sonar-web/src/main/js/api/user-tokens.ts +++ b/server/sonar-web/src/main/js/api/user-tokens.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request'; /** List tokens for given user login */ export function getTokens(login: string): Promise<T.UserToken[]> { diff --git a/server/sonar-web/src/main/js/api/user_groups.ts b/server/sonar-web/src/main/js/api/user_groups.ts index 751e66563c8..ea9326c6790 100644 --- a/server/sonar-web/src/main/js/api/user_groups.ts +++ b/server/sonar-web/src/main/js/api/user_groups.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request'; export function searchUsersGroups(data: { f?: string; diff --git a/server/sonar-web/src/main/js/api/users.ts b/server/sonar-web/src/main/js/api/users.ts index 250bffb19c9..a405707aaf9 100644 --- a/server/sonar-web/src/main/js/api/users.ts +++ b/server/sonar-web/src/main/js/api/users.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request'; export function getCurrentUser(): Promise<T.CurrentUser> { return getJSON('/api/users/current'); diff --git a/server/sonar-web/src/main/js/api/web-api.ts b/server/sonar-web/src/main/js/api/web-api.ts index 71ca793add9..d55049e0cd4 100644 --- a/server/sonar-web/src/main/js/api/web-api.ts +++ b/server/sonar-web/src/main/js/api/web-api.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON } from '../sonar-ui-common/helpers/request'; interface RawDomain { actions: T.WebApi.Action[]; diff --git a/server/sonar-web/src/main/js/api/webhooks.ts b/server/sonar-web/src/main/js/api/webhooks.ts index 8863f4caecf..8b000a8b2a5 100644 --- a/server/sonar-web/src/main/js/api/webhooks.ts +++ b/server/sonar-web/src/main/js/api/webhooks.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getJSON, post, postJSON } from 'sonar-ui-common/helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { getJSON, post, postJSON } from '../sonar-ui-common/helpers/request'; export function createWebhook(data: { name: string; diff --git a/server/sonar-web/src/main/js/app/components/AdminContainer.tsx b/server/sonar-web/src/main/js/app/components/AdminContainer.tsx index 91e47fbb833..4b30e7d04e5 100644 --- a/server/sonar-web/src/main/js/app/components/AdminContainer.tsx +++ b/server/sonar-web/src/main/js/app/components/AdminContainer.tsx @@ -20,11 +20,11 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { connect } from 'react-redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getSettingsNavigation } from '../../api/nav'; import { getPendingPlugins } from '../../api/plugins'; import { getSystemStatus, waitSystemUPStatus } from '../../api/system'; import handleRequiredAuthorization from '../../app/utils/handleRequiredAuthorization'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { setAdminPages } from '../../store/appState'; import { getAppState, Store } from '../../store/rootReducer'; import { PendingPluginResult } from '../../types/plugins'; diff --git a/server/sonar-web/src/main/js/app/components/App.tsx b/server/sonar-web/src/main/js/app/components/App.tsx index 53c740346f8..72aee72bc8f 100644 --- a/server/sonar-web/src/main/js/app/components/App.tsx +++ b/server/sonar-web/src/main/js/app/components/App.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; import { fetchLanguages } from '../../store/rootActions'; import { getGlobalSettingValue, Store } from '../../store/rootReducer'; import KeyboardShortcutsModal from './KeyboardShortcutsModal'; diff --git a/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx b/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx index 31f7ea3ecf6..604223f76f3 100644 --- a/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx +++ b/server/sonar-web/src/main/js/app/components/ComponentContainer.tsx @@ -20,7 +20,6 @@ import { differenceBy } from 'lodash'; import * as React from 'react'; import { connect } from 'react-redux'; -import { HttpStatus } from 'sonar-ui-common/helpers/request'; import { getProjectAlmBinding, validateProjectAlmBinding } from '../../api/alm-settings'; import { getBranches, getPullRequests } from '../../api/branches'; import { getAnalysisStatus, getTasksForComponent } from '../../api/ce'; @@ -35,6 +34,7 @@ import { isPullRequest } from '../../helpers/branch-like'; import { getPortfolioUrl } from '../../helpers/urls'; +import { HttpStatus } from '../../sonar-ui-common/helpers/request'; import { registerBranchStatus, requireAuthorization } from '../../store/rootActions'; import { ProjectAlmBindingConfigurationErrors, diff --git a/server/sonar-web/src/main/js/app/components/ComponentContainerNotFound.tsx b/server/sonar-web/src/main/js/app/components/ComponentContainerNotFound.tsx index 79b351d7e7c..797ba2121f3 100644 --- a/server/sonar-web/src/main/js/app/components/ComponentContainerNotFound.tsx +++ b/server/sonar-web/src/main/js/app/components/ComponentContainerNotFound.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; export default function ComponentContainerNotFound() { return ( diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx index 75a013f3cf3..54fdcb8cadd 100644 --- a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx +++ b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import InstanceMessage from '../../components/common/InstanceMessage'; import { getEdition } from '../../helpers/editions'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import { EditionKey } from '../../types/editions'; import GlobalFooterBranding from './GlobalFooterBranding'; diff --git a/server/sonar-web/src/main/js/app/components/GlobalMessagesContainer.tsx b/server/sonar-web/src/main/js/app/components/GlobalMessagesContainer.tsx index 1321b327eb9..151b4bbbb88 100644 --- a/server/sonar-web/src/main/js/app/components/GlobalMessagesContainer.tsx +++ b/server/sonar-web/src/main/js/app/components/GlobalMessagesContainer.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { connect } from 'react-redux'; -import GlobalMessages from 'sonar-ui-common/components/controls/GlobalMessages'; +import GlobalMessages from '../../sonar-ui-common/components/controls/GlobalMessages'; import { closeGlobalMessage } from '../../store/globalMessages'; import { getGlobalMessages, Store } from '../../store/rootReducer'; diff --git a/server/sonar-web/src/main/js/app/components/KeyboardShortcutsModal.tsx b/server/sonar-web/src/main/js/app/components/KeyboardShortcutsModal.tsx index d961ae6dd40..e09d096e57c 100644 --- a/server/sonar-web/src/main/js/app/components/KeyboardShortcutsModal.tsx +++ b/server/sonar-web/src/main/js/app/components/KeyboardShortcutsModal.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../sonar-ui-common/components/controls/Modal'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; type Shortcuts = Array<{ category: string; diff --git a/server/sonar-web/src/main/js/app/components/NotFound.tsx b/server/sonar-web/src/main/js/app/components/NotFound.tsx index 2078841d6b0..12d0de6313b 100644 --- a/server/sonar-web/src/main/js/app/components/NotFound.tsx +++ b/server/sonar-web/src/main/js/app/components/NotFound.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import SimpleContainer from './SimpleContainer'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/PluginRiskConsent.tsx b/server/sonar-web/src/main/js/app/components/PluginRiskConsent.tsx index 4a64fe97bbd..16ba03f36b4 100644 --- a/server/sonar-web/src/main/js/app/components/PluginRiskConsent.tsx +++ b/server/sonar-web/src/main/js/app/components/PluginRiskConsent.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { setSimpleSettingValue } from '../../api/settings'; import { whenLoggedIn } from '../../components/hoc/whenLoggedIn'; import { Router, withRouter } from '../../components/hoc/withRouter'; import { hasGlobalPermission } from '../../helpers/users'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { Permissions } from '../../types/permissions'; import { RiskConsent } from '../../types/plugins'; import { SettingsKey } from '../../types/settings'; diff --git a/server/sonar-web/src/main/js/app/components/RecentHistory.ts b/server/sonar-web/src/main/js/app/components/RecentHistory.ts index 6b12774c04b..57f4b178105 100644 --- a/server/sonar-web/src/main/js/app/components/RecentHistory.ts +++ b/server/sonar-web/src/main/js/app/components/RecentHistory.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { get, remove, save } from 'sonar-ui-common/helpers/storage'; +import { get, remove, save } from '../../sonar-ui-common/helpers/storage'; const RECENT_HISTORY = 'sonar_recent_history'; const HISTORY_LIMIT = 10; diff --git a/server/sonar-web/src/main/js/app/components/ResetPassword.tsx b/server/sonar-web/src/main/js/app/components/ResetPassword.tsx index 55ef8b4c88f..759d8fbc644 100644 --- a/server/sonar-web/src/main/js/app/components/ResetPassword.tsx +++ b/server/sonar-web/src/main/js/app/components/ResetPassword.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import ResetPasswordForm from '../../components/common/ResetPasswordForm'; import { whenLoggedIn } from '../../components/hoc/whenLoggedIn'; import { getBaseUrl } from '../../helpers/system'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import GlobalMessagesContainer from './GlobalMessagesContainer'; export interface ResetPasswordProps { diff --git a/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx b/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx index bcf77021060..00fa60d8ce7 100644 --- a/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx +++ b/server/sonar-web/src/main/js/app/components/SimpleContainer.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import NavBar from 'sonar-ui-common/components/ui/NavBar'; +import NavBar from '../../sonar-ui-common/components/ui/NavBar'; import { rawSizes } from '../theme'; import GlobalFooterContainer from './GlobalFooterContainer'; diff --git a/server/sonar-web/src/main/js/app/components/SimpleSessionsContainer.tsx b/server/sonar-web/src/main/js/app/components/SimpleSessionsContainer.tsx index 27233656949..87891b13902 100644 --- a/server/sonar-web/src/main/js/app/components/SimpleSessionsContainer.tsx +++ b/server/sonar-web/src/main/js/app/components/SimpleSessionsContainer.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; import GlobalFooterContainer from './GlobalFooterContainer'; const PageTracker = lazyLoadComponent(() => import('./PageTracker')); diff --git a/server/sonar-web/src/main/js/app/components/StartupModal.tsx b/server/sonar-web/src/main/js/app/components/StartupModal.tsx index d15c3065a48..4d7355d347d 100644 --- a/server/sonar-web/src/main/js/app/components/StartupModal.tsx +++ b/server/sonar-web/src/main/js/app/components/StartupModal.tsx @@ -20,13 +20,13 @@ import * as differenceInDays from 'date-fns/difference_in_days'; import * as React from 'react'; import { connect } from 'react-redux'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; -import { parseDate, toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { hasMessage } from 'sonar-ui-common/helpers/l10n'; -import { get, save } from 'sonar-ui-common/helpers/storage'; import { showLicense } from '../../api/marketplace'; import { Location, Router, withRouter } from '../../components/hoc/withRouter'; import { isLoggedIn } from '../../helpers/users'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; +import { parseDate, toShortNotSoISOString } from '../../sonar-ui-common/helpers/dates'; +import { hasMessage } from '../../sonar-ui-common/helpers/l10n'; +import { get, save } from '../../sonar-ui-common/helpers/storage'; import { getAppState, getCurrentUser, Store } from '../../store/rootReducer'; import { EditionKey } from '../../types/editions'; diff --git a/server/sonar-web/src/main/js/app/components/__tests__/ComponentContainer-test.tsx b/server/sonar-web/src/main/js/app/components/__tests__/ComponentContainer-test.tsx index e46025122e9..9cb60b143a0 100644 --- a/server/sonar-web/src/main/js/app/components/__tests__/ComponentContainer-test.tsx +++ b/server/sonar-web/src/main/js/app/components/__tests__/ComponentContainer-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getProjectAlmBinding, validateProjectAlmBinding } from '../../../api/alm-settings'; import { getBranches, getPullRequests } from '../../../api/branches'; import { getAnalysisStatus, getTasksForComponent } from '../../../api/ce'; @@ -29,6 +28,7 @@ import { mockProjectAlmBindingConfigurationErrors } from '../../../helpers/mocks import { mockBranch, mockMainBranch, mockPullRequest } from '../../../helpers/mocks/branch-like'; import { mockTask } from '../../../helpers/mocks/tasks'; import { mockAppState, mockComponent, mockLocation, mockRouter } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../types/alm-settings'; import { ComponentQualifier } from '../../../types/component'; import { TaskStatuses } from '../../../types/tasks'; diff --git a/server/sonar-web/src/main/js/app/components/__tests__/KeyboardShortcutsModal-test.tsx b/server/sonar-web/src/main/js/app/components/__tests__/KeyboardShortcutsModal-test.tsx index dfa88d01329..13ebabbc7bc 100644 --- a/server/sonar-web/src/main/js/app/components/__tests__/KeyboardShortcutsModal-test.tsx +++ b/server/sonar-web/src/main/js/app/components/__tests__/KeyboardShortcutsModal-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Modal from 'sonar-ui-common/components/controls/Modal'; import { mockEvent } from '../../../helpers/testMocks'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; import KeyboardShortcutsModal from '../KeyboardShortcutsModal'; let handle: void | (() => void); diff --git a/server/sonar-web/src/main/js/app/components/__tests__/PluginRiskConsent-test.tsx b/server/sonar-web/src/main/js/app/components/__tests__/PluginRiskConsent-test.tsx index 5aedf55b0ac..2a0ecde261c 100644 --- a/server/sonar-web/src/main/js/app/components/__tests__/PluginRiskConsent-test.tsx +++ b/server/sonar-web/src/main/js/app/components/__tests__/PluginRiskConsent-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; import { setSimpleSettingValue } from '../../../api/settings'; import { mockLoggedInUser, mockRouter } from '../../../helpers/testMocks'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; import { PluginRiskConsent, PluginRiskConsentProps } from '../PluginRiskConsent'; jest.mock('../../../api/settings', () => ({ diff --git a/server/sonar-web/src/main/js/app/components/__tests__/RecentHistory-test.tsx b/server/sonar-web/src/main/js/app/components/__tests__/RecentHistory-test.tsx index eaf86535910..636aaccf7a6 100644 --- a/server/sonar-web/src/main/js/app/components/__tests__/RecentHistory-test.tsx +++ b/server/sonar-web/src/main/js/app/components/__tests__/RecentHistory-test.tsx @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { get, remove, save } from 'sonar-ui-common/helpers/storage'; +import { get, remove, save } from '../../../sonar-ui-common/helpers/storage'; import RecentHistory, { History } from '../RecentHistory'; -jest.mock('sonar-ui-common/helpers/storage', () => ({ +jest.mock('../../../sonar-ui-common/helpers/storage', () => ({ get: jest.fn(), remove: jest.fn(), save: jest.fn() diff --git a/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx b/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx index 8d27be08bef..54c24c5eddb 100644 --- a/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx +++ b/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx @@ -20,11 +20,11 @@ import * as differenceInDays from 'date-fns/difference_in_days'; import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import { toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { hasMessage } from 'sonar-ui-common/helpers/l10n'; -import { get, save } from 'sonar-ui-common/helpers/storage'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { showLicense } from '../../../api/marketplace'; +import { toShortNotSoISOString } from '../../../sonar-ui-common/helpers/dates'; +import { hasMessage } from '../../../sonar-ui-common/helpers/l10n'; +import { get, save } from '../../../sonar-ui-common/helpers/storage'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { EditionKey } from '../../../types/editions'; import { StartupModal } from '../StartupModal'; @@ -32,16 +32,16 @@ jest.mock('../../../api/marketplace', () => ({ showLicense: jest.fn().mockResolvedValue(undefined) })); -jest.mock('sonar-ui-common/helpers/storage', () => ({ +jest.mock('../../../sonar-ui-common/helpers/storage', () => ({ get: jest.fn(), save: jest.fn() })); -jest.mock('sonar-ui-common/helpers/l10n', () => ({ +jest.mock('../../../sonar-ui-common/helpers/l10n', () => ({ hasMessage: jest.fn().mockReturnValue(true) })); -jest.mock('sonar-ui-common/helpers/dates', () => ({ +jest.mock('../../../sonar-ui-common/helpers/dates', () => ({ parseDate: jest.fn().mockReturnValue('parsed-date'), toShortNotSoISOString: jest.fn().mockReturnValue('short-not-iso-date') })); diff --git a/server/sonar-web/src/main/js/app/components/a11y/A11ySkipTarget.tsx b/server/sonar-web/src/main/js/app/components/a11y/A11ySkipTarget.tsx index a57fd9f7d28..7a459d0c863 100644 --- a/server/sonar-web/src/main/js/app/components/a11y/A11ySkipTarget.tsx +++ b/server/sonar-web/src/main/js/app/components/a11y/A11ySkipTarget.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { A11yContext } from './A11yContext'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/a11y/__tests__/A11yProvider-test.tsx b/server/sonar-web/src/main/js/app/components/a11y/__tests__/A11yProvider-test.tsx index f191c55aff2..c3e3c139ac0 100644 --- a/server/sonar-web/src/main/js/app/components/a11y/__tests__/A11yProvider-test.tsx +++ b/server/sonar-web/src/main/js/app/components/a11y/__tests__/A11yProvider-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { A11yContextShape } from '../A11yContext'; import A11yProvider from '../A11yProvider'; diff --git a/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopup.tsx b/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopup.tsx index ab3f44270e7..f653b2eb91d 100644 --- a/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopup.tsx +++ b/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopup.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { SuggestionsContext } from './SuggestionsContext'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopupHelper.tsx b/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopupHelper.tsx index 2001b683e02..1b82118c952 100644 --- a/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopupHelper.tsx +++ b/server/sonar-web/src/main/js/app/components/embed-docs-modal/EmbedDocsPopupHelper.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import HelpIcon from 'sonar-ui-common/components/icons/HelpIcon'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import HelpIcon from '../../../sonar-ui-common/components/icons/HelpIcon'; +import { lazyLoadComponent } from '../../../sonar-ui-common/components/lazyLoadComponent'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; const EmbedDocsPopup = lazyLoadComponent(() => import('./EmbedDocsPopup')); diff --git a/server/sonar-web/src/main/js/app/components/extensions/CreateApplicationForm.tsx b/server/sonar-web/src/main/js/app/components/extensions/CreateApplicationForm.tsx index b46fbcfba60..dd484df68e3 100644 --- a/server/sonar-web/src/main/js/app/components/extensions/CreateApplicationForm.tsx +++ b/server/sonar-web/src/main/js/app/components/extensions/CreateApplicationForm.tsx @@ -18,14 +18,17 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { createApplication } from '../../../api/application'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ComponentQualifier, Visibility } from '../../../types/component'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/extensions/Extension.tsx b/server/sonar-web/src/main/js/app/components/extensions/Extension.tsx index 734f89ab883..259e9b828f9 100644 --- a/server/sonar-web/src/main/js/app/components/extensions/Extension.tsx +++ b/server/sonar-web/src/main/js/app/components/extensions/Extension.tsx @@ -21,11 +21,11 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { InjectedIntlProps, injectIntl } from 'react-intl'; import { connect } from 'react-redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Location, Router, withRouter } from '../../../components/hoc/withRouter'; import { getExtensionStart } from '../../../helpers/extensions'; import { getCurrentL10nBundle } from '../../../helpers/l10n'; import { getBaseUrl } from '../../../helpers/system'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { addGlobalErrorMessage } from '../../../store/globalMessages'; import { getCurrentUser, Store } from '../../../store/rootReducer'; import { ExtensionStartMethod } from '../../../types/extension'; diff --git a/server/sonar-web/src/main/js/app/components/extensions/__tests__/CreateApplicationForm-test.tsx b/server/sonar-web/src/main/js/app/components/extensions/__tests__/CreateApplicationForm-test.tsx index c6ea150fb1b..a44b8c61af6 100644 --- a/server/sonar-web/src/main/js/app/components/extensions/__tests__/CreateApplicationForm-test.tsx +++ b/server/sonar-web/src/main/js/app/components/extensions/__tests__/CreateApplicationForm-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { createApplication } from '../../../../api/application'; import { mockEvent } from '../../../../helpers/testMocks'; +import SimpleModal from '../../../../sonar-ui-common/components/controls/SimpleModal'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { ComponentQualifier, Visibility } from '../../../../types/component'; import CreateApplicationForm from '../CreateApplicationForm'; diff --git a/server/sonar-web/src/main/js/app/components/extensions/__tests__/Extension-test.tsx b/server/sonar-web/src/main/js/app/components/extensions/__tests__/Extension-test.tsx index b8d63edc02c..a5d652e4b27 100644 --- a/server/sonar-web/src/main/js/app/components/extensions/__tests__/Extension-test.tsx +++ b/server/sonar-web/src/main/js/app/components/extensions/__tests__/Extension-test.tsx @@ -19,9 +19,9 @@ */ import { mount } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getExtensionStart } from '../../../../helpers/extensions'; import { mockCurrentUser, mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { Extension } from '../Extension'; jest.mock('../../../../helpers/extensions', () => ({ diff --git a/server/sonar-web/src/main/js/app/components/extensions/exposeLibraries.ts b/server/sonar-web/src/main/js/app/components/extensions/exposeLibraries.ts index 29c40e9f618..7a71aed8fbf 100644 --- a/server/sonar-web/src/main/js/app/components/extensions/exposeLibraries.ts +++ b/server/sonar-web/src/main/js/app/components/extensions/exposeLibraries.ts @@ -18,63 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { FormattedMessage } from 'react-intl'; -import ActionsDropdown, { - ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import { - Button, - EditButton, - ResetButtonLink, - SubmitButton -} from 'sonar-ui-common/components/controls/buttons'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import ReloadButton from 'sonar-ui-common/components/controls/ReloadButton'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import SearchSelect from 'sonar-ui-common/components/controls/SearchSelect'; -import Select from 'sonar-ui-common/components/controls/Select'; -import SelectList from 'sonar-ui-common/components/controls/SelectList'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import AlertErrorIcon from 'sonar-ui-common/components/icons/AlertErrorIcon'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import AlertWarnIcon from 'sonar-ui-common/components/icons/AlertWarnIcon'; -import BranchIcon from 'sonar-ui-common/components/icons/BranchIcon'; -import CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import ClearIcon from 'sonar-ui-common/components/icons/ClearIcon'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import HelpIcon from 'sonar-ui-common/components/icons/HelpIcon'; -import LockIcon from 'sonar-ui-common/components/icons/LockIcon'; -import PlusCircleIcon from 'sonar-ui-common/components/icons/PlusCircleIcon'; -import PullRequestIcon from 'sonar-ui-common/components/icons/PullRequestIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import SecurityHotspotIcon from 'sonar-ui-common/components/icons/SecurityHotspotIcon'; -import VulnerabilityIcon from 'sonar-ui-common/components/icons/VulnerabilityIcon'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import DuplicationsRating from 'sonar-ui-common/components/ui/DuplicationsRating'; -import Level from 'sonar-ui-common/components/ui/Level'; -import Rating from 'sonar-ui-common/components/ui/Rating'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { - get, - getJSON, - getText, - post, - postJSON, - postJSONBody, - request -} from 'sonar-ui-common/helpers/request'; import NotFound from '../../../app/components/NotFound'; import Favorite from '../../../components/controls/Favorite'; import HomePageSelect from '../../../components/controls/HomePageSelect'; @@ -99,6 +42,63 @@ import { getComponentSecurityHotspotsUrl, getRulesUrl } from '../../../helpers/urls'; +import ActionsDropdown, { + ActionsDropdownItem +} from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import { + Button, + EditButton, + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Checkbox from '../../../sonar-ui-common/components/controls/Checkbox'; +import ConfirmButton from '../../../sonar-ui-common/components/controls/ConfirmButton'; +import Dropdown from '../../../sonar-ui-common/components/controls/Dropdown'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import RadioToggle from '../../../sonar-ui-common/components/controls/RadioToggle'; +import ReloadButton from '../../../sonar-ui-common/components/controls/ReloadButton'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import SearchSelect from '../../../sonar-ui-common/components/controls/SearchSelect'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import SelectList from '../../../sonar-ui-common/components/controls/SelectList'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import AlertErrorIcon from '../../../sonar-ui-common/components/icons/AlertErrorIcon'; +import AlertSuccessIcon from '../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import AlertWarnIcon from '../../../sonar-ui-common/components/icons/AlertWarnIcon'; +import BranchIcon from '../../../sonar-ui-common/components/icons/BranchIcon'; +import CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import ClearIcon from '../../../sonar-ui-common/components/icons/ClearIcon'; +import DetachIcon from '../../../sonar-ui-common/components/icons/DetachIcon'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import HelpIcon from '../../../sonar-ui-common/components/icons/HelpIcon'; +import LockIcon from '../../../sonar-ui-common/components/icons/LockIcon'; +import PlusCircleIcon from '../../../sonar-ui-common/components/icons/PlusCircleIcon'; +import PullRequestIcon from '../../../sonar-ui-common/components/icons/PullRequestIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import SecurityHotspotIcon from '../../../sonar-ui-common/components/icons/SecurityHotspotIcon'; +import VulnerabilityIcon from '../../../sonar-ui-common/components/icons/VulnerabilityIcon'; +import DateFormatter from '../../../sonar-ui-common/components/intl/DateFormatter'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import DateTimeFormatter from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import DuplicationsRating from '../../../sonar-ui-common/components/ui/DuplicationsRating'; +import Level from '../../../sonar-ui-common/components/ui/Level'; +import Rating from '../../../sonar-ui-common/components/ui/Rating'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; +import { + get, + getJSON, + getText, + post, + postJSON, + postJSONBody, + request +} from '../../../sonar-ui-common/helpers/request'; import addGlobalSuccessMessage from '../../utils/addGlobalSuccessMessage'; import throwGlobalError from '../../utils/throwGlobalError'; import A11ySkipTarget from '../a11y/A11ySkipTarget'; diff --git a/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationHelper.ts b/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationHelper.ts index 1d3eb893cad..0514b7dcdf2 100644 --- a/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationHelper.ts +++ b/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationHelper.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { get, remove, save } from 'sonar-ui-common/helpers/storage'; import { getIndexationStatus } from '../../../api/ce'; +import { get, remove, save } from '../../../sonar-ui-common/helpers/storage'; import { IndexationStatus } from '../../../types/indexation'; const POLLING_INTERVAL_MS = 5000; diff --git a/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationRenderer.tsx b/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationRenderer.tsx index 4bf1455f264..2e6c7ff2abf 100644 --- a/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationRenderer.tsx +++ b/server/sonar-web/src/main/js/app/components/indexation/IndexationNotificationRenderer.tsx @@ -20,8 +20,8 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert, AlertProps } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { Alert, AlertProps } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { IndexationNotificationType } from '../../../types/indexation'; import { TaskStatuses, TaskTypes } from '../../../types/tasks'; diff --git a/server/sonar-web/src/main/js/app/components/indexation/PageUnavailableDueToIndexation.tsx b/server/sonar-web/src/main/js/app/components/indexation/PageUnavailableDueToIndexation.tsx index 4c5c28427e6..ff868c7972d 100644 --- a/server/sonar-web/src/main/js/app/components/indexation/PageUnavailableDueToIndexation.tsx +++ b/server/sonar-web/src/main/js/app/components/indexation/PageUnavailableDueToIndexation.tsx @@ -19,11 +19,11 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import withIndexationContext, { WithIndexationContextProps } from '../../../components/hoc/withIndexationContext'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props extends WithIndexationContextProps { pageContext?: PageContext; diff --git a/server/sonar-web/src/main/js/app/components/indexation/__tests__/IndexationNotificationHelper-test.tsx b/server/sonar-web/src/main/js/app/components/indexation/__tests__/IndexationNotificationHelper-test.tsx index fe8fa17c1af..b3170c43fab 100644 --- a/server/sonar-web/src/main/js/app/components/indexation/__tests__/IndexationNotificationHelper-test.tsx +++ b/server/sonar-web/src/main/js/app/components/indexation/__tests__/IndexationNotificationHelper-test.tsx @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { get, remove, save } from 'sonar-ui-common/helpers/storage'; import { getIndexationStatus } from '../../../../api/ce'; +import { get, remove, save } from '../../../../sonar-ui-common/helpers/storage'; import { IndexationStatus } from '../../../../types/indexation'; import IndexationNotificationHelper from '../IndexationNotificationHelper'; @@ -31,7 +31,7 @@ jest.mock('../../../../api/ce', () => ({ getIndexationStatus: jest.fn() })); -jest.mock('sonar-ui-common/helpers/storage', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/storage', () => ({ get: jest.fn(), remove: jest.fn(), save: jest.fn() diff --git a/server/sonar-web/src/main/js/app/components/nav/component/Breadcrumb.tsx b/server/sonar-web/src/main/js/app/components/nav/component/Breadcrumb.tsx index d7f64110f47..1ac43095f55 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/Breadcrumb.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/Breadcrumb.tsx @@ -20,9 +20,9 @@ import { last } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; import { isMainBranch } from '../../../../helpers/branch-like'; import { getComponentOverviewUrl } from '../../../../helpers/urls'; +import QualifierIcon from '../../../../sonar-ui-common/components/icons/QualifierIcon'; import { BranchLike } from '../../../../types/branch-like'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx index 8a8301d6cac..401c5ade6cf 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNav.tsx @@ -19,7 +19,7 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import ContextNavBar from 'sonar-ui-common/components/ui/ContextNavBar'; +import ContextNavBar from '../../../../sonar-ui-common/components/ui/ContextNavBar'; import { ProjectAlmBindingConfigurationErrors, ProjectAlmBindingResponse diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBgTaskNotif.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBgTaskNotif.tsx index 19424db709e..78928515063 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBgTaskNotif.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavBgTaskNotif.tsx @@ -20,11 +20,11 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link, WithRouterProps } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { hasMessage, translate } from 'sonar-ui-common/helpers/l10n'; import { STATUSES } from '../../../../apps/background-tasks/constants'; import { withRouter } from '../../../../components/hoc/withRouter'; import { getComponentBackgroundTaskUrl } from '../../../../helpers/urls'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { hasMessage, translate } from '../../../../sonar-ui-common/helpers/l10n'; import { Task, TaskStatuses } from '../../../../types/tasks'; import ComponentNavLicenseNotif from './ComponentNavLicenseNotif'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavLicenseNotif.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavLicenseNotif.tsx index 7a98dbd3b14..d2360840b55 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavLicenseNotif.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavLicenseNotif.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { isValidLicense } from '../../../../api/marketplace'; import { withAppState } from '../../../../components/hoc/withAppState'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import { ComponentQualifier } from '../../../../types/component'; import { Task } from '../../../../types/tasks'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavProjectBindingErrorNotif.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavProjectBindingErrorNotif.tsx index 0308b9ede48..ba27c987edb 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavProjectBindingErrorNotif.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavProjectBindingErrorNotif.tsx @@ -20,10 +20,10 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { PULL_REQUEST_DECORATION_BINDING_CATEGORY } from '../../../../apps/settings/components/AdditionalCategoryKeys'; import { getProjectSettingsUrl } from '../../../../helpers/urls'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; export interface ComponentNavProjectBindingErrorNotifProps { component: T.Component; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx index 01fc1079508..1e5929bcad3 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/ComponentNavWarnings.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { lazyLoadComponent } from '../../../../sonar-ui-common/components/lazyLoadComponent'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { TaskWarning } from '../../../../types/tasks'; const AnalysisWarningsModal = lazyLoadComponent( diff --git a/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx b/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx index 0eaec31665f..e5e4b138acf 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx @@ -19,13 +19,13 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import BranchStatus from '../../../../components/common/BranchStatus'; import HomePageSelect from '../../../../components/controls/HomePageSelect'; import { isBranch, isPullRequest } from '../../../../helpers/branch-like'; import { isLoggedIn } from '../../../../helpers/users'; +import DetachIcon from '../../../../sonar-ui-common/components/icons/DetachIcon'; +import DateTimeFormatter from '../../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { getCurrentUser, Store } from '../../../../store/rootReducer'; import { BranchLike } from '../../../../types/branch-like'; import { ComponentQualifier } from '../../../../types/component'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/Menu.tsx b/server/sonar-web/src/main/js/app/components/nav/component/Menu.tsx index eee1d068e57..7df410dd26e 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/Menu.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/Menu.tsx @@ -20,15 +20,15 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { Link, LinkProps } from 'react-router'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import BulletListIcon from 'sonar-ui-common/components/icons/BulletListIcon'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import NavBarTabs from 'sonar-ui-common/components/ui/NavBarTabs'; -import { hasMessage, translate } from 'sonar-ui-common/helpers/l10n'; import { withAppState } from '../../../../components/hoc/withAppState'; import { getBranchLikeQuery, isPullRequest } from '../../../../helpers/branch-like'; import { getPortfolioUrl, getProjectQueryUrl } from '../../../../helpers/urls'; +import Dropdown from '../../../../sonar-ui-common/components/controls/Dropdown'; +import Tooltip from '../../../../sonar-ui-common/components/controls/Tooltip'; +import BulletListIcon from '../../../../sonar-ui-common/components/icons/BulletListIcon'; +import DropdownIcon from '../../../../sonar-ui-common/components/icons/DropdownIcon'; +import NavBarTabs from '../../../../sonar-ui-common/components/ui/NavBarTabs'; +import { hasMessage, translate } from '../../../../sonar-ui-common/helpers/l10n'; import { BranchLike, BranchParameters } from '../../../../types/branch-like'; import { ComponentQualifier, isPortfolioLike } from '../../../../types/component'; import './Menu.css'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavBgTaskNotif-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavBgTaskNotif-test.tsx index 0cb0ebd7579..cd069c5bc32 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavBgTaskNotif-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavBgTaskNotif-test.tsx @@ -20,15 +20,15 @@ import { shallow } from 'enzyme'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { hasMessage } from 'sonar-ui-common/helpers/l10n'; import { mockTask } from '../../../../../helpers/mocks/tasks'; import { mockComponent, mockLocation } from '../../../../../helpers/testMocks'; +import { Alert } from '../../../../../sonar-ui-common/components/ui/Alert'; +import { hasMessage } from '../../../../../sonar-ui-common/helpers/l10n'; import { Task, TaskStatuses, TaskTypes } from '../../../../../types/tasks'; import { ComponentNavBgTaskNotif } from '../ComponentNavBgTaskNotif'; -jest.mock('sonar-ui-common/helpers/l10n', () => ({ - ...jest.requireActual('sonar-ui-common/helpers/l10n'), +jest.mock('../../../../../sonar-ui-common/helpers/l10n', () => ({ + ...jest.requireActual('../../../../../sonar-ui-common/helpers/l10n'), hasMessage: jest.fn().mockReturnValue(true) })); diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavLicenseNotif-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavLicenseNotif-test.tsx index d10fc983296..dc63ca704a4 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavLicenseNotif-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/ComponentNavLicenseNotif-test.tsx @@ -19,14 +19,14 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { isValidLicense } from '../../../../../api/marketplace'; import { mockTask } from '../../../../../helpers/mocks/tasks'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import { TaskStatuses } from '../../../../../types/tasks'; import { ComponentNavLicenseNotif } from '../ComponentNavLicenseNotif'; -jest.mock('sonar-ui-common/helpers/l10n', () => ({ - ...jest.requireActual('sonar-ui-common/helpers/l10n'), +jest.mock('../../../../../sonar-ui-common/helpers/l10n', () => ({ + ...jest.requireActual('../../../../../sonar-ui-common/helpers/l10n'), hasMessage: jest.fn().mockReturnValue(true) })); diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.tsx index 4f4d13cdf98..c05cc8f8524 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/BranchLikeNavigation.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; import { withAppState } from '../../../../../components/hoc/withAppState'; +import Toggler from '../../../../../sonar-ui-common/components/controls/Toggler'; import { ProjectAlmBindingResponse } from '../../../../../types/alm-settings'; import { BranchLike } from '../../../../../types/branch-like'; import './BranchLikeNavigation.css'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx index 263974cc43b..8add2010e16 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLike.tsx @@ -19,14 +19,14 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import PlusCircleIcon from 'sonar-ui-common/components/icons/PlusCircleIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import DocumentationTooltip from '../../../../../components/common/DocumentationTooltip'; import BranchLikeIcon from '../../../../../components/icons/BranchLikeIcon'; import { getBranchLikeDisplayName } from '../../../../../helpers/branch-like'; import { getApplicationAdminUrl } from '../../../../../helpers/urls'; +import HelpTooltip from '../../../../../sonar-ui-common/components/controls/HelpTooltip'; +import DropdownIcon from '../../../../../sonar-ui-common/components/icons/DropdownIcon'; +import PlusCircleIcon from '../../../../../sonar-ui-common/components/icons/PlusCircleIcon'; +import { translate, translateWithParameters } from '../../../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, ProjectAlmBindingResponse } from '../../../../../types/alm-settings'; import { BranchLike } from '../../../../../types/branch-like'; import { ComponentQualifier } from '../../../../../types/component'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLikeMergeInformation.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLikeMergeInformation.tsx index 5d042ce2b0e..d4d4bbd58f6 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLikeMergeInformation.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/CurrentBranchLikeMergeInformation.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { isPullRequest } from '../../../../../helpers/branch-like'; +import { translate } from '../../../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../../../types/branch-like'; export interface CurrentBranchLikeMergeInformationProps { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/Menu.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/Menu.tsx index 3f47d9e7a7d..b659a7d7dd8 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/Menu.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/Menu.tsx @@ -19,10 +19,6 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { KeyCodes } from 'sonar-ui-common/helpers/keycodes'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Router, withRouter } from '../../../../../components/hoc/withRouter'; import { getBrancheLikesAsTree, @@ -31,6 +27,10 @@ import { isSameBranchLike } from '../../../../../helpers/branch-like'; import { getBranchLikeUrl } from '../../../../../helpers/urls'; +import { DropdownOverlay } from '../../../../../sonar-ui-common/components/controls/Dropdown'; +import SearchBox from '../../../../../sonar-ui-common/components/controls/SearchBox'; +import { KeyCodes } from '../../../../../sonar-ui-common/helpers/keycodes'; +import { translate } from '../../../../../sonar-ui-common/helpers/l10n'; import { BranchLike, BranchLikeTree } from '../../../../../types/branch-like'; import { ComponentQualifier } from '../../../../../types/component'; import MenuItemList from './MenuItemList'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/MenuItem.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/MenuItem.tsx index 4ed517404c7..0081d6e2107 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/MenuItem.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/MenuItem.tsx @@ -19,10 +19,10 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import BranchStatus from '../../../../../components/common/BranchStatus'; import BranchLikeIcon from '../../../../../components/icons/BranchLikeIcon'; import { getBranchLikeDisplayName, isMainBranch } from '../../../../../helpers/branch-like'; +import { translate } from '../../../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../../../types/branch-like'; export interface MenuItemProps { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/MenuItemList.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/MenuItemList.tsx index 6308da0f963..2cfeef45c33 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/MenuItemList.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/MenuItemList.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; -import { isDefined } from 'sonar-ui-common/helpers/types'; import { getBranchLikeKey, isSameBranchLike } from '../../../../../helpers/branch-like'; +import HelpTooltip from '../../../../../sonar-ui-common/components/controls/HelpTooltip'; +import { translate } from '../../../../../sonar-ui-common/helpers/l10n'; +import { scrollToElement } from '../../../../../sonar-ui-common/helpers/scrolling'; +import { isDefined } from '../../../../../sonar-ui-common/helpers/types'; import { BranchLike, BranchLikeTree } from '../../../../../types/branch-like'; import MenuItem from './MenuItem'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/BranchLikeNavigation-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/BranchLikeNavigation-test.tsx index c0b34d01686..0872ef3f49c 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/BranchLikeNavigation-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/BranchLikeNavigation-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockSetOfBranchAndPullRequest } from '../../../../../../helpers/mocks/branch-like'; import { mockAppState, mockComponent } from '../../../../../../helpers/testMocks'; +import Toggler from '../../../../../../sonar-ui-common/components/controls/Toggler'; +import { click } from '../../../../../../sonar-ui-common/helpers/testUtils'; import { BranchLikeNavigation, BranchLikeNavigationProps } from '../BranchLikeNavigation'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/Menu-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/Menu-test.tsx index 5f8684faa3e..5415fdfcf7a 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/Menu-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/Menu-test.tsx @@ -20,14 +20,14 @@ import { shallow } from 'enzyme'; import * as React from 'react'; import { Link } from 'react-router'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { KeyCodes } from 'sonar-ui-common/helpers/keycodes'; -import { click, mockEvent } from 'sonar-ui-common/helpers/testUtils'; import { mockPullRequest, mockSetOfBranchAndPullRequest } from '../../../../../../helpers/mocks/branch-like'; import { mockComponent, mockRouter } from '../../../../../../helpers/testMocks'; +import SearchBox from '../../../../../../sonar-ui-common/components/controls/SearchBox'; +import { KeyCodes } from '../../../../../../sonar-ui-common/helpers/keycodes'; +import { click, mockEvent } from '../../../../../../sonar-ui-common/helpers/testUtils'; import { Menu } from '../Menu'; import { MenuItemList } from '../MenuItemList'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/MenuItem-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/MenuItem-test.tsx index a2d661556a2..28162225144 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/MenuItem-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/branch-like/__tests__/MenuItem-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockMainBranch, mockPullRequest } from '../../../../../../helpers/mocks/branch-like'; import { mockComponent } from '../../../../../../helpers/testMocks'; +import { click } from '../../../../../../sonar-ui-common/helpers/testUtils'; import { MenuItem, MenuItemProps } from '../MenuItem'; it('should render a main branch correctly', () => { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/DrawerLink.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/DrawerLink.tsx index 186d15c8157..058c16891a3 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/DrawerLink.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/DrawerLink.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; +import ChevronRightIcon from '../../../../../sonar-ui-common/components/icons/ChevronRightIcon'; export interface DrawerLinkProps<P> { label: string; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/InfoDrawer.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/InfoDrawer.tsx index 08f17ec64ee..af20df002ea 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/InfoDrawer.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/InfoDrawer.tsx @@ -19,9 +19,9 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { ClearButton } from 'sonar-ui-common/components/controls/buttons'; -import EscKeydownHandler from 'sonar-ui-common/components/controls/EscKeydownHandler'; -import OutsideClickHandler from 'sonar-ui-common/components/controls/OutsideClickHandler'; +import { ClearButton } from '../../../../../sonar-ui-common/components/controls/buttons'; +import EscKeydownHandler from '../../../../../sonar-ui-common/components/controls/EscKeydownHandler'; +import OutsideClickHandler from '../../../../../sonar-ui-common/components/controls/OutsideClickHandler'; import './InfoDrawer.css'; export interface InfoDrawerProps { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/InfoDrawerPage.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/InfoDrawerPage.tsx index 8867951eedd..30056b53285 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/InfoDrawerPage.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/InfoDrawerPage.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import BackIcon from 'sonar-ui-common/components/icons/BackIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import BackIcon from '../../../../../sonar-ui-common/components/icons/BackIcon'; +import { translate } from '../../../../../sonar-ui-common/helpers/l10n'; export interface InfoDrawerPageProps { children: React.ReactNode; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/ProjectInformationRenderer.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/ProjectInformationRenderer.tsx index 5fe1b82eaaf..106ca606cad 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/ProjectInformationRenderer.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/ProjectInformationRenderer.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import PrivacyBadgeContainer from '../../../../../components/common/PrivacyBadgeContainer'; +import { translate } from '../../../../../sonar-ui-common/helpers/l10n'; import { ComponentQualifier } from '../../../../../types/component'; import DrawerLink from './DrawerLink'; import MetaKey from './meta/MetaKey'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/__tests__/ProjectInformation-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/__tests__/ProjectInformation-test.tsx index 75030f5c6d4..e9a3a5dc9b3 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/__tests__/ProjectInformation-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/__tests__/ProjectInformation-test.tsx @@ -19,13 +19,13 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockComponent, mockCurrentUser, mockLoggedInUser, mockMetric } from '../../../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../../../sonar-ui-common/helpers/testUtils'; import { ProjectInformation } from '../ProjectInformation'; import { ProjectInformationPages } from '../ProjectInformationPages'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/BadgeButton.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/BadgeButton.tsx index 8d427fd722a..646eaa2d093 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/BadgeButton.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/BadgeButton.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../../../../sonar-ui-common/helpers/l10n'; import { BadgeType } from './utils'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/BadgeParams.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/BadgeParams.tsx index a6cb58cca05..59fefdbee99 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/BadgeParams.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/BadgeParams.tsx @@ -19,9 +19,9 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { getLocalizedMetricName, translate } from 'sonar-ui-common/helpers/l10n'; import { fetchWebApi } from '../../../../../../api/web-api'; +import Select from '../../../../../../sonar-ui-common/components/controls/Select'; +import { getLocalizedMetricName, translate } from '../../../../../../sonar-ui-common/helpers/l10n'; import { BadgeColors, BadgeFormats, BadgeOptions, BadgeType } from './utils'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/ProjectBadges.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/ProjectBadges.tsx index cf378c26c42..531d52cdfc6 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/ProjectBadges.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/ProjectBadges.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../../../../components/common/CodeSnippet'; import { getBranchLikeQuery } from '../../../../../../helpers/branch-like'; +import { translate } from '../../../../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../../../../types/branch-like'; import { MetricKey } from '../../../../../../types/metrics'; import BadgeButton from './BadgeButton'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/BadgeButton-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/BadgeButton-test.tsx index b69110a2332..adf7877a87b 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/BadgeButton-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/BadgeButton-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../../../../sonar-ui-common/helpers/testUtils'; import BadgeButton from '../BadgeButton'; import { BadgeType } from '../utils'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/ProjectBadges-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/ProjectBadges-test.tsx index 211ce31e9de..fb000f69621 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/ProjectBadges-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/ProjectBadges-test.tsx @@ -19,13 +19,13 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Location } from 'sonar-ui-common/helpers/urls'; import { mockBranch } from '../../../../../../../helpers/mocks/branch-like'; import { mockMetric } from '../../../../../../../helpers/testMocks'; +import { Location } from '../../../../../../../sonar-ui-common/helpers/urls'; import { MetricKey } from '../../../../../../../types/metrics'; import ProjectBadges from '../ProjectBadges'; -jest.mock('sonar-ui-common/helpers/urls', () => ({ +jest.mock('../../../../../../../sonar-ui-common/helpers/urls', () => ({ getHostUrl: () => 'host', getPathUrlAsString: (l: Location) => l.pathname })); diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/utils-test.ts b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/utils-test.ts index c733bb8c7ad..9d6174facb4 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/utils-test.ts +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/__tests__/utils-test.ts @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { Location } from 'sonar-ui-common/helpers/urls'; +import { Location } from '../../../../../../../sonar-ui-common/helpers/urls'; import { BadgeOptions, BadgeType, getBadgeSnippet, getBadgeUrl } from '../utils'; -jest.mock('sonar-ui-common/helpers/urls', () => ({ - ...jest.requireActual('sonar-ui-common/helpers/urls'), +jest.mock('../../../../../../../sonar-ui-common/helpers/urls', () => ({ + ...jest.requireActual('../../../../../../../sonar-ui-common/helpers/urls'), getHostUrl: () => 'host', getPathUrlAsString: (o: Location) => `host${o.pathname}?id=${o.query ? o.query.id : ''}&branch=${o.query ? o.query.branch : ''}` diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/utils.ts b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/utils.ts index e0277fa8948..48266ab6df6 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/utils.ts +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/badges/utils.ts @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { stringify } from 'querystring'; -import { getLocalizedMetricName } from 'sonar-ui-common/helpers/l10n'; -import { omitNil } from 'sonar-ui-common/helpers/request'; -import { getHostUrl, getPathUrlAsString } from 'sonar-ui-common/helpers/urls'; import { getProjectUrl } from '../../../../../../helpers/urls'; +import { getLocalizedMetricName } from '../../../../../../sonar-ui-common/helpers/l10n'; +import { omitNil } from '../../../../../../sonar-ui-common/helpers/request'; +import { getHostUrl, getPathUrlAsString } from '../../../../../../sonar-ui-common/helpers/urls'; export type BadgeColors = 'white' | 'black' | 'orange'; export type BadgeFormats = 'md' | 'url'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaKey.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaKey.tsx index 61d49cb7282..bfff750221c 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaKey.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaKey.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClipboardButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardButton } from '../../../../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../../../../sonar-ui-common/helpers/l10n'; interface Props { componentKey: string; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLink.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLink.tsx index 94ee8f1a8eb..d0b487b56ef 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLink.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLink.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClearButton } from 'sonar-ui-common/components/controls/buttons'; -import ProjectLinkIcon from 'sonar-ui-common/components/icons/ProjectLinkIcon'; import { getLinkName } from '../../../../../../helpers/projectLinks'; +import { ClearButton } from '../../../../../../sonar-ui-common/components/controls/buttons'; +import ProjectLinkIcon from '../../../../../../sonar-ui-common/components/icons/ProjectLinkIcon'; import isValidUri from '../../../../../utils/isValidUri'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLinks.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLinks.tsx index bba22f2c893..c3a2366b538 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLinks.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaLinks.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getProjectLinks } from '../../../../../../api/projectLinks'; import { orderLinks } from '../../../../../../helpers/projectLinks'; +import { translate } from '../../../../../../sonar-ui-common/helpers/l10n'; import MetaLink from './MetaLink'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaQualityGate.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaQualityGate.tsx index 3e5869ca535..4e4fcba9894 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaQualityGate.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaQualityGate.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getQualityGateUrl } from '../../../../../../helpers/urls'; +import { translate } from '../../../../../../sonar-ui-common/helpers/l10n'; interface Props { qualityGate: { isDefault?: boolean; key: string; name: string }; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaQualityProfiles.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaQualityProfiles.tsx index 6d504c49ac2..25e44404e5c 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaQualityProfiles.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaQualityProfiles.tsx @@ -20,10 +20,10 @@ import * as React from 'react'; import { connect } from 'react-redux'; import { Link } from 'react-router'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { searchRules } from '../../../../../../api/rules'; import { getQualityProfileUrl } from '../../../../../../helpers/urls'; +import Tooltip from '../../../../../../sonar-ui-common/components/controls/Tooltip'; +import { translate, translateWithParameters } from '../../../../../../sonar-ui-common/helpers/l10n'; import { getLanguages, Store } from '../../../../../../store/rootReducer'; interface StateProps { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaSize.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaSize.tsx index 06b2bf7fb46..9475410037e 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaSize.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaSize.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import SizeRating from 'sonar-ui-common/components/ui/SizeRating'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure, localizeMetric } from 'sonar-ui-common/helpers/measures'; import DrilldownLink from '../../../../../../components/shared/DrilldownLink'; +import SizeRating from '../../../../../../sonar-ui-common/components/ui/SizeRating'; +import { translate } from '../../../../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure, localizeMetric } from '../../../../../../sonar-ui-common/helpers/measures'; import { ComponentQualifier } from '../../../../../../types/component'; import { MetricKey } from '../../../../../../types/metrics'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaTags.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaTags.tsx index 775f37292cc..436e556e50a 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaTags.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/MetaTags.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { setApplicationTags, setProjectTags } from '../../../../../../api/components'; import TagsList from '../../../../../../components/tags/TagsList'; +import { ButtonLink } from '../../../../../../sonar-ui-common/components/controls/buttons'; +import Dropdown from '../../../../../../sonar-ui-common/components/controls/Dropdown'; +import { PopupPlacement } from '../../../../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../../../../sonar-ui-common/helpers/l10n'; import { ComponentQualifier } from '../../../../../../types/component'; import MetaTagsSelector from './MetaTagsSelector'; diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/__tests__/MetaLink-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/__tests__/MetaLink-test.tsx index 511ba80fa6c..40cd393b23c 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/__tests__/MetaLink-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/__tests__/MetaLink-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ClearButton } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { ClearButton } from '../../../../../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../../../../../sonar-ui-common/helpers/testUtils'; import MetaLink from '../MetaLink'; const DANGEROUS_LINK = { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/__tests__/MetaQualityProfiles-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/__tests__/MetaQualityProfiles-test.tsx index 2b45baf2dde..6ee4e139a51 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/__tests__/MetaQualityProfiles-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/meta/__tests__/MetaQualityProfiles-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { searchRules } from '../../../../../../../api/rules'; import { mockLanguage, mockQualityProfile } from '../../../../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../../../../sonar-ui-common/helpers/testUtils'; import { MetaQualityProfiles } from '../MetaQualityProfiles'; jest.mock('../../../../../../../api/rules', () => { diff --git a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/notifications/ProjectNotifications.tsx b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/notifications/ProjectNotifications.tsx index 0092e1e9a79..d3ac66106ea 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/notifications/ProjectNotifications.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/projectInformation/notifications/ProjectNotifications.tsx @@ -18,14 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import NotificationsList from '../../../../../../apps/account/notifications/NotificationsList'; import { withNotifications, WithNotificationsProps } from '../../../../../../components/hoc/withNotifications'; +import { Alert } from '../../../../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../../../../sonar-ui-common/helpers/l10n'; interface Props { component: T.Component; diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx index bf07d907cf9..4d749f8d175 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import NavBar from 'sonar-ui-common/components/ui/NavBar'; +import NavBar from '../../../../sonar-ui-common/components/ui/NavBar'; import { getAppState, getCurrentUser, Store } from '../../../../store/rootReducer'; import { rawSizes } from '../../../theme'; import EmbedDocsPopupHelper from '../../embed-docs-modal/EmbedDocsPopupHelper'; diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavBranding.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavBranding.tsx index b836f4d8d26..f6fc31230ee 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavBranding.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavBranding.tsx @@ -20,8 +20,8 @@ import * as React from 'react'; import { connect } from 'react-redux'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../../sonar-ui-common/helpers/urls'; import { getGlobalSettingValue, Store } from '../../../../store/rootReducer'; interface StateProps { diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx index 378363b4479..5c5ba5c5ebc 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.tsx @@ -20,11 +20,11 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { Link } from 'react-router'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { isMySet } from '../../../../apps/issues/utils'; import { getQualityGatesUrl } from '../../../../helpers/urls'; +import Dropdown from '../../../../sonar-ui-common/components/controls/Dropdown'; +import DropdownIcon from '../../../../sonar-ui-common/components/icons/DropdownIcon'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { ComponentQualifier } from '../../../../types/component'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.tsx index d66a1996325..9620ba45a55 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavUser.tsx @@ -19,12 +19,12 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; import { Router, withRouter } from '../../../../components/hoc/withRouter'; import Avatar from '../../../../components/ui/Avatar'; import { isLoggedIn } from '../../../../helpers/users'; +import Dropdown from '../../../../sonar-ui-common/components/controls/Dropdown'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../../sonar-ui-common/helpers/urls'; import { rawSizes } from '../../../theme'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/nav/global/__tests__/GlobalNav-test.tsx b/server/sonar-web/src/main/js/app/components/nav/global/__tests__/GlobalNav-test.tsx index 0a1c6451484..9804c9db9a7 100644 --- a/server/sonar-web/src/main/js/app/components/nav/global/__tests__/GlobalNav-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/global/__tests__/GlobalNav-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import { GlobalNav, GlobalNavProps } from '../GlobalNav'; // Solve redux warning issue "No reducer provided for key": diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/PendingPluginsActionNotif.tsx b/server/sonar-web/src/main/js/app/components/nav/settings/PendingPluginsActionNotif.tsx index 078a8851000..80164dce4a3 100644 --- a/server/sonar-web/src/main/js/app/components/nav/settings/PendingPluginsActionNotif.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/settings/PendingPluginsActionNotif.tsx @@ -19,12 +19,12 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { cancelPendingPlugins } from '../../../../api/plugins'; import InstanceMessage from '../../../../components/common/InstanceMessage'; import RestartButton from '../../../../components/common/RestartButton'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { PendingPluginResult } from '../../../../types/plugins'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx index 0d4f96b0b19..332a5d90ad2 100644 --- a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsNav.tsx @@ -20,12 +20,12 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { IndexLink, Link } from 'react-router'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import ContextNavBar from 'sonar-ui-common/components/ui/ContextNavBar'; -import NavBarTabs from 'sonar-ui-common/components/ui/NavBarTabs'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import Dropdown from '../../../../sonar-ui-common/components/controls/Dropdown'; +import DropdownIcon from '../../../../sonar-ui-common/components/icons/DropdownIcon'; +import ContextNavBar from '../../../../sonar-ui-common/components/ui/ContextNavBar'; +import NavBarTabs from '../../../../sonar-ui-common/components/ui/NavBarTabs'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../../sonar-ui-common/helpers/urls'; import { AdminPageExtension } from '../../../../types/extension'; import { PendingPluginResult } from '../../../../types/plugins'; import { rawSizes } from '../../../theme'; diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/SystemRestartNotif.tsx b/server/sonar-web/src/main/js/app/components/nav/settings/SystemRestartNotif.tsx index fc6f574328c..00c4c0eb2fc 100644 --- a/server/sonar-web/src/main/js/app/components/nav/settings/SystemRestartNotif.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/settings/SystemRestartNotif.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getInstance } from '../../../../helpers/system'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; export default function SystemRestartNotif() { return ( diff --git a/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/PendingPluginsActionNotif-test.tsx b/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/PendingPluginsActionNotif-test.tsx index 71b8516e1a9..a2067e576e0 100644 --- a/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/PendingPluginsActionNotif-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/settings/__tests__/PendingPluginsActionNotif-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../../sonar-ui-common/helpers/testUtils'; import PendingPluginsActionNotif from '../PendingPluginsActionNotif'; jest.mock('../../../../../api/plugins', () => ({ diff --git a/server/sonar-web/src/main/js/app/components/search/Search.tsx b/server/sonar-web/src/main/js/app/components/search/Search.tsx index 40658ee5cb8..f4b97fed26b 100644 --- a/server/sonar-web/src/main/js/app/components/search/Search.tsx +++ b/server/sonar-web/src/main/js/app/components/search/Search.tsx @@ -22,16 +22,16 @@ import { debounce, keyBy, uniqBy } from 'lodash'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { withRouter, WithRouterProps } from 'react-router'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import OutsideClickHandler from 'sonar-ui-common/components/controls/OutsideClickHandler'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import ClockIcon from 'sonar-ui-common/components/icons/ClockIcon'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { getSuggestions } from '../../../api/components'; import { getComponentOverviewUrl } from '../../../helpers/urls'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import OutsideClickHandler from '../../../sonar-ui-common/components/controls/OutsideClickHandler'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import ClockIcon from '../../../sonar-ui-common/components/icons/ClockIcon'; +import { lazyLoadComponent } from '../../../sonar-ui-common/components/lazyLoadComponent'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import { ComponentQualifier } from '../../../types/component'; import RecentHistory from '../RecentHistory'; import './Search.css'; diff --git a/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx b/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx index c5f2ef395f5..bdec79fe411 100644 --- a/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx +++ b/server/sonar-web/src/main/js/app/components/search/SearchResult.tsx @@ -19,12 +19,12 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import ClockIcon from 'sonar-ui-common/components/icons/ClockIcon'; -import FavoriteIcon from 'sonar-ui-common/components/icons/FavoriteIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; import { ComponentQualifier } from '../../../../js/types/component'; import { getComponentOverviewUrl } from '../../../helpers/urls'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import ClockIcon from '../../../sonar-ui-common/components/icons/ClockIcon'; +import FavoriteIcon from '../../../sonar-ui-common/components/icons/FavoriteIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; import { ComponentResult } from './utils'; interface Props { diff --git a/server/sonar-web/src/main/js/app/components/search/SearchResults.tsx b/server/sonar-web/src/main/js/app/components/search/SearchResults.tsx index 8191959de3f..6e5d82118a1 100644 --- a/server/sonar-web/src/main/js/app/components/search/SearchResults.tsx +++ b/server/sonar-web/src/main/js/app/components/search/SearchResults.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import SearchShowMore from './SearchShowMore'; import { ComponentResult, More, Results, sortQualifiers } from './utils'; diff --git a/server/sonar-web/src/main/js/app/components/search/SearchShowMore.tsx b/server/sonar-web/src/main/js/app/components/search/SearchShowMore.tsx index f347a1ea858..e73846ebeb5 100644 --- a/server/sonar-web/src/main/js/app/components/search/SearchShowMore.tsx +++ b/server/sonar-web/src/main/js/app/components/search/SearchShowMore.tsx @@ -20,8 +20,8 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { allowMore: boolean; diff --git a/server/sonar-web/src/main/js/app/components/search/__tests__/Search-test.tsx b/server/sonar-web/src/main/js/app/components/search/__tests__/Search-test.tsx index dcf4db06153..f786a336c16 100644 --- a/server/sonar-web/src/main/js/app/components/search/__tests__/Search-test.tsx +++ b/server/sonar-web/src/main/js/app/components/search/__tests__/Search-test.tsx @@ -19,8 +19,8 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import { elementKeydown } from 'sonar-ui-common/helpers/testUtils'; import { mockRouter } from '../../../../helpers/testMocks'; +import { elementKeydown } from '../../../../sonar-ui-common/helpers/testUtils'; import { ComponentQualifier } from '../../../../types/component'; import { Search } from '../Search'; diff --git a/server/sonar-web/src/main/js/app/components/search/__tests__/SearchShowMore-test.tsx b/server/sonar-web/src/main/js/app/components/search/__tests__/SearchShowMore-test.tsx index 21bac947553..db64602bebf 100644 --- a/server/sonar-web/src/main/js/app/components/search/__tests__/SearchShowMore-test.tsx +++ b/server/sonar-web/src/main/js/app/components/search/__tests__/SearchShowMore-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import SearchShowMore from '../SearchShowMore'; it('should render', () => { diff --git a/server/sonar-web/src/main/js/app/index.ts b/server/sonar-web/src/main/js/app/index.ts index 98dc2d01d5f..7cc56e88bfa 100644 --- a/server/sonar-web/src/main/js/app/index.ts +++ b/server/sonar-web/src/main/js/app/index.ts @@ -17,11 +17,11 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import SonarUiCommonInitializer from 'sonar-ui-common/helpers/init'; -import { parseJSON, request } from 'sonar-ui-common/helpers/request'; import { installExtensionsHandler, installWebAnalyticsHandler } from '../helpers/extensionsHandler'; import { loadL10nBundle } from '../helpers/l10n'; import { getBaseUrl, getSystemStatus } from '../helpers/system'; +import SonarUiCommonInitializer from '../sonar-ui-common/helpers/init'; +import { parseJSON, request } from '../sonar-ui-common/helpers/request'; import './styles/sonar.css'; SonarUiCommonInitializer.setUrlContext(getBaseUrl()); diff --git a/server/sonar-web/src/main/js/app/utils/handleRequiredAuthorization.ts b/server/sonar-web/src/main/js/app/utils/handleRequiredAuthorization.ts index 0150e95e20a..8f827f27129 100644 --- a/server/sonar-web/src/main/js/app/utils/handleRequiredAuthorization.ts +++ b/server/sonar-web/src/main/js/app/utils/handleRequiredAuthorization.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import getHistory from 'sonar-ui-common/helpers/getHistory'; +import getHistory from '../../sonar-ui-common/helpers/getHistory'; import { requireAuthorization } from '../../store/appState'; import getStore from './getStore'; diff --git a/server/sonar-web/src/main/js/app/utils/startReactApp.tsx b/server/sonar-web/src/main/js/app/utils/startReactApp.tsx index 9f1187c0720..7edda98c752 100644 --- a/server/sonar-web/src/main/js/app/utils/startReactApp.tsx +++ b/server/sonar-web/src/main/js/app/utils/startReactApp.tsx @@ -26,9 +26,6 @@ import { HelmetProvider } from 'react-helmet-async'; import { IntlProvider } from 'react-intl'; import { Provider } from 'react-redux'; import { IndexRoute, Redirect, Route, RouteConfig, RouteProps, Router } from 'react-router'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; -import { ThemeProvider } from 'sonar-ui-common/components/theme'; -import getHistory from 'sonar-ui-common/helpers/getHistory'; import aboutRoutes from '../../apps/about/routes'; import accountRoutes from '../../apps/account/routes'; import applicationConsoleRoutes from '../../apps/application-console/routes'; @@ -64,6 +61,9 @@ import usersRoutes from '../../apps/users/routes'; import webAPIRoutes from '../../apps/web-api/routes'; import webhooksRoutes from '../../apps/webhooks/routes'; import withIndexationGuard from '../../components/hoc/withIndexationGuard'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; +import { ThemeProvider } from '../../sonar-ui-common/components/theme'; +import getHistory from '../../sonar-ui-common/helpers/getHistory'; import App from '../components/App'; import GlobalContainer from '../components/GlobalContainer'; import { PageContext } from '../components/indexation/PageUnavailableDueToIndexation'; diff --git a/server/sonar-web/src/main/js/app/utils/throwGlobalError.ts b/server/sonar-web/src/main/js/app/utils/throwGlobalError.ts index cb4152f5361..811062e45a2 100644 --- a/server/sonar-web/src/main/js/app/utils/throwGlobalError.ts +++ b/server/sonar-web/src/main/js/app/utils/throwGlobalError.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { parseError } from 'sonar-ui-common/helpers/request'; +import { parseError } from '../../sonar-ui-common/helpers/request'; import { addGlobalErrorMessage } from '../../store/globalMessages'; import getStore from './getStore'; diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutApp.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutApp.tsx index 652f712e689..869aecc4e12 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutApp.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutApp.tsx @@ -22,8 +22,6 @@ import { keyBy } from 'lodash'; import * as React from 'react'; import { connect } from 'react-redux'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { addWhitePageClass, removeWhitePageClass } from 'sonar-ui-common/helpers/pages'; import { searchProjects } from '../../../api/components'; import { getFacet } from '../../../api/issues'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; @@ -31,6 +29,8 @@ import withIndexationContext, { WithIndexationContextProps } from '../../../components/hoc/withIndexationContext'; import { sanitizeString } from '../../../helpers/sanitize'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { addWhitePageClass, removeWhitePageClass } from '../../../sonar-ui-common/helpers/pages'; import { getAppState, getCurrentUser, diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx index 5318e35fc2f..ab8ece04b32 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import ReadMore from './ReadMore'; const link = '/documentation/user-guide/issues/'; diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.tsx index 049beaaf332..7ae2dd95bc8 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutLanguages.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; const languages = [ { name: 'Java', url: 'https://redirect.sonarsource.com/plugins/java.html' }, diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx index 1be48192bcd..3a3ec8f27e0 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import ReadMore from './ReadMore'; const link = '/documentation/user-guide/clean-as-you-code/'; diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutProjects.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutProjects.tsx index c4de0cfb145..d071cfe88fc 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutProjects.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutProjects.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; interface Props { count: number; diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx index fc56482863d..a491da67517 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import ReadMore from './ReadMore'; const link = '/documentation/user-guide/quality-gates/'; diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.tsx index 30f041f41eb..f80bf8ee117 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutQualityModel.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BugIcon from 'sonar-ui-common/components/icons/BugIcon'; -import CodeSmellIcon from 'sonar-ui-common/components/icons/CodeSmellIcon'; -import SecurityHotspotIcon from 'sonar-ui-common/components/icons/SecurityHotspotIcon'; -import VulnerabilityIcon from 'sonar-ui-common/components/icons/VulnerabilityIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import BugIcon from '../../../sonar-ui-common/components/icons/BugIcon'; +import CodeSmellIcon from '../../../sonar-ui-common/components/icons/CodeSmellIcon'; +import SecurityHotspotIcon from '../../../sonar-ui-common/components/icons/SecurityHotspotIcon'; +import VulnerabilityIcon from '../../../sonar-ui-common/components/icons/VulnerabilityIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function AboutQualityModel() { return ( diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx index 584ef88ca07..a9db3de495e 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; const scanners = [ { diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx index e76a918e906..b39e7230cf8 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import TagsIcon from 'sonar-ui-common/components/icons/TagsIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getRulesUrl } from '../../../helpers/urls'; +import TagsIcon from '../../../sonar-ui-common/components/icons/TagsIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import ReadMore from './ReadMore'; const link = '/documentation/user-guide/rules/'; diff --git a/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.tsx b/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.tsx index 5150a49de50..a7db1eb714d 100644 --- a/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/EntryIssueTypes.tsx @@ -19,12 +19,12 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import BugIcon from 'sonar-ui-common/components/icons/BugIcon'; -import CodeSmellIcon from 'sonar-ui-common/components/icons/CodeSmellIcon'; -import VulnerabilityIcon from 'sonar-ui-common/components/icons/VulnerabilityIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getIssuesUrl } from '../../../helpers/urls'; +import BugIcon from '../../../sonar-ui-common/components/icons/BugIcon'; +import CodeSmellIcon from '../../../sonar-ui-common/components/icons/CodeSmellIcon'; +import VulnerabilityIcon from '../../../sonar-ui-common/components/icons/VulnerabilityIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; export interface EntryIssueTypesProps { bugs?: number; diff --git a/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx b/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx index 96a48a7f96a..e5cc42affa0 100644 --- a/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { link: string; diff --git a/server/sonar-web/src/main/js/apps/about/components/__tests__/AboutApp-test.tsx b/server/sonar-web/src/main/js/apps/about/components/__tests__/AboutApp-test.tsx index a562dc129d4..d9949372460 100644 --- a/server/sonar-web/src/main/js/apps/about/components/__tests__/AboutApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/__tests__/AboutApp-test.tsx @@ -19,15 +19,15 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { addWhitePageClass, removeWhitePageClass } from 'sonar-ui-common/helpers/pages'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { searchProjects } from '../../../../api/components'; import { getFacet } from '../../../../api/issues'; import { mockCurrentUser, mockLocation } from '../../../../helpers/testMocks'; +import { addWhitePageClass, removeWhitePageClass } from '../../../../sonar-ui-common/helpers/pages'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AboutApp } from '../AboutApp'; import EntryIssueTypes from '../EntryIssueTypes'; -jest.mock('sonar-ui-common/helpers/pages', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/pages', () => ({ addWhitePageClass: jest.fn(), removeWhitePageClass: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/about/routes.ts b/server/sonar-web/src/main/js/apps/about/routes.ts index 25554038b33..1efdc06f832 100644 --- a/server/sonar-web/src/main/js/apps/about/routes.ts +++ b/server/sonar-web/src/main/js/apps/about/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { indexRoute: { component: lazyLoadComponent(() => import('./components/AboutApp')) } } diff --git a/server/sonar-web/src/main/js/apps/account/components/Account.tsx b/server/sonar-web/src/main/js/apps/account/components/Account.tsx index 0c1e65ac08c..e4022fa52ba 100644 --- a/server/sonar-web/src/main/js/apps/account/components/Account.tsx +++ b/server/sonar-web/src/main/js/apps/account/components/Account.tsx @@ -19,11 +19,11 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; import { withCurrentUser } from '../../../components/hoc/withCurrentUser'; +import handleRequiredAuthentication from '../../../sonar-ui-common/helpers/handleRequiredAuthentication'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import '../account.css'; import Nav from './Nav'; import UserCard from './UserCard'; diff --git a/server/sonar-web/src/main/js/apps/account/components/Nav.tsx b/server/sonar-web/src/main/js/apps/account/components/Nav.tsx index 4b2fb957eea..001cf6f025b 100644 --- a/server/sonar-web/src/main/js/apps/account/components/Nav.tsx +++ b/server/sonar-web/src/main/js/apps/account/components/Nav.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { IndexLink, Link } from 'react-router'; -import NavBarTabs from 'sonar-ui-common/components/ui/NavBarTabs'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import NavBarTabs from '../../../sonar-ui-common/components/ui/NavBarTabs'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function Nav() { return ( diff --git a/server/sonar-web/src/main/js/apps/account/components/Security.tsx b/server/sonar-web/src/main/js/apps/account/components/Security.tsx index b5300960175..8f06d4150f5 100644 --- a/server/sonar-web/src/main/js/apps/account/components/Security.tsx +++ b/server/sonar-web/src/main/js/apps/account/components/Security.tsx @@ -20,8 +20,8 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { connect } from 'react-redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import ResetPasswordForm from '../../../components/common/ResetPasswordForm'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getCurrentUser, Store } from '../../../store/rootReducer'; import Tokens from './Tokens'; diff --git a/server/sonar-web/src/main/js/apps/account/components/Tokens.tsx b/server/sonar-web/src/main/js/apps/account/components/Tokens.tsx index d235dd1bad0..24132821d10 100644 --- a/server/sonar-web/src/main/js/apps/account/components/Tokens.tsx +++ b/server/sonar-web/src/main/js/apps/account/components/Tokens.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import InstanceMessage from '../../../components/common/InstanceMessage'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import TokensForm from '../../users/components/TokensForm'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/account/components/__tests__/Account-test.tsx b/server/sonar-web/src/main/js/apps/account/components/__tests__/Account-test.tsx index a02ff8325e3..600e95053fa 100644 --- a/server/sonar-web/src/main/js/apps/account/components/__tests__/Account-test.tsx +++ b/server/sonar-web/src/main/js/apps/account/components/__tests__/Account-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; import { mockCurrentUser } from '../../../../helpers/testMocks'; +import handleRequiredAuthentication from '../../../../sonar-ui-common/helpers/handleRequiredAuthentication'; import { Account } from '../Account'; -jest.mock('sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ default: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/account/notifications/GlobalNotifications.tsx b/server/sonar-web/src/main/js/apps/account/notifications/GlobalNotifications.tsx index 736ec258885..6f1dec2f624 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/GlobalNotifications.tsx +++ b/server/sonar-web/src/main/js/apps/account/notifications/GlobalNotifications.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { isSonarCloud } from '../../../helpers/system'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import NotificationsList from './NotificationsList'; import SonarCloudNotifications from './SonarCloudNotifications'; diff --git a/server/sonar-web/src/main/js/apps/account/notifications/Notifications.tsx b/server/sonar-web/src/main/js/apps/account/notifications/Notifications.tsx index 65d37a03ad6..88983c7c261 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/Notifications.tsx +++ b/server/sonar-web/src/main/js/apps/account/notifications/Notifications.tsx @@ -20,13 +20,13 @@ import { partition } from 'lodash'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { withNotifications, WithNotificationsProps } from '../../../components/hoc/withNotifications'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import GlobalNotifications from './GlobalNotifications'; import Projects from './Projects'; diff --git a/server/sonar-web/src/main/js/apps/account/notifications/NotificationsList.tsx b/server/sonar-web/src/main/js/apps/account/notifications/NotificationsList.tsx index 34c6e0456bc..cd91caeb8aa 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/NotificationsList.tsx +++ b/server/sonar-web/src/main/js/apps/account/notifications/NotificationsList.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import { hasMessage, translate } from 'sonar-ui-common/helpers/l10n'; +import Checkbox from '../../../sonar-ui-common/components/controls/Checkbox'; +import { hasMessage, translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onAdd: (n: T.Notification) => void; diff --git a/server/sonar-web/src/main/js/apps/account/notifications/ProjectModal.tsx b/server/sonar-web/src/main/js/apps/account/notifications/ProjectModal.tsx index 586d02c4434..f917be101ea 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/ProjectModal.tsx +++ b/server/sonar-web/src/main/js/apps/account/notifications/ProjectModal.tsx @@ -20,12 +20,15 @@ import * as classNames from 'classnames'; import { debounce } from 'lodash'; import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getSuggestions } from '../../../api/components'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { addedProjects: T.NotificationProject[]; diff --git a/server/sonar-web/src/main/js/apps/account/notifications/ProjectNotifications.tsx b/server/sonar-web/src/main/js/apps/account/notifications/ProjectNotifications.tsx index 0e900a76e2d..688a6555f5b 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/ProjectNotifications.tsx +++ b/server/sonar-web/src/main/js/apps/account/notifications/ProjectNotifications.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BoxedGroupAccordion from 'sonar-ui-common/components/controls/BoxedGroupAccordion'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import BoxedGroupAccordion from '../../../sonar-ui-common/components/controls/BoxedGroupAccordion'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import NotificationsList from './NotificationsList'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/account/notifications/Projects.tsx b/server/sonar-web/src/main/js/apps/account/notifications/Projects.tsx index 4bc331a7117..91317b068e9 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/Projects.tsx +++ b/server/sonar-web/src/main/js/apps/account/notifications/Projects.tsx @@ -19,9 +19,9 @@ */ import { groupBy, sortBy, uniqBy } from 'lodash'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import ProjectModal from './ProjectModal'; import ProjectNotifications from './ProjectNotifications'; diff --git a/server/sonar-web/src/main/js/apps/account/notifications/SonarCloudNotifications.tsx b/server/sonar-web/src/main/js/apps/account/notifications/SonarCloudNotifications.tsx index fcf50025403..bf1b4f084b5 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/SonarCloudNotifications.tsx +++ b/server/sonar-web/src/main/js/apps/account/notifications/SonarCloudNotifications.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Checkbox from '../../../sonar-ui-common/components/controls/Checkbox'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getCurrentUserSetting, Store } from '../../../store/rootReducer'; import { setCurrentUserSetting } from '../../../store/users'; diff --git a/server/sonar-web/src/main/js/apps/account/notifications/__tests__/NotificationsList-test.tsx b/server/sonar-web/src/main/js/apps/account/notifications/__tests__/NotificationsList-test.tsx index 315f5478c20..96487394db7 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/__tests__/NotificationsList-test.tsx +++ b/server/sonar-web/src/main/js/apps/account/notifications/__tests__/NotificationsList-test.tsx @@ -19,12 +19,12 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import { hasMessage } from 'sonar-ui-common/helpers/l10n'; +import Checkbox from '../../../../sonar-ui-common/components/controls/Checkbox'; +import { hasMessage } from '../../../../sonar-ui-common/helpers/l10n'; import NotificationsList from '../NotificationsList'; -jest.mock('sonar-ui-common/helpers/l10n', () => ({ - ...jest.requireActual('sonar-ui-common/helpers/l10n'), +jest.mock('../../../../sonar-ui-common/helpers/l10n', () => ({ + ...jest.requireActual('../../../../sonar-ui-common/helpers/l10n'), hasMessage: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/account/notifications/__tests__/ProjectModal-test.tsx b/server/sonar-web/src/main/js/apps/account/notifications/__tests__/ProjectModal-test.tsx index aa290307e12..b67434ebe87 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/__tests__/ProjectModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/account/notifications/__tests__/ProjectModal-test.tsx @@ -19,8 +19,13 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, elementKeydown, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getSuggestions } from '../../../../api/components'; +import { + change, + elementKeydown, + submit, + waitAndUpdate +} from '../../../../sonar-ui-common/helpers/testUtils'; import ProjectModal from '../ProjectModal'; jest.mock('../../../../api/components', () => ({ diff --git a/server/sonar-web/src/main/js/apps/account/notifications/__tests__/Projects-test.tsx b/server/sonar-web/src/main/js/apps/account/notifications/__tests__/Projects-test.tsx index e87b0a2ca8e..03f125ca9b1 100644 --- a/server/sonar-web/src/main/js/apps/account/notifications/__tests__/Projects-test.tsx +++ b/server/sonar-web/src/main/js/apps/account/notifications/__tests__/Projects-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import Projects from '../Projects'; jest.mock('../../../../api/components', () => ({ diff --git a/server/sonar-web/src/main/js/apps/account/profile/Profile.tsx b/server/sonar-web/src/main/js/apps/account/profile/Profile.tsx index 1e673ee9da0..36427183199 100644 --- a/server/sonar-web/src/main/js/apps/account/profile/Profile.tsx +++ b/server/sonar-web/src/main/js/apps/account/profile/Profile.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { whenLoggedIn } from '../../../components/hoc/whenLoggedIn'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import UserExternalIdentity from './UserExternalIdentity'; export interface ProfileProps { diff --git a/server/sonar-web/src/main/js/apps/account/profile/UserExternalIdentity.tsx b/server/sonar-web/src/main/js/apps/account/profile/UserExternalIdentity.tsx index b9d80ec5142..516b2b8c04a 100644 --- a/server/sonar-web/src/main/js/apps/account/profile/UserExternalIdentity.tsx +++ b/server/sonar-web/src/main/js/apps/account/profile/UserExternalIdentity.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { getTextColor } from 'sonar-ui-common/helpers/colors'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; import { getIdentityProviders } from '../../../api/users'; import { colors } from '../../../app/theme'; +import { getTextColor } from '../../../sonar-ui-common/helpers/colors'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; export interface UserExternalIdentityProps { user: T.LoggedInUser; diff --git a/server/sonar-web/src/main/js/apps/account/profile/__tests__/UserExternalIdentity-test.tsx b/server/sonar-web/src/main/js/apps/account/profile/__tests__/UserExternalIdentity-test.tsx index 7c399dddeb7..92656791ea0 100644 --- a/server/sonar-web/src/main/js/apps/account/profile/__tests__/UserExternalIdentity-test.tsx +++ b/server/sonar-web/src/main/js/apps/account/profile/__tests__/UserExternalIdentity-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockLoggedInUser } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import UserExternalIdentity, { UserExternalIdentityProps } from '../UserExternalIdentity'; jest.mock('../../../../api/users', () => ({ diff --git a/server/sonar-web/src/main/js/apps/account/projects/ProjectCard.tsx b/server/sonar-web/src/main/js/apps/account/projects/ProjectCard.tsx index 9312fc81877..2fda699e227 100644 --- a/server/sonar-web/src/main/js/apps/account/projects/ProjectCard.tsx +++ b/server/sonar-web/src/main/js/apps/account/projects/ProjectCard.tsx @@ -19,13 +19,13 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import Level from 'sonar-ui-common/components/ui/Level'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import MetaLink from '../../../app/components/nav/component/projectInformation/meta/MetaLink'; import { orderLinks } from '../../../helpers/projectLinks'; import { getProjectUrl } from '../../../helpers/urls'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import Level from '../../../sonar-ui-common/components/ui/Level'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { project: T.MyProject; diff --git a/server/sonar-web/src/main/js/apps/account/projects/Projects.tsx b/server/sonar-web/src/main/js/apps/account/projects/Projects.tsx index 8104dfe641b..e60e529188c 100644 --- a/server/sonar-web/src/main/js/apps/account/projects/Projects.tsx +++ b/server/sonar-web/src/main/js/apps/account/projects/Projects.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import ProjectCard from './ProjectCard'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/account/projects/ProjectsContainer.tsx b/server/sonar-web/src/main/js/apps/account/projects/ProjectsContainer.tsx index 2ddc91c1293..dd3e5d4d270 100644 --- a/server/sonar-web/src/main/js/apps/account/projects/ProjectsContainer.tsx +++ b/server/sonar-web/src/main/js/apps/account/projects/ProjectsContainer.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getMyProjects } from '../../../api/components'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Projects from './Projects'; interface State { diff --git a/server/sonar-web/src/main/js/apps/account/projects/__tests__/Projects-test.tsx b/server/sonar-web/src/main/js/apps/account/projects/__tests__/Projects-test.tsx index 21a17968b9e..246673515dc 100644 --- a/server/sonar-web/src/main/js/apps/account/projects/__tests__/Projects-test.tsx +++ b/server/sonar-web/src/main/js/apps/account/projects/__tests__/Projects-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; +import ListFooter from '../../../../sonar-ui-common/components/controls/ListFooter'; import ProjectCard from '../ProjectCard'; import Projects from '../Projects'; diff --git a/server/sonar-web/src/main/js/apps/account/routes.ts b/server/sonar-web/src/main/js/apps/account/routes.ts index aa82d990f94..6c850464b22 100644 --- a/server/sonar-web/src/main/js/apps/account/routes.ts +++ b/server/sonar-web/src/main/js/apps/account/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/application-console/ApplicationBranches.tsx b/server/sonar-web/src/main/js/apps/application-console/ApplicationBranches.tsx index 317505e466d..f447f649b1e 100644 --- a/server/sonar-web/src/main/js/apps/application-console/ApplicationBranches.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/ApplicationBranches.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { Application } from '../../types/application'; import ApplicationProjectBranch from './ApplicationProjectBranch'; import CreateBranchForm from './CreateBranchForm'; diff --git a/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleApp.tsx b/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleApp.tsx index d089107e86c..dc908a24db6 100644 --- a/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleApp.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleApp.tsx @@ -20,9 +20,9 @@ import { Location } from 'history'; import * as React from 'react'; import { InjectedRouter } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { editApplication, getApplicationDetails, refreshApplication } from '../../api/application'; import addGlobalSuccessMessage from '../../app/utils/addGlobalSuccessMessage'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { Application, ApplicationProject } from '../../types/application'; import ApplicationConsoleAppRenderer from './ApplicationConsoleAppRenderer'; import { ApplicationBranch } from './utils'; diff --git a/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleAppRenderer.tsx b/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleAppRenderer.tsx index e5465cbc439..4b3319244d8 100644 --- a/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleAppRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/ApplicationConsoleAppRenderer.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { Application, ApplicationProject } from '../../types/application'; import { Branch } from '../../types/branch-like'; import ApplicationBranches from './ApplicationBranches'; diff --git a/server/sonar-web/src/main/js/apps/application-console/ApplicationProjectBranch.tsx b/server/sonar-web/src/main/js/apps/application-console/ApplicationProjectBranch.tsx index 065d3d02e45..bfc6edb8c39 100644 --- a/server/sonar-web/src/main/js/apps/application-console/ApplicationProjectBranch.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/ApplicationProjectBranch.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BranchIcon from 'sonar-ui-common/components/icons/BranchIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import BranchIcon from '../../sonar-ui-common/components/icons/BranchIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { Application } from '../../types/application'; import BranchRowActions from './BranchRowActions'; import { ApplicationBranch } from './utils'; diff --git a/server/sonar-web/src/main/js/apps/application-console/ApplicationProjects.tsx b/server/sonar-web/src/main/js/apps/application-console/ApplicationProjects.tsx index d9f3d409174..ed48c688cea 100644 --- a/server/sonar-web/src/main/js/apps/application-console/ApplicationProjects.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/ApplicationProjects.tsx @@ -19,16 +19,16 @@ */ import { find, without } from 'lodash'; import * as React from 'react'; -import SelectList, { - SelectListFilter, - SelectListSearchParams -} from 'sonar-ui-common/components/controls/SelectList'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; import { addProjectToApplication, getApplicationProjects, removeProjectFromApplication } from '../../api/application'; +import SelectList, { + SelectListFilter, + SelectListSearchParams +} from '../../sonar-ui-common/components/controls/SelectList'; +import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon'; import { Application, ApplicationProject } from '../../types/application'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/application-console/BranchRowActions.tsx b/server/sonar-web/src/main/js/apps/application-console/BranchRowActions.tsx index 8cd2141eac1..884c8010db5 100644 --- a/server/sonar-web/src/main/js/apps/application-console/BranchRowActions.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/BranchRowActions.tsx @@ -19,12 +19,12 @@ */ import { without } from 'lodash'; import * as React from 'react'; +import { deleteApplicationBranch } from '../../api/application'; import ActionsDropdown, { ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { deleteApplicationBranch } from '../../api/application'; +} from '../../sonar-ui-common/components/controls/ActionsDropdown'; +import ConfirmButton from '../../sonar-ui-common/components/controls/ConfirmButton'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import { Application } from '../../types/application'; import CreateBranchForm from './CreateBranchForm'; import { ApplicationBranch } from './utils'; diff --git a/server/sonar-web/src/main/js/apps/application-console/BranchSelectItem.tsx b/server/sonar-web/src/main/js/apps/application-console/BranchSelectItem.tsx index 80433c8d834..0f133fe0d91 100644 --- a/server/sonar-web/src/main/js/apps/application-console/BranchSelectItem.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/BranchSelectItem.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import BranchIcon from 'sonar-ui-common/components/icons/BranchIcon'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import BranchIcon from '../../sonar-ui-common/components/icons/BranchIcon'; export interface Option { label: string; diff --git a/server/sonar-web/src/main/js/apps/application-console/CreateBranchForm.tsx b/server/sonar-web/src/main/js/apps/application-console/CreateBranchForm.tsx index c040d48a798..17ccbc37106 100644 --- a/server/sonar-web/src/main/js/apps/application-console/CreateBranchForm.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/CreateBranchForm.tsx @@ -19,17 +19,17 @@ */ import { some, without } from 'lodash'; import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { addApplicationBranch, getApplicationDetails, updateApplicationBranch } from '../../api/application'; +import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import SimpleModal from '../../sonar-ui-common/components/controls/SimpleModal'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import MandatoryFieldMarker from '../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { Application, ApplicationProject } from '../../types/application'; import ProjectBranchRow from './ProjectBranchRow'; import { ApplicationBranch, SelectBranchOption } from './utils'; diff --git a/server/sonar-web/src/main/js/apps/application-console/EditForm.tsx b/server/sonar-web/src/main/js/apps/application-console/EditForm.tsx index e056c357b96..6634ed80a3a 100644 --- a/server/sonar-web/src/main/js/apps/application-console/EditForm.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/EditForm.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import SimpleModal from '../../sonar-ui-common/components/controls/SimpleModal'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { Application } from '../../types/application'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/application-console/ProjectBranchRow.tsx b/server/sonar-web/src/main/js/apps/application-console/ProjectBranchRow.tsx index 169519df6ed..9ac6938b6f9 100644 --- a/server/sonar-web/src/main/js/apps/application-console/ProjectBranchRow.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/ProjectBranchRow.tsx @@ -19,12 +19,12 @@ */ import { orderBy } from 'lodash'; import * as React from 'react'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import Select from 'sonar-ui-common/components/controls/Select'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; import { getBranches } from '../../api/branches'; +import Checkbox from '../../sonar-ui-common/components/controls/Checkbox'; +import Select from '../../sonar-ui-common/components/controls/Select'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; import { ApplicationProject } from '../../types/application'; import BranchSelectItem from './BranchSelectItem'; import { ApplicationBranch, SelectBranchOption } from './utils'; diff --git a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleApp-test.tsx b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleApp-test.tsx index 0a61bbe5782..67ad87d2417 100644 --- a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleApp-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { editApplication, getApplicationDetails, @@ -28,6 +27,7 @@ import { import addGlobalSuccessMessage from '../../../app/utils/addGlobalSuccessMessage'; import { mockApplication, mockApplicationProject } from '../../../helpers/mocks/application'; import { mockLocation, mockRouter } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { Application } from '../../../types/application'; import ApplicationConsoleApp from '../ApplicationConsoleApp'; diff --git a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleRender-test.tsx b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleRender-test.tsx index ac56e40f161..1e0fa1c2290 100644 --- a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleRender-test.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationConsoleRender-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockApplication } from '../../../helpers/mocks/application'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import ApplicationConsoleAppRenderer, { ApplicationConsoleAppRendererProps } from '../ApplicationConsoleAppRenderer'; diff --git a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationProjects-test.tsx b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationProjects-test.tsx index b8360e07d66..5832ae841a5 100644 --- a/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationProjects-test.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/__tests__/ApplicationProjects-test.tsx @@ -19,14 +19,16 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import SelectList, { SelectListFilter } from 'sonar-ui-common/components/controls/SelectList'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { addProjectToApplication, getApplicationProjects, removeProjectFromApplication } from '../../../api/application'; import { mockApplication } from '../../../helpers/mocks/application'; +import SelectList, { + SelectListFilter +} from '../../../sonar-ui-common/components/controls/SelectList'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import ApplicationProjects from '../ApplicationProjects'; jest.mock('../../../api/application', () => ({ diff --git a/server/sonar-web/src/main/js/apps/application-console/__tests__/CreateBranchForm-test.tsx b/server/sonar-web/src/main/js/apps/application-console/__tests__/CreateBranchForm-test.tsx index 94216ad3749..a2ca0af6200 100644 --- a/server/sonar-web/src/main/js/apps/application-console/__tests__/CreateBranchForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/__tests__/CreateBranchForm-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getApplicationDetails } from '../../../api/application'; import { mockApplication, mockApplicationProject } from '../../../helpers/mocks/application'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { Application } from '../../../types/application'; import CreateBranchForm from '../CreateBranchForm'; diff --git a/server/sonar-web/src/main/js/apps/application-console/__tests__/EditForm-test.tsx b/server/sonar-web/src/main/js/apps/application-console/__tests__/EditForm-test.tsx index 1e60305639d..bcf6128fd31 100644 --- a/server/sonar-web/src/main/js/apps/application-console/__tests__/EditForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/application-console/__tests__/EditForm-test.tsx @@ -20,9 +20,9 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { change, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockApplication } from '../../../helpers/mocks/application'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import { change, waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import EditForm from '../EditForm'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/application-console/routes.ts b/server/sonar-web/src/main/js/apps/application-console/routes.ts index 777305dccf4..7b34efc7ca0 100644 --- a/server/sonar-web/src/main/js/apps/application-console/routes.ts +++ b/server/sonar-web/src/main/js/apps/application-console/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/application-settings/ApplicationSettingsApp.tsx b/server/sonar-web/src/main/js/apps/application-settings/ApplicationSettingsApp.tsx index 1bef269e394..dffd53076ed 100644 --- a/server/sonar-web/src/main/js/apps/application-settings/ApplicationSettingsApp.tsx +++ b/server/sonar-web/src/main/js/apps/application-settings/ApplicationSettingsApp.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getDefinitions, getValues, setSimpleSettingValue } from '../../api/settings'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { SettingCategoryDefinition, SettingsKey } from '../../types/settings'; import ReportFrequencyForm from './ReportFrequencyForm'; diff --git a/server/sonar-web/src/main/js/apps/application-settings/ReportFrequencyForm.tsx b/server/sonar-web/src/main/js/apps/application-settings/ReportFrequencyForm.tsx index 2d8790133a9..953875aee35 100644 --- a/server/sonar-web/src/main/js/apps/application-settings/ReportFrequencyForm.tsx +++ b/server/sonar-web/src/main/js/apps/application-settings/ReportFrequencyForm.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button, ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { sanitizeStringRestricted } from '../../helpers/sanitize'; +import { Button, ResetButtonLink } from '../../sonar-ui-common/components/controls/buttons'; +import Select from '../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { SettingCategoryDefinition } from '../../types/settings'; export interface ReportFrequencyFormProps { diff --git a/server/sonar-web/src/main/js/apps/application-settings/__tests__/ApplicationSettingsApp-test.tsx b/server/sonar-web/src/main/js/apps/application-settings/__tests__/ApplicationSettingsApp-test.tsx index a2e8c06391c..8e1bee7ec4a 100644 --- a/server/sonar-web/src/main/js/apps/application-settings/__tests__/ApplicationSettingsApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/application-settings/__tests__/ApplicationSettingsApp-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { setSimpleSettingValue } from '../../../api/settings'; import { mockComponent } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { SettingsKey } from '../../../types/settings'; import ApplicationSettingsApp from '../ApplicationSettingsApp'; diff --git a/server/sonar-web/src/main/js/apps/application-settings/__tests__/ReportFrequencyForm-test.tsx b/server/sonar-web/src/main/js/apps/application-settings/__tests__/ReportFrequencyForm-test.tsx index b7a8b0cb9d5..ed43a300e8c 100644 --- a/server/sonar-web/src/main/js/apps/application-settings/__tests__/ReportFrequencyForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/application-settings/__tests__/ReportFrequencyForm-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Button, ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Select from 'sonar-ui-common/components/controls/Select'; import { mockDefinition } from '../../../helpers/mocks/settings'; +import { Button, ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Select from '../../../sonar-ui-common/components/controls/Select'; import ReportFrequencyForm, { ReportFrequencyFormProps } from '../ReportFrequencyForm'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/application-settings/routes.ts b/server/sonar-web/src/main/js/apps/application-settings/routes.ts index 18822c1779c..59093a32169 100644 --- a/server/sonar-web/src/main/js/apps/application-settings/routes.ts +++ b/server/sonar-web/src/main/js/apps/application-settings/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/audit-logs/components/AuditAppRenderer.tsx b/server/sonar-web/src/main/js/apps/audit-logs/components/AuditAppRenderer.tsx index 599d7a207a2..a3afed7887d 100644 --- a/server/sonar-web/src/main/js/apps/audit-logs/components/AuditAppRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/audit-logs/components/AuditAppRenderer.tsx @@ -22,10 +22,10 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; import DateRangeInput from '../../../components/controls/DateRangeInput'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import '../style.css'; import { HousekeepingPolicy, now, RangeOption } from '../utils'; import DownloadButton from './DownloadButton'; diff --git a/server/sonar-web/src/main/js/apps/audit-logs/components/DownloadButton.tsx b/server/sonar-web/src/main/js/apps/audit-logs/components/DownloadButton.tsx index 0a61310a6d0..1e53ba65439 100644 --- a/server/sonar-web/src/main/js/apps/audit-logs/components/DownloadButton.tsx +++ b/server/sonar-web/src/main/js/apps/audit-logs/components/DownloadButton.tsx @@ -20,8 +20,8 @@ import * as classNames from 'classnames'; import { endOfDay, startOfDay, subDays } from 'date-fns'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getBaseUrl } from '../../../helpers/system'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import '../style.css'; import { now, RangeOption } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/audit-logs/components/__tests__/AuditApp-test.tsx b/server/sonar-web/src/main/js/apps/audit-logs/components/__tests__/AuditApp-test.tsx index 0c8e55241cb..ab66c6aba24 100644 --- a/server/sonar-web/src/main/js/apps/audit-logs/components/__tests__/AuditApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/audit-logs/components/__tests__/AuditApp-test.tsx @@ -20,7 +20,7 @@ import { subDays } from 'date-fns'; import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { HousekeepingPolicy, RangeOption } from '../../utils'; import { AuditApp } from '../AuditApp'; import AuditAppRenderer from '../AuditAppRenderer'; diff --git a/server/sonar-web/src/main/js/apps/audit-logs/routes.ts b/server/sonar-web/src/main/js/apps/audit-logs/routes.ts index ac15e95075b..31b4218a283 100644 --- a/server/sonar-web/src/main/js/apps/audit-logs/routes.ts +++ b/server/sonar-web/src/main/js/apps/audit-logs/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/__tests__/BackgroundTasks-test.tsx b/server/sonar-web/src/main/js/apps/background-tasks/__tests__/BackgroundTasks-test.tsx index a19a73472d3..3761e939f64 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/__tests__/BackgroundTasks-test.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/__tests__/BackgroundTasks-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import Search from '../components/Search'; import { DEFAULT_FILTERS } from '../constants'; import { formatDuration } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/BackgroundTasksApp.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/BackgroundTasksApp.tsx index 1f4fb93aea8..62e893f2e71 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/BackgroundTasksApp.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/BackgroundTasksApp.tsx @@ -20,9 +20,6 @@ import { debounce } from 'lodash'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import { toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { parseAsDate } from 'sonar-ui-common/helpers/query'; import { cancelAllTasks, cancelTask as cancelTaskAPI, @@ -32,6 +29,9 @@ import { } from '../../../api/ce'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; import { Location, Router } from '../../../components/hoc/withRouter'; +import { toShortNotSoISOString } from '../../../sonar-ui-common/helpers/dates'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { parseAsDate } from '../../../sonar-ui-common/helpers/query'; import { Task, TaskStatuses } from '../../../types/tasks'; import '../background-tasks.css'; import { CURRENTS, DEBOUNCE_DELAY, DEFAULT_FILTERS } from '../constants'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/CurrentsFilter.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/CurrentsFilter.tsx index df816e15d08..84ff9609ce3 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/CurrentsFilter.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/CurrentsFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Checkbox from '../../../sonar-ui-common/components/controls/Checkbox'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { CURRENTS } from '../constants'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Footer.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/Footer.tsx index 96b788f43fd..bbda3058eae 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/Footer.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Footer.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Task } from '../../../types/tasks'; const LIMIT = 1000; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx index 337eb727155..ae270f0866a 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Workers from './Workers'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/NoWorkersSupportPopup.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/NoWorkersSupportPopup.tsx index 8f6b72bd919..70232ce3c6e 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/NoWorkersSupportPopup.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/NoWorkersSupportPopup.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function NoWorkersSupportPopup() { return ( diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/ScannerContext.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/ScannerContext.tsx index a6abf017fe6..b814c439548 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/ScannerContext.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/ScannerContext.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getTask } from '../../../api/ce'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Task } from '../../../types/tasks'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Search.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/Search.tsx index f31d8d4c030..11e49e5296e 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/Search.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Search.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { DEFAULT_FILTERS } from '../constants'; import { Query } from '../utils'; import CurrentsFilter from './CurrentsFilter'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Stacktrace.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/Stacktrace.tsx index 5e1e79df2b3..7e5cbec6300 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/Stacktrace.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Stacktrace.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getTask } from '../../../api/ce'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Task } from '../../../types/tasks'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/StatPendingCount.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/StatPendingCount.tsx index d48edb6f4a7..fd9c216871c 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/StatPendingCount.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/StatPendingCount.tsx @@ -19,11 +19,11 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import { ClearButton } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { colors } from '../../../app/theme'; +import { ClearButton } from '../../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../../sonar-ui-common/components/controls/ConfirmButton'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getAppState, Store } from '../../../store/rootReducer'; export interface Props { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/StatPendingTime.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/StatPendingTime.tsx index e6242f7eb75..61022dbc0f2 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/StatPendingTime.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/StatPendingTime.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; // Do not display the pending time for values smaller than this threshold (in ms) const MIN_PENDING_TIME_THRESHOLD = 1000; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/StatStillFailing.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/StatStillFailing.tsx index ac7b1c3c773..d4c6d436345 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/StatStillFailing.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/StatStillFailing.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/StatusFilter.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/StatusFilter.tsx index 6ca0c8e3913..6d66537cbe2 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/StatusFilter.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/StatusFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { TaskStatuses } from '../../../types/tasks'; import { STATUSES } from '../constants'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskActions.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskActions.tsx index 755b1ff83f6..4e243a1ef63 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskActions.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskActions.tsx @@ -20,10 +20,10 @@ import * as React from 'react'; import ActionsDropdown, { ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +} from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import ConfirmModal from '../../../sonar-ui-common/components/controls/ConfirmModal'; +import { lazyLoadComponent } from '../../../sonar-ui-common/components/lazyLoadComponent'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Task, TaskStatuses } from '../../../types/tasks'; import ScannerContext from './ScannerContext'; import Stacktrace from './Stacktrace'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskComponent.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskComponent.tsx index 97acfd51d91..d61a048b5c3 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskComponent.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskComponent.tsx @@ -19,15 +19,15 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import BranchIcon from 'sonar-ui-common/components/icons/BranchIcon'; -import PullRequestIcon from 'sonar-ui-common/components/icons/PullRequestIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; import { getBranchUrl, getPortfolioUrl, getProjectUrl, getPullRequestUrl } from '../../../helpers/urls'; +import BranchIcon from '../../../sonar-ui-common/components/icons/BranchIcon'; +import PullRequestIcon from '../../../sonar-ui-common/components/icons/PullRequestIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; import { isPortfolioLike } from '../../../types/component'; import { Task } from '../../../types/tasks'; import TaskType from './TaskType'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDate.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDate.tsx index bb4753f2237..e717e76ddd3 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDate.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDate.tsx @@ -19,8 +19,8 @@ */ import * as differenceInDays from 'date-fns/difference_in_days'; import * as React from 'react'; -import TimeFormatter from 'sonar-ui-common/components/intl/TimeFormatter'; -import { isValidDate, parseDate } from 'sonar-ui-common/helpers/dates'; +import TimeFormatter from '../../../sonar-ui-common/components/intl/TimeFormatter'; +import { isValidDate, parseDate } from '../../../sonar-ui-common/helpers/dates'; interface Props { date?: string; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDay.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDay.tsx index 48fd0cc1710..ce2573709e0 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDay.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskDay.tsx @@ -19,8 +19,8 @@ */ import * as isSameDay from 'date-fns/is_same_day'; import * as React from 'react'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import DateFormatter from '../../../sonar-ui-common/components/intl/DateFormatter'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; interface Props { submittedAt: string; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskStatus.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskStatus.tsx index 9097231ae6c..bcf1a205df1 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskStatus.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskStatus.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import PendingIcon from 'sonar-ui-common/components/icons/PendingIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import PendingIcon from '../../../sonar-ui-common/components/icons/PendingIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { TaskStatuses } from '../../../types/tasks'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskSubmitter.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskSubmitter.tsx index 9e62f16f600..e0037630169 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskSubmitter.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskSubmitter.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { submitter?: string; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskType.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskType.tsx index a180bfd84b6..2c0cc058a04 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskType.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskType.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { type: string; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Tasks.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/Tasks.tsx index 62bb72ec3c0..19a08461d49 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/Tasks.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Tasks.tsx @@ -19,7 +19,7 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Task as ITask } from '../../../types/tasks'; import Task from './Task'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TypesFilter.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/TypesFilter.tsx index 05b77c9ac98..e810c07b6f2 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/TypesFilter.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TypesFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ALL_TYPES } from '../constants'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Workers.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/Workers.tsx index cf586076bd1..030bf9de172 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/Workers.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Workers.tsx @@ -18,14 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { EditButton } from 'sonar-ui-common/components/controls/buttons'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import AlertWarnIcon from 'sonar-ui-common/components/icons/AlertWarnIcon'; -import PlusCircleIcon from 'sonar-ui-common/components/icons/PlusCircleIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getWorkers } from '../../../api/ce'; import { colors } from '../../../app/theme'; +import { EditButton } from '../../../sonar-ui-common/components/controls/buttons'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import AlertWarnIcon from '../../../sonar-ui-common/components/icons/AlertWarnIcon'; +import PlusCircleIcon from '../../../sonar-ui-common/components/icons/PlusCircleIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import NoWorkersSupportPopup from './NoWorkersSupportPopup'; import WorkersForm from './WorkersForm'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/WorkersForm.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/WorkersForm.tsx index 1dc056b1c17..4a59103ab7a 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/WorkersForm.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/WorkersForm.tsx @@ -18,12 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { setWorkerCount } from '../../../api/ce'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; const MAX_WORKERS = 10; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/BackgroundTasksApp-test.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/BackgroundTasksApp-test.tsx index 4f8d00e23f2..658fdb34c7f 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/BackgroundTasksApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/BackgroundTasksApp-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import BackgroundTasksApp from '../BackgroundTasksApp'; jest.mock('../../../../api/ce', () => ({ diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/ScannerContext-test.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/ScannerContext-test.tsx index f2b1bedfd9b..f2bffffd391 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/ScannerContext-test.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/ScannerContext-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockTask } from '../../../../helpers/mocks/tasks'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { TaskTypes } from '../../../../types/tasks'; import ScannerContext from '../ScannerContext'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Stacktrace-test.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Stacktrace-test.tsx index c315330a509..89dc9bbe300 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Stacktrace-test.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Stacktrace-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockTask } from '../../../../helpers/mocks/tasks'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { TaskTypes } from '../../../../types/tasks'; import Stacktrace from '../Stacktrace'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/StatStillFailing-test.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/StatStillFailing-test.tsx index ce251ff5c71..5cb8a6c9325 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/StatStillFailing-test.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/StatStillFailing-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import StatStillFailing, { Props } from '../StatStillFailing'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/TaskActions-test.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/TaskActions-test.tsx index 45cb4400989..d2293f322fd 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/TaskActions-test.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/TaskActions-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockTask } from '../../../../helpers/mocks/tasks'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { Task, TaskStatuses } from '../../../../types/tasks'; import TaskActions from '../TaskActions'; diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Workers-test.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Workers-test.tsx index e4d54074aa4..c65e2ab12f5 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Workers-test.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/Workers-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import Workers from '../Workers'; it('renders', () => { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/WorkersForm-test.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/WorkersForm-test.tsx index 0023370e55a..fe7c50e9840 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/WorkersForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/background-tasks/components/__tests__/WorkersForm-test.tsx @@ -24,7 +24,7 @@ jest.mock('../../../../api/ce', () => ({ import { shallow } from 'enzyme'; import * as React from 'react'; -import { submit } from 'sonar-ui-common/helpers/testUtils'; +import { submit } from '../../../../sonar-ui-common/helpers/testUtils'; import WorkersForm from '../WorkersForm'; it('changes select', () => { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/routes.ts b/server/sonar-web/src/main/js/apps/background-tasks/routes.ts index 28549ac2be5..9a9a94bf5b8 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/routes.ts +++ b/server/sonar-web/src/main/js/apps/background-tasks/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/background-tasks/utils.ts b/server/sonar-web/src/main/js/apps/background-tasks/utils.ts index c1f230a6593..28a8cad3b12 100644 --- a/server/sonar-web/src/main/js/apps/background-tasks/utils.ts +++ b/server/sonar-web/src/main/js/apps/background-tasks/utils.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; +import { toShortNotSoISOString } from '../../sonar-ui-common/helpers/dates'; import { Task, TaskStatuses } from '../../types/tasks'; import { ALL_TYPES, CURRENTS, STATUSES } from './constants'; diff --git a/server/sonar-web/src/main/js/apps/change-admin-password/ChangeAdminPasswordAppRenderer.tsx b/server/sonar-web/src/main/js/apps/change-admin-password/ChangeAdminPasswordAppRenderer.tsx index cee0dce669e..ec231e77c85 100644 --- a/server/sonar-web/src/main/js/apps/change-admin-password/ChangeAdminPasswordAppRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/change-admin-password/ChangeAdminPasswordAppRenderer.tsx @@ -18,14 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getReturnUrl } from 'sonar-ui-common/helpers/urls'; import GlobalMessagesContainer from '../../app/components/GlobalMessagesContainer'; import { Location } from '../../components/hoc/withRouter'; +import { SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import MandatoryFieldMarker from '../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { getReturnUrl } from '../../sonar-ui-common/helpers/urls'; import Unauthorized from '../sessions/components/Unauthorized'; import { DEFAULT_ADMIN_PASSWORD } from './constants'; diff --git a/server/sonar-web/src/main/js/apps/change-admin-password/__tests__/ChangeAdminPasswordApp-test.tsx b/server/sonar-web/src/main/js/apps/change-admin-password/__tests__/ChangeAdminPasswordApp-test.tsx index efc3e980c75..ea55b97f72a 100644 --- a/server/sonar-web/src/main/js/apps/change-admin-password/__tests__/ChangeAdminPasswordApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/change-admin-password/__tests__/ChangeAdminPasswordApp-test.tsx @@ -20,9 +20,9 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { changePassword } from '../../../api/users'; import { mockLocation } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { getAppState, Store } from '../../../store/rootReducer'; import { ChangeAdminPasswordApp, mapStateToProps } from '../ChangeAdminPasswordApp'; import { DEFAULT_ADMIN_LOGIN, DEFAULT_ADMIN_PASSWORD } from '../constants'; diff --git a/server/sonar-web/src/main/js/apps/change-admin-password/__tests__/ChangeAdminPasswordAppRenderer-test.tsx b/server/sonar-web/src/main/js/apps/change-admin-password/__tests__/ChangeAdminPasswordAppRenderer-test.tsx index 4861353e498..399161ae2f4 100644 --- a/server/sonar-web/src/main/js/apps/change-admin-password/__tests__/ChangeAdminPasswordAppRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/change-admin-password/__tests__/ChangeAdminPasswordAppRenderer-test.tsx @@ -20,8 +20,8 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, submit } from 'sonar-ui-common/helpers/testUtils'; import { mockLocation } from '../../../helpers/testMocks'; +import { change, submit } from '../../../sonar-ui-common/helpers/testUtils'; import ChangeAdminPasswordAppRenderer, { ChangeAdminPasswordAppRendererProps } from '../ChangeAdminPasswordAppRenderer'; diff --git a/server/sonar-web/src/main/js/apps/code/components/AppCode.tsx b/server/sonar-web/src/main/js/apps/code/components/AppCode.tsx index 33d3f562810..36819b2f463 100644 --- a/server/sonar-web/src/main/js/apps/code/components/AppCode.tsx +++ b/server/sonar-web/src/main/js/apps/code/components/AppCode.tsx @@ -24,12 +24,12 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { connect } from 'react-redux'; import { InjectedRouter } from 'react-router'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; import { isPullRequest, isSameBranchLike } from '../../../helpers/branch-like'; import { getCodeUrl, getProjectUrl } from '../../../helpers/urls'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { fetchBranchStatus, fetchMetrics } from '../../../store/rootActions'; import { getMetrics } from '../../../store/rootReducer'; import { BranchLike } from '../../../types/branch-like'; diff --git a/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx b/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx index 4ba1e2fa925..3502c001f21 100644 --- a/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx +++ b/server/sonar-web/src/main/js/apps/code/components/ComponentName.tsx @@ -19,12 +19,12 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import BranchIcon from 'sonar-ui-common/components/icons/BranchIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { colors } from '../../../app/theme'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; import { getProjectUrl } from '../../../helpers/urls'; +import BranchIcon from '../../../sonar-ui-common/components/icons/BranchIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; export function getTooltip(component: T.ComponentMeasure) { diff --git a/server/sonar-web/src/main/js/apps/code/components/ComponentPin.tsx b/server/sonar-web/src/main/js/apps/code/components/ComponentPin.tsx index 0bbb9952c1d..12cce663d48 100644 --- a/server/sonar-web/src/main/js/apps/code/components/ComponentPin.tsx +++ b/server/sonar-web/src/main/js/apps/code/components/ComponentPin.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import PinIcon from 'sonar-ui-common/components/icons/PinIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { WorkspaceContextShape } from '../../../components/workspace/context'; +import PinIcon from '../../../sonar-ui-common/components/icons/PinIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/code/components/ComponentsEmpty.tsx b/server/sonar-web/src/main/js/apps/code/components/ComponentsEmpty.tsx index 87e0ab59651..d6350db5d3e 100644 --- a/server/sonar-web/src/main/js/apps/code/components/ComponentsEmpty.tsx +++ b/server/sonar-web/src/main/js/apps/code/components/ComponentsEmpty.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { canBePinned?: boolean; diff --git a/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx b/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx index 43f79d95feb..5811d4f9dce 100644 --- a/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx +++ b/server/sonar-web/src/main/js/apps/code/components/ComponentsHeader.tsx @@ -19,7 +19,7 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { baseComponent?: T.ComponentMeasure; diff --git a/server/sonar-web/src/main/js/apps/code/components/Search.tsx b/server/sonar-web/src/main/js/apps/code/components/Search.tsx index e9cee9b4ca7..c2c0ae74b4b 100644 --- a/server/sonar-web/src/main/js/apps/code/components/Search.tsx +++ b/server/sonar-web/src/main/js/apps/code/components/Search.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getTree } from '../../../api/components'; import { Location, Router, withRouter } from '../../../components/hoc/withRouter'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/code/components/SourceViewerWrapper.tsx b/server/sonar-web/src/main/js/apps/code/components/SourceViewerWrapper.tsx index 7eba7260030..159e3ae851b 100644 --- a/server/sonar-web/src/main/js/apps/code/components/SourceViewerWrapper.tsx +++ b/server/sonar-web/src/main/js/apps/code/components/SourceViewerWrapper.tsx @@ -19,9 +19,9 @@ */ import { Location } from 'history'; import * as React from 'react'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import withKeyboardNavigation from '../../../components/hoc/withKeyboardNavigation'; import SourceViewer from '../../../components/SourceViewer/SourceViewer'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import { BranchLike } from '../../../types/branch-like'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/code/components/__tests__/AppCode-test.tsx b/server/sonar-web/src/main/js/apps/code/components/__tests__/AppCode-test.tsx index 8db2522d690..25000ff7955 100644 --- a/server/sonar-web/src/main/js/apps/code/components/__tests__/AppCode-test.tsx +++ b/server/sonar-web/src/main/js/apps/code/components/__tests__/AppCode-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockPullRequest } from '../../../../helpers/mocks/branch-like'; import { mockComponent, @@ -27,6 +26,7 @@ import { mockIssue, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { ComponentQualifier } from '../../../../types/component'; import { loadMoreChildren, retrieveComponent } from '../../utils'; import { AppCode } from '../AppCode'; diff --git a/server/sonar-web/src/main/js/apps/code/routes.ts b/server/sonar-web/src/main/js/apps/code/routes.ts index 14681d9db0c..22ec4facb3d 100644 --- a/server/sonar-web/src/main/js/apps/code/routes.ts +++ b/server/sonar-web/src/main/js/apps/code/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationButton.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationButton.tsx index 3161bb40ab1..9bb7c49c2cd 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationButton.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationButton.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; import { Profile as BaseProfile } from '../../../api/quality-profiles'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; import ActivationFormModal from './ActivationFormModal'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx index 65d00e2a7c1..8c4abdf8c2b 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx @@ -19,15 +19,18 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { activateRule, Profile } from '../../../api/quality-profiles'; import SeverityHelper from '../../../components/shared/SeverityHelper'; import { SEVERITIES } from '../../../helpers/constants'; import { sanitizeString } from '../../../helpers/sanitize'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { sortProfiles } from '../../quality-profiles/utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationSeverityFacet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationSeverityFacet.tsx index 30208a046f9..e231f359e66 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationSeverityFacet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationSeverityFacet.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import SeverityHelper from '../../../components/shared/SeverityHelper'; import { SEVERITIES } from '../../../helpers/constants'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Facet, { BasicProps } from './Facet'; interface Props extends BasicProps { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx index dee0996689c..1093ec1076a 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/App.tsx @@ -23,17 +23,6 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { connect } from 'react-redux'; import { withRouter, WithRouterProps } from 'react-router'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import BackIcon from 'sonar-ui-common/components/icons/BackIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { - addSideBarClass, - addWhitePageClass, - removeSideBarClass, - removeWhitePageClass -} from 'sonar-ui-common/helpers/pages'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { Profile, searchQualityProfiles } from '../../../api/quality-profiles'; import { getRulesApp, searchRules } from '../../../api/rules'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; @@ -42,6 +31,17 @@ import FiltersHeader from '../../../components/common/FiltersHeader'; import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper'; import '../../../components/search-navigator.css'; import { isLoggedIn } from '../../../helpers/users'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import BackIcon from '../../../sonar-ui-common/components/icons/BackIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { + addSideBarClass, + addWhitePageClass, + removeSideBarClass, + removeWhitePageClass +} from '../../../sonar-ui-common/helpers/pages'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import { getCurrentUser, getLanguages, Store } from '../../../store/rootReducer'; import { SecurityStandard } from '../../../types/security'; import { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/AvailableSinceFacet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/AvailableSinceFacet.tsx index c1737bde427..9849df84334 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/AvailableSinceFacet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/AvailableSinceFacet.tsx @@ -19,11 +19,11 @@ */ import * as React from 'react'; import { InjectedIntlProps, injectIntl } from 'react-intl'; -import { longFormatterOption } from 'sonar-ui-common/components/intl/DateFormatter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import DateInput from '../../../components/controls/DateInput'; import FacetBox from '../../../components/facet/FacetBox'; import FacetHeader from '../../../components/facet/FacetHeader'; +import { longFormatterOption } from '../../../sonar-ui-common/components/intl/DateFormatter'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Query } from '../query'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChange.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChange.tsx index b367362dfa2..2b928e063e7 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChange.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChange.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Profile } from '../../../api/quality-profiles'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import Dropdown from '../../../sonar-ui-common/components/controls/Dropdown'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Query } from '../query'; import BulkChangeModal from './BulkChangeModal'; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChangeModal.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChangeModal.tsx index f3ad210a863..27a657d2910 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChangeModal.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/BulkChangeModal.tsx @@ -18,13 +18,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { bulkActivateRules, bulkDeactivateRules, Profile } from '../../../api/quality-profiles'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { Query, serializeQuery } from '../query'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/CustomRuleFormModal.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/CustomRuleFormModal.tsx index d21c7e83498..d525c9540bc 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/CustomRuleFormModal.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/CustomRuleFormModal.tsx @@ -18,21 +18,24 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { csvEscape } from 'sonar-ui-common/helpers/csv'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { latinize } from 'sonar-ui-common/helpers/strings'; import { createRule, updateRule } from '../../../api/rules'; import FormattingTips from '../../../components/common/FormattingTips'; import SeverityHelper from '../../../components/shared/SeverityHelper'; import TypeHelper from '../../../components/shared/TypeHelper'; import { RULE_STATUSES, RULE_TYPES, SEVERITIES } from '../../../helpers/constants'; import { sanitizeString } from '../../../helpers/sanitize'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { csvEscape } from '../../../sonar-ui-common/helpers/csv'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { latinize } from '../../../sonar-ui-common/helpers/strings'; interface Props { customRule?: T.RuleDetails; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/DefaultSeverityFacet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/DefaultSeverityFacet.tsx index 27d6f28c68b..1b42a4965c8 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/DefaultSeverityFacet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/DefaultSeverityFacet.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import SeverityHelper from '../../../components/shared/SeverityHelper'; import { SEVERITIES } from '../../../helpers/constants'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Facet, { BasicProps } from './Facet'; export default class DefaultSeverityFacet extends React.PureComponent<BasicProps> { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/Facet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/Facet.tsx index 1dc147669a9..373d2340bb7 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/Facet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/Facet.tsx @@ -20,13 +20,13 @@ import * as classNames from 'classnames'; import { orderBy, sortBy, without } from 'lodash'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import FacetBox from '../../../components/facet/FacetBox'; import FacetHeader from '../../../components/facet/FacetHeader'; import FacetItem from '../../../components/facet/FacetItem'; import FacetItemsList from '../../../components/facet/FacetItemsList'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { FacetKey } from '../query'; export interface BasicProps { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/InheritanceFacet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/InheritanceFacet.tsx index 64d8a7f0678..658e5d848a0 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/InheritanceFacet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/InheritanceFacet.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Facet, { BasicProps } from './Facet'; interface Props extends T.Omit<BasicProps, 'values'> { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/LanguageFacet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/LanguageFacet.tsx index ca4ef683988..c70d39ea969 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/LanguageFacet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/LanguageFacet.tsx @@ -20,9 +20,9 @@ import { uniqBy } from 'lodash'; import * as React from 'react'; import { connect } from 'react-redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { highlightTerm } from 'sonar-ui-common/helpers/search'; import ListStyleFacet from '../../../components/facet/ListStyleFacet'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { highlightTerm } from '../../../sonar-ui-common/helpers/search'; import { getLanguages, Store } from '../../../store/rootReducer'; import { BasicProps } from './Facet'; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/PageActions.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/PageActions.tsx index c8b1ce624c0..2f5cc731770 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/PageActions.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/PageActions.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ReloadButton from 'sonar-ui-common/components/controls/ReloadButton'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import PageCounter from '../../../components/common/PageCounter'; import PageShortcutsTooltip from '../../../components/ui/PageShortcutsTooltip'; +import ReloadButton from '../../../sonar-ui-common/components/controls/ReloadButton'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface PageActionsProps { loading: boolean; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/ProfileFacet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/ProfileFacet.tsx index 90e09ef1bc2..8892cd80498 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/ProfileFacet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/ProfileFacet.tsx @@ -20,13 +20,13 @@ import * as classNames from 'classnames'; import { sortBy } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Profile } from '../../../api/quality-profiles'; import DocumentationTooltip from '../../../components/common/DocumentationTooltip'; import FacetBox from '../../../components/facet/FacetBox'; import FacetHeader from '../../../components/facet/FacetHeader'; import FacetItem from '../../../components/facet/FacetItem'; import FacetItemsList from '../../../components/facet/FacetItemsList'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { FacetKey, Query } from '../query'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RemoveExtendedDescriptionModal.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RemoveExtendedDescriptionModal.tsx index 464e940c741..7781deeea9c 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RemoveExtendedDescriptionModal.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RemoveExtendedDescriptionModal.tsx @@ -18,9 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onCancel: () => void; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetails.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetails.tsx index 5df135c7e92..2e73236dd8e 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetails.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetails.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { Profile } from '../../../api/quality-profiles'; import { deleteRule, getRuleDetails, updateRule } from '../../../api/rules'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../../sonar-ui-common/components/controls/ConfirmButton'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Activation, Query } from '../query'; import CustomRuleButton from './CustomRuleButton'; import RuleDetailsCustomRules from './RuleDetailsCustomRules'; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsCustomRules.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsCustomRules.tsx index a17456d3894..353d58206b7 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsCustomRules.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsCustomRules.tsx @@ -20,13 +20,13 @@ import { sortBy } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { deleteRule, searchRules } from '../../../api/rules'; import SeverityHelper from '../../../components/shared/SeverityHelper'; import { getRuleUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../../sonar-ui-common/components/controls/ConfirmButton'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import CustomRuleButton from './CustomRuleButton'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsDescription.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsDescription.tsx index d89059fa468..30b6259edd8 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsDescription.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsDescription.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button, ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { updateRule } from '../../../api/rules'; import FormattingTips from '../../../components/common/FormattingTips'; import { sanitizeString } from '../../../helpers/sanitize'; +import { Button, ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import RemoveExtendedDescriptionModal from './RemoveExtendedDescriptionModal'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsIssues.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsIssues.tsx index f76ed5bd710..391a5f98ebb 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsIssues.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsIssues.tsx @@ -19,13 +19,13 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getFacet } from '../../../api/issues'; import { withAppState } from '../../../components/hoc/withAppState'; import { getIssuesUrl } from '../../../helpers/urls'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; interface Props { appState: Pick<T.AppState, 'branchesEnabled'>; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx index 48c85dbd966..15a278f7d77 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsMeta.tsx @@ -19,18 +19,18 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import LinkIcon from 'sonar-ui-common/components/icons/LinkIcon'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import SeverityHelper from '../../../components/shared/SeverityHelper'; import TagsList from '../../../components/tags/TagsList'; import { getRuleUrl } from '../../../helpers/urls'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Dropdown from '../../../sonar-ui-common/components/controls/Dropdown'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import LinkIcon from '../../../sonar-ui-common/components/icons/LinkIcon'; +import DateFormatter from '../../../sonar-ui-common/components/intl/DateFormatter'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Query } from '../query'; import RuleDetailsTagsPopup from './RuleDetailsTagsPopup'; import SimilarRulesFilter from './SimilarRulesFilter'; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsParameters.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsParameters.tsx index 91cf2b95cd4..92550c4fe7f 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsParameters.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsParameters.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { sanitizeString } from '../../../helpers/sanitize'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { params: T.RuleParameter[]; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx index d8332cec996..efc76ea8022 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx @@ -20,14 +20,14 @@ import { filter } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { activateRule, deactivateRule, Profile } from '../../../api/quality-profiles'; import InstanceMessage from '../../../components/common/InstanceMessage'; import SeverityHelper from '../../../components/shared/SeverityHelper'; import { getQualityProfileUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../../sonar-ui-common/components/controls/ConfirmButton'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import BuiltInQualityProfileBadge from '../../quality-profiles/components/BuiltInQualityProfileBadge'; import ActivationButton from './ActivationButton'; import RuleInheritanceIcon from './RuleInheritanceIcon'; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx index 7cfad2ffe36..84eb004c731 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleListItem.tsx @@ -20,15 +20,15 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import SeverityIcon from 'sonar-ui-common/components/icons/SeverityIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { deactivateRule, Profile } from '../../../api/quality-profiles'; import TagsList from '../../../components/tags/TagsList'; import { getRuleUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../../sonar-ui-common/components/controls/ConfirmButton'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import SeverityIcon from '../../../sonar-ui-common/components/icons/SeverityIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Activation, Query } from '../query'; import ActivationButton from './ActivationButton'; import RuleInheritanceIcon from './RuleInheritanceIcon'; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/SimilarRulesFilter.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/SimilarRulesFilter.tsx index da9b2c2a7a5..7ea00019d85 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/SimilarRulesFilter.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/SimilarRulesFilter.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import FilterIcon from 'sonar-ui-common/components/icons/FilterIcon'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import TagsIcon from 'sonar-ui-common/components/icons/TagsIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import SeverityHelper from '../../../components/shared/SeverityHelper'; +import Dropdown from '../../../sonar-ui-common/components/controls/Dropdown'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import FilterIcon from '../../../sonar-ui-common/components/icons/FilterIcon'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import TagsIcon from '../../../sonar-ui-common/components/icons/TagsIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Query } from '../query'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/StatusFacet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/StatusFacet.tsx index 288b62d3149..925b1388ada 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/StatusFacet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/StatusFacet.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { RULE_STATUSES } from '../../../helpers/constants'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Facet, { BasicProps } from './Facet'; export default class StatusFacet extends React.PureComponent<BasicProps> { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/TagFacet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/TagFacet.tsx index 9cee5794503..4bcf519f029 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/TagFacet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/TagFacet.tsx @@ -19,12 +19,12 @@ */ import { uniq } from 'lodash'; import * as React from 'react'; -import TagsIcon from 'sonar-ui-common/components/icons/TagsIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { highlightTerm } from 'sonar-ui-common/helpers/search'; import { getRuleTags } from '../../../api/rules'; import { colors } from '../../../app/theme'; import ListStyleFacet from '../../../components/facet/ListStyleFacet'; +import TagsIcon from '../../../sonar-ui-common/components/icons/TagsIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { highlightTerm } from '../../../sonar-ui-common/helpers/search'; import { BasicProps } from './Facet'; export default class TagFacet extends React.PureComponent<BasicProps> { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/TemplateFacet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/TemplateFacet.tsx index cdbe845b6bc..49921d9d0cb 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/TemplateFacet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/TemplateFacet.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Facet, { BasicProps } from './Facet'; interface Props extends T.Omit<BasicProps, 'onChange' | 'values'> { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/TypeFacet.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/TypeFacet.tsx index 802a1237ca9..e273e25e4c5 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/TypeFacet.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/TypeFacet.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Facet, { BasicProps } from './Facet'; export default class TypeFacet extends React.PureComponent<BasicProps> { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/App-test.tsx index bfb683be6a7..b39bc080690 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/App-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getRulesApp } from '../../../../api/rules'; import ScreenPositionHelper from '../../../../components/common/ScreenPositionHelper'; import { mockCurrentUser, mockLocation, mockRouter, mockRule } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { App } from '../App'; jest.mock('../../../../components/common/ScreenPositionHelper'); diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/BulkChangeModal-test.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/BulkChangeModal-test.tsx index c0e76af21aa..4e3c064db71 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/BulkChangeModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/BulkChangeModal-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { bulkActivateRules, bulkDeactivateRules } from '../../../../api/quality-profiles'; import { mockLanguage, mockQualityProfile } from '../../../../helpers/testMocks'; +import { submit, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { Query } from '../../query'; import BulkChangeModal from '../BulkChangeModal'; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/CustomRuleFormModal-test.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/CustomRuleFormModal-test.tsx index 895e063555e..bb28f3434df 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/CustomRuleFormModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/CustomRuleFormModal-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { createRule } from '../../../../api/rules'; import { mockRule, mockRuleDetailsParameter } from '../../../../helpers/testMocks'; +import { submit, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import CustomRuleFormModal from '../CustomRuleFormModal'; jest.mock('../../../../api/rules', () => ({ createRule: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetails-test.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetails-test.tsx index c0dbe57b146..fb2bd90d25c 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetails-test.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetails-test.tsx @@ -20,9 +20,9 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { deleteRule, getRuleDetails, updateRule } from '../../../../api/rules'; import { mockQualityProfile } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import RuleDetails from '../RuleDetails'; jest.mock('../../../../api/rules', () => { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetailsDescription-test.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetailsDescription-test.tsx index 256da7dd37f..ce3a71620b7 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetailsDescription-test.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetailsDescription-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { change, click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import RuleDetailsDescription from '../RuleDetailsDescription'; jest.mock('../../../../api/rules', () => ({ diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetailsIssues-test.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetailsIssues-test.tsx index 97f97c22997..4f190d2b1e8 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetailsIssues-test.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleDetailsIssues-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getFacet } from '../../../../api/issues'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { RuleDetailsIssues } from '../RuleDetailsIssues'; jest.mock('../../../../api/issues', () => ({ diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleListItem-test.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleListItem-test.tsx index 5a70aa7be2a..e797688f02c 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleListItem-test.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/RuleListItem-test.tsx @@ -20,9 +20,9 @@ import { shallow } from 'enzyme'; import * as React from 'react'; import { Link } from 'react-router'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { deactivateRule } from '../../../../api/quality-profiles'; import { mockEvent, mockQualityProfile, mockRule } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import RuleListItem from '../RuleListItem'; jest.mock('../../../../api/quality-profiles', () => ({ diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/SimilarRulesFilter-test.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/SimilarRulesFilter-test.tsx index 09d37152ac0..6a8a72b21e1 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/SimilarRulesFilter-test.tsx +++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/SimilarRulesFilter-test.tsx @@ -19,8 +19,8 @@ */ import { mount, shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockRule } from '../../../../helpers/testMocks'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import SimilarRulesFilter from '../SimilarRulesFilter'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/coding-rules/query.ts b/server/sonar-web/src/main/js/apps/coding-rules/query.ts index d7047af3577..7901b506d51 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/query.ts +++ b/server/sonar-web/src/main/js/apps/coding-rules/query.ts @@ -29,7 +29,7 @@ import { serializeOptionalBoolean, serializeString, serializeStringArray -} from 'sonar-ui-common/helpers/query'; +} from '../../sonar-ui-common/helpers/query'; export interface Query { activation: boolean | undefined; diff --git a/server/sonar-web/src/main/js/apps/coding-rules/routes.ts b/server/sonar-web/src/main/js/apps/coding-rules/routes.ts index 93cbcf53e8a..6f05b29713c 100644 --- a/server/sonar-web/src/main/js/apps/coding-rules/routes.ts +++ b/server/sonar-web/src/main/js/apps/coding-rules/routes.ts @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { RedirectFunction, RouterState } from 'react-router'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; import { parseQuery, serializeQuery } from './query'; function parseHash(hash: string): T.RawQuery { diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/App.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/App.tsx index fb586c22a7b..3a863ca651c 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/App.tsx @@ -23,24 +23,24 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { connect } from 'react-redux'; import { withRouter, WithRouterProps } from 'react-router'; +import { getMeasuresWithPeriod } from '../../../api/measures'; +import { getAllMetrics } from '../../../api/metrics'; +import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; +import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper'; +import { enhanceMeasure } from '../../../components/measure/utils'; +import '../../../components/search-navigator.css'; +import { getBranchLikeQuery, isPullRequest, isSameBranchLike } from '../../../helpers/branch-like'; import { getLocalizedMetricDomain, translate, translateWithParameters -} from 'sonar-ui-common/helpers/l10n'; +} from '../../../sonar-ui-common/helpers/l10n'; import { addSideBarClass, addWhitePageClass, removeSideBarClass, removeWhitePageClass -} from 'sonar-ui-common/helpers/pages'; -import { getMeasuresWithPeriod } from '../../../api/measures'; -import { getAllMetrics } from '../../../api/metrics'; -import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; -import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper'; -import { enhanceMeasure } from '../../../components/measure/utils'; -import '../../../components/search-navigator.css'; -import { getBranchLikeQuery, isPullRequest, isSameBranchLike } from '../../../helpers/branch-like'; +} from '../../../sonar-ui-common/helpers/pages'; import { fetchBranchStatus } from '../../../store/rootActions'; import { BranchLike } from '../../../types/branch-like'; import { ComponentQualifier } from '../../../types/component'; diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/Breadcrumb.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/Breadcrumb.tsx index 04334f7643e..db4329c32ec 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/Breadcrumb.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/Breadcrumb.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { collapsePath, limitComponentName } from 'sonar-ui-common/helpers/path'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { collapsePath, limitComponentName } from '../../../sonar-ui-common/helpers/path'; interface Props { canBrowse: boolean; diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/LeakPeriodLegend.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/LeakPeriodLegend.tsx index 0cf991dcfa9..aac8157b802 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/LeakPeriodLegend.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/LeakPeriodLegend.tsx @@ -21,14 +21,16 @@ import * as classNames from 'classnames'; import * as differenceInDays from 'date-fns/difference_in_days'; import * as React from 'react'; import { InjectedIntlProps, injectIntl } from 'react-intl'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import DateFormatter, { longFormatterOption } from 'sonar-ui-common/components/intl/DateFormatter'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; +import { getPeriodDate, getPeriodLabel } from '../../../helpers/periods'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import DateFormatter, { + longFormatterOption +} from '../../../sonar-ui-common/components/intl/DateFormatter'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; import DateTimeFormatter, { formatterOption -} from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { getPeriodDate, getPeriodLabel } from '../../../helpers/periods'; +} from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx index ac027905e48..610d6ada0a2 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureContent.tsx @@ -19,10 +19,6 @@ */ import * as React from 'react'; import { InjectedRouter } from 'react-router'; -import PageActions from 'sonar-ui-common/components/ui/PageActions'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { RequestData } from 'sonar-ui-common/helpers/request'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { getComponentTree } from '../../../api/components'; import { getMeasures } from '../../../api/measures'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; @@ -30,6 +26,10 @@ import SourceViewer from '../../../components/SourceViewer/SourceViewer'; import { getBranchLikeQuery, isSameBranchLike } from '../../../helpers/branch-like'; import { isDiffMetric } from '../../../helpers/measures'; import { getProjectUrl } from '../../../helpers/urls'; +import PageActions from '../../../sonar-ui-common/components/ui/PageActions'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { RequestData } from '../../../sonar-ui-common/helpers/request'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import { BranchLike } from '../../../types/branch-like'; import { MetricKey } from '../../../types/metrics'; import { complementary } from '../config/complementary'; diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.tsx index e734316ebc2..2f36734282a 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureHeader.tsx @@ -19,14 +19,14 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import HistoryIcon from 'sonar-ui-common/components/icons/HistoryIcon'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { getLocalizedMetricName, translate } from 'sonar-ui-common/helpers/l10n'; import LanguageDistributionContainer from '../../../components/charts/LanguageDistributionContainer'; import Measure from '../../../components/measure/Measure'; import { isDiffMetric } from '../../../helpers/measures'; import { getMeasureHistoryUrl } from '../../../helpers/urls'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import HistoryIcon from '../../../sonar-ui-common/components/icons/HistoryIcon'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { getLocalizedMetricName, translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import { hasFullMeasures } from '../utils'; import LeakPeriodLegend from './LeakPeriodLegend'; diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.tsx index 26053da42d8..a2a31fc87ff 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureOverview.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import PageActions from 'sonar-ui-common/components/ui/PageActions'; import { getComponentLeaves } from '../../../api/components'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; import SourceViewer from '../../../components/SourceViewer/SourceViewer'; import { getBranchLikeQuery, isSameBranchLike } from '../../../helpers/branch-like'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import PageActions from '../../../sonar-ui-common/components/ui/PageActions'; import { BranchLike } from '../../../types/branch-like'; import BubbleChart from '../drilldown/BubbleChart'; import { enhanceComponent, getBubbleMetrics, hasFullMeasures, isFileType } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureViewSelect.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureViewSelect.tsx index 0f3bcc8aa7b..e82e820f1ed 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasureViewSelect.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasureViewSelect.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import ListIcon from 'sonar-ui-common/components/icons/ListIcon'; -import TreeIcon from 'sonar-ui-common/components/icons/TreeIcon'; -import TreemapIcon from 'sonar-ui-common/components/icons/TreemapIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import ListIcon from '../../../sonar-ui-common/components/icons/ListIcon'; +import TreeIcon from '../../../sonar-ui-common/components/icons/TreeIcon'; +import TreemapIcon from '../../../sonar-ui-common/components/icons/TreemapIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { hasList, hasTree, hasTreemap, View } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/MeasuresEmpty.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/MeasuresEmpty.tsx index 9671b08cb68..3751c12cfa9 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/MeasuresEmpty.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/MeasuresEmpty.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function MeasuresEmpty() { return ( diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/App-test.tsx index 93a5e0972b2..04aa3fef23c 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/App-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getMeasuresWithPeriod } from '../../../../api/measures'; import { mockMainBranch, mockPullRequest } from '../../../../helpers/mocks/branch-like'; import { mockComponent, mockIssue, mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { App } from '../App'; jest.mock('../../../../api/metrics', () => ({ diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/Breadcrumbs-test.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/Breadcrumbs-test.tsx index 244f80e8fa2..6619b9780ce 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/Breadcrumbs-test.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/Breadcrumbs-test.tsx @@ -19,8 +19,8 @@ */ import { mount } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getBreadcrumbs } from '../../../../api/components'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import Breadcrumbs from '../Breadcrumbs'; jest.mock('../../../../api/components', () => ({ diff --git a/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/MeasureContent-test.tsx b/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/MeasureContent-test.tsx index bc44caa8815..7929da4d7ab 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/MeasureContent-test.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/components/__tests__/MeasureContent-test.tsx @@ -19,13 +19,13 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getComponentTree } from '../../../../api/components'; import { mockComponentMeasure, mockRouter } from '../../../../helpers/testMocks'; +import { scrollToElement } from '../../../../sonar-ui-common/helpers/scrolling'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import MeasureContent from '../MeasureContent'; -jest.mock('sonar-ui-common/helpers/scrolling', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/scrolling', () => ({ scrollToElement: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/BubbleChart.tsx b/server/sonar-web/src/main/js/apps/component-measures/drilldown/BubbleChart.tsx index aa2c2724b20..23c066ca5a6 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/BubbleChart.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/BubbleChart.tsx @@ -18,19 +18,19 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import OriginalBubbleChart from 'sonar-ui-common/components/charts/BubbleChart'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; +import ColorRatingsLegend from '../../../components/charts/ColorRatingsLegend'; +import { RATING_COLORS } from '../../../helpers/constants'; +import { isDiffMetric } from '../../../helpers/measures'; +import OriginalBubbleChart from '../../../sonar-ui-common/components/charts/BubbleChart'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; import { getLocalizedMetricDomain, getLocalizedMetricName, translate, translateWithParameters -} from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { isDefined } from 'sonar-ui-common/helpers/types'; -import ColorRatingsLegend from '../../../components/charts/ColorRatingsLegend'; -import { RATING_COLORS } from '../../../helpers/constants'; -import { isDiffMetric } from '../../../helpers/measures'; +} from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; +import { isDefined } from '../../../sonar-ui-common/helpers/types'; import { getBubbleMetrics, getBubbleYDomain, isProjectOverview } from '../utils'; import EmptyResult from './EmptyResult'; diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentCell.tsx b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentCell.tsx index b3cc4f33e22..f410a120ae1 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentCell.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentCell.tsx @@ -19,18 +19,18 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import BranchIcon from 'sonar-ui-common/components/icons/BranchIcon'; -import LinkIcon from 'sonar-ui-common/components/icons/LinkIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { isDiffMetric } from 'sonar-ui-common/helpers/measures'; -import { splitPath } from 'sonar-ui-common/helpers/path'; import { getBranchLikeUrl, getComponentDrilldownUrlWithSelection, getComponentSecurityHotspotsUrl, getProjectUrl } from '../../../helpers/urls'; +import BranchIcon from '../../../sonar-ui-common/components/icons/BranchIcon'; +import LinkIcon from '../../../sonar-ui-common/components/icons/LinkIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { isDiffMetric } from '../../../sonar-ui-common/helpers/measures'; +import { splitPath } from '../../../sonar-ui-common/helpers/path'; import { BranchLike } from '../../../types/branch-like'; import { isFileType, isSecurityReviewMetric, View } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsList.tsx b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsList.tsx index ede874a8921..b4d57ed0f38 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsList.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/ComponentsList.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { getLocalizedMetricName } from 'sonar-ui-common/helpers/l10n'; +import { getLocalizedMetricName } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import { complementary } from '../config/complementary'; import { View } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/EmptyResult.tsx b/server/sonar-web/src/main/js/apps/component-measures/drilldown/EmptyResult.tsx index dd85b2a6fe5..3b090019e4b 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/EmptyResult.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/EmptyResult.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function EmptyResult() { return <div className="note">{translate('no_results')}</div>; diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/FilesView.tsx b/server/sonar-web/src/main/js/apps/component-measures/drilldown/FilesView.tsx index 00ae1b7730d..89a81414891 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/FilesView.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/FilesView.tsx @@ -20,13 +20,13 @@ import * as key from 'keymaster'; import { throttle } from 'lodash'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { isDiffMetric, isPeriodBestValue } from '../../../helpers/measures'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import { BranchLike } from '../../../types/branch-like'; import { View } from '../utils'; import ComponentsList from './ComponentsList'; diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.tsx b/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.tsx index d883a849968..82da04be4cf 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/TreeMapView.tsx @@ -20,19 +20,19 @@ import { scaleLinear, scaleOrdinal } from 'd3-scale'; import * as React from 'react'; import { AutoSizer } from 'react-virtualized/dist/commonjs/AutoSizer'; -import ColorGradientLegend from 'sonar-ui-common/components/charts/ColorGradientLegend'; -import TreeMap, { TreeMapItem } from 'sonar-ui-common/components/charts/TreeMap'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; +import { colors } from '../../../app/theme'; +import ColorBoxLegend from '../../../components/charts/ColorBoxLegend'; +import { isDiffMetric } from '../../../helpers/measures'; +import ColorGradientLegend from '../../../sonar-ui-common/components/charts/ColorGradientLegend'; +import TreeMap, { TreeMapItem } from '../../../sonar-ui-common/components/charts/TreeMap'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; import { getLocalizedMetricName, translate, translateWithParameters -} from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { isDefined } from 'sonar-ui-common/helpers/types'; -import { colors } from '../../../app/theme'; -import ColorBoxLegend from '../../../components/charts/ColorBoxLegend'; -import { isDiffMetric } from '../../../helpers/measures'; +} from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; +import { isDefined } from '../../../sonar-ui-common/helpers/types'; import { BranchLike } from '../../../types/branch-like'; import { MetricKey } from '../../../types/metrics'; import EmptyResult from './EmptyResult'; diff --git a/server/sonar-web/src/main/js/apps/component-measures/drilldown/__tests__/BubbleChart-test.tsx b/server/sonar-web/src/main/js/apps/component-measures/drilldown/__tests__/BubbleChart-test.tsx index 079f77c1d4b..c8865973cf7 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/drilldown/__tests__/BubbleChart-test.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/drilldown/__tests__/BubbleChart-test.tsx @@ -20,8 +20,8 @@ import { shallow } from 'enzyme'; import { keyBy } from 'lodash'; import * as React from 'react'; -import OriginalBubbleChart from 'sonar-ui-common/components/charts/BubbleChart'; import { mockComponentMeasure, mockMeasure, mockMetric } from '../../../../helpers/testMocks'; +import OriginalBubbleChart from '../../../../sonar-ui-common/components/charts/BubbleChart'; import { MetricKey } from '../../../../types/metrics'; import { enhanceComponent } from '../../utils'; import BubbleChart from '../BubbleChart'; diff --git a/server/sonar-web/src/main/js/apps/component-measures/routes.ts b/server/sonar-web/src/main/js/apps/component-measures/routes.ts index fba1c3ee8b5..c48f0b4124a 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/routes.ts +++ b/server/sonar-web/src/main/js/apps/component-measures/routes.ts @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { RedirectFunction, RouterState } from 'react-router'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/component-measures/sidebar/DomainFacet.tsx b/server/sonar-web/src/main/js/apps/component-measures/sidebar/DomainFacet.tsx index 9c88eef672d..9062d191a44 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/sidebar/DomainFacet.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/sidebar/DomainFacet.tsx @@ -18,18 +18,18 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BubblesIcon from 'sonar-ui-common/components/icons/BubblesIcon'; +import FacetBox from '../../../components/facet/FacetBox'; +import FacetHeader from '../../../components/facet/FacetHeader'; +import FacetItem from '../../../components/facet/FacetItem'; +import FacetItemsList from '../../../components/facet/FacetItemsList'; +import BubblesIcon from '../../../sonar-ui-common/components/icons/BubblesIcon'; import { getLocalizedCategoryMetricName, getLocalizedMetricDomain, getLocalizedMetricName, hasMessage, translate -} from 'sonar-ui-common/helpers/l10n'; -import FacetBox from '../../../components/facet/FacetBox'; -import FacetHeader from '../../../components/facet/FacetHeader'; -import FacetItem from '../../../components/facet/FacetItem'; -import FacetItemsList from '../../../components/facet/FacetItemsList'; +} from '../../../sonar-ui-common/helpers/l10n'; import { addMeasureCategories, filterMeasures, diff --git a/server/sonar-web/src/main/js/apps/component-measures/sidebar/ProjectOverviewFacet.tsx b/server/sonar-web/src/main/js/apps/component-measures/sidebar/ProjectOverviewFacet.tsx index e7d9e63bac8..36370960da3 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/sidebar/ProjectOverviewFacet.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/sidebar/ProjectOverviewFacet.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import FacetBox from '../../../components/facet/FacetBox'; import FacetItem from '../../../components/facet/FacetItem'; import FacetItemsList from '../../../components/facet/FacetItemsList'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onChange: (metric: string) => void; diff --git a/server/sonar-web/src/main/js/apps/component-measures/sidebar/Sidebar.tsx b/server/sonar-web/src/main/js/apps/component-measures/sidebar/Sidebar.tsx index 21b4129b9ed..00fe2d3c82b 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/sidebar/Sidebar.tsx +++ b/server/sonar-web/src/main/js/apps/component-measures/sidebar/Sidebar.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { groupByDomains, KNOWN_DOMAINS, PROJECT_OVERVEW, Query } from '../utils'; import DomainFacet from './DomainFacet'; import ProjectOverviewFacet from './ProjectOverviewFacet'; diff --git a/server/sonar-web/src/main/js/apps/component-measures/utils.ts b/server/sonar-web/src/main/js/apps/component-measures/utils.ts index 956bb6f655d..d3c38415b3b 100644 --- a/server/sonar-web/src/main/js/apps/component-measures/utils.ts +++ b/server/sonar-web/src/main/js/apps/component-measures/utils.ts @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { groupBy, memoize, sortBy, toPairs } from 'lodash'; -import { getLocalizedMetricName } from 'sonar-ui-common/helpers/l10n'; -import { cleanQuery, parseAsString, serializeString } from 'sonar-ui-common/helpers/query'; import { enhanceMeasure } from '../../components/measure/utils'; import { isBranch, isPullRequest } from '../../helpers/branch-like'; import { getDisplayMetrics, isDiffMetric } from '../../helpers/measures'; +import { getLocalizedMetricName } from '../../sonar-ui-common/helpers/l10n'; +import { cleanQuery, parseAsString, serializeString } from '../../sonar-ui-common/helpers/query'; import { BranchLike } from '../../types/branch-like'; import { ComponentQualifier } from '../../types/component'; import { MetricKey } from '../../types/metrics'; diff --git a/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx b/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx index 8f530ee5b12..bb0c910676d 100644 --- a/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/AzurePersonalAccessTokenForm.tsx @@ -20,11 +20,11 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import ValidationInput from '../../../sonar-ui-common/components/controls/ValidationInput'; +import DetachIcon from '../../../sonar-ui-common/components/icons/DetachIcon'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmSettingsInstance } from '../../../types/alm-settings'; export interface AzurePersonalAccessTokenFormProps { diff --git a/server/sonar-web/src/main/js/apps/create/project/AzureProjectAccordion.tsx b/server/sonar-web/src/main/js/apps/create/project/AzureProjectAccordion.tsx index faced4d512c..26deef49616 100644 --- a/server/sonar-web/src/main/js/apps/create/project/AzureProjectAccordion.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/AzureProjectAccordion.tsx @@ -21,15 +21,15 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import BoxedGroupAccordion from 'sonar-ui-common/components/controls/BoxedGroupAccordion'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { colors } from '../../../app/theme'; import { getProjectUrl } from '../../../helpers/urls'; +import BoxedGroupAccordion from '../../../sonar-ui-common/components/controls/BoxedGroupAccordion'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AzureProject, AzureRepository } from '../../../types/alm-integration'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/AzureProjectCreateRenderer.tsx b/server/sonar-web/src/main/js/apps/create/project/AzureProjectCreateRenderer.tsx index 9d0ff0ac8d8..200a39df833 100644 --- a/server/sonar-web/src/main/js/apps/create/project/AzureProjectCreateRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/AzureProjectCreateRenderer.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { AzureProject, AzureRepository } from '../../../types/alm-integration'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; import AzurePersonalAccessTokenForm from './AzurePersonalAccessTokenForm'; diff --git a/server/sonar-web/src/main/js/apps/create/project/AzureProjectsList.tsx b/server/sonar-web/src/main/js/apps/create/project/AzureProjectsList.tsx index 46816bd8d59..9cc222d1636 100644 --- a/server/sonar-web/src/main/js/apps/create/project/AzureProjectsList.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/AzureProjectsList.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AzureProject, AzureRepository } from '../../../types/alm-integration'; import AzureProjectAccordion from './AzureProjectAccordion'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudProjectCreateRender.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudProjectCreateRender.tsx index f9568ebd179..41c342bdcf0 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudProjectCreateRender.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudProjectCreateRender.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { BitbucketCloudRepository } from '../../../types/alm-integration'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; import BitbucketCloudSearchForm from './BitbucketCloudSearchForm'; diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudSearchForm.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudSearchForm.tsx index b97c2b57d45..18239e73af1 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudSearchForm.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketCloudSearchForm.tsx @@ -20,17 +20,17 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getProjectUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import DetachIcon from '../../../sonar-ui-common/components/icons/DetachIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { BitbucketCloudRepository } from '../../../types/alm-integration'; import { ComponentQualifier } from '../../../types/component'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketImportRepositoryForm.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketImportRepositoryForm.tsx index e6673eb9782..2f1c1d22bf3 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketImportRepositoryForm.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketImportRepositoryForm.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BitbucketProject, BitbucketProjectRepositories, diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx index 150a25f2160..dcc00be8cff 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectAccordion.tsx @@ -21,13 +21,13 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import BoxedGroupAccordion from 'sonar-ui-common/components/controls/BoxedGroupAccordion'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { colors } from '../../../app/theme'; import { getProjectUrl } from '../../../helpers/urls'; +import BoxedGroupAccordion from '../../../sonar-ui-common/components/controls/BoxedGroupAccordion'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { BitbucketProject, BitbucketRepository } from '../../../types/alm-integration'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectCreateRenderer.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectCreateRenderer.tsx index 50694a2b665..83554586735 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectCreateRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketProjectCreateRenderer.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { BitbucketProject, BitbucketProjectRepositories, diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketRepositories.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketRepositories.tsx index b0771758242..de3c1324d18 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketRepositories.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketRepositories.tsx @@ -19,8 +19,8 @@ */ import { uniq, without } from 'lodash'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BitbucketProject, BitbucketProjectRepositories, diff --git a/server/sonar-web/src/main/js/apps/create/project/BitbucketSearchResults.tsx b/server/sonar-web/src/main/js/apps/create/project/BitbucketSearchResults.tsx index 1d9b7f7cd86..bf441e280ec 100644 --- a/server/sonar-web/src/main/js/apps/create/project/BitbucketSearchResults.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/BitbucketSearchResults.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BitbucketProject, BitbucketRepository } from '../../../types/alm-integration'; import BitbucketProjectAccordion from './BitbucketProjectAccordion'; diff --git a/server/sonar-web/src/main/js/apps/create/project/CreateProjectModeSelection.tsx b/server/sonar-web/src/main/js/apps/create/project/CreateProjectModeSelection.tsx index 6d3fc17a105..9f89d514d6c 100644 --- a/server/sonar-web/src/main/js/apps/create/project/CreateProjectModeSelection.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/CreateProjectModeSelection.tsx @@ -19,11 +19,11 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import ChevronsIcon from 'sonar-ui-common/components/icons/ChevronsIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; import { withAppState } from '../../../components/hoc/withAppState'; +import ChevronsIcon from '../../../sonar-ui-common/components/icons/ChevronsIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { AlmKeys } from '../../../types/alm-settings'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx b/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx index 70747ecd634..f91c074812a 100644 --- a/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/CreateProjectPage.tsx @@ -20,12 +20,12 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { WithRouterProps } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getAlmSettings } from '../../../api/alm-settings'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; import { whenLoggedIn } from '../../../components/hoc/whenLoggedIn'; import { withAppState } from '../../../components/hoc/withAppState'; import { getProjectUrl } from '../../../helpers/urls'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; import AlmBindingDefinitionForm from '../../settings/components/almIntegration/AlmBindingDefinitionForm'; import AzureProjectCreate from './AzureProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreate.tsx b/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreate.tsx index ece5a41f4ce..7a404c935e9 100644 --- a/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreate.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreate.tsx @@ -20,13 +20,13 @@ import { debounce } from 'lodash'; import * as React from 'react'; import { WithRouterProps } from 'react-router'; -import { getHostUrl } from 'sonar-ui-common/helpers/urls'; import { getGithubClientId, getGithubOrganizations, getGithubRepositories, importGithubRepository } from '../../../api/alm-integrations'; +import { getHostUrl } from '../../../sonar-ui-common/helpers/urls'; import { GithubOrganization, GithubRepository } from '../../../types/alm-integration'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; import GitHubProjectCreateRenderer from './GitHubProjectCreateRenderer'; diff --git a/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreateRenderer.tsx b/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreateRenderer.tsx index 35e82d7322a..2a6bf0edcbb 100644 --- a/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreateRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/GitHubProjectCreateRenderer.tsx @@ -20,19 +20,19 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import SearchSelect from 'sonar-ui-common/components/controls/SearchSelect'; -import CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { colors } from '../../../app/theme'; import { getBaseUrl } from '../../../helpers/system'; import { getProjectUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import SearchSelect from '../../../sonar-ui-common/components/controls/SearchSelect'; +import CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { GithubOrganization, GithubRepository } from '../../../types/alm-integration'; import { ComponentQualifier } from '../../../types/component'; import CreateProjectPageHeader from './CreateProjectPageHeader'; diff --git a/server/sonar-web/src/main/js/apps/create/project/GitlabProjectCreateRenderer.tsx b/server/sonar-web/src/main/js/apps/create/project/GitlabProjectCreateRenderer.tsx index 25795300b5b..26025cc6e76 100644 --- a/server/sonar-web/src/main/js/apps/create/project/GitlabProjectCreateRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/GitlabProjectCreateRenderer.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { GitlabProject } from '../../../types/alm-integration'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; import CreateProjectPageHeader from './CreateProjectPageHeader'; diff --git a/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx b/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx index 7ab9a59b924..fb9a6b5a045 100644 --- a/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/GitlabProjectSelectionForm.tsx @@ -20,17 +20,17 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getProjectUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import DetachIcon from '../../../sonar-ui-common/components/icons/DetachIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { GitlabProject } from '../../../types/alm-integration'; import { ComponentQualifier } from '../../../types/component'; import { CreateProjectModes } from './types'; diff --git a/server/sonar-web/src/main/js/apps/create/project/ManualProjectCreate.tsx b/server/sonar-web/src/main/js/apps/create/project/ManualProjectCreate.tsx index 85bf0e190a5..5150e25d1f9 100644 --- a/server/sonar-web/src/main/js/apps/create/project/ManualProjectCreate.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/ManualProjectCreate.tsx @@ -20,15 +20,15 @@ import * as classNames from 'classnames'; import { debounce } from 'lodash'; import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { createProject, doesComponentExists } from '../../../api/components'; import ProjectKeyInput from '../../../components/common/ProjectKeyInput'; import { PROJECT_KEY_INVALID_CHARACTERS, validateProjectKey } from '../../../helpers/projects'; +import { SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import ValidationInput from '../../../sonar-ui-common/components/controls/ValidationInput'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ProjectKeyValidationResult } from '../../../types/component'; import { PROJECT_NAME_MAX_LEN } from './constants'; import CreateProjectPageHeader from './CreateProjectPageHeader'; diff --git a/server/sonar-web/src/main/js/apps/create/project/PersonalAccessTokenForm.tsx b/server/sonar-web/src/main/js/apps/create/project/PersonalAccessTokenForm.tsx index 9d82f6be75f..6f82c135653 100644 --- a/server/sonar-web/src/main/js/apps/create/project/PersonalAccessTokenForm.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/PersonalAccessTokenForm.tsx @@ -20,16 +20,16 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; import { checkPersonalAccessTokenIsValid, setAlmPersonalAccessToken } from '../../../api/alm-integrations'; +import { SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import ValidationInput from '../../../sonar-ui-common/components/controls/ValidationInput'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/create/project/WrongBindingCountAlert.tsx b/server/sonar-web/src/main/js/apps/create/project/WrongBindingCountAlert.tsx index 670a81e7d42..d60551a35f4 100644 --- a/server/sonar-web/src/main/js/apps/create/project/WrongBindingCountAlert.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/WrongBindingCountAlert.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getGlobalSettingsUrl } from '../../../helpers/urls'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import { ALM_INTEGRATION } from '../../settings/components/AdditionalCategoryKeys'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzurePersonalAccessTokenForm-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzurePersonalAccessTokenForm-test.tsx index 820f2428514..51740e63712 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzurePersonalAccessTokenForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzurePersonalAccessTokenForm-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { change, submit } from 'sonar-ui-common/helpers/testUtils'; import { mockAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; +import { SubmitButton } from '../../../../sonar-ui-common/components/controls/buttons'; +import { change, submit } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import AzurePersonalAccessTokenForm, { AzurePersonalAccessTokenFormProps diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectAccordion-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectAccordion-test.tsx index e7ff10e54e2..d75707cb429 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectAccordion-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectAccordion-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import BoxedGroupAccordion from 'sonar-ui-common/components/controls/BoxedGroupAccordion'; -import Radio from 'sonar-ui-common/components/controls/Radio'; import { mockAzureProject, mockAzureRepository } from '../../../../helpers/mocks/alm-integrations'; import { mockEvent } from '../../../../helpers/testMocks'; +import BoxedGroupAccordion from '../../../../sonar-ui-common/components/controls/BoxedGroupAccordion'; +import Radio from '../../../../sonar-ui-common/components/controls/Radio'; import AzureProjectAccordion, { AzureProjectAccordionProps } from '../AzureProjectAccordion'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectCreate-test.tsx index b9ac65d6d02..bac8a0b607c 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectCreate-test.tsx @@ -20,7 +20,6 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { checkPersonalAccessTokenIsValid, getAzureProjects, @@ -32,6 +31,7 @@ import { import { mockAzureProject, mockAzureRepository } from '../../../../helpers/mocks/alm-integrations'; import { mockAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import AzureProjectCreate from '../AzureProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectsList-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectsList-test.tsx index 6b3ada7adb4..45871211fb2 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectsList-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/AzureProjectsList-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; import { mockAzureProject, mockAzureRepository } from '../../../../helpers/mocks/alm-integrations'; +import ListFooter from '../../../../sonar-ui-common/components/controls/ListFooter'; import AzureProjectAccordion from '../AzureProjectAccordion'; import AzureProjectsList, { AzureProjectsListProps } from '../AzureProjectsList'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketCloudProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketCloudProjectCreate-test.tsx index aac602992b7..c06c5a9c675 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketCloudProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketCloudProjectCreate-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { importBitbucketCloudRepository, searchForBitbucketCloudRepositories @@ -27,6 +26,7 @@ import { import { mockBitbucketCloudRepository } from '../../../../helpers/mocks/alm-integrations'; import { mockBitbucketCloudAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import BitbucketCloudProjectCreate, { BITBUCKET_CLOUD_PROJECTS_PAGESIZE } from '../BitbucketCloudProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketImportRepositoryForm-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketImportRepositoryForm-test.tsx index 702e6134058..9fd4b31172e 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketImportRepositoryForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketImportRepositoryForm-test.tsx @@ -20,12 +20,12 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { change } from 'sonar-ui-common/helpers/testUtils'; import { mockBitbucketProject, mockBitbucketRepository } from '../../../../helpers/mocks/alm-integrations'; +import SearchBox from '../../../../sonar-ui-common/components/controls/SearchBox'; +import { change } from '../../../../sonar-ui-common/helpers/testUtils'; import BitbucketImportRepositoryForm, { BitbucketImportRepositoryFormProps } from '../BitbucketImportRepositoryForm'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectAccordion-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectAccordion-test.tsx index 671cfa4fdc0..8d1f7062a79 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectAccordion-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectAccordion-test.tsx @@ -20,11 +20,11 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; import { mockBitbucketProject, mockBitbucketRepository } from '../../../../helpers/mocks/alm-integrations'; +import Radio from '../../../../sonar-ui-common/components/controls/Radio'; import BitbucketProjectAccordion, { BitbucketProjectAccordionProps } from '../BitbucketProjectAccordion'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectCreate-test.tsx index b9ea23c639d..bd13b29af8f 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketProjectCreate-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getBitbucketServerProjects, getBitbucketServerRepositories, @@ -32,6 +31,7 @@ import { } from '../../../../helpers/mocks/alm-integrations'; import { mockAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import BitbucketProjectCreate from '../BitbucketProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketRepositories-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketRepositories-test.tsx index 87cdc788213..49a5236e56c 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketRepositories-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/BitbucketRepositories-test.tsx @@ -20,11 +20,11 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockBitbucketProject, mockBitbucketRepository } from '../../../../helpers/mocks/alm-integrations'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import BitbucketProjectAccordion from '../BitbucketProjectAccordion'; import BitbucketRepositories, { BitbucketRepositoriesProps } from '../BitbucketRepositories'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectModeSelection-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectModeSelection-test.tsx index b0633d92c74..7dc3b94019d 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectModeSelection-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectModeSelection-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import { CreateProjectModeSelection, diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPage-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPage-test.tsx index 2845ff4d050..ca4d3f3337f 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPage-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPage-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getAlmSettings } from '../../../../api/alm-settings'; import { mockLocation, mockLoggedInUser, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import AlmBindingDefinitionForm from '../../../settings/components/almIntegration/AlmBindingDefinitionForm'; import CreateProjectModeSelection from '../CreateProjectModeSelection'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreate-test.tsx index c5c5c97dfff..a8647296957 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreate-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getGithubClientId, getGithubOrganizations, @@ -29,6 +28,7 @@ import { import { mockGitHubRepository } from '../../../../helpers/mocks/alm-integrations'; import { mockAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import GitHubProjectCreate from '../GitHubProjectCreate'; jest.mock('../../../../api/alm-integrations', () => ({ diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreateRenderer-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreateRenderer-test.tsx index a3cd7679412..997c309ee5e 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreateRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitHubProjectCreateRenderer-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import SearchSelect from 'sonar-ui-common/components/controls/SearchSelect'; import { mockGitHubRepository } from '../../../../helpers/mocks/alm-integrations'; +import Radio from '../../../../sonar-ui-common/components/controls/Radio'; +import SearchBox from '../../../../sonar-ui-common/components/controls/SearchBox'; +import SearchSelect from '../../../../sonar-ui-common/components/controls/SearchSelect'; import { GithubOrganization } from '../../../../types/alm-integration'; import GitHubProjectCreateRenderer, { GitHubProjectCreateRendererProps diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectCreate-test.tsx index 60474b4695c..56bfc8ef52f 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectCreate-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getGitlabProjects, importGitlabProject } from '../../../../api/alm-integrations'; import { mockGitlabProject } from '../../../../helpers/mocks/alm-integrations'; import { mockAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import GitlabProjectCreate from '../GitlabProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectSelectionForm-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectSelectionForm-test.tsx index 027ef23dc6d..446508109ef 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectSelectionForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/GitlabProjectSelectionForm-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; import { mockGitlabProject } from '../../../../helpers/mocks/alm-integrations'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import ListFooter from '../../../../sonar-ui-common/components/controls/ListFooter'; +import SearchBox from '../../../../sonar-ui-common/components/controls/SearchBox'; import GitlabProjectSelectionForm, { GitlabProjectSelectionFormProps } from '../GitlabProjectSelectionForm'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/ManualProjectCreate-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/ManualProjectCreate-test.tsx index 28d38847477..42417a3c2dc 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/ManualProjectCreate-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/ManualProjectCreate-test.tsx @@ -20,13 +20,13 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; -import { change, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { createProject, doesComponentExists } from '../../../../api/components'; import ProjectKeyInput from '../../../../components/common/ProjectKeyInput'; import { validateProjectKey } from '../../../../helpers/projects'; import { mockEvent } from '../../../../helpers/testMocks'; +import { SubmitButton } from '../../../../sonar-ui-common/components/controls/buttons'; +import ValidationInput from '../../../../sonar-ui-common/components/controls/ValidationInput'; +import { change, submit, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { ProjectKeyValidationResult } from '../../../../types/component'; import { PROJECT_NAME_MAX_LEN } from '../constants'; import ManualProjectCreate from '../ManualProjectCreate'; diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/PersonalAccessTokenForm-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/PersonalAccessTokenForm-test.tsx index f8d55114a1e..082039b0a93 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/PersonalAccessTokenForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/PersonalAccessTokenForm-test.tsx @@ -19,8 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { change, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { checkPersonalAccessTokenIsValid, setAlmPersonalAccessToken @@ -29,6 +27,8 @@ import { mockAlmSettingsInstance, mockBitbucketCloudAlmSettingsInstance } from '../../../../helpers/mocks/alm-settings'; +import { SubmitButton } from '../../../../sonar-ui-common/components/controls/buttons'; +import { change, submit, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import PersonalAccessTokenForm from '../PersonalAccessTokenForm'; diff --git a/server/sonar-web/src/main/js/apps/documentation/components/App.tsx b/server/sonar-web/src/main/js/apps/documentation/components/App.tsx index a033af231a0..a8d8423fb78 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/App.tsx @@ -22,10 +22,6 @@ import { DocNavigationItem } from 'Docs/@types/types'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { Link } from 'react-router'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { addSideBarClass, removeSideBarClass } from 'sonar-ui-common/helpers/pages'; -import { isDefined } from 'sonar-ui-common/helpers/types'; import { getInstalledPlugins } from '../../../api/plugins'; import { getPluginStaticFileContent } from '../../../api/static'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; @@ -33,6 +29,10 @@ import NotFound from '../../../app/components/NotFound'; import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper'; import DocMarkdownBlock from '../../../components/docs/DocMarkdownBlock'; import { ParsedContent, separateFrontMatter } from '../../../helpers/markdown'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { addSideBarClass, removeSideBarClass } from '../../../sonar-ui-common/helpers/pages'; +import { isDefined } from '../../../sonar-ui-common/helpers/types'; import { InstalledPlugin, PluginType } from '../../../types/plugins'; import { getUrlsList } from '../navTreeUtils'; import getPages from '../pages'; diff --git a/server/sonar-web/src/main/js/apps/documentation/components/MenuBlock.tsx b/server/sonar-web/src/main/js/apps/documentation/components/MenuBlock.tsx index f8d7f16593d..2ad79cbcf6c 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/MenuBlock.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/MenuBlock.tsx @@ -20,8 +20,8 @@ import * as classNames from 'classnames'; import { DocNavigationItem, DocsNavigationBlock } from 'Docs/@types/types'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import OpenCloseIcon from 'sonar-ui-common/components/icons/OpenCloseIcon'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import OpenCloseIcon from '../../../sonar-ui-common/components/icons/OpenCloseIcon'; import { isDocsNavigationBlock } from '../navTreeUtils'; import { DocumentationEntry, getNodeFromUrl } from '../utils'; import { MenuItem } from './MenuItem'; diff --git a/server/sonar-web/src/main/js/apps/documentation/components/MenuExternalLink.tsx b/server/sonar-web/src/main/js/apps/documentation/components/MenuExternalLink.tsx index 2996dc3467a..cc92fa60f99 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/MenuExternalLink.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/MenuExternalLink.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; +import DetachIcon from '../../../sonar-ui-common/components/icons/DetachIcon'; interface Props { title: string; diff --git a/server/sonar-web/src/main/js/apps/documentation/components/SearchResults.tsx b/server/sonar-web/src/main/js/apps/documentation/components/SearchResults.tsx index 19d307407f5..23b19e45a08 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/SearchResults.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/SearchResults.tsx @@ -21,7 +21,7 @@ import { DocNavigationItem } from 'Docs/@types/types'; import { sortBy } from 'lodash'; import lunr, { LunrBuilder, LunrIndex, LunrToken } from 'lunr'; import * as React from 'react'; -import { isDefined } from 'sonar-ui-common/helpers/types'; +import { isDefined } from '../../../sonar-ui-common/helpers/types'; import { getUrlsList } from '../navTreeUtils'; import { DocumentationEntry } from '../utils'; import SearchResultEntry from './SearchResultEntry'; diff --git a/server/sonar-web/src/main/js/apps/documentation/components/Sidebar.tsx b/server/sonar-web/src/main/js/apps/documentation/components/Sidebar.tsx index d2fafb89c0d..869f0b7f22c 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/Sidebar.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/Sidebar.tsx @@ -19,7 +19,7 @@ */ import { DocNavigationItem } from 'Docs/@types/types'; import * as React from 'react'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; import { DocumentationEntry } from '../utils'; import Menu from './Menu'; import SearchResults from './SearchResults'; diff --git a/server/sonar-web/src/main/js/apps/documentation/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/documentation/components/__tests__/App-test.tsx index c754c4dde34..f48ac2be598 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/__tests__/App-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { addSideBarClass, removeSideBarClass } from 'sonar-ui-common/helpers/pages'; -import { request } from 'sonar-ui-common/helpers/request'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { addSideBarClass, removeSideBarClass } from '../../../../sonar-ui-common/helpers/pages'; +import { request } from '../../../../sonar-ui-common/helpers/request'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { InstalledPlugin } from '../../../../types/plugins'; import getPages from '../../pages'; import App from '../App'; @@ -51,12 +51,12 @@ jest.mock('Docs/../static/SonarQubeNavigationTree.json', () => ({ ] })); -jest.mock('sonar-ui-common/helpers/pages', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/pages', () => ({ addSideBarClass: jest.fn(), removeSideBarClass: jest.fn() })); -jest.mock('sonar-ui-common/helpers/request', () => { +jest.mock('../../../../sonar-ui-common/helpers/request', () => { const { mockDocumentationMarkdown } = jest.requireActual('../../../../helpers/testMocks'); return { request: jest.fn(() => ({ diff --git a/server/sonar-web/src/main/js/apps/documentation/components/__tests__/MenuBlock-test.tsx b/server/sonar-web/src/main/js/apps/documentation/components/__tests__/MenuBlock-test.tsx index 817b7b28cb8..a2b0ed72248 100644 --- a/server/sonar-web/src/main/js/apps/documentation/components/__tests__/MenuBlock-test.tsx +++ b/server/sonar-web/src/main/js/apps/documentation/components/__tests__/MenuBlock-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import MenuBlock from '../MenuBlock'; it('should render a closed menu block', () => { diff --git a/server/sonar-web/src/main/js/apps/documentation/routes.ts b/server/sonar-web/src/main/js/apps/documentation/routes.ts index be863aa0c08..76cfc03421d 100644 --- a/server/sonar-web/src/main/js/apps/documentation/routes.ts +++ b/server/sonar-web/src/main/js/apps/documentation/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const App = lazyLoadComponent(() => import(/* webpackChunkName: "docs" */ './components/App')); diff --git a/server/sonar-web/src/main/js/apps/groups/components/App.tsx b/server/sonar-web/src/main/js/apps/groups/components/App.tsx index fc779853d14..01eb3dada9f 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/App.tsx @@ -19,12 +19,12 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { omitNil } from 'sonar-ui-common/helpers/request'; import { createGroup, deleteGroup, searchUsersGroups, updateGroup } from '../../../api/user_groups'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { omitNil } from '../../../sonar-ui-common/helpers/request'; import DeleteForm from './DeleteForm'; import Form from './Form'; import Header from './Header'; diff --git a/server/sonar-web/src/main/js/apps/groups/components/DeleteForm.tsx b/server/sonar-web/src/main/js/apps/groups/components/DeleteForm.tsx index 52d6cf39527..4ba75a1e023 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/DeleteForm.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/DeleteForm.tsx @@ -18,10 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { group: T.Group; diff --git a/server/sonar-web/src/main/js/apps/groups/components/EditMembers.tsx b/server/sonar-web/src/main/js/apps/groups/components/EditMembers.tsx index c1f3b50a848..dd8dc1cd57d 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/EditMembers.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/EditMembers.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import BulletListIcon from 'sonar-ui-common/components/icons/BulletListIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonIcon } from '../../../sonar-ui-common/components/controls/buttons'; +import BulletListIcon from '../../../sonar-ui-common/components/icons/BulletListIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import EditMembersModal from './EditMembersModal'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/groups/components/EditMembersModal.tsx b/server/sonar-web/src/main/js/apps/groups/components/EditMembersModal.tsx index e98b2ab3e6a..462aac441ab 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/EditMembersModal.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/EditMembersModal.tsx @@ -19,14 +19,14 @@ */ import { find, without } from 'lodash'; import * as React from 'react'; -import { ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; +import { addUserToGroup, getUsersInGroup, removeUserFromGroup } from '../../../api/user_groups'; +import { ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; import SelectList, { SelectListFilter, SelectListSearchParams -} from 'sonar-ui-common/components/controls/SelectList'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { addUserToGroup, getUsersInGroup, removeUserFromGroup } from '../../../api/user_groups'; +} from '../../../sonar-ui-common/components/controls/SelectList'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { group: T.Group; diff --git a/server/sonar-web/src/main/js/apps/groups/components/Form.tsx b/server/sonar-web/src/main/js/apps/groups/components/Form.tsx index 978b7ce181f..2796e308e59 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/Form.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/Form.tsx @@ -18,12 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { confirmButtonText: string; diff --git a/server/sonar-web/src/main/js/apps/groups/components/Header.tsx b/server/sonar-web/src/main/js/apps/groups/components/Header.tsx index 063e44b1443..6aba69becfb 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/Header.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/Header.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Form from './Form'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/groups/components/List.tsx b/server/sonar-web/src/main/js/apps/groups/components/List.tsx index 72a61dda277..7ad06d1d1ee 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/List.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/List.tsx @@ -19,7 +19,7 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import ListItem from './ListItem'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/groups/components/ListItem.tsx b/server/sonar-web/src/main/js/apps/groups/components/ListItem.tsx index 3b8d3caecdf..59ceb8493b4 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/ListItem.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/ListItem.tsx @@ -21,8 +21,8 @@ import * as React from 'react'; import ActionsDropdown, { ActionsDropdownDivider, ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +} from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import EditMembers from './EditMembers'; export interface ListItemProps { diff --git a/server/sonar-web/src/main/js/apps/groups/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/groups/components/__tests__/App-test.tsx index c53f617af20..efeed575ab9 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/__tests__/App-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { createGroup, deleteGroup, @@ -27,6 +26,7 @@ import { updateGroup } from '../../../../api/user_groups'; import { mockGroup } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import App from '../App'; jest.mock('../../../../api/user_groups', () => ({ diff --git a/server/sonar-web/src/main/js/apps/groups/components/__tests__/EditMembers-test.tsx b/server/sonar-web/src/main/js/apps/groups/components/__tests__/EditMembers-test.tsx index e45404bb50c..f27db315de8 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/__tests__/EditMembers-test.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/__tests__/EditMembers-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import EditMembers from '../EditMembers'; it('should edit members', () => { diff --git a/server/sonar-web/src/main/js/apps/groups/components/__tests__/EditMembersModal-test.tsx b/server/sonar-web/src/main/js/apps/groups/components/__tests__/EditMembersModal-test.tsx index 9d102432714..d6e7096c8a6 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/__tests__/EditMembersModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/__tests__/EditMembersModal-test.tsx @@ -19,9 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import SelectList, { SelectListFilter } from 'sonar-ui-common/components/controls/SelectList'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { addUserToGroup, getUsersInGroup, removeUserFromGroup } from '../../../../api/user_groups'; +import SelectList, { + SelectListFilter +} from '../../../../sonar-ui-common/components/controls/SelectList'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import EditMembersModal from '../EditMembersModal'; const group = { id: 1, name: 'foo', membersCount: 1 }; diff --git a/server/sonar-web/src/main/js/apps/groups/components/__tests__/Form-test.tsx b/server/sonar-web/src/main/js/apps/groups/components/__tests__/Form-test.tsx index 6cb22e537d0..65c62164219 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/__tests__/Form-test.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/__tests__/Form-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, click, submit } from 'sonar-ui-common/helpers/testUtils'; +import { change, click, submit } from '../../../../sonar-ui-common/helpers/testUtils'; import Form from '../Form'; it('should render form', async () => { diff --git a/server/sonar-web/src/main/js/apps/groups/components/__tests__/Header-test.tsx b/server/sonar-web/src/main/js/apps/groups/components/__tests__/Header-test.tsx index 8b9c4963097..e22d914d748 100644 --- a/server/sonar-web/src/main/js/apps/groups/components/__tests__/Header-test.tsx +++ b/server/sonar-web/src/main/js/apps/groups/components/__tests__/Header-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import Header from '../Header'; it('should create new group', () => { diff --git a/server/sonar-web/src/main/js/apps/groups/routes.ts b/server/sonar-web/src/main/js/apps/groups/routes.ts index 854cd1ef120..f57b5528d59 100644 --- a/server/sonar-web/src/main/js/apps/groups/routes.ts +++ b/server/sonar-web/src/main/js/apps/groups/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/issues/__tests__/utils-test.ts b/server/sonar-web/src/main/js/apps/issues/__tests__/utils-test.ts index 91b2019abc9..6f69f84b739 100644 --- a/server/sonar-web/src/main/js/apps/issues/__tests__/utils-test.ts +++ b/server/sonar-web/src/main/js/apps/issues/__tests__/utils-test.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import { SecurityStandard } from '../../../types/security'; import { scrollToIssue, @@ -26,7 +26,7 @@ import { shouldOpenStandardsFacet } from '../utils'; -jest.mock('sonar-ui-common/helpers/scrolling', () => ({ +jest.mock('../../../sonar-ui-common/helpers/scrolling', () => ({ scrollToElement: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/issues/components/App.tsx b/server/sonar-web/src/main/js/apps/issues/components/App.tsx index d9ac7cbfd00..afb752b00c2 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/App.tsx @@ -22,20 +22,6 @@ import { debounce, keyBy, omit, without } from 'lodash'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { - addSideBarClass, - addWhitePageClass, - removeSideBarClass, - removeWhitePageClass -} from 'sonar-ui-common/helpers/pages'; -import { serializeDate } from 'sonar-ui-common/helpers/query'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; import EmptySearch from '../../../components/common/EmptySearch'; @@ -50,6 +36,20 @@ import { isSameBranchLike } from '../../../helpers/branch-like'; import { isSonarCloud } from '../../../helpers/system'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import Checkbox from '../../../sonar-ui-common/components/controls/Checkbox'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import handleRequiredAuthentication from '../../../sonar-ui-common/helpers/handleRequiredAuthentication'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { + addSideBarClass, + addWhitePageClass, + removeSideBarClass, + removeWhitePageClass +} from '../../../sonar-ui-common/helpers/pages'; +import { serializeDate } from '../../../sonar-ui-common/helpers/query'; import { BranchLike } from '../../../types/branch-like'; import { Facet, diff --git a/server/sonar-web/src/main/js/apps/issues/components/AppContainer.tsx b/server/sonar-web/src/main/js/apps/issues/components/AppContainer.tsx index 2c22170bd48..551b7ebcd42 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/AppContainer.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/AppContainer.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { connect } from 'react-redux'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; import { searchIssues } from '../../../api/issues'; import { withRouter } from '../../../components/hoc/withRouter'; import { parseIssueFromResponse } from '../../../helpers/issues'; +import { lazyLoadComponent } from '../../../sonar-ui-common/components/lazyLoadComponent'; import { fetchBranchStatus } from '../../../store/rootActions'; import { getCurrentUser, Store } from '../../../store/rootReducer'; import { FetchIssuesPromise } from '../../../types/issues'; diff --git a/server/sonar-web/src/main/js/apps/issues/components/BulkChangeModal.tsx b/server/sonar-web/src/main/js/apps/issues/components/BulkChangeModal.tsx index 5baaba4ab74..70c3ceaae8a 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/BulkChangeModal.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/BulkChangeModal.tsx @@ -20,23 +20,26 @@ import { pickBy, sortBy } from 'lodash'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import SearchSelect from 'sonar-ui-common/components/controls/SearchSelect'; -import Select from 'sonar-ui-common/components/controls/Select'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { bulkChangeIssues, searchIssueTags } from '../../../api/issues'; import throwGlobalError from '../../../app/utils/throwGlobalError'; import FormattingTips from '../../../components/common/FormattingTips'; import SeverityHelper from '../../../components/shared/SeverityHelper'; import Avatar from '../../../components/ui/Avatar'; import { isLoggedIn, isUserActive } from '../../../helpers/users'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Checkbox from '../../../sonar-ui-common/components/controls/Checkbox'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import SearchSelect from '../../../sonar-ui-common/components/controls/SearchSelect'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { searchAssignees } from '../utils'; interface AssigneeOption { diff --git a/server/sonar-web/src/main/js/apps/issues/components/ComponentBreadcrumbs.tsx b/server/sonar-web/src/main/js/apps/issues/components/ComponentBreadcrumbs.tsx index 0de4e072f38..af8072af9b9 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/ComponentBreadcrumbs.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/ComponentBreadcrumbs.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { collapsePath, limitComponentName } from 'sonar-ui-common/helpers/path'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { collapsePath, limitComponentName } from '../../../sonar-ui-common/helpers/path'; import { getSelectedLocation } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/issues/components/IssuesCounter.tsx b/server/sonar-web/src/main/js/apps/issues/components/IssuesCounter.tsx index 8526a566871..b01cb385fae 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/IssuesCounter.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/IssuesCounter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import PageCounter from '../../../components/common/PageCounter'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { current: number | undefined; diff --git a/server/sonar-web/src/main/js/apps/issues/components/IssuesSourceViewer.tsx b/server/sonar-web/src/main/js/apps/issues/components/IssuesSourceViewer.tsx index 6654a069a87..6209307c532 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/IssuesSourceViewer.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/IssuesSourceViewer.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import SourceViewer from '../../../components/SourceViewer/SourceViewer'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import { BranchLike } from '../../../types/branch-like'; import CrossComponentSourceViewer from '../crossComponentSourceViewer/CrossComponentSourceViewer'; import { getLocations, getSelectedLocation } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/issues/components/MyIssuesFilter.tsx b/server/sonar-web/src/main/js/apps/issues/components/MyIssuesFilter.tsx index 31dc102f7ee..c20291bf6ef 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/MyIssuesFilter.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/MyIssuesFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { myIssues: boolean; diff --git a/server/sonar-web/src/main/js/apps/issues/components/NoIssues.tsx b/server/sonar-web/src/main/js/apps/issues/components/NoIssues.tsx index 088665575c4..79f3a88cc80 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/NoIssues.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/NoIssues.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import '../../../components/common/EmptySearch.css'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function NoIssues() { return ( diff --git a/server/sonar-web/src/main/js/apps/issues/components/NoMyIssues.tsx b/server/sonar-web/src/main/js/apps/issues/components/NoMyIssues.tsx index f4e495985d7..3d1e351fb65 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/NoMyIssues.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/NoMyIssues.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import '../../../components/common/EmptySearch.css'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function NoMyIssues() { return ( diff --git a/server/sonar-web/src/main/js/apps/issues/components/PageActions.tsx b/server/sonar-web/src/main/js/apps/issues/components/PageActions.tsx index 09f9fc8a224..0c9f4c35adc 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/PageActions.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/PageActions.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import HomePageSelect from '../../../components/controls/HomePageSelect'; import PageShortcutsTooltip from '../../../components/ui/PageShortcutsTooltip'; import { isSonarCloud } from '../../../helpers/system'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import IssuesCounter from './IssuesCounter'; import TotalEffort from './TotalEffort'; diff --git a/server/sonar-web/src/main/js/apps/issues/components/TotalEffort.tsx b/server/sonar-web/src/main/js/apps/issues/components/TotalEffort.tsx index 53a5511225c..c03300e4a7a 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/TotalEffort.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/TotalEffort.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; export default function TotalEffort({ effort }: { effort: number }) { return ( diff --git a/server/sonar-web/src/main/js/apps/issues/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/issues/components/__tests__/App-test.tsx index f4169cbabd1..bd629cc8ff2 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/__tests__/App-test.tsx @@ -20,15 +20,6 @@ import { shallow } from 'enzyme'; import * as key from 'keymaster'; import * as React from 'react'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; -import { KeyCodes } from 'sonar-ui-common/helpers/keycodes'; -import { - addSideBarClass, - addWhitePageClass, - removeSideBarClass, - removeWhitePageClass -} from 'sonar-ui-common/helpers/pages'; -import { KEYCODE_MAP, keydown, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockPullRequest } from '../../../../helpers/mocks/branch-like'; import { mockComponent, @@ -39,6 +30,15 @@ import { mockLoggedInUser, mockRouter } from '../../../../helpers/testMocks'; +import handleRequiredAuthentication from '../../../../sonar-ui-common/helpers/handleRequiredAuthentication'; +import { KeyCodes } from '../../../../sonar-ui-common/helpers/keycodes'; +import { + addSideBarClass, + addWhitePageClass, + removeSideBarClass, + removeWhitePageClass +} from '../../../../sonar-ui-common/helpers/pages'; +import { KEYCODE_MAP, keydown, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { disableLocationsNavigator, enableLocationsNavigator, @@ -50,14 +50,14 @@ import { import App from '../App'; import BulkChangeModal from '../BulkChangeModal'; -jest.mock('sonar-ui-common/helpers/pages', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/pages', () => ({ addSideBarClass: jest.fn(), addWhitePageClass: jest.fn(), removeSideBarClass: jest.fn(), removeWhitePageClass: jest.fn() })); -jest.mock('sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ default: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/issues/components/__tests__/BulkChangeModal-test.tsx b/server/sonar-web/src/main/js/apps/issues/components/__tests__/BulkChangeModal-test.tsx index ec7b73572db..11bd8a3e0b8 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/__tests__/BulkChangeModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/__tests__/BulkChangeModal-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { change, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { searchIssueTags } from '../../../../api/issues'; import { mockIssue } from '../../../../helpers/testMocks'; +import { SubmitButton } from '../../../../sonar-ui-common/components/controls/buttons'; +import Select from '../../../../sonar-ui-common/components/controls/Select'; +import { change, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import BulkChangeModal, { MAX_PAGE_SIZE } from '../BulkChangeModal'; jest.mock('../../../../api/issues', () => ({ diff --git a/server/sonar-web/src/main/js/apps/issues/components/__tests__/IssuesList-test.tsx b/server/sonar-web/src/main/js/apps/issues/components/__tests__/IssuesList-test.tsx index 0eac703a7fa..5695ad06edf 100644 --- a/server/sonar-web/src/main/js/apps/issues/components/__tests__/IssuesList-test.tsx +++ b/server/sonar-web/src/main/js/apps/issues/components/__tests__/IssuesList-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockIssue } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import IssuesList from '../IssuesList'; it('should render correctly', async () => { diff --git a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssueLocationBadge.tsx b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssueLocationBadge.tsx index 841ab10fdd6..b158295fa0c 100644 --- a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssueLocationBadge.tsx +++ b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssueLocationBadge.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import LocationIndex from '../../../components/common/LocationIndex'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; interface Props { count: number; diff --git a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssueLocations.tsx b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssueLocations.tsx index fa4bb827f73..37f17877ccc 100644 --- a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssueLocations.tsx +++ b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssueLocations.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; import ConciseIssueLocationBadge from './ConciseIssueLocationBadge'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssuesList.tsx b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssuesList.tsx index 542231e4b08..7f9449008ce 100644 --- a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssuesList.tsx +++ b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssuesList.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import ConciseIssue from './ConciseIssue'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssuesListHeader.tsx b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssuesListHeader.tsx index bd036c78aaf..305dc312cc8 100644 --- a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssuesListHeader.tsx +++ b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/ConciseIssuesListHeader.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BackButton from 'sonar-ui-common/components/controls/BackButton'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import PageShortcutsTooltip from '../../../components/ui/PageShortcutsTooltip'; +import BackButton from '../../../sonar-ui-common/components/controls/BackButton'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface ConciseIssuesListHeaderProps { displayBackButton: boolean; diff --git a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/CrossFileLocationsNavigator.tsx b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/CrossFileLocationsNavigator.tsx index 8cc75797264..1131f60d157 100644 --- a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/CrossFileLocationsNavigator.tsx +++ b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/CrossFileLocationsNavigator.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { collapsePath } from 'sonar-ui-common/helpers/path'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { collapsePath } from '../../../sonar-ui-common/helpers/path'; import ConciseIssueLocationsNavigatorLocation from './ConciseIssueLocationsNavigatorLocation'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/__tests__/ConciseIssueBox-test.tsx b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/__tests__/ConciseIssueBox-test.tsx index bebbb3d6768..785a0fc8232 100644 --- a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/__tests__/ConciseIssueBox-test.tsx +++ b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/__tests__/ConciseIssueBox-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockIssue } from '../../../../helpers/testMocks'; +import { click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ConciseIssueBox from '../ConciseIssueBox'; it('should render correctly', async () => { diff --git a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/__tests__/CrossFileLocationsNavigator-test.tsx b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/__tests__/CrossFileLocationsNavigator-test.tsx index e7cbc96523e..355e480b2ed 100644 --- a/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/__tests__/CrossFileLocationsNavigator-test.tsx +++ b/server/sonar-web/src/main/js/apps/issues/conciseIssuesList/__tests__/CrossFileLocationsNavigator-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockFlowLocation } from '../../../../helpers/testMocks'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import CrossFileLocationsNavigator from '../CrossFileLocationsNavigator'; const location1: T.FlowLocation = { diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewer.tsx b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewer.tsx index ded02fd4213..827372f88ad 100644 --- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewer.tsx +++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewer.tsx @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../../sonar-ui-common/components/lazyLoadComponent'; const CrossComponentSourceViewer = lazyLoadComponent( () => import(/* webpackPrefetch: true */ './CrossComponentSourceViewerWrapper'), diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewerWrapper.tsx b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewerWrapper.tsx index 99110c40998..8159080a98a 100644 --- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewerWrapper.tsx +++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/CrossComponentSourceViewerWrapper.tsx @@ -19,9 +19,6 @@ */ import { findLastIndex } from 'lodash'; import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getDuplications } from '../../../api/components'; import { getIssueFlowSnippets } from '../../../api/issues'; import throwGlobalError from '../../../app/utils/throwGlobalError'; @@ -38,6 +35,9 @@ import { import { SourceViewerContext } from '../../../components/SourceViewer/SourceViewerContext'; import { WorkspaceContext } from '../../../components/workspace/context'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import ComponentSourceSnippetGroupViewer from './ComponentSourceSnippetGroupViewer'; import { groupLocationsByComponent } from './utils'; diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/SnippetViewer.tsx b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/SnippetViewer.tsx index fb4a5147c62..b43ae9943ac 100644 --- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/SnippetViewer.tsx +++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/SnippetViewer.tsx @@ -19,9 +19,6 @@ */ import classNames from 'classnames'; import * as React from 'react'; -import ExpandSnippetIcon from 'sonar-ui-common/components/icons/ExpandSnippetIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { scrollHorizontally } from 'sonar-ui-common/helpers/scrolling'; import Line from '../../../components/SourceViewer/components/Line'; import { symbolsByLine } from '../../../components/SourceViewer/helpers/indexing'; import { getSecondaryIssueLocationsForLine } from '../../../components/SourceViewer/helpers/issueLocations'; @@ -30,6 +27,9 @@ import { optimizeLocationMessage, optimizeSelectedIssue } from '../../../components/SourceViewer/helpers/lines'; +import ExpandSnippetIcon from '../../../sonar-ui-common/components/icons/ExpandSnippetIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { scrollHorizontally } from '../../../sonar-ui-common/helpers/scrolling'; import { BranchLike } from '../../../types/branch-like'; import './SnippetViewer.css'; import { inSnippet, LINES_BELOW_ISSUE } from './utils'; diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/ComponentSourceSnippetGroupViewer-test.tsx b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/ComponentSourceSnippetGroupViewer-test.tsx index 82815cd70ca..b70c1779de4 100644 --- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/ComponentSourceSnippetGroupViewer-test.tsx +++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/ComponentSourceSnippetGroupViewer-test.tsx @@ -20,7 +20,6 @@ import { mount, ReactWrapper, shallow } from 'enzyme'; import { range, times } from 'lodash'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getSources } from '../../../../api/components'; import Issue from '../../../../components/issue/Issue'; import { mockBranch, mockMainBranch } from '../../../../helpers/mocks/branch-like'; @@ -31,6 +30,7 @@ import { mockSourceLine, mockSourceViewerFile } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ComponentSourceSnippetGroupViewer from '../ComponentSourceSnippetGroupViewer'; import SnippetViewer from '../SnippetViewer'; diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/CrossComponentSourceViewerWrapper-test.tsx b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/CrossComponentSourceViewerWrapper-test.tsx index 088058f9735..e1385d49a63 100644 --- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/CrossComponentSourceViewerWrapper-test.tsx +++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/CrossComponentSourceViewerWrapper-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getDuplications } from '../../../../api/components'; import { getIssueFlowSnippets } from '../../../../api/issues'; import { @@ -29,6 +28,7 @@ import { mockSourceLine, mockSourceViewerFile } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import CrossComponentSourceViewerWrapper from '../CrossComponentSourceViewerWrapper'; jest.mock('../../../../api/issues', () => { diff --git a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/SnippetViewer-test.tsx b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/SnippetViewer-test.tsx index de1ddca64b2..1bc3d76f177 100644 --- a/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/SnippetViewer-test.tsx +++ b/server/sonar-web/src/main/js/apps/issues/crossComponentSourceViewer/__tests__/SnippetViewer-test.tsx @@ -20,12 +20,12 @@ import { mount, shallow } from 'enzyme'; import { range } from 'lodash'; import * as React from 'react'; -import { scrollHorizontally } from 'sonar-ui-common/helpers/scrolling'; import { mockMainBranch } from '../../../../helpers/mocks/branch-like'; import { mockIssue, mockSourceLine, mockSourceViewerFile } from '../../../../helpers/testMocks'; +import { scrollHorizontally } from '../../../../sonar-ui-common/helpers/scrolling'; import SnippetViewer from '../SnippetViewer'; -jest.mock('sonar-ui-common/helpers/scrolling', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/scrolling', () => ({ scrollHorizontally: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/issues/redirects.ts b/server/sonar-web/src/main/js/apps/issues/redirects.ts index 507844099ee..83671dcf33b 100644 --- a/server/sonar-web/src/main/js/apps/issues/redirects.ts +++ b/server/sonar-web/src/main/js/apps/issues/redirects.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { Location } from 'sonar-ui-common/helpers/urls'; +import { Location } from '../../sonar-ui-common/helpers/urls'; import { areMyIssuesSelected, parseQuery, serializeQuery } from './utils'; function parseHash(hash: string) { diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/AssigneeFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/AssigneeFacet.tsx index 88be4204cfc..3904b0a5cfe 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/AssigneeFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/AssigneeFacet.tsx @@ -19,11 +19,11 @@ */ import { omit, sortBy, without } from 'lodash'; import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { highlightTerm } from 'sonar-ui-common/helpers/search'; import ListStyleFacet from '../../../components/facet/ListStyleFacet'; import Avatar from '../../../components/ui/Avatar'; import { isUserActive } from '../../../helpers/users'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { highlightTerm } from '../../../sonar-ui-common/helpers/search'; import { Facet } from '../../../types/issues'; import { Query, searchAssignees } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/AuthorFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/AuthorFacet.tsx index 24f5b4d74fa..bcedd8f2eb3 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/AuthorFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/AuthorFacet.tsx @@ -19,10 +19,10 @@ */ import { omit } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { highlightTerm } from 'sonar-ui-common/helpers/search'; import { searchIssueAuthors } from '../../../api/issues'; import ListStyleFacet from '../../../components/facet/ListStyleFacet'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { highlightTerm } from '../../../sonar-ui-common/helpers/search'; import { Facet } from '../../../types/issues'; import { Query } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/CreationDateFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/CreationDateFacet.tsx index b05c71c38d3..db082f4d93e 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/CreationDateFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/CreationDateFacet.tsx @@ -21,19 +21,19 @@ import * as isSameDay from 'date-fns/is_same_day'; import { max } from 'lodash'; import * as React from 'react'; import { InjectedIntlProps, injectIntl } from 'react-intl'; -import BarChart from 'sonar-ui-common/components/charts/BarChart'; -import { longFormatterOption } from 'sonar-ui-common/components/intl/DateFormatter'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import DateTimeFormatter, { - formatterOption as dateTimeFormatterOption -} from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import DateRangeInput from '../../../components/controls/DateRangeInput'; import FacetBox from '../../../components/facet/FacetBox'; import FacetHeader from '../../../components/facet/FacetHeader'; import FacetItem from '../../../components/facet/FacetItem'; +import BarChart from '../../../sonar-ui-common/components/charts/BarChart'; +import { longFormatterOption } from '../../../sonar-ui-common/components/intl/DateFormatter'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import DateTimeFormatter, { + formatterOption as dateTimeFormatterOption +} from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { isPortfolioLike } from '../../../types/component'; import { Query } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/DirectoryFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/DirectoryFacet.tsx index 9c3cc96e3eb..cca8822e56f 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/DirectoryFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/DirectoryFacet.tsx @@ -19,13 +19,13 @@ */ import { omit } from 'lodash'; import * as React from 'react'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { collapsePath } from 'sonar-ui-common/helpers/path'; -import { highlightTerm } from 'sonar-ui-common/helpers/search'; import { getDirectories } from '../../../api/components'; import ListStyleFacet from '../../../components/facet/ListStyleFacet'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { collapsePath } from '../../../sonar-ui-common/helpers/path'; +import { highlightTerm } from '../../../sonar-ui-common/helpers/search'; import { BranchLike } from '../../../types/branch-like'; import { TreeComponentWithPath } from '../../../types/component'; import { Facet } from '../../../types/issues'; diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/FileFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/FileFacet.tsx index f7d34ac0516..b2c6a8d5d3e 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/FileFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/FileFacet.tsx @@ -19,14 +19,14 @@ */ import { omit } from 'lodash'; import * as React from 'react'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { collapsePath, splitPath } from 'sonar-ui-common/helpers/path'; -import { highlightTerm } from 'sonar-ui-common/helpers/search'; -import { isDefined } from 'sonar-ui-common/helpers/types'; import { getFiles } from '../../../api/components'; import ListStyleFacet from '../../../components/facet/ListStyleFacet'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { collapsePath, splitPath } from '../../../sonar-ui-common/helpers/path'; +import { highlightTerm } from '../../../sonar-ui-common/helpers/search'; +import { isDefined } from '../../../sonar-ui-common/helpers/types'; import { BranchLike } from '../../../types/branch-like'; import { TreeComponentWithPath } from '../../../types/component'; import { Facet } from '../../../types/issues'; diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/LanguageFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/LanguageFacet.tsx index a72c52c47cd..1109b5dbcaf 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/LanguageFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/LanguageFacet.tsx @@ -20,9 +20,9 @@ import { omit, uniqBy } from 'lodash'; import * as React from 'react'; import { connect } from 'react-redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { highlightTerm } from 'sonar-ui-common/helpers/search'; import ListStyleFacet from '../../../components/facet/ListStyleFacet'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { highlightTerm } from '../../../sonar-ui-common/helpers/search'; import { getLanguages, Store } from '../../../store/rootReducer'; import { Facet, ReferencedLanguage } from '../../../types/issues'; import { Query } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/ProjectFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/ProjectFacet.tsx index e8c5c266890..31442815910 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/ProjectFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/ProjectFacet.tsx @@ -19,11 +19,11 @@ */ import { omit } from 'lodash'; import * as React from 'react'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { highlightTerm } from 'sonar-ui-common/helpers/search'; import { getTree, searchProjects } from '../../../api/components'; import ListStyleFacet from '../../../components/facet/ListStyleFacet'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { highlightTerm } from '../../../sonar-ui-common/helpers/search'; import { ComponentQualifier } from '../../../types/component'; import { Facet, ReferencedComponent } from '../../../types/issues'; import { Query } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/ResolutionFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/ResolutionFacet.tsx index 4193a6db766..157a604fa3b 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/ResolutionFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/ResolutionFacet.tsx @@ -19,12 +19,12 @@ */ import { orderBy, without } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import FacetBox from '../../../components/facet/FacetBox'; import FacetHeader from '../../../components/facet/FacetHeader'; import FacetItem from '../../../components/facet/FacetItem'; import FacetItemsList from '../../../components/facet/FacetItemsList'; import MultipleSelectionHint from '../../../components/facet/MultipleSelectionHint'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { formatFacetStat, Query } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/RuleFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/RuleFacet.tsx index 6d17c6163cb..b962c161c69 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/RuleFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/RuleFacet.tsx @@ -19,9 +19,9 @@ */ import { omit } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { searchRules } from '../../../api/rules'; import ListStyleFacet from '../../../components/facet/ListStyleFacet'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Facet, ReferencedRule } from '../../../types/issues'; import { Query } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/ScopeFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/ScopeFacet.tsx index 6c324f7db06..a7c58981a29 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/ScopeFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/ScopeFacet.tsx @@ -19,14 +19,14 @@ */ import { without } from 'lodash'; import * as React from 'react'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import FacetBox from '../../../components/facet/FacetBox'; import FacetHeader from '../../../components/facet/FacetHeader'; import FacetItem from '../../../components/facet/FacetItem'; import FacetItemsList from '../../../components/facet/FacetItemsList'; import MultipleSelectionHint from '../../../components/facet/MultipleSelectionHint'; import { SOURCE_SCOPES } from '../../../helpers/constants'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { formatFacetStat, Query } from '../utils'; export interface ScopeFacetProps { diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/SeverityFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/SeverityFacet.tsx index 695fd3edb1c..3a9ccae6834 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/SeverityFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/SeverityFacet.tsx @@ -19,13 +19,13 @@ */ import { orderBy, without } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import FacetBox from '../../../components/facet/FacetBox'; import FacetHeader from '../../../components/facet/FacetHeader'; import FacetItem from '../../../components/facet/FacetItem'; import FacetItemsList from '../../../components/facet/FacetItemsList'; import MultipleSelectionHint from '../../../components/facet/MultipleSelectionHint'; import SeverityHelper from '../../../components/shared/SeverityHelper'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { formatFacetStat, Query } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/StandardFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/StandardFacet.tsx index dae9a1640df..c779e26ed28 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/StandardFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/StandardFacet.tsx @@ -19,8 +19,6 @@ */ import { omit, sortBy, without } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { highlightTerm } from 'sonar-ui-common/helpers/search'; import FacetBox from '../../../components/facet/FacetBox'; import FacetHeader from '../../../components/facet/FacetHeader'; import FacetItem from '../../../components/facet/FacetItem'; @@ -34,6 +32,8 @@ import { renderSansTop25Category, renderSonarSourceSecurityCategory } from '../../../helpers/security-standard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { highlightTerm } from '../../../sonar-ui-common/helpers/search'; import { Facet } from '../../../types/issues'; import { SecurityStandard, Standards, StandardType } from '../../../types/security'; import { formatFacetStat, Query, STANDARDS } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/StatusFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/StatusFacet.tsx index 1d3cdf0c9f3..80bac60b2c7 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/StatusFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/StatusFacet.tsx @@ -19,13 +19,13 @@ */ import { orderBy, without } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import FacetBox from '../../../components/facet/FacetBox'; import FacetHeader from '../../../components/facet/FacetHeader'; import FacetItem from '../../../components/facet/FacetItem'; import FacetItemsList from '../../../components/facet/FacetItemsList'; import MultipleSelectionHint from '../../../components/facet/MultipleSelectionHint'; import StatusHelper from '../../../components/shared/StatusHelper'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { formatFacetStat, Query } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/TagFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/TagFacet.tsx index 15db7664094..1894d6400ca 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/TagFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/TagFacet.tsx @@ -19,12 +19,12 @@ */ import { omit } from 'lodash'; import * as React from 'react'; -import TagsIcon from 'sonar-ui-common/components/icons/TagsIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { highlightTerm } from 'sonar-ui-common/helpers/search'; import { searchIssueTags } from '../../../api/issues'; import { colors } from '../../../app/theme'; import ListStyleFacet from '../../../components/facet/ListStyleFacet'; +import TagsIcon from '../../../sonar-ui-common/components/icons/TagsIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { highlightTerm } from '../../../sonar-ui-common/helpers/search'; import { Facet } from '../../../types/issues'; import { Query } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/TypeFacet.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/TypeFacet.tsx index ddfea489a61..41e620607c8 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/TypeFacet.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/TypeFacet.tsx @@ -19,14 +19,14 @@ */ import { orderBy, without } from 'lodash'; import * as React from 'react'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import FacetBox from '../../../components/facet/FacetBox'; import FacetHeader from '../../../components/facet/FacetHeader'; import FacetItem from '../../../components/facet/FacetItem'; import FacetItemsList from '../../../components/facet/FacetItemsList'; import MultipleSelectionHint from '../../../components/facet/MultipleSelectionHint'; import { ISSUE_TYPES } from '../../../helpers/constants'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { formatFacetStat, Query } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/StandardFacet-test.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/StandardFacet-test.tsx index 57205c07e31..132f351a353 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/StandardFacet-test.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/StandardFacet-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { getStandards } from '../../../../helpers/security-standard'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { Query } from '../../utils'; import StandardFacet from '../StandardFacet'; diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/StatusFacet-test.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/StatusFacet-test.tsx index 83423e36006..e048b364172 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/StatusFacet-test.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/StatusFacet-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import StatusFacet from '../StatusFacet'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/TypeFacet-test.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/TypeFacet-test.tsx index a4d40255c54..75b67261e59 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/TypeFacet-test.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/__tests__/TypeFacet-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import TypeFacet from '../TypeFacet'; it('should render open by default', () => { diff --git a/server/sonar-web/src/main/js/apps/issues/utils.ts b/server/sonar-web/src/main/js/apps/issues/utils.ts index f01a74a4aad..0ebb14e37bf 100644 --- a/server/sonar-web/src/main/js/apps/issues/utils.ts +++ b/server/sonar-web/src/main/js/apps/issues/utils.ts @@ -17,7 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { searchUsers } from '../../api/users'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import { cleanQuery, parseAsArray, @@ -28,10 +29,9 @@ import { serializeDateShort, serializeString, serializeStringArray -} from 'sonar-ui-common/helpers/query'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; -import { get, save } from 'sonar-ui-common/helpers/storage'; -import { searchUsers } from '../../api/users'; +} from '../../sonar-ui-common/helpers/query'; +import { scrollToElement } from '../../sonar-ui-common/helpers/scrolling'; +import { get, save } from '../../sonar-ui-common/helpers/storage'; import { Facet, RawFacet } from '../../types/issues'; import { SecurityStandard, StandardType } from '../../types/security'; diff --git a/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx b/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx index 3e620caf7eb..465ab30cf86 100644 --- a/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/maintenance/components/App.tsx @@ -21,14 +21,14 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import TimeFormatter from 'sonar-ui-common/components/intl/TimeFormatter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl, getReturnUrl } from 'sonar-ui-common/helpers/urls'; import { getMigrationStatus, getSystemStatus, migrateDatabase } from '../../../api/system'; import InstanceMessage from '../../../components/common/InstanceMessage'; import { isSonarCloud } from '../../../helpers/system'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import TimeFormatter from '../../../sonar-ui-common/components/intl/TimeFormatter'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl, getReturnUrl } from '../../../sonar-ui-common/helpers/urls'; import '../styles.css'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/maintenance/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/maintenance/components/__tests__/App-test.tsx index e2659ccfaa0..f51b1d9c632 100644 --- a/server/sonar-web/src/main/js/apps/maintenance/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/maintenance/components/__tests__/App-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import App from '../App'; jest.mock('../../../../api/system', () => ({ diff --git a/server/sonar-web/src/main/js/apps/maintenance/routes.tsx b/server/sonar-web/src/main/js/apps/maintenance/routes.tsx index 1f30240715d..80881819f79 100644 --- a/server/sonar-web/src/main/js/apps/maintenance/routes.tsx +++ b/server/sonar-web/src/main/js/apps/maintenance/routes.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { IndexRoute } from 'react-router'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; export const maintenanceRoutes = ( <IndexRoute component={lazyLoadComponent(() => import('./components/MaintenanceAppContainer'))} /> diff --git a/server/sonar-web/src/main/js/apps/marketplace/App.tsx b/server/sonar-web/src/main/js/apps/marketplace/App.tsx index 9ccdb29511c..24e4a7595d5 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/App.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/App.tsx @@ -22,9 +22,6 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getAvailablePlugins, getInstalledPlugins, @@ -34,6 +31,9 @@ import { import { getValues, setSimpleSettingValue } from '../../api/settings'; import Suggestions from '../../app/components/embed-docs-modal/Suggestions'; import { Location, Router, withRouter } from '../../components/hoc/withRouter'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { EditionKey } from '../../types/editions'; import { PendingPluginResult, Plugin, RiskConsent } from '../../types/plugins'; import { SettingsKey } from '../../types/settings'; diff --git a/server/sonar-web/src/main/js/apps/marketplace/Footer.tsx b/server/sonar-web/src/main/js/apps/marketplace/Footer.tsx index c41f5c3174d..bec229d6cdd 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/Footer.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/Footer.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; interface Props { total: number; diff --git a/server/sonar-web/src/main/js/apps/marketplace/Header.tsx b/server/sonar-web/src/main/js/apps/marketplace/Header.tsx index 7701fb3bbd1..262f5a9ade2 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/Header.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/Header.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { EditionKey } from '../../types/editions'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/marketplace/Search.tsx b/server/sonar-web/src/main/js/apps/marketplace/Search.tsx index 0b04e38cd32..71e2adf9eef 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/Search.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/Search.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import RadioToggle from '../../sonar-ui-common/components/controls/RadioToggle'; +import SearchBox from '../../sonar-ui-common/components/controls/SearchBox'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { Query } from './utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/marketplace/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/marketplace/__tests__/App-test.tsx index ea6e4456137..b54164224d2 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/__tests__/App-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getAvailablePlugins, getInstalledPlugins, @@ -28,6 +27,7 @@ import { } from '../../../api/plugins'; import { getValues, setSimpleSettingValue } from '../../../api/settings'; import { mockLocation, mockRouter } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { EditionKey } from '../../../types/editions'; import { RiskConsent } from '../../../types/plugins'; import { SettingsKey } from '../../../types/settings'; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx index 7279855d7fe..f811f261c2b 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/EditionBox.tsx @@ -21,9 +21,9 @@ import tooltipDCE from 'Docs/tooltips/editions/datacenter.md'; import tooltipDE from 'Docs/tooltips/editions/developer.md'; import tooltipEE from 'Docs/tooltips/editions/enterprise.md'; import * as React from 'react'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getEditionUrl } from '../../../helpers/editions'; +import { lazyLoadComponent } from '../../../sonar-ui-common/components/lazyLoadComponent'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Edition, EditionKey } from '../../../types/editions'; const DocMarkdownBlock = lazyLoadComponent( diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/LicensePromptModal.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/LicensePromptModal.tsx index 12ae21cd106..6fd515a3471 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/LicensePromptModal.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/LicensePromptModal.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onClose: () => void; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginActions.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginActions.tsx index f5f04df2afd..a705f43ff03 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginActions.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginActions.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import CheckIcon from 'sonar-ui-common/components/icons/CheckIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { installPlugin, uninstallPlugin, updatePlugin } from '../../../api/plugins'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import Checkbox from '../../../sonar-ui-common/components/controls/Checkbox'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import CheckIcon from '../../../sonar-ui-common/components/icons/CheckIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { isAvailablePlugin, isInstalledPlugin, Plugin } from '../../../types/plugins'; import PluginUpdateButton from './PluginUpdateButton'; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginAvailable.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginAvailable.tsx index ccf65ac8e08..318ce5c98e4 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginAvailable.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginAvailable.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { AvailablePlugin, InstalledPlugin } from '../../../types/plugins'; import PluginChangeLogButton from './PluginChangeLogButton'; import PluginDescription from './PluginDescription'; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLog.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLog.tsx index 306b79c07c0..f3d14fa3a1f 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLog.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLog.tsx @@ -19,7 +19,7 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Release, Update } from '../../../types/plugins'; import PluginChangeLogItem from './PluginChangeLogItem'; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogButton.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogButton.tsx index 83104fb87cd..a2952406bb0 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogButton.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogButton.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import EllipsisIcon from 'sonar-ui-common/components/icons/EllipsisIcon'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Dropdown from '../../../sonar-ui-common/components/controls/Dropdown'; +import EllipsisIcon from '../../../sonar-ui-common/components/icons/EllipsisIcon'; import { Release, Update } from '../../../types/plugins'; import PluginChangeLog from './PluginChangeLog'; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogItem.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogItem.tsx index aedf82c1f64..25f904fe26d 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogItem.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginChangeLogItem.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import DateFormatter from '../../../sonar-ui-common/components/intl/DateFormatter'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Release, Update } from '../../../types/plugins'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginInstalled.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginInstalled.tsx index 597d63f77d1..11bb65ad80c 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginInstalled.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginInstalled.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { InstalledPlugin } from '../../../types/plugins'; import PluginDescription from './PluginDescription'; import PluginLicense from './PluginLicense'; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginLicense.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginLicense.tsx index 941a962ac89..0aa2329b7eb 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginLicense.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginLicense.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { license?: string; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginOrganization.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginOrganization.tsx index 225a9a4bdc6..5bcceb6fe14 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginOrganization.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginOrganization.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Plugin } from '../../../types/plugins'; export interface PluginOrganizationProps { diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginRiskConsentBox.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginRiskConsentBox.tsx index ed8cff315fd..be572709c35 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginRiskConsentBox.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginRiskConsentBox.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { EditionKey } from '../../../types/editions'; import { RiskConsent } from '../../../types/plugins'; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginStatus.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginStatus.tsx index 5a29bc2af13..0ec951648f9 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginStatus.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginStatus.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Plugin } from '../../../types/plugins'; import PluginActions from './PluginActions'; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateButton.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateButton.tsx index 04bf0e53364..9925ab9f114 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateButton.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateButton.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Update } from '../../../types/plugins'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateItem.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateItem.tsx index 524c4f3765b..9af6f0f22b7 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateItem.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdateItem.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Release, Update } from '../../../types/plugins'; import PluginChangeLogButton from './PluginChangeLogButton'; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdates.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdates.tsx index cc09aeb68d9..25a431ebea7 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdates.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginUpdates.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Update } from '../../../types/plugins'; import PluginUpdateItem from './PluginUpdateItem'; diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/PluginUrls.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/PluginUrls.tsx index d59b784468d..ad17d28ed8c 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/components/PluginUrls.tsx +++ b/server/sonar-web/src/main/js/apps/marketplace/components/PluginUrls.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Plugin } from '../../../types/plugins'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/marketplace/routes.ts b/server/sonar-web/src/main/js/apps/marketplace/routes.ts index a4467d87232..2d6991b424c 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/routes.ts +++ b/server/sonar-web/src/main/js/apps/marketplace/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/marketplace/utils.ts b/server/sonar-web/src/main/js/apps/marketplace/utils.ts index 39b6c7d355d..a6e139d6fe6 100644 --- a/server/sonar-web/src/main/js/apps/marketplace/utils.ts +++ b/server/sonar-web/src/main/js/apps/marketplace/utils.ts @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { memoize } from 'lodash'; -import { cleanQuery, parseAsString, serializeString } from 'sonar-ui-common/helpers/query'; +import { cleanQuery, parseAsString, serializeString } from '../../sonar-ui-common/helpers/query'; import { Plugin } from '../../types/plugins'; export interface Query { diff --git a/server/sonar-web/src/main/js/apps/overview/branches/ActivityPanel.tsx b/server/sonar-web/src/main/js/apps/overview/branches/ActivityPanel.tsx index 22a4c7e360f..f8baa938ff9 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/ActivityPanel.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/ActivityPanel.tsx @@ -18,9 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import GraphsHeader from '../../../components/activity-graph/GraphsHeader'; import GraphsHistory from '../../../components/activity-graph/GraphsHistory'; import { @@ -30,6 +27,9 @@ import { splitSeriesInGraphs } from '../../../components/activity-graph/utils'; import ActivityLink from '../../../components/common/ActivityLink'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import { GraphType, MeasureHistory } from '../../../types/project-activity'; import Analysis from './Analysis'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/Analysis.tsx b/server/sonar-web/src/main/js/apps/overview/branches/Analysis.tsx index bd812f80007..a263f8ff8be 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/Analysis.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/Analysis.tsx @@ -19,8 +19,8 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import DateTimeFormatter from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ComponentQualifier } from '../../../types/component'; import Event from './Event'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/ApplicationLeakPeriodInfo.tsx b/server/sonar-web/src/main/js/apps/overview/branches/ApplicationLeakPeriodInfo.tsx index 459eedb4fe0..7639d46ed66 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/ApplicationLeakPeriodInfo.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/ApplicationLeakPeriodInfo.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { ApplicationPeriod } from '../../../types/application'; export interface ApplicationLeakPeriodInfoProps { diff --git a/server/sonar-web/src/main/js/apps/overview/branches/BranchOverview.tsx b/server/sonar-web/src/main/js/apps/overview/branches/BranchOverview.tsx index c1ccd55b86d..7ab24817f18 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/BranchOverview.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/BranchOverview.tsx @@ -19,8 +19,6 @@ */ import { sortBy, uniq } from 'lodash'; import * as React from 'react'; -import { parseDate, toNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { isDefined } from 'sonar-ui-common/helpers/types'; import { getApplicationDetails, getApplicationLeak } from '../../../api/application'; import { getMeasuresWithPeriodAndMetrics } from '../../../api/measures'; import { getProjectActivity } from '../../../api/projectActivity'; @@ -42,6 +40,8 @@ import { extractStatusConditionsFromApplicationStatusChildProject, extractStatusConditionsFromProjectStatus } from '../../../helpers/qualityGates'; +import { parseDate, toNotSoISOString } from '../../../sonar-ui-common/helpers/dates'; +import { isDefined } from '../../../sonar-ui-common/helpers/types'; import { ProjectAlmBindingResponse } from '../../../types/alm-settings'; import { ApplicationPeriod } from '../../../types/application'; import { Branch, BranchLike } from '../../../types/branch-like'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/BranchOverviewRenderer.tsx b/server/sonar-web/src/main/js/apps/overview/branches/BranchOverviewRenderer.tsx index 52cf4428bbf..558e456b6da 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/BranchOverviewRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/BranchOverviewRenderer.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import { ProjectAlmBindingResponse } from '../../../types/alm-settings'; import { ApplicationPeriod } from '../../../types/application'; import { Branch } from '../../../types/branch-like'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/DebtValue.tsx b/server/sonar-web/src/main/js/apps/overview/branches/DebtValue.tsx index 45bd5914a73..49c2783c4a4 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/DebtValue.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/DebtValue.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { getLocalizedMetricName, translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getLeakValue } from '../../../components/measure/utils'; import DrilldownLink from '../../../components/shared/DrilldownLink'; import { findMeasure, localizeMetric } from '../../../helpers/measures'; +import { getLocalizedMetricName, translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { BranchLike } from '../../../types/branch-like'; import { MetricKey } from '../../../types/metrics'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/DrilldownMeasureValue.tsx b/server/sonar-web/src/main/js/apps/overview/branches/DrilldownMeasureValue.tsx index d633161592f..f0fd35e6f18 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/DrilldownMeasureValue.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/DrilldownMeasureValue.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { getLocalizedMetricName } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import DrilldownLink from '../../../components/shared/DrilldownLink'; import { findMeasure } from '../../../helpers/measures'; +import { getLocalizedMetricName } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { BranchLike } from '../../../types/branch-like'; import { MetricKey } from '../../../types/metrics'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/Event.tsx b/server/sonar-web/src/main/js/apps/overview/branches/Event.tsx index 18b57a455bd..18db26b01e8 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/Event.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/Event.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import Level from 'sonar-ui-common/components/ui/Level'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Level from '../../../sonar-ui-common/components/ui/Level'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { isDefinitionChangeEvent } from '../../projectActivity/components/DefinitionChangeEventInner'; import { isRichQualityGateEvent } from '../../projectActivity/components/RichQualityGateEventInner'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/FirstAnalysisNextStepsNotif.tsx b/server/sonar-web/src/main/js/apps/overview/branches/FirstAnalysisNextStepsNotif.tsx index 2db27f088b2..eec07932cf1 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/FirstAnalysisNextStepsNotif.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/FirstAnalysisNextStepsNotif.tsx @@ -20,10 +20,10 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { withCurrentUser } from '../../../components/hoc/withCurrentUser'; import DismissableAlert from '../../../components/ui/DismissableAlert'; import { isLoggedIn } from '../../../helpers/users'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ProjectAlmBindingResponse } from '../../../types/alm-settings'; import { ComponentQualifier } from '../../../types/component'; import { PULL_REQUEST_DECORATION_BINDING_CATEGORY } from '../../settings/components/AdditionalCategoryKeys'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanel.tsx b/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanel.tsx index 2e1cbae10d9..651c9cb83a9 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanel.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanel.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BoxedTabs from 'sonar-ui-common/components/controls/BoxedTabs'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { isDiffMetric } from 'sonar-ui-common/helpers/measures'; import { rawSizes } from '../../../app/theme'; import ComponentReportActions from '../../../components/controls/ComponentReportActions'; import { findMeasure } from '../../../helpers/measures'; +import BoxedTabs from '../../../sonar-ui-common/components/controls/BoxedTabs'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { isDiffMetric } from '../../../sonar-ui-common/helpers/measures'; import { ApplicationPeriod } from '../../../types/application'; import { Branch } from '../../../types/branch-like'; import { ComponentQualifier } from '../../../types/component'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelIssueMeasureRow.tsx b/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelIssueMeasureRow.tsx index 05139e5c596..5bf789f78d2 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelIssueMeasureRow.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelIssueMeasureRow.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import { ComponentQualifier } from '../../../types/component'; import { IssueType } from '../../../types/issues'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelNoNewCode.tsx b/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelNoNewCode.tsx index ccd24a82b46..83a822f2463 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelNoNewCode.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/MeasuresPanelNoNewCode.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { Branch } from '../../../types/branch-like'; import { ComponentQualifier } from '../../../types/component'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/NoCodeWarning.tsx b/server/sonar-web/src/main/js/apps/overview/branches/NoCodeWarning.tsx index 2b0d5833577..2a330b66f61 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/NoCodeWarning.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/NoCodeWarning.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getBranchLikeDisplayName, isMainBranch } from '../../../helpers/branch-like'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import { ComponentQualifier } from '../../../types/component'; import { MetricKey } from '../../../types/metrics'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/ProjectLeakPeriodInfo.tsx b/server/sonar-web/src/main/js/apps/overview/branches/ProjectLeakPeriodInfo.tsx index bf8641bd335..136f545b5cd 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/ProjectLeakPeriodInfo.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/ProjectLeakPeriodInfo.tsx @@ -19,11 +19,11 @@ */ import * as React from 'react'; import { InjectedIntl, injectIntl } from 'react-intl'; -import { longFormatterOption } from 'sonar-ui-common/components/intl/DateFormatter'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import { formatterOption } from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getPeriodDate, getPeriodLabel } from '../../../helpers/periods'; +import { longFormatterOption } from '../../../sonar-ui-common/components/intl/DateFormatter'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import { formatterOption } from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; export interface ProjectLeakPeriodInfoProps { intl: Pick<InjectedIntl, 'formatDate' | 'formatTime'>; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/QualityGatePanel.tsx b/server/sonar-web/src/main/js/apps/overview/branches/QualityGatePanel.tsx index a78943a9d8c..e63a9f7a16a 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/QualityGatePanel.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/QualityGatePanel.tsx @@ -19,10 +19,10 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { QualityGateStatus } from '../../../types/quality-gates'; import QualityGatePanelSection from './QualityGatePanelSection'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/QualityGatePanelSection.tsx b/server/sonar-web/src/main/js/apps/overview/branches/QualityGatePanelSection.tsx index af666d7d05f..b763442d58b 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/QualityGatePanelSection.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/QualityGatePanelSection.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { isDiffMetric } from '../../../helpers/measures'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import { ComponentQualifier } from '../../../types/component'; import { QualityGateStatus } from '../../../types/quality-gates'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/SecurityHotspotsReviewed.tsx b/server/sonar-web/src/main/js/apps/overview/branches/SecurityHotspotsReviewed.tsx index 038a9d08f2b..ea833f31b44 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/SecurityHotspotsReviewed.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/SecurityHotspotsReviewed.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getLeakValue } from '../../../components/measure/utils'; import CoverageRating from '../../../components/ui/CoverageRating'; import { findMeasure } from '../../../helpers/measures'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { MetricKey } from '../../../types/metrics'; export interface SecurityHotspotsReviewedProps { diff --git a/server/sonar-web/src/main/js/apps/overview/branches/__tests__/ActivityPanel-test.tsx b/server/sonar-web/src/main/js/apps/overview/branches/__tests__/ActivityPanel-test.tsx index e4e6689657b..8e8b5bee578 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/__tests__/ActivityPanel-test.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/__tests__/ActivityPanel-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; import GraphsHistory from '../../../../components/activity-graph/GraphsHistory'; import { mockMainBranch } from '../../../../helpers/mocks/branch-like'; import { @@ -29,6 +28,7 @@ import { mockMeasure, mockMetric } from '../../../../helpers/testMocks'; +import { parseDate } from '../../../../sonar-ui-common/helpers/dates'; import { GraphType } from '../../../../types/project-activity'; import { ActivityPanel, ActivityPanelProps } from '../ActivityPanel'; diff --git a/server/sonar-web/src/main/js/apps/overview/branches/__tests__/ApplicationLeakPeriodInfo-test.tsx b/server/sonar-web/src/main/js/apps/overview/branches/__tests__/ApplicationLeakPeriodInfo-test.tsx index 95d1b81551b..6a6df76ed46 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/__tests__/ApplicationLeakPeriodInfo-test.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/__tests__/ApplicationLeakPeriodInfo-test.tsx @@ -25,7 +25,7 @@ import { ApplicationLeakPeriodInfoProps } from '../ApplicationLeakPeriodInfo'; -jest.mock('sonar-ui-common/components/intl/DateFromNow'); +jest.mock('../../../../sonar-ui-common/components/intl/DateFromNow'); it('renders correctly', () => { const wrapper = shallowRender(); diff --git a/server/sonar-web/src/main/js/apps/overview/branches/__tests__/BranchOverview-test.tsx b/server/sonar-web/src/main/js/apps/overview/branches/__tests__/BranchOverview-test.tsx index d7374852d03..e046e01e7cf 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/__tests__/BranchOverview-test.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/__tests__/BranchOverview-test.tsx @@ -20,8 +20,6 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { isDiffMetric } from 'sonar-ui-common/helpers/measures'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getApplicationDetails, getApplicationLeak } from '../../../../api/application'; import { getMeasuresWithPeriodAndMetrics } from '../../../../api/measures'; import { getProjectActivity } from '../../../../api/projectActivity'; @@ -33,13 +31,15 @@ import { getAllTimeMachineData } from '../../../../api/time-machine'; import { getActivityGraph, saveActivityGraph } from '../../../../components/activity-graph/utils'; import { mockBranch, mockMainBranch } from '../../../../helpers/mocks/branch-like'; import { mockAnalysis, mockComponent } from '../../../../helpers/testMocks'; +import { isDiffMetric } from '../../../../sonar-ui-common/helpers/measures'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { ComponentQualifier } from '../../../../types/component'; import { MetricKey } from '../../../../types/metrics'; import { GraphType } from '../../../../types/project-activity'; import BranchOverview, { BRANCH_OVERVIEW_ACTIVITY_GRAPH, NO_CI_DETECTED } from '../BranchOverview'; import BranchOverviewRenderer from '../BranchOverviewRenderer'; -jest.mock('sonar-ui-common/helpers/dates', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/dates', () => ({ parseDate: jest.fn(date => `PARSED:${date}`), toNotSoISOString: jest.fn(date => date) })); diff --git a/server/sonar-web/src/main/js/apps/overview/branches/__tests__/MeasuresPanel-test.tsx b/server/sonar-web/src/main/js/apps/overview/branches/__tests__/MeasuresPanel-test.tsx index fcd90000e8a..2fb9aaaaa3a 100644 --- a/server/sonar-web/src/main/js/apps/overview/branches/__tests__/MeasuresPanel-test.tsx +++ b/server/sonar-web/src/main/js/apps/overview/branches/__tests__/MeasuresPanel-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import BoxedTabs from 'sonar-ui-common/components/controls/BoxedTabs'; import { mockBranch, mockMainBranch } from '../../../../helpers/mocks/branch-like'; import { mockComponent, @@ -27,6 +26,7 @@ import { mockMetric, mockPeriod } from '../../../../helpers/testMocks'; +import BoxedTabs from '../../../../sonar-ui-common/components/controls/BoxedTabs'; import { ComponentQualifier } from '../../../../types/component'; import { MetricKey } from '../../../../types/metrics'; import { MeasuresPanel, MeasuresPanelProps, MeasuresPanelTabs } from '../MeasuresPanel'; diff --git a/server/sonar-web/src/main/js/apps/overview/components/App.tsx b/server/sonar-web/src/main/js/apps/overview/components/App.tsx index cd1b6ff4a5a..093d5412636 100644 --- a/server/sonar-web/src/main/js/apps/overview/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/overview/components/App.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; import { withAppState } from '../../../components/hoc/withAppState'; import { Router, withRouter } from '../../../components/hoc/withRouter'; import { isPullRequest } from '../../../helpers/branch-like'; +import { lazyLoadComponent } from '../../../sonar-ui-common/components/lazyLoadComponent'; import { ProjectAlmBindingResponse } from '../../../types/alm-settings'; import { BranchLike } from '../../../types/branch-like'; import { isPortfolioLike } from '../../../types/component'; diff --git a/server/sonar-web/src/main/js/apps/overview/components/EmptyOverview.tsx b/server/sonar-web/src/main/js/apps/overview/components/EmptyOverview.tsx index a17ec366fa0..083ee35ccef 100644 --- a/server/sonar-web/src/main/js/apps/overview/components/EmptyOverview.tsx +++ b/server/sonar-web/src/main/js/apps/overview/components/EmptyOverview.tsx @@ -20,11 +20,11 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { connect } from 'react-redux'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import TutorialSelection from '../../../components/tutorials/TutorialSelection'; import { getBranchLikeDisplayName, isBranch, isMainBranch } from '../../../helpers/branch-like'; import { isLoggedIn } from '../../../helpers/users'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getCurrentUser, Store } from '../../../store/rootReducer'; import { ProjectAlmBindingResponse } from '../../../types/alm-settings'; import { BranchLike } from '../../../types/branch-like'; diff --git a/server/sonar-web/src/main/js/apps/overview/components/IssueLabel.tsx b/server/sonar-web/src/main/js/apps/overview/components/IssueLabel.tsx index fa3a0815de2..425bad16d02 100644 --- a/server/sonar-web/src/main/js/apps/overview/components/IssueLabel.tsx +++ b/server/sonar-web/src/main/js/apps/overview/components/IssueLabel.tsx @@ -19,13 +19,13 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure, localizeMetric } from 'sonar-ui-common/helpers/measures'; import { getLeakValue } from '../../../components/measure/utils'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; import { findMeasure } from '../../../helpers/measures'; import { getComponentIssuesUrl, getComponentSecurityHotspotsUrl } from '../../../helpers/urls'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure, localizeMetric } from '../../../sonar-ui-common/helpers/measures'; import { BranchLike } from '../../../types/branch-like'; import { IssueType } from '../../../types/issues'; import { getIssueIconClass, getIssueMetricKey } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/overview/components/IssueRating.tsx b/server/sonar-web/src/main/js/apps/overview/components/IssueRating.tsx index 39e16126da4..3ded99b2125 100644 --- a/server/sonar-web/src/main/js/apps/overview/components/IssueRating.tsx +++ b/server/sonar-web/src/main/js/apps/overview/components/IssueRating.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import Rating from 'sonar-ui-common/components/ui/Rating'; import { getLeakValue, getRatingTooltip } from '../../../components/measure/utils'; import DrilldownLink from '../../../components/shared/DrilldownLink'; import { findMeasure } from '../../../helpers/measures'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import Rating from '../../../sonar-ui-common/components/ui/Rating'; import { BranchLike } from '../../../types/branch-like'; import { IssueType } from '../../../types/issues'; import { getIssueRatingMetricKey, getIssueRatingName } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/overview/components/LeakPeriodLegend.tsx b/server/sonar-web/src/main/js/apps/overview/components/LeakPeriodLegend.tsx index 77deaff25c3..58b4a91df86 100644 --- a/server/sonar-web/src/main/js/apps/overview/components/LeakPeriodLegend.tsx +++ b/server/sonar-web/src/main/js/apps/overview/components/LeakPeriodLegend.tsx @@ -20,14 +20,16 @@ import * as differenceInDays from 'date-fns/difference_in_days'; import * as React from 'react'; import { InjectedIntlProps, injectIntl } from 'react-intl'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import DateFormatter, { longFormatterOption } from 'sonar-ui-common/components/intl/DateFormatter'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; +import { getPeriodDate, getPeriodLabel } from '../../../helpers/periods'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import DateFormatter, { + longFormatterOption +} from '../../../sonar-ui-common/components/intl/DateFormatter'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; import DateTimeFormatter, { formatterOption -} from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { getPeriodDate, getPeriodLabel } from '../../../helpers/periods'; +} from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { period: T.Period; diff --git a/server/sonar-web/src/main/js/apps/overview/components/MeasurementLabel.tsx b/server/sonar-web/src/main/js/apps/overview/components/MeasurementLabel.tsx index 7bf140aa929..2b1152839b8 100644 --- a/server/sonar-web/src/main/js/apps/overview/components/MeasurementLabel.tsx +++ b/server/sonar-web/src/main/js/apps/overview/components/MeasurementLabel.tsx @@ -19,11 +19,11 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getLeakValue } from '../../../components/measure/utils'; import DrilldownLink from '../../../components/shared/DrilldownLink'; import { findMeasure } from '../../../helpers/measures'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { BranchLike } from '../../../types/branch-like'; import { getMeasurementIconClass, diff --git a/server/sonar-web/src/main/js/apps/overview/components/QualityGateCondition.tsx b/server/sonar-web/src/main/js/apps/overview/components/QualityGateCondition.tsx index f06d652ea4d..e172060331d 100644 --- a/server/sonar-web/src/main/js/apps/overview/components/QualityGateCondition.tsx +++ b/server/sonar-web/src/main/js/apps/overview/components/QualityGateCondition.tsx @@ -20,15 +20,15 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { Link } from 'react-router'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { Location } from 'sonar-ui-common/helpers/urls'; import Measure from '../../../components/measure/Measure'; import DrilldownLink from '../../../components/shared/DrilldownLink'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; import { isDiffMetric } from '../../../helpers/measures'; import { getComponentIssuesUrl, getComponentSecurityHotspotsUrl } from '../../../helpers/urls'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; +import { Location } from '../../../sonar-ui-common/helpers/urls'; import { BranchLike } from '../../../types/branch-like'; import { IssueType } from '../../../types/issues'; import { MetricKey } from '../../../types/metrics'; diff --git a/server/sonar-web/src/main/js/apps/overview/components/QualityGateConditions.tsx b/server/sonar-web/src/main/js/apps/overview/components/QualityGateConditions.tsx index 9de867992c0..8ad441eb601 100644 --- a/server/sonar-web/src/main/js/apps/overview/components/QualityGateConditions.tsx +++ b/server/sonar-web/src/main/js/apps/overview/components/QualityGateConditions.tsx @@ -19,9 +19,9 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import ChevronDownIcon from 'sonar-ui-common/components/icons/ChevronDownIcon'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import ChevronDownIcon from '../../../sonar-ui-common/components/icons/ChevronDownIcon'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import { QualityGateStatusConditionEnhanced } from '../../../types/quality-gates'; import QualityGateCondition from './QualityGateCondition'; diff --git a/server/sonar-web/src/main/js/apps/overview/components/__tests__/QualityGateConditions-test.tsx b/server/sonar-web/src/main/js/apps/overview/components/__tests__/QualityGateConditions-test.tsx index a4e70175647..1e94ca8bc7a 100644 --- a/server/sonar-web/src/main/js/apps/overview/components/__tests__/QualityGateConditions-test.tsx +++ b/server/sonar-web/src/main/js/apps/overview/components/__tests__/QualityGateConditions-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockQualityGateStatusConditionEnhanced } from '../../../../helpers/mocks/quality-gates'; import { mockComponent } from '../../../../helpers/testMocks'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { QualityGateStatusConditionEnhanced } from '../../../../types/quality-gates'; import { QualityGateConditions, QualityGateConditionsProps } from '../QualityGateConditions'; diff --git a/server/sonar-web/src/main/js/apps/overview/pullRequests/AfterMergeEstimate.tsx b/server/sonar-web/src/main/js/apps/overview/pullRequests/AfterMergeEstimate.tsx index af8dd887178..a3cafb9f453 100644 --- a/server/sonar-web/src/main/js/apps/overview/pullRequests/AfterMergeEstimate.tsx +++ b/server/sonar-web/src/main/js/apps/overview/pullRequests/AfterMergeEstimate.tsx @@ -19,9 +19,9 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { findMeasure } from '../../../helpers/measures'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { getMeasurementAfterMergeMetricKey, MeasurementType } from '../utils'; export interface AfterMergeEstimateProps { diff --git a/server/sonar-web/src/main/js/apps/overview/pullRequests/LargeQualityGateBadge.tsx b/server/sonar-web/src/main/js/apps/overview/pullRequests/LargeQualityGateBadge.tsx index 22b522964d2..9374b9efd2b 100644 --- a/server/sonar-web/src/main/js/apps/overview/pullRequests/LargeQualityGateBadge.tsx +++ b/server/sonar-web/src/main/js/apps/overview/pullRequests/LargeQualityGateBadge.tsx @@ -21,11 +21,11 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import HelpIcon from 'sonar-ui-common/components/icons/HelpIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { colors } from '../../../app/theme'; import { getQualityGatesUrl, getQualityGateUrl } from '../../../helpers/urls'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import HelpIcon from '../../../sonar-ui-common/components/icons/HelpIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { component: T.Component; diff --git a/server/sonar-web/src/main/js/apps/overview/pullRequests/PullRequestOverview.tsx b/server/sonar-web/src/main/js/apps/overview/pullRequests/PullRequestOverview.tsx index 39e6f9df1cd..64597fa2e88 100644 --- a/server/sonar-web/src/main/js/apps/overview/pullRequests/PullRequestOverview.tsx +++ b/server/sonar-web/src/main/js/apps/overview/pullRequests/PullRequestOverview.tsx @@ -21,13 +21,13 @@ import * as classNames from 'classnames'; import { differenceBy, uniq } from 'lodash'; import * as React from 'react'; import { connect } from 'react-redux'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { isDefined } from 'sonar-ui-common/helpers/types'; import { getMeasuresWithMetrics } from '../../../api/measures'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; import { enhanceConditionWithMeasure, enhanceMeasuresWithMetrics } from '../../../helpers/measures'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { isDefined } from '../../../sonar-ui-common/helpers/types'; import { fetchBranchStatus } from '../../../store/rootActions'; import { getBranchStatusByBranchLike, Store } from '../../../store/rootReducer'; import { BranchLike, PullRequest } from '../../../types/branch-like'; diff --git a/server/sonar-web/src/main/js/apps/overview/pullRequests/__tests__/PullRequestOverview-test.tsx b/server/sonar-web/src/main/js/apps/overview/pullRequests/__tests__/PullRequestOverview-test.tsx index 3f79a7f6288..75036f41570 100644 --- a/server/sonar-web/src/main/js/apps/overview/pullRequests/__tests__/PullRequestOverview-test.tsx +++ b/server/sonar-web/src/main/js/apps/overview/pullRequests/__tests__/PullRequestOverview-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getMeasuresWithMetrics } from '../../../../api/measures'; import { mockPullRequest } from '../../../../helpers/mocks/branch-like'; import { mockQualityGateStatusCondition } from '../../../../helpers/mocks/quality-gates'; import { mockComponent } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { PR_METRICS } from '../../utils'; import { PullRequestOverview } from '../PullRequestOverview'; diff --git a/server/sonar-web/src/main/js/apps/overview/routes.ts b/server/sonar-web/src/main/js/apps/overview/routes.ts index 854cd1ef120..f57b5528d59 100644 --- a/server/sonar-web/src/main/js/apps/overview/routes.ts +++ b/server/sonar-web/src/main/js/apps/overview/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/overview/utils.ts b/server/sonar-web/src/main/js/apps/overview/utils.ts index f12110c6c1f..3a90a2c5433 100644 --- a/server/sonar-web/src/main/js/apps/overview/utils.ts +++ b/server/sonar-web/src/main/js/apps/overview/utils.ts @@ -17,10 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import DuplicationsRating from 'sonar-ui-common/components/ui/DuplicationsRating'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import CoverageRating from '../../components/ui/CoverageRating'; import { ISSUETYPE_METRIC_KEYS_MAP } from '../../helpers/issues'; +import DuplicationsRating from '../../sonar-ui-common/components/ui/DuplicationsRating'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { IssueType } from '../../types/issues'; import { MetricKey } from '../../types/metrics'; diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.tsx index 103e4ea4959..b98ab8e2ad0 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/ActionsCell.tsx @@ -19,17 +19,17 @@ */ import { difference } from 'lodash'; import * as React from 'react'; -import ActionsDropdown, { - ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { deletePermissionTemplate, setDefaultPermissionTemplate, updatePermissionTemplate } from '../../../api/permissions'; import { Router, withRouter } from '../../../components/hoc/withRouter'; +import ActionsDropdown, { + ActionsDropdownItem +} from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { PERMISSION_TEMPLATES_PATH } from '../utils'; import DeleteForm from './DeleteForm'; import Form from './Form'; diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/App.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/App.tsx index fb94613a334..d3d41a26ac8 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/App.tsx @@ -21,9 +21,9 @@ import { Location } from 'history'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { connect } from 'react-redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getPermissionTemplates } from '../../../api/permissions'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getAppState, Store } from '../../../store/rootReducer'; import '../../permissions/styles.css'; import { mergeDefaultsToTemplates, mergePermissionsToTemplates, sortPermissions } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Defaults.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/Defaults.tsx index d75681dc579..862c5e7f212 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/Defaults.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Defaults.tsx @@ -19,7 +19,7 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { template: T.PermissionTemplate; diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/DeleteForm.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/DeleteForm.tsx index 4d915117ede..3897b635b6d 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/DeleteForm.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/DeleteForm.tsx @@ -18,10 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onClose: () => void; diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Form.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/Form.tsx index 2b3dd4b272d..aa8595b7e59 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/Form.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Form.tsx @@ -18,12 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { confirmButtonText: string; diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Header.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/Header.tsx index 978a38f6a66..ec53e638978 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/Header.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Header.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { createPermissionTemplate } from '../../../api/permissions'; import { Router, withRouter } from '../../../components/hoc/withRouter'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { PERMISSION_TEMPLATES_PATH } from '../utils'; import Form from './Form'; diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Home.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/Home.tsx index d6aa56b495e..4bd8c9de9fb 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/Home.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Home.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Header from './Header'; import List from './List'; diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.tsx index f59bb0964e1..4962e65d652 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import InstanceMessage from '../../../components/common/InstanceMessage'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { permissions: T.Permission[]; diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.tsx index f02b3a4f1ee..b7989446ecc 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { isSonarCloud } from '../../../helpers/system'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { permission: { diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/Template.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/Template.tsx index 7d9987d8388..ffc9ea631d9 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/Template.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/Template.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import * as api from '../../../api/permissions'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import HoldersList from '../../permissions/shared/components/HoldersList'; import SearchForm from '../../permissions/shared/components/SearchForm'; import { diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/TemplateHeader.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/TemplateHeader.tsx index 894536aab32..cf1a984d98b 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/TemplateHeader.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/TemplateHeader.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { PERMISSION_TEMPLATES_PATH } from '../utils'; import ActionsCell from './ActionsCell'; diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/permission-templates/components/__tests__/App-test.tsx index 9612d5b2cee..c9d7874a0c6 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/permission-templates/components/__tests__/App-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockLocation } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { App } from '../App'; jest.mock('../../../../api/permissions', () => ({ diff --git a/server/sonar-web/src/main/js/apps/permission-templates/routes.ts b/server/sonar-web/src/main/js/apps/permission-templates/routes.ts index 854cd1ef120..f57b5528d59 100644 --- a/server/sonar-web/src/main/js/apps/permission-templates/routes.ts +++ b/server/sonar-web/src/main/js/apps/permission-templates/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/permissions/__tests__/utils-test.ts b/server/sonar-web/src/main/js/apps/permissions/__tests__/utils-test.ts index 85a890121f8..4e4e8e14aaf 100644 --- a/server/sonar-web/src/main/js/apps/permissions/__tests__/utils-test.ts +++ b/server/sonar-web/src/main/js/apps/permissions/__tests__/utils-test.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import SonarUiCommonInitializer from 'sonar-ui-common/helpers/init'; import { isSonarCloud } from '../../../helpers/system'; +import SonarUiCommonInitializer from '../../../sonar-ui-common/helpers/init'; import { convertToPermissionDefinitions } from '../utils'; jest.mock('../../../helpers/system', () => ({ isSonarCloud: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.tsx b/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.tsx index cf81750333f..d0fb680c306 100644 --- a/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; +import ListFooter from '../../../../sonar-ui-common/components/controls/ListFooter'; import { getAppState, Store } from '../../../../store/rootReducer'; import { ComponentQualifier } from '../../../../types/component'; import HoldersList from '../../shared/components/HoldersList'; diff --git a/server/sonar-web/src/main/js/apps/permissions/global/components/App.tsx b/server/sonar-web/src/main/js/apps/permissions/global/components/App.tsx index a559000ab02..76e179beddc 100644 --- a/server/sonar-web/src/main/js/apps/permissions/global/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/global/components/App.tsx @@ -20,9 +20,9 @@ import { without } from 'lodash'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import * as api from '../../../../api/permissions'; import Suggestions from '../../../../app/components/embed-docs-modal/Suggestions'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import '../../styles.css'; import AllHoldersList from './AllHoldersList'; import PageHeader from './PageHeader'; diff --git a/server/sonar-web/src/main/js/apps/permissions/global/components/PageHeader.tsx b/server/sonar-web/src/main/js/apps/permissions/global/components/PageHeader.tsx index 8377f350afe..7070b894147 100644 --- a/server/sonar-web/src/main/js/apps/permissions/global/components/PageHeader.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/global/components/PageHeader.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; interface Props { loading?: boolean; diff --git a/server/sonar-web/src/main/js/apps/permissions/global/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/permissions/global/components/__tests__/App-test.tsx index 388aa568d3a..f0ae1af06b5 100644 --- a/server/sonar-web/src/main/js/apps/permissions/global/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/global/components/__tests__/App-test.tsx @@ -19,13 +19,13 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { grantPermissionToGroup, grantPermissionToUser, revokePermissionFromGroup, revokePermissionFromUser } from '../../../../../api/permissions'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import App from '../App'; jest.mock('../../../../../api/permissions', () => ({ diff --git a/server/sonar-web/src/main/js/apps/permissions/project/components/AllHoldersList.tsx b/server/sonar-web/src/main/js/apps/permissions/project/components/AllHoldersList.tsx index 822674320ab..9b0dfbd031e 100644 --- a/server/sonar-web/src/main/js/apps/permissions/project/components/AllHoldersList.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/project/components/AllHoldersList.tsx @@ -19,7 +19,7 @@ */ import { without } from 'lodash'; import * as React from 'react'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; +import ListFooter from '../../../../sonar-ui-common/components/controls/ListFooter'; import HoldersList from '../../shared/components/HoldersList'; import SearchForm from '../../shared/components/SearchForm'; import { convertToPermissionDefinitions, PERMISSIONS_ORDER_BY_QUALIFIER } from '../../utils'; diff --git a/server/sonar-web/src/main/js/apps/permissions/project/components/App.tsx b/server/sonar-web/src/main/js/apps/permissions/project/components/App.tsx index a1118cc2261..8705a95c47f 100644 --- a/server/sonar-web/src/main/js/apps/permissions/project/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/project/components/App.tsx @@ -20,9 +20,9 @@ import { without } from 'lodash'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import * as api from '../../../../api/permissions'; import VisibilitySelector from '../../../../components/common/VisibilitySelector'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import '../../styles.css'; import AllHoldersList from './AllHoldersList'; import PageHeader from './PageHeader'; diff --git a/server/sonar-web/src/main/js/apps/permissions/project/components/ApplyTemplate.tsx b/server/sonar-web/src/main/js/apps/permissions/project/components/ApplyTemplate.tsx index de448687c5d..8aa7313009f 100644 --- a/server/sonar-web/src/main/js/apps/permissions/project/components/ApplyTemplate.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/project/components/ApplyTemplate.tsx @@ -18,15 +18,18 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Select from 'sonar-ui-common/components/controls/Select'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { applyTemplateToProject, getPermissionTemplates } from '../../../../api/permissions'; +import { + ResetButtonLink, + SubmitButton +} from '../../../../sonar-ui-common/components/controls/buttons'; +import Select from '../../../../sonar-ui-common/components/controls/Select'; +import SimpleModal from '../../../../sonar-ui-common/components/controls/SimpleModal'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../../sonar-ui-common/components/ui/DeferredSpinner'; +import MandatoryFieldMarker from '../../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; interface Props { onApply?: () => void; diff --git a/server/sonar-web/src/main/js/apps/permissions/project/components/PageHeader.tsx b/server/sonar-web/src/main/js/apps/permissions/project/components/PageHeader.tsx index 991ba17fad9..34163a4a2f3 100644 --- a/server/sonar-web/src/main/js/apps/permissions/project/components/PageHeader.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/project/components/PageHeader.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { isApplication, isPortfolioLike } from '../../../../types/component'; import ApplyTemplate from './ApplyTemplate'; diff --git a/server/sonar-web/src/main/js/apps/permissions/project/components/PublicProjectDisclaimer.tsx b/server/sonar-web/src/main/js/apps/permissions/project/components/PublicProjectDisclaimer.tsx index c41cae40ebc..fe2ea04d20b 100644 --- a/server/sonar-web/src/main/js/apps/permissions/project/components/PublicProjectDisclaimer.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/project/components/PublicProjectDisclaimer.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import ConfirmModal from '../../../../sonar-ui-common/components/controls/ConfirmModal'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; interface Props { component: { diff --git a/server/sonar-web/src/main/js/apps/permissions/project/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/permissions/project/components/__tests__/App-test.tsx index eedb8c6d737..a3e6666f277 100644 --- a/server/sonar-web/src/main/js/apps/permissions/project/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/project/components/__tests__/App-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { grantPermissionToGroup, grantPermissionToUser, @@ -27,6 +26,7 @@ import { revokePermissionFromUser } from '../../../../../api/permissions'; import { mockComponent } from '../../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import App from '../App'; jest.mock('../../../../../api/permissions', () => ({ diff --git a/server/sonar-web/src/main/js/apps/permissions/project/components/__tests__/ApplyTemplate-test.tsx b/server/sonar-web/src/main/js/apps/permissions/project/components/__tests__/ApplyTemplate-test.tsx index d9e129e1097..a156c334d54 100644 --- a/server/sonar-web/src/main/js/apps/permissions/project/components/__tests__/ApplyTemplate-test.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/project/components/__tests__/ApplyTemplate-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import ApplyTemplate from '../ApplyTemplate'; jest.mock('../../../../../api/permissions', () => ({ diff --git a/server/sonar-web/src/main/js/apps/permissions/routes.ts b/server/sonar-web/src/main/js/apps/permissions/routes.ts index 64a0024e8ee..2120a3ff088 100644 --- a/server/sonar-web/src/main/js/apps/permissions/routes.ts +++ b/server/sonar-web/src/main/js/apps/permissions/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; export const globalPermissionsRoutes = [ { diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/GroupHolder.tsx b/server/sonar-web/src/main/js/apps/permissions/shared/components/GroupHolder.tsx index 1c71b4e11e8..fc3705a020f 100644 --- a/server/sonar-web/src/main/js/apps/permissions/shared/components/GroupHolder.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/GroupHolder.tsx @@ -19,7 +19,7 @@ */ import { without } from 'lodash'; import * as React from 'react'; -import GroupIcon from 'sonar-ui-common/components/icons/GroupIcon'; +import GroupIcon from '../../../../sonar-ui-common/components/icons/GroupIcon'; import { isPermissionDefinitionGroup } from '../../utils'; import PermissionCell from './PermissionCell'; diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx b/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx index 499c039cb68..4bc8839db4c 100644 --- a/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/HoldersList.tsx @@ -19,7 +19,7 @@ */ import { partition, sortBy } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { isPermissionDefinitionGroup } from '../../utils'; import GroupHolder from './GroupHolder'; import PermissionHeader from './PermissionHeader'; diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/PermissionCell.tsx b/server/sonar-web/src/main/js/apps/permissions/shared/components/PermissionCell.tsx index b8b40f46af5..67d1959b0b8 100644 --- a/server/sonar-web/src/main/js/apps/permissions/shared/components/PermissionCell.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/PermissionCell.tsx @@ -19,7 +19,7 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; +import Checkbox from '../../../../sonar-ui-common/components/controls/Checkbox'; import { isPermissionDefinitionGroup } from '../../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/PermissionHeader.tsx b/server/sonar-web/src/main/js/apps/permissions/shared/components/PermissionHeader.tsx index bfae263e65d..ae4c61116fa 100644 --- a/server/sonar-web/src/main/js/apps/permissions/shared/components/PermissionHeader.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/PermissionHeader.tsx @@ -19,11 +19,11 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import InstanceMessage from '../../../../components/common/InstanceMessage'; +import HelpTooltip from '../../../../sonar-ui-common/components/controls/HelpTooltip'; +import Tooltip from '../../../../sonar-ui-common/components/controls/Tooltip'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import { isPermissionDefinitionGroup } from '../../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/SearchForm.tsx b/server/sonar-web/src/main/js/apps/permissions/shared/components/SearchForm.tsx index 87f7ffeeff6..71d4fcae909 100644 --- a/server/sonar-web/src/main/js/apps/permissions/shared/components/SearchForm.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/SearchForm.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import RadioToggle from '../../../../sonar-ui-common/components/controls/RadioToggle'; +import SearchBox from '../../../../sonar-ui-common/components/controls/SearchBox'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; interface Props { filter: string; diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/UserHolder.tsx b/server/sonar-web/src/main/js/apps/permissions/shared/components/UserHolder.tsx index 40e7cb648cb..5359fec5ef1 100644 --- a/server/sonar-web/src/main/js/apps/permissions/shared/components/UserHolder.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/UserHolder.tsx @@ -19,8 +19,8 @@ */ import { without } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import Avatar from '../../../../components/ui/Avatar'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { isPermissionDefinitionGroup } from '../../utils'; import PermissionCell from './PermissionCell'; diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/__tests__/GroupHolder-test.tsx b/server/sonar-web/src/main/js/apps/permissions/shared/components/__tests__/GroupHolder-test.tsx index 08889d8210e..945e6f71b44 100644 --- a/server/sonar-web/src/main/js/apps/permissions/shared/components/__tests__/GroupHolder-test.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/__tests__/GroupHolder-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockPermissionGroup } from '../../../../../helpers/mocks/permissions'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import GroupHolder from '../GroupHolder'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/__tests__/UserHolder-test.tsx b/server/sonar-web/src/main/js/apps/permissions/shared/components/__tests__/UserHolder-test.tsx index da48b3cc454..29bb671ec58 100644 --- a/server/sonar-web/src/main/js/apps/permissions/shared/components/__tests__/UserHolder-test.tsx +++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/__tests__/UserHolder-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockPermissionUser } from '../../../../../helpers/mocks/permissions'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import UserHolder from '../UserHolder'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/permissions/utils.ts b/server/sonar-web/src/main/js/apps/permissions/utils.ts index c8d5b74dc1b..242d3691adb 100644 --- a/server/sonar-web/src/main/js/apps/permissions/utils.ts +++ b/server/sonar-web/src/main/js/apps/permissions/utils.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { hasMessage, translate } from 'sonar-ui-common/helpers/l10n'; import { isSonarCloud } from '../../helpers/system'; +import { hasMessage, translate } from '../../sonar-ui-common/helpers/l10n'; export const PERMISSIONS_ORDER_FOR_PROJECT_TEMPLATE = [ 'user', diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/App.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/App.tsx index 197ead48a18..633a0b5c971 100644 --- a/server/sonar-web/src/main/js/apps/portfolio/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/portfolio/components/App.tsx @@ -21,8 +21,6 @@ import { Location } from 'history'; import * as React from 'react'; import { connect } from 'react-redux'; import { InjectedRouter } from 'react-router'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getChildren } from '../../../api/components'; import { getMeasures } from '../../../api/measures'; import MeasuresLink from '../../../components/common/MeasuresLink'; @@ -30,6 +28,8 @@ import ComponentReportActions from '../../../components/controls/ComponentReport import { withCurrentUser } from '../../../components/hoc/withCurrentUser'; import Measure from '../../../components/measure/Measure'; import { isLoggedIn } from '../../../helpers/users'; +import handleRequiredAuthentication from '../../../sonar-ui-common/helpers/handleRequiredAuthentication'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { fetchMetrics } from '../../../store/rootActions'; import { getMetrics, Store } from '../../../store/rootReducer'; import '../styles.css'; diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/Effort.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/Effort.tsx index 8a5b12700e6..fae774e31ef 100644 --- a/server/sonar-web/src/main/js/apps/portfolio/components/Effort.tsx +++ b/server/sonar-web/src/main/js/apps/portfolio/components/Effort.tsx @@ -20,10 +20,10 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import Rating from 'sonar-ui-common/components/ui/Rating'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import Measure from '../../../components/measure/Measure'; import { getComponentDrilldownUrl } from '../../../helpers/urls'; +import Rating from '../../../sonar-ui-common/components/ui/Rating'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { component: string; diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/MainRating.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/MainRating.tsx index 4d3f63ca7bf..256a965ccca 100644 --- a/server/sonar-web/src/main/js/apps/portfolio/components/MainRating.tsx +++ b/server/sonar-web/src/main/js/apps/portfolio/components/MainRating.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import Rating from 'sonar-ui-common/components/ui/Rating'; import { getMeasureTreemapUrl } from '../../../helpers/urls'; +import Rating from '../../../sonar-ui-common/components/ui/Rating'; interface Props { component: string; diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/MetricBox.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/MetricBox.tsx index fda361d8f1f..9266e9a28e2 100644 --- a/server/sonar-web/src/main/js/apps/portfolio/components/MetricBox.tsx +++ b/server/sonar-web/src/main/js/apps/portfolio/components/MetricBox.tsx @@ -19,13 +19,13 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import Level from 'sonar-ui-common/components/ui/Level'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import ActivityLink from '../../../components/common/ActivityLink'; import MeasuresLink from '../../../components/common/MeasuresLink'; import Measure from '../../../components/measure/Measure'; import { getComponentDrilldownUrl } from '../../../helpers/urls'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import Level from '../../../sonar-ui-common/components/ui/Level'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { GraphType } from '../../../types/project-activity'; import { METRICS_PER_TYPE } from '../utils'; import Effort from './Effort'; diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/RatingFreshness.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/RatingFreshness.tsx index 69793db233a..c6fd9b6cf65 100644 --- a/server/sonar-web/src/main/js/apps/portfolio/components/RatingFreshness.tsx +++ b/server/sonar-web/src/main/js/apps/portfolio/components/RatingFreshness.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import Rating from 'sonar-ui-common/components/ui/Rating'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import Rating from '../../../sonar-ui-common/components/ui/Rating'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { lastChange?: string; diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/UnsubscribeEmailModal.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/UnsubscribeEmailModal.tsx index b53479faa4b..df51e53bc91 100644 --- a/server/sonar-web/src/main/js/apps/portfolio/components/UnsubscribeEmailModal.tsx +++ b/server/sonar-web/src/main/js/apps/portfolio/components/UnsubscribeEmailModal.tsx @@ -18,12 +18,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button, ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { unsubscribeFromEmailReport } from '../../../api/component-report'; +import { + Button, + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { component: T.Component; diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/WorstProjects.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/WorstProjects.tsx index 0f73993fa04..061abcba40a 100644 --- a/server/sonar-web/src/main/js/apps/portfolio/components/WorstProjects.tsx +++ b/server/sonar-web/src/main/js/apps/portfolio/components/WorstProjects.tsx @@ -20,12 +20,12 @@ import { max } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { colors } from '../../../app/theme'; import Measure from '../../../components/measure/Measure'; import { getComponentOverviewUrl } from '../../../helpers/urls'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { ComponentQualifier } from '../../../types/component'; import { SubComponent } from '../types'; diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/App-test.tsx index 061a517af28..a859c82944e 100644 --- a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/App-test.tsx @@ -19,8 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getChildren } from '../../../../api/components'; import { getMeasures } from '../../../../api/measures'; import { @@ -30,11 +28,13 @@ import { mockLoggedInUser, mockRouter } from '../../../../helpers/testMocks'; +import handleRequiredAuthentication from '../../../../sonar-ui-common/helpers/handleRequiredAuthentication'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { ComponentQualifier } from '../../../../types/component'; import { App } from '../App'; import UnsubscribeEmailModal from '../UnsubscribeEmailModal'; -jest.mock('sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ default: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/UnsubscribeEmailModal-test.tsx b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/UnsubscribeEmailModal-test.tsx index 7269733003c..4c829c3cd3a 100644 --- a/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/UnsubscribeEmailModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/portfolio/components/__tests__/UnsubscribeEmailModal-test.tsx @@ -20,10 +20,10 @@ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { unsubscribeFromEmailReport } from '../../../../api/component-report'; import { mockComponent } from '../../../../helpers/testMocks'; +import SimpleModal from '../../../../sonar-ui-common/components/controls/SimpleModal'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { ComponentQualifier } from '../../../../types/component'; import UnsubscribeEmailModal from '../UnsubscribeEmailModal'; diff --git a/server/sonar-web/src/main/js/apps/portfolio/routes.ts b/server/sonar-web/src/main/js/apps/portfolio/routes.ts index 854cd1ef120..f57b5528d59 100644 --- a/server/sonar-web/src/main/js/apps/portfolio/routes.ts +++ b/server/sonar-web/src/main/js/apps/portfolio/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/projectActivity/__tests__/actions-test.ts b/server/sonar-web/src/main/js/apps/projectActivity/__tests__/actions-test.ts index ded60a4672e..b48e012e808 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/__tests__/actions-test.ts +++ b/server/sonar-web/src/main/js/apps/projectActivity/__tests__/actions-test.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { parseDate } from 'sonar-ui-common/helpers/dates'; import { DEFAULT_GRAPH } from '../../../components/activity-graph/utils'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import * as actions from '../actions'; const ANALYSES = [ diff --git a/server/sonar-web/src/main/js/apps/projectActivity/__tests__/utils-test.ts b/server/sonar-web/src/main/js/apps/projectActivity/__tests__/utils-test.ts index 3a924db90db..1c5547da888 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/__tests__/utils-test.ts +++ b/server/sonar-web/src/main/js/apps/projectActivity/__tests__/utils-test.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import * as dates from 'sonar-ui-common/helpers/dates'; import { DEFAULT_GRAPH } from '../../../components/activity-graph/utils'; +import * as dates from '../../../sonar-ui-common/helpers/dates'; import { GraphType } from '../../../types/project-activity'; import * as utils from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/DefinitionChangeEventInner.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/DefinitionChangeEventInner.tsx index f113cdb43b1..5eec7466ff2 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/DefinitionChangeEventInner.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/DefinitionChangeEventInner.tsx @@ -20,13 +20,13 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import BranchIcon from 'sonar-ui-common/components/icons/BranchIcon'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { limitComponentName } from 'sonar-ui-common/helpers/path'; import { isMainBranch } from '../../../helpers/branch-like'; import { getProjectUrl } from '../../../helpers/urls'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import BranchIcon from '../../../sonar-ui-common/components/icons/BranchIcon'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { limitComponentName } from '../../../sonar-ui-common/helpers/path'; import { BranchLike } from '../../../types/branch-like'; export type DefinitionChangeEvent = T.AnalysisEvent & diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/Event.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/Event.tsx index ea173aa741f..f41fbdc028a 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/Event.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/Event.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DeleteButton, EditButton } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { DeleteButton, EditButton } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import EventInner from './EventInner'; import ChangeEventForm from './forms/ChangeEventForm'; import RemoveEventForm from './forms/RemoveEventForm'; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/EventInner.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/EventInner.tsx index 94cfb31e6d4..2050f7d5634 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/EventInner.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/EventInner.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { ComponentContext } from '../../../app/components/ComponentContext'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { DefinitionChangeEventInner, isDefinitionChangeEvent } from './DefinitionChangeEventInner'; import { isRichQualityGateEvent, RichQualityGateEventInner } from './RichQualityGateEventInner'; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx index 1eabe913952..00a46b93d1a 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysesList.tsx @@ -21,10 +21,10 @@ import * as classNames from 'classnames'; import { isEqual } from 'date-fns'; import { throttle } from 'lodash'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import { toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import DateFormatter from '../../../sonar-ui-common/components/intl/DateFormatter'; +import { toShortNotSoISOString } from '../../../sonar-ui-common/helpers/dates'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ComponentQualifier } from '../../../types/component'; import { activityQueryChanged, getAnalysesByVersionByDay, Query } from '../utils'; import ProjectActivityAnalysis from './ProjectActivityAnalysis'; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysis.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysis.tsx index c1430028731..1ad4d7a82c8 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysis.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAnalysis.tsx @@ -22,14 +22,14 @@ import * as React from 'react'; import ActionsDropdown, { ActionsDropdownDivider, ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import ClickEventBoundary from 'sonar-ui-common/components/controls/ClickEventBoundary'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import TimeFormatter from 'sonar-ui-common/components/intl/TimeFormatter'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; +} from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import ClickEventBoundary from '../../../sonar-ui-common/components/controls/ClickEventBoundary'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import TimeFormatter from '../../../sonar-ui-common/components/intl/TimeFormatter'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import Events from './Events'; import AddEventForm from './forms/AddEventForm'; import RemoveAnalysisForm from './forms/RemoveAnalysisForm'; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityApp.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityApp.tsx index 118c697fcef..105dfe9296f 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityApp.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityApp.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { MeasureHistory } from '../../../types/project-activity'; import { Query } from '../utils'; import './projectActivity.css'; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAppContainer.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAppContainer.tsx index 7b17bb84efe..1a0ddaf497a 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAppContainer.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityAppContainer.tsx @@ -20,7 +20,6 @@ import { Location } from 'history'; import * as React from 'react'; import { InjectedRouter } from 'react-router'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; import { getAllMetrics } from '../../../api/metrics'; import * as api from '../../../api/projectActivity'; import { getAllTimeMachineData } from '../../../api/time-machine'; @@ -31,6 +30,7 @@ import { isCustomGraph } from '../../../components/activity-graph/utils'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import { BranchLike } from '../../../types/branch-like'; import { MetricKey } from '../../../types/metrics'; import { GraphType, MeasureHistory } from '../../../types/project-activity'; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityDateInput.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityDateInput.tsx index 735e962c8a3..6b711cf5e2f 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityDateInput.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityDateInput.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import DateRangeInput from '../../../components/controls/DateRangeInput'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Query } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageFooter.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageFooter.tsx index 9daadae20a5..6bcaf4e561c 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageFooter.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageFooter.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; interface Props { analyses: unknown[]; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageHeader.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageHeader.tsx index 81b1a278dbf..4f57d232d25 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageHeader.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/ProjectActivityPageHeader.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { APPLICATION_EVENT_TYPES, EVENT_TYPES, Query } from '../utils'; import ProjectActivityDateInput from './ProjectActivityDateInput'; import ProjectActivityEventSelectOption from './ProjectActivityEventSelectOption'; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/RichQualityGateEventInner.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/RichQualityGateEventInner.tsx index cf9590db0f4..daf5c273e96 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/RichQualityGateEventInner.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/RichQualityGateEventInner.tsx @@ -20,11 +20,11 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import Level from 'sonar-ui-common/components/ui/Level'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getProjectUrl } from '../../../helpers/urls'; +import { ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import Level from '../../../sonar-ui-common/components/ui/Level'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; export type RichQualityGateEvent = T.AnalysisEvent & Required<Pick<T.AnalysisEvent, 'qualityGate'>>; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/DefinitionChangeEventInner-test.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/DefinitionChangeEventInner-test.tsx index e5496e85a25..81c74f4c6bf 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/DefinitionChangeEventInner-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/DefinitionChangeEventInner-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockBranch } from '../../../../helpers/mocks/branch-like'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { DefinitionChangeEvent, DefinitionChangeEventInner } from '../DefinitionChangeEventInner'; it('should render', () => { diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/Event-test.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/Event-test.tsx index 1cf4bb0a431..63874c580ae 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/Event-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/Event-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { DeleteButton, EditButton } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockAnalysisEvent } from '../../../../helpers/testMocks'; +import { DeleteButton, EditButton } from '../../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { Event, EventProps } from '../Event'; import ChangeEventForm from '../forms/ChangeEventForm'; import RemoveEventForm from '../forms/RemoveEventForm'; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityAnalysesList-test.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityAnalysesList-test.tsx index c458e7cc0b7..0153190aae9 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityAnalysesList-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityAnalysesList-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; import { DEFAULT_GRAPH } from '../../../../components/activity-graph/utils'; import { mockParsedAnalysis } from '../../../../helpers/testMocks'; +import { parseDate } from '../../../../sonar-ui-common/helpers/dates'; import { ComponentQualifier } from '../../../../types/component'; import ProjectActivityAnalysesList from '../ProjectActivityAnalysesList'; @@ -31,8 +31,8 @@ jest.mock('date-fns/start_of_day', () => (date: Date) => { return startDay; }); -jest.mock('sonar-ui-common/helpers/dates', () => { - const actual = jest.requireActual('sonar-ui-common/helpers/dates'); +jest.mock('../../../../sonar-ui-common/helpers/dates', () => { + const actual = jest.requireActual('../../../../sonar-ui-common/helpers/dates'); return { ...actual, toShortNotSoISOString: (date: string) => 'ISO.' + date }; }); diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityAnalysis-test.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityAnalysis-test.tsx index f88cebbbb25..cce2034ddfb 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityAnalysis-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityAnalysis-test.tsx @@ -21,22 +21,22 @@ import { mount, shallow } from 'enzyme'; import * as React from 'react'; import { IntlProvider } from 'react-intl'; -import TimeFormatter from 'sonar-ui-common/components/intl/TimeFormatter'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockAnalysisEvent, mockParsedAnalysis } from '../../../../helpers/testMocks'; +import TimeFormatter from '../../../../sonar-ui-common/components/intl/TimeFormatter'; +import { scrollToElement } from '../../../../sonar-ui-common/helpers/scrolling'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import AddEventForm from '../forms/AddEventForm'; import RemoveAnalysisForm from '../forms/RemoveAnalysisForm'; import { ProjectActivityAnalysis, ProjectActivityAnalysisProps } from '../ProjectActivityAnalysis'; -jest.mock('sonar-ui-common/helpers/dates', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/dates', () => ({ parseDate: () => ({ valueOf: () => 1546333200000, toISOString: () => '2019-01-01T09:00:00.000Z' }) })); -jest.mock('sonar-ui-common/helpers/scrolling', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/scrolling', () => ({ scrollToElement: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityApp-test.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityApp-test.tsx index d57552bb608..459c868e341 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityApp-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; import { DEFAULT_GRAPH } from '../../../../components/activity-graph/utils'; +import { parseDate } from '../../../../sonar-ui-common/helpers/dates'; import ProjectActivityApp from '../ProjectActivityApp'; const ANALYSES = [ diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityDateInput-test.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityDateInput-test.tsx index 8efd75a516b..57533ad372a 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityDateInput-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityDateInput-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../../sonar-ui-common/helpers/dates'; import ProjectActivityDateInput from '../ProjectActivityDateInput'; it('should render correctly the date inputs', () => { diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityGraphs-test.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityGraphs-test.tsx index 281f306eb9c..f061b28fcbb 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityGraphs-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityGraphs-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; import { DEFAULT_GRAPH } from '../../../../components/activity-graph/utils'; +import { parseDate } from '../../../../sonar-ui-common/helpers/dates'; import ProjectActivityGraphs from '../ProjectActivityGraphs'; const ANALYSES = [ diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityPageHeader-test.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityPageHeader-test.tsx index efec7f379d4..228cc9b3449 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityPageHeader-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/ProjectActivityPageHeader-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../../sonar-ui-common/helpers/dates'; import ProjectActivityPageHeader from '../ProjectActivityPageHeader'; it('should render correctly the list of series', () => { diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/RichQualityGateEventInner-test.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/RichQualityGateEventInner-test.tsx index f6d570a57db..9fead0cdb74 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/RichQualityGateEventInner-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/__tests__/RichQualityGateEventInner-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { RichQualityGateEvent, RichQualityGateEventInner } from '../RichQualityGateEventInner'; const event: RichQualityGateEvent = { diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/forms/AddEventForm.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/forms/AddEventForm.tsx index fa8fc975c56..dd5cd7a52cc 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/forms/AddEventForm.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/forms/AddEventForm.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import ConfirmModal from '../../../../sonar-ui-common/components/controls/ConfirmModal'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; interface Props { addEvent: (analysis: string, name: string, category?: string) => Promise<void>; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/forms/ChangeEventForm.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/forms/ChangeEventForm.tsx index 1c5f684f5a6..5825d1b9133 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/forms/ChangeEventForm.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/forms/ChangeEventForm.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import ConfirmModal from '../../../../sonar-ui-common/components/controls/ConfirmModal'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; interface Props { changeEvent: (event: string, name: string) => Promise<void>; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/forms/RemoveAnalysisForm.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/forms/RemoveAnalysisForm.tsx index 293d0e527aa..c923b2f5903 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/forms/RemoveAnalysisForm.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/forms/RemoveAnalysisForm.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import ConfirmModal from '../../../../sonar-ui-common/components/controls/ConfirmModal'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; interface Props { analysis: T.ParsedAnalysis; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/forms/RemoveEventForm.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/forms/RemoveEventForm.tsx index 99bda1618d9..9f1d83fd887 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/forms/RemoveEventForm.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/forms/RemoveEventForm.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import ConfirmModal from '../../../../sonar-ui-common/components/controls/ConfirmModal'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; export interface RemoveEventFormProps { analysisKey: string; diff --git a/server/sonar-web/src/main/js/apps/projectActivity/components/forms/__tests__/RemoveEventForm-test.tsx b/server/sonar-web/src/main/js/apps/projectActivity/components/forms/__tests__/RemoveEventForm-test.tsx index 134762d2994..bc4c89918cd 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/components/forms/__tests__/RemoveEventForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectActivity/components/forms/__tests__/RemoveEventForm-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; import { mockAnalysisEvent } from '../../../../../helpers/testMocks'; +import ConfirmModal from '../../../../../sonar-ui-common/components/controls/ConfirmModal'; import RemoveEventForm, { RemoveEventFormProps } from '../RemoveEventForm'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/projectActivity/routes.ts b/server/sonar-web/src/main/js/apps/projectActivity/routes.ts index f9a2b2b837e..a2945a661f6 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/routes.ts +++ b/server/sonar-web/src/main/js/apps/projectActivity/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/projectActivity/utils.ts b/server/sonar-web/src/main/js/apps/projectActivity/utils.ts index 09644b14451..7757447ff32 100644 --- a/server/sonar-web/src/main/js/apps/projectActivity/utils.ts +++ b/server/sonar-web/src/main/js/apps/projectActivity/utils.ts @@ -19,7 +19,8 @@ */ import * as startOfDay from 'date-fns/start_of_day'; import { isEqual } from 'lodash'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { DEFAULT_GRAPH } from '../../components/activity-graph/utils'; +import { parseDate } from '../../sonar-ui-common/helpers/dates'; import { cleanQuery, parseAsArray, @@ -28,8 +29,7 @@ import { serializeDate, serializeString, serializeStringArray -} from 'sonar-ui-common/helpers/query'; -import { DEFAULT_GRAPH } from '../../components/activity-graph/utils'; +} from '../../sonar-ui-common/helpers/query'; import { GraphType } from '../../types/project-activity'; export interface Query { diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/App.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/App.tsx index ed9efc5b521..6c11045130e 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/App.tsx @@ -20,12 +20,12 @@ import * as classNames from 'classnames'; import { debounce } from 'lodash'; import * as React from 'react'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getNewCodePeriod, resetNewCodePeriod, setNewCodePeriod } from '../../../api/newCodePeriod'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; import { isBranch, sortBranches } from '../../../helpers/branch-like'; +import AlertSuccessIcon from '../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Branch, BranchLike } from '../../../types/branch-like'; import '../styles.css'; import { getSettingValue } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/AppHeader.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/AppHeader.tsx index 464e9990bee..64fcec257b5 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/AppHeader.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/AppHeader.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface AppHeaderProps { canAdmin: boolean; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingAnalysis.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingAnalysis.tsx index b4a31dc6b98..dacca51fe9e 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingAnalysis.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingAnalysis.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioCard from 'sonar-ui-common/components/controls/RadioCard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import RadioCard from '../../../sonar-ui-common/components/controls/RadioCard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface Props { disabled?: boolean; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingDays.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingDays.tsx index b8d7b081702..38de4bead2e 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingDays.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingDays.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioCard from 'sonar-ui-common/components/controls/RadioCard'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import RadioCard from '../../../sonar-ui-common/components/controls/RadioCard'; +import ValidationInput from '../../../sonar-ui-common/components/controls/ValidationInput'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingPreviousVersion.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingPreviousVersion.tsx index 6fd3d7c1e46..7848ab80e2e 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingPreviousVersion.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingPreviousVersion.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioCard from 'sonar-ui-common/components/controls/RadioCard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import RadioCard from '../../../sonar-ui-common/components/controls/RadioCard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface Props { disabled?: boolean; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingReferenceBranch.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingReferenceBranch.tsx index 1d9db7939a9..abc8d6a50a4 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingReferenceBranch.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BaselineSettingReferenceBranch.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioCard from 'sonar-ui-common/components/controls/RadioCard'; -import SearchSelect from 'sonar-ui-common/components/controls/SearchSelect'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import AlertErrorIcon from 'sonar-ui-common/components/icons/AlertErrorIcon'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import RadioCard from '../../../sonar-ui-common/components/controls/RadioCard'; +import SearchSelect from '../../../sonar-ui-common/components/controls/SearchSelect'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import AlertErrorIcon from '../../../sonar-ui-common/components/icons/AlertErrorIcon'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; export interface BaselineSettingReferenceBranchProps { branchList: BranchOption[]; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisList.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisList.tsx index 2b63146fa7f..ba9eb88eebb 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisList.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisList.tsx @@ -20,9 +20,9 @@ import { subDays } from 'date-fns'; import { throttle } from 'lodash'; import * as React from 'react'; -import { parseDate, toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { getProjectActivity } from '../../../api/projectActivity'; +import { parseDate, toShortNotSoISOString } from '../../../sonar-ui-common/helpers/dates'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import BranchAnalysisListRenderer from './BranchAnalysisListRenderer'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisListRenderer.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisListRenderer.tsx index 2336ff11dd7..d2262269977 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisListRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchAnalysisListRenderer.tsx @@ -19,14 +19,14 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import Select from 'sonar-ui-common/components/controls/Select'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import TimeFormatter from 'sonar-ui-common/components/intl/TimeFormatter'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { parseDate, toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import DateFormatter from '../../../sonar-ui-common/components/intl/DateFormatter'; +import TimeFormatter from '../../../sonar-ui-common/components/intl/TimeFormatter'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { parseDate, toShortNotSoISOString } from '../../../sonar-ui-common/helpers/dates'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Events from '../../projectActivity/components/Events'; import { getAnalysesByVersionByDay } from '../../projectActivity/utils'; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchBaselineSettingModal.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchBaselineSettingModal.tsx index e00c45db228..5e4f4d08dad 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchBaselineSettingModal.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchBaselineSettingModal.tsx @@ -18,12 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { toNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { setNewCodePeriod } from '../../../api/newCodePeriod'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { toNotSoISOString } from '../../../sonar-ui-common/helpers/dates'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Branch, BranchWithNewCodePeriod } from '../../../types/branch-like'; import { getSettingValue, validateSetting } from '../utils'; import BaselineSettingAnalysis from './BaselineSettingAnalysis'; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx index 1f63b22f85e..613134ec5c0 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { listBranchesNewCodePeriod, resetNewCodePeriod } from '../../../api/newCodePeriod'; import { isBranch, sortBranches } from '../../../helpers/branch-like'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Branch, BranchLike, BranchWithNewCodePeriod } from '../../../types/branch-like'; import BranchBaselineSettingModal from './BranchBaselineSettingModal'; import BranchListRow from './BranchListRow'; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchListRow.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchListRow.tsx index 91292a6d955..22ce6e8b579 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchListRow.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchListRow.tsx @@ -18,14 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; +import BranchLikeIcon from '../../../components/icons/BranchLikeIcon'; import ActionsDropdown, { ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import WarningIcon from 'sonar-ui-common/components/icons/WarningIcon'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import BranchLikeIcon from '../../../components/icons/BranchLikeIcon'; +} from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import WarningIcon from '../../../sonar-ui-common/components/icons/WarningIcon'; +import DateTimeFormatter from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { BranchWithNewCodePeriod } from '../../../types/branch-like'; export interface BranchListRowProps { diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/ProjectBaselineSelector.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/ProjectBaselineSelector.tsx index 4d133b25ee1..a9ab6045382 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/ProjectBaselineSelector.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/ProjectBaselineSelector.tsx @@ -19,11 +19,14 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Branch } from '../../../types/branch-like'; import { validateSetting } from '../utils'; import BaselineSettingAnalysis from './BaselineSettingAnalysis'; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/App-test.tsx index 65cd8e22f08..710fa4222bc 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/App-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getNewCodePeriod, resetNewCodePeriod, @@ -27,6 +26,7 @@ import { } from '../../../../api/newCodePeriod'; import { mockBranch, mockMainBranch, mockPullRequest } from '../../../../helpers/mocks/branch-like'; import { mockComponent, mockEvent } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import App from '../App'; jest.mock('../../../../api/newCodePeriod', () => ({ diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BaselineSettingReferenceBranch-test.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BaselineSettingReferenceBranch-test.tsx index 40abe8d8f9c..b6708b46522 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BaselineSettingReferenceBranch-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BaselineSettingReferenceBranch-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import RadioCard from 'sonar-ui-common/components/controls/RadioCard'; -import SearchSelect from 'sonar-ui-common/components/controls/SearchSelect'; +import RadioCard from '../../../../sonar-ui-common/components/controls/RadioCard'; +import SearchSelect from '../../../../sonar-ui-common/components/controls/SearchSelect'; import BaselineSettingReferenceBranch, { BaselineSettingReferenceBranchProps, BranchOption diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchAnalysisList-test.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchAnalysisList-test.tsx index 0f7f428fc1b..b20677d9d3b 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchAnalysisList-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchAnalysisList-test.tsx @@ -20,10 +20,10 @@ import { subDays } from 'date-fns'; import { shallow } from 'enzyme'; import * as React from 'react'; -import { toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getProjectActivity } from '../../../../api/projectActivity'; import { mockAnalysis, mockAnalysisEvent } from '../../../../helpers/testMocks'; +import { toShortNotSoISOString } from '../../../../sonar-ui-common/helpers/dates'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import BranchAnalysisList from '../BranchAnalysisList'; jest.mock('date-fns/start_of_day', () => @@ -32,7 +32,7 @@ jest.mock('date-fns/start_of_day', () => })) ); -jest.mock('sonar-ui-common/helpers/dates', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/dates', () => ({ parseDate: jest.fn().mockReturnValue('2017-03-02'), toShortNotSoISOString: jest.fn().mockReturnValue('2017-03-02') })); diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchAnalysisListRenderer-test.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchAnalysisListRenderer-test.tsx index 45785c4f34e..defba93f077 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchAnalysisListRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchAnalysisListRenderer-test.tsx @@ -30,8 +30,8 @@ jest.mock('date-fns/start_of_day', () => (date: Date) => { return startDay; }); -jest.mock('sonar-ui-common/helpers/dates', () => { - const actual = jest.requireActual('sonar-ui-common/helpers/dates'); +jest.mock('../../../../sonar-ui-common/helpers/dates', () => { + const actual = jest.requireActual('../../../../sonar-ui-common/helpers/dates'); return { ...actual, toShortNotSoISOString: (date: string) => `ISO.${date}` }; }); diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchBaselineSettingModal-test.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchBaselineSettingModal-test.tsx index 5198cab35e2..4a6c8e9b4cb 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchBaselineSettingModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchBaselineSettingModal-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { mockEvent, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { setNewCodePeriod } from '../../../../api/newCodePeriod'; import { mockBranch, mockMainBranch } from '../../../../helpers/mocks/branch-like'; +import { mockEvent, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import BranchBaselineSettingModal from '../BranchBaselineSettingModal'; jest.mock('../../../../api/newCodePeriod', () => ({ diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchList-test.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchList-test.tsx index 6498b40333d..b4b26018353 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchList-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchList-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { listBranchesNewCodePeriod, resetNewCodePeriod } from '../../../../api/newCodePeriod'; import { mockBranch, mockMainBranch } from '../../../../helpers/mocks/branch-like'; import { mockComponent } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import BranchBaselineSettingModal from '../BranchBaselineSettingModal'; import BranchList from '../BranchList'; diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchListRow-test.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchListRow-test.tsx index baee3ebaed0..266860211b9 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchListRow-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/__tests__/BranchListRow-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ActionsDropdownItem } from 'sonar-ui-common/components/controls/ActionsDropdown'; import { mockBranch, mockMainBranch } from '../../../../helpers/mocks/branch-like'; +import { ActionsDropdownItem } from '../../../../sonar-ui-common/components/controls/ActionsDropdown'; import BranchListRow, { BranchListRowProps } from '../BranchListRow'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/routes.ts b/server/sonar-web/src/main/js/apps/projectBaseline/routes.ts index f74e79490f1..d9f2449a14f 100644 --- a/server/sonar-web/src/main/js/apps/projectBaseline/routes.ts +++ b/server/sonar-web/src/main/js/apps/projectBaseline/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/App.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/App.tsx index b09ec991e2f..4ae3217093f 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/App.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import BranchLikeTabs from './BranchLikeTabs'; import LifetimeInformation from './LifetimeInformation'; diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeRow.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeRow.tsx index b9531e417e2..6c0a4061d7c 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeRow.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeRow.tsx @@ -18,11 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ActionsDropdown, { - ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import BranchStatus from '../../../components/common/BranchStatus'; import BranchLikeIcon from '../../../components/icons/BranchLikeIcon'; import { @@ -31,6 +26,11 @@ import { isMainBranch, isPullRequest } from '../../../helpers/branch-like'; +import ActionsDropdown, { + ActionsDropdownItem +} from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import BranchPurgeSetting from './BranchPurgeSetting'; diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTable.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTable.tsx index a02a8e2ebc9..b8e12914ab4 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTable.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTable.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getBranchLikeKey } from '../../../helpers/branch-like'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import BranchLikeRow from './BranchLikeRow'; diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTabs.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTabs.tsx index f7d7ac3e175..ef7b87e756f 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTabs.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTabs.tsx @@ -18,10 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BoxedTabs from 'sonar-ui-common/components/controls/BoxedTabs'; -import BranchIcon from 'sonar-ui-common/components/icons/BranchIcon'; -import PullRequestIcon from 'sonar-ui-common/components/icons/PullRequestIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { isBranch, isMainBranch, @@ -29,6 +25,10 @@ import { sortBranches, sortPullRequests } from '../../../helpers/branch-like'; +import BoxedTabs from '../../../sonar-ui-common/components/controls/BoxedTabs'; +import BranchIcon from '../../../sonar-ui-common/components/icons/BranchIcon'; +import PullRequestIcon from '../../../sonar-ui-common/components/icons/PullRequestIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import BranchLikeTable from './BranchLikeTable'; import DeleteBranchModal from './DeleteBranchModal'; diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchPurgeSetting.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchPurgeSetting.tsx index 86dafa64cea..a08f4595aec 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchPurgeSetting.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchPurgeSetting.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import Toggle from 'sonar-ui-common/components/controls/Toggle'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { excludeBranchFromPurge } from '../../../api/branches'; import { isMainBranch } from '../../../helpers/branch-like'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import Toggle from '../../../sonar-ui-common/components/controls/Toggle'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Branch } from '../../../types/branch-like'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/DeleteBranchModal.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/DeleteBranchModal.tsx index a2f9ad062b6..a04783cfa96 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/DeleteBranchModal.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/DeleteBranchModal.tsx @@ -18,11 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { deleteBranch, deletePullRequest } from '../../../api/branches'; import { getBranchLikeDisplayName, isPullRequest } from '../../../helpers/branch-like'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/LifetimeInformationRenderer.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/LifetimeInformationRenderer.tsx index 362776a9748..01b353f870b 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/LifetimeInformationRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/LifetimeInformationRenderer.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; export interface LifetimeInformationRendererProps { branchAndPullRequestLifeTimeInDays?: string; diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/RenameBranchModal.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/RenameBranchModal.tsx index eb160154d1b..b25f1ac0b86 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/RenameBranchModal.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/RenameBranchModal.tsx @@ -18,12 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { renameBranch } from '../../../api/branches'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { MainBranch } from '../../../types/branch-like'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/BranchLikeTabs-test.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/BranchLikeTabs-test.tsx index 20137640f5a..a46a7b75579 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/BranchLikeTabs-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/BranchLikeTabs-test.tsx @@ -19,13 +19,13 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import BoxedTabs from 'sonar-ui-common/components/controls/BoxedTabs'; import { mockMainBranch, mockPullRequest, mockSetOfBranchAndPullRequest } from '../../../../helpers/mocks/branch-like'; import { mockComponent } from '../../../../helpers/testMocks'; +import BoxedTabs from '../../../../sonar-ui-common/components/controls/BoxedTabs'; import { BranchLikeTable } from '../BranchLikeTable'; import BranchLikeTabs, { Tabs } from '../BranchLikeTabs'; import DeleteBranchModal from '../DeleteBranchModal'; diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/BranchPurgeSetting-test.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/BranchPurgeSetting-test.tsx index 14a68b2cdd4..1f6f8c473ac 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/BranchPurgeSetting-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/BranchPurgeSetting-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Toggle from 'sonar-ui-common/components/controls/Toggle'; import { excludeBranchFromPurge } from '../../../../api/branches'; import { mockBranch, mockMainBranch } from '../../../../helpers/mocks/branch-like'; import { mockComponent } from '../../../../helpers/testMocks'; +import Toggle from '../../../../sonar-ui-common/components/controls/Toggle'; import BranchPurgeSetting from '../BranchPurgeSetting'; jest.mock('../../../../api/branches', () => ({ diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/DeleteBranchModal-test.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/DeleteBranchModal-test.tsx index 75800d84541..bda6fcc725a 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/DeleteBranchModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/DeleteBranchModal-test.tsx @@ -19,10 +19,15 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import { click, doAsync, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { deleteBranch, deletePullRequest } from '../../../../api/branches'; import { mockBranch, mockPullRequest } from '../../../../helpers/mocks/branch-like'; import { mockComponent } from '../../../../helpers/testMocks'; +import { + click, + doAsync, + submit, + waitAndUpdate +} from '../../../../sonar-ui-common/helpers/testUtils'; import { BranchLike } from '../../../../types/branch-like'; import DeleteBranchModal from '../DeleteBranchModal'; diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/LifetimeInformation-test.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/LifetimeInformation-test.tsx index ddeca976bd0..59be149f47b 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/LifetimeInformation-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/LifetimeInformation-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getValues } from '../../../../api/settings'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { SettingsKey } from '../../../../types/settings'; import { LifetimeInformation } from '../LifetimeInformation'; diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/RenameBranchModal-test.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/RenameBranchModal-test.tsx index a842d6dc1d7..cca1eee7530 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/RenameBranchModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/RenameBranchModal-test.tsx @@ -19,10 +19,16 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import { change, click, doAsync, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { renameBranch } from '../../../../api/branches'; import { mockMainBranch } from '../../../../helpers/mocks/branch-like'; import { mockComponent } from '../../../../helpers/testMocks'; +import { + change, + click, + doAsync, + submit, + waitAndUpdate +} from '../../../../sonar-ui-common/helpers/testUtils'; import RenameBranchModal from '../RenameBranchModal'; jest.mock('../../../../api/branches', () => ({ renameBranch: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/projectBranches/routes.ts b/server/sonar-web/src/main/js/apps/projectBranches/routes.ts index 854cd1ef120..f57b5528d59 100644 --- a/server/sonar-web/src/main/js/apps/projectBranches/routes.ts +++ b/server/sonar-web/src/main/js/apps/projectBranches/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/projectDeletion/App.tsx b/server/sonar-web/src/main/js/apps/projectDeletion/App.tsx index 4fe68e3a179..dd4c6a02932 100644 --- a/server/sonar-web/src/main/js/apps/projectDeletion/App.tsx +++ b/server/sonar-web/src/main/js/apps/projectDeletion/App.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import Form from './Form'; import Header from './Header'; diff --git a/server/sonar-web/src/main/js/apps/projectDeletion/Form.tsx b/server/sonar-web/src/main/js/apps/projectDeletion/Form.tsx index 17a28d4d6a2..1ae2bb00a8c 100644 --- a/server/sonar-web/src/main/js/apps/projectDeletion/Form.tsx +++ b/server/sonar-web/src/main/js/apps/projectDeletion/Form.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { deleteApplication } from '../../api/application'; import { deletePortfolio, deleteProject } from '../../api/components'; import addGlobalSuccessMessage from '../../app/utils/addGlobalSuccessMessage'; import { Router, withRouter } from '../../components/hoc/withRouter'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../sonar-ui-common/components/controls/ConfirmButton'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import { isApplication, isPortfolioLike } from '../../types/component'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/projectDeletion/Header.tsx b/server/sonar-web/src/main/js/apps/projectDeletion/Header.tsx index 775e91fa252..7fdfb20cabe 100644 --- a/server/sonar-web/src/main/js/apps/projectDeletion/Header.tsx +++ b/server/sonar-web/src/main/js/apps/projectDeletion/Header.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { component: Pick<T.Component, 'qualifier'>; diff --git a/server/sonar-web/src/main/js/apps/projectKey/Key.tsx b/server/sonar-web/src/main/js/apps/projectKey/Key.tsx index fca0e4459b0..6458a99d296 100644 --- a/server/sonar-web/src/main/js/apps/projectKey/Key.tsx +++ b/server/sonar-web/src/main/js/apps/projectKey/Key.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { withRouter, WithRouterProps } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { changeKey } from '../../api/components'; import RecentHistory from '../../app/components/RecentHistory'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import UpdateForm from './UpdateForm'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/projectKey/UpdateForm.tsx b/server/sonar-web/src/main/js/apps/projectKey/UpdateForm.tsx index ea8d214f890..63eaf48076f 100644 --- a/server/sonar-web/src/main/js/apps/projectKey/UpdateForm.tsx +++ b/server/sonar-web/src/main/js/apps/projectKey/UpdateForm.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import ProjectKeyInput from '../../components/common/ProjectKeyInput'; import { validateProjectKey } from '../../helpers/projects'; +import { Button, SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../sonar-ui-common/components/controls/ConfirmButton'; +import MandatoryFieldsExplanation from '../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import { ProjectKeyValidationResult } from '../../types/component'; export interface UpdateFormProps { diff --git a/server/sonar-web/src/main/js/apps/projectKey/__tests__/UpdateForm-test.tsx b/server/sonar-web/src/main/js/apps/projectKey/__tests__/UpdateForm-test.tsx index fcc6c8db9a5..fce8a5e10e6 100644 --- a/server/sonar-web/src/main/js/apps/projectKey/__tests__/UpdateForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectKey/__tests__/UpdateForm-test.tsx @@ -19,10 +19,10 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import { Button, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import ProjectKeyInput from '../../../components/common/ProjectKeyInput'; import { mockComponent, mockEvent } from '../../../helpers/testMocks'; +import { Button, SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import UpdateForm, { UpdateFormProps } from '../UpdateForm'; it('should render', () => { diff --git a/server/sonar-web/src/main/js/apps/projectLinks/App.tsx b/server/sonar-web/src/main/js/apps/projectLinks/App.tsx index 0b8cd24b4d5..0548f6e082b 100644 --- a/server/sonar-web/src/main/js/apps/projectLinks/App.tsx +++ b/server/sonar-web/src/main/js/apps/projectLinks/App.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { createLink, deleteLink, getProjectLinks } from '../../api/projectLinks'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import Header from './Header'; import Table from './Table'; diff --git a/server/sonar-web/src/main/js/apps/projectLinks/CreationModal.tsx b/server/sonar-web/src/main/js/apps/projectLinks/CreationModal.tsx index 39f1a38fa57..1d6cd1b81ac 100644 --- a/server/sonar-web/src/main/js/apps/projectLinks/CreationModal.tsx +++ b/server/sonar-web/src/main/js/apps/projectLinks/CreationModal.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import SimpleModal from '../../sonar-ui-common/components/controls/SimpleModal'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import MandatoryFieldMarker from '../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { onClose: () => void; diff --git a/server/sonar-web/src/main/js/apps/projectLinks/Header.tsx b/server/sonar-web/src/main/js/apps/projectLinks/Header.tsx index 2ffc9d6ca43..d91ff946350 100644 --- a/server/sonar-web/src/main/js/apps/projectLinks/Header.tsx +++ b/server/sonar-web/src/main/js/apps/projectLinks/Header.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import CreationModal from './CreationModal'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/projectLinks/LinkRow.tsx b/server/sonar-web/src/main/js/apps/projectLinks/LinkRow.tsx index 9ea84db1902..32d57ddc6c0 100644 --- a/server/sonar-web/src/main/js/apps/projectLinks/LinkRow.tsx +++ b/server/sonar-web/src/main/js/apps/projectLinks/LinkRow.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import ProjectLinkIcon from 'sonar-ui-common/components/icons/ProjectLinkIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import isValidUri from '../../app/utils/isValidUri'; import { getLinkName, isProvided } from '../../helpers/projectLinks'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../sonar-ui-common/components/controls/ConfirmButton'; +import ProjectLinkIcon from '../../sonar-ui-common/components/icons/ProjectLinkIcon'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; interface Props { link: T.ProjectLink; diff --git a/server/sonar-web/src/main/js/apps/projectLinks/Table.tsx b/server/sonar-web/src/main/js/apps/projectLinks/Table.tsx index 517eede8c33..4f8bccf0dbc 100644 --- a/server/sonar-web/src/main/js/apps/projectLinks/Table.tsx +++ b/server/sonar-web/src/main/js/apps/projectLinks/Table.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { orderLinks } from '../../helpers/projectLinks'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import LinkRow from './LinkRow'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/projectLinks/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/projectLinks/__tests__/App-test.tsx index a296b394a10..1224f82d98e 100644 --- a/server/sonar-web/src/main/js/apps/projectLinks/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectLinks/__tests__/App-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { createLink, deleteLink, getProjectLinks } from '../../../api/projectLinks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import App from '../App'; // import { getProjectLinks, createLink, deleteLink } from '../../api/projectLinks'; diff --git a/server/sonar-web/src/main/js/apps/projectLinks/__tests__/CreationModal-test.tsx b/server/sonar-web/src/main/js/apps/projectLinks/__tests__/CreationModal-test.tsx index 089d159ccb0..8b2e2f7b837 100644 --- a/server/sonar-web/src/main/js/apps/projectLinks/__tests__/CreationModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectLinks/__tests__/CreationModal-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, submit } from 'sonar-ui-common/helpers/testUtils'; +import { change, submit } from '../../../sonar-ui-common/helpers/testUtils'; import CreationModal from '../CreationModal'; it('should create link', () => { diff --git a/server/sonar-web/src/main/js/apps/projectLinks/__tests__/Header-test.tsx b/server/sonar-web/src/main/js/apps/projectLinks/__tests__/Header-test.tsx index 2d074d0811e..4ff3a8785c3 100644 --- a/server/sonar-web/src/main/js/apps/projectLinks/__tests__/Header-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectLinks/__tests__/Header-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import Header from '../Header'; it('should render', () => { diff --git a/server/sonar-web/src/main/js/apps/projectQualityGate/ProjectQualityGateApp.tsx b/server/sonar-web/src/main/js/apps/projectQualityGate/ProjectQualityGateApp.tsx index 095bde5a1e8..51e52ab61b8 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityGate/ProjectQualityGateApp.tsx +++ b/server/sonar-web/src/main/js/apps/projectQualityGate/ProjectQualityGateApp.tsx @@ -18,7 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { associateGateWithProject, dissociateGateWithProject, @@ -29,6 +28,7 @@ import { } from '../../api/quality-gates'; import addGlobalSuccessMessage from '../../app/utils/addGlobalSuccessMessage'; import handleRequiredAuthorization from '../../app/utils/handleRequiredAuthorization'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { USE_SYSTEM_DEFAULT } from './constants'; import ProjectQualityGateAppRenderer from './ProjectQualityGateAppRenderer'; diff --git a/server/sonar-web/src/main/js/apps/projectQualityGate/ProjectQualityGateAppRenderer.tsx b/server/sonar-web/src/main/js/apps/projectQualityGate/ProjectQualityGateAppRenderer.tsx index 2da84b07ec9..88325f4dbb8 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityGate/ProjectQualityGateAppRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/projectQualityGate/ProjectQualityGateAppRenderer.tsx @@ -21,16 +21,16 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { isDiffMetric } from 'sonar-ui-common/helpers/measures'; import A11ySkipTarget from '../../app/components/a11y/A11ySkipTarget'; import Suggestions from '../../app/components/embed-docs-modal/Suggestions'; import DisableableSelectOption from '../../components/common/DisableableSelectOption'; +import { SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import HelpTooltip from '../../sonar-ui-common/components/controls/HelpTooltip'; +import Radio from '../../sonar-ui-common/components/controls/Radio'; +import Select from '../../sonar-ui-common/components/controls/Select'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { isDiffMetric } from '../../sonar-ui-common/helpers/measures'; import BuiltInQualityGateBadge from '../quality-gates/components/BuiltInQualityGateBadge'; import { USE_SYSTEM_DEFAULT } from './constants'; diff --git a/server/sonar-web/src/main/js/apps/projectQualityGate/__tests__/ProjectQualityGateApp-test.tsx b/server/sonar-web/src/main/js/apps/projectQualityGate/__tests__/ProjectQualityGateApp-test.tsx index d1643b8aba5..cf1b581b214 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityGate/__tests__/ProjectQualityGateApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectQualityGate/__tests__/ProjectQualityGateApp-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { associateGateWithProject, dissociateGateWithProject, @@ -30,6 +29,7 @@ import { import handleRequiredAuthorization from '../../../app/utils/handleRequiredAuthorization'; import { mockQualityGate } from '../../../helpers/mocks/quality-gates'; import { mockComponent } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { USE_SYSTEM_DEFAULT } from '../constants'; import ProjectQualityGateApp from '../ProjectQualityGateApp'; diff --git a/server/sonar-web/src/main/js/apps/projectQualityGate/__tests__/ProjectQualityGateAppRenderer-test.tsx b/server/sonar-web/src/main/js/apps/projectQualityGate/__tests__/ProjectQualityGateAppRenderer-test.tsx index 19691ab2088..e2c2938f294 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityGate/__tests__/ProjectQualityGateAppRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectQualityGate/__tests__/ProjectQualityGateAppRenderer-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { submit } from 'sonar-ui-common/helpers/testUtils'; import { mockQualityGate } from '../../../helpers/mocks/quality-gates'; import { mockCondition } from '../../../helpers/testMocks'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { submit } from '../../../sonar-ui-common/helpers/testUtils'; import { MetricKey } from '../../../types/metrics'; import { USE_SYSTEM_DEFAULT } from '../constants'; import ProjectQualityGateAppRenderer, { diff --git a/server/sonar-web/src/main/js/apps/projectQualityGate/routes.ts b/server/sonar-web/src/main/js/apps/projectQualityGate/routes.ts index 835e763202a..395a4f4dd01 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityGate/routes.ts +++ b/server/sonar-web/src/main/js/apps/projectQualityGate/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/projectQualityProfiles/ProjectQualityProfilesApp.tsx b/server/sonar-web/src/main/js/apps/projectQualityProfiles/ProjectQualityProfilesApp.tsx index b065f5435df..c8158903dcb 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityProfiles/ProjectQualityProfilesApp.tsx +++ b/server/sonar-web/src/main/js/apps/projectQualityProfiles/ProjectQualityProfilesApp.tsx @@ -19,8 +19,6 @@ */ import { differenceBy } from 'lodash'; import * as React from 'react'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { isDefined } from 'sonar-ui-common/helpers/types'; import { associateProject, dissociateProject, @@ -30,6 +28,8 @@ import { } from '../../api/quality-profiles'; import addGlobalSuccessMessage from '../../app/utils/addGlobalSuccessMessage'; import handleRequiredAuthorization from '../../app/utils/handleRequiredAuthorization'; +import { translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; +import { isDefined } from '../../sonar-ui-common/helpers/types'; import ProjectQualityProfilesAppRenderer from './ProjectQualityProfilesAppRenderer'; import { ProjectProfile } from './types'; diff --git a/server/sonar-web/src/main/js/apps/projectQualityProfiles/ProjectQualityProfilesAppRenderer.tsx b/server/sonar-web/src/main/js/apps/projectQualityProfiles/ProjectQualityProfilesAppRenderer.tsx index 53f79b447e7..8a7635275fe 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityProfiles/ProjectQualityProfilesAppRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/projectQualityProfiles/ProjectQualityProfilesAppRenderer.tsx @@ -21,15 +21,15 @@ import { groupBy, orderBy } from 'lodash'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import EditIcon from 'sonar-ui-common/components/icons/EditIcon'; -import PlusCircleIcon from 'sonar-ui-common/components/icons/PlusCircleIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Profile } from '../../api/quality-profiles'; import A11ySkipTarget from '../../app/components/a11y/A11ySkipTarget'; import Suggestions from '../../app/components/embed-docs-modal/Suggestions'; import { getRulesUrl } from '../../helpers/urls'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import HelpTooltip from '../../sonar-ui-common/components/controls/HelpTooltip'; +import EditIcon from '../../sonar-ui-common/components/icons/EditIcon'; +import PlusCircleIcon from '../../sonar-ui-common/components/icons/PlusCircleIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import BuiltInQualityProfileBadge from '../quality-profiles/components/BuiltInQualityProfileBadge'; import AddLanguageModal from './components/AddLanguageModal'; import SetQualityProfileModal from './components/SetQualityProfileModal'; diff --git a/server/sonar-web/src/main/js/apps/projectQualityProfiles/__tests__/ProjectQualityProfilesApp-test.tsx b/server/sonar-web/src/main/js/apps/projectQualityProfiles/__tests__/ProjectQualityProfilesApp-test.tsx index 815c1a97a54..547bead93eb 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityProfiles/__tests__/ProjectQualityProfilesApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectQualityProfiles/__tests__/ProjectQualityProfilesApp-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { associateProject, dissociateProject, @@ -29,6 +28,7 @@ import { } from '../../../api/quality-profiles'; import handleRequiredAuthorization from '../../../app/utils/handleRequiredAuthorization'; import { mockComponent } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import ProjectQualityProfilesApp from '../ProjectQualityProfilesApp'; jest.mock('../../../api/quality-profiles', () => { diff --git a/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/AddLanguageModal.tsx b/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/AddLanguageModal.tsx index e21e2b6cf20..82a90de0c71 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/AddLanguageModal.tsx +++ b/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/AddLanguageModal.tsx @@ -21,13 +21,13 @@ import { difference } from 'lodash'; import * as React from 'react'; import { connect } from 'react-redux'; import { Link } from 'react-router'; -import { ButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Select from 'sonar-ui-common/components/controls/Select'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Profile } from '../../../api/quality-profiles'; import DisableableSelectOption from '../../../components/common/DisableableSelectOption'; import { getQualityProfileUrl } from '../../../helpers/urls'; +import { ButtonLink, SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Store } from '../../../store/rootReducer'; export interface AddLanguageModalProps { diff --git a/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/SetQualityProfileModal.tsx b/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/SetQualityProfileModal.tsx index a42b488f035..cb9be26ae92 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/SetQualityProfileModal.tsx +++ b/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/SetQualityProfileModal.tsx @@ -19,15 +19,15 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { ButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import Select from 'sonar-ui-common/components/controls/Select'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { Profile } from '../../../api/quality-profiles'; import DisableableSelectOption from '../../../components/common/DisableableSelectOption'; import { getQualityProfileUrl } from '../../../helpers/urls'; +import { ButtonLink, SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import BuiltInQualityProfileBadge from '../../quality-profiles/components/BuiltInQualityProfileBadge'; import { USE_SYSTEM_DEFAULT } from '../constants'; diff --git a/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/__tests__/AddLanguageModal-test.tsx b/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/__tests__/AddLanguageModal-test.tsx index 9438ce4f61f..d97beb3023c 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/__tests__/AddLanguageModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/__tests__/AddLanguageModal-test.tsx @@ -19,9 +19,9 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; import { mockQualityProfile } from '../../../../helpers/testMocks'; +import Select from '../../../../sonar-ui-common/components/controls/Select'; +import SimpleModal from '../../../../sonar-ui-common/components/controls/SimpleModal'; import { AddLanguageModal, AddLanguageModalProps } from '../AddLanguageModal'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/__tests__/SetQualityProfileModal-test.tsx b/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/__tests__/SetQualityProfileModal-test.tsx index 9a7995ca6ee..2c9ad1797cb 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/__tests__/SetQualityProfileModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectQualityProfiles/components/__tests__/SetQualityProfileModal-test.tsx @@ -19,10 +19,10 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import Select from 'sonar-ui-common/components/controls/Select'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; import { mockComponent, mockQualityProfile } from '../../../../helpers/testMocks'; +import Radio from '../../../../sonar-ui-common/components/controls/Radio'; +import Select from '../../../../sonar-ui-common/components/controls/Select'; +import SimpleModal from '../../../../sonar-ui-common/components/controls/SimpleModal'; import SetQualityProfileModal, { SetQualityProfileModalProps } from '../SetQualityProfileModal'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/projectQualityProfiles/routes.ts b/server/sonar-web/src/main/js/apps/projectQualityProfiles/routes.ts index 8a2a2332150..b04a9d34320 100644 --- a/server/sonar-web/src/main/js/apps/projectQualityProfiles/routes.ts +++ b/server/sonar-web/src/main/js/apps/projectQualityProfiles/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx index 185be554b6d..f520c820609 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/AllProjects.tsx @@ -20,18 +20,18 @@ import { omitBy } from 'lodash'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { addSideBarClass, removeSideBarClass } from 'sonar-ui-common/helpers/pages'; -import { get, save } from 'sonar-ui-common/helpers/storage'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper'; import { Location, Router, withRouter } from '../../../components/hoc/withRouter'; import '../../../components/search-navigator.css'; import { isLoggedIn } from '../../../helpers/users'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import handleRequiredAuthentication from '../../../sonar-ui-common/helpers/handleRequiredAuthentication'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { addSideBarClass, removeSideBarClass } from '../../../sonar-ui-common/helpers/pages'; +import { get, save } from '../../../sonar-ui-common/helpers/storage'; import { ComponentQualifier } from '../../../types/component'; import { hasFilterParams, hasVisualizationParams, parseUrlQuery, Query } from '../query'; import '../styles.css'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/AllProjectsContainer.tsx b/server/sonar-web/src/main/js/apps/projects/components/AllProjectsContainer.tsx index bc730647312..016fcb5f7b5 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/AllProjectsContainer.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/AllProjectsContainer.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { connect } from 'react-redux'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../../sonar-ui-common/components/lazyLoadComponent'; import { getAppState, getCurrentUser, Store } from '../../../store/rootReducer'; import { ComponentQualifier } from '../../../types/component'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/ApplicationCreation.tsx b/server/sonar-web/src/main/js/apps/projects/components/ApplicationCreation.tsx index 56742d4e086..6370abe992c 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/ApplicationCreation.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/ApplicationCreation.tsx @@ -18,8 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getComponentNavigation } from '../../../api/nav'; import CreateApplicationForm from '../../../app/components/extensions/CreateApplicationForm'; import { withAppState } from '../../../components/hoc/withAppState'; @@ -27,6 +25,8 @@ import { withCurrentUser } from '../../../components/hoc/withCurrentUser'; import { Router, withRouter } from '../../../components/hoc/withRouter'; import { getComponentAdminUrl, getComponentOverviewUrl } from '../../../helpers/urls'; import { hasGlobalPermission } from '../../../helpers/users'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ComponentQualifier } from '../../../types/component'; import { Permissions } from '../../../types/permissions'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/ClearAll.tsx b/server/sonar-web/src/main/js/apps/projects/components/ClearAll.tsx index 2b5e6ab1b1d..3ab932bb29a 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/ClearAll.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/ClearAll.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onClearAll: () => void; diff --git a/server/sonar-web/src/main/js/apps/projects/components/DefaultPageSelector.tsx b/server/sonar-web/src/main/js/apps/projects/components/DefaultPageSelector.tsx index 56ef87faafb..f511a91a6c8 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/DefaultPageSelector.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/DefaultPageSelector.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { get } from 'sonar-ui-common/helpers/storage'; import { searchProjects } from '../../../api/components'; import { withCurrentUser } from '../../../components/hoc/withCurrentUser'; import { Location, Router, withRouter } from '../../../components/hoc/withRouter'; import { hasGlobalPermission, isLoggedIn } from '../../../helpers/users'; +import { get } from '../../../sonar-ui-common/helpers/storage'; import { PROJECTS_ALL, PROJECTS_DEFAULT_FILTER, PROJECTS_FAVORITE } from '../utils'; import AllProjectsContainer from './AllProjectsContainer'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/EmptyFavoriteSearch.tsx b/server/sonar-web/src/main/js/apps/projects/components/EmptyFavoriteSearch.tsx index 2a3c80494f2..c86b03c66a2 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/EmptyFavoriteSearch.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/EmptyFavoriteSearch.tsx @@ -20,8 +20,8 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import '../../../components/common/EmptySearch.css'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Query } from '../query'; export default function EmptyFavoriteSearch({ query }: { query: Query }) { diff --git a/server/sonar-web/src/main/js/apps/projects/components/EmptyInstance.tsx b/server/sonar-web/src/main/js/apps/projects/components/EmptyInstance.tsx index 34678061215..3397720a780 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/EmptyInstance.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/EmptyInstance.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import { WithRouterProps } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { withRouter } from '../../../components/hoc/withRouter'; import { hasGlobalPermission, isLoggedIn } from '../../../helpers/users'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Permissions } from '../../../types/permissions'; export interface EmptyInstanceProps { diff --git a/server/sonar-web/src/main/js/apps/projects/components/FavoriteFilter.tsx b/server/sonar-web/src/main/js/apps/projects/components/FavoriteFilter.tsx index 20969b7bb67..3e3c57bc6d4 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/FavoriteFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/FavoriteFilter.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { IndexLink, Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { save } from 'sonar-ui-common/helpers/storage'; import { isLoggedIn } from '../../../helpers/users'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { save } from '../../../sonar-ui-common/helpers/storage'; import { PROJECTS_ALL, PROJECTS_DEFAULT_FILTER, PROJECTS_FAVORITE } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/projects/components/NoFavoriteProjects.tsx b/server/sonar-web/src/main/js/apps/projects/components/NoFavoriteProjects.tsx index 5f87253c2d7..3daaee1d38c 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/NoFavoriteProjects.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/NoFavoriteProjects.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function NoFavoriteProjects() { return ( diff --git a/server/sonar-web/src/main/js/apps/projects/components/PageHeader.tsx b/server/sonar-web/src/main/js/apps/projects/components/PageHeader.tsx index c954611367a..0809336d957 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/PageHeader.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/PageHeader.tsx @@ -19,10 +19,10 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import HomePageSelect from '../../../components/controls/HomePageSelect'; import { isLoggedIn } from '../../../helpers/users'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import SearchFilterContainer from '../filters/SearchFilterContainer'; import { Project } from '../types'; import ApplicationCreation from './ApplicationCreation'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.tsx b/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.tsx index 4a0f69585a9..9bdb1e57928 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/PageSidebar.tsx @@ -19,7 +19,7 @@ */ import { flatMap } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import CoverageFilter from '../filters/CoverageFilter'; import DuplicationsFilter from '../filters/DuplicationsFilter'; import LanguagesFilterContainer from '../filters/LanguagesFilterContainer'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/PerspectiveSelect.tsx b/server/sonar-web/src/main/js/apps/projects/components/PerspectiveSelect.tsx index 43fb2b23ff6..441efc3962d 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/PerspectiveSelect.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/PerspectiveSelect.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { VIEWS, VISUALIZATIONS } from '../utils'; import PerspectiveSelectOption, { Option } from './PerspectiveSelectOption'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/PerspectiveSelectOption.tsx b/server/sonar-web/src/main/js/apps/projects/components/PerspectiveSelectOption.tsx index 30554fb211b..5cf080bbdff 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/PerspectiveSelectOption.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/PerspectiveSelectOption.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BubblesIcon from 'sonar-ui-common/components/icons/BubblesIcon'; -import ListIcon from 'sonar-ui-common/components/icons/ListIcon'; +import BubblesIcon from '../../../sonar-ui-common/components/icons/BubblesIcon'; +import ListIcon from '../../../sonar-ui-common/components/icons/ListIcon'; export interface Option { label: string; diff --git a/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenu.tsx b/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenu.tsx index 3b1c420744f..264167ce4f1 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenu.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenu.tsx @@ -19,15 +19,15 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import EllipsisIcon from 'sonar-ui-common/components/icons/EllipsisIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getAlmSettings } from '../../../api/alm-settings'; import { withCurrentUser } from '../../../components/hoc/withCurrentUser'; import { IMPORT_COMPATIBLE_ALMS, IMPORT_COMPATIBLE_ALM_COUNT } from '../../../helpers/constants'; import { hasGlobalPermission } from '../../../helpers/users'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import Dropdown from '../../../sonar-ui-common/components/controls/Dropdown'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import EllipsisIcon from '../../../sonar-ui-common/components/icons/EllipsisIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance } from '../../../types/alm-settings'; import { Permissions } from '../../../types/permissions'; import ProjectCreationMenuItem from './ProjectCreationMenuItem'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenuItem.tsx b/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenuItem.tsx index 6bdc1540b65..5decdbb78b5 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenuItem.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/ProjectCreationMenuItem.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import ChevronsIcon from 'sonar-ui-common/components/icons/ChevronsIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import ChevronsIcon from '../../../sonar-ui-common/components/icons/ChevronsIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { AlmKeys } from '../../../types/alm-settings'; export interface ProjectCreationMenuItemProps { diff --git a/server/sonar-web/src/main/js/apps/projects/components/ProjectsList.tsx b/server/sonar-web/src/main/js/apps/projects/components/ProjectsList.tsx index a401ac5c502..2f26cf63cf7 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/ProjectsList.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/ProjectsList.tsx @@ -21,8 +21,8 @@ import * as React from 'react'; import { AutoSizer } from 'react-virtualized/dist/commonjs/AutoSizer'; import { List, ListRowProps } from 'react-virtualized/dist/commonjs/List'; import { WindowScroller } from 'react-virtualized/dist/commonjs/WindowScroller'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import EmptySearch from '../../../components/common/EmptySearch'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Query } from '../query'; import { Project } from '../types'; import EmptyFavoriteSearch from './EmptyFavoriteSearch'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/ProjectsSortingSelect.tsx b/server/sonar-web/src/main/js/apps/projects/components/ProjectsSortingSelect.tsx index 608fb662b9b..59f1a6a0712 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/ProjectsSortingSelect.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/ProjectsSortingSelect.tsx @@ -19,13 +19,13 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import Select from 'sonar-ui-common/components/controls/Select'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import SortAscIcon from 'sonar-ui-common/components/icons/SortAscIcon'; -import SortDescIcon from 'sonar-ui-common/components/icons/SortDescIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { colors } from '../../../app/theme'; +import { ButtonIcon } from '../../../sonar-ui-common/components/controls/buttons'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import SortAscIcon from '../../../sonar-ui-common/components/icons/SortAscIcon'; +import SortDescIcon from '../../../sonar-ui-common/components/icons/SortDescIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { parseSorting, SORTING_LEAK_METRICS, SORTING_METRICS } from '../utils'; import ProjectsSortingSelectOption, { Option } from './ProjectsSortingSelectOption'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/AllProjects-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/AllProjects-test.tsx index 529ff1d70fc..81bef7f6a77 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/AllProjects-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/AllProjects-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { get, save } from 'sonar-ui-common/helpers/storage'; +import { get, save } from '../../../../sonar-ui-common/helpers/storage'; import { ComponentQualifier } from '../../../../types/component'; import { AllProjects, @@ -55,7 +55,7 @@ jest.mock('../../utils', () => { return utils; }); -jest.mock('sonar-ui-common/helpers/storage', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/storage', () => ({ get: jest.fn(() => null), save: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/ApplicationCreation-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/ApplicationCreation-test.tsx index fa411d0c5ad..127b03b12d8 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/ApplicationCreation-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/ApplicationCreation-test.tsx @@ -19,10 +19,10 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; import { getComponentNavigation } from '../../../../api/nav'; import CreateApplicationForm from '../../../../app/components/extensions/CreateApplicationForm'; import { mockAppState, mockLoggedInUser, mockRouter } from '../../../../helpers/testMocks'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; import { ComponentQualifier } from '../../../../types/component'; import { ApplicationCreation, ApplicationCreationProps } from '../ApplicationCreation'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/ClearAll-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/ClearAll-test.tsx index fc0a59f7274..5fbf88db635 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/ClearAll-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/ClearAll-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import ClearAll from '../ClearAll'; it('renders', () => { diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/DefaultPageSelector-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/DefaultPageSelector-test.tsx index 1445bf40746..9ac62fb5336 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/DefaultPageSelector-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/DefaultPageSelector-test.tsx @@ -19,8 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { get } from 'sonar-ui-common/helpers/storage'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { searchProjects } from '../../../../api/components'; import { mockCurrentUser, @@ -29,6 +27,8 @@ import { mockRouter } from '../../../../helpers/testMocks'; import { hasGlobalPermission } from '../../../../helpers/users'; +import { get } from '../../../../sonar-ui-common/helpers/storage'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { DefaultPageSelector } from '../DefaultPageSelector'; jest.mock('../AllProjectsContainer', () => ({ @@ -38,7 +38,7 @@ jest.mock('../AllProjectsContainer', () => ({ } })); -jest.mock('sonar-ui-common/helpers/storage', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/storage', () => ({ get: jest.fn().mockReturnValue(undefined) })); diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/FavoriteFilter-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/FavoriteFilter-test.tsx index ca76c7cb240..61be1c433b5 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/FavoriteFilter-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/FavoriteFilter-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { save } from 'sonar-ui-common/helpers/storage'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { save } from '../../../../sonar-ui-common/helpers/storage'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import FavoriteFilter from '../FavoriteFilter'; -jest.mock('sonar-ui-common/helpers/storage', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/storage', () => ({ save: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/ProjectCreationMenu-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/ProjectCreationMenu-test.tsx index 7afc40b3af3..d53dee50767 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/ProjectCreationMenu-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/ProjectCreationMenu-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getAlmSettings } from '../../../../api/alm-settings'; import { mockLoggedInUser } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../types/alm-settings'; import { ProjectCreationMenu } from '../ProjectCreationMenu'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/__tests__/ProjectsSortingSelect-test.tsx b/server/sonar-web/src/main/js/apps/projects/components/__tests__/ProjectsSortingSelect-test.tsx index 76f41d84352..4253c43401b 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/__tests__/ProjectsSortingSelect-test.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/__tests__/ProjectsSortingSelect-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import ProjectsSortingSelect from '../ProjectsSortingSelect'; it('should render correctly for overall view', () => { diff --git a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCard.tsx b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCard.tsx index 4a854f9d8f3..7ab96073b33 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCard.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCard.tsx @@ -21,18 +21,18 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import SizeRating from 'sonar-ui-common/components/ui/SizeRating'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import PrivacyBadgeContainer from '../../../../components/common/PrivacyBadgeContainer'; import Favorite from '../../../../components/controls/Favorite'; import Measure from '../../../../components/measure/Measure'; import TagsList from '../../../../components/tags/TagsList'; import { getProjectUrl } from '../../../../helpers/urls'; import { isLoggedIn } from '../../../../helpers/users'; +import Tooltip from '../../../../sonar-ui-common/components/controls/Tooltip'; +import QualifierIcon from '../../../../sonar-ui-common/components/icons/QualifierIcon'; +import DateFromNow from '../../../../sonar-ui-common/components/intl/DateFromNow'; +import DateTimeFormatter from '../../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import SizeRating from '../../../../sonar-ui-common/components/ui/SizeRating'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import { ComponentQualifier } from '../../../../types/component'; import { MetricKey } from '../../../../types/metrics'; import { Project } from '../../types'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardLanguages.tsx b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardLanguages.tsx index 996ead44a17..23316b03e90 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardLanguages.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardLanguages.tsx @@ -19,7 +19,7 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasure.tsx b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasure.tsx index e55e51a1056..bd1d1f42a4f 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasure.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasure.tsx @@ -19,7 +19,7 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; +import IssueTypeIcon from '../../../../sonar-ui-common/components/icons/IssueTypeIcon'; export interface ProjectCardMeasureProps { iconKey?: string; diff --git a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasures.tsx b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasures.tsx index ab73ef5a8a6..57347d495a9 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasures.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardMeasures.tsx @@ -20,13 +20,13 @@ import * as classNames from 'classnames'; import * as difference from 'date-fns/difference_in_milliseconds'; import * as React from 'react'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import DuplicationsRating from 'sonar-ui-common/components/ui/DuplicationsRating'; -import Rating from 'sonar-ui-common/components/ui/Rating'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { isDefined } from 'sonar-ui-common/helpers/types'; import Measure from '../../../../components/measure/Measure'; import CoverageRating from '../../../../components/ui/CoverageRating'; +import DateTimeFormatter from '../../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import DuplicationsRating from '../../../../sonar-ui-common/components/ui/DuplicationsRating'; +import Rating from '../../../../sonar-ui-common/components/ui/Rating'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; +import { isDefined } from '../../../../sonar-ui-common/helpers/types'; import { ComponentQualifier } from '../../../../types/component'; import { MetricKey } from '../../../../types/metrics'; import { formatDuration } from '../../utils'; diff --git a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardQualityGate.tsx b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardQualityGate.tsx index e879c96d591..e0c16d01a6a 100644 --- a/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardQualityGate.tsx +++ b/server/sonar-web/src/main/js/apps/projects/components/project-card/ProjectCardQualityGate.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import Level from 'sonar-ui-common/components/ui/Level'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import HelpTooltip from '../../../../sonar-ui-common/components/controls/HelpTooltip'; +import Level from '../../../../sonar-ui-common/components/ui/Level'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../../sonar-ui-common/helpers/measures'; interface Props { status?: string; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/CoverageFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/CoverageFilter.tsx index 7b27656d205..b656d3716f2 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/CoverageFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/CoverageFilter.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import CoverageRating from '../../../components/ui/CoverageRating'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getCoverageRatingAverageValue, getCoverageRatingLabel -} from 'sonar-ui-common/helpers/ratings'; -import CoverageRating from '../../../components/ui/CoverageRating'; +} from '../../../sonar-ui-common/helpers/ratings'; import { Facet } from '../types'; import Filter from './Filter'; import FilterHeader from './FilterHeader'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/DuplicationsFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/DuplicationsFilter.tsx index df0cd9368db..a06946a3c98 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/DuplicationsFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/DuplicationsFilter.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DuplicationsRating from 'sonar-ui-common/components/ui/DuplicationsRating'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import DuplicationsRating from '../../../sonar-ui-common/components/ui/DuplicationsRating'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getDuplicationsRatingAverageValue, getDuplicationsRatingLabel -} from 'sonar-ui-common/helpers/ratings'; +} from '../../../sonar-ui-common/helpers/ratings'; import { Facet } from '../types'; import Filter from './Filter'; import FilterHeader from './FilterHeader'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/Filter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/Filter.tsx index b11139ae9d4..6c8f79e38a1 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/Filter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/Filter.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { Facet } from '../types'; export type Option = string | number; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/IssuesFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/IssuesFilter.tsx index 231010c049f..b437b47f244 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/IssuesFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/IssuesFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Rating from 'sonar-ui-common/components/ui/Rating'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Rating from '../../../sonar-ui-common/components/ui/Rating'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Facet } from '../types'; import Filter from './Filter'; import FilterHeader from './FilterHeader'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/LanguagesFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/LanguagesFilter.tsx index d00359e387d..6e3c8a53469 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/LanguagesFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/LanguagesFilter.tsx @@ -19,7 +19,7 @@ */ import { difference, sortBy } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getLanguageByKey } from '../../../store/languages'; import { Facet } from '../types'; import Filter from './Filter'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/MaintainabilityFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/MaintainabilityFilter.tsx index a3200831379..a6bb27b3042 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/MaintainabilityFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/MaintainabilityFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import CodeSmellIcon from 'sonar-ui-common/components/icons/CodeSmellIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import CodeSmellIcon from '../../../sonar-ui-common/components/icons/CodeSmellIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Facet } from '../types'; import IssuesFilter from './IssuesFilter'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/NewLinesFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/NewLinesFilter.tsx index 891492b8d5b..86e5b4f1f81 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/NewLinesFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/NewLinesFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getSizeRatingLabel } from 'sonar-ui-common/helpers/ratings'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getSizeRatingLabel } from '../../../sonar-ui-common/helpers/ratings'; import { Facet } from '../types'; import Filter from './Filter'; import FilterHeader from './FilterHeader'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/NewMaintainabilityFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/NewMaintainabilityFilter.tsx index 36a9c4c801c..66325a135b7 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/NewMaintainabilityFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/NewMaintainabilityFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import CodeSmellIcon from 'sonar-ui-common/components/icons/CodeSmellIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import CodeSmellIcon from '../../../sonar-ui-common/components/icons/CodeSmellIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Facet } from '../types'; import IssuesFilter from './IssuesFilter'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/NewReliabilityFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/NewReliabilityFilter.tsx index ea28235f4fb..3bf152eeae5 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/NewReliabilityFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/NewReliabilityFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BugIcon from 'sonar-ui-common/components/icons/BugIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import BugIcon from '../../../sonar-ui-common/components/icons/BugIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Facet } from '../types'; import IssuesFilter from './IssuesFilter'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/NewSecurityFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/NewSecurityFilter.tsx index 24a9a03292d..092d0a4a54a 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/NewSecurityFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/NewSecurityFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import VulnerabilityIcon from 'sonar-ui-common/components/icons/VulnerabilityIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import VulnerabilityIcon from '../../../sonar-ui-common/components/icons/VulnerabilityIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Facet } from '../types'; import IssuesFilter from './IssuesFilter'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/QualifierFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/QualifierFilter.tsx index bd271ad3f3c..a59fde35725 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/QualifierFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/QualifierFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ComponentQualifier } from '../../../types/component'; import { Facet } from '../types'; import Filter from './Filter'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/QualityGateFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/QualityGateFilter.tsx index e0f4ba36881..347c88539a9 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/QualityGateFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/QualityGateFilter.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import Level from 'sonar-ui-common/components/ui/Level'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import Level from '../../../sonar-ui-common/components/ui/Level'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Facet } from '../types'; import Filter from './Filter'; import FilterHeader from './FilterHeader'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/ReliabilityFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/ReliabilityFilter.tsx index d8d6bbd50b1..952a6ef84d5 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/ReliabilityFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/ReliabilityFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BugIcon from 'sonar-ui-common/components/icons/BugIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import BugIcon from '../../../sonar-ui-common/components/icons/BugIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Facet } from '../types'; import IssuesFilter from './IssuesFilter'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/SearchFilterContainer.tsx b/server/sonar-web/src/main/js/apps/projects/filters/SearchFilterContainer.tsx index a2e94cde4c1..b4f2563967f 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/SearchFilterContainer.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/SearchFilterContainer.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { query: { search?: string }; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterFooter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterFooter.tsx index ce2d7230890..5e184e6a4f4 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterFooter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterFooter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { isFavorite?: boolean; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterOption.tsx b/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterOption.tsx index c3529a9e19c..e787a18af65 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterOption.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/SearchableFilterOption.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { option?: { name: string }; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/SecurityFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/SecurityFilter.tsx index 70da56f336e..be34bbbf52c 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/SecurityFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/SecurityFilter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import VulnerabilityIcon from 'sonar-ui-common/components/icons/VulnerabilityIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import VulnerabilityIcon from '../../../sonar-ui-common/components/icons/VulnerabilityIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Facet } from '../types'; import IssuesFilter from './IssuesFilter'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/SecurityReviewFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/SecurityReviewFilter.tsx index 1a9eafb543b..ec8ea03df5e 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/SecurityReviewFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/SecurityReviewFilter.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import SecurityHotspotIcon from 'sonar-ui-common/components/icons/SecurityHotspotIcon'; -import Rating from 'sonar-ui-common/components/ui/Rating'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import SecurityHotspotIcon from '../../../sonar-ui-common/components/icons/SecurityHotspotIcon'; +import Rating from '../../../sonar-ui-common/components/ui/Rating'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Facet } from '../types'; import Filter from './Filter'; import FilterHeader from './FilterHeader'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/SizeFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/SizeFilter.tsx index 32488a495a1..8265900fa18 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/SizeFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/SizeFilter.tsx @@ -18,9 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import SizeRating from 'sonar-ui-common/components/ui/SizeRating'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getSizeRatingAverageValue, getSizeRatingLabel } from 'sonar-ui-common/helpers/ratings'; +import SizeRating from '../../../sonar-ui-common/components/ui/SizeRating'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { + getSizeRatingAverageValue, + getSizeRatingLabel +} from '../../../sonar-ui-common/helpers/ratings'; import { Facet } from '../types'; import Filter from './Filter'; import FilterHeader from './FilterHeader'; diff --git a/server/sonar-web/src/main/js/apps/projects/filters/TagsFilter.tsx b/server/sonar-web/src/main/js/apps/projects/filters/TagsFilter.tsx index c4290be3b85..3e78ddcd323 100644 --- a/server/sonar-web/src/main/js/apps/projects/filters/TagsFilter.tsx +++ b/server/sonar-web/src/main/js/apps/projects/filters/TagsFilter.tsx @@ -19,8 +19,8 @@ */ import { debounce, difference, size, sortBy } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { searchProjectTags } from '../../../api/components'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Facet } from '../types'; import Filter from './Filter'; import FilterHeader from './FilterHeader'; diff --git a/server/sonar-web/src/main/js/apps/projects/routes.ts b/server/sonar-web/src/main/js/apps/projects/routes.ts index e1d22ef0daf..cc026f8dd9b 100644 --- a/server/sonar-web/src/main/js/apps/projects/routes.ts +++ b/server/sonar-web/src/main/js/apps/projects/routes.ts @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { RedirectFunction, RouterState } from 'react-router'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; -import { save } from 'sonar-ui-common/helpers/storage'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; +import { save } from '../../sonar-ui-common/helpers/storage'; import { PROJECTS_ALL, PROJECTS_DEFAULT_FILTER } from './utils'; const routes = [ diff --git a/server/sonar-web/src/main/js/apps/projects/utils.ts b/server/sonar-web/src/main/js/apps/projects/utils.ts index 60611e67ed7..f729cf3a72e 100644 --- a/server/sonar-web/src/main/js/apps/projects/utils.ts +++ b/server/sonar-web/src/main/js/apps/projects/utils.ts @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { invert } from 'lodash'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { RequestData } from 'sonar-ui-common/helpers/request'; import { Facet, searchProjects } from '../../api/components'; import { getMeasuresForProjects } from '../../api/measures'; import { isDiffMetric } from '../../helpers/measures'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; +import { RequestData } from '../../sonar-ui-common/helpers/request'; import { MetricKey } from '../../types/metrics'; import { convertToFilter, Query } from './query'; diff --git a/server/sonar-web/src/main/js/apps/projects/visualizations/Coverage.tsx b/server/sonar-web/src/main/js/apps/projects/visualizations/Coverage.tsx index ba071412e78..ee807a7ffcd 100644 --- a/server/sonar-web/src/main/js/apps/projects/visualizations/Coverage.tsx +++ b/server/sonar-web/src/main/js/apps/projects/visualizations/Coverage.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Project } from '../types'; import SimpleBubbleChart from './SimpleBubbleChart'; diff --git a/server/sonar-web/src/main/js/apps/projects/visualizations/Duplications.tsx b/server/sonar-web/src/main/js/apps/projects/visualizations/Duplications.tsx index 4ed730dc17e..a353b4810c4 100644 --- a/server/sonar-web/src/main/js/apps/projects/visualizations/Duplications.tsx +++ b/server/sonar-web/src/main/js/apps/projects/visualizations/Duplications.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Project } from '../types'; import SimpleBubbleChart from './SimpleBubbleChart'; diff --git a/server/sonar-web/src/main/js/apps/projects/visualizations/Maintainability.tsx b/server/sonar-web/src/main/js/apps/projects/visualizations/Maintainability.tsx index c8cf6dc08dc..d963b5359ba 100644 --- a/server/sonar-web/src/main/js/apps/projects/visualizations/Maintainability.tsx +++ b/server/sonar-web/src/main/js/apps/projects/visualizations/Maintainability.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Project } from '../types'; import SimpleBubbleChart from './SimpleBubbleChart'; diff --git a/server/sonar-web/src/main/js/apps/projects/visualizations/Reliability.tsx b/server/sonar-web/src/main/js/apps/projects/visualizations/Reliability.tsx index ad86f70116d..e62c648276a 100644 --- a/server/sonar-web/src/main/js/apps/projects/visualizations/Reliability.tsx +++ b/server/sonar-web/src/main/js/apps/projects/visualizations/Reliability.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Project } from '../types'; import SimpleBubbleChart from './SimpleBubbleChart'; diff --git a/server/sonar-web/src/main/js/apps/projects/visualizations/Risk.tsx b/server/sonar-web/src/main/js/apps/projects/visualizations/Risk.tsx index b9c21d671fa..013026433b3 100644 --- a/server/sonar-web/src/main/js/apps/projects/visualizations/Risk.tsx +++ b/server/sonar-web/src/main/js/apps/projects/visualizations/Risk.tsx @@ -18,15 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BubbleChart from 'sonar-ui-common/components/charts/BubbleChart'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { isDefined } from 'sonar-ui-common/helpers/types'; import ColorRatingsLegend from '../../../components/charts/ColorRatingsLegend'; import { RATING_COLORS } from '../../../helpers/constants'; import { getProjectUrl } from '../../../helpers/urls'; +import BubbleChart from '../../../sonar-ui-common/components/charts/BubbleChart'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; +import { isDefined } from '../../../sonar-ui-common/helpers/types'; import { ComponentQualifier } from '../../../types/component'; import { Project } from '../types'; diff --git a/server/sonar-web/src/main/js/apps/projects/visualizations/Security.tsx b/server/sonar-web/src/main/js/apps/projects/visualizations/Security.tsx index 0181ac2eb46..d2df2ff39b9 100644 --- a/server/sonar-web/src/main/js/apps/projects/visualizations/Security.tsx +++ b/server/sonar-web/src/main/js/apps/projects/visualizations/Security.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Project } from '../types'; import SimpleBubbleChart from './SimpleBubbleChart'; diff --git a/server/sonar-web/src/main/js/apps/projects/visualizations/SimpleBubbleChart.tsx b/server/sonar-web/src/main/js/apps/projects/visualizations/SimpleBubbleChart.tsx index be22f59d320..9d387853d9c 100644 --- a/server/sonar-web/src/main/js/apps/projects/visualizations/SimpleBubbleChart.tsx +++ b/server/sonar-web/src/main/js/apps/projects/visualizations/SimpleBubbleChart.tsx @@ -18,15 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BubbleChart from 'sonar-ui-common/components/charts/BubbleChart'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { isDefined } from 'sonar-ui-common/helpers/types'; import ColorRatingsLegend from '../../../components/charts/ColorRatingsLegend'; import { RATING_COLORS } from '../../../helpers/constants'; import { getProjectUrl } from '../../../helpers/urls'; +import BubbleChart from '../../../sonar-ui-common/components/charts/BubbleChart'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; +import { isDefined } from '../../../sonar-ui-common/helpers/types'; import { ComponentQualifier } from '../../../types/component'; import { Project } from '../types'; diff --git a/server/sonar-web/src/main/js/apps/projects/visualizations/Visualizations.tsx b/server/sonar-web/src/main/js/apps/projects/visualizations/Visualizations.tsx index b4b259882cb..3dc25731990 100644 --- a/server/sonar-web/src/main/js/apps/projects/visualizations/Visualizations.tsx +++ b/server/sonar-web/src/main/js/apps/projects/visualizations/Visualizations.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Project } from '../types'; import { localizeSorting } from '../utils'; import Coverage from './Coverage'; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx index c10ecb3d411..c624bd1db93 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/App.tsx @@ -21,14 +21,14 @@ import { debounce, uniq, without } from 'lodash'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { connect } from 'react-redux'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import { toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getComponents, Project } from '../../api/components'; import { changeProjectDefaultVisibility } from '../../api/permissions'; import { getValues } from '../../api/settings'; import Suggestions from '../../app/components/embed-docs-modal/Suggestions'; import { hasGlobalPermission } from '../../helpers/users'; +import ListFooter from '../../sonar-ui-common/components/controls/ListFooter'; +import { toShortNotSoISOString } from '../../sonar-ui-common/helpers/dates'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { getAppState, getCurrentUser, Store } from '../../store/rootReducer'; import { Permissions } from '../../types/permissions'; import { SettingsKey } from '../../types/settings'; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/BulkApplyTemplateModal.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/BulkApplyTemplateModal.tsx index 3db935d400c..027ee59e33a 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/BulkApplyTemplateModal.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/BulkApplyTemplateModal.tsx @@ -18,15 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { toNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { bulkApplyTemplate, getPermissionTemplates } from '../../api/permissions'; +import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../sonar-ui-common/components/controls/Modal'; +import Select from '../../sonar-ui-common/components/controls/Select'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import MandatoryFieldMarker from '../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { toNotSoISOString } from '../../sonar-ui-common/helpers/dates'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; export interface Props { analyzedBefore: Date | undefined; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/ChangeDefaultVisibilityForm.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/ChangeDefaultVisibilityForm.tsx index d90c9b5dedd..4c38ce4f1d0 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/ChangeDefaultVisibilityForm.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/ChangeDefaultVisibilityForm.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button, ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button, ResetButtonLink } from '../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../sonar-ui-common/components/controls/Modal'; +import Radio from '../../sonar-ui-common/components/controls/Radio'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; export interface Props { defaultVisibility: T.Visibility; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx index 8b8437c8dce..15c93000141 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/CreateProjectForm.tsx @@ -20,15 +20,15 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { createProject } from '../../api/components'; import VisibilitySelector from '../../components/common/VisibilitySelector'; import { getProjectUrl } from '../../helpers/urls'; +import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../sonar-ui-common/components/controls/Modal'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import MandatoryFieldMarker from '../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { defaultProjectVisibility?: T.Visibility; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/DeleteModal.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/DeleteModal.tsx index 240f34e94c7..66e3d015a7d 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/DeleteModal.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/DeleteModal.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { toNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { bulkDeleteProjects } from '../../api/components'; +import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../sonar-ui-common/components/controls/Modal'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import { toNotSoISOString } from '../../sonar-ui-common/helpers/dates'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; export interface Props { analyzedBefore: Date | undefined; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/Header.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/Header.tsx index 9b02df2bc17..ba9e78aee19 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/Header.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/Header.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button, EditButton } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button, EditButton } from '../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import ChangeDefaultVisibilityForm from './ChangeDefaultVisibilityForm'; export interface Props { diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx index 7f646ef294f..767495017dc 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRow.tsx @@ -19,13 +19,13 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; import { Project } from '../../api/components'; import PrivacyBadgeContainer from '../../components/common/PrivacyBadgeContainer'; import { getComponentOverviewUrl } from '../../helpers/urls'; +import Checkbox from '../../sonar-ui-common/components/controls/Checkbox'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon'; +import DateFormatter from '../../sonar-ui-common/components/intl/DateFormatter'; import './ProjectRow.css'; import ProjectRowActions from './ProjectRowActions'; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRowActions.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRowActions.tsx index d47596c0335..69f808ff22e 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRowActions.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/ProjectRowActions.tsx @@ -18,14 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ActionsDropdown, { - ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Project } from '../../api/components'; import { getComponentNavigation } from '../../api/nav'; import { getComponentPermissionsUrl } from '../../helpers/urls'; +import ActionsDropdown, { + ActionsDropdownItem +} from '../../sonar-ui-common/components/controls/ActionsDropdown'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import ApplyTemplate from '../permissions/project/components/ApplyTemplate'; import RestoreAccessModal from './RestoreAccessModal'; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/Projects.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/Projects.tsx index 72806d3a304..3a40b6806b4 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/Projects.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/Projects.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Project } from '../../api/components'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import ProjectRow from './ProjectRow'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/RestoreAccessModal.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/RestoreAccessModal.tsx index 548786972f6..562a38942ad 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/RestoreAccessModal.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/RestoreAccessModal.tsx @@ -19,11 +19,11 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Project } from '../../api/components'; import { grantPermissionToUser } from '../../api/permissions'; +import { ResetButtonLink, SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../sonar-ui-common/components/controls/Modal'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { currentUser: Pick<T.LoggedInUser, 'login'>; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/Search.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/Search.tsx index 965669387f1..b0625038a14 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/Search.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/Search.tsx @@ -19,15 +19,15 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import Select from 'sonar-ui-common/components/controls/Select'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Project } from '../../api/components'; import DateInput from '../../components/controls/DateInput'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import Checkbox from '../../sonar-ui-common/components/controls/Checkbox'; +import HelpTooltip from '../../sonar-ui-common/components/controls/HelpTooltip'; +import SearchBox from '../../sonar-ui-common/components/controls/SearchBox'; +import Select from '../../sonar-ui-common/components/controls/Select'; +import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import BulkApplyTemplateModal from './BulkApplyTemplateModal'; import DeleteModal from './DeleteModal'; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/App-test.tsx index 1b92fa7a999..5d66104f58c 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/App-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getComponents } from '../../../api/components'; import { changeProjectDefaultVisibility } from '../../../api/permissions'; import { getValues } from '../../../api/settings'; import { mockAppState, mockLoggedInUser } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { App, Props } from '../App'; import Search from '../Search'; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/BulkApplyTemplateModal-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/BulkApplyTemplateModal-test.tsx index a53a2569155..647aab9334c 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/BulkApplyTemplateModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/BulkApplyTemplateModal-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; +import { click, waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import BulkApplyTemplateModal, { Props } from '../BulkApplyTemplateModal'; jest.mock('../../../api/permissions', () => ({ diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ChangeDefaultVisibilityForm-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ChangeDefaultVisibilityForm-test.tsx index 33573353b5a..0b9a405c4ce 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ChangeDefaultVisibilityForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ChangeDefaultVisibilityForm-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import ChangeDefaultVisibilityForm from '../ChangeDefaultVisibilityForm'; it('closes', () => { diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/CreateProjectForm-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/CreateProjectForm-test.tsx index 37b243bb415..ab62bb13fb4 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/CreateProjectForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/CreateProjectForm-test.tsx @@ -26,7 +26,7 @@ jest.mock('../../../api/components', () => ({ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { change, submit, waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import CreateProjectForm from '../CreateProjectForm'; const createProject = require('../../../api/components').createProject as jest.Mock<any>; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/DeleteModal-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/DeleteModal-test.tsx index 0007e58c8b6..0f7d0062043 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/DeleteModal-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/DeleteModal-test.tsx @@ -24,8 +24,8 @@ jest.mock('../../../api/components', () => ({ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import DeleteModal, { Props } from '../DeleteModal'; const bulkDeleteProjects = require('../../../api/components').bulkDeleteProjects as jest.Mock<any>; diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Header-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Header-test.tsx index 56bde21cb52..e50560a61cf 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Header-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Header-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import Header, { Props } from '../Header'; jest.mock('../../../helpers/system', () => ({ isSonarCloud: jest.fn().mockReturnValue(false) })); diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ProjectRowActions-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ProjectRowActions-test.tsx index dd6c69709c2..09163cf0930 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ProjectRowActions-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/ProjectRowActions-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getComponentNavigation } from '../../../api/nav'; import { mockLoggedInUser } from '../../../helpers/testMocks'; +import { click, waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import ProjectRowActions, { Props } from '../ProjectRowActions'; jest.mock('../../../api/nav', () => ({ diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Search-test.tsx b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Search-test.tsx index 74aeebaf5f8..c215f55bb1c 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Search-test.tsx +++ b/server/sonar-web/src/main/js/apps/projectsManagement/__tests__/Search-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import Search, { Props } from '../Search'; it('renders', () => { diff --git a/server/sonar-web/src/main/js/apps/projectsManagement/routes.ts b/server/sonar-web/src/main/js/apps/projectsManagement/routes.ts index 62f34457260..a823184781c 100644 --- a/server/sonar-web/src/main/js/apps/projectsManagement/routes.ts +++ b/server/sonar-web/src/main/js/apps/projectsManagement/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/App.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/App.tsx index fa26aa3da94..0e36cbc3817 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/App.tsx @@ -20,19 +20,19 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { WithRouterProps } from 'react-router'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { - addSideBarClass, - addWhitePageClass, - removeSideBarClass, - removeWhitePageClass -} from 'sonar-ui-common/helpers/pages'; import { fetchQualityGates } from '../../../api/quality-gates'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper'; import '../../../components/search-navigator.css'; import { getQualityGateUrl } from '../../../helpers/urls'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { + addSideBarClass, + addWhitePageClass, + removeSideBarClass, + removeWhitePageClass +} from '../../../sonar-ui-common/helpers/pages'; import '../styles.css'; import Details from './Details'; import List from './List'; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/BuiltInQualityGateBadge.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/BuiltInQualityGateBadge.tsx index 914dac2ed5a..9e444f895e7 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/BuiltInQualityGateBadge.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/BuiltInQualityGateBadge.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx index 663894eea32..f4f4ccb2bdd 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Condition.tsx @@ -19,15 +19,15 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { DeleteButton, EditButton } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; +import { deleteCondition } from '../../../api/quality-gates'; +import { DeleteButton, EditButton } from '../../../sonar-ui-common/components/controls/buttons'; +import ConfirmModal from '../../../sonar-ui-common/components/controls/ConfirmModal'; import { getLocalizedMetricName, translate, translateWithParameters -} from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { deleteCondition } from '../../../api/quality-gates'; +} from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { getLocalizedMetricNameNoDiffMetric } from '../utils'; import ConditionModal from './ConditionModal'; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/ConditionModal.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/ConditionModal.tsx index 76eedd4d125..394c1361d33 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/ConditionModal.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/ConditionModal.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { getLocalizedMetricName, translate } from 'sonar-ui-common/helpers/l10n'; -import { isDiffMetric } from 'sonar-ui-common/helpers/measures'; import { createCondition, updateCondition } from '../../../api/quality-gates'; +import ConfirmModal from '../../../sonar-ui-common/components/controls/ConfirmModal'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { getLocalizedMetricName, translate } from '../../../sonar-ui-common/helpers/l10n'; +import { isDiffMetric } from '../../../sonar-ui-common/helpers/measures'; import { getPossibleOperators } from '../utils'; import ConditionOperator from './ConditionOperator'; import MetricSelect from './MetricSelect'; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/ConditionOperator.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/ConditionOperator.tsx index 4ae3ad3b04d..a0738cb978f 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/ConditionOperator.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/ConditionOperator.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getPossibleOperators } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.tsx index 296c4d11c54..b57955f08a3 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Conditions.tsx @@ -19,13 +19,13 @@ */ import { differenceWith, map, sortBy, uniqBy } from 'lodash'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ModalButton from 'sonar-ui-common/components/controls/ModalButton'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { getLocalizedMetricName, translate } from 'sonar-ui-common/helpers/l10n'; -import { isDiffMetric } from 'sonar-ui-common/helpers/measures'; import DocumentationTooltip from '../../../components/common/DocumentationTooltip'; import { withAppState } from '../../../components/hoc/withAppState'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ModalButton from '../../../sonar-ui-common/components/controls/ModalButton'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { getLocalizedMetricName, translate } from '../../../sonar-ui-common/helpers/l10n'; +import { isDiffMetric } from '../../../sonar-ui-common/helpers/measures'; import { MetricKey } from '../../../types/metrics'; import Condition from './Condition'; import ConditionModal from './ConditionModal'; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/CopyQualityGateForm.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/CopyQualityGateForm.tsx index d40627a6aa8..428d744ebe8 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/CopyQualityGateForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/CopyQualityGateForm.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { copyQualityGate } from '../../../api/quality-gates'; import { Router, withRouter } from '../../../components/hoc/withRouter'; import { getQualityGateUrl } from '../../../helpers/urls'; +import ConfirmModal from '../../../sonar-ui-common/components/controls/ConfirmModal'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onClose: () => void; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/CreateQualityGateForm.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/CreateQualityGateForm.tsx index d61759f9797..7895710de5f 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/CreateQualityGateForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/CreateQualityGateForm.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { createQualityGate } from '../../../api/quality-gates'; import { Router, withRouter } from '../../../components/hoc/withRouter'; import { getQualityGateUrl } from '../../../helpers/urls'; +import ConfirmModal from '../../../sonar-ui-common/components/controls/ConfirmModal'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onClose: () => void; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/DeleteQualityGateForm.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/DeleteQualityGateForm.tsx index 0fd853ca0fe..42aaa9a917a 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/DeleteQualityGateForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/DeleteQualityGateForm.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { deleteQualityGate } from '../../../api/quality-gates'; import { Router, withRouter } from '../../../components/hoc/withRouter'; import { getQualityGatesUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../../sonar-ui-common/components/controls/ConfirmButton'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onDelete: () => Promise<void>; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Details.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/Details.tsx index fb21522e641..7c2a628693c 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/Details.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Details.tsx @@ -20,10 +20,10 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { connect } from 'react-redux'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { fetchQualityGate } from '../../../api/quality-gates'; import addGlobalSuccessMessage from '../../../app/utils/addGlobalSuccessMessage'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { fetchMetrics } from '../../../store/rootActions'; import { getMetrics, Store } from '../../../store/rootReducer'; import { addCondition, checkIfDefault, deleteCondition, replaceCondition } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsContent.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsContent.tsx index 9f0476dfc33..4c92f487df6 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsContent.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsContent.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Conditions from './Conditions'; import Projects from './Projects'; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsHeader.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsHeader.tsx index 924fc33e618..5a73c571973 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsHeader.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/DetailsHeader.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ModalButton from 'sonar-ui-common/components/controls/ModalButton'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { setQualityGateAsDefault } from '../../../api/quality-gates'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ModalButton from '../../../sonar-ui-common/components/controls/ModalButton'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import BuiltInQualityGateBadge from './BuiltInQualityGateBadge'; import CopyQualityGateForm from './CopyQualityGateForm'; import DeleteQualityGateForm from './DeleteQualityGateForm'; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/List.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/List.tsx index 630558194c9..f3352364859 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/List.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/List.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getQualityGateUrl } from '../../../helpers/urls'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import BuiltInQualityGateBadge from './BuiltInQualityGateBadge'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/ListHeader.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/ListHeader.tsx index b37054d0c95..d8ab82b47a5 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/ListHeader.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/ListHeader.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ModalButton from 'sonar-ui-common/components/controls/ModalButton'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import DocumentationTooltip from '../../../components/common/DocumentationTooltip'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ModalButton from '../../../sonar-ui-common/components/controls/ModalButton'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import CreateQualityGateForm from './CreateQualityGateForm'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/MetricSelect.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/MetricSelect.tsx index bba09418575..eaedaf45569 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/MetricSelect.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/MetricSelect.tsx @@ -19,8 +19,8 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { getLocalizedMetricDomain, translate } from 'sonar-ui-common/helpers/l10n'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { getLocalizedMetricDomain, translate } from '../../../sonar-ui-common/helpers/l10n'; import { getLocalizedMetricNameNoDiffMetric } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/Projects.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/Projects.tsx index 13bcfc42e5e..0d99068bd47 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/Projects.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/Projects.tsx @@ -19,16 +19,16 @@ */ import { find, without } from 'lodash'; import * as React from 'react'; -import SelectList, { - SelectListFilter, - SelectListSearchParams -} from 'sonar-ui-common/components/controls/SelectList'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { associateGateWithProject, dissociateGateWithProject, searchProjects } from '../../../api/quality-gates'; +import SelectList, { + SelectListFilter, + SelectListSearchParams +} from '../../../sonar-ui-common/components/controls/SelectList'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { canEdit?: boolean; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/RenameQualityGateForm.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/RenameQualityGateForm.tsx index b719aade82e..23f830ac0a7 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/RenameQualityGateForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/RenameQualityGateForm.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { renameQualityGate } from '../../../api/quality-gates'; +import ConfirmModal from '../../../sonar-ui-common/components/controls/ConfirmModal'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onClose: () => void; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/ThresholdInput.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/ThresholdInput.tsx index 672f985ad15..9061af66f26 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/ThresholdInput.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/ThresholdInput.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; +import Select from '../../../sonar-ui-common/components/controls/Select'; interface Props { name: string; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/App.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/App.tsx index 8758e3d39c4..fe81f19f993 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/App.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/App.tsx @@ -20,19 +20,19 @@ import { shallow } from 'enzyme'; import * as React from 'react'; +import ScreenPositionHelper from '../../../../components/common/ScreenPositionHelper'; +import { mockQualityGate } from '../../../../helpers/mocks/quality-gates'; +import { mockRouter } from '../../../../helpers/testMocks'; import { addSideBarClass, addWhitePageClass, removeSideBarClass, removeWhitePageClass -} from 'sonar-ui-common/helpers/pages'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; -import ScreenPositionHelper from '../../../../components/common/ScreenPositionHelper'; -import { mockQualityGate } from '../../../../helpers/mocks/quality-gates'; -import { mockRouter } from '../../../../helpers/testMocks'; +} from '../../../../sonar-ui-common/helpers/pages'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import App from '../App'; -jest.mock('sonar-ui-common/helpers/pages', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/pages', () => ({ addSideBarClass: jest.fn(), addWhitePageClass: jest.fn(), removeSideBarClass: jest.fn(), diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/CreateQualityGateForm-test.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/CreateQualityGateForm-test.tsx index 134fce588ec..8f60de3a03b 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/CreateQualityGateForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/CreateQualityGateForm-test.tsx @@ -20,11 +20,11 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import { change, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { createQualityGate } from '../../../../api/quality-gates'; import { mockRouter } from '../../../../helpers/testMocks'; import { getQualityGateUrl } from '../../../../helpers/urls'; +import ConfirmModal from '../../../../sonar-ui-common/components/controls/ConfirmModal'; +import { change, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { CreateQualityGateForm } from '../CreateQualityGateForm'; jest.mock('../../../../api/quality-gates', () => ({ diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/Details-test.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/Details-test.tsx index e62c16b46a6..ed7be58bbb5 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/Details-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/Details-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { fetchQualityGate } from '../../../../api/quality-gates'; import { mockQualityGate } from '../../../../helpers/mocks/quality-gates'; import { mockCondition } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { addCondition, deleteCondition, replaceCondition } from '../../utils'; import { Details } from '../Details'; diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/DetailsHeader-test.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/DetailsHeader-test.tsx index 0fd8c9bf2f8..7612885c892 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/DetailsHeader-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/DetailsHeader-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { setQualityGateAsDefault } from '../../../../api/quality-gates'; import { mockQualityGate } from '../../../../helpers/mocks/quality-gates'; import { mockCondition } from '../../../../helpers/testMocks'; +import { click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import DetailsHeader from '../DetailsHeader'; jest.mock('../../../../api/quality-gates', () => ({ diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/Projects-test.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/Projects-test.tsx index 3629a40d84b..bbe7406cc8d 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/Projects-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/Projects-test.tsx @@ -19,8 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import SelectList, { SelectListFilter } from 'sonar-ui-common/components/controls/SelectList'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { associateGateWithProject, dissociateGateWithProject, @@ -28,6 +26,10 @@ import { } from '../../../../api/quality-gates'; import { mockQualityGate } from '../../../../helpers/mocks/quality-gates'; import { mockCondition } from '../../../../helpers/testMocks'; +import SelectList, { + SelectListFilter +} from '../../../../sonar-ui-common/components/controls/SelectList'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import Projects from '../Projects'; jest.mock('../../../../api/quality-gates', () => ({ diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/ThresholdInput-test.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/ThresholdInput-test.tsx index 82c817722c1..a02d0cf5135 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/ThresholdInput-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-gates/components/__tests__/ThresholdInput-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change } from 'sonar-ui-common/helpers/testUtils'; +import { change } from '../../../../sonar-ui-common/helpers/testUtils'; import ThresholdInput from '../ThresholdInput'; describe('on strings', () => { diff --git a/server/sonar-web/src/main/js/apps/quality-gates/routes.ts b/server/sonar-web/src/main/js/apps/quality-gates/routes.ts index 92f1c12ad80..352daf06175 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/routes.ts +++ b/server/sonar-web/src/main/js/apps/quality-gates/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const App = lazyLoadComponent(() => import('./components/App')); diff --git a/server/sonar-web/src/main/js/apps/quality-gates/utils.ts b/server/sonar-web/src/main/js/apps/quality-gates/utils.ts index 0517b6e93c7..813e1382b91 100644 --- a/server/sonar-web/src/main/js/apps/quality-gates/utils.ts +++ b/server/sonar-web/src/main/js/apps/quality-gates/utils.ts @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getLocalizedMetricName } from 'sonar-ui-common/helpers/l10n'; import getStore from '../../app/utils/getStore'; import { isDiffMetric } from '../../helpers/measures'; +import { getLocalizedMetricName } from '../../sonar-ui-common/helpers/l10n'; import { getMetricByKey } from '../../store/rootReducer'; export function checkIfDefault(qualityGate: T.QualityGate, list: T.QualityGate[]): boolean { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/Changelog.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/Changelog.tsx index 1401c82df83..113a61d92b0 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/Changelog.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/Changelog.tsx @@ -21,10 +21,10 @@ import * as isSameMinute from 'date-fns/is_same_minute'; import { sortBy } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getRulesUrl } from '../../../helpers/urls'; +import DateTimeFormatter from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ProfileChangelogEvent } from '../types'; import ChangesList from './ChangesList'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogContainer.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogContainer.tsx index 5617bf64451..588014b1900 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogContainer.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogContainer.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import { WithRouterProps } from 'react-router'; -import { parseDate, toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getProfileChangelog } from '../../../api/quality-profiles'; import { withRouter } from '../../../components/hoc/withRouter'; +import { parseDate, toShortNotSoISOString } from '../../../sonar-ui-common/helpers/dates'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Profile, ProfileChangelogEvent } from '../types'; import { getProfileChangelogPath } from '../utils'; import Changelog from './Changelog'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogEmpty.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogEmpty.tsx index a9328902eaf..4fe78fa6197 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogEmpty.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogEmpty.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function ChangelogEmpty() { return <div className="big-spacer-top">{translate('no_results')}</div>; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogSearch.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogSearch.tsx index 54b6539818e..c478fbf2949 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogSearch.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ChangelogSearch.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import DateRangeInput from '../../../components/controls/DateRangeInput'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { dateRange: { from?: Date; to?: Date } | undefined; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ParameterChange.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ParameterChange.tsx index 68602b8bcb7..3b66dcbb47d 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ParameterChange.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/ParameterChange.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { name: string; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/SeverityChange.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/SeverityChange.tsx index f8d5083db26..2587989d965 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/SeverityChange.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/SeverityChange.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import SeverityHelper from '../../../components/shared/SeverityHelper'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { severity: string; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/__tests__/ChangelogContainer-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/__tests__/ChangelogContainer-test.tsx index 3a5f0c36159..76b7a1f8b11 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/__tests__/ChangelogContainer-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/__tests__/ChangelogContainer-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { mockEvent, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getProfileChangelog } from '../../../../api/quality-profiles'; import { mockLocation, mockQualityProfile, mockRouter } from '../../../../helpers/testMocks'; +import { mockEvent, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { ChangelogContainer } from '../ChangelogContainer'; beforeEach(() => jest.clearAllMocks()); diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/__tests__/ChangelogSearch-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/__tests__/ChangelogSearch-test.tsx index 4c2bef55312..5a935c82d3b 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/changelog/__tests__/ChangelogSearch-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/changelog/__tests__/ChangelogSearch-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { parseDate } from '../../../../sonar-ui-common/helpers/dates'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import ChangelogSearch from '../ChangelogSearch'; it('should render', () => { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonEmpty.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonEmpty.tsx index d4d5faae2ec..76dc039719d 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonEmpty.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonEmpty.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function ComparisonEmpty() { return <div className="big-spacer-top">{translate('quality_profile.empty_comparison')}</div>; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonForm.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonForm.tsx index 6d4948c45a8..143be6943ea 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonForm.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Profile } from '../types'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonResultActivation.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonResultActivation.tsx index c25f25b7b66..643e3cc4ac7 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonResultActivation.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonResultActivation.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Profile } from '../../../api/quality-profiles'; import { getRuleDetails } from '../../../api/rules'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { lazyLoadComponent } from '../../../sonar-ui-common/components/lazyLoadComponent'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; const ActivationFormModal = lazyLoadComponent( () => import('../../coding-rules/components/ActivationFormModal'), diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonResults.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonResults.tsx index f19862fa55f..606d04efc69 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonResults.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/compare/ComparisonResults.tsx @@ -19,12 +19,12 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import ChevronLeftIcon from 'sonar-ui-common/components/icons/ChevronLeftIcon'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import SeverityIcon from 'sonar-ui-common/components/icons/SeverityIcon'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { CompareResponse, Profile } from '../../../api/quality-profiles'; import { getRulesUrl } from '../../../helpers/urls'; +import ChevronLeftIcon from '../../../sonar-ui-common/components/icons/ChevronLeftIcon'; +import ChevronRightIcon from '../../../sonar-ui-common/components/icons/ChevronRightIcon'; +import SeverityIcon from '../../../sonar-ui-common/components/icons/SeverityIcon'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import ComparisonEmpty from './ComparisonEmpty'; import ComparisonResultActivation from './ComparisonResultActivation'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/compare/__tests__/ComparisonResultActivation-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/compare/__tests__/ComparisonResultActivation-test.tsx index 7d1bf8732ea..ef092ef8ab7 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/compare/__tests__/ComparisonResultActivation-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/compare/__tests__/ComparisonResultActivation-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { Profile } from '../../../../api/quality-profiles'; +import { click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ComparisonResultActivation from '../ComparisonResultActivation'; jest.mock('../../../../api/rules', () => ({ diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/components/App.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/components/App.tsx index 195bca0ef00..857f2f6be72 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/components/App.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Actions, getExporters, searchQualityProfiles } from '../../../api/quality-profiles'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import '../styles.css'; import { Exporter, Profile } from '../types'; import { sortProfiles } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/components/BuiltInQualityProfileBadge.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/components/BuiltInQualityProfileBadge.tsx index 9aac4253d2c..01d15945b28 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/components/BuiltInQualityProfileBadge.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/components/BuiltInQualityProfileBadge.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/components/DeleteProfileForm.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/components/DeleteProfileForm.tsx index 0e5b61310d9..d8b699e8f60 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/components/DeleteProfileForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/components/DeleteProfileForm.tsx @@ -18,10 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Profile } from '../types'; export interface DeleteProfileFormProps { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileActions.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileActions.tsx index 8b80c62cb64..055b2f7d123 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileActions.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileActions.tsx @@ -18,12 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ActionsDropdown, { - ActionsDropdownDivider, - ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { changeProfileParent, copyProfile, @@ -36,6 +30,12 @@ import { import { Router, withRouter } from '../../../components/hoc/withRouter'; import { getBaseUrl } from '../../../helpers/system'; import { getRulesUrl } from '../../../helpers/urls'; +import ActionsDropdown, { + ActionsDropdownDivider, + ActionsDropdownItem +} from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Profile, ProfileActionModals } from '../types'; import { getProfileComparePath, getProfilePath, PROFILE_PATH } from '../utils'; import DeleteProfileForm from './DeleteProfileForm'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileModalForm.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileModalForm.tsx index d532c30599d..6929c5a590f 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileModalForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileModalForm.tsx @@ -18,11 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Profile } from '../types'; export interface ProfileModalFormProps { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileNotFound.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileNotFound.tsx index 38d3b0e731c..524d8a99b30 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileNotFound.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileNotFound.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { IndexLink } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { PROFILE_PATH } from '../utils'; export default function ProfileNotFound() { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/components/__tests__/ProfileActions-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/components/__tests__/ProfileActions-test.tsx index d5320fa5067..67414faf3b1 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/components/__tests__/ProfileActions-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/components/__tests__/ProfileActions-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { changeProfileParent, copyProfile, @@ -29,6 +28,7 @@ import { setDefaultProfile } from '../../../../api/quality-profiles'; import { mockQualityProfile, mockRouter } from '../../../../helpers/testMocks'; +import { click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { ProfileActionModals } from '../../types'; import { PROFILE_PATH } from '../../utils'; import DeleteProfileForm from '../DeleteProfileForm'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/components/__tests__/ProfileModalForm-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/components/__tests__/ProfileModalForm-test.tsx index 6029ef64ac1..b2bf600e13c 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/components/__tests__/ProfileModalForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/components/__tests__/ProfileModalForm-test.tsx @@ -20,8 +20,8 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change } from 'sonar-ui-common/helpers/testUtils'; import { mockEvent, mockQualityProfile } from '../../../../helpers/testMocks'; +import { change } from '../../../../sonar-ui-common/helpers/testUtils'; import ProfileModalForm, { ProfileModalFormProps } from '../ProfileModalForm'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ChangeParentForm.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ChangeParentForm.tsx index 849bdeb5f05..e7567b1cab9 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ChangeParentForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ChangeParentForm.tsx @@ -19,13 +19,16 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import Select from 'sonar-ui-common/components/controls/Select'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { changeProfileParent } from '../../../api/quality-profiles'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Profile } from '../types'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ChangeProjectsForm.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ChangeProjectsForm.tsx index b0ace048b2f..23c048c91e8 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ChangeProjectsForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ChangeProjectsForm.tsx @@ -19,18 +19,18 @@ */ import { find, without } from 'lodash'; import * as React from 'react'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import SelectList, { - SelectListFilter, - SelectListSearchParams -} from 'sonar-ui-common/components/controls/SelectList'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { associateProject, dissociateProject, getProfileProjects, ProfileProject } from '../../../api/quality-profiles'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import SelectList, { + SelectListFilter, + SelectListSearchParams +} from '../../../sonar-ui-common/components/controls/SelectList'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Profile } from '../types'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileDetails.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileDetails.tsx index 0e18bd84523..5634d4cd0d7 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileDetails.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileDetails.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Exporter, Profile } from '../types'; import ProfileExporters from './ProfileExporters'; import ProfileInheritance from './ProfileInheritance'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileExporters.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileExporters.tsx index ee3a355ceb8..64ad085420a 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileExporters.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileExporters.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getQualityProfileExporterUrl } from '../../../api/quality-profiles'; import { getBaseUrl } from '../../../helpers/system'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Exporter, Profile } from '../types'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.tsx index 4fd0762265e..1c040ae76d4 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { IndexLink, Link } from 'react-router'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import BuiltInQualityProfileBadge from '../components/BuiltInQualityProfileBadge'; import ProfileActions from '../components/ProfileActions'; import ProfileLink from '../components/ProfileLink'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileInheritance.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileInheritance.tsx index 1f32fb599b9..f8300362c6e 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileInheritance.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileInheritance.tsx @@ -19,9 +19,9 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getProfileInheritance } from '../../../api/quality-profiles'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Profile } from '../types'; import ChangeParentForm from './ChangeParentForm'; import ProfileInheritanceBox from './ProfileInheritanceBox'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileInheritanceBox.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileInheritanceBox.tsx index 096152f3372..db2a854428b 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileInheritanceBox.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileInheritanceBox.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import BuiltInQualityProfileBadge from '../components/BuiltInQualityProfileBadge'; import ProfileLink from '../components/ProfileLink'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissions.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissions.tsx index 20984262b7a..2b4fc8fdb27 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissions.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissions.tsx @@ -19,13 +19,13 @@ */ import { sortBy, uniqBy } from 'lodash'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { searchGroups, searchUsers, SearchUsersGroupsParameters } from '../../../api/quality-profiles'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Profile } from '../types'; import ProfilePermissionsForm from './ProfilePermissionsForm'; import ProfilePermissionsGroup from './ProfilePermissionsGroup'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsForm.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsForm.tsx index 1358417c6f7..8e027b9d42a 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsForm.tsx @@ -18,9 +18,6 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { addGroup, addUser, @@ -28,6 +25,12 @@ import { searchUsers, SearchUsersGroupsParameters } from '../../../api/quality-profiles'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Group } from './ProfilePermissions'; import ProfilePermissionsFormSelect from './ProfilePermissionsFormSelect'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsFormSelect.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsFormSelect.tsx index d73001e2f67..ae90e02f2c1 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsFormSelect.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsFormSelect.tsx @@ -19,10 +19,10 @@ */ import { debounce, identity } from 'lodash'; import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import GroupIcon from 'sonar-ui-common/components/icons/GroupIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import Avatar from '../../../components/ui/Avatar'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import GroupIcon from '../../../sonar-ui-common/components/icons/GroupIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Group } from './ProfilePermissions'; type Option = T.UserSelected | Group; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsGroup.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsGroup.tsx index 7db040e2bc2..4d767a4f78c 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsGroup.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsGroup.tsx @@ -19,11 +19,17 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button, DeleteButton, ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal, { ChildrenProps } from 'sonar-ui-common/components/controls/SimpleModal'; -import GroupIcon from 'sonar-ui-common/components/icons/GroupIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { removeGroup } from '../../../api/quality-profiles'; +import { + Button, + DeleteButton, + ResetButtonLink +} from '../../../sonar-ui-common/components/controls/buttons'; +import SimpleModal, { + ChildrenProps +} from '../../../sonar-ui-common/components/controls/SimpleModal'; +import GroupIcon from '../../../sonar-ui-common/components/icons/GroupIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Group } from './ProfilePermissions'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsUser.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsUser.tsx index 6e012c6f42c..7df85415ab7 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsUser.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfilePermissionsUser.tsx @@ -19,15 +19,17 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; +import { removeUser } from '../../../api/quality-profiles'; +import Avatar from '../../../components/ui/Avatar'; import { DeleteButton, ResetButtonLink, SubmitButton -} from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal, { ChildrenProps } from 'sonar-ui-common/components/controls/SimpleModal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { removeUser } from '../../../api/quality-profiles'; -import Avatar from '../../../components/ui/Avatar'; +} from '../../../sonar-ui-common/components/controls/buttons'; +import SimpleModal, { + ChildrenProps +} from '../../../sonar-ui-common/components/controls/SimpleModal'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onDelete: (user: T.UserSelected) => void; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.tsx index 33758d5616c..da2f88e1bf5 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileProjects.tsx @@ -19,13 +19,13 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getProfileProjects } from '../../../api/quality-profiles'; import { getProjectUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Profile } from '../types'; import ChangeProjectsForm from './ChangeProjectsForm'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRules.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRules.tsx index 990e4ba9a81..4c34a906c39 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRules.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRules.tsx @@ -20,12 +20,12 @@ import { keyBy } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getQualityProfile } from '../../../api/quality-profiles'; import { searchRules, takeFacet } from '../../../api/rules'; import { getRulesUrl } from '../../../helpers/urls'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Profile } from '../types'; import ProfileRulesDeprecatedWarning from './ProfileRulesDeprecatedWarning'; import ProfileRulesRowOfType from './ProfileRulesRowOfType'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesDeprecatedWarning.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesDeprecatedWarning.tsx index 48c0212e628..ca7d7c2d674 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesDeprecatedWarning.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesDeprecatedWarning.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getDeprecatedActiveRulesUrl } from '../../../helpers/urls'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { activeDeprecatedRules: number; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowOfType.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowOfType.tsx index 92ade413171..6f4647eccf8 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowOfType.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowOfType.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getRulesUrl } from '../../../helpers/urls'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; interface Props { count: number | null; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowTotal.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowTotal.tsx index cd1ac7fb3cb..058342fb563 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowTotal.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesRowTotal.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getRulesUrl } from '../../../helpers/urls'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; interface Props { count: number | null; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesSonarWayComparison.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesSonarWayComparison.tsx index f367be2ac00..f64f265ec1b 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesSonarWayComparison.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileRulesSonarWayComparison.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getRulesUrl } from '../../../helpers/urls'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { language: string; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ChangeParentForm-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ChangeParentForm-test.tsx index 023a58e6c03..5f082599f45 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ChangeParentForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ChangeParentForm-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { mockEvent, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockQualityProfile } from '../../../../helpers/testMocks'; +import { mockEvent, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ChangeParentForm from '../ChangeParentForm'; beforeEach(() => jest.clearAllMocks()); diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ChangeProjectsForm-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ChangeProjectsForm-test.tsx index 4d37706bc5d..479ef91f3c7 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ChangeProjectsForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ChangeProjectsForm-test.tsx @@ -19,13 +19,15 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import SelectList, { SelectListFilter } from 'sonar-ui-common/components/controls/SelectList'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { associateProject, dissociateProject, getProfileProjects } from '../../../../api/quality-profiles'; +import SelectList, { + SelectListFilter +} from '../../../../sonar-ui-common/components/controls/SelectList'; +import { click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ChangeProjectsForm from '../ChangeProjectsForm'; const profile: any = { key: 'profFile_key' }; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileInheritance-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileInheritance-test.tsx index eee8a01cd53..003bd0a94cd 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileInheritance-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileInheritance-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockQualityProfile, mockQualityProfileInheritance } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ProfileInheritance from '../ProfileInheritance'; beforeEach(() => jest.clearAllMocks()); diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissions-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissions-test.tsx index 76a623be825..9ca5c5169a7 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissions-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissions-test.tsx @@ -19,8 +19,8 @@ */ import { mount, shallow } from 'enzyme'; import * as React from 'react'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { searchGroups, searchUsers } from '../../../../api/quality-profiles'; +import { click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ProfilePermissions from '../ProfilePermissions'; jest.mock('../../../../api/quality-profiles', () => ({ diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsForm-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsForm-test.tsx index 26b442fa738..e92e57f36b5 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsForm-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { addGroup, addUser, searchGroups, searchUsers } from '../../../../api/quality-profiles'; import { mockGroup, mockUser } from '../../../../helpers/testMocks'; +import { submit, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ProfilePermissionsForm from '../ProfilePermissionsForm'; import ProfilePermissionsFormSelect from '../ProfilePermissionsFormSelect'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsGroup-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsGroup-test.tsx index 94df0cc21f5..7e04f85cff9 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsGroup-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsGroup-test.tsx @@ -24,7 +24,7 @@ jest.mock('../../../../api/quality-profiles', () => ({ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import ProfilePermissionsGroup from '../ProfilePermissionsGroup'; const removeGroup = require('../../../../api/quality-profiles').removeGroup as jest.Mock<any>; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsUser-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsUser-test.tsx index fad6607b0cf..60356c89550 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsUser-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfilePermissionsUser-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { removeUser } from '../../../../api/quality-profiles'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import ProfilePermissionsUser from '../ProfilePermissionsUser'; jest.mock('../../../../api/quality-profiles', () => ({ diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileProjects-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileProjects-test.tsx index 8599b62a419..774f7137a84 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileProjects-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileProjects-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockQualityProfile } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ChangeProjectsForm from '../ChangeProjectsForm'; import ProfileProjects from '../ProfileProjects'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileRules-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileRules-test.tsx index eb854599c50..6893b3e2934 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileRules-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/__tests__/ProfileRules-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import * as apiQP from '../../../../api/quality-profiles'; import * as apiRules from '../../../../api/rules'; import { mockQualityProfile } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ProfileRules from '../ProfileRules'; const PROFILE = mockQualityProfile({ diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/CreateProfileForm.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/CreateProfileForm.tsx index fe139e165ea..f14dedc7194 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/CreateProfileForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/CreateProfileForm.tsx @@ -19,19 +19,22 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import Select from 'sonar-ui-common/components/controls/Select'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { parseAsOptionalString } from 'sonar-ui-common/helpers/query'; import { changeProfileParent, createQualityProfile, getImporters } from '../../../api/quality-profiles'; import { Location } from '../../../components/hoc/withRouter'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { parseAsOptionalString } from '../../../sonar-ui-common/helpers/query'; import { Profile } from '../types'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionDeprecated.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionDeprecated.tsx index bff8a116a2f..6e1aaed6a78 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionDeprecated.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionDeprecated.tsx @@ -20,8 +20,8 @@ import { sortBy } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getDeprecatedActiveRulesUrl } from '../../../helpers/urls'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import ProfileLink from '../components/ProfileLink'; import { Profile } from '../types'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionRules.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionRules.tsx index bfb33f9861f..acc5a25353e 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionRules.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionRules.tsx @@ -20,11 +20,11 @@ import { sortBy } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import { toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { searchRules } from '../../../api/rules'; import { getRulesUrl } from '../../../helpers/urls'; +import { toShortNotSoISOString } from '../../../sonar-ui-common/helpers/dates'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; const RULES_LIMIT = 10; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionStagnant.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionStagnant.tsx index 9365080d45b..c0134055e85 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionStagnant.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/EvolutionStagnant.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import DateFormatter from '../../../sonar-ui-common/components/intl/DateFormatter'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import ProfileLink from '../components/ProfileLink'; import { Profile } from '../types'; import { isStagnant } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/PageHeader.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/PageHeader.tsx index 4f4d24133a2..7cc7c92c70b 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/PageHeader.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/PageHeader.tsx @@ -19,11 +19,11 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Actions } from '../../../api/quality-profiles'; import { Location, Router, withRouter } from '../../../components/hoc/withRouter'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Profile } from '../types'; import { getProfilePath } from '../utils'; import CreateProfileForm from './CreateProfileForm'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.tsx index e43e74c5a1e..f97318cd496 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.tsx @@ -20,9 +20,9 @@ import { Location } from 'history'; import { groupBy, pick, sortBy } from 'lodash'; import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Profile } from '../types'; import ProfilesListHeader from './ProfilesListHeader'; import ProfilesListRow from './ProfilesListRow'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListHeader.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListHeader.tsx index 042a713b050..121985ee261 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListHeader.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListHeader.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Router, withRouter } from '../../../components/hoc/withRouter'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getProfilesForLanguagePath, PROFILE_PATH } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.tsx index 4564f622cb6..33540dc7155 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getRulesUrl } from '../../../helpers/urls'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import BuiltInQualityProfileBadge from '../components/BuiltInQualityProfileBadge'; import ProfileActions from '../components/ProfileActions'; import ProfileLink from '../components/ProfileLink'; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/RestoreProfileForm.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/RestoreProfileForm.tsx index 761394e6a66..aa7bbdf254e 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/RestoreProfileForm.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/RestoreProfileForm.tsx @@ -18,13 +18,16 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { restoreQualityProfile } from '../../../api/quality-profiles'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onClose: () => void; diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/__tests__/CreateProfileForm-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/__tests__/CreateProfileForm-test.tsx index aa7ca15169f..f6019e79a32 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/__tests__/CreateProfileForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/__tests__/CreateProfileForm-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { mockEvent, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { changeProfileParent, createQualityProfile } from '../../../../api/quality-profiles'; import { mockLocation, mockQualityProfile } from '../../../../helpers/testMocks'; +import { mockEvent, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import CreateProfileForm from '../CreateProfileForm'; beforeEach(() => jest.clearAllMocks()); diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/__tests__/PageHeader-test.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/__tests__/PageHeader-test.tsx index 5c9cffba022..38f058bb4dd 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/home/__tests__/PageHeader-test.tsx +++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/__tests__/PageHeader-test.tsx @@ -19,13 +19,13 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockLanguage, mockLocation, mockQualityProfile, mockRouter } from '../../../../helpers/testMocks'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { PageHeader } from '../PageHeader'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/routes.ts b/server/sonar-web/src/main/js/apps/quality-profiles/routes.ts index 0440dc6a06c..4e4a92076ba 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/routes.ts +++ b/server/sonar-web/src/main/js/apps/quality-profiles/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/utils.ts b/server/sonar-web/src/main/js/apps/quality-profiles/utils.ts index 21d5904a8ad..febe5f6fcc9 100644 --- a/server/sonar-web/src/main/js/apps/quality-profiles/utils.ts +++ b/server/sonar-web/src/main/js/apps/quality-profiles/utils.ts @@ -19,8 +19,8 @@ */ import * as differenceInYears from 'date-fns/difference_in_years'; import { sortBy } from 'lodash'; -import { isValidDate, parseDate } from 'sonar-ui-common/helpers/dates'; import { Profile as BaseProfile } from '../../api/quality-profiles'; +import { isValidDate, parseDate } from '../../sonar-ui-common/helpers/dates'; import { Profile } from './types'; export function sortProfiles(profiles: BaseProfile[]): Profile[] { diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/SecurityHotspotsAppRenderer.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/SecurityHotspotsAppRenderer.tsx index d18e906686e..7306e8ed2ed 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/SecurityHotspotsAppRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/SecurityHotspotsAppRenderer.tsx @@ -19,13 +19,13 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import A11ySkipTarget from '../../app/components/a11y/A11ySkipTarget'; import Suggestions from '../../app/components/embed-docs-modal/Suggestions'; import ScreenPositionHelper from '../../components/common/ScreenPositionHelper'; import { isBranch } from '../../helpers/branch-like'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { scrollToElement } from '../../sonar-ui-common/helpers/scrolling'; import { BranchLike } from '../../types/branch-like'; import { SecurityStandard, Standards } from '../../types/security'; import { HotspotFilters, HotspotStatusFilter, RawHotspot } from '../../types/security-hotspots'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsApp-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsApp-test.tsx index 0124c3a841a..fa5c0781c05 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsApp-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getMeasures } from '../../../api/measures'; import { getSecurityHotspotList, getSecurityHotspots } from '../../../api/security-hotspots'; import { mockBranch, mockPullRequest } from '../../../helpers/mocks/branch-like'; @@ -32,6 +31,7 @@ import { mockLoggedInUser, mockRouter } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { SecurityStandard } from '../../../types/security'; import { HotspotResolution, diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsAppRenderer-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsAppRenderer-test.tsx index 6fdd414e136..1816ab12c25 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsAppRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsAppRenderer-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper'; import { mockRawHotspot, mockStandards } from '../../../helpers/mocks/security-hotspots'; import { mockComponent } from '../../../helpers/testMocks'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import { SecurityStandard } from '../../../types/security'; import { HotspotStatusFilter } from '../../../types/security-hotspots'; import FilterBar from '../components/FilterBar'; @@ -30,7 +30,7 @@ import SecurityHotspotsAppRenderer, { SecurityHotspotsAppRendererProps } from '../SecurityHotspotsAppRenderer'; -jest.mock('sonar-ui-common/helpers/scrolling', () => ({ +jest.mock('../../../sonar-ui-common/helpers/scrolling', () => ({ scrollToElement: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/EmptyHotspotsPage.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/EmptyHotspotsPage.tsx index 475335b4f97..d4bcab1274c 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/EmptyHotspotsPage.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/EmptyHotspotsPage.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; export interface EmptyHotspotsPageProps { filtered: boolean; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/FilterBar.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/FilterBar.tsx index 8cea9a03a74..8410c6c3b0b 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/FilterBar.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/FilterBar.tsx @@ -18,15 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import Select from 'sonar-ui-common/components/controls/Select'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { withCurrentUser } from '../../../components/hoc/withCurrentUser'; import Measure from '../../../components/measure/Measure'; import CoverageRating from '../../../components/ui/CoverageRating'; import { isLoggedIn } from '../../../helpers/users'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import RadioToggle from '../../../sonar-ui-common/components/controls/RadioToggle'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ComponentQualifier } from '../../../types/component'; import { HotspotFilters, HotspotStatusFilter } from '../../../types/security-hotspots'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotCategory.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotCategory.tsx index b1fa7abaea9..60f808c0eea 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotCategory.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotCategory.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import ChevronDownIcon from 'sonar-ui-common/components/icons/ChevronDownIcon'; -import ChevronUpIcon from 'sonar-ui-common/components/icons/ChevronUpIcon'; +import ChevronDownIcon from '../../../sonar-ui-common/components/icons/ChevronDownIcon'; +import ChevronUpIcon from '../../../sonar-ui-common/components/icons/ChevronUpIcon'; import { RawHotspot } from '../../../types/security-hotspots'; import HotspotListItem from './HotspotListItem'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotCommentPopup.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotCommentPopup.tsx index aaad92a7992..fabe06e89b7 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotCommentPopup.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotCommentPopup.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button, ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import FormattingTips from '../../../components/common/FormattingTips'; +import { Button, ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface HotspotCommentPopupProps { markdownComment: string; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotList.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotList.tsx index b65a32e8cd2..506c8ca5169 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotList.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotList.tsx @@ -20,10 +20,10 @@ import * as classNames from 'classnames'; import { groupBy } from 'lodash'; import * as React from 'react'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import SecurityHotspotIcon from 'sonar-ui-common/components/icons/SecurityHotspotIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { addSideBarClass, removeSideBarClass } from 'sonar-ui-common/helpers/pages'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import SecurityHotspotIcon from '../../../sonar-ui-common/components/icons/SecurityHotspotIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { addSideBarClass, removeSideBarClass } from '../../../sonar-ui-common/helpers/pages'; import { HotspotStatusFilter, RawHotspot, RiskExposure } from '../../../types/security-hotspots'; import { groupByCategory, RISK_EXPOSURE_LEVELS } from '../utils'; import HotspotCategory from './HotspotCategory'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotListItem.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotListItem.tsx index c4ec9eff29e..26ecd5738a2 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotListItem.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotListItem.tsx @@ -19,7 +19,7 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { RawHotspot } from '../../../types/security-hotspots'; import { getStatusOptionFromStatusAndResolution } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotOpenInIdeButton.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotOpenInIdeButton.tsx index 2f5bf84dab9..782640cd6a3 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotOpenInIdeButton.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotOpenInIdeButton.tsx @@ -18,14 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import addGlobalErrorMessage from '../../../app/utils/addGlobalErrorMessage'; import addGlobalSuccessMessage from '../../../app/utils/addGlobalSuccessMessage'; import { openHotspot, probeSonarLintServers } from '../../../helpers/sonarlint'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Ide } from '../../../types/sonarlint'; import { HotspotOpenInIdeOverlay } from './HotspotOpenInIdeOverlay'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotReviewHistory.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotReviewHistory.tsx index 98d06cf4c95..0490f09f3ec 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotReviewHistory.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotReviewHistory.tsx @@ -19,15 +19,19 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { Button, DeleteButton, EditButton } from 'sonar-ui-common/components/controls/buttons'; -import Dropdown, { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import IssueChangelogDiff from '../../../components/issue/components/IssueChangelogDiff'; import Avatar from '../../../components/ui/Avatar'; import { sanitizeString } from '../../../helpers/sanitize'; +import { + Button, + DeleteButton, + EditButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Dropdown, { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DateTimeFormatter from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { Hotspot, ReviewHistoryType } from '../../../types/security-hotspots'; import { getHotspotReviewHistory } from '../utils'; import HotspotCommentPopup from './HotspotCommentPopup'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotReviewHistoryAndComments.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotReviewHistoryAndComments.tsx index f959b0fa334..baadf35f33b 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotReviewHistoryAndComments.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotReviewHistoryAndComments.tsx @@ -19,8 +19,6 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { Button, ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { commentSecurityHotspot, deleteSecurityHotspotComment, @@ -28,6 +26,8 @@ import { } from '../../../api/security-hotspots'; import FormattingTips from '../../../components/common/FormattingTips'; import { isLoggedIn } from '../../../helpers/users'; +import { Button, ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Hotspot } from '../../../types/security-hotspots'; import HotspotReviewHistory from './HotspotReviewHistory'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotSimpleList.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotSimpleList.tsx index 58d0db29f12..3722efddca1 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotSimpleList.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotSimpleList.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import SecurityHotspotIcon from 'sonar-ui-common/components/icons/SecurityHotspotIcon'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { addSideBarClass, removeSideBarClass } from 'sonar-ui-common/helpers/pages'; -import { fileFromPath } from 'sonar-ui-common/helpers/path'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import SecurityHotspotIcon from '../../../sonar-ui-common/components/icons/SecurityHotspotIcon'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { addSideBarClass, removeSideBarClass } from '../../../sonar-ui-common/helpers/pages'; +import { fileFromPath } from '../../../sonar-ui-common/helpers/path'; import { ComponentQualifier } from '../../../types/component'; import { SecurityStandard, Standards } from '../../../types/security'; import { RawHotspot } from '../../../types/security-hotspots'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotSnippetContainerRenderer.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotSnippetContainerRenderer.tsx index 6934ac0d5a2..775d850f2b9 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotSnippetContainerRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotSnippetContainerRenderer.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { SourceViewerContext } from '../../../components/SourceViewer/SourceViewerContext'; import SourceViewerHeaderSlim from '../../../components/SourceViewer/SourceViewerHeaderSlim'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../../types/branch-like'; import { Hotspot } from '../../../types/security-hotspots'; import SnippetViewer from '../../issues/crossComponentSourceViewer/SnippetViewer'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewer.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewer.tsx index b538d2b21fb..5073832a407 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewer.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewer.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { getSecurityHotspotDetails } from '../../../api/security-hotspots'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import { BranchLike } from '../../../types/branch-like'; import { Hotspot } from '../../../types/security-hotspots'; import HotspotViewerRenderer from './HotspotViewerRenderer'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewerRenderer.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewerRenderer.tsx index 511bff84cba..646a5d214c4 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewerRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewerRenderer.tsx @@ -20,16 +20,16 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardButton } from 'sonar-ui-common/components/controls/clipboard'; -import LinkIcon from 'sonar-ui-common/components/icons/LinkIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getPathUrlAsString } from 'sonar-ui-common/helpers/urls'; import { withCurrentUser } from '../../../components/hoc/withCurrentUser'; import { fillBranchLike, getBranchLikeQuery } from '../../../helpers/branch-like'; import { getComponentSecurityHotspotsUrl, getRuleUrl } from '../../../helpers/urls'; import { isLoggedIn } from '../../../helpers/users'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import LinkIcon from '../../../sonar-ui-common/components/icons/LinkIcon'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getPathUrlAsString } from '../../../sonar-ui-common/helpers/urls'; import { BranchLike } from '../../../types/branch-like'; import { Hotspot } from '../../../types/security-hotspots'; import Assignee from './assignee/Assignee'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewerTabs.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewerTabs.tsx index 8b736e83003..e7dae95f184 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewerTabs.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotViewerTabs.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BoxedTabs from 'sonar-ui-common/components/controls/BoxedTabs'; -import Tab from 'sonar-ui-common/components/controls/Tabs'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { sanitizeString } from '../../../helpers/sanitize'; +import BoxedTabs from '../../../sonar-ui-common/components/controls/BoxedTabs'; +import Tab from '../../../sonar-ui-common/components/controls/Tabs'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Hotspot } from '../../../types/security-hotspots'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/FilterBar-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/FilterBar-test.tsx index 3297a276caf..56cd321cde9 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/FilterBar-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/FilterBar-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import Select from 'sonar-ui-common/components/controls/Select'; import { mockComponent, mockCurrentUser, mockLoggedInUser } from '../../../../helpers/testMocks'; +import RadioToggle from '../../../../sonar-ui-common/components/controls/RadioToggle'; +import Select from '../../../../sonar-ui-common/components/controls/Select'; import { ComponentQualifier } from '../../../../types/component'; import { HotspotStatusFilter } from '../../../../types/security-hotspots'; import { AssigneeFilterOption, FilterBar, FilterBarProps } from '../FilterBar'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotCommentPopup-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotCommentPopup-test.tsx index 747e05ab6ae..2efb0d0c276 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotCommentPopup-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotCommentPopup-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Button, ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; +import { Button, ResetButtonLink } from '../../../../sonar-ui-common/components/controls/buttons'; import HotspotCommentPopup, { HotspotCommentPopupProps } from '../HotspotCommentPopup'; it('should render correclty', () => { diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotList-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotList-test.tsx index e1c741bafd6..476c2378b6a 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotList-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotList-test.tsx @@ -19,13 +19,13 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { addSideBarClass, removeSideBarClass } from 'sonar-ui-common/helpers/pages'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockRawHotspot } from '../../../../helpers/mocks/security-hotspots'; +import { addSideBarClass, removeSideBarClass } from '../../../../sonar-ui-common/helpers/pages'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { HotspotStatusFilter, RiskExposure } from '../../../../types/security-hotspots'; import HotspotList from '../HotspotList'; -jest.mock('sonar-ui-common/helpers/pages', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/pages', () => ({ addSideBarClass: jest.fn(), removeSideBarClass: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotOpenInIdeButton-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotOpenInIdeButton-test.tsx index 9cb52ee0f79..ae15ee009a4 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotOpenInIdeButton-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotOpenInIdeButton-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; import * as sonarlint from '../../../../helpers/sonarlint'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; import HotspotOpenInIdeButton from '../HotspotOpenInIdeButton'; jest.mock('../../../../helpers/sonarlint'); diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotReviewHistoryAndComments-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotReviewHistoryAndComments-test.tsx index 9dfc6b8ed48..5bc5a600124 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotReviewHistoryAndComments-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotReviewHistoryAndComments-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { commentSecurityHotspot, deleteSecurityHotspotComment, @@ -28,6 +27,7 @@ import { import { mockHotspot } from '../../../../helpers/mocks/security-hotspots'; import { mockCurrentUser } from '../../../../helpers/testMocks'; import { isLoggedIn } from '../../../../helpers/users'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import HotspotReviewHistory from '../HotspotReviewHistory'; import HotspotReviewHistoryAndComments from '../HotspotReviewHistoryAndComments'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotSimpleList-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotSimpleList-test.tsx index ee28eb15ef2..4244bdf9442 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotSimpleList-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotSimpleList-test.tsx @@ -19,13 +19,13 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { addSideBarClass, removeSideBarClass } from 'sonar-ui-common/helpers/pages'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockRawHotspot } from '../../../../helpers/mocks/security-hotspots'; +import { addSideBarClass, removeSideBarClass } from '../../../../sonar-ui-common/helpers/pages'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { SecurityStandard } from '../../../../types/security'; import HotspotSimpleList, { HotspotSimpleListProps } from '../HotspotSimpleList'; -jest.mock('sonar-ui-common/helpers/pages', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/pages', () => ({ addSideBarClass: jest.fn(), removeSideBarClass: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotSnippetContainer-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotSnippetContainer-test.tsx index 4e7698db772..645436ef0f2 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotSnippetContainer-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotSnippetContainer-test.tsx @@ -20,11 +20,11 @@ import { shallow } from 'enzyme'; import { range } from 'lodash'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getSources } from '../../../../api/components'; import { mockBranch } from '../../../../helpers/mocks/branch-like'; import { mockHotspot, mockHotspotComponent } from '../../../../helpers/mocks/security-hotspots'; import { mockComponent, mockSourceLine } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { ComponentQualifier } from '../../../../types/component'; import HotspotSnippetContainer from '../HotspotSnippetContainer'; import HotspotSnippetContainerRenderer from '../HotspotSnippetContainerRenderer'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotViewer-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotViewer-test.tsx index 1839e8b419d..a7289309a07 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotViewer-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotViewer-test.tsx @@ -20,10 +20,10 @@ import { shallow } from 'enzyme'; import { clone } from 'lodash'; import * as React from 'react'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getSecurityHotspotDetails } from '../../../../api/security-hotspots'; import { mockComponent } from '../../../../helpers/testMocks'; +import { scrollToElement } from '../../../../sonar-ui-common/helpers/scrolling'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import HotspotViewer from '../HotspotViewer'; import HotspotViewerRenderer from '../HotspotViewerRenderer'; @@ -33,7 +33,9 @@ jest.mock('../../../../api/security-hotspots', () => ({ getSecurityHotspotDetails: jest.fn().mockResolvedValue({ id: `I am a detailled hotspot` }) })); -jest.mock('sonar-ui-common/helpers/scrolling', () => ({ scrollToElement: jest.fn() })); +jest.mock('../../../../sonar-ui-common/helpers/scrolling', () => ({ + scrollToElement: jest.fn() +})); it('should render correctly', async () => { const wrapper = shallowRender(); diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotViewerTabs-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotViewerTabs-test.tsx index 5d2a3af8d12..1fc6854b804 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotViewerTabs-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotViewerTabs-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import BoxedTabs from 'sonar-ui-common/components/controls/BoxedTabs'; import { mockHotspot, mockHotspotRule } from '../../../../helpers/mocks/security-hotspots'; import { mockUser } from '../../../../helpers/testMocks'; +import BoxedTabs from '../../../../sonar-ui-common/components/controls/BoxedTabs'; import HotspotViewerTabs, { TabKeys } from '../HotspotViewerTabs'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/Assignee.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/Assignee.tsx index 19ba3ae0ef8..ba12ef0c8e2 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/Assignee.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/Assignee.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { assignSecurityHotspot } from '../../../../api/security-hotspots'; import addGlobalSuccessMessage from '../../../../app/utils/addGlobalSuccessMessage'; import { withCurrentUser } from '../../../../components/hoc/withCurrentUser'; import { isLoggedIn } from '../../../../helpers/users'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import { Hotspot, HotspotStatus } from '../../../../types/security-hotspots'; import AssigneeRenderer from './AssigneeRenderer'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeRenderer.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeRenderer.tsx index e0da8d9dcbf..33c0ac53018 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeRenderer.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { EditButton } from 'sonar-ui-common/components/controls/buttons'; -import EscKeydownHandler from 'sonar-ui-common/components/controls/EscKeydownHandler'; -import OutsideClickHandler from 'sonar-ui-common/components/controls/OutsideClickHandler'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { EditButton } from '../../../../sonar-ui-common/components/controls/buttons'; +import EscKeydownHandler from '../../../../sonar-ui-common/components/controls/EscKeydownHandler'; +import OutsideClickHandler from '../../../../sonar-ui-common/components/controls/OutsideClickHandler'; +import DeferredSpinner from '../../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import AssigneeSelection from './AssigneeSelection'; export interface AssigneeRendererProps { diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeSelection.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeSelection.tsx index efb0ebe2caf..a4c7a4cb0c3 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeSelection.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeSelection.tsx @@ -19,10 +19,10 @@ */ import { debounce } from 'lodash'; import * as React from 'react'; -import { KeyCodes } from 'sonar-ui-common/helpers/keycodes'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { searchUsers } from '../../../../api/users'; import { isUserActive } from '../../../../helpers/users'; +import { KeyCodes } from '../../../../sonar-ui-common/helpers/keycodes'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import AssigneeSelectionRenderer from './AssigneeSelectionRenderer'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeSelectionRenderer.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeSelectionRenderer.tsx index 252c54cfedf..afe33d95a99 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeSelectionRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/AssigneeSelectionRenderer.tsx @@ -19,12 +19,12 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import Avatar from '../../../../components/ui/Avatar'; +import { DropdownOverlay } from '../../../../sonar-ui-common/components/controls/Dropdown'; +import SearchBox from '../../../../sonar-ui-common/components/controls/SearchBox'; +import DeferredSpinner from '../../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { PopupPlacement } from '../../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import './AssigneeSelection.css'; export interface HotspotAssigneeSelectRendererProps { diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/Assignee-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/Assignee-test.tsx index 60d34a60ec0..94be36bda05 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/Assignee-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/Assignee-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { assignSecurityHotspot } from '../../../../../api/security-hotspots'; import addGlobalSuccessMessage from '../../../../../app/utils/addGlobalSuccessMessage'; import { mockHotspot } from '../../../../../helpers/mocks/security-hotspots'; import { mockCurrentUser, mockUser } from '../../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import { HotspotStatus } from '../../../../../types/security-hotspots'; import { Assignee } from '../Assignee'; import AssigneeRenderer from '../AssigneeRenderer'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/AssigneeRenderer-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/AssigneeRenderer-test.tsx index 67b4dcae941..41cb5036403 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/AssigneeRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/AssigneeRenderer-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { EditButton } from 'sonar-ui-common/components/controls/buttons'; -import OutsideClickHandler from 'sonar-ui-common/components/controls/OutsideClickHandler'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockLoggedInUser, mockUser } from '../../../../../helpers/testMocks'; +import { EditButton } from '../../../../../sonar-ui-common/components/controls/buttons'; +import OutsideClickHandler from '../../../../../sonar-ui-common/components/controls/OutsideClickHandler'; +import { click } from '../../../../../sonar-ui-common/helpers/testUtils'; import AssigneeRenderer, { AssigneeRendererProps } from '../AssigneeRenderer'; import AssigneeSelection from '../AssigneeSelection'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/AssigneeSelection-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/AssigneeSelection-test.tsx index e4eaf7a2315..69e882dc30a 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/AssigneeSelection-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/assignee/__tests__/AssigneeSelection-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { KeyCodes } from 'sonar-ui-common/helpers/keycodes'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { searchUsers } from '../../../../../api/users'; import { mockLoggedInUser, mockUser } from '../../../../../helpers/testMocks'; +import { KeyCodes } from '../../../../../sonar-ui-common/helpers/keycodes'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import AssigneeSelection from '../AssigneeSelection'; jest.mock('../../../../../api/users', () => ({ diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/Status.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/Status.tsx index 8194919bfbf..e8e75a5b63e 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/Status.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/Status.tsx @@ -19,15 +19,15 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { withCurrentUser } from '../../../../components/hoc/withCurrentUser'; import { isLoggedIn } from '../../../../helpers/users'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import { DropdownOverlay } from '../../../../sonar-ui-common/components/controls/Dropdown'; +import Toggler from '../../../../sonar-ui-common/components/controls/Toggler'; +import Tooltip from '../../../../sonar-ui-common/components/controls/Tooltip'; +import DropdownIcon from '../../../../sonar-ui-common/components/icons/DropdownIcon'; +import { PopupPlacement } from '../../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { Hotspot } from '../../../../types/security-hotspots'; import { getStatusOptionFromStatusAndResolution } from '../../utils'; import StatusDescription from './StatusDescription'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusDescription.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusDescription.tsx index cb64be09386..cb2b3853689 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusDescription.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusDescription.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { HotspotStatusOption } from '../../../../types/security-hotspots'; export interface StatusDescriptionProps { diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusSelection.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusSelection.tsx index b029f33193e..c09078c2644 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusSelection.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusSelection.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { setSecurityHotspotStatus } from '../../../../api/security-hotspots'; import addGlobalSuccessMessage from '../../../../app/utils/addGlobalSuccessMessage'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import { Hotspot, HotspotStatusOption } from '../../../../types/security-hotspots'; import { getStatusAndResolutionFromStatusOption, diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusSelectionRenderer.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusSelectionRenderer.tsx index 16ac6955319..42a1254a477 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusSelectionRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/StatusSelectionRenderer.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import FormattingTips from '../../../../components/common/FormattingTips'; +import { SubmitButton } from '../../../../sonar-ui-common/components/controls/buttons'; +import Radio from '../../../../sonar-ui-common/components/controls/Radio'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { HotspotStatusOption } from '../../../../types/security-hotspots'; import StatusDescription from './StatusDescription'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/Status-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/Status-test.tsx index 15191724ed0..fe8d5d1577d 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/Status-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/Status-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockHotspot } from '../../../../../helpers/mocks/security-hotspots'; import { mockCurrentUser } from '../../../../../helpers/testMocks'; +import { DropdownOverlay } from '../../../../../sonar-ui-common/components/controls/Dropdown'; +import Toggler from '../../../../../sonar-ui-common/components/controls/Toggler'; +import { click } from '../../../../../sonar-ui-common/helpers/testUtils'; import { HotspotStatusOption } from '../../../../../types/security-hotspots'; import { Status, StatusProps } from '../Status'; import StatusSelection from '../StatusSelection'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/StatusSelection-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/StatusSelection-test.tsx index 53b0d7cffa6..42563dd9e2a 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/StatusSelection-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/StatusSelection-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { setSecurityHotspotStatus } from '../../../../../api/security-hotspots'; import { mockHotspot } from '../../../../../helpers/mocks/security-hotspots'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import { HotspotStatus, HotspotStatusOption } from '../../../../../types/security-hotspots'; import StatusSelection from '../StatusSelection'; import StatusSelectionRenderer from '../StatusSelectionRenderer'; diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/StatusSelectionRenderer-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/StatusSelectionRenderer-test.tsx index b223c156860..872c45c041b 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/StatusSelectionRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/status/__tests__/StatusSelectionRenderer-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import { change, click } from 'sonar-ui-common/helpers/testUtils'; +import { SubmitButton } from '../../../../../sonar-ui-common/components/controls/buttons'; +import Radio from '../../../../../sonar-ui-common/components/controls/Radio'; +import { change, click } from '../../../../../sonar-ui-common/helpers/testUtils'; import { HotspotStatusOption } from '../../../../../types/security-hotspots'; import StatusSelectionRenderer, { StatusSelectionRendererProps } from '../StatusSelectionRenderer'; diff --git a/server/sonar-web/src/main/js/apps/sessions/components/Login.tsx b/server/sonar-web/src/main/js/apps/sessions/components/Login.tsx index 79fdae7e31c..6dba8f5395b 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/Login.tsx +++ b/server/sonar-web/src/main/js/apps/sessions/components/Login.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import GlobalMessagesContainer from '../../../app/components/GlobalMessagesContainer'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Store } from '../../../store/rootReducer'; import './Login.css'; import LoginForm from './LoginForm'; diff --git a/server/sonar-web/src/main/js/apps/sessions/components/LoginContainer.tsx b/server/sonar-web/src/main/js/apps/sessions/components/LoginContainer.tsx index 7178f501c70..f4d2928692b 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/LoginContainer.tsx +++ b/server/sonar-web/src/main/js/apps/sessions/components/LoginContainer.tsx @@ -20,8 +20,8 @@ import { Location } from 'history'; import * as React from 'react'; import { connect } from 'react-redux'; -import { getReturnUrl } from 'sonar-ui-common/helpers/urls'; import { getIdentityProviders } from '../../../api/users'; +import { getReturnUrl } from '../../../sonar-ui-common/helpers/urls'; import { doLogin } from '../../../store/rootActions'; import Login from './Login'; diff --git a/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.tsx b/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.tsx index 28ee3b95211..2e46f9a411b 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.tsx +++ b/server/sonar-web/src/main/js/apps/sessions/components/LoginForm.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import './LoginForm.css'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/sessions/components/Logout.tsx b/server/sonar-web/src/main/js/apps/sessions/components/Logout.tsx index aa4ea6132e6..c05e0fd400a 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/Logout.tsx +++ b/server/sonar-web/src/main/js/apps/sessions/components/Logout.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; import GlobalMessagesContainer from '../../../app/components/GlobalMessagesContainer'; import RecentHistory from '../../../app/components/RecentHistory'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { doLogout } from '../../../store/rootActions'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/sessions/components/OAuthProviders.tsx b/server/sonar-web/src/main/js/apps/sessions/components/OAuthProviders.tsx index ee168dee207..0a2924d15e0 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/OAuthProviders.tsx +++ b/server/sonar-web/src/main/js/apps/sessions/components/OAuthProviders.tsx @@ -19,10 +19,10 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import IdentityProviderLink from 'sonar-ui-common/components/controls/IdentityProviderLink'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import IdentityProviderLink from '../../../sonar-ui-common/components/controls/IdentityProviderLink'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import './OAuthProviders.css'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/sessions/components/Unauthorized.tsx b/server/sonar-web/src/main/js/apps/sessions/components/Unauthorized.tsx index c50b357ce3a..dcd1abbc14e 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/Unauthorized.tsx +++ b/server/sonar-web/src/main/js/apps/sessions/components/Unauthorized.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { getCookie } from 'sonar-ui-common/helpers/cookies'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { getCookie } from '../../../sonar-ui-common/helpers/cookies'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; export default function Unauthorized() { const message = decodeURIComponent(getCookie('AUTHENTICATION-ERROR') || ''); diff --git a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/LoginContainer-test.tsx b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/LoginContainer-test.tsx index 3e602f24bfe..7e6d57e388a 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/LoginContainer-test.tsx +++ b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/LoginContainer-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getIdentityProviders } from '../../../../api/users'; import { mockLocation } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { LoginContainer } from '../LoginContainer'; jest.mock('../../../../api/users', () => { diff --git a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/LoginForm-test.tsx b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/LoginForm-test.tsx index 19f9ecdf757..4e4612b2fbe 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/LoginForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/LoginForm-test.tsx @@ -19,7 +19,12 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, click, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { + change, + click, + submit, + waitAndUpdate +} from '../../../../sonar-ui-common/helpers/testUtils'; import LoginForm from '../LoginForm'; it('logs in with simple credentials', () => { diff --git a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/Logout-test.tsx b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/Logout-test.tsx index 3a403ca4438..55f8d3461a1 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/Logout-test.tsx +++ b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/Logout-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { Logout } from '../Logout'; const originalLocation = window.location; diff --git a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/Unauthorized-test.tsx b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/Unauthorized-test.tsx index 8ba7b011621..51b9a810610 100644 --- a/server/sonar-web/src/main/js/apps/sessions/components/__tests__/Unauthorized-test.tsx +++ b/server/sonar-web/src/main/js/apps/sessions/components/__tests__/Unauthorized-test.tsx @@ -21,7 +21,7 @@ import { shallow } from 'enzyme'; import * as React from 'react'; import Unauthorized from '../Unauthorized'; -jest.mock('sonar-ui-common/helpers/cookies', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/cookies', () => ({ getCookie: jest.fn().mockReturnValue('Foo') })); diff --git a/server/sonar-web/src/main/js/apps/sessions/routes.ts b/server/sonar-web/src/main/js/apps/sessions/routes.ts index ec67f583593..87793f47aff 100644 --- a/server/sonar-web/src/main/js/apps/sessions/routes.ts +++ b/server/sonar-web/src/main/js/apps/sessions/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/settings/components/AdditionalCategories.tsx b/server/sonar-web/src/main/js/apps/settings/components/AdditionalCategories.tsx index 4481f60e684..651362b551d 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/AdditionalCategories.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/AdditionalCategories.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { ALM_INTEGRATION, ANALYSIS_SCOPE_CATEGORY, diff --git a/server/sonar-web/src/main/js/apps/settings/components/AnalysisScope.tsx b/server/sonar-web/src/main/js/apps/settings/components/AnalysisScope.tsx index 86defc4a091..ebf60c38e3d 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/AnalysisScope.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/AnalysisScope.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AdditionalCategoryComponentProps } from './AdditionalCategories'; import CategoryDefinitionsList from './CategoryDefinitionsList'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/AppContainer.tsx b/server/sonar-web/src/main/js/apps/settings/components/AppContainer.tsx index 4ab599eaa85..087e10a3ea8 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/AppContainer.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/AppContainer.tsx @@ -22,15 +22,15 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { connect } from 'react-redux'; import { WithRouterProps } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; +import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { addSideBarClass, addWhitePageClass, removeSideBarClass, removeWhitePageClass -} from 'sonar-ui-common/helpers/pages'; -import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; -import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper'; +} from '../../../sonar-ui-common/helpers/pages'; import { getSettingsAppDefaultCategory, Store } from '../../../store/rootReducer'; import { fetchSettings } from '../store/actions'; import '../styles.css'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/Definition.tsx b/server/sonar-web/src/main/js/apps/settings/components/Definition.tsx index fadd728a2cf..1d28db83706 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/Definition.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/Definition.tsx @@ -20,10 +20,10 @@ import classNames from 'classnames'; import * as React from 'react'; import { connect } from 'react-redux'; -import AlertErrorIcon from 'sonar-ui-common/components/icons/AlertErrorIcon'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { sanitizeStringRestricted } from '../../../helpers/sanitize'; +import AlertErrorIcon from '../../../sonar-ui-common/components/icons/AlertErrorIcon'; +import AlertSuccessIcon from '../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { getSettingsAppChangedValue, getSettingsAppValidationMessage, diff --git a/server/sonar-web/src/main/js/apps/settings/components/DefinitionActions.tsx b/server/sonar-web/src/main/js/apps/settings/components/DefinitionActions.tsx index 70eb44829c5..ce1f79d27e3 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/DefinitionActions.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/DefinitionActions.tsx @@ -18,9 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button, ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { + Button, + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Setting } from '../../../types/settings'; import { getDefaultValue, getSettingValue, isEmptyValue } from '../utils'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/EmailForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/EmailForm.tsx index cfc14b0b3ea..d3a51ee9f38 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/EmailForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/EmailForm.tsx @@ -18,15 +18,15 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { parseError } from 'sonar-ui-common/helpers/request'; import { sendTestEmail } from '../../../api/settings'; import { withCurrentUser } from '../../../components/hoc/withCurrentUser'; +import { SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { parseError } from '../../../sonar-ui-common/helpers/request'; interface Props { currentUser: T.LoggedInUser; diff --git a/server/sonar-web/src/main/js/apps/settings/components/Languages.tsx b/server/sonar-web/src/main/js/apps/settings/components/Languages.tsx index 00dc3cea652..432461ca743 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/Languages.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/Languages.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { Location, Router, withRouter } from '../../../components/hoc/withRouter'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getSettingsAppAllCategories, Store } from '../../../store/rootReducer'; import { getCategoryName } from '../utils'; import { AdditionalCategoryComponentProps } from './AdditionalCategories'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/NewCodePeriod.tsx b/server/sonar-web/src/main/js/apps/settings/components/NewCodePeriod.tsx index d9ca62d0205..be4033936b5 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/NewCodePeriod.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/NewCodePeriod.tsx @@ -20,11 +20,14 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getNewCodePeriod, setNewCodePeriod } from '../../../api/newCodePeriod'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import AlertSuccessIcon from '../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import BaselineSettingDays from '../../projectBaseline/components/BaselineSettingDays'; import BaselineSettingPreviousVersion from '../../projectBaseline/components/BaselineSettingPreviousVersion'; import { validateDays } from '../../projectBaseline/utils'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/PageHeader.tsx b/server/sonar-web/src/main/js/apps/settings/components/PageHeader.tsx index 19d7137aa8b..e0d9061df4f 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/PageHeader.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/PageHeader.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import InstanceMessage from '../../../components/common/InstanceMessage'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface PageHeaderProps { component?: T.Component; diff --git a/server/sonar-web/src/main/js/apps/settings/components/SubCategoryDefinitionsList.tsx b/server/sonar-web/src/main/js/apps/settings/components/SubCategoryDefinitionsList.tsx index f052070165b..df2e2eba045 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/SubCategoryDefinitionsList.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/SubCategoryDefinitionsList.tsx @@ -19,9 +19,9 @@ */ import { groupBy, isEqual, sortBy } from 'lodash'; import * as React from 'react'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { Location, withRouter } from '../../../components/hoc/withRouter'; import { sanitizeStringRestricted } from '../../../helpers/sanitize'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import { SettingWithCategory } from '../../../types/settings'; import { getSubCategoryDescription, getSubCategoryName } from '../utils'; import DefinitionsList from './DefinitionsList'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/__tests__/AppContainer-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/__tests__/AppContainer-test.tsx index fb6fdf156d3..dcb1ab3ca39 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/__tests__/AppContainer-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/__tests__/AppContainer-test.tsx @@ -19,15 +19,15 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; +import ScreenPositionHelper from '../../../../components/common/ScreenPositionHelper'; +import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; import { addSideBarClass, addWhitePageClass, removeSideBarClass, removeWhitePageClass -} from 'sonar-ui-common/helpers/pages'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; -import ScreenPositionHelper from '../../../../components/common/ScreenPositionHelper'; -import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +} from '../../../../sonar-ui-common/helpers/pages'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { ALM_INTEGRATION, ANALYSIS_SCOPE_CATEGORY, @@ -37,7 +37,7 @@ import { } from '../AdditionalCategoryKeys'; import { App } from '../AppContainer'; -jest.mock('sonar-ui-common/helpers/pages', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/pages', () => ({ addSideBarClass: jest.fn(), addWhitePageClass: jest.fn(), removeSideBarClass: jest.fn(), diff --git a/server/sonar-web/src/main/js/apps/settings/components/__tests__/Definition-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/__tests__/Definition-test.tsx index d22229ba2c3..eaee4ef5677 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/__tests__/Definition-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/__tests__/Definition-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockSetting } from '../../../../helpers/mocks/settings'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { Definition } from '../Definition'; const setting = mockSetting(); diff --git a/server/sonar-web/src/main/js/apps/settings/components/__tests__/EmailForm-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/__tests__/EmailForm-test.tsx index a0ae6b993d6..c67ab25a908 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/__tests__/EmailForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/__tests__/EmailForm-test.tsx @@ -20,12 +20,12 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { sendTestEmail } from '../../../../api/settings'; import { mockLoggedInUser } from '../../../../helpers/testMocks'; +import { change, submit, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { EmailForm } from '../EmailForm'; -jest.mock('sonar-ui-common/helpers/request', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/request', () => ({ parseError: jest.fn().mockResolvedValue('Error message') })); diff --git a/server/sonar-web/src/main/js/apps/settings/components/__tests__/Languages-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/__tests__/Languages-test.tsx index 66ce87c018b..f50ef2ce95f 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/__tests__/Languages-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/__tests__/Languages-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; import { mockComponent, mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import Select from '../../../../sonar-ui-common/components/controls/Select'; import CategoryDefinitionsList from '../CategoryDefinitionsList'; import { Languages, LanguagesProps } from '../Languages'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/__tests__/NewCodePeriod-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/__tests__/NewCodePeriod-test.tsx index 6a2c64876a0..35a12846b8a 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/__tests__/NewCodePeriod-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/__tests__/NewCodePeriod-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getNewCodePeriod, setNewCodePeriod } from '../../../../api/newCodePeriod'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import NewCodePeriod from '../NewCodePeriod'; jest.mock('../../../../api/newCodePeriod', () => ({ diff --git a/server/sonar-web/src/main/js/apps/settings/components/__tests__/SubCategoryDefinitionsList-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/__tests__/SubCategoryDefinitionsList-test.tsx index 3484a97bd07..4185f5fedd4 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/__tests__/SubCategoryDefinitionsList-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/__tests__/SubCategoryDefinitionsList-test.tsx @@ -19,16 +19,16 @@ */ import { mount, shallow } from 'enzyme'; import * as React from 'react'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockSettingWithCategory } from '../../../../helpers/mocks/settings'; import { mockLocation } from '../../../../helpers/testMocks'; +import { scrollToElement } from '../../../../sonar-ui-common/helpers/scrolling'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { SubCategoryDefinitionsList, SubCategoryDefinitionsListProps } from '../SubCategoryDefinitionsList'; -jest.mock('sonar-ui-common/helpers/scrolling', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/scrolling', () => ({ scrollToElement: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionBox.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionBox.tsx index 73489a02c3d..74e2282f121 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionBox.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionBox.tsx @@ -20,17 +20,17 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import AlertErrorIcon from 'sonar-ui-common/components/icons/AlertErrorIcon'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import DeleteIcon from 'sonar-ui-common/components/icons/DeleteIcon'; -import EditIcon from 'sonar-ui-common/components/icons/EditIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { ALM_DOCUMENTATION_PATHS, IMPORT_COMPATIBLE_ALMS } from '../../../../helpers/constants'; import { getEdition, getEditionUrl } from '../../../../helpers/editions'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import HelpTooltip from '../../../../sonar-ui-common/components/controls/HelpTooltip'; +import Tooltip from '../../../../sonar-ui-common/components/controls/Tooltip'; +import AlertErrorIcon from '../../../../sonar-ui-common/components/icons/AlertErrorIcon'; +import AlertSuccessIcon from '../../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import DeleteIcon from '../../../../sonar-ui-common/components/icons/DeleteIcon'; +import EditIcon from '../../../../sonar-ui-common/components/icons/EditIcon'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmBindingDefinitionBase, AlmKeys, diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionFormField.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionFormField.tsx index bba6481cf22..0edf9c46bac 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionFormField.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionFormField.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../../sonar-ui-common/components/controls/buttons'; +import HelpTooltip from '../../../../sonar-ui-common/components/controls/HelpTooltip'; +import MandatoryFieldMarker from '../../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmBindingDefinitionBase } from '../../../../types/alm-settings'; export interface AlmBindingDefinitionFormFieldProps<B extends AlmBindingDefinitionBase> { diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionFormRenderer.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionFormRenderer.tsx index 1aca5499b39..f8664a28637 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionFormRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmBindingDefinitionFormRenderer.tsx @@ -18,11 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { + ResetButtonLink, + SubmitButton +} from '../../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../../sonar-ui-common/components/controls/Modal'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmBindingDefinition, AlmKeys, diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx index f0289cb6318..3444cb9fd83 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmIntegrationRenderer.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BoxedTabs from 'sonar-ui-common/components/controls/BoxedTabs'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import BoxedTabs from '../../../../sonar-ui-common/components/controls/BoxedTabs'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../../sonar-ui-common/helpers/urls'; import { AlmKeys, AlmSettingsBindingDefinitions, diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx index 667059ef4fb..1661200ae7a 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AlmTabRenderer.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import DeferredSpinner from '../../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmBindingDefinition, AlmBindingDefinitionBase, diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureForm.tsx index f6638de1817..fdb38dfcd39 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/AzureForm.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { ALM_DOCUMENTATION_PATHS } from '../../../../helpers/constants'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AzureBindingDefinition } from '../../../../types/alm-settings'; import { AlmBindingDefinitionFormField } from './AlmBindingDefinitionFormField'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketCloudForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketCloudForm.tsx index c1ec4713ff5..5d766957f36 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketCloudForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketCloudForm.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { BitbucketCloudBindingDefinition } from '../../../../types/alm-settings'; import { AlmBindingDefinitionFormField } from './AlmBindingDefinitionFormField'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketForm.tsx index 08612473b58..749ce2e1081 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketForm.tsx @@ -20,10 +20,10 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { ALM_DOCUMENTATION_PATHS } from '../../../../helpers/constants'; +import RadioToggle from '../../../../sonar-ui-common/components/controls/RadioToggle'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, BitbucketCloudBindingDefinition, diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx index d2ac778e29a..67f7fa430f3 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/BitbucketServerForm.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { BitbucketServerBindingDefinition } from '../../../../types/alm-settings'; import { AlmBindingDefinitionFormField } from './AlmBindingDefinitionFormField'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/CreationTooltip.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/CreationTooltip.tsx index bc9fcb2d76c..936f2efbcc8 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/CreationTooltip.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/CreationTooltip.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { withAppState } from '../../../../components/hoc/withAppState'; import { getEdition, getEditionUrl } from '../../../../helpers/editions'; +import Tooltip from '../../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../../types/alm-settings'; import { EditionKey } from '../../../../types/editions'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/DeleteModal.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/DeleteModal.tsx index e5d6d626085..05c3cb63f38 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/DeleteModal.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/DeleteModal.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import ConfirmModal from 'sonar-ui-common/components/controls/ConfirmModal'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import ConfirmModal from '../../../../sonar-ui-common/components/controls/ConfirmModal'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; export interface DeleteModalProps { id: string; diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx index bf75e18c801..b00cb30273b 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { ALM_DOCUMENTATION_PATHS } from '../../../../helpers/constants'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, GithubBindingDefinition } from '../../../../types/alm-settings'; import { AlmBindingDefinitionFormField } from './AlmBindingDefinitionFormField'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabForm.tsx index 34406e9ae7c..ec89c8b8752 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GitlabForm.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { ALM_DOCUMENTATION_PATHS } from '../../../../helpers/constants'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, GitlabBindingDefinition } from '../../../../types/alm-settings'; import { AlmBindingDefinitionFormField } from './AlmBindingDefinitionFormField'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionForm-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionForm-test.tsx index b4ca5b1e7b4..c78b1d3cfe9 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionForm-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { createAzureConfiguration, createBitbucketCloudConfiguration, @@ -41,6 +40,7 @@ import { mockGithubBindingDefinition, mockGitlabBindingDefinition } from '../../../../../helpers/mocks/alm-settings'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import { AlmBindingDefinition, AlmKeys } from '../../../../../types/alm-settings'; import AlmBindingDefinitionForm from '../AlmBindingDefinitionForm'; import AlmBindingDefinitionFormRenderer from '../AlmBindingDefinitionFormRenderer'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionFormField-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionFormField-test.tsx index ceccda088f0..4261bd1dffd 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionFormField-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionFormField-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { ButtonLink } from '../../../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../../../sonar-ui-common/helpers/testUtils'; import { AlmBindingDefinitionBase } from '../../../../../types/alm-settings'; import { AlmBindingDefinitionFormField, diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionFormRenderer-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionFormRenderer-test.tsx index e60c01849c8..02643d899fd 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionFormRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmBindingDefinitionFormRenderer-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockGithubBindingDefinition } from '../../../../../helpers/mocks/alm-settings'; import { mockEvent } from '../../../../../helpers/testMocks'; +import { ResetButtonLink } from '../../../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../../types/alm-settings'; import AlmBindingDefinitionFormRenderer, { AlmBindingDefinitionFormProps diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-test.tsx index 110e538ff99..b9f4b241050 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmIntegration-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { countBindedProjects, deleteConfiguration, @@ -27,6 +26,7 @@ import { validateAlmSettings } from '../../../../../api/alm-settings'; import { mockLocation } from '../../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys, AlmSettingsBindingStatusType } from '../../../../../types/alm-settings'; import { AlmIntegration } from '../AlmIntegration'; import AlmIntegrationRenderer from '../AlmIntegrationRenderer'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTab-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTab-test.tsx index c66da1da1aa..a7af4d5ca22 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTab-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/AlmTab-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockAzureBindingDefinition } from '../../../../../helpers/mocks/alm-settings'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys } from '../../../../../types/alm-settings'; import AlmTab from '../AlmTab'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/BitbucketForm-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/BitbucketForm-test.tsx index 21bf6410a6e..88a12490b64 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/BitbucketForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/BitbucketForm-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; import { mockBitbucketCloudBindingDefinition, mockBitbucketServerBindingDefinition } from '../../../../../helpers/mocks/alm-settings'; +import RadioToggle from '../../../../../sonar-ui-common/components/controls/RadioToggle'; import { AlmKeys } from '../../../../../types/alm-settings'; import BitbucketForm, { BitbucketFormProps } from '../BitbucketForm'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForBoolean.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForBoolean.tsx index b6708ab9e83..74921a67aba 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForBoolean.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForBoolean.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Toggle from 'sonar-ui-common/components/controls/Toggle'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Toggle from '../../../../sonar-ui-common/components/controls/Toggle'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { DefaultSpecializedInputProps } from '../../utils'; interface Props extends DefaultSpecializedInputProps { diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForJSON.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForJSON.tsx index 701734e8db8..0edf6bb3ab1 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForJSON.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForJSON.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { DefaultSpecializedInputProps } from '../../utils'; const JSON_SPACE_SIZE = 4; diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForPassword.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForPassword.tsx index a53886a0868..aae8152eb8b 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForPassword.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForPassword.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import LockIcon from 'sonar-ui-common/components/icons/LockIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { colors } from '../../../../app/theme'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import LockIcon from '../../../../sonar-ui-common/components/icons/LockIcon'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { DefaultSpecializedInputProps } from '../../utils'; interface State { diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSingleSelectList.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSingleSelectList.tsx index 117b3916715..12421ba9618 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSingleSelectList.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/InputForSingleSelectList.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; +import Select from '../../../../sonar-ui-common/components/controls/Select'; import { SettingCategoryDefinition } from '../../../../types/settings'; import { DefaultSpecializedInputProps } from '../../utils'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/MultiValueInput.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/MultiValueInput.tsx index 4cc7df0e074..8dfa106672d 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/MultiValueInput.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/MultiValueInput.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DeleteButton } from 'sonar-ui-common/components/controls/buttons'; +import { DeleteButton } from '../../../../sonar-ui-common/components/controls/buttons'; import { DefaultInputProps, getEmptyValue } from '../../utils'; import PrimitiveInput from './PrimitiveInput'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/PropertySetInput.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/PropertySetInput.tsx index e0293999dcf..c85f583f4fd 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/PropertySetInput.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/PropertySetInput.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DeleteButton } from 'sonar-ui-common/components/controls/buttons'; +import { DeleteButton } from '../../../../sonar-ui-common/components/controls/buttons'; import { DefaultInputProps, getEmptyValue, getUniqueName, isCategoryDefinition } from '../../utils'; import PrimitiveInput from './PrimitiveInput'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForJSON-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForJSON-test.tsx index 1eee2261537..42090287fe1 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForJSON-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForJSON-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change } from 'sonar-ui-common/helpers/testUtils'; +import { change } from '../../../../../sonar-ui-common/helpers/testUtils'; import { DefaultSpecializedInputProps } from '../../../utils'; import InputForJSON from '../InputForJSON'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForPassword-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForPassword-test.tsx index ad030011883..e8ddd53ecd2 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForPassword-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForPassword-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, click, submit } from 'sonar-ui-common/helpers/testUtils'; +import { change, click, submit } from '../../../../../sonar-ui-common/helpers/testUtils'; import { DefaultSpecializedInputProps } from '../../../utils'; import InputForPassword from '../InputForPassword'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForText-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForText-test.tsx index c214fb9af1e..aa8e6e094d0 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForText-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/InputForText-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change } from 'sonar-ui-common/helpers/testUtils'; +import { change } from '../../../../../sonar-ui-common/helpers/testUtils'; import { DefaultSpecializedInputProps } from '../../../utils'; import InputForText from '../InputForText'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/MultiValueInput-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/MultiValueInput-test.tsx index c47d92eadb2..5fc3cc4c1ef 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/MultiValueInput-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/MultiValueInput-test.tsx @@ -19,7 +19,7 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../../sonar-ui-common/helpers/testUtils'; import { SettingCategoryDefinition } from '../../../../../types/settings'; import { DefaultInputProps } from '../../../utils'; import MultiValueInput from '../MultiValueInput'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/SimpleInput-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/SimpleInput-test.tsx index e4a0dff396c..7f55d57aa47 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/SimpleInput-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/inputs/__tests__/SimpleInput-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change } from 'sonar-ui-common/helpers/testUtils'; +import { change } from '../../../../../sonar-ui-common/helpers/testUtils'; import SimpleInput from '../SimpleInput'; it('should render input', () => { diff --git a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/AlmSpecificForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/AlmSpecificForm.tsx index 4f4672e6bf1..b17b0555153 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/AlmSpecificForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/AlmSpecificForm.tsx @@ -20,11 +20,11 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { ALM_DOCUMENTATION_PATHS } from '../../../../helpers/constants'; import { convertGithubApiUrlToLink, stripTrailingSlash } from '../../../../helpers/urls'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import MandatoryFieldMarker from '../../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/PRDecorationBinding.tsx b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/PRDecorationBinding.tsx index 75e58e4a6e8..65ccfa6d87d 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/PRDecorationBinding.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/PRDecorationBinding.tsx @@ -19,7 +19,6 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import { HttpStatus } from 'sonar-ui-common/helpers/request'; import { deleteProjectAlmBinding, getAlmSettings, @@ -34,6 +33,7 @@ import { import throwGlobalError from '../../../../app/utils/throwGlobalError'; import { withCurrentUser } from '../../../../components/hoc/withCurrentUser'; import { hasGlobalPermission } from '../../../../helpers/users'; +import { HttpStatus } from '../../../../sonar-ui-common/helpers/request'; import { getAppState, Store } from '../../../../store/rootReducer'; import { AlmKeys, diff --git a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/PRDecorationBindingRenderer.tsx b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/PRDecorationBindingRenderer.tsx index f5f60aef774..95444b37b7d 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/PRDecorationBindingRenderer.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/PRDecorationBindingRenderer.tsx @@ -20,15 +20,15 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Button, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Select from 'sonar-ui-common/components/controls/Select'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getGlobalSettingsUrl } from '../../../../helpers/urls'; +import { Button, SubmitButton } from '../../../../sonar-ui-common/components/controls/buttons'; +import Select from '../../../../sonar-ui-common/components/controls/Select'; +import AlertSuccessIcon from '../../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../../sonar-ui-common/components/ui/DeferredSpinner'; +import MandatoryFieldMarker from '../../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmSettingsInstance, ProjectAlmBindingConfigurationErrors, diff --git a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/PRDecorationBinding-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/PRDecorationBinding-test.tsx index f20850762b6..a262274f7e3 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/PRDecorationBinding-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/PRDecorationBinding-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { deleteProjectAlmBinding, getAlmSettings, @@ -37,6 +36,7 @@ import { mockProjectAlmBindingResponse } from '../../../../../helpers/mocks/alm-settings'; import { mockComponent, mockCurrentUser } from '../../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys, AlmSettingsInstance } from '../../../../../types/alm-settings'; import { PRDecorationBinding } from '../PRDecorationBinding'; import PRDecorationBindingRenderer from '../PRDecorationBindingRenderer'; diff --git a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/PRDecorationBindingRenderer-test.tsx b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/PRDecorationBindingRenderer-test.tsx index fe8d6b8ba50..c8cb2ca7d4c 100644 --- a/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/PRDecorationBindingRenderer-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/components/pullRequestDecorationBinding/__tests__/PRDecorationBindingRenderer-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import Select from '../../../../../sonar-ui-common/components/controls/Select'; +import { waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionApp.tsx b/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionApp.tsx index 540940672ed..247cb3f1ac3 100644 --- a/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionApp.tsx +++ b/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionApp.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { checkSecretKey, generateSecretKey } from '../../../api/settings'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import EncryptionForm from './EncryptionForm'; import GenerateSecretKeyForm from './GenerateSecretKeyForm'; diff --git a/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionForm.tsx b/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionForm.tsx index f040aacbe2c..014152a685a 100644 --- a/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionForm.tsx @@ -20,11 +20,11 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardButton } from 'sonar-ui-common/components/controls/clipboard'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { encryptValue } from '../../../api/settings'; +import { SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { generateSecretKey: () => Promise<void>; diff --git a/server/sonar-web/src/main/js/apps/settings/encryption/GenerateSecretKeyForm.tsx b/server/sonar-web/src/main/js/apps/settings/encryption/GenerateSecretKeyForm.tsx index 6947080e056..1bf80f49722 100644 --- a/server/sonar-web/src/main/js/apps/settings/encryption/GenerateSecretKeyForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/encryption/GenerateSecretKeyForm.tsx @@ -20,10 +20,10 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardButton } from 'sonar-ui-common/components/controls/clipboard'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { generateSecretKey: () => Promise<void>; diff --git a/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/EncryptionApp-test.tsx b/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/EncryptionApp-test.tsx index 7d4f8e3618a..7ba6081f616 100644 --- a/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/EncryptionApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/EncryptionApp-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { checkSecretKey, generateSecretKey } from '../../../../api/settings'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import EncryptionApp from '../EncryptionApp'; jest.mock('../../../../api/settings', () => ({ diff --git a/server/sonar-web/src/main/js/apps/settings/routes.ts b/server/sonar-web/src/main/js/apps/settings/routes.ts index 498fc3c6519..ad62cde0340 100644 --- a/server/sonar-web/src/main/js/apps/settings/routes.ts +++ b/server/sonar-web/src/main/js/apps/settings/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/settings/store/actions.ts b/server/sonar-web/src/main/js/apps/settings/store/actions.ts index 7201065e6ab..87f45788979 100644 --- a/server/sonar-web/src/main/js/apps/settings/store/actions.ts +++ b/server/sonar-web/src/main/js/apps/settings/store/actions.ts @@ -18,14 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { Dispatch } from 'redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { parseError } from 'sonar-ui-common/helpers/request'; import { getDefinitions, getValues, resetSettingValue, setSettingValue } from '../../../api/settings'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { parseError } from '../../../sonar-ui-common/helpers/request'; import { closeAllGlobalMessages } from '../../../store/globalMessages'; import { getSettingsAppChangedValue, diff --git a/server/sonar-web/src/main/js/apps/settings/utils.ts b/server/sonar-web/src/main/js/apps/settings/utils.ts index e695e2cfaa3..ab37d79e892 100644 --- a/server/sonar-web/src/main/js/apps/settings/utils.ts +++ b/server/sonar-web/src/main/js/apps/settings/utils.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { hasMessage, translate } from 'sonar-ui-common/helpers/l10n'; +import { hasMessage, translate } from '../../sonar-ui-common/helpers/l10n'; import { Setting, SettingCategoryDefinition, SettingDefinition } from '../../types/settings'; export const DEFAULT_CATEGORY = 'general'; diff --git a/server/sonar-web/src/main/js/apps/system/components/App.tsx b/server/sonar-web/src/main/js/apps/system/components/App.tsx index 87a6d3fd622..7de833ce33d 100644 --- a/server/sonar-web/src/main/js/apps/system/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/App.tsx @@ -20,9 +20,9 @@ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { withRouter, WithRouterProps } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getSystemInfo } from '../../../api/system'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import '../styles.css'; import { getClusterVersion, diff --git a/server/sonar-web/src/main/js/apps/system/components/ChangeLogLevelForm.tsx b/server/sonar-web/src/main/js/apps/system/components/ChangeLogLevelForm.tsx index 47f0c4c4187..ef5d423ffd8 100644 --- a/server/sonar-web/src/main/js/apps/system/components/ChangeLogLevelForm.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/ChangeLogLevelForm.tsx @@ -18,11 +18,14 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { setLogLevel } from '../../../api/system'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { LOGS_LEVELS } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/system/components/ClusterSysInfos.tsx b/server/sonar-web/src/main/js/apps/system/components/ClusterSysInfos.tsx index a965f9bdd3c..858d434b304 100644 --- a/server/sonar-web/src/main/js/apps/system/components/ClusterSysInfos.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/ClusterSysInfos.tsx @@ -19,7 +19,7 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getAppNodes, getClusterMainCardSection, diff --git a/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx b/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx index f4e07eca7de..72ca8e89938 100644 --- a/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/PageActions.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button, EditButton } from 'sonar-ui-common/components/controls/buttons'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; import AdminContext from '../../../app/components/AdminContext'; import RestartButton from '../../../components/common/RestartButton'; +import { Button, EditButton } from '../../../sonar-ui-common/components/controls/buttons'; +import Dropdown from '../../../sonar-ui-common/components/controls/Dropdown'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { getFileNameSuffix } from '../utils'; import ChangeLogLevelForm from './ChangeLogLevelForm'; diff --git a/server/sonar-web/src/main/js/apps/system/components/PageHeader.tsx b/server/sonar-web/src/main/js/apps/system/components/PageHeader.tsx index a81cf274698..61a883e6491 100644 --- a/server/sonar-web/src/main/js/apps/system/components/PageHeader.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/PageHeader.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClipboardButton } from 'sonar-ui-common/components/controls/clipboard'; -import { toShortNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { toShortNotSoISOString } from '../../../sonar-ui-common/helpers/dates'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import PageActions from './PageActions'; export interface Props { diff --git a/server/sonar-web/src/main/js/apps/system/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/system/components/__tests__/App-test.tsx index e4fce6afafd..57f68f7204a 100644 --- a/server/sonar-web/src/main/js/apps/system/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/__tests__/App-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getSystemInfo } from '../../../../api/system'; import { mockClusterSysInfo, @@ -27,6 +26,7 @@ import { mockRouter, mockStandaloneSysInfo } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { App } from '../App'; jest.mock('../../../../api/system', () => ({ diff --git a/server/sonar-web/src/main/js/apps/system/components/__tests__/PageActions-test.tsx b/server/sonar-web/src/main/js/apps/system/components/__tests__/PageActions-test.tsx index 66f438d9d56..35d745f404c 100644 --- a/server/sonar-web/src/main/js/apps/system/components/__tests__/PageActions-test.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/__tests__/PageActions-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import PageActions from '../PageActions'; jest.mock('../../utils', () => ({ diff --git a/server/sonar-web/src/main/js/apps/system/components/__tests__/PageHeader-test.tsx b/server/sonar-web/src/main/js/apps/system/components/__tests__/PageHeader-test.tsx index 76ffbed28c5..7d143597513 100644 --- a/server/sonar-web/src/main/js/apps/system/components/__tests__/PageHeader-test.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/__tests__/PageHeader-test.tsx @@ -21,7 +21,7 @@ import { shallow } from 'enzyme'; import * as React from 'react'; import PageHeader, { Props } from '../PageHeader'; -jest.mock('sonar-ui-common/helpers/dates', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/dates', () => ({ toShortNotSoISOString: () => '2019-01-01' })); diff --git a/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCard.tsx b/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCard.tsx index 46879b1cbb2..c03ad6e1270 100644 --- a/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCard.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCard.tsx @@ -19,9 +19,9 @@ */ import { map } from 'lodash'; import * as React from 'react'; -import BoxedGroupAccordion from 'sonar-ui-common/components/controls/BoxedGroupAccordion'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import BoxedGroupAccordion from '../../../../sonar-ui-common/components/controls/BoxedGroupAccordion'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { getLogsLevel, groupSections, LOGS_LEVELS } from '../../utils'; import HealthItem from './HealthItem'; import Section from './Section'; diff --git a/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCauseItem.tsx b/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCauseItem.tsx index c449b94c99e..f764c9fc0c8 100644 --- a/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCauseItem.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/info-items/HealthCauseItem.tsx @@ -19,7 +19,7 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/apps/system/components/info-items/HealthItem.tsx b/server/sonar-web/src/main/js/apps/system/components/info-items/HealthItem.tsx index e3c3c28740f..4571978f6e4 100644 --- a/server/sonar-web/src/main/js/apps/system/components/info-items/HealthItem.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/info-items/HealthItem.tsx @@ -19,9 +19,9 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import StatusIndicator from '../../../../components/common/StatusIndicator'; +import Tooltip from '../../../../sonar-ui-common/components/controls/Tooltip'; +import { translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import HealthCauseItem from './HealthCauseItem'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/system/components/info-items/SysInfoItem.tsx b/server/sonar-web/src/main/js/apps/system/components/info-items/SysInfoItem.tsx index 126d912c9b5..8a6ab950f38 100644 --- a/server/sonar-web/src/main/js/apps/system/components/info-items/SysInfoItem.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/info-items/SysInfoItem.tsx @@ -19,7 +19,7 @@ */ import { map } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { HEALTH_FIELD, STATE_FIELD } from '../../utils'; import HealthItem from './HealthItem'; diff --git a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeForm.tsx b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeForm.tsx index 832ab678dec..e32b51f73d2 100644 --- a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeForm.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeForm.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { withAppState } from '../../../../components/hoc/withAppState'; +import { ResetButtonLink } from '../../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../../sonar-ui-common/components/controls/Modal'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { EditionKey } from '../../../../types/editions'; import { SystemUpgrade } from '../../../../types/system'; import SystemUpgradeItem from './SystemUpgradeItem'; diff --git a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeIntermediate.tsx b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeIntermediate.tsx index d7cf4cf34ce..4442791ab58 100644 --- a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeIntermediate.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeIntermediate.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../../sonar-ui-common/components/controls/buttons'; +import DropdownIcon from '../../../../sonar-ui-common/components/icons/DropdownIcon'; +import DateFormatter from '../../../../sonar-ui-common/components/intl/DateFormatter'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { SystemUpgrade } from '../../../../types/system'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeItem.tsx b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeItem.tsx index b8d55e570fc..06487ebb3fd 100644 --- a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeItem.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeItem.tsx @@ -19,13 +19,13 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getEdition, getEditionDownloadFilename, getEditionDownloadUrl } from '../../../../helpers/editions'; +import DateFormatter from '../../../../sonar-ui-common/components/intl/DateFormatter'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import { EditionKey } from '../../../../types/editions'; import { SystemUpgrade } from '../../../../types/system'; import SystemUpgradeIntermediate from './SystemUpgradeIntermediate'; diff --git a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeNotif.tsx b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeNotif.tsx index f2b24c7a744..f332bc0a98f 100644 --- a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeNotif.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/SystemUpgradeNotif.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getSystemUpgrades } from '../../../../api/system'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { SystemUpgrade } from '../../../../types/system'; import { groupUpgrades, sortUpgrades } from '../../utils'; import SystemUpgradeForm from './SystemUpgradeForm'; diff --git a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/__tests__/SystemUpgradeIntermediate-test.tsx b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/__tests__/SystemUpgradeIntermediate-test.tsx index ee38a662fe3..1d16b436a19 100644 --- a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/__tests__/SystemUpgradeIntermediate-test.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/__tests__/SystemUpgradeIntermediate-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../../sonar-ui-common/helpers/testUtils'; import SystemUpgradeIntermediate from '../SystemUpgradeIntermediate'; const UPGRADES = [ diff --git a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/__tests__/SystemUpgradeNotif-test.tsx b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/__tests__/SystemUpgradeNotif-test.tsx index e367825379b..181e892cbca 100644 --- a/server/sonar-web/src/main/js/apps/system/components/system-upgrade/__tests__/SystemUpgradeNotif-test.tsx +++ b/server/sonar-web/src/main/js/apps/system/components/system-upgrade/__tests__/SystemUpgradeNotif-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getSystemUpgrades } from '../../../../../api/system'; +import { click, waitAndUpdate } from '../../../../../sonar-ui-common/helpers/testUtils'; import SystemUpgradeNotif from '../SystemUpgradeNotif'; jest.mock('../../../../../api/system', () => ({ diff --git a/server/sonar-web/src/main/js/apps/system/routes.ts b/server/sonar-web/src/main/js/apps/system/routes.ts index 854cd1ef120..f57b5528d59 100644 --- a/server/sonar-web/src/main/js/apps/system/routes.ts +++ b/server/sonar-web/src/main/js/apps/system/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/system/utils.ts b/server/sonar-web/src/main/js/apps/system/utils.ts index 4d57a19396b..7727bfeb690 100644 --- a/server/sonar-web/src/main/js/apps/system/utils.ts +++ b/server/sonar-web/src/main/js/apps/system/utils.ts @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { each, groupBy, memoize, omit, omitBy, pickBy, sortBy } from 'lodash'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import { cleanQuery, parseAsArray, parseAsString, serializeStringArray -} from 'sonar-ui-common/helpers/query'; +} from '../../sonar-ui-common/helpers/query'; import { SystemUpgrade } from '../../types/system'; export interface Query { diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/TutorialsApp.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/TutorialsApp.tsx index 27dc42381ed..91793919adb 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/TutorialsApp.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/TutorialsApp.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; import { withCurrentUser } from '../../../components/hoc/withCurrentUser'; import TutorialSelection from '../../../components/tutorials/TutorialSelection'; import { isLoggedIn } from '../../../helpers/users'; +import handleRequiredAuthentication from '../../../sonar-ui-common/helpers/handleRequiredAuthentication'; import { ProjectAlmBindingResponse } from '../../../types/alm-settings'; export interface TutorialsAppProps { diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/TutorialsApp-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/TutorialsApp-test.tsx index bab74dbd72b..1cb372e0c1c 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/TutorialsApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/TutorialsApp-test.tsx @@ -19,12 +19,14 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; import { mockProjectAzureBindingResponse } from '../../../../helpers/mocks/alm-settings'; import { mockComponent, mockCurrentUser, mockLoggedInUser } from '../../../../helpers/testMocks'; +import handleRequiredAuthentication from '../../../../sonar-ui-common/helpers/handleRequiredAuthentication'; import { TutorialsApp, TutorialsAppProps } from '../TutorialsApp'; -jest.mock('sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ default: jest.fn() })); +jest.mock('../../../../sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ + default: jest.fn() +})); it('should render correctly', () => { expect(shallowRender()).toMatchSnapshot(); diff --git a/server/sonar-web/src/main/js/apps/tutorials/routes.ts b/server/sonar-web/src/main/js/apps/tutorials/routes.ts index 3c043682d37..4cb72f2c83d 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/routes.ts +++ b/server/sonar-web/src/main/js/apps/tutorials/routes.ts @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/users/Header.tsx b/server/sonar-web/src/main/js/apps/users/Header.tsx index 1f7d4ea7bd3..e6ffc857c95 100644 --- a/server/sonar-web/src/main/js/apps/users/Header.tsx +++ b/server/sonar-web/src/main/js/apps/users/Header.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import UserForm from './components/UserForm'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/users/Search.tsx b/server/sonar-web/src/main/js/apps/users/Search.tsx index 420fa7479fb..b374db588b7 100644 --- a/server/sonar-web/src/main/js/apps/users/Search.tsx +++ b/server/sonar-web/src/main/js/apps/users/Search.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import SearchBox from '../../sonar-ui-common/components/controls/SearchBox'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { Query } from './utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/users/UsersApp.tsx b/server/sonar-web/src/main/js/apps/users/UsersApp.tsx index 71634e61d37..e65a54b2026 100644 --- a/server/sonar-web/src/main/js/apps/users/UsersApp.tsx +++ b/server/sonar-web/src/main/js/apps/users/UsersApp.tsx @@ -19,12 +19,12 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getIdentityProviders, searchUsers } from '../../api/users'; import Suggestions from '../../app/components/embed-docs-modal/Suggestions'; import { withCurrentUser } from '../../components/hoc/withCurrentUser'; import { Location, Router, withRouter } from '../../components/hoc/withRouter'; +import ListFooter from '../../sonar-ui-common/components/controls/ListFooter'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import Header from './Header'; import Search from './Search'; import UsersList from './UsersList'; diff --git a/server/sonar-web/src/main/js/apps/users/UsersList.tsx b/server/sonar-web/src/main/js/apps/users/UsersList.tsx index a5ecd790820..ff8667fb031 100644 --- a/server/sonar-web/src/main/js/apps/users/UsersList.tsx +++ b/server/sonar-web/src/main/js/apps/users/UsersList.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import UserListItem from './components/UserListItem'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/users/__tests__/Header-test.tsx b/server/sonar-web/src/main/js/apps/users/__tests__/Header-test.tsx index 35e92d33b17..3e974b597a3 100644 --- a/server/sonar-web/src/main/js/apps/users/__tests__/Header-test.tsx +++ b/server/sonar-web/src/main/js/apps/users/__tests__/Header-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import Header from '../Header'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/users/__tests__/UsersApp-test.tsx b/server/sonar-web/src/main/js/apps/users/__tests__/UsersApp-test.tsx index 92bd26582da..995f39a29bd 100644 --- a/server/sonar-web/src/main/js/apps/users/__tests__/UsersApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/users/__tests__/UsersApp-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { Location } from '../../../components/hoc/withRouter'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { UsersApp } from '../UsersApp'; jest.mock('../../../api/users', () => ({ diff --git a/server/sonar-web/src/main/js/apps/users/components/DeactivateForm.tsx b/server/sonar-web/src/main/js/apps/users/components/DeactivateForm.tsx index c8edf1cce31..db786c14565 100644 --- a/server/sonar-web/src/main/js/apps/users/components/DeactivateForm.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/DeactivateForm.tsx @@ -18,10 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { deactivateUser } from '../../../api/users'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; export interface Props { onClose: () => void; diff --git a/server/sonar-web/src/main/js/apps/users/components/GroupsForm.tsx b/server/sonar-web/src/main/js/apps/users/components/GroupsForm.tsx index f2ec536dd3e..b08e6e2f428 100644 --- a/server/sonar-web/src/main/js/apps/users/components/GroupsForm.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/GroupsForm.tsx @@ -19,14 +19,14 @@ */ import { find, without } from 'lodash'; import * as React from 'react'; -import Modal from 'sonar-ui-common/components/controls/Modal'; +import { getUserGroups, UserGroup } from '../../../api/users'; +import { addUserToGroup, removeUserFromGroup } from '../../../api/user_groups'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; import SelectList, { SelectListFilter, SelectListSearchParams -} from 'sonar-ui-common/components/controls/SelectList'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getUserGroups, UserGroup } from '../../../api/users'; -import { addUserToGroup, removeUserFromGroup } from '../../../api/user_groups'; +} from '../../../sonar-ui-common/components/controls/SelectList'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onClose: () => void; diff --git a/server/sonar-web/src/main/js/apps/users/components/PasswordForm.tsx b/server/sonar-web/src/main/js/apps/users/components/PasswordForm.tsx index 13aa843062e..5dc1e6baf93 100644 --- a/server/sonar-web/src/main/js/apps/users/components/PasswordForm.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/PasswordForm.tsx @@ -18,16 +18,19 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { parseError } from 'sonar-ui-common/helpers/request'; import { changePassword } from '../../../api/users'; import addGlobalSuccessMessage from '../../../app/utils/addGlobalSuccessMessage'; import throwGlobalError from '../../../app/utils/throwGlobalError'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { parseError } from '../../../sonar-ui-common/helpers/request'; interface Props { isCurrentUser: boolean; diff --git a/server/sonar-web/src/main/js/apps/users/components/TokensForm.tsx b/server/sonar-web/src/main/js/apps/users/components/TokensForm.tsx index 6846aa959a1..a1e31da9165 100644 --- a/server/sonar-web/src/main/js/apps/users/components/TokensForm.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/TokensForm.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { generateToken, getTokens } from '../../../api/user-tokens'; +import { SubmitButton } from '../../../sonar-ui-common/components/controls/buttons'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import TokensFormItem, { TokenDeleteConfirmation } from './TokensFormItem'; import TokensFormNewToken from './TokensFormNewToken'; diff --git a/server/sonar-web/src/main/js/apps/users/components/TokensFormItem.tsx b/server/sonar-web/src/main/js/apps/users/components/TokensFormItem.tsx index 212c0687f7a..075aa88ffee 100644 --- a/server/sonar-web/src/main/js/apps/users/components/TokensFormItem.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/TokensFormItem.tsx @@ -19,15 +19,15 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { limitComponentName } from 'sonar-ui-common/helpers/path'; import { revokeToken } from '../../../api/user-tokens'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../../sonar-ui-common/components/controls/ConfirmButton'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import DateFormatter from '../../../sonar-ui-common/components/intl/DateFormatter'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { limitComponentName } from '../../../sonar-ui-common/helpers/path'; export type TokenDeleteConfirmation = 'inline' | 'modal'; diff --git a/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx b/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx index e03e32e7c23..cde0666a09d 100644 --- a/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/TokensFormModal.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import TokensForm from './TokensForm'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/users/components/TokensFormNewToken.tsx b/server/sonar-web/src/main/js/apps/users/components/TokensFormNewToken.tsx index 359ada995f2..09d8ce01824 100644 --- a/server/sonar-web/src/main/js/apps/users/components/TokensFormNewToken.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/TokensFormNewToken.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClipboardButton } from 'sonar-ui-common/components/controls/clipboard'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { token: { name: string; token: string }; diff --git a/server/sonar-web/src/main/js/apps/users/components/UserActions.tsx b/server/sonar-web/src/main/js/apps/users/components/UserActions.tsx index cc05744d217..1a196e3a561 100644 --- a/server/sonar-web/src/main/js/apps/users/components/UserActions.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/UserActions.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; +import { isUserActive } from '../../../helpers/users'; import ActionsDropdown, { ActionsDropdownDivider, ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { isUserActive } from '../../../helpers/users'; +} from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import DeactivateForm from './DeactivateForm'; import PasswordForm from './PasswordForm'; import UserForm from './UserForm'; diff --git a/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx b/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx index 6ab6b9e2c4f..a3a1e7a36f3 100644 --- a/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/UserForm.tsx @@ -19,15 +19,19 @@ */ import { uniq } from 'lodash'; import * as React from 'react'; -import { Button, ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { parseError } from 'sonar-ui-common/helpers/request'; import { createUser, updateUser } from '../../../api/users'; import throwGlobalError from '../../../app/utils/throwGlobalError'; +import { + Button, + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { parseError } from '../../../sonar-ui-common/helpers/request'; import UserScmAccountInput from './UserScmAccountInput'; export interface Props { diff --git a/server/sonar-web/src/main/js/apps/users/components/UserGroups.tsx b/server/sonar-web/src/main/js/apps/users/components/UserGroups.tsx index c307564364c..8aab5c250f5 100644 --- a/server/sonar-web/src/main/js/apps/users/components/UserGroups.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/UserGroups.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import BulletListIcon from 'sonar-ui-common/components/icons/BulletListIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { ButtonIcon } from '../../../sonar-ui-common/components/controls/buttons'; +import BulletListIcon from '../../../sonar-ui-common/components/icons/BulletListIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import GroupsForm from './GroupsForm'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx b/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx index 3a69ca597fb..0d32ce150fd 100644 --- a/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/UserListItem.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import BulletListIcon from 'sonar-ui-common/components/icons/BulletListIcon'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import Avatar from '../../../components/ui/Avatar'; +import { ButtonIcon } from '../../../sonar-ui-common/components/controls/buttons'; +import BulletListIcon from '../../../sonar-ui-common/components/icons/BulletListIcon'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import TokensFormModal from './TokensFormModal'; import UserActions from './UserActions'; import UserGroups from './UserGroups'; diff --git a/server/sonar-web/src/main/js/apps/users/components/UserListItemIdentity.tsx b/server/sonar-web/src/main/js/apps/users/components/UserListItemIdentity.tsx index 76535abcffd..e34a18f37e5 100644 --- a/server/sonar-web/src/main/js/apps/users/components/UserListItemIdentity.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/UserListItemIdentity.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { getTextColor } from 'sonar-ui-common/helpers/colors'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; import { colors } from '../../../app/theme'; +import { getTextColor } from '../../../sonar-ui-common/helpers/colors'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; export interface Props { identityProvider?: T.IdentityProvider; diff --git a/server/sonar-web/src/main/js/apps/users/components/UserScmAccountInput.tsx b/server/sonar-web/src/main/js/apps/users/components/UserScmAccountInput.tsx index 76f12ee9454..7d4dff74860 100644 --- a/server/sonar-web/src/main/js/apps/users/components/UserScmAccountInput.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/UserScmAccountInput.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DeleteButton } from 'sonar-ui-common/components/controls/buttons'; +import { DeleteButton } from '../../../sonar-ui-common/components/controls/buttons'; export interface Props { idx: number; diff --git a/server/sonar-web/src/main/js/apps/users/components/UserScmAccounts.tsx b/server/sonar-web/src/main/js/apps/users/components/UserScmAccounts.tsx index c0c142e12ae..16a5a956a47 100644 --- a/server/sonar-web/src/main/js/apps/users/components/UserScmAccounts.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/UserScmAccounts.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { scmAccounts: string[]; diff --git a/server/sonar-web/src/main/js/apps/users/components/UsersSelectSearch.tsx b/server/sonar-web/src/main/js/apps/users/components/UsersSelectSearch.tsx index 28ecc3846de..6a1abba5d25 100644 --- a/server/sonar-web/src/main/js/apps/users/components/UsersSelectSearch.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/UsersSelectSearch.tsx @@ -19,9 +19,9 @@ */ import { debounce } from 'lodash'; import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import Avatar from '../../../components/ui/Avatar'; +import Select from '../../../sonar-ui-common/components/controls/Select'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Option { login: string; diff --git a/server/sonar-web/src/main/js/apps/users/components/__tests__/GroupsForm-test.tsx b/server/sonar-web/src/main/js/apps/users/components/__tests__/GroupsForm-test.tsx index 3ef5c3dfa27..c145a9d395d 100644 --- a/server/sonar-web/src/main/js/apps/users/components/__tests__/GroupsForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/__tests__/GroupsForm-test.tsx @@ -19,11 +19,13 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import SelectList, { SelectListFilter } from 'sonar-ui-common/components/controls/SelectList'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getUserGroups } from '../../../../api/users'; import { addUserToGroup, removeUserFromGroup } from '../../../../api/user_groups'; import { mockUser } from '../../../../helpers/testMocks'; +import SelectList, { + SelectListFilter +} from '../../../../sonar-ui-common/components/controls/SelectList'; +import { click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import GroupsForm from '../GroupsForm'; const user = mockUser(); diff --git a/server/sonar-web/src/main/js/apps/users/components/__tests__/TokensForm-test.tsx b/server/sonar-web/src/main/js/apps/users/components/__tests__/TokensForm-test.tsx index e0f5a5fadb8..d31169e00dc 100644 --- a/server/sonar-web/src/main/js/apps/users/components/__tests__/TokensForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/__tests__/TokensForm-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { generateToken, getTokens } from '../../../../api/user-tokens'; +import { change, submit, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import TokensForm from '../TokensForm'; jest.mock('../../../../api/user-tokens', () => ({ diff --git a/server/sonar-web/src/main/js/apps/users/components/__tests__/TokensFormItem-test.tsx b/server/sonar-web/src/main/js/apps/users/components/__tests__/TokensFormItem-test.tsx index f1b4e717f7d..8a28525f059 100644 --- a/server/sonar-web/src/main/js/apps/users/components/__tests__/TokensFormItem-test.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/__tests__/TokensFormItem-test.tsx @@ -19,13 +19,13 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { revokeToken } from '../../../../api/user-tokens'; +import { click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import TokensFormItem from '../TokensFormItem'; -jest.mock('sonar-ui-common/components/intl/DateFormatter'); -jest.mock('sonar-ui-common/components/intl/DateFromNow'); -jest.mock('sonar-ui-common/components/intl/DateTimeFormatter'); +jest.mock('../../../../sonar-ui-common/components/intl/DateFormatter'); +jest.mock('../../../../sonar-ui-common/components/intl/DateFromNow'); +jest.mock('../../../../sonar-ui-common/components/intl/DateTimeFormatter'); jest.mock('../../../../api/user-tokens', () => ({ revokeToken: jest.fn().mockResolvedValue(undefined) diff --git a/server/sonar-web/src/main/js/apps/users/components/__tests__/UserActions-test.tsx b/server/sonar-web/src/main/js/apps/users/components/__tests__/UserActions-test.tsx index 414a7b05058..cf86b50d6d8 100644 --- a/server/sonar-web/src/main/js/apps/users/components/__tests__/UserActions-test.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/__tests__/UserActions-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import UserActions from '../UserActions'; const user = { diff --git a/server/sonar-web/src/main/js/apps/users/components/__tests__/UserForm-test.tsx b/server/sonar-web/src/main/js/apps/users/components/__tests__/UserForm-test.tsx index c8e8edef8fa..99b0d2b5e5a 100644 --- a/server/sonar-web/src/main/js/apps/users/components/__tests__/UserForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/__tests__/UserForm-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { createUser, updateUser } from '../../../../api/users'; import { mockUser } from '../../../../helpers/testMocks'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { submit, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import UserForm from '../UserForm'; jest.mock('../../../../api/users', () => ({ diff --git a/server/sonar-web/src/main/js/apps/users/components/__tests__/UserGroups-test.tsx b/server/sonar-web/src/main/js/apps/users/components/__tests__/UserGroups-test.tsx index 3020bc4c780..c5f995d4555 100644 --- a/server/sonar-web/src/main/js/apps/users/components/__tests__/UserGroups-test.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/__tests__/UserGroups-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import UserGroups from '../UserGroups'; const user = { diff --git a/server/sonar-web/src/main/js/apps/users/components/__tests__/UserListItem-test.tsx b/server/sonar-web/src/main/js/apps/users/components/__tests__/UserListItem-test.tsx index d5fb31f0e6d..c5f5af71c78 100644 --- a/server/sonar-web/src/main/js/apps/users/components/__tests__/UserListItem-test.tsx +++ b/server/sonar-web/src/main/js/apps/users/components/__tests__/UserListItem-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import UserListItem from '../UserListItem'; -jest.mock('sonar-ui-common/components/intl/DateFromNow'); -jest.mock('sonar-ui-common/components/intl/DateTimeFormatter'); +jest.mock('../../../../sonar-ui-common/components/intl/DateFromNow'); +jest.mock('../../../../sonar-ui-common/components/intl/DateTimeFormatter'); const user: T.User = { active: true, diff --git a/server/sonar-web/src/main/js/apps/users/routes.ts b/server/sonar-web/src/main/js/apps/users/routes.ts index 2b9596e6df8..71f305b65fb 100644 --- a/server/sonar-web/src/main/js/apps/users/routes.ts +++ b/server/sonar-web/src/main/js/apps/users/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/users/utils.ts b/server/sonar-web/src/main/js/apps/users/utils.ts index 8426d9336e5..870809f002b 100644 --- a/server/sonar-web/src/main/js/apps/users/utils.ts +++ b/server/sonar-web/src/main/js/apps/users/utils.ts @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { memoize } from 'lodash'; -import { cleanQuery, parseAsString, serializeString } from 'sonar-ui-common/helpers/query'; +import { cleanQuery, parseAsString, serializeString } from '../../sonar-ui-common/helpers/query'; export interface Query { search: string; diff --git a/server/sonar-web/src/main/js/apps/web-api/components/Action.tsx b/server/sonar-web/src/main/js/apps/web-api/components/Action.tsx index 4a18d5150df..96565880849 100644 --- a/server/sonar-web/src/main/js/apps/web-api/components/Action.tsx +++ b/server/sonar-web/src/main/js/apps/web-api/components/Action.tsx @@ -20,8 +20,8 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { Link } from 'react-router'; -import LinkIcon from 'sonar-ui-common/components/icons/LinkIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import LinkIcon from '../../../sonar-ui-common/components/icons/LinkIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { getActionKey, serializeQuery } from '../utils'; import ActionChangelog from './ActionChangelog'; import DeprecatedBadge from './DeprecatedBadge'; diff --git a/server/sonar-web/src/main/js/apps/web-api/components/DeprecatedBadge.tsx b/server/sonar-web/src/main/js/apps/web-api/components/DeprecatedBadge.tsx index 20285dbd415..cfe9f1d302a 100644 --- a/server/sonar-web/src/main/js/apps/web-api/components/DeprecatedBadge.tsx +++ b/server/sonar-web/src/main/js/apps/web-api/components/DeprecatedBadge.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { parseVersion } from '../utils'; export default function DeprecatedBadge({ since }: { since?: string }) { diff --git a/server/sonar-web/src/main/js/apps/web-api/components/InternalBadge.tsx b/server/sonar-web/src/main/js/apps/web-api/components/InternalBadge.tsx index 33de9dc3d48..87a62da168a 100644 --- a/server/sonar-web/src/main/js/apps/web-api/components/InternalBadge.tsx +++ b/server/sonar-web/src/main/js/apps/web-api/components/InternalBadge.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function InternalBadge() { return ( diff --git a/server/sonar-web/src/main/js/apps/web-api/components/Params.tsx b/server/sonar-web/src/main/js/apps/web-api/components/Params.tsx index 1ddb6ee28ed..a71d897572c 100644 --- a/server/sonar-web/src/main/js/apps/web-api/components/Params.tsx +++ b/server/sonar-web/src/main/js/apps/web-api/components/Params.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import DeprecatedBadge from './DeprecatedBadge'; import InternalBadge from './InternalBadge'; diff --git a/server/sonar-web/src/main/js/apps/web-api/components/Search.tsx b/server/sonar-web/src/main/js/apps/web-api/components/Search.tsx index 2d5b3db896c..730b178656b 100644 --- a/server/sonar-web/src/main/js/apps/web-api/components/Search.tsx +++ b/server/sonar-web/src/main/js/apps/web-api/components/Search.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Checkbox from '../../../sonar-ui-common/components/controls/Checkbox'; +import HelpTooltip from '../../../sonar-ui-common/components/controls/HelpTooltip'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { Query } from '../utils'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx b/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx index 9c2f3035cdd..3d1fb81400c 100644 --- a/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx +++ b/server/sonar-web/src/main/js/apps/web-api/components/WebApiApp.tsx @@ -21,13 +21,13 @@ import { maxBy } from 'lodash'; import * as React from 'react'; import { Helmet } from 'react-helmet-async'; import { Link, withRouter, WithRouterProps } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { addSideBarClass, removeSideBarClass } from 'sonar-ui-common/helpers/pages'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { fetchWebApi } from '../../../api/web-api'; import A11ySkipTarget from '../../../app/components/a11y/A11ySkipTarget'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; import ScreenPositionHelper from '../../../components/common/ScreenPositionHelper'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { addSideBarClass, removeSideBarClass } from '../../../sonar-ui-common/helpers/pages'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import '../styles/web-api.css'; import { getActionKey, diff --git a/server/sonar-web/src/main/js/apps/web-api/components/__tests__/WebApiApp-test.tsx b/server/sonar-web/src/main/js/apps/web-api/components/__tests__/WebApiApp-test.tsx index 6d906597b9e..92cd3153b23 100644 --- a/server/sonar-web/src/main/js/apps/web-api/components/__tests__/WebApiApp-test.tsx +++ b/server/sonar-web/src/main/js/apps/web-api/components/__tests__/WebApiApp-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { addSideBarClass, removeSideBarClass } from 'sonar-ui-common/helpers/pages'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { fetchWebApi } from '../../../../api/web-api'; import { mockLocation, mockRouter } from '../../../../helpers/testMocks'; +import { addSideBarClass, removeSideBarClass } from '../../../../sonar-ui-common/helpers/pages'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { WebApiApp } from '../WebApiApp'; jest.mock('../../../../components/common/ScreenPositionHelper'); @@ -39,7 +39,7 @@ jest.mock('../../../../api/web-api', () => ({ ]) })); -jest.mock('sonar-ui-common/helpers/pages', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/pages', () => ({ addSideBarClass: jest.fn(), removeSideBarClass: jest.fn() })); diff --git a/server/sonar-web/src/main/js/apps/web-api/routes.ts b/server/sonar-web/src/main/js/apps/web-api/routes.ts index 26b6739f509..de4eedbd65a 100644 --- a/server/sonar-web/src/main/js/apps/web-api/routes.ts +++ b/server/sonar-web/src/main/js/apps/web-api/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/apps/web-api/utils.ts b/server/sonar-web/src/main/js/apps/web-api/utils.ts index 7da0dbfcca3..cbd54a2a37c 100644 --- a/server/sonar-web/src/main/js/apps/web-api/utils.ts +++ b/server/sonar-web/src/main/js/apps/web-api/utils.ts @@ -23,7 +23,7 @@ import { parseAsOptionalBoolean, parseAsString, serializeString -} from 'sonar-ui-common/helpers/query'; +} from '../../sonar-ui-common/helpers/query'; export interface Query { search: string; diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/App.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/App.tsx index 2b9eecc679e..164e6afb170 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/App.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/App.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Helmet } from 'react-helmet-async'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { createWebhook, deleteWebhook, searchWebhooks, updateWebhook } from '../../../api/webhooks'; import Suggestions from '../../../app/components/embed-docs-modal/Suggestions'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import PageActions from './PageActions'; import PageHeader from './PageHeader'; import WebhooksList from './WebhooksList'; diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/CreateWebhookForm.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/CreateWebhookForm.tsx index 8aa607080c8..89679a7515d 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/CreateWebhookForm.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/CreateWebhookForm.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import InputValidationField from 'sonar-ui-common/components/controls/InputValidationField'; -import ValidationModal from 'sonar-ui-common/components/controls/ValidationModal'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { isWebUri } from 'valid-url'; +import InputValidationField from '../../../sonar-ui-common/components/controls/InputValidationField'; +import ValidationModal from '../../../sonar-ui-common/components/controls/ValidationModal'; +import MandatoryFieldMarker from '../../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onClose: () => void; diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/DeleteWebhookForm.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/DeleteWebhookForm.tsx index 58cd9e02f31..10f6d69985e 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/DeleteWebhookForm.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/DeleteWebhookForm.tsx @@ -18,10 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { + ResetButtonLink, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onClose: () => void; diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/DeliveriesForm.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/DeliveriesForm.tsx index e7daab63280..fb5ac01d617 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/DeliveriesForm.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/DeliveriesForm.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { searchDeliveries } from '../../../api/webhooks'; +import { ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import ListFooter from '../../../sonar-ui-common/components/controls/ListFooter'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import DeliveryAccordion from './DeliveryAccordion'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/DeliveryAccordion.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/DeliveryAccordion.tsx index 85005877c70..b4fab1f2dda 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/DeliveryAccordion.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/DeliveryAccordion.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BoxedGroupAccordion from 'sonar-ui-common/components/controls/BoxedGroupAccordion'; -import AlertErrorIcon from 'sonar-ui-common/components/icons/AlertErrorIcon'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; import { getDelivery } from '../../../api/webhooks'; +import BoxedGroupAccordion from '../../../sonar-ui-common/components/controls/BoxedGroupAccordion'; +import AlertErrorIcon from '../../../sonar-ui-common/components/icons/AlertErrorIcon'; +import AlertSuccessIcon from '../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import DateTimeFormatter from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; import DeliveryItem from './DeliveryItem'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/DeliveryItem.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/DeliveryItem.tsx index 016b9459193..5dd449cc09e 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/DeliveryItem.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/DeliveryItem.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import CodeSnippet from '../../../components/common/CodeSnippet'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/LatestDeliveryForm.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/LatestDeliveryForm.tsx index 25d2e445d08..b12491e5675 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/LatestDeliveryForm.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/LatestDeliveryForm.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getDelivery } from '../../../api/webhooks'; +import { ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import DeliveryItem from './DeliveryItem'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/PageActions.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/PageActions.tsx index 5593cf3a326..dfe3683c5c7 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/PageActions.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/PageActions.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import CreateWebhookForm from './CreateWebhookForm'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/PageHeader.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/PageHeader.tsx index 7e8edb76681..206bba574b8 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/PageHeader.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/PageHeader.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { children?: React.ReactNode; diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/WebhookActions.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/WebhookActions.tsx index b0f049a421b..78a4c71408a 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/WebhookActions.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/WebhookActions.tsx @@ -21,8 +21,8 @@ import * as React from 'react'; import ActionsDropdown, { ActionsDropdownDivider, ActionsDropdownItem -} from 'sonar-ui-common/components/controls/ActionsDropdown'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +} from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import CreateWebhookForm from './CreateWebhookForm'; import DeleteWebhookForm from './DeleteWebhookForm'; import DeliveriesForm from './DeliveriesForm'; diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/WebhookItem.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/WebhookItem.tsx index 1c772225ce8..20012c7ab37 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/WebhookItem.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/WebhookItem.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import WebhookActions from './WebhookActions'; import WebhookItemLatestDelivery from './WebhookItemLatestDelivery'; diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/WebhookItemLatestDelivery.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/WebhookItemLatestDelivery.tsx index ec171b4b501..21c70df97ab 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/WebhookItemLatestDelivery.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/WebhookItemLatestDelivery.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import AlertErrorIcon from 'sonar-ui-common/components/icons/AlertErrorIcon'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import BulletListIcon from 'sonar-ui-common/components/icons/BulletListIcon'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonIcon } from '../../../sonar-ui-common/components/controls/buttons'; +import AlertErrorIcon from '../../../sonar-ui-common/components/icons/AlertErrorIcon'; +import AlertSuccessIcon from '../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import BulletListIcon from '../../../sonar-ui-common/components/icons/BulletListIcon'; +import DateTimeFormatter from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import LatestDeliveryForm from './LatestDeliveryForm'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/WebhooksList.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/WebhooksList.tsx index b99a8388880..9c22e4d4d8a 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/WebhooksList.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/WebhooksList.tsx @@ -19,7 +19,7 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import WebhookItem from './WebhookItem'; interface Props { diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/PageActions-test.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/PageActions-test.tsx index bb3aec9afb7..152768c5682 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/PageActions-test.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/PageActions-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import PageActions from '../PageActions'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/WebhookActions-test.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/WebhookActions-test.tsx index 75a6991cd53..ed0f960e078 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/WebhookActions-test.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/WebhookActions-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import WebhookActions from '../WebhookActions'; const webhook = { diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/WebhookItemLatestDelivery-test.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/WebhookItemLatestDelivery-test.tsx index 87299e175d1..6684c49377e 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/WebhookItemLatestDelivery-test.tsx +++ b/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/WebhookItemLatestDelivery-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import WebhookItemLatestDelivery from '../WebhookItemLatestDelivery'; const latestDelivery = { diff --git a/server/sonar-web/src/main/js/apps/webhooks/routes.ts b/server/sonar-web/src/main/js/apps/webhooks/routes.ts index 854cd1ef120..f57b5528d59 100644 --- a/server/sonar-web/src/main/js/apps/webhooks/routes.ts +++ b/server/sonar-web/src/main/js/apps/webhooks/routes.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const routes = [ { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewer.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewer.tsx index 56fb594c4fd..f08f456c69d 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewer.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewer.tsx @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const SourceViewer = lazyLoadComponent( () => import(/* webpackPrefetch: true */ './SourceViewerBase'), diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.tsx index 352d2bac7ce..51a2089cfa0 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerBase.tsx @@ -19,8 +19,6 @@ */ import { intersection, uniqBy } from 'lodash'; import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getComponentData, getComponentForSourceViewer, @@ -28,6 +26,8 @@ import { getSources } from '../../api/components'; import { getBranchLikeQuery, isSameBranchLike } from '../../helpers/branch-like'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../types/branch-like'; import { WorkspaceContext } from '../workspace/context'; import DuplicationPopup from './components/DuplicationPopup'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.tsx index 8aa0c34a5d4..c95af38d52e 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerCode.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../types/branch-like'; import { MetricKey } from '../../types/metrics'; import Line from './components/Line'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx index 6e5e2f3f21d..089f44cf40c 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeader.tsx @@ -20,21 +20,21 @@ import { stringify } from 'querystring'; import * as React from 'react'; import { Link } from 'react-router'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import ListIcon from 'sonar-ui-common/components/icons/ListIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { collapsedDirFromPath, fileFromPath } from 'sonar-ui-common/helpers/path'; -import { omitNil } from 'sonar-ui-common/helpers/request'; -import { getBaseUrl, getPathUrlAsString } from 'sonar-ui-common/helpers/urls'; import { getBranchLikeQuery } from '../../helpers/branch-like'; import { ISSUE_TYPES } from '../../helpers/constants'; import { ISSUETYPE_METRIC_KEYS_MAP } from '../../helpers/issues'; import { getBranchLikeUrl, getCodeUrl, getComponentIssuesUrl } from '../../helpers/urls'; +import { ButtonIcon } from '../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../sonar-ui-common/components/controls/clipboard'; +import Dropdown from '../../sonar-ui-common/components/controls/Dropdown'; +import ListIcon from '../../sonar-ui-common/components/icons/ListIcon'; +import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon'; +import { PopupPlacement } from '../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; +import { collapsedDirFromPath, fileFromPath } from '../../sonar-ui-common/helpers/path'; +import { omitNil } from '../../sonar-ui-common/helpers/request'; +import { getBaseUrl, getPathUrlAsString } from '../../sonar-ui-common/helpers/urls'; import { BranchLike } from '../../types/branch-like'; import { ComponentQualifier } from '../../types/component'; import { WorkspaceContextShape } from '../workspace/context'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeaderSlim.tsx b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeaderSlim.tsx index 1adc0fb8d5c..6a160338172 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeaderSlim.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/SourceViewerHeaderSlim.tsx @@ -20,16 +20,16 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { Link } from 'react-router'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import ExpandSnippetIcon from 'sonar-ui-common/components/icons/ExpandSnippetIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { collapsedDirFromPath, fileFromPath } from 'sonar-ui-common/helpers/path'; -import { getPathUrlAsString } from 'sonar-ui-common/helpers/urls'; import { getBranchLikeQuery } from '../../helpers/branch-like'; import { getBranchLikeUrl, getComponentIssuesUrl } from '../../helpers/urls'; +import { ButtonIcon } from '../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../sonar-ui-common/components/controls/clipboard'; +import ExpandSnippetIcon from '../../sonar-ui-common/components/icons/ExpandSnippetIcon'; +import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { collapsedDirFromPath, fileFromPath } from '../../sonar-ui-common/helpers/path'; +import { getPathUrlAsString } from '../../sonar-ui-common/helpers/urls'; import { BranchLike } from '../../types/branch-like'; import { ComponentQualifier } from '../../types/component'; import './SourceViewerHeaderSlim.css'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewerBase-test.tsx b/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewerBase-test.tsx index eea4cbd8247..7f9ac1d28a1 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewerBase-test.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/__tests__/SourceViewerBase-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getComponentData, getComponentForSourceViewer, getSources } from '../../../api/components'; import { mockMainBranch } from '../../../helpers/mocks/branch-like'; import { mockIssue, mockSourceLine, mockSourceViewerFile } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import defaultLoadIssues from '../helpers/loadIssues'; import SourceViewerBase from '../SourceViewerBase'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/DuplicationPopup.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/DuplicationPopup.tsx index 362f781ef64..5f64b732f39 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/DuplicationPopup.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/DuplicationPopup.tsx @@ -20,12 +20,12 @@ import { groupBy, sortBy } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { collapsedDirFromPath, fileFromPath } from 'sonar-ui-common/helpers/path'; import { isPullRequest } from '../../../helpers/branch-like'; import { getProjectUrl } from '../../../helpers/urls'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { collapsedDirFromPath, fileFromPath } from '../../../sonar-ui-common/helpers/path'; import { BranchLike } from '../../../types/branch-like'; import { WorkspaceContextShape } from '../../workspace/context'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.tsx index b69c4347c16..5ca08ba5d0a 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineCoverage.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; export interface LineCoverageProps { line: T.SourceLine; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.tsx index 3d3cc14552f..74d9e33f258 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineDuplicationBlock.tsx @@ -19,11 +19,11 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface LineDuplicationBlockProps { blocksLoaded: boolean; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.tsx index a621ccbdae9..2397856404c 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineIssuesIndicator.tsx @@ -20,10 +20,10 @@ import * as classNames from 'classnames'; import { uniq } from 'lodash'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import IssueIcon from 'sonar-ui-common/components/icons/IssueIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { sortByType } from '../../../helpers/issues'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import IssueIcon from '../../../sonar-ui-common/components/icons/IssueIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; export interface LineIssuesIndicatorProps { issues: T.Issue[]; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineNumber.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineNumber.tsx index 48e63fe419d..8015ab5d8cc 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineNumber.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineNumber.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import { translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import LineOptionsPopup from './LineOptionsPopup'; export interface LineNumberProps { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineOptionsPopup.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineOptionsPopup.tsx index 24ee901a7ea..57a43002b9c 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineOptionsPopup.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineOptionsPopup.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ActionsDropdownItem } from 'sonar-ui-common/components/controls/ActionsDropdown'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getPathUrlAsString } from 'sonar-ui-common/helpers/urls'; import { getCodeUrl } from '../../../helpers/urls'; +import { ActionsDropdownItem } from '../../../sonar-ui-common/components/controls/ActionsDropdown'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getPathUrlAsString } from '../../../sonar-ui-common/helpers/urls'; import { SourceViewerContext } from '../SourceViewerContext'; export interface LineOptionsPopupProps { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.tsx index 0efc34fef62..e50618cad7f 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/LineSCM.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import Dropdown from '../../../sonar-ui-common/components/controls/Dropdown'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import SCMPopup from './SCMPopup'; export interface LineSCMProps { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlay.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlay.tsx index 54f72e11fe1..f403e9ab6d6 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlay.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlay.tsx @@ -20,14 +20,6 @@ import { groupBy, keyBy, sortBy } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import { ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import TagsIcon from 'sonar-ui-common/components/icons/TagsIcon'; -import DuplicationsRating from 'sonar-ui-common/components/ui/DuplicationsRating'; -import { getLocalizedMetricName, translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getFacets } from '../../../api/issues'; import { getMeasures } from '../../../api/measures'; import { getAllMetrics } from '../../../api/metrics'; @@ -35,6 +27,14 @@ import { getBranchLikeQuery } from '../../../helpers/branch-like'; import { ISSUE_TYPES, SEVERITIES } from '../../../helpers/constants'; import { enhanceMeasuresWithMetrics, getDisplayMetrics } from '../../../helpers/measures'; import { getBranchLikeUrl } from '../../../helpers/urls'; +import { ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../../sonar-ui-common/components/controls/Modal'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import TagsIcon from '../../../sonar-ui-common/components/icons/TagsIcon'; +import DuplicationsRating from '../../../sonar-ui-common/components/ui/DuplicationsRating'; +import { getLocalizedMetricName, translate } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { BranchLike } from '../../../types/branch-like'; import Measure from '../../measure/Measure'; import SeverityHelper from '../../shared/SeverityHelper'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlayMeasure.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlayMeasure.tsx index 034eec8e02e..394b748d5e8 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlayMeasure.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/MeasuresOverlayMeasure.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { getLocalizedMetricName } from 'sonar-ui-common/helpers/l10n'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { getLocalizedMetricName } from '../../../sonar-ui-common/helpers/l10n'; import { isMetricKey, MetricKey } from '../../../types/metrics'; import Measure from '../../measure/Measure'; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/SCMPopup.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/SCMPopup.tsx index 9571538b1b8..cd324ab1263 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/SCMPopup.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/SCMPopup.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import DateFormatter from 'sonar-ui-common/components/intl/DateFormatter'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import DateFormatter from '../../../sonar-ui-common/components/intl/DateFormatter'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface SCMPopupProps { line: T.SourceLine; diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineDuplicationBlock-test.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineDuplicationBlock-test.tsx index f852404b844..a0d47ae847e 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineDuplicationBlock-test.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineDuplicationBlock-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import Toggler from '../../../../sonar-ui-common/components/controls/Toggler'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { LineDuplicationBlock, LineDuplicationBlockProps } from '../LineDuplicationBlock'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineIssuesIndicator-test.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineIssuesIndicator-test.tsx index d7a65492471..abba13b5906 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineIssuesIndicator-test.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/LineIssuesIndicator-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockIssue } from '../../../../helpers/testMocks'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { LineIssuesIndicator, LineIssuesIndicatorProps } from '../LineIssuesIndicator'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/MeasuresOverlay-test.tsx b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/MeasuresOverlay-test.tsx index 07f4fb615d7..1af17b98b44 100644 --- a/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/MeasuresOverlay-test.tsx +++ b/server/sonar-web/src/main/js/components/SourceViewer/components/__tests__/MeasuresOverlay-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockBranch } from '../../../../helpers/mocks/branch-like'; +import { click, waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { MetricKey } from '../../../../types/metrics'; import MeasuresOverlay from '../MeasuresOverlay'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetric.tsx b/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetric.tsx index bb3a1bf5511..a0295be6d31 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetric.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetric.tsx @@ -19,11 +19,11 @@ */ import { find, sortBy } from 'lodash'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { getLocalizedMetricName, translate } from 'sonar-ui-common/helpers/l10n'; import { isDiffMetric } from '../../helpers/measures'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import Dropdown from '../../sonar-ui-common/components/controls/Dropdown'; +import DropdownIcon from '../../sonar-ui-common/components/icons/DropdownIcon'; +import { getLocalizedMetricName, translate } from '../../sonar-ui-common/helpers/l10n'; import AddGraphMetricPopup from './AddGraphMetricPopup'; interface Props { diff --git a/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetricPopup.tsx b/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetricPopup.tsx index efb16123ecd..45098fa56a9 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetricPopup.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/AddGraphMetricPopup.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import MultiSelect from '../common/MultiSelect'; export interface AddGraphMetricPopupProps { diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphHistory.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphHistory.tsx index 0564585ddf1..8e872d882ae 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphHistory.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphHistory.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { AutoSizer } from 'react-virtualized/dist/commonjs/AutoSizer'; -import AdvancedTimeline from 'sonar-ui-common/components/charts/AdvancedTimeline'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getShortType } from '../../helpers/measures'; +import AdvancedTimeline from '../../sonar-ui-common/components/charts/AdvancedTimeline'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import { MeasureHistory, Serie } from '../../types/project-activity'; import GraphsLegendCustom from './GraphsLegendCustom'; import GraphsLegendStatic from './GraphsLegendStatic'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx index 637dc0ae43c..74879dc3999 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsHeader.tsx @@ -19,8 +19,8 @@ */ import classNames from 'classnames'; import * as React from 'react'; -import Select from 'sonar-ui-common/components/controls/Select'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Select from '../../sonar-ui-common/components/controls/Select'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { GraphType } from '../../types/project-activity'; import AddGraphMetric from './AddGraphMetric'; import './styles.css'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsHistory.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsHistory.tsx index 36257772f7f..b82f6f2406b 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsHistory.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsHistory.tsx @@ -19,9 +19,9 @@ */ import { isEqual } from 'lodash'; import * as React from 'react'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../sonar-ui-common/helpers/urls'; import { GraphType, MeasureHistory, Serie } from '../../types/project-activity'; import GraphHistory from './GraphHistory'; import './styles.css'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendCustom.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendCustom.tsx index 7b8d5b6bb8e..78cbb66d597 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendCustom.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendCustom.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { Serie } from '../../types/project-activity'; import GraphsLegendItem from './GraphsLegendItem'; import { hasDataValues } from './utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendItem.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendItem.tsx index 985b344ef73..3303a22455f 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendItem.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendItem.tsx @@ -19,9 +19,9 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { ClearButton } from 'sonar-ui-common/components/controls/buttons'; -import AlertWarnIcon from 'sonar-ui-common/components/icons/AlertWarnIcon'; -import ChartLegendIcon from 'sonar-ui-common/components/icons/ChartLegendIcon'; +import { ClearButton } from '../../sonar-ui-common/components/controls/buttons'; +import AlertWarnIcon from '../../sonar-ui-common/components/icons/AlertWarnIcon'; +import ChartLegendIcon from '../../sonar-ui-common/components/icons/ChartLegendIcon'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendNewCode.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendNewCode.tsx index afa9058193e..65bda38c508 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendNewCode.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsLegendNewCode.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; export default function GraphsLegendNewCode() { return ( diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx index 283b0f83796..6f0f22c36cf 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltips.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { Popup, PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { isDefined } from 'sonar-ui-common/helpers/types'; +import DateTimeFormatter from '../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { Popup, PopupPlacement } from '../../sonar-ui-common/components/ui/popups'; +import { isDefined } from '../../sonar-ui-common/helpers/types'; import { MeasureHistory, Serie } from '../../types/project-activity'; import GraphsTooltipsContent from './GraphsTooltipsContent'; import GraphsTooltipsContentCoverage from './GraphsTooltipsContentCoverage'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContent.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContent.tsx index f38a0002104..3c30e28cf87 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContent.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContent.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ChartLegendIcon from 'sonar-ui-common/components/icons/ChartLegendIcon'; +import ChartLegendIcon from '../../sonar-ui-common/components/icons/ChartLegendIcon'; interface Props { name: string; diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentCoverage.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentCoverage.tsx index 9a1843acd43..482a4503dd8 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentCoverage.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentCoverage.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import { MeasureHistory } from '../../types/project-activity'; export interface GraphsTooltipsContentCoverageProps { diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentDuplication.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentDuplication.tsx index 7cfcad3d071..95839b501d7 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentDuplication.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentDuplication.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import { MeasureHistory } from '../../types/project-activity'; export interface GraphsTooltipsContentDuplicationProps { diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentIssues.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentIssues.tsx index 92e1be94c77..5346165eea9 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentIssues.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsTooltipsContentIssues.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import ChartLegendIcon from 'sonar-ui-common/components/icons/ChartLegendIcon'; -import Rating from 'sonar-ui-common/components/ui/Rating'; +import ChartLegendIcon from '../../sonar-ui-common/components/icons/ChartLegendIcon'; +import Rating from '../../sonar-ui-common/components/ui/Rating'; import { MeasureHistory } from '../../types/project-activity'; export interface GraphsTooltipsContentIssuesProps { diff --git a/server/sonar-web/src/main/js/components/activity-graph/GraphsZoom.tsx b/server/sonar-web/src/main/js/components/activity-graph/GraphsZoom.tsx index c71eaf6937f..b2aee06f7fd 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/GraphsZoom.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/GraphsZoom.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { AutoSizer } from 'react-virtualized/dist/commonjs/AutoSizer'; -import ZoomTimeLine from 'sonar-ui-common/components/charts/ZoomTimeLine'; +import ZoomTimeLine from '../../sonar-ui-common/components/charts/ZoomTimeLine'; import { Serie } from '../../types/project-activity'; import { hasHistoryData } from './utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphHistory-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphHistory-test.tsx index 7b1e439ba8b..aa6fcc54dd8 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphHistory-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphHistory-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphHistory from '../GraphHistory'; import { DEFAULT_GRAPH } from '../utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsHistory-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsHistory-test.tsx index ad83117996c..b18469949a3 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsHistory-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsHistory-test.tsx @@ -20,7 +20,7 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsHistory from '../GraphsHistory'; import { DEFAULT_GRAPH } from '../utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendCustom-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendCustom-test.tsx index 9c8ef242b53..5829be3deac 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendCustom-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendCustom-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsLegendCustom, { GraphsLegendCustomProps } from '../GraphsLegendCustom'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendItem-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendItem-test.tsx index ac1715a0b24..dcac4a82363 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendItem-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsLegendItem-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ClearButton } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { ClearButton } from '../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import GraphsLegendItem from '../GraphsLegendItem'; it('should render correctly a legend', () => { diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltips-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltips-test.tsx index 2461b3a6513..6bb92900cf5 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltips-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltips-test.tsx @@ -20,8 +20,8 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; import { mockEvent } from '../../../helpers/testMocks'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsTooltips from '../GraphsTooltips'; import { DEFAULT_GRAPH } from '../utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentCoverage-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentCoverage-test.tsx index f088d70aadc..9f89feeeddd 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentCoverage-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentCoverage-test.tsx @@ -20,7 +20,7 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsTooltipsContentCoverage, { GraphsTooltipsContentCoverageProps } from '../GraphsTooltipsContentCoverage'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentDuplication-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentDuplication-test.tsx index 7b8c6e44d79..cf994c06583 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentDuplication-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentDuplication-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsTooltipsContentDuplication, { GraphsTooltipsContentDuplicationProps } from '../GraphsTooltipsContentDuplication'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentIssues-test.tsx b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentIssues-test.tsx index 63558a0ee2c..635e8fee88a 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentIssues-test.tsx +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/GraphsTooltipsContentIssues-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import GraphsTooltipsContentIssues, { GraphsTooltipsContentIssuesProps } from '../GraphsTooltipsContentIssues'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/__tests__/utils-test.ts b/server/sonar-web/src/main/js/components/activity-graph/__tests__/utils-test.ts index d9f53bc3ef8..6e26f2f9e5e 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/__tests__/utils-test.ts +++ b/server/sonar-web/src/main/js/components/activity-graph/__tests__/utils-test.ts @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import * as dates from 'sonar-ui-common/helpers/dates'; +import * as dates from '../../../sonar-ui-common/helpers/dates'; import { MetricKey } from '../../../types/metrics'; import { GraphType, Serie } from '../../../types/project-activity'; import * as utils from '../utils'; diff --git a/server/sonar-web/src/main/js/components/activity-graph/utils.ts b/server/sonar-web/src/main/js/components/activity-graph/utils.ts index efe86766a74..c4b13e1887c 100644 --- a/server/sonar-web/src/main/js/components/activity-graph/utils.ts +++ b/server/sonar-web/src/main/js/components/activity-graph/utils.ts @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { chunk, flatMap, groupBy, sortBy } from 'lodash'; -import { getLocalizedMetricName, translate } from 'sonar-ui-common/helpers/l10n'; -import { get, save } from 'sonar-ui-common/helpers/storage'; import { localizeMetric } from '../../helpers/measures'; +import { getLocalizedMetricName, translate } from '../../sonar-ui-common/helpers/l10n'; +import { get, save } from '../../sonar-ui-common/helpers/storage'; import { MetricKey } from '../../types/metrics'; import { GraphType, MeasureHistory, Serie } from '../../types/project-activity'; diff --git a/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.tsx b/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.tsx index a9fbd7eea56..67605e1db0e 100644 --- a/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.tsx +++ b/server/sonar-web/src/main/js/components/charts/ColorBoxLegend.tsx @@ -20,7 +20,7 @@ import * as classNames from 'classnames'; import { ScaleLinear, ScaleOrdinal } from 'd3-scale'; import * as React from 'react'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import './ColorBoxLegend.css'; interface Props { diff --git a/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.tsx b/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.tsx index 53af7bba224..cce95472cc0 100644 --- a/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.tsx +++ b/server/sonar-web/src/main/js/components/charts/ColorRatingsLegend.tsx @@ -19,11 +19,11 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { RATING_COLORS } from '../../helpers/constants'; +import { ButtonLink } from '../../sonar-ui-common/components/controls/buttons'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import './ColorBoxLegend.css'; export interface ColorRatingsLegendProps { diff --git a/server/sonar-web/src/main/js/components/charts/LanguageDistribution.tsx b/server/sonar-web/src/main/js/components/charts/LanguageDistribution.tsx index 06204ba9af1..f603b34a89e 100644 --- a/server/sonar-web/src/main/js/components/charts/LanguageDistribution.tsx +++ b/server/sonar-web/src/main/js/components/charts/LanguageDistribution.tsx @@ -19,9 +19,9 @@ */ import { sortBy } from 'lodash'; import * as React from 'react'; -import Histogram from 'sonar-ui-common/components/charts/Histogram'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import Histogram from '../../sonar-ui-common/components/charts/Histogram'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; interface Props { alignTicks?: boolean; diff --git a/server/sonar-web/src/main/js/components/charts/__tests__/ColorRatingsLegend-test.tsx b/server/sonar-web/src/main/js/components/charts/__tests__/ColorRatingsLegend-test.tsx index 50eb686ae58..7638e1288e8 100644 --- a/server/sonar-web/src/main/js/components/charts/__tests__/ColorRatingsLegend-test.tsx +++ b/server/sonar-web/src/main/js/components/charts/__tests__/ColorRatingsLegend-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; import ColorRatingsLegend, { ColorRatingsLegendProps } from '../ColorRatingsLegend'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/common/ActivityLink.tsx b/server/sonar-web/src/main/js/components/common/ActivityLink.tsx index 8128db11301..4d6afcb46ab 100644 --- a/server/sonar-web/src/main/js/components/common/ActivityLink.tsx +++ b/server/sonar-web/src/main/js/components/common/ActivityLink.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import HistoryIcon from 'sonar-ui-common/components/icons/HistoryIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getActivityUrl, getMeasureHistoryUrl } from '../../helpers/urls'; +import HistoryIcon from '../../sonar-ui-common/components/icons/HistoryIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../types/branch-like'; import { GraphType } from '../../types/project-activity'; import { isCustomGraph } from '../activity-graph/utils'; diff --git a/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx b/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx index dc99b50368f..f107a35e31a 100644 --- a/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx +++ b/server/sonar-web/src/main/js/components/common/AnalysisWarningsModal.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Modal from 'sonar-ui-common/components/controls/Modal'; -import WarningIcon from 'sonar-ui-common/components/icons/WarningIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { dismissAnalysisWarning, getTask } from '../../api/ce'; import { sanitizeStringRestricted } from '../../helpers/sanitize'; +import { ButtonLink } from '../../sonar-ui-common/components/controls/buttons'; +import Modal from '../../sonar-ui-common/components/controls/Modal'; +import WarningIcon from '../../sonar-ui-common/components/icons/WarningIcon'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { TaskWarning } from '../../types/tasks'; import { withCurrentUser } from '../hoc/withCurrentUser'; diff --git a/server/sonar-web/src/main/js/components/common/BranchStatus.tsx b/server/sonar-web/src/main/js/components/common/BranchStatus.tsx index 91d80dab3e3..98bdd0eef0f 100644 --- a/server/sonar-web/src/main/js/components/common/BranchStatus.tsx +++ b/server/sonar-web/src/main/js/components/common/BranchStatus.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import Level from 'sonar-ui-common/components/ui/Level'; +import Level from '../../sonar-ui-common/components/ui/Level'; import { getBranchStatusByBranchLike, Store } from '../../store/rootReducer'; import { BranchLike } from '../../types/branch-like'; diff --git a/server/sonar-web/src/main/js/components/common/CodeSnippet.tsx b/server/sonar-web/src/main/js/components/common/CodeSnippet.tsx index bf81eec490b..e6d26f826b5 100644 --- a/server/sonar-web/src/main/js/components/common/CodeSnippet.tsx +++ b/server/sonar-web/src/main/js/components/common/CodeSnippet.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { ClipboardButton } from 'sonar-ui-common/components/controls/clipboard'; -import { isDefined } from 'sonar-ui-common/helpers/types'; +import { ClipboardButton } from '../../sonar-ui-common/components/controls/clipboard'; +import { isDefined } from '../../sonar-ui-common/helpers/types'; import './CodeSnippet.css'; export interface CodeSnippetProps { diff --git a/server/sonar-web/src/main/js/components/common/DisableableSelectOption.tsx b/server/sonar-web/src/main/js/components/common/DisableableSelectOption.tsx index 5ca6146e233..ba057c4cc21 100644 --- a/server/sonar-web/src/main/js/components/common/DisableableSelectOption.tsx +++ b/server/sonar-web/src/main/js/components/common/DisableableSelectOption.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; export interface DisableableSelectOptionProps { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/DocumentationTooltip.tsx b/server/sonar-web/src/main/js/components/common/DocumentationTooltip.tsx index 2e1546dd61c..f241884c67c 100644 --- a/server/sonar-web/src/main/js/components/common/DocumentationTooltip.tsx +++ b/server/sonar-web/src/main/js/components/common/DocumentationTooltip.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; import { isWebUri } from 'valid-url'; +import HelpTooltip from '../../sonar-ui-common/components/controls/HelpTooltip'; +import DetachIcon from '../../sonar-ui-common/components/icons/DetachIcon'; export interface DocumentationTooltipProps { children?: React.ReactNode; diff --git a/server/sonar-web/src/main/js/components/common/EmptySearch.tsx b/server/sonar-web/src/main/js/components/common/EmptySearch.tsx index 07b036f0894..3091ad24715 100644 --- a/server/sonar-web/src/main/js/components/common/EmptySearch.tsx +++ b/server/sonar-web/src/main/js/components/common/EmptySearch.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import './EmptySearch.css'; export default function EmptySearch() { diff --git a/server/sonar-web/src/main/js/components/common/FiltersHeader.tsx b/server/sonar-web/src/main/js/components/common/FiltersHeader.tsx index 800bd3a8fb0..216366e6e59 100644 --- a/server/sonar-web/src/main/js/components/common/FiltersHeader.tsx +++ b/server/sonar-web/src/main/js/components/common/FiltersHeader.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { displayReset: boolean; diff --git a/server/sonar-web/src/main/js/components/common/FormattingTips.tsx b/server/sonar-web/src/main/js/components/common/FormattingTips.tsx index b231e254e80..6e12fd4521f 100644 --- a/server/sonar-web/src/main/js/components/common/FormattingTips.tsx +++ b/server/sonar-web/src/main/js/components/common/FormattingTips.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getFormattingHelpUrl } from '../../helpers/urls'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/MeasuresLink.tsx b/server/sonar-web/src/main/js/components/common/MeasuresLink.tsx index bdfc97d1075..106b193920a 100644 --- a/server/sonar-web/src/main/js/components/common/MeasuresLink.tsx +++ b/server/sonar-web/src/main/js/components/common/MeasuresLink.tsx @@ -20,9 +20,9 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { Link } from 'react-router'; -import MeasuresIcon from 'sonar-ui-common/components/icons/MeasuresIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { getComponentDrilldownUrl } from '../../helpers/urls'; +import MeasuresIcon from '../../sonar-ui-common/components/icons/MeasuresIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { BranchLike } from '../../types/branch-like'; import './MeasuresLink.css'; diff --git a/server/sonar-web/src/main/js/components/common/MultiSelect.tsx b/server/sonar-web/src/main/js/components/common/MultiSelect.tsx index 24738a5ee40..430aa020c64 100644 --- a/server/sonar-web/src/main/js/components/common/MultiSelect.tsx +++ b/server/sonar-web/src/main/js/components/common/MultiSelect.tsx @@ -20,8 +20,8 @@ import * as classNames from 'classnames'; import { difference } from 'lodash'; import * as React from 'react'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import SearchBox from '../../sonar-ui-common/components/controls/SearchBox'; +import { translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import MultiSelectOption from './MultiSelectOption'; interface Props { diff --git a/server/sonar-web/src/main/js/components/common/MultiSelectOption.tsx b/server/sonar-web/src/main/js/components/common/MultiSelectOption.tsx index e6a89f70140..244c85cb2a9 100644 --- a/server/sonar-web/src/main/js/components/common/MultiSelectOption.tsx +++ b/server/sonar-web/src/main/js/components/common/MultiSelectOption.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Checkbox from '../../sonar-ui-common/components/controls/Checkbox'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; export interface MultiSelectOptionProps { active?: boolean; diff --git a/server/sonar-web/src/main/js/components/common/PageCounter.tsx b/server/sonar-web/src/main/js/components/common/PageCounter.tsx index 033b822bba7..40bc2808ddc 100644 --- a/server/sonar-web/src/main/js/components/common/PageCounter.tsx +++ b/server/sonar-web/src/main/js/components/common/PageCounter.tsx @@ -19,7 +19,7 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; export interface PageCounterProps { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx b/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx index bf3e8e3e2ee..c8f4200691e 100644 --- a/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx +++ b/server/sonar-web/src/main/js/components/common/PrivacyBadgeContainer.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface PrivacyBadgeContainerProps { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/ProjectKeyInput.tsx b/server/sonar-web/src/main/js/components/common/ProjectKeyInput.tsx index 0e5e27283c1..5a8ae7c92cf 100644 --- a/server/sonar-web/src/main/js/components/common/ProjectKeyInput.tsx +++ b/server/sonar-web/src/main/js/components/common/ProjectKeyInput.tsx @@ -19,9 +19,9 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { PROJECT_KEY_MAX_LEN } from '../../helpers/constants'; +import ValidationInput from '../../sonar-ui-common/components/controls/ValidationInput'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; export interface ProjectKeyInputProps { error?: string; diff --git a/server/sonar-web/src/main/js/components/common/ResetPasswordForm.tsx b/server/sonar-web/src/main/js/components/common/ResetPasswordForm.tsx index 8f46d2f8650..d0de4ad77e9 100644 --- a/server/sonar-web/src/main/js/components/common/ResetPasswordForm.tsx +++ b/server/sonar-web/src/main/js/components/common/ResetPasswordForm.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import MandatoryFieldMarker from 'sonar-ui-common/components/ui/MandatoryFieldMarker'; -import MandatoryFieldsExplanation from 'sonar-ui-common/components/ui/MandatoryFieldsExplanation'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { changePassword } from '../../api/users'; +import { SubmitButton } from '../../sonar-ui-common/components/controls/buttons'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import MandatoryFieldMarker from '../../sonar-ui-common/components/ui/MandatoryFieldMarker'; +import MandatoryFieldsExplanation from '../../sonar-ui-common/components/ui/MandatoryFieldsExplanation'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/RestartButton.tsx b/server/sonar-web/src/main/js/components/common/RestartButton.tsx index 5643c3b1a9b..22215f367e3 100644 --- a/server/sonar-web/src/main/js/components/common/RestartButton.tsx +++ b/server/sonar-web/src/main/js/components/common/RestartButton.tsx @@ -19,10 +19,10 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ConfirmButton from 'sonar-ui-common/components/controls/ConfirmButton'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { restart } from '../../api/system'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import ConfirmButton from '../../sonar-ui-common/components/controls/ConfirmButton'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/common/SelectListItem.tsx b/server/sonar-web/src/main/js/components/common/SelectListItem.tsx index dbfba2748a8..d3f52082451 100644 --- a/server/sonar-web/src/main/js/components/common/SelectListItem.tsx +++ b/server/sonar-web/src/main/js/components/common/SelectListItem.tsx @@ -19,7 +19,7 @@ */ import classNames from 'classnames'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; interface Props { active?: string; diff --git a/server/sonar-web/src/main/js/components/common/StatusIndicator.tsx b/server/sonar-web/src/main/js/components/common/StatusIndicator.tsx index 5e37429ade6..f158f69abcd 100644 --- a/server/sonar-web/src/main/js/components/common/StatusIndicator.tsx +++ b/server/sonar-web/src/main/js/components/common/StatusIndicator.tsx @@ -19,7 +19,7 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import './StatusIndicator.css'; export interface StatusIndicatorProps { diff --git a/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx b/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx index 88a4d37cd5b..663a3a5bf3b 100644 --- a/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx +++ b/server/sonar-web/src/main/js/components/common/VisibilitySelector.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import Radio from '../../sonar-ui-common/components/controls/Radio'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { canTurnToPrivate?: boolean; diff --git a/server/sonar-web/src/main/js/components/common/__tests__/AnalysisWarningsModal-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/AnalysisWarningsModal-test.tsx index 6514e28297a..a4289821d20 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/AnalysisWarningsModal-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/AnalysisWarningsModal-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { dismissAnalysisWarning, getTask } from '../../../api/ce'; import { mockTaskWarning } from '../../../helpers/mocks/tasks'; import { mockCurrentUser, mockEvent } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { AnalysisWarningsModal } from '../AnalysisWarningsModal'; jest.mock('../../../api/ce', () => ({ diff --git a/server/sonar-web/src/main/js/components/common/__tests__/FormattingTips-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/FormattingTips-test.tsx index 96ec202034a..19a384037b0 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/FormattingTips-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/FormattingTips-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import FormattingTips from '../FormattingTips'; const originalOpen = window.open; diff --git a/server/sonar-web/src/main/js/components/common/__tests__/ProjectKeyInput-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/ProjectKeyInput-test.tsx index 7333ba41d8d..3a4a6aaf997 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/ProjectKeyInput-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/ProjectKeyInput-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import ValidationInput from 'sonar-ui-common/components/controls/ValidationInput'; +import ValidationInput from '../../../sonar-ui-common/components/controls/ValidationInput'; import ProjectKeyInput, { ProjectKeyInputProps } from '../ProjectKeyInput'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/common/__tests__/ResetPasswordForm-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/ResetPasswordForm-test.tsx index e940f20395e..2650c54e9c3 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/ResetPasswordForm-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/ResetPasswordForm-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { changePassword } from '../../../api/users'; import { mockEvent, mockLoggedInUser } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import ResetPasswordForm from '../ResetPasswordForm'; jest.mock('../../../api/users', () => ({ diff --git a/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.tsx index 58263ec3c03..ce778d7f3fe 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/SelectList-test.tsx @@ -19,7 +19,7 @@ */ import { mount, shallow } from 'enzyme'; import * as React from 'react'; -import { click, keydown } from 'sonar-ui-common/helpers/testUtils'; +import { click, keydown } from '../../../sonar-ui-common/helpers/testUtils'; import SelectList from '../SelectList'; import SelectListItem from '../SelectListItem'; diff --git a/server/sonar-web/src/main/js/components/common/__tests__/VisibilitySelector-test.tsx b/server/sonar-web/src/main/js/components/common/__tests__/VisibilitySelector-test.tsx index 95bb0bbe561..5dce0b915af 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/VisibilitySelector-test.tsx +++ b/server/sonar-web/src/main/js/components/common/__tests__/VisibilitySelector-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import Radio from 'sonar-ui-common/components/controls/Radio'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; import VisibilitySelector from '../VisibilitySelector'; it('changes visibility', () => { diff --git a/server/sonar-web/src/main/js/components/controls/ComponentReportActions.tsx b/server/sonar-web/src/main/js/components/controls/ComponentReportActions.tsx index 84e7be44554..e0c4b00f660 100644 --- a/server/sonar-web/src/main/js/components/controls/ComponentReportActions.tsx +++ b/server/sonar-web/src/main/js/components/controls/ComponentReportActions.tsx @@ -19,7 +19,6 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getReportStatus, subscribeToEmailReport, @@ -27,6 +26,7 @@ import { } from '../../api/component-report'; import addGlobalSuccessMessage from '../../app/utils/addGlobalSuccessMessage'; import { isLoggedIn } from '../../helpers/users'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import { Store } from '../../store/rootReducer'; import { Branch } from '../../types/branch-like'; import { ComponentQualifier } from '../../types/component'; diff --git a/server/sonar-web/src/main/js/components/controls/ComponentReportActionsRenderer.tsx b/server/sonar-web/src/main/js/components/controls/ComponentReportActionsRenderer.tsx index a693b8315f7..581ec4da87e 100644 --- a/server/sonar-web/src/main/js/components/controls/ComponentReportActionsRenderer.tsx +++ b/server/sonar-web/src/main/js/components/controls/ComponentReportActionsRenderer.tsx @@ -19,11 +19,11 @@ */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Dropdown from 'sonar-ui-common/components/controls/Dropdown'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getReportUrl } from '../../api/component-report'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import Dropdown from '../../sonar-ui-common/components/controls/Dropdown'; +import DropdownIcon from '../../sonar-ui-common/components/icons/DropdownIcon'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import { Branch } from '../../types/branch-like'; export interface ComponentReportActionsRendererProps { diff --git a/server/sonar-web/src/main/js/components/controls/DateInput.tsx b/server/sonar-web/src/main/js/components/controls/DateInput.tsx index fb62d5b4953..eb1d5422093 100644 --- a/server/sonar-web/src/main/js/components/controls/DateInput.tsx +++ b/server/sonar-web/src/main/js/components/controls/DateInput.tsx @@ -26,18 +26,18 @@ import { range } from 'lodash'; import * as React from 'react'; import { DayModifiers, Modifier, Modifiers } from 'react-day-picker'; import { InjectedIntlProps, injectIntl } from 'react-intl'; -import { ButtonIcon, ClearButton } from 'sonar-ui-common/components/controls/buttons'; -import OutsideClickHandler from 'sonar-ui-common/components/controls/OutsideClickHandler'; -import Select from 'sonar-ui-common/components/controls/Select'; -import CalendarIcon from 'sonar-ui-common/components/icons/CalendarIcon'; -import ChevronLeftIcon from 'sonar-ui-common/components/icons/ChevronLeftIcon'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; +import { ButtonIcon, ClearButton } from '../../sonar-ui-common/components/controls/buttons'; +import OutsideClickHandler from '../../sonar-ui-common/components/controls/OutsideClickHandler'; +import Select from '../../sonar-ui-common/components/controls/Select'; +import CalendarIcon from '../../sonar-ui-common/components/icons/CalendarIcon'; +import ChevronLeftIcon from '../../sonar-ui-common/components/icons/ChevronLeftIcon'; +import ChevronRightIcon from '../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; import { getShortMonthName, getShortWeekDayName, getWeekDayName -} from 'sonar-ui-common/helpers/l10n'; +} from '../../sonar-ui-common/helpers/l10n'; import './DayPicker.css'; import './styles.css'; diff --git a/server/sonar-web/src/main/js/components/controls/DateRangeInput.tsx b/server/sonar-web/src/main/js/components/controls/DateRangeInput.tsx index b258ca14313..371ad27425a 100644 --- a/server/sonar-web/src/main/js/components/controls/DateRangeInput.tsx +++ b/server/sonar-web/src/main/js/components/controls/DateRangeInput.tsx @@ -20,7 +20,7 @@ import * as classNames from 'classnames'; import { max, min } from 'date-fns'; import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import DateInput from './DateInput'; type DateRange = { from?: Date; to?: Date }; diff --git a/server/sonar-web/src/main/js/components/controls/Favorite.tsx b/server/sonar-web/src/main/js/components/controls/Favorite.tsx index 6432d1854a2..3c0ba619fc3 100644 --- a/server/sonar-web/src/main/js/components/controls/Favorite.tsx +++ b/server/sonar-web/src/main/js/components/controls/Favorite.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import FavoriteButton from 'sonar-ui-common/components/controls/FavoriteButton'; import { addFavorite, removeFavorite } from '../../api/favorites'; +import FavoriteButton from '../../sonar-ui-common/components/controls/FavoriteButton'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/controls/HomePageSelect.tsx b/server/sonar-web/src/main/js/components/controls/HomePageSelect.tsx index f97e9747406..64c804bd697 100644 --- a/server/sonar-web/src/main/js/components/controls/HomePageSelect.tsx +++ b/server/sonar-web/src/main/js/components/controls/HomePageSelect.tsx @@ -20,11 +20,11 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { connect } from 'react-redux'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import HomeIcon from 'sonar-ui-common/components/icons/HomeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { isLoggedIn } from '../../helpers/users'; +import { ButtonLink } from '../../sonar-ui-common/components/controls/buttons'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import HomeIcon from '../../sonar-ui-common/components/icons/HomeIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import { getCurrentUser, Store } from '../../store/rootReducer'; import { setHomePage } from '../../store/users'; diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/ComponentReportActions-test.tsx b/server/sonar-web/src/main/js/components/controls/__tests__/ComponentReportActions-test.tsx index 844b4d78cb9..c32443d6d23 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/ComponentReportActions-test.tsx +++ b/server/sonar-web/src/main/js/components/controls/__tests__/ComponentReportActions-test.tsx @@ -20,7 +20,6 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getReportStatus, subscribeToEmailReport, @@ -30,6 +29,7 @@ import addGlobalSuccessMessage from '../../../app/utils/addGlobalSuccessMessage' import { mockBranch } from '../../../helpers/mocks/branch-like'; import { mockComponentReportStatus } from '../../../helpers/mocks/component-report'; import { mockComponent, mockCurrentUser } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { ComponentQualifier } from '../../../types/component'; import { ComponentReportActions } from '../ComponentReportActions'; diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/DateInput-test.tsx b/server/sonar-web/src/main/js/components/controls/__tests__/DateInput-test.tsx index 4938ffc4f9d..64bbec9b825 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/DateInput-test.tsx +++ b/server/sonar-web/src/main/js/components/controls/__tests__/DateInput-test.tsx @@ -24,7 +24,7 @@ import * as subDays from 'date-fns/sub_days'; import * as subMonths from 'date-fns/sub_months'; import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import DateInput from '../DateInput'; beforeAll(() => { diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/DateRangeInput-test.tsx b/server/sonar-web/src/main/js/components/controls/__tests__/DateRangeInput-test.tsx index 9e2a55482d0..0d023f19e01 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/DateRangeInput-test.tsx +++ b/server/sonar-web/src/main/js/components/controls/__tests__/DateRangeInput-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { parseDate } from 'sonar-ui-common/helpers/dates'; +import { parseDate } from '../../../sonar-ui-common/helpers/dates'; import DateRangeInput from '../DateRangeInput'; const dateA = parseDate('2018-01-17T00:00:00.000Z'); diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/Favorite-test.tsx b/server/sonar-web/src/main/js/components/controls/__tests__/Favorite-test.tsx index f59867db0fe..dcfd8e3f1af 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/Favorite-test.tsx +++ b/server/sonar-web/src/main/js/components/controls/__tests__/Favorite-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import FavoriteButton from 'sonar-ui-common/components/controls/FavoriteButton'; +import FavoriteButton from '../../../sonar-ui-common/components/controls/FavoriteButton'; import Favorite from '../Favorite'; jest.mock('../../../api/favorites', () => ({ diff --git a/server/sonar-web/src/main/js/components/controls/__tests__/HomePageSelect-test.tsx b/server/sonar-web/src/main/js/components/controls/__tests__/HomePageSelect-test.tsx index 4c37bf9c5f6..7c05867ab27 100644 --- a/server/sonar-web/src/main/js/components/controls/__tests__/HomePageSelect-test.tsx +++ b/server/sonar-web/src/main/js/components/controls/__tests__/HomePageSelect-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { click, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockCurrentUser, mockLoggedInUser } from '../../../helpers/testMocks'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import { click, waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { DEFAULT_HOMEPAGE, HomePageSelect } from '../HomePageSelect'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/docs/DocCollapsibleBlock.tsx b/server/sonar-web/src/main/js/components/docs/DocCollapsibleBlock.tsx index 9af17ff06a6..e335ee3eb8c 100644 --- a/server/sonar-web/src/main/js/components/docs/DocCollapsibleBlock.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocCollapsibleBlock.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import OpenCloseIcon from 'sonar-ui-common/components/icons/OpenCloseIcon'; +import OpenCloseIcon from '../../sonar-ui-common/components/icons/OpenCloseIcon'; interface State { open: boolean; diff --git a/server/sonar-web/src/main/js/components/docs/DocImg.tsx b/server/sonar-web/src/main/js/components/docs/DocImg.tsx index 801694e15f7..f2836e9a18f 100644 --- a/server/sonar-web/src/main/js/components/docs/DocImg.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocImg.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { getBaseUrl } from '../../sonar-ui-common/helpers/urls'; export default function DocImg(props: React.ImgHTMLAttributes<HTMLImageElement>) { const { alt, src, ...other } = props; diff --git a/server/sonar-web/src/main/js/components/docs/DocLink.tsx b/server/sonar-web/src/main/js/components/docs/DocLink.tsx index 98e1417e7b9..3cb93cf5812 100644 --- a/server/sonar-web/src/main/js/components/docs/DocLink.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocLink.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; import { isSonarCloud } from '../../helpers/system'; +import DetachIcon from '../../sonar-ui-common/components/icons/DetachIcon'; import { withAppState } from '../hoc/withAppState'; interface OwnProps { diff --git a/server/sonar-web/src/main/js/components/docs/DocMarkdownBlock.tsx b/server/sonar-web/src/main/js/components/docs/DocMarkdownBlock.tsx index 9a04f699535..b183a8ad4f5 100644 --- a/server/sonar-web/src/main/js/components/docs/DocMarkdownBlock.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocMarkdownBlock.tsx @@ -25,7 +25,7 @@ import rehypeSlug from 'rehype-slug'; import remark from 'remark'; import remarkCustomBlocks from 'remark-custom-blocks'; import remarkRehype from 'remark-rehype'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; +import { scrollToElement } from '../../sonar-ui-common/helpers/scrolling'; import DocCollapsibleBlock from './DocCollapsibleBlock'; import DocImg from './DocImg'; import DocLink from './DocLink'; diff --git a/server/sonar-web/src/main/js/components/docs/DocToc.tsx b/server/sonar-web/src/main/js/components/docs/DocToc.tsx index 28dc7f82b83..18a455c0192 100644 --- a/server/sonar-web/src/main/js/components/docs/DocToc.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocToc.tsx @@ -23,7 +23,7 @@ import * as React from 'react'; import { findDOMNode } from 'react-dom'; import remark from 'remark'; import reactRenderer from 'remark-react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import onlyToc from './plugins/remark-only-toc'; interface Props { diff --git a/server/sonar-web/src/main/js/components/docs/DocTooltipLink.tsx b/server/sonar-web/src/main/js/components/docs/DocTooltipLink.tsx index aea12f3bc62..f1624dcc954 100644 --- a/server/sonar-web/src/main/js/components/docs/DocTooltipLink.tsx +++ b/server/sonar-web/src/main/js/components/docs/DocTooltipLink.tsx @@ -20,7 +20,7 @@ import { forEach } from 'lodash'; import * as React from 'react'; import { Link } from 'react-router'; -import DetachIcon from 'sonar-ui-common/components/icons/DetachIcon'; +import DetachIcon from '../../sonar-ui-common/components/icons/DetachIcon'; interface OwnProps { customProps?: T.Dict<string>; diff --git a/server/sonar-web/src/main/js/components/docs/__tests__/DocCollapsibleBlock-test.tsx b/server/sonar-web/src/main/js/components/docs/__tests__/DocCollapsibleBlock-test.tsx index b649b865b67..8e8827d5d61 100644 --- a/server/sonar-web/src/main/js/components/docs/__tests__/DocCollapsibleBlock-test.tsx +++ b/server/sonar-web/src/main/js/components/docs/__tests__/DocCollapsibleBlock-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import DocCollapsibleBlock from '../DocCollapsibleBlock'; const children = ( diff --git a/server/sonar-web/src/main/js/components/docs/__tests__/DocMarkdownBlock-test.tsx b/server/sonar-web/src/main/js/components/docs/__tests__/DocMarkdownBlock-test.tsx index 86a4f1e9eb5..47cccf1ef0c 100644 --- a/server/sonar-web/src/main/js/components/docs/__tests__/DocMarkdownBlock-test.tsx +++ b/server/sonar-web/src/main/js/components/docs/__tests__/DocMarkdownBlock-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { mockEvent } from '../../../helpers/testMocks'; +import { scrollToElement } from '../../../sonar-ui-common/helpers/scrolling'; import DocMarkdownBlock from '../DocMarkdownBlock'; const CONTENT = ` @@ -50,7 +50,7 @@ jest.mock('rehype-raw', () => ({ default: jest.requireActual('rehype-raw') })); jest.mock('rehype-react', () => ({ default: jest.requireActual('rehype-react') })); jest.mock('rehype-slug', () => ({ default: jest.requireActual('rehype-slug') })); -jest.mock('sonar-ui-common/helpers/scrolling', () => ({ +jest.mock('../../../sonar-ui-common/helpers/scrolling', () => ({ scrollToElement: jest.fn() })); diff --git a/server/sonar-web/src/main/js/components/docs/__tests__/DocToc-test.tsx b/server/sonar-web/src/main/js/components/docs/__tests__/DocToc-test.tsx index e49cf8710df..3113d2972ae 100644 --- a/server/sonar-web/src/main/js/components/docs/__tests__/DocToc-test.tsx +++ b/server/sonar-web/src/main/js/components/docs/__tests__/DocToc-test.tsx @@ -19,7 +19,7 @@ */ import { mount } from 'enzyme'; import * as React from 'react'; -import { click, scrollTo } from 'sonar-ui-common/helpers/testUtils'; +import { click, scrollTo } from '../../../sonar-ui-common/helpers/testUtils'; import DocToc from '../DocToc'; const OFFSET = 300; diff --git a/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx b/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx index f8868ac7262..cb7a7de515d 100644 --- a/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx +++ b/server/sonar-web/src/main/js/components/facet/FacetHeader.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import OpenCloseIcon from 'sonar-ui-common/components/icons/OpenCloseIcon'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../sonar-ui-common/components/controls/buttons'; +import HelpTooltip from '../../sonar-ui-common/components/controls/HelpTooltip'; +import OpenCloseIcon from '../../sonar-ui-common/components/icons/OpenCloseIcon'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; interface Props { children?: React.ReactNode; diff --git a/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx b/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx index 70d8545712d..dacee4ebd96 100644 --- a/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx +++ b/server/sonar-web/src/main/js/components/facet/ListStyleFacet.tsx @@ -20,13 +20,13 @@ import * as classNames from 'classnames'; import { sortBy, without } from 'lodash'; import * as React from 'react'; -import ListFooter from 'sonar-ui-common/components/controls/ListFooter'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { queriesEqual } from 'sonar-ui-common/helpers/query'; +import ListFooter from '../../sonar-ui-common/components/controls/ListFooter'; +import SearchBox from '../../sonar-ui-common/components/controls/SearchBox'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { Alert } from '../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; +import { queriesEqual } from '../../sonar-ui-common/helpers/query'; import FacetBox from './FacetBox'; import FacetHeader from './FacetHeader'; import FacetItem from './FacetItem'; diff --git a/server/sonar-web/src/main/js/components/facet/ListStyleFacetFooter.tsx b/server/sonar-web/src/main/js/components/facet/ListStyleFacetFooter.tsx index ab87b1fef28..1afa9718fa0 100644 --- a/server/sonar-web/src/main/js/components/facet/ListStyleFacetFooter.tsx +++ b/server/sonar-web/src/main/js/components/facet/ListStyleFacetFooter.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/facet/MultipleSelectionHint.tsx b/server/sonar-web/src/main/js/components/facet/MultipleSelectionHint.tsx index 063297d25f8..913644ad6aa 100644 --- a/server/sonar-web/src/main/js/components/facet/MultipleSelectionHint.tsx +++ b/server/sonar-web/src/main/js/components/facet/MultipleSelectionHint.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import './MultipleSelectionHint.css'; interface Props { diff --git a/server/sonar-web/src/main/js/components/facet/__tests__/FacetHeader-test.tsx b/server/sonar-web/src/main/js/components/facet/__tests__/FacetHeader-test.tsx index e541b8900ec..c135b73d803 100644 --- a/server/sonar-web/src/main/js/components/facet/__tests__/FacetHeader-test.tsx +++ b/server/sonar-web/src/main/js/components/facet/__tests__/FacetHeader-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import FacetHeader from '../FacetHeader'; it('should render open facet with value', () => { diff --git a/server/sonar-web/src/main/js/components/facet/__tests__/FacetItem-test.tsx b/server/sonar-web/src/main/js/components/facet/__tests__/FacetItem-test.tsx index 83647b04946..54f0cba0272 100644 --- a/server/sonar-web/src/main/js/components/facet/__tests__/FacetItem-test.tsx +++ b/server/sonar-web/src/main/js/components/facet/__tests__/FacetItem-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import FacetItem, { Props } from '../FacetItem'; it('should render active', () => { diff --git a/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacet-test.tsx b/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacet-test.tsx index 4ac3324585e..72e4ff445e4 100644 --- a/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacet-test.tsx +++ b/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacet-test.tsx @@ -19,7 +19,7 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import ListStyleFacet, { Props } from '../ListStyleFacet'; it('should render', () => { diff --git a/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacetFooter-test.tsx b/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacetFooter-test.tsx index 02ce7a4aecf..cf4edc30d25 100644 --- a/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacetFooter-test.tsx +++ b/server/sonar-web/src/main/js/components/facet/__tests__/ListStyleFacetFooter-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import ListStyleFacetFooter from '../ListStyleFacetFooter'; it('should not render "show more"', () => { diff --git a/server/sonar-web/src/main/js/components/hoc/__tests__/whenLoggedIn-test.tsx b/server/sonar-web/src/main/js/components/hoc/__tests__/whenLoggedIn-test.tsx index 5ee9fbeefb2..18de0d584b1 100644 --- a/server/sonar-web/src/main/js/components/hoc/__tests__/whenLoggedIn-test.tsx +++ b/server/sonar-web/src/main/js/components/hoc/__tests__/whenLoggedIn-test.tsx @@ -19,11 +19,11 @@ */ import { shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; import { mockStore } from '../../../helpers/testMocks'; +import handleRequiredAuthentication from '../../../sonar-ui-common/helpers/handleRequiredAuthentication'; import { whenLoggedIn } from '../whenLoggedIn'; -jest.mock('sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ +jest.mock('../../../sonar-ui-common/helpers/handleRequiredAuthentication', () => ({ default: jest.fn() })); diff --git a/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx b/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx index 102a987dd95..60a8ba13cca 100644 --- a/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx +++ b/server/sonar-web/src/main/js/components/hoc/__tests__/withKeyboardNavigation-test.tsx @@ -19,8 +19,8 @@ */ import { mount, shallow } from 'enzyme'; import * as React from 'react'; -import { KEYCODE_MAP, keydown } from 'sonar-ui-common/helpers/testUtils'; import { mockComponent } from '../../../helpers/testMocks'; +import { KEYCODE_MAP, keydown } from '../../../sonar-ui-common/helpers/testUtils'; import withKeyboardNavigation, { WithKeyboardNavigationProps } from '../withKeyboardNavigation'; class X extends React.Component<{ diff --git a/server/sonar-web/src/main/js/components/hoc/__tests__/withNotifications-test.tsx b/server/sonar-web/src/main/js/components/hoc/__tests__/withNotifications-test.tsx index 5f1e351f9c9..babc0bf1e25 100644 --- a/server/sonar-web/src/main/js/components/hoc/__tests__/withNotifications-test.tsx +++ b/server/sonar-web/src/main/js/components/hoc/__tests__/withNotifications-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { addNotification, getNotifications, removeNotification } from '../../../api/notifications'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { withNotifications, WithNotificationsProps } from '../withNotifications'; jest.mock('../../../api/notifications', () => ({ diff --git a/server/sonar-web/src/main/js/components/hoc/whenLoggedIn.tsx b/server/sonar-web/src/main/js/components/hoc/whenLoggedIn.tsx index e34d37059ee..250ecb9e3d7 100644 --- a/server/sonar-web/src/main/js/components/hoc/whenLoggedIn.tsx +++ b/server/sonar-web/src/main/js/components/hoc/whenLoggedIn.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import handleRequiredAuthentication from 'sonar-ui-common/helpers/handleRequiredAuthentication'; import { isLoggedIn } from '../../helpers/users'; +import handleRequiredAuthentication from '../../sonar-ui-common/helpers/handleRequiredAuthentication'; import { getWrappedDisplayName } from './utils'; import { withCurrentUser } from './withCurrentUser'; diff --git a/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx b/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx index 15c53d6a5a4..4db6963967b 100644 --- a/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx +++ b/server/sonar-web/src/main/js/components/hoc/withKeyboardNavigation.tsx @@ -19,7 +19,7 @@ */ import * as key from 'keymaster'; import * as React from 'react'; -import PageActions from 'sonar-ui-common/components/ui/PageActions'; +import PageActions from '../../sonar-ui-common/components/ui/PageActions'; import { getWrappedDisplayName } from './utils'; export interface WithKeyboardNavigationProps { diff --git a/server/sonar-web/src/main/js/components/icons/BranchLikeIcon.tsx b/server/sonar-web/src/main/js/components/icons/BranchLikeIcon.tsx index e64f93febdd..8b301c9aed0 100644 --- a/server/sonar-web/src/main/js/components/icons/BranchLikeIcon.tsx +++ b/server/sonar-web/src/main/js/components/icons/BranchLikeIcon.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import BranchIcon from 'sonar-ui-common/components/icons/BranchIcon'; -import { IconProps } from 'sonar-ui-common/components/icons/Icon'; -import PullRequestIcon from 'sonar-ui-common/components/icons/PullRequestIcon'; import { isPullRequest } from '../../helpers/branch-like'; +import BranchIcon from '../../sonar-ui-common/components/icons/BranchIcon'; +import { IconProps } from '../../sonar-ui-common/components/icons/Icon'; +import PullRequestIcon from '../../sonar-ui-common/components/icons/PullRequestIcon'; import { BranchLike } from '../../types/branch-like'; export interface BranchLikeIconProps extends IconProps { diff --git a/server/sonar-web/src/main/js/components/issue/IssueView.tsx b/server/sonar-web/src/main/js/components/issue/IssueView.tsx index 98d1d885a66..dc2d5e9c82c 100644 --- a/server/sonar-web/src/main/js/components/issue/IssueView.tsx +++ b/server/sonar-web/src/main/js/components/issue/IssueView.tsx @@ -19,8 +19,8 @@ */ import classNames from 'classnames'; import * as React from 'react'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; import { deleteIssueComment, editIssueComment } from '../../api/issues'; +import Checkbox from '../../sonar-ui-common/components/controls/Checkbox'; import { BranchLike } from '../../types/branch-like'; import { updateIssue } from './actions'; import IssueActionsBar from './components/IssueActionsBar'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.tsx index 2022ebcc0d2..5389b6c2ded 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueActionsBar.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { IssueResponse } from '../../../types/issues'; import { updateIssue } from '../actions'; import IssueAssign from './IssueAssign'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.tsx index afc63537aab..11c7af41e71 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueAssign.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueAssign.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import Avatar from '../../ui/Avatar'; import SetAssigneePopup from '../popups/SetAssigneePopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.tsx index 15261cc7e77..10d6cbdae9d 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueChangelog.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; import ChangelogPopup from '../popups/ChangelogPopup'; interface Props { diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.tsx index d6281e0133a..119f7799a59 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueChangelogDiff.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; interface Props { diff: T.IssueChangelogDiff; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.tsx index d5826942b9c..8373f5faeca 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentAction.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { addIssueComment } from '../../../api/issues'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { updateIssue } from '../actions'; import CommentPopup from '../popups/CommentPopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.tsx index 06d4a937ed2..0e598e235c5 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueCommentLine.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DeleteButton, EditButton } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DateFromNow from 'sonar-ui-common/components/intl/DateFromNow'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { sanitizeString } from '../../../helpers/sanitize'; +import { DeleteButton, EditButton } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DateFromNow from '../../../sonar-ui-common/components/intl/DateFromNow'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import Avatar from '../../ui/Avatar'; import CommentDeletePopup from '../popups/CommentDeletePopup'; import CommentPopup from '../popups/CommentPopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueMessage.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueMessage.tsx index 49b7814078f..5c83e6f7a2b 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueMessage.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueMessage.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { RuleStatus } from '../../../types/rules'; import DocumentationTooltip from '../../common/DocumentationTooltip'; import { WorkspaceContextShape } from '../../workspace/context'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx index c6996fd066c..9a3d77151db 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueSeverity.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { setIssueSeverity } from '../../../api/issues'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { IssueResponse } from '../../../types/issues'; import SeverityHelper from '../../shared/SeverityHelper'; import SetSeverityPopup from '../popups/SetSeverityPopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTags.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueTags.tsx index 553bb8c6e80..e1621611761 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueTags.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueTags.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { setIssueTags } from '../../../api/issues'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import TagsList from '../../tags/TagsList'; import { updateIssue } from '../actions'; import SetIssueTagsPopup from '../popups/SetIssueTagsPopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.tsx index 1b82ac169b2..581ab6fcbd9 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueTitleBar.tsx @@ -19,12 +19,12 @@ */ import * as React from 'react'; import { Link } from 'react-router'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import LinkIcon from 'sonar-ui-common/components/icons/LinkIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; import { getBranchLikeQuery } from '../../../helpers/branch-like'; import { getComponentIssuesUrl } from '../../../helpers/urls'; +import Tooltip from '../../../sonar-ui-common/components/controls/Tooltip'; +import LinkIcon from '../../../sonar-ui-common/components/icons/LinkIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../../../sonar-ui-common/helpers/measures'; import { BranchLike } from '../../../types/branch-like'; import { RuleStatus } from '../../../types/rules'; import LocationIndex from '../../common/LocationIndex'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx index 419eaa2b92d..151b16b4c60 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueTransition.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { setIssueTransition } from '../../../api/issues'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import StatusHelper from '../../shared/StatusHelper'; import { updateIssue } from '../actions'; import SetTransitionPopup from '../popups/SetTransitionPopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx b/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx index d2d4871f289..dfb5884e687 100644 --- a/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/IssueType.tsx @@ -18,13 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { setIssueType } from '../../../api/issues'; import { colors } from '../../../app/theme'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { IssueResponse } from '../../../types/issues'; import SetTypePopup from '../popups/SetTypePopup'; diff --git a/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.tsx b/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.tsx index 3292efc5f68..9719b16e892 100644 --- a/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/SimilarIssuesFilter.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import Toggler from 'sonar-ui-common/components/controls/Toggler'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import FilterIcon from 'sonar-ui-common/components/icons/FilterIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import Toggler from '../../../sonar-ui-common/components/controls/Toggler'; +import DropdownIcon from '../../../sonar-ui-common/components/icons/DropdownIcon'; +import FilterIcon from '../../../sonar-ui-common/components/icons/FilterIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import SimilarIssuesPopup from '../popups/SimilarIssuesPopup'; interface Props { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueAssign-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueAssign-test.tsx index 6d39c9b8087..b7a57ad8f6f 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueAssign-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueAssign-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockIssue } from '../../../../helpers/testMocks'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueAssign from '../IssueAssign'; const issue = mockIssue(false, { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueChangelog-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueChangelog-test.tsx index 791574241d7..79c9f420d31 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueChangelog-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueChangelog-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueChangelog from '../IssueChangelog'; const issue = { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentAction-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentAction-test.tsx index e17301e4294..ea85db6caf3 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentAction-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentAction-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueCommentAction from '../IssueCommentAction'; it('should render correctly', () => { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentLine-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentLine-test.tsx index bb309096778..1bc3834007c 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentLine-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueCommentLine-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueCommentLine from '../IssueCommentLine'; const comment: T.IssueComment = { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueMessage-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueMessage-test.tsx index 1bdf7b0e8d9..76434929cdf 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueMessage-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueMessage-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { ButtonLink } from '../../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import { RuleStatus } from '../../../../types/rules'; import IssueMessage, { IssueMessageProps } from '../IssueMessage'; diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueSeverity-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueSeverity-test.tsx index c98f0e6ee74..0ab46df88ff 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueSeverity-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueSeverity-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueSeverity from '../IssueSeverity'; const issue = { severity: 'BLOCKER' }; diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTags-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTags-test.tsx index 49acbba7d0d..bb66a22454d 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTags-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTags-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueTags from '../IssueTags'; const issue = { key: 'issuekey', tags: ['mytag', 'test'] }; diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTransition-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTransition-test.tsx index c574a8c1fae..a781f587839 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTransition-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueTransition-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueTransition from '../IssueTransition'; const issue: IssueTransition['props']['issue'] = { diff --git a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueType-test.tsx b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueType-test.tsx index 460413c3cda..82c0709b272 100644 --- a/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueType-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/components/__tests__/IssueType-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import IssueType from '../IssueType'; const issue: Pick<T.Issue, 'type'> = { type: 'BUG' }; diff --git a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.tsx index c92a8bf217d..f34b57ee112 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/ChangelogPopup.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import DateTimeFormatter from 'sonar-ui-common/components/intl/DateTimeFormatter'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { getIssueChangelog } from '../../../api/issues'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import DateTimeFormatter from '../../../sonar-ui-common/components/intl/DateTimeFormatter'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import Avatar from '../../ui/Avatar'; import IssueChangelogDiff from '../components/IssueChangelogDiff'; diff --git a/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.tsx index 28bfed0db9e..6228c4531e2 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/CommentDeletePopup.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; interface Props { onDelete: () => void; diff --git a/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.tsx index edeb5b687de..2698e111960 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/CommentPopup.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button, ResetButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button, ResetButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import FormattingTips from '../../common/FormattingTips'; interface Props { diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.tsx index 697405f3dd9..2ca2cdd3cf8 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/SetAssigneePopup.tsx @@ -19,11 +19,11 @@ */ import { map } from 'lodash'; import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import SearchBox from 'sonar-ui-common/components/controls/SearchBox'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { searchUsers } from '../../../api/users'; import { isLoggedIn, isUserActive } from '../../../helpers/users'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import SearchBox from '../../../sonar-ui-common/components/controls/SearchBox'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import SelectList from '../../common/SelectList'; import SelectListItem from '../../common/SelectListItem'; import { withCurrentUser } from '../../hoc/withCurrentUser'; diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetIssueTagsPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SetIssueTagsPopup.tsx index e7ccefc4c7e..6a67ab9522f 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetIssueTagsPopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/SetIssueTagsPopup.tsx @@ -19,9 +19,9 @@ */ import { difference, without } from 'lodash'; import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import { PopupPlacement } from 'sonar-ui-common/components/ui/popups'; import { searchIssueTags } from '../../../api/issues'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import { PopupPlacement } from '../../../sonar-ui-common/components/ui/popups'; import TagsSelector from '../../tags/TagsSelector'; interface Props { diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.tsx index a249cab9f91..9758367c83d 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/SetSeverityPopup.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import SeverityIcon from 'sonar-ui-common/components/icons/SeverityIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import SeverityIcon from '../../../sonar-ui-common/components/icons/SeverityIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import SelectList from '../../common/SelectList'; import SelectListItem from '../../common/SelectListItem'; diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.tsx index 93faa598e95..1c5ccb83a53 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/SetTransitionPopup.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import { hasMessage, translate } from 'sonar-ui-common/helpers/l10n'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import { hasMessage, translate } from '../../../sonar-ui-common/helpers/l10n'; import SelectList from '../../common/SelectList'; import SelectListItem from '../../common/SelectListItem'; diff --git a/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.tsx index 95928141ea4..39807141097 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/SetTypePopup.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import SelectList from '../../common/SelectList'; import SelectListItem from '../../common/SelectListItem'; diff --git a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.tsx b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.tsx index 1684b684d32..32d6136db31 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/SimilarIssuesPopup.tsx @@ -18,12 +18,12 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { DropdownOverlay } from 'sonar-ui-common/components/controls/Dropdown'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import TagsIcon from 'sonar-ui-common/components/icons/TagsIcon'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { fileFromPath, limitComponentName } from 'sonar-ui-common/helpers/path'; +import { DropdownOverlay } from '../../../sonar-ui-common/components/controls/Dropdown'; +import IssueTypeIcon from '../../../sonar-ui-common/components/icons/IssueTypeIcon'; +import QualifierIcon from '../../../sonar-ui-common/components/icons/QualifierIcon'; +import TagsIcon from '../../../sonar-ui-common/components/icons/TagsIcon'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; +import { fileFromPath, limitComponentName } from '../../../sonar-ui-common/helpers/path'; import SelectList from '../../common/SelectList'; import SelectListItem from '../../common/SelectListItem'; import SeverityHelper from '../../shared/SeverityHelper'; diff --git a/server/sonar-web/src/main/js/components/issue/popups/__tests__/ChangelogPopup-test.tsx b/server/sonar-web/src/main/js/components/issue/popups/__tests__/ChangelogPopup-test.tsx index 141238705e1..a2c1c2eb712 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/__tests__/ChangelogPopup-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/__tests__/ChangelogPopup-test.tsx @@ -19,8 +19,8 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getIssueChangelog } from '../../../../api/issues'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import ChangelogPopup from '../ChangelogPopup'; jest.mock('../../../../api/issues', () => ({ diff --git a/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentDeletePopup-test.tsx b/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentDeletePopup-test.tsx index 30e1fa23638..dc620384173 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentDeletePopup-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentDeletePopup-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import CommentDeletePopup from '../CommentDeletePopup'; it('should render the comment delete popup correctly', () => { diff --git a/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentPopup-test.tsx b/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentPopup-test.tsx index 0f234f38d26..28364fe0a3f 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentPopup-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/__tests__/CommentPopup-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import CommentPopup from '../CommentPopup'; it('should render the comment popup correctly without existing comment', () => { diff --git a/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetAssigneePopup-test.tsx b/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetAssigneePopup-test.tsx index 7a744a33cf2..71861beb06b 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetAssigneePopup-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetAssigneePopup-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { searchUsers } from '../../../../api/users'; import { mockLoggedInUser, mockUser } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { SetAssigneePopup } from '../SetAssigneePopup'; jest.mock('../../../../api/users', () => { diff --git a/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetTransitionPopup-test.tsx b/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetTransitionPopup-test.tsx index 95f57dff106..bcd199f2a18 100644 --- a/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetTransitionPopup-test.tsx +++ b/server/sonar-web/src/main/js/components/issue/popups/__tests__/SetTransitionPopup-test.tsx @@ -19,11 +19,11 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { hasMessage } from 'sonar-ui-common/helpers/l10n'; +import { hasMessage } from '../../../../sonar-ui-common/helpers/l10n'; import SetTransitionPopup, { Props } from '../SetTransitionPopup'; -jest.mock('sonar-ui-common/helpers/l10n', () => ({ - ...jest.requireActual('sonar-ui-common/helpers/l10n'), +jest.mock('../../../../sonar-ui-common/helpers/l10n', () => ({ + ...jest.requireActual('../../../../sonar-ui-common/helpers/l10n'), hasMessage: jest.fn().mockReturnValue(false) })); diff --git a/server/sonar-web/src/main/js/components/measure/Measure.tsx b/server/sonar-web/src/main/js/components/measure/Measure.tsx index 57ad705956e..f1d0d8469e0 100644 --- a/server/sonar-web/src/main/js/components/measure/Measure.tsx +++ b/server/sonar-web/src/main/js/components/measure/Measure.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import Level from 'sonar-ui-common/components/ui/Level'; -import Rating from 'sonar-ui-common/components/ui/Rating'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import Level from '../../sonar-ui-common/components/ui/Level'; +import Rating from '../../sonar-ui-common/components/ui/Rating'; +import { formatMeasure } from '../../sonar-ui-common/helpers/measures'; import { getRatingTooltip } from './utils'; interface Props { diff --git a/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx b/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx index 3fbcfaba327..222222308c2 100644 --- a/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx +++ b/server/sonar-web/src/main/js/components/shared/SeverityHelper.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import SeverityIcon from 'sonar-ui-common/components/icons/SeverityIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import SeverityIcon from '../../sonar-ui-common/components/icons/SeverityIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/shared/StatusHelper.tsx b/server/sonar-web/src/main/js/components/shared/StatusHelper.tsx index 7c4d972c25c..bc9de1dd8a0 100644 --- a/server/sonar-web/src/main/js/components/shared/StatusHelper.tsx +++ b/server/sonar-web/src/main/js/components/shared/StatusHelper.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import StatusIcon from 'sonar-ui-common/components/icons/StatusIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import StatusIcon from '../../sonar-ui-common/components/icons/StatusIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/shared/TypeHelper.tsx b/server/sonar-web/src/main/js/components/shared/TypeHelper.tsx index 02aab6b4ed1..18ac7cc516f 100644 --- a/server/sonar-web/src/main/js/components/shared/TypeHelper.tsx +++ b/server/sonar-web/src/main/js/components/shared/TypeHelper.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import IssueTypeIcon from 'sonar-ui-common/components/icons/IssueTypeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import IssueTypeIcon from '../../sonar-ui-common/components/icons/IssueTypeIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; interface Props { className?: string; diff --git a/server/sonar-web/src/main/js/components/tags/TagsList.tsx b/server/sonar-web/src/main/js/components/tags/TagsList.tsx index 11192df6c6f..00853bc998b 100644 --- a/server/sonar-web/src/main/js/components/tags/TagsList.tsx +++ b/server/sonar-web/src/main/js/components/tags/TagsList.tsx @@ -19,9 +19,9 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import DropdownIcon from 'sonar-ui-common/components/icons/DropdownIcon'; -import TagsIcon from 'sonar-ui-common/components/icons/TagsIcon'; -import { translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import DropdownIcon from '../../sonar-ui-common/components/icons/DropdownIcon'; +import TagsIcon from '../../sonar-ui-common/components/icons/TagsIcon'; +import { translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; import './TagsList.css'; interface Props { diff --git a/server/sonar-web/src/main/js/components/tags/TagsSelector.tsx b/server/sonar-web/src/main/js/components/tags/TagsSelector.tsx index b98f161b572..ae83cabad8c 100644 --- a/server/sonar-web/src/main/js/components/tags/TagsSelector.tsx +++ b/server/sonar-web/src/main/js/components/tags/TagsSelector.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; import MultiSelect from '../common/MultiSelect'; import './TagsList.css'; diff --git a/server/sonar-web/src/main/js/components/tutorials/TutorialSelection.tsx b/server/sonar-web/src/main/js/components/tutorials/TutorialSelection.tsx index 2dd1d3851c9..43588b85c38 100644 --- a/server/sonar-web/src/main/js/components/tutorials/TutorialSelection.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/TutorialSelection.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { WithRouterProps } from 'react-router'; -import { getHostUrl } from 'sonar-ui-common/helpers/urls'; import { getAlmSettingsNoCatch } from '../../api/alm-settings'; import { getValues } from '../../api/settings'; +import { getHostUrl } from '../../sonar-ui-common/helpers/urls'; import { AlmSettingsInstance, ProjectAlmBindingResponse } from '../../types/alm-settings'; import { SettingsKey } from '../../types/settings'; import { withRouter } from '../hoc/withRouter'; diff --git a/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx b/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx index 257077294b7..af7d93ee15d 100644 --- a/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/TutorialSelectionRenderer.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import EllipsisIcon from 'sonar-ui-common/components/icons/EllipsisIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import EllipsisIcon from '../../sonar-ui-common/components/icons/EllipsisIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../sonar-ui-common/helpers/urls'; import { AlmKeys, AlmSettingsInstance, ProjectAlmBindingResponse } from '../../types/alm-settings'; import AzurePipelinesTutorial from './azure-pipelines/AzurePipelinesTutorial'; import BitbucketPipelinesTutorial from './bitbucket-pipelines/BitbucketPipelinesTutorial'; diff --git a/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelection-test.tsx b/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelection-test.tsx index 8fbac8a413e..6eab55cfecf 100644 --- a/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelection-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelection-test.tsx @@ -19,8 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; -import { getHostUrl } from 'sonar-ui-common/helpers/urls'; import { getAlmSettingsNoCatch } from '../../../api/alm-settings'; import { getValues } from '../../../api/settings'; import { @@ -33,11 +31,13 @@ import { mockLoggedInUser, mockRouter } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; +import { getHostUrl } from '../../../sonar-ui-common/helpers/urls'; import { SettingsKey } from '../../../types/settings'; import { TutorialSelection } from '../TutorialSelection'; import { TutorialModes } from '../types'; -jest.mock('sonar-ui-common/helpers/urls', () => ({ +jest.mock('../../../sonar-ui-common/helpers/urls', () => ({ getHostUrl: jest.fn().mockReturnValue('http://host.url') })); diff --git a/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx b/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx index 70c2829493a..a6c45ad79f7 100644 --- a/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/__tests__/TutorialSelectionRenderer-test.tsx @@ -19,7 +19,6 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockAlmSettingsInstance, mockProjectAzureBindingResponse, @@ -29,6 +28,7 @@ import { mockProjectGitLabBindingResponse } from '../../../helpers/mocks/alm-settings'; import { mockComponent, mockLoggedInUser } from '../../../helpers/testMocks'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import TutorialSelectionRenderer, { TutorialSelectionRendererProps } from '../TutorialSelectionRenderer'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx index fd794e44f4d..e54a817f490 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/AzurePipelinesTutorial.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import AllSetStep from '../components/AllSetStep'; import FinishButton from '../components/FinishButton'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/BranchAnalysisStepContent.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/BranchAnalysisStepContent.tsx index e8fd38050d4..7bd83625b83 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/BranchAnalysisStepContent.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/BranchAnalysisStepContent.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getLanguages, Store } from '../../../store/rootReducer'; import RenderOptions from '../components/RenderOptions'; import { BuildTools } from '../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ExtensionInstallationStepContent.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ExtensionInstallationStepContent.tsx index 0fc014113d0..457a3c85238 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ExtensionInstallationStepContent.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ExtensionInstallationStepContent.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export default function ExtensionInstallationStepContent() { return ( diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/JavaToolInstallation.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/JavaToolInstallation.tsx index c4619c8e4c5..4f357e41299 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/JavaToolInstallation.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/JavaToolInstallation.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; function renderSentenceWithFieldAndValue(props: { field: React.ReactNode; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx index 04254a2482b..330d2175399 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/ServiceEndpointStepContent.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import EditTokenModal from '../components/EditTokenModal'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx index 21c414bd54b..245a6279f4c 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/AzurePipelinesTutorial-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockComponent, mockLoggedInUser } from '../../../../helpers/testMocks'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import Step from '../../components/Step'; import AzurePipelinesTutorial, { AzurePipelinesTutorialProps } from '../AzurePipelinesTutorial'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/ServiceEndpointStepContent-test.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/ServiceEndpointStepContent-test.tsx index 0f4f849718f..05d0a5e3de6 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/ServiceEndpointStepContent-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/__tests__/ServiceEndpointStepContent-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { click } from 'sonar-ui-common/helpers/testUtils'; import { mockComponent, mockLoggedInUser } from '../../../../helpers/testMocks'; +import { Button } from '../../../../sonar-ui-common/components/controls/buttons'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import EditTokenModal from '../../components/EditTokenModal'; import ServiceEndpointStepContent from '../ServiceEndpointStepContent'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/AlertClassicEditor.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/AlertClassicEditor.tsx index 06aca839b05..136242ab73b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/AlertClassicEditor.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/AlertClassicEditor.tsx @@ -21,9 +21,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { ALM_DOCUMENTATION_PATHS } from '../../../../helpers/constants'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../../types/alm-settings'; export default function AlertClassicEditor() { diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx index d0b7783818c..1cdc13e7ed5 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/ClangGCC.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getHostUrl } from 'sonar-ui-common/helpers/urls'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; +import { getHostUrl } from '../../../../sonar-ui-common/helpers/urls'; import CodeSnippet from '../../../common/CodeSnippet'; import { CompilationInfo } from '../../components/CompilationInfo'; import RenderOptions from '../../components/RenderOptions'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaGradle.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaGradle.tsx index 372499561dd..ac9b306252d 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaGradle.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaGradle.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; import { BuildTools } from '../../types'; import JavaToolInstallation from '../JavaToolInstallation'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaMaven.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaMaven.tsx index aee48bdc51d..50f84fce710 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaMaven.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/JavaMaven.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { translate, translateWithParameters } from '../../../../sonar-ui-common/helpers/l10n'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; import { BuildTools } from '../../types'; import JavaToolInstallation from '../JavaToolInstallation'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PrepareAnalysisCommand.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PrepareAnalysisCommand.tsx index 744a22da66e..b43b6ce906e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PrepareAnalysisCommand.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PrepareAnalysisCommand.tsx @@ -20,8 +20,8 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; import { BuildTools } from '../../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PublishSteps.tsx b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PublishSteps.tsx index 580301e681c..a4b99aaa31b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PublishSteps.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/azure-pipelines/commands/PublishSteps.tsx @@ -21,9 +21,9 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { ALM_DOCUMENTATION_PATHS } from '../../../../helpers/constants'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../../types/alm-settings'; import { withAppState } from '../../../hoc/withAppState'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/BitbucketPipelinesTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/BitbucketPipelinesTutorial.tsx index 76f314de563..7366acaa63e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/BitbucketPipelinesTutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/BitbucketPipelinesTutorial.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/PreambuleYaml.tsx b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/PreambuleYaml.tsx index 910cfa3034c..bfc5e8499be 100644 --- a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/PreambuleYaml.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/PreambuleYaml.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../common/CodeSnippet'; import DefaultProjectKey from '../components/DefaultProjectKey'; import { BuildTools } from '../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx index 61c4d6fc076..c3227e8a063 100644 --- a/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/bitbucket-pipelines/RepositoryVariables.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmSettingsInstance, ProjectAlmBindingResponse } from '../../../types/alm-settings'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; import TokenStepGenerator from '../components/TokenStepGenerator'; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/AllSet.tsx b/server/sonar-web/src/main/js/components/tutorials/components/AllSet.tsx index 1721c3d3f84..5e71426c94d 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/AllSet.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/AllSet.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../sonar-ui-common/helpers/urls'; import { AlmKeys } from '../../../types/alm-settings'; import { withAppState } from '../../hoc/withAppState'; import SentenceWithHighlights from './SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/AllSetStep.tsx b/server/sonar-web/src/main/js/components/tutorials/components/AllSetStep.tsx index 0146f4968b3..5f823cc2075 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/AllSetStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/AllSetStep.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import AllSet from './AllSet'; import Step from './Step'; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx b/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx index f86872e8751..51cbcf43cbd 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/CompilationInfo.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface CompilationInfoProps { className?: string; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/CreateYmlFile.tsx b/server/sonar-web/src/main/js/components/tutorials/components/CreateYmlFile.tsx index 395aadbc729..a08f0ab767d 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/CreateYmlFile.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/CreateYmlFile.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../common/CodeSnippet'; export interface CreateYmlFileProps { diff --git a/server/sonar-web/src/main/js/components/tutorials/components/EditTokenModal.tsx b/server/sonar-web/src/main/js/components/tutorials/components/EditTokenModal.tsx index ed775c90b11..fff4339ec1b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/EditTokenModal.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/EditTokenModal.tsx @@ -20,13 +20,13 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Button, DeleteButton } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import SimpleModal from 'sonar-ui-common/components/controls/SimpleModal'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; import { generateToken, getTokens, revokeToken } from '../../../api/user-tokens'; +import { Button, DeleteButton } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import SimpleModal from '../../../sonar-ui-common/components/controls/SimpleModal'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import DeferredSpinner from '../../../sonar-ui-common/components/ui/DeferredSpinner'; +import { translate, translateWithParameters } from '../../../sonar-ui-common/helpers/l10n'; import { getUniqueTokenName } from '../utils'; interface State { diff --git a/server/sonar-web/src/main/js/components/tutorials/components/FinishButton.tsx b/server/sonar-web/src/main/js/components/tutorials/components/FinishButton.tsx index 491637b730f..317c5b35fc0 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/FinishButton.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/FinishButton.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { rawSizes } from '../../../app/theme'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ChevronRightIcon from '../../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface FinishButtonProps { onClick: () => void; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/LabelActionPair.tsx b/server/sonar-web/src/main/js/components/tutorials/components/LabelActionPair.tsx index 18962f7f96e..962c4ec10e3 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/LabelActionPair.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/LabelActionPair.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface LabelActionPairProps { translationKey: string; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/LabelValuePair.tsx b/server/sonar-web/src/main/js/components/tutorials/components/LabelValuePair.tsx index 7f55ff7fbe8..9ee3babea90 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/LabelValuePair.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/LabelValuePair.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface LabelValuePairProps { translationKey: string; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/RenderOptions.tsx b/server/sonar-web/src/main/js/components/tutorials/components/RenderOptions.tsx index 84659248d5b..ae796aa23ce 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/RenderOptions.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/RenderOptions.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import RadioToggle from '../../../sonar-ui-common/components/controls/RadioToggle'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface RenderOptionsProps { checked: string | undefined; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithFilename.tsx b/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithFilename.tsx index ad1e328ea14..d8d392d1a9a 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithFilename.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithFilename.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface SentenceWithFilenameProps { filename: string; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithHighlights.tsx b/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithHighlights.tsx index 0a4d57d3bc7..de7b5b23a0f 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithHighlights.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/SentenceWithHighlights.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface SentenceWithHighlightsProps { highlightKeys: string[]; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/TokenStepGenerator.tsx b/server/sonar-web/src/main/js/components/tutorials/components/TokenStepGenerator.tsx index dea0fa4a8c6..cbafc901032 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/TokenStepGenerator.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/TokenStepGenerator.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import EditTokenModal from './EditTokenModal'; export interface TokenStepGeneratorProps { diff --git a/server/sonar-web/src/main/js/components/tutorials/components/YamlFileStep.tsx b/server/sonar-web/src/main/js/components/tutorials/components/YamlFileStep.tsx index f9a6c4828c2..21d108c479d 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/YamlFileStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/YamlFileStep.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { withCLanguageFeature } from '../../hoc/withCLanguageFeature'; import RenderOptions from '../components/RenderOptions'; import { BuildTools } from '../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/__tests__/EditTokenModal-test.tsx b/server/sonar-web/src/main/js/components/tutorials/components/__tests__/EditTokenModal-test.tsx index 95098784d0c..062c1cef18f 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/__tests__/EditTokenModal-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/__tests__/EditTokenModal-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { generateToken, getTokens, revokeToken } from '../../../../api/user-tokens'; import { mockComponent, mockEvent, mockLoggedInUser } from '../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../sonar-ui-common/helpers/testUtils'; import { getUniqueTokenName } from '../../utils'; import EditTokenModal from '../EditTokenModal'; diff --git a/server/sonar-web/src/main/js/components/tutorials/components/__tests__/Step-test.tsx b/server/sonar-web/src/main/js/components/tutorials/components/__tests__/Step-test.tsx index 10983bab7a6..4672e3b653e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/components/__tests__/Step-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/components/__tests__/Step-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../../sonar-ui-common/helpers/testUtils'; import Step from '../Step'; it('renders', () => { diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/GitHubActionTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/github-action/GitHubActionTutorial.tsx index 7be0f3252a0..c990ecce3d3 100644 --- a/server/sonar-web/src/main/js/components/tutorials/github-action/GitHubActionTutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/github-action/GitHubActionTutorial.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/SecretStep.tsx b/server/sonar-web/src/main/js/components/tutorials/github-action/SecretStep.tsx index 8e91c51c7a6..6253a56bdf6 100644 --- a/server/sonar-web/src/main/js/components/tutorials/github-action/SecretStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/github-action/SecretStep.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmSettingsInstance, ProjectAlmBindingResponse } from '../../../types/alm-settings'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; import TokenStepGenerator from '../components/TokenStepGenerator'; diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/CFamily.tsx b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/CFamily.tsx index 4f2a13aeae7..0a223beaf08 100644 --- a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/CFamily.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/CFamily.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { CompilationInfo } from '../../components/CompilationInfo'; import CreateYmlFile from '../../components/CreateYmlFile'; import DefaultProjectKey from '../../components/DefaultProjectKey'; diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx index af28cb25261..8f7ba36e3ce 100644 --- a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/Gradle.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import CreateYmlFile from '../../components/CreateYmlFile'; import FinishButton from '../../components/FinishButton'; diff --git a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/JavaMaven.tsx b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/JavaMaven.tsx index 879f9df3334..73618bc6b5b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/github-action/commands/JavaMaven.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/github-action/commands/JavaMaven.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import CreateYmlFile from '../../components/CreateYmlFile'; import FinishButton from '../../components/FinishButton'; diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx index beb4f2f9ae6..4c770fed88a 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/EnvironmentVariablesStep.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Step from '../components/Step'; import TokenStepGenerator from '../components/TokenStepGenerator'; diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/GitLabCITutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/GitLabCITutorial.tsx index 6595d407972..c302598a3a7 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/GitLabCITutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/GitLabCITutorial.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import AllSetStep from '../components/AllSetStep'; import { BuildTools } from '../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/ProjectKeyStep.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/ProjectKeyStep.tsx index d4f03a0480e..f1f095cc228 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/ProjectKeyStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/ProjectKeyStep.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../common/CodeSnippet'; import { withCLanguageFeature } from '../../hoc/withCLanguageFeature'; import RenderOptions from '../components/RenderOptions'; diff --git a/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx b/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx index d6be9f21cc0..6620ccdaada 100644 --- a/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/gitlabci/YmlFileStep.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../sonar-ui-common/components/controls/clipboard'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { withAppState } from '../../hoc/withAppState'; import FinishButton from '../components/FinishButton'; import Step from '../components/Step'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx index 0af21063e28..43393164c70 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsTutorial.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { connect } from 'react-redux'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { getAppState, getCurrentUserSetting, Store } from '../../../store/rootReducer'; import { setCurrentUserSetting } from '../../../store/users'; import { diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsfileStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsfileStep.tsx index a6ab708384f..057511e09e5 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsfileStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/JenkinsfileStep.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { withCLanguageFeature } from '../../hoc/withCLanguageFeature'; import RenderOptions from '../components/RenderOptions'; import Step from '../components/Step'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx index 13c866859e2..475df4e7d67 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/MultiBranchPipelineStep.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { rawSizes } from '../../../app/theme'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ChevronRightIcon from '../../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/PipelineStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/PipelineStep.tsx index 7123047dd6b..a75017cf628 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/PipelineStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/PipelineStep.tsx @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { rawSizes } from '../../../app/theme'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import ChevronRightIcon from '../../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import LabelActionPair from '../components/LabelActionPair'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx index c488fb4b526..ec20d0ddc73 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/PreRequisitesStep.tsx @@ -20,12 +20,12 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Button } from 'sonar-ui-common/components/controls/buttons'; -import Checkbox from 'sonar-ui-common/components/controls/Checkbox'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { rawSizes } from '../../../app/theme'; +import { Button } from '../../../sonar-ui-common/components/controls/buttons'; +import Checkbox from '../../../sonar-ui-common/components/controls/Checkbox'; +import ChevronRightIcon from '../../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; import Step from '../components/Step'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/SelectAlmStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/SelectAlmStep.tsx index 20579ed0110..f2bc56e759a 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/SelectAlmStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/SelectAlmStep.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import { hasMessage, translate } from 'sonar-ui-common/helpers/l10n'; +import RadioToggle from '../../../sonar-ui-common/components/controls/RadioToggle'; +import AlertSuccessIcon from '../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import { hasMessage, translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys } from '../../../types/alm-settings'; import Step from '../components/Step'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStep.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStep.tsx index e0a9a5cdb2d..11dbe47aa07 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStep.tsx @@ -19,10 +19,10 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Button, ButtonLink } from 'sonar-ui-common/components/controls/buttons'; -import ChevronRightIcon from 'sonar-ui-common/components/icons/ChevronRightIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { rawSizes } from '../../../app/theme'; +import { Button, ButtonLink } from '../../../sonar-ui-common/components/controls/buttons'; +import ChevronRightIcon from '../../../sonar-ui-common/components/icons/ChevronRightIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepBitbucket.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepBitbucket.tsx index b5bdfb0f7ac..05fd27ef083 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepBitbucket.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepBitbucket.tsx @@ -19,9 +19,9 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { stripTrailingSlash } from '../../../helpers/urls'; +import { Alert } from '../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmKeys, AlmSettingsInstance, diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx index 3ab1a430141..c94a66d0288 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGitLab.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../common/CodeSnippet'; import LabelActionPair from '../components/LabelActionPair'; import SentenceWithHighlights from '../components/SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx index 64d20fd3ed7..9c446ea7185 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/WebhookStepGithub.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { AlmSettingsInstance, ProjectAlmBindingResponse } from '../../../types/alm-settings'; import CodeSnippet from '../../common/CodeSnippet'; import LabelActionPair from '../components/LabelActionPair'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/SelectAlmStep-test.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/SelectAlmStep-test.tsx index d0d3b95b9b6..4096d4a347a 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/SelectAlmStep-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/__tests__/SelectAlmStep-test.tsx @@ -24,7 +24,7 @@ import { AlmKeys } from '../../../../types/alm-settings'; import Step from '../../components/Step'; import SelectAlmStep, { SelectAlmStepProps } from '../SelectAlmStep'; -jest.mock('sonar-ui-common/helpers/l10n', () => ({ +jest.mock('../../../../sonar-ui-common/helpers/l10n', () => ({ hasMessage: (_a: string, k: string, _b: string) => k === AlmKeys.BitbucketCloud, translate: (...k: string[]) => k.join('.') })); diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx index 40572ef286f..03376585600 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CFamilly.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { CompilationInfo } from '../../components/CompilationInfo'; import DefaultProjectKey from '../../components/DefaultProjectKey'; import FinishButton from '../../components/FinishButton'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CreateJenkinsfileBulletPoint.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CreateJenkinsfileBulletPoint.tsx index f87c1c9616f..3a4beda931e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CreateJenkinsfileBulletPoint.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/CreateJenkinsfileBulletPoint.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import HelpTooltip from 'sonar-ui-common/components/controls/HelpTooltip'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; +import HelpTooltip from '../../../../sonar-ui-common/components/controls/HelpTooltip'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; import CodeSnippet from '../../../common/CodeSnippet'; import SentenceWithFilename from '../../components/SentenceWithFilename'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx index 2664493f4d1..fe6c15d88cf 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNet.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import FinishButton from '../../components/FinishButton'; import RenderOptions from '../../components/RenderOptions'; import { OSs } from '../../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsMSBuild.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsMSBuild.tsx index 9a64daa0414..3db98dc4ed2 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsMSBuild.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsMSBuild.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../../sonar-ui-common/components/controls/clipboard'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; export default function DotNetPrereqsMSBuild() { diff --git a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsScanner.tsx b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsScanner.tsx index a68e7b1055b..708e4518ddc 100644 --- a/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsScanner.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/jenkins/buildtool-steps/DotNetPrereqsScanner.tsx @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClipboardIconButton } from 'sonar-ui-common/components/controls/clipboard'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ClipboardIconButton } from '../../../../sonar-ui-common/components/controls/clipboard'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import SentenceWithHighlights from '../../components/SentenceWithHighlights'; export default function DotNetPrereqsScanner() { diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/BuildToolForm.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/BuildToolForm.tsx index c805794317f..aad059d1c9b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/BuildToolForm.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/BuildToolForm.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import RadioToggle from 'sonar-ui-common/components/controls/RadioToggle'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import RadioToggle from '../../../sonar-ui-common/components/controls/RadioToggle'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import { withCLanguageFeature } from '../../hoc/withCLanguageFeature'; import RenderOptions from '../components/RenderOptions'; import { BuildTools, ManualTutorialConfig, OSs } from '../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx index 0b782d55708..d7cf0a1ec1b 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/DoneNextSteps.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; export interface DoneNextStepsProps { component: T.Component; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/ManualTutorial.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/ManualTutorial.tsx index e1f666c9755..4dfcedaef7a 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/ManualTutorial.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/ManualTutorial.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import InstanceMessage from '../../common/InstanceMessage'; import ProjectAnalysisStep from './ProjectAnalysisStep'; import TokenStep from './TokenStep'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/ProjectAnalysisStep.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/ProjectAnalysisStep.tsx index e82ae41c58d..10d35f2fd04 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/ProjectAnalysisStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/ProjectAnalysisStep.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Step from '../components/Step'; import { ManualTutorialConfig } from '../types'; import BuildToolForm from './BuildToolForm'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/TokenStep.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/TokenStep.tsx index 3c109bcba50..02b53819950 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/TokenStep.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/TokenStep.tsx @@ -20,12 +20,16 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { Button, DeleteButton, SubmitButton } from 'sonar-ui-common/components/controls/buttons'; -import Radio from 'sonar-ui-common/components/controls/Radio'; -import AlertErrorIcon from 'sonar-ui-common/components/icons/AlertErrorIcon'; -import AlertSuccessIcon from 'sonar-ui-common/components/icons/AlertSuccessIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; import { generateToken, getTokens, revokeToken } from '../../../api/user-tokens'; +import { + Button, + DeleteButton, + SubmitButton +} from '../../../sonar-ui-common/components/controls/buttons'; +import Radio from '../../../sonar-ui-common/components/controls/Radio'; +import AlertErrorIcon from '../../../sonar-ui-common/components/icons/AlertErrorIcon'; +import AlertSuccessIcon from '../../../sonar-ui-common/components/icons/AlertSuccessIcon'; +import { translate } from '../../../sonar-ui-common/helpers/l10n'; import Step from '../components/Step'; import { getUniqueTokenName } from '../utils'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/TokenStep-test.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/TokenStep-test.tsx index b180ee09174..f12c9486df2 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/TokenStep-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/__tests__/TokenStep-test.tsx @@ -19,7 +19,12 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { change, click, submit, waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { + change, + click, + submit, + waitAndUpdate +} from '../../../../sonar-ui-common/helpers/testUtils'; import TokenStep from '../TokenStep'; jest.mock('../../../../api/user-tokens', () => ({ diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/AnalysisCommand.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/AnalysisCommand.tsx index 1cb28a011d1..120757ccf6e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/AnalysisCommand.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/AnalysisCommand.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { getHostUrl } from 'sonar-ui-common/helpers/urls'; +import { getHostUrl } from '../../../../sonar-ui-common/helpers/urls'; import { BuildTools, ManualTutorialConfig } from '../../types'; import ClangGCCCustom from './ClangGCCCommand'; import DotNet from './DotNet'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetCore.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetCore.tsx index 9d74fe62b43..ba3b40b0650 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetCore.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetCore.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; -import { Alert } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { Alert } from '../../../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import { DotNetProps } from './DotNet'; import DotNetExecute from './DotNetExecute'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetExecute.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetExecute.tsx index 56091251a9a..9d3daf27387 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetExecute.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetExecute.tsx @@ -21,7 +21,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; import DoneNextSteps from '../DoneNextSteps'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetFramework.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetFramework.tsx index 2542db69702..2f22d88b1ad 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetFramework.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNetFramework.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { DotNetProps } from './DotNet'; import DotNetExecute from './DotNetExecute'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadBuildWrapper.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadBuildWrapper.tsx index 0e8636b9763..d7c90aa69d2 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadBuildWrapper.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadBuildWrapper.tsx @@ -19,8 +19,8 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; +import { getBaseUrl } from '../../../../sonar-ui-common/helpers/urls'; import { OSs } from '../../types'; export interface DownloadBuildWrapperProps { diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadScanner.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadScanner.tsx index 81ef04c99b7..f30d9f50657 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadScanner.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DownloadScanner.tsx @@ -19,7 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import { OSs } from '../../types'; interface Props { diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecBuildWrapper.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecBuildWrapper.tsx index 677d22f2f77..57b60f8aaa2 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecBuildWrapper.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecBuildWrapper.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import { OSs } from '../../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecScanner.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecScanner.tsx index a3c2083ec34..ae71a14ddaa 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecScanner.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/ExecScanner.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; import { OSs } from '../../types'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx index 773148047c2..2a39fd02072 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; import DoneNextSteps from '../DoneNextSteps'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx index d6e00ac2fbf..b934fa55c32 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx @@ -20,7 +20,7 @@ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; import { Link } from 'react-router'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../../../../sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; import DoneNextSteps from '../DoneNextSteps'; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/AnalysisCommand-test.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/AnalysisCommand-test.tsx index b4687447326..ccd19e18c92 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/AnalysisCommand-test.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/AnalysisCommand-test.tsx @@ -23,7 +23,7 @@ import { mockComponent } from '../../../../../helpers/testMocks'; import { BuildTools, OSs } from '../../../types'; import AnalysisCommand, { AnalysisCommandProps } from '../AnalysisCommand'; -jest.mock('sonar-ui-common/helpers/urls', () => ({ +jest.mock('../../../../../sonar-ui-common/helpers/urls', () => ({ getHostUrl: () => 'HOST' })); diff --git a/server/sonar-web/src/main/js/components/ui/Avatar.tsx b/server/sonar-web/src/main/js/components/ui/Avatar.tsx index 5d1f705aaaa..3f7548db439 100644 --- a/server/sonar-web/src/main/js/components/ui/Avatar.tsx +++ b/server/sonar-web/src/main/js/components/ui/Avatar.tsx @@ -20,7 +20,7 @@ import * as classNames from 'classnames'; import * as React from 'react'; import { connect } from 'react-redux'; -import GenericAvatar from 'sonar-ui-common/components/ui/GenericAvatar'; +import GenericAvatar from '../../sonar-ui-common/components/ui/GenericAvatar'; import { getGlobalSettingValue, Store } from '../../store/rootReducer'; interface Props { diff --git a/server/sonar-web/src/main/js/components/ui/CoverageRating.tsx b/server/sonar-web/src/main/js/components/ui/CoverageRating.tsx index 52b5601d4f0..a73ae9b4bd1 100644 --- a/server/sonar-web/src/main/js/components/ui/CoverageRating.tsx +++ b/server/sonar-web/src/main/js/components/ui/CoverageRating.tsx @@ -18,11 +18,11 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; import { colors } from '../../app/theme'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; const DonutChart = lazyLoadComponent( - () => import('sonar-ui-common/components/charts/DonutChart'), + () => import('../../sonar-ui-common/components/charts/DonutChart'), 'DonutChart' ); diff --git a/server/sonar-web/src/main/js/components/ui/DismissableAlert.tsx b/server/sonar-web/src/main/js/components/ui/DismissableAlert.tsx index 9c3fa5f8dea..8e2ac8ca4da 100644 --- a/server/sonar-web/src/main/js/components/ui/DismissableAlert.tsx +++ b/server/sonar-web/src/main/js/components/ui/DismissableAlert.tsx @@ -19,11 +19,11 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import ClearIcon from 'sonar-ui-common/components/icons/ClearIcon'; -import { Alert, AlertProps } from 'sonar-ui-common/components/ui/Alert'; -import { translate } from 'sonar-ui-common/helpers/l10n'; -import { get, save } from 'sonar-ui-common/helpers/storage'; +import { ButtonIcon } from '../../sonar-ui-common/components/controls/buttons'; +import ClearIcon from '../../sonar-ui-common/components/icons/ClearIcon'; +import { Alert, AlertProps } from '../../sonar-ui-common/components/ui/Alert'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; +import { get, save } from '../../sonar-ui-common/helpers/storage'; import './DismissableAlert.css'; export interface DismissableAlertProps extends AlertProps { diff --git a/server/sonar-web/src/main/js/components/ui/PageShortcutsTooltip.tsx b/server/sonar-web/src/main/js/components/ui/PageShortcutsTooltip.tsx index 5af086cd941..4f20d315791 100644 --- a/server/sonar-web/src/main/js/components/ui/PageShortcutsTooltip.tsx +++ b/server/sonar-web/src/main/js/components/ui/PageShortcutsTooltip.tsx @@ -19,8 +19,8 @@ */ import * as classNames from 'classnames'; import * as React from 'react'; -import Tooltip from 'sonar-ui-common/components/controls/Tooltip'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import Tooltip from '../../sonar-ui-common/components/controls/Tooltip'; +import { translate, translateWithParameters } from '../../sonar-ui-common/helpers/l10n'; export interface PageShortcutsTooltipProps { className?: string; diff --git a/server/sonar-web/src/main/js/components/ui/__tests__/DismissableAlert-test.tsx b/server/sonar-web/src/main/js/components/ui/__tests__/DismissableAlert-test.tsx index c371d5a0c19..2de4b43a827 100644 --- a/server/sonar-web/src/main/js/components/ui/__tests__/DismissableAlert-test.tsx +++ b/server/sonar-web/src/main/js/components/ui/__tests__/DismissableAlert-test.tsx @@ -20,15 +20,15 @@ import { shallow } from 'enzyme'; import * as React from 'react'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import { save } from 'sonar-ui-common/helpers/storage'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { ButtonIcon } from '../../../sonar-ui-common/components/controls/buttons'; +import { save } from '../../../sonar-ui-common/helpers/storage'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import DismissableAlert, { DismissableAlertProps, DISMISSED_ALERT_STORAGE_KEY } from '../DismissableAlert'; -jest.mock('sonar-ui-common/helpers/storage', () => ({ +jest.mock('../../../sonar-ui-common/helpers/storage', () => ({ get: jest.fn((_: string, suffix: string) => (suffix === 'bar' ? 'true' : undefined)), save: jest.fn() })); diff --git a/server/sonar-web/src/main/js/components/workspace/Workspace.tsx b/server/sonar-web/src/main/js/components/workspace/Workspace.tsx index cfd5f2415a0..80cb63af455 100644 --- a/server/sonar-web/src/main/js/components/workspace/Workspace.tsx +++ b/server/sonar-web/src/main/js/components/workspace/Workspace.tsx @@ -19,9 +19,9 @@ */ import { omit, uniqBy } from 'lodash'; import * as React from 'react'; -import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent'; -import { get, save } from 'sonar-ui-common/helpers/storage'; import { getRulesApp } from '../../api/rules'; +import { lazyLoadComponent } from '../../sonar-ui-common/components/lazyLoadComponent'; +import { get, save } from '../../sonar-ui-common/helpers/storage'; import { ComponentDescriptor, RuleDescriptor, WorkspaceContext } from './context'; import './styles.css'; import WorkspacePortal from './WorkspacePortal'; diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentTitle.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentTitle.tsx index 10e55f2910b..4e2775c6c93 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentTitle.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentTitle.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import QualifierIcon from 'sonar-ui-common/components/icons/QualifierIcon'; -import { collapsePath } from 'sonar-ui-common/helpers/path'; +import QualifierIcon from '../../sonar-ui-common/components/icons/QualifierIcon'; +import { collapsePath } from '../../sonar-ui-common/helpers/path'; import { ComponentDescriptor } from './context'; interface Props { diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentViewer.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentViewer.tsx index 09b37d3b13a..a4ccc7cf640 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentViewer.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceComponentViewer.tsx @@ -20,9 +20,9 @@ import { debounce } from 'lodash'; import * as React from 'react'; import { connect } from 'react-redux'; -import { scrollToElement } from 'sonar-ui-common/helpers/scrolling'; import { getParents } from '../../api/components'; import { isPullRequest } from '../../helpers/branch-like'; +import { scrollToElement } from '../../sonar-ui-common/helpers/scrolling'; import { fetchBranchStatus } from '../../store/rootActions'; import { BranchLike } from '../../types/branch-like'; import SourceViewer from '../SourceViewer/SourceViewer'; diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceHeader.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceHeader.tsx index 51765517b08..c9c9a3adc9e 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceHeader.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceHeader.tsx @@ -19,13 +19,13 @@ */ import * as React from 'react'; import { DraggableCore, DraggableData } from 'react-draggable'; -import { ButtonIcon } from 'sonar-ui-common/components/controls/buttons'; -import ClearIcon from 'sonar-ui-common/components/icons/ClearIcon'; -import CollapseIcon from 'sonar-ui-common/components/icons/CollapseIcon'; -import ExpandIcon from 'sonar-ui-common/components/icons/ExpandIcon'; -import { IconProps } from 'sonar-ui-common/components/icons/Icon'; -import MinimizeIcon from 'sonar-ui-common/components/icons/MinimizeIcon'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { ButtonIcon } from '../../sonar-ui-common/components/controls/buttons'; +import ClearIcon from '../../sonar-ui-common/components/icons/ClearIcon'; +import CollapseIcon from '../../sonar-ui-common/components/icons/CollapseIcon'; +import ExpandIcon from '../../sonar-ui-common/components/icons/ExpandIcon'; +import { IconProps } from '../../sonar-ui-common/components/icons/Icon'; +import MinimizeIcon from '../../sonar-ui-common/components/icons/MinimizeIcon'; +import { translate } from '../../sonar-ui-common/helpers/l10n'; export interface Props { children: React.ReactNode; diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceNavItem.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceNavItem.tsx index dd25f73f540..2b5c9cc85af 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceNavItem.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceNavItem.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { ClearButton } from 'sonar-ui-common/components/controls/buttons'; +import { ClearButton } from '../../sonar-ui-common/components/controls/buttons'; export interface Props { children: React.ReactNode; diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleDetails.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleDetails.tsx index 5c9a7fd6c96..f3782661cab 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleDetails.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleDetails.tsx @@ -19,11 +19,11 @@ */ import { keyBy } from 'lodash'; import * as React from 'react'; -import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; import { getRuleDetails, getRulesApp } from '../../api/rules'; import RuleDetailsDescription from '../../apps/coding-rules/components/RuleDetailsDescription'; import RuleDetailsMeta from '../../apps/coding-rules/components/RuleDetailsMeta'; import '../../apps/coding-rules/styles.css'; +import DeferredSpinner from '../../sonar-ui-common/components/ui/DeferredSpinner'; interface Props { onLoad: (details: { name: string }) => void; diff --git a/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleTitle.tsx b/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleTitle.tsx index aaebd780f4c..a064ce29c62 100644 --- a/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleTitle.tsx +++ b/server/sonar-web/src/main/js/components/workspace/WorkspaceRuleTitle.tsx @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import LightBulbIcon from 'sonar-ui-common/components/icons/LightBulbIcon'; import { colors } from '../../app/theme'; +import LightBulbIcon from '../../sonar-ui-common/components/icons/LightBulbIcon'; import { RuleDescriptor } from './context'; interface Props { diff --git a/server/sonar-web/src/main/js/components/workspace/__tests__/Workspace-test.tsx b/server/sonar-web/src/main/js/components/workspace/__tests__/Workspace-test.tsx index 1c203306601..89fce91ea1d 100644 --- a/server/sonar-web/src/main/js/components/workspace/__tests__/Workspace-test.tsx +++ b/server/sonar-web/src/main/js/components/workspace/__tests__/Workspace-test.tsx @@ -19,9 +19,9 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { get, save } from 'sonar-ui-common/helpers/storage'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { mockBranch } from '../../../helpers/mocks/branch-like'; +import { get, save } from '../../../sonar-ui-common/helpers/storage'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { ComponentQualifier } from '../../../types/component'; import Workspace, { INITIAL_HEIGHT, @@ -31,7 +31,7 @@ import Workspace, { WorkspaceTypes } from '../Workspace'; -jest.mock('sonar-ui-common/helpers/storage', () => { +jest.mock('../../../sonar-ui-common/helpers/storage', () => { return { get: jest.fn(), save: jest.fn() diff --git a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceComponentViewer-test.tsx b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceComponentViewer-test.tsx index 71b86bff688..1f2d8bd4617 100644 --- a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceComponentViewer-test.tsx +++ b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceComponentViewer-test.tsx @@ -19,10 +19,10 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; import { getParents } from '../../../api/components'; import { mockPullRequest } from '../../../helpers/mocks/branch-like'; import { mockIssue } from '../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import { Props, WorkspaceComponentViewer } from '../WorkspaceComponentViewer'; jest.mock('../../../api/components', () => ({ diff --git a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceNavItem-test.tsx b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceNavItem-test.tsx index 6fbd53e06d3..70d05e9ca22 100644 --- a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceNavItem-test.tsx +++ b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceNavItem-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { click } from 'sonar-ui-common/helpers/testUtils'; +import { click } from '../../../sonar-ui-common/helpers/testUtils'; import WorkspaceNavItem, { Props } from '../WorkspaceNavItem'; it('should render', () => { diff --git a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceRuleDetails-test.tsx b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceRuleDetails-test.tsx index 955dedaf246..1e0e71078c6 100644 --- a/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceRuleDetails-test.tsx +++ b/server/sonar-web/src/main/js/components/workspace/__tests__/WorkspaceRuleDetails-test.tsx @@ -19,7 +19,7 @@ */ import { shallow } from 'enzyme'; import * as React from 'react'; -import { waitAndUpdate } from 'sonar-ui-common/helpers/testUtils'; +import { waitAndUpdate } from '../../../sonar-ui-common/helpers/testUtils'; import WorkspaceRuleDetails from '../WorkspaceRuleDetails'; jest.mock('../../../api/rules', () => ({ diff --git a/server/sonar-web/src/main/js/helpers/__tests__/l10n-test.ts b/server/sonar-web/src/main/js/helpers/__tests__/l10n-test.ts index 8d01db29b15..7cc76f01fec 100644 --- a/server/sonar-web/src/main/js/helpers/__tests__/l10n-test.ts +++ b/server/sonar-web/src/main/js/helpers/__tests__/l10n-test.ts @@ -18,9 +18,9 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as reactIntl from 'react-intl'; -import SonarUiCommonInitializer from 'sonar-ui-common/helpers/init'; -import { get } from 'sonar-ui-common/helpers/storage'; import { fetchL10nBundle } from '../../api/l10n'; +import SonarUiCommonInitializer from '../../sonar-ui-common/helpers/init'; +import { get } from '../../sonar-ui-common/helpers/storage'; import { loadL10nBundle } from '../l10n'; beforeEach(() => { @@ -34,7 +34,7 @@ jest.mock('../../api/l10n', () => ({ .mockResolvedValue({ effectiveLocale: 'de', messages: { test_message: 'test' } }) })); -jest.mock('sonar-ui-common/helpers/storage', () => ({ +jest.mock('../../sonar-ui-common/helpers/storage', () => ({ get: jest.fn(), save: jest.fn() })); diff --git a/server/sonar-web/src/main/js/helpers/editions.ts b/server/sonar-web/src/main/js/helpers/editions.ts index 26ef32f2fa7..0bbc36a8ad9 100644 --- a/server/sonar-web/src/main/js/helpers/editions.ts +++ b/server/sonar-web/src/main/js/helpers/editions.ts @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { stringify } from 'querystring'; -import { omitNil } from 'sonar-ui-common/helpers/request'; +import { omitNil } from '../sonar-ui-common/helpers/request'; import { Edition, EditionKey } from '../types/editions'; import { SystemUpgrade } from '../types/system'; diff --git a/server/sonar-web/src/main/js/helpers/extensions.ts b/server/sonar-web/src/main/js/helpers/extensions.ts index 9add8d45ae7..c0357b9380b 100644 --- a/server/sonar-web/src/main/js/helpers/extensions.ts +++ b/server/sonar-web/src/main/js/helpers/extensions.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; +import { getBaseUrl } from '../sonar-ui-common/helpers/urls'; import { getExtensionFromCache } from './extensionsHandler'; let librariesExposed = false; diff --git a/server/sonar-web/src/main/js/helpers/issues.ts b/server/sonar-web/src/main/js/helpers/issues.ts index 43f80f45df3..4c2e2f0f484 100644 --- a/server/sonar-web/src/main/js/helpers/issues.ts +++ b/server/sonar-web/src/main/js/helpers/issues.ts @@ -18,10 +18,10 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { flatten, sortBy } from 'lodash'; -import BugIcon from 'sonar-ui-common/components/icons/BugIcon'; -import CodeSmellIcon from 'sonar-ui-common/components/icons/CodeSmellIcon'; -import SecurityHotspotIcon from 'sonar-ui-common/components/icons/SecurityHotspotIcon'; -import VulnerabilityIcon from 'sonar-ui-common/components/icons/VulnerabilityIcon'; +import BugIcon from '../sonar-ui-common/components/icons/BugIcon'; +import CodeSmellIcon from '../sonar-ui-common/components/icons/CodeSmellIcon'; +import SecurityHotspotIcon from '../sonar-ui-common/components/icons/SecurityHotspotIcon'; +import VulnerabilityIcon from '../sonar-ui-common/components/icons/VulnerabilityIcon'; import { IssueType, RawIssue } from '../types/issues'; import { MetricKey } from '../types/metrics'; import { ISSUE_TYPES } from './constants'; diff --git a/server/sonar-web/src/main/js/helpers/l10n.ts b/server/sonar-web/src/main/js/helpers/l10n.ts index 4f1b75584eb..ac4026d0d23 100644 --- a/server/sonar-web/src/main/js/helpers/l10n.ts +++ b/server/sonar-web/src/main/js/helpers/l10n.ts @@ -17,13 +17,13 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { toNotSoISOString } from 'sonar-ui-common/helpers/dates'; -import SonarUiCommonInitializer, { DEFAULT_LOCALE } from 'sonar-ui-common/helpers/init'; +import { fetchL10nBundle } from '../api/l10n'; +import { toNotSoISOString } from '../sonar-ui-common/helpers/dates'; +import SonarUiCommonInitializer, { DEFAULT_LOCALE } from '../sonar-ui-common/helpers/init'; import { get as loadFromLocalStorage, save as saveInLocalStorage -} from 'sonar-ui-common/helpers/storage'; -import { fetchL10nBundle } from '../api/l10n'; +} from '../sonar-ui-common/helpers/storage'; import { L10nBundle, L10nBundleRequestParams } from '../types/l10n'; const L10N_BUNDLE_LS_KEY = 'l10n.bundle'; diff --git a/server/sonar-web/src/main/js/helpers/measures.ts b/server/sonar-web/src/main/js/helpers/measures.ts index 8f0a011ac4f..51c3047c2c7 100644 --- a/server/sonar-web/src/main/js/helpers/measures.ts +++ b/server/sonar-web/src/main/js/helpers/measures.ts @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; -import { formatMeasure } from 'sonar-ui-common/helpers/measures'; -import { isDefined } from 'sonar-ui-common/helpers/types'; +import { translate, translateWithParameters } from '../sonar-ui-common/helpers/l10n'; +import { formatMeasure } from '../sonar-ui-common/helpers/measures'; +import { isDefined } from '../sonar-ui-common/helpers/types'; import { MetricKey } from '../types/metrics'; import { QualityGateStatusCondition, diff --git a/server/sonar-web/src/main/js/helpers/periods.ts b/server/sonar-web/src/main/js/helpers/periods.ts index 857a96685f7..8ef8871ae2f 100644 --- a/server/sonar-web/src/main/js/helpers/periods.ts +++ b/server/sonar-web/src/main/js/helpers/periods.ts @@ -17,8 +17,8 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { parseDate } from 'sonar-ui-common/helpers/dates'; -import { translate, translateWithParameters } from 'sonar-ui-common/helpers/l10n'; +import { parseDate } from '../sonar-ui-common/helpers/dates'; +import { translate, translateWithParameters } from '../sonar-ui-common/helpers/l10n'; import { ApplicationPeriod } from '../types/application'; export function getPeriodLabel( diff --git a/server/sonar-web/src/main/js/helpers/projectLinks.ts b/server/sonar-web/src/main/js/helpers/projectLinks.ts index e97697b1782..76c44b4e538 100644 --- a/server/sonar-web/src/main/js/helpers/projectLinks.ts +++ b/server/sonar-web/src/main/js/helpers/projectLinks.ts @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { partition, sortBy } from 'lodash'; -import { translate } from 'sonar-ui-common/helpers/l10n'; +import { translate } from '../sonar-ui-common/helpers/l10n'; const PROVIDED_TYPES = ['homepage', 'ci', 'issue', 'scm', 'scm_dev']; type NameAndType = Pick<T.ProjectLink, 'name' | 'type'>; diff --git a/server/sonar-web/src/main/js/helpers/sonarlint.ts b/server/sonar-web/src/main/js/helpers/sonarlint.ts index 30c26c0c2b4..dc3c9e73d47 100644 --- a/server/sonar-web/src/main/js/helpers/sonarlint.ts +++ b/server/sonar-web/src/main/js/helpers/sonarlint.ts @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import { getHostUrl } from 'sonar-ui-common/helpers/urls'; +import { getHostUrl } from '../sonar-ui-common/helpers/urls'; import { Ide } from '../types/sonarlint'; const SONARLINT_PORT_START = 64120; diff --git a/server/sonar-web/src/main/js/helpers/urls.ts b/server/sonar-web/src/main/js/helpers/urls.ts index 4ef448df31a..b1261e52ad8 100644 --- a/server/sonar-web/src/main/js/helpers/urls.ts +++ b/server/sonar-web/src/main/js/helpers/urls.ts @@ -18,8 +18,8 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import { pick } from 'lodash'; -import { getBaseUrl, Location } from 'sonar-ui-common/helpers/urls'; import { getProfilePath } from '../apps/quality-profiles/utils'; +import { getBaseUrl, Location } from '../sonar-ui-common/helpers/urls'; import { BranchLike, BranchParameters } from '../types/branch-like'; import { ComponentQualifier, isApplication, isPortfolioLike } from '../types/component'; import { GraphType } from '../types/project-activity'; diff --git a/server/sonar-ui-common/components/__tests__/__snapshots__/lazyLoadComponent-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/__tests__/__snapshots__/lazyLoadComponent-test.tsx.snap index 7f00f47e206..9edbac96c7c 100644 --- a/server/sonar-ui-common/components/__tests__/__snapshots__/lazyLoadComponent-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/__tests__/__snapshots__/lazyLoadComponent-test.tsx.snap @@ -16,9 +16,7 @@ exports[`should lazy load and display the component 1`] = ` </LazyComponentWrapper> `; -exports[`should lazy load and display the component 2`] = `null`; - -exports[`should lazy load and display the component 3`] = ` +exports[`should lazy load and display the component 2`] = ` <LazyComponentWrapper> <LazyErrorBoundary> <Suspense @@ -36,11 +34,3 @@ exports[`should lazy load and display the component 3`] = ` </LazyErrorBoundary> </LazyComponentWrapper> `; - -exports[`should lazy load and display the component 4`] = ` -<a - class="icon-checkbox" - href="#" - role="checkbox" -/> -`; diff --git a/server/sonar-ui-common/components/__tests__/getHistory-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/components/__tests__/getHistory-test.ts index 2df78cdd02e..2df78cdd02e 100644 --- a/server/sonar-ui-common/components/__tests__/getHistory-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/__tests__/getHistory-test.ts diff --git a/server/sonar-ui-common/components/__tests__/lazyLoadComponent-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/__tests__/lazyLoadComponent-test.tsx index 216163e9432..1d481fbfd62 100644 --- a/server/sonar-ui-common/components/__tests__/lazyLoadComponent-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/__tests__/lazyLoadComponent-test.tsx @@ -32,11 +32,10 @@ it('should lazy load and display the component', async () => { const LazyComponent = lazyLoadComponent(factory); const wrapper = mount(<LazyComponent />); expect(wrapper).toMatchSnapshot(); - expect(wrapper.render()).toMatchSnapshot(); expect(factory).toBeCalledTimes(1); await waitAndUpdate(wrapper); + await waitAndUpdate(wrapper); expect(wrapper).toMatchSnapshot(); - expect(wrapper.render()).toMatchSnapshot(); expect(factory).toBeCalledTimes(1); }); diff --git a/server/sonar-ui-common/components/charts/AdvancedTimeline.css b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/AdvancedTimeline.css index d71ef2dee96..d71ef2dee96 100644 --- a/server/sonar-ui-common/components/charts/AdvancedTimeline.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/AdvancedTimeline.css diff --git a/server/sonar-ui-common/components/charts/AdvancedTimeline.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/AdvancedTimeline.tsx index 0a9bd4125d0..6263de1a6a6 100644 --- a/server/sonar-ui-common/components/charts/AdvancedTimeline.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/AdvancedTimeline.tsx @@ -75,7 +75,7 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> eventSize: 8, maxYTicksCount: 4, padding: [26, 10, 50, 60], - zoomSpeed: 1, + zoomSpeed: 1 }; constructor(props: Props) { @@ -129,11 +129,15 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> } getRatingScale = (availableHeight: number) => { - return scalePoint<number>().domain([5, 4, 3, 2, 1]).range([availableHeight, 0]); + return scalePoint<number>() + .domain([5, 4, 3, 2, 1]) + .range([availableHeight, 0]); }; getLevelScale = (availableHeight: number) => { - return scalePoint().domain(['ERROR', 'WARN', 'OK']).range([availableHeight, 0]); + return scalePoint() + .domain(['ERROR', 'WARN', 'OK']) + .range([availableHeight, 0]); }; getYScale = (props: Props, availableHeight: number, flatData: T.Chart.Point[]): YScale => { @@ -141,12 +145,11 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> return this.getRatingScale(availableHeight); } else if (props.metricType === 'LEVEL') { return this.getLevelScale(availableHeight); - } else { - return scaleLinear() - .range([availableHeight, 0]) - .domain([0, max(flatData, (d) => Number(d.y || 0)) || 1]) - .nice(); } + return scaleLinear() + .range([availableHeight, 0]) + .domain([0, max(flatData, d => Number(d.y || 0)) || 1]) + .nice(); }; getXScale = ( @@ -154,7 +157,7 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> availableWidth: number, flatData: T.Chart.Point[] ) => { - const dateRange = extent(flatData, (d) => d.x) as [Date, Date]; + const dateRange = extent(flatData, d => d.x) as [Date, Date]; const start = startDate && startDate > dateRange[0] ? startDate : dateRange[0]; const end = endDate && endDate < dateRange[1] ? endDate : dateRange[1]; const xScale: ScaleTime<number, number> = scaleTime() @@ -163,31 +166,31 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> .clamp(false); return { xScale, - maxXRange: dateRange.map(xScale), + maxXRange: dateRange.map(xScale) }; }; getScales = (props: Props) => { const availableWidth = props.width - props.padding[1] - props.padding[3]; const availableHeight = props.height - props.padding[0] - props.padding[2]; - const flatData = flatten(props.series.map((serie) => serie.data)); + const flatData = flatten(props.series.map(serie => serie.data)); return { ...this.getXScale(props, availableWidth, flatData), - yScale: this.getYScale(props, availableHeight, flatData), + yScale: this.getYScale(props, availableHeight, flatData) }; }; getSelectedDatePos = (xScale: XScale, selectedDate?: Date) => { const firstSerie = this.props.series[0]; if (selectedDate && firstSerie) { - const idx = firstSerie.data.findIndex((p) => p.x.valueOf() === selectedDate.valueOf()); + const idx = firstSerie.data.findIndex(p => p.x.valueOf() === selectedDate.valueOf()); const xRange = sortBy(xScale.range()); const xPos = xScale(selectedDate); if (idx >= 0 && xPos >= xRange[0] && xPos <= xRange[1]) { return { selectedDate, selectedDateXPos: xScale(selectedDate), - selectedDateIdx: idx, + selectedDateIdx: idx }; } } @@ -238,7 +241,7 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> mouseOver: false, selectedDate: undefined, selectedDateXPos: undefined, - selectedDateIdx: undefined, + selectedDateIdx: undefined }); updateTooltip(undefined, undefined, undefined); } @@ -258,12 +261,12 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> }; updateTooltipPos = (xPos: number) => { - this.setState((state) => { + this.setState(state => { const firstSerie = this.props.series[0]; if (state.mouseOver && firstSerie) { const { updateTooltip } = this.props; const date = state.xScale.invert(xPos); - const bisectX = bisector<T.Chart.Point, Date>((d) => d.x).right; + const bisectX = bisector<T.Chart.Point, Date>(d => d.x).right; let idx = bisectX(firstSerie.data, date); if (idx >= 0) { const previousPoint = firstSerie.data[idx - 1]; @@ -302,7 +305,7 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> // if there are duplicated ticks, that means 4 ticks are too much for this data // so let's just use the domain values (min and max) if (formatYTick) { - const formattedTicks = ticks.map((tick) => formatYTick(tick)); + const formattedTicks = ticks.map(tick => formatYTick(tick)); if (ticks.length > uniq(formattedTicks).length) { ticks = yScale.domain(); } @@ -310,7 +313,7 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> return ( <g> - {ticks.map((tick) => ( + {ticks.map(tick => ( <g key={tick}> {formatYTick != null && ( <text @@ -349,6 +352,7 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> return ( <text className="line-chart-tick" + // eslint-disable-next-line react/no-array-index-key key={index} textAnchor="end" transform={`rotate(-35, ${x}, ${y})`} @@ -432,7 +436,7 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> return ( <ThemeConsumer> - {(theme) => ( + {theme => ( <> {displayNewCodeLegend && this.renderNewCodeLegend({ leakStart, leakWidth, theme })} <rect @@ -451,9 +455,9 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> renderLines = () => { const lineGenerator = d3Line<T.Chart.Point>() - .defined((d) => Boolean(d.y || d.y === 0)) - .x((d) => this.state.xScale(d.x)) - .y((d) => this.state.yScale(d.y)); + .defined(d => Boolean(d.y || d.y === 0)) + .x(d => this.state.xScale(d.x)) + .y(d => this.state.yScale(d.y)); if (this.props.basisCurve) { lineGenerator.curve(curveBasis); } @@ -490,6 +494,7 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> className={classNames('line-chart-dot', 'line-chart-dot-' + serieIdx)} cx={this.state.xScale(point.x)} cy={this.state.yScale(point.y)} + // eslint-disable-next-line react/no-array-index-key key={serie.name + idx} r="2" /> @@ -497,16 +502,16 @@ export default class AdvancedTimeline extends React.PureComponent<Props, State> }) .filter(isDefined) ) - .filter((dots) => dots.length > 0)} + .filter(dots => dots.length > 0)} </g> ); }; renderAreas = () => { const areaGenerator = area<T.Chart.Point>() - .defined((d) => Boolean(d.y || d.y === 0)) - .x((d) => this.state.xScale(d.x)) - .y1((d) => this.state.yScale(d.y)) + .defined(d => Boolean(d.y || d.y === 0)) + .x(d => this.state.xScale(d.x)) + .y1(d => this.state.yScale(d.y)) .y0(this.state.yScale(0)); if (this.props.basisCurve) { areaGenerator.curve(curveBasis); diff --git a/server/sonar-ui-common/components/charts/BarChart.css b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/BarChart.css index 849885a4cda..849885a4cda 100644 --- a/server/sonar-ui-common/components/charts/BarChart.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/BarChart.css diff --git a/server/sonar-ui-common/components/charts/BarChart.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/BarChart.tsx index 9f337c99ef5..210dc3acf0a 100644 --- a/server/sonar-ui-common/components/charts/BarChart.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/BarChart.tsx @@ -63,6 +63,7 @@ export default class BarChart<T> extends React.PureComponent<Props<T>> { <text className="bar-chart-tick" dy="1.5em" + // eslint-disable-next-line react/no-array-index-key key={index} onClick={() => this.handleClick(point)} style={{ cursor: this.props.onBarClick ? 'pointer' : 'default' }} @@ -72,6 +73,7 @@ export default class BarChart<T> extends React.PureComponent<Props<T>> { </text> ); return ( + // eslint-disable-next-line react/no-array-index-key <Tooltip key={index} overlay={d.tooltip || undefined}> {text} </Tooltip> @@ -95,6 +97,7 @@ export default class BarChart<T> extends React.PureComponent<Props<T>> { <text className="bar-chart-tick" dy="-1em" + // eslint-disable-next-line react/no-array-index-key key={index} onClick={() => this.handleClick(point)} style={{ cursor: this.props.onBarClick ? 'pointer' : 'default' }} @@ -104,6 +107,7 @@ export default class BarChart<T> extends React.PureComponent<Props<T>> { </text> ); return ( + // eslint-disable-next-line react/no-array-index-key <Tooltip key={index} overlay={point.tooltip || undefined}> {text} </Tooltip> @@ -122,6 +126,7 @@ export default class BarChart<T> extends React.PureComponent<Props<T>> { <rect className="bar-chart-bar" height={height} + // eslint-disable-next-line react/no-array-index-key key={index} onClick={() => this.handleClick(point)} style={{ cursor: this.props.onBarClick ? 'pointer' : 'default' }} @@ -131,6 +136,7 @@ export default class BarChart<T> extends React.PureComponent<Props<T>> { /> ); return ( + // eslint-disable-next-line react/no-array-index-key <Tooltip key={index} overlay={point.tooltip || undefined}> {rect} </Tooltip> @@ -148,12 +154,14 @@ export default class BarChart<T> extends React.PureComponent<Props<T>> { const innerPadding = (availableWidth - barsWidth * data.length) / (data.length - 1); const relativeInnerPadding = innerPadding / (innerPadding + barsWidth); - const maxY = max(data, (d) => d.y) as number; + const maxY = max(data, d => d.y) as number; const xScale = scaleBand<number>() - .domain(data.map((d) => d.x)) + .domain(data.map(d => d.x)) .range([0, availableWidth]) .paddingInner(relativeInnerPadding); - const yScale = scaleLinear().domain([0, maxY]).range([availableHeight, 0]); + const yScale = scaleLinear() + .domain([0, maxY]) + .range([availableHeight, 0]); return ( <svg className="bar-chart" height={height} width={width}> diff --git a/server/sonar-ui-common/components/charts/BubbleChart.css b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/BubbleChart.css index c5faa9af5a1..c5faa9af5a1 100644 --- a/server/sonar-ui-common/components/charts/BubbleChart.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/BubbleChart.css diff --git a/server/sonar-ui-common/components/charts/BubbleChart.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/BubbleChart.tsx index d0a7ae7da23..75d3172ea80 100644 --- a/server/sonar-ui-common/components/charts/BubbleChart.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/BubbleChart.tsx @@ -79,7 +79,7 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> formatXTick: (d: number) => String(d), formatYTick: (d: number) => String(d), padding: [10, 10, 10, 10], - sizeRange: [5, 45], + sizeRange: [5, 45] }; constructor(props: Props<T>) { @@ -92,15 +92,18 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> const rect = this.node.getBoundingClientRect(); this.zoom.translateExtent([ [0, 0], - [rect.width, rect.height], + [rect.width, rect.height] ]); } } boundNode = (node: SVGSVGElement) => { this.node = node; - this.zoom = zoom().scaleExtent([1, 10]).on('zoom', this.zoomed); - select(this.node).call(this.zoom); + this.zoom = zoom() + .scaleExtent([1, 10]) + .on('zoom', this.zoomed); + // TODO: Check why as any cast is necessary now. + select(this.node).call(this.zoom as any); }; zoomed = () => { @@ -110,8 +113,8 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> transform: { x: x + padding[3] * (k - 1), y: y + padding[0] * (k - 1), - k, - }, + k + } }); }; @@ -119,21 +122,22 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> event.stopPropagation(); event.preventDefault(); if (this.zoom && this.node) { - select(this.node).call(this.zoom.transform, zoomIdentity); + // TODO: Check why as any cast is necessary now. + select(this.node).call(this.zoom.transform as any, zoomIdentity); } }; getXRange(xScale: Scale, sizeScale: Scale, availableWidth: number) { - const minX = min(this.props.items, (d) => xScale(d.x) - sizeScale(d.size)) || 0; - const maxX = max(this.props.items, (d) => xScale(d.x) + sizeScale(d.size)) || 0; + const minX = min(this.props.items, d => xScale(d.x) - sizeScale(d.size)) || 0; + const maxX = max(this.props.items, d => xScale(d.x) + sizeScale(d.size)) || 0; const dMinX = minX < 0 ? xScale.range()[0] - minX : xScale.range()[0]; const dMaxX = maxX > xScale.range()[1] ? maxX - xScale.range()[1] : 0; return [dMinX, availableWidth - dMaxX]; } getYRange(yScale: Scale, sizeScale: Scale, availableHeight: number) { - const minY = min(this.props.items, (d) => yScale(d.y) - sizeScale(d.size)) || 0; - const maxY = max(this.props.items, (d) => yScale(d.y) + sizeScale(d.size)) || 0; + const minY = min(this.props.items, d => yScale(d.y) - sizeScale(d.size)) || 0; + const maxY = max(this.props.items, d => yScale(d.y) + sizeScale(d.size)) || 0; const dMinY = minY < 0 ? yScale.range()[1] - minY : yScale.range()[1]; const dMaxY = maxY > yScale.range()[0] ? maxY - yScale.range()[0] : 0; return [availableHeight - dMaxY, dMinY]; @@ -141,7 +145,7 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> getTicks(scale: Scale, format: (d: number) => string) { const zoom = Math.ceil(this.state.transform.k); - const ticks = scale.ticks(TICKS_COUNT * zoom).map((tick) => format(tick)); + const ticks = scale.ticks(TICKS_COUNT * zoom).map(tick => format(tick)); const uniqueTicksCount = uniq(ticks).length; const ticksCount = uniqueTicksCount < TICKS_COUNT * zoom ? uniqueTicksCount - 1 : TICKS_COUNT * zoom; @@ -163,6 +167,7 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> return ( <line className="bubble-chart-grid" + // eslint-disable-next-line react/no-array-index-key key={index} x1={x * transform.k + transform.x} x2={x * transform.k + transform.x} @@ -188,6 +193,7 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> return ( <line className="bubble-chart-grid" + // eslint-disable-next-line react/no-array-index-key key={index} x1={transform.k > 1 ? 0 : x1} x2={x2 * transform.k} @@ -212,6 +218,7 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> const innerText = this.props.formatXTick(tick); // as we modified the `x` using `transform`, check that it is inside the range again return x > 0 && x < xScale.range()[1] ? ( + // eslint-disable-next-line react/no-array-index-key <text className="bubble-chart-tick" dy="1.5em" key={index} x={x} y={y}> {innerText} </text> @@ -237,6 +244,7 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> className="bubble-chart-tick bubble-chart-tick-y" dx="-0.5em" dy="0.3em" + // eslint-disable-next-line react/no-array-index-key key={index} x={x} y={y}> @@ -254,15 +262,15 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> const availableHeight = this.props.height - this.props.padding[0] - this.props.padding[2]; const xScale = scaleLinear() - .domain(this.props.xDomain || [0, max(this.props.items, (d) => d.x) || 0]) + .domain(this.props.xDomain || [0, max(this.props.items, d => d.x) || 0]) .range([0, availableWidth]) .nice(); const yScale = scaleLinear() - .domain(this.props.yDomain || [0, max(this.props.items, (d) => d.y) || 0]) + .domain(this.props.yDomain || [0, max(this.props.items, d => d.y) || 0]) .range([availableHeight, 0]) .nice(); const sizeScale = scaleLinear() - .domain(this.props.sizeDomain || [0, max(this.props.items, (d) => d.size) || 0]) + .domain(this.props.sizeDomain || [0, max(this.props.items, d => d.size) || 0]) .range(this.props.sizeRange || []); const xScaleOriginal = xScale.copy(); @@ -271,7 +279,7 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> xScale.range(this.getXRange(xScale, sizeScale, availableWidth)); yScale.range(this.getYRange(yScale, sizeScale, availableHeight)); - const bubbles = sortBy(this.props.items, (b) => -b.size).map((item, index) => { + const bubbles = sortBy(this.props.items, b => -b.size).map((item, index) => { return ( <Bubble color={item.color} @@ -333,7 +341,7 @@ export default class BubbleChart<T> extends React.PureComponent<Props<T>, State> </Link> </Tooltip> </div> - <AutoSizer disableHeight={true}>{(size) => this.renderChart(size.width)}</AutoSizer> + <AutoSizer disableHeight={true}>{size => this.renderChart(size.width)}</AutoSizer> </div> ); } diff --git a/server/sonar-ui-common/components/charts/ColorGradientLegend.css b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/ColorGradientLegend.css index a6c96275921..a6c96275921 100644 --- a/server/sonar-ui-common/components/charts/ColorGradientLegend.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/ColorGradientLegend.css diff --git a/server/sonar-ui-common/components/charts/ColorGradientLegend.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/ColorGradientLegend.tsx index 05c417695c5..9cfc0f92203 100644 --- a/server/sonar-ui-common/components/charts/ColorGradientLegend.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/ColorGradientLegend.tsx @@ -42,7 +42,7 @@ export default function ColorGradientLegend({ padding = [12, 24, 0, 0], height, showColorNA = false, - width, + width }: Props) { const colorRange: Array<string | number> = colorScale.range(); const colorDomain: Array<string | number> = colorScale.domain(); @@ -57,6 +57,7 @@ export default function ColorGradientLegend({ <defs> <linearGradient id="gradient-legend"> {colorRange.map((color, idx) => ( + // eslint-disable-next-line react/no-array-index-key <stop key={idx} offset={idx / lastColorIdx} stopColor={String(color)} /> ))} </linearGradient> @@ -67,7 +68,7 @@ export default function ColorGradientLegend({ height="30" patternTransform="rotate(45 0 0)" patternUnits="userSpaceOnUse"> - {NA_GRADIENT_LINE_INCREMENTS.map((i) => ( + {NA_GRADIENT_LINE_INCREMENTS.map(i => ( <React.Fragment key={i}> <line x1={i} @@ -99,6 +100,7 @@ export default function ColorGradientLegend({ <text className="gradient-legend-text" dy="-2px" + // eslint-disable-next-line react/no-array-index-key key={idx} x={widthNoPadding * (idx / lastDomainIdx)} y={0}> diff --git a/server/sonar-ui-common/components/charts/DonutChart.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/DonutChart.tsx index e3c7b60abd2..223e0c26cf8 100644 --- a/server/sonar-ui-common/components/charts/DonutChart.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/DonutChart.tsx @@ -45,7 +45,7 @@ export default function DonutChart(props: DonutChartProps) { const pie = d3Pie<any, DataPoint>() .sort(null) - .value((d) => d.value); + .value(d => d.value); if (props.padAngle !== undefined) { pie.padAngle(props.padAngle); @@ -56,6 +56,7 @@ export default function DonutChart(props: DonutChartProps) { <Sector data={d} fill={props.data[i].fill} + // eslint-disable-next-line react/no-array-index-key key={i} radius={radius} thickness={props.thickness} diff --git a/server/sonar-ui-common/components/charts/Histogram.css b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/Histogram.css index 8ca78c53e4b..8ca78c53e4b 100644 --- a/server/sonar-ui-common/components/charts/Histogram.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/Histogram.css diff --git a/server/sonar-ui-common/components/charts/Histogram.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/Histogram.tsx index 61948c4e2a3..a4ae509a2ef 100644 --- a/server/sonar-ui-common/components/charts/Histogram.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/Histogram.tsx @@ -103,6 +103,7 @@ export default class Histogram extends React.PureComponent<Props> { <g> {this.props.bars.map((d, index) => { return ( + // eslint-disable-next-line react/no-array-index-key <g key={index}> {this.renderBar(d, index, xScale, yScale)} {this.renderValue(d, index, xScale, yScale)} diff --git a/server/sonar-ui-common/components/charts/LineChart.css b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/LineChart.css index 37d7f95698c..37d7f95698c 100644 --- a/server/sonar-ui-common/components/charts/LineChart.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/LineChart.css diff --git a/server/sonar-ui-common/components/charts/LineChart.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/LineChart.tsx index ea48e43c4e0..9cf7f76623b 100644 --- a/server/sonar-ui-common/components/charts/LineChart.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/LineChart.tsx @@ -52,16 +52,16 @@ export default class LineChart extends React.PureComponent<Props> { } const area = d3Area<DataPoint>() - .x((d) => xScale(d.x)) + .x(d => xScale(d.x)) .y0(yScale.range()[0]) - .y1((d) => yScale(d.y || 0)) - .defined((d) => d.y != null) + .y1(d => yScale(d.y || 0)) + .defined(d => d.y != null) .curve(curveBasis); let { data } = this.props; if (this.props.backdropConstraints) { const c = this.props.backdropConstraints; - data = data.filter((d) => c[0] <= d.x && d.x <= c[1]); + data = data.filter(d => c[0] <= d.x && d.x <= c[1]); } return <path className="line-chart-backdrop" d={area(data) as string} />; @@ -75,10 +75,11 @@ export default class LineChart extends React.PureComponent<Props> { } const points = this.props.data - .filter((point) => point.y != null) + .filter(point => point.y != null) .map((point, index) => { const x = xScale(point.x); const y = yScale(point.y || 0); + // eslint-disable-next-line react/no-array-index-key return <circle className="line-chart-point" cx={x} cy={y} key={index} r="3" />; }); return <g>{points}</g>; @@ -95,6 +96,7 @@ export default class LineChart extends React.PureComponent<Props> { const x = xScale(point.x); const y1 = yScale.range()[0]; const y2 = yScale(point.y || 0); + // eslint-disable-next-line react/no-array-index-key return <line className="line-chart-grid" key={index} x1={x} x2={x} y1={y1} y2={y2} />; }); return <g>{lines}</g>; @@ -112,6 +114,7 @@ export default class LineChart extends React.PureComponent<Props> { const x = xScale(point.x); const y = yScale.range()[0]; return ( + // eslint-disable-next-line react/no-array-index-key <text className="line-chart-tick" dy="1.5em" key={index} x={x} y={y}> {tick} </text> @@ -132,6 +135,7 @@ export default class LineChart extends React.PureComponent<Props> { const x = xScale(point.x); const y = yScale(point.y || 0); return ( + // eslint-disable-next-line react/no-array-index-key <text className="line-chart-tick" dy="-1em" key={index} x={x} y={y}> {value} </text> @@ -142,9 +146,9 @@ export default class LineChart extends React.PureComponent<Props> { renderLine(xScale: ScaleLinear<number, number>, yScale: ScaleLinear<number, number>) { const p = d3Line<DataPoint>() - .x((d) => xScale(d.x)) - .y((d) => yScale(d.y || 0)) - .defined((d) => d.y != null) + .x(d => xScale(d.x)) + .y(d => yScale(d.y || 0)) + .defined(d => d.y != null) .curve(curveBasis); return <path className="line-chart-path" d={p(this.props.data) as string} />; } @@ -160,14 +164,14 @@ export default class LineChart extends React.PureComponent<Props> { const availableHeight = height - padding[0] - padding[2]; const xScale = scaleLinear() - .domain(extent(this.props.data, (d) => d.x) as [number, number]) + .domain(extent(this.props.data, d => d.x) as [number, number]) .range([0, availableWidth]); const yScale = scaleLinear().range([availableHeight, 0]); if (this.props.domain) { yScale.domain(this.props.domain); } else { - const maxY = max(this.props.data, (d) => d.y) as number; + const maxY = max(this.props.data, d => d.y) as number; yScale.domain([0, maxY]); } @@ -189,7 +193,7 @@ export default class LineChart extends React.PureComponent<Props> { return this.props.width !== undefined ? ( this.renderChart(this.props.width) ) : ( - <AutoSizer disableHeight={true}>{(size) => this.renderChart(size.width)}</AutoSizer> + <AutoSizer disableHeight={true}>{size => this.renderChart(size.width)}</AutoSizer> ); } } diff --git a/server/sonar-ui-common/components/charts/TreeMap.css b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/TreeMap.css index fe9e1d24b18..fe9e1d24b18 100644 --- a/server/sonar-ui-common/components/charts/TreeMap.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/TreeMap.css diff --git a/server/sonar-ui-common/components/charts/TreeMap.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/TreeMap.tsx index de082a37a99..3a6e25112a7 100644 --- a/server/sonar-ui-common/components/charts/TreeMap.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/TreeMap.tsx @@ -67,18 +67,20 @@ export default class TreeMap extends React.PureComponent<Props> { render() { const { items, height, width } = this.props; const hierarchy = d3Hierarchy({ children: items } as HierarchicalTreemapItem) - .sum((d) => d.size) + .sum(d => d.size) .sort((a, b) => (b.value || 0) - (a.value || 0)); - const treemap = d3Treemap<TreeMapItem>().round(true).size([width, height]); + const treemap = d3Treemap<TreeMapItem>() + .round(true) + .size([width, height]); const nodes = treemap(hierarchy).leaves(); - const prefix = this.mostCommitPrefix(items.map((item) => item.label)); + const prefix = this.mostCommitPrefix(items.map(item => item.label)); const halfWidth = width / 2; return ( <div className="sonar-d3"> <div className="treemap-container" style={{ width, height }}> - {nodes.map((node) => ( + {nodes.map(node => ( <TreeMapRect fill={node.data.color} gradient={node.data.gradient} diff --git a/server/sonar-ui-common/components/charts/TreeMapRect.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/TreeMapRect.tsx index 7226fd51928..9a2f86e7af9 100644 --- a/server/sonar-ui-common/components/charts/TreeMapRect.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/TreeMapRect.tsx @@ -25,7 +25,10 @@ import { Location } from '../../helpers/urls'; import Tooltip, { Placement } from '../controls/Tooltip'; import LinkIcon from '../icons/LinkIcon'; -const SIZE_SCALE = scaleLinear().domain([3, 15]).range([11, 18]).clamp(true); +const SIZE_SCALE = scaleLinear() + .domain([3, 15]) + .range([11, 18]) + .clamp(true); interface Props { fill?: string; @@ -84,7 +87,7 @@ export default class TreeMapRect extends React.PureComponent<Props> { backgroundSize: '12px 12px', fontSize: SIZE_SCALE(this.props.width / this.props.label.length), lineHeight: `${this.props.height}px`, - cursor: this.props.onClick != null ? 'pointer' : 'default', + cursor: this.props.onClick != null ? 'pointer' : 'default' }; const isTextVisible = this.props.width >= TEXT_VISIBLE_AT_WIDTH && this.props.height >= TEXT_VISIBLE_AT_HEIGHT; diff --git a/server/sonar-ui-common/components/charts/ZoomTimeLine.css b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/ZoomTimeLine.css index 21997431077..21997431077 100644 --- a/server/sonar-ui-common/components/charts/ZoomTimeLine.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/ZoomTimeLine.css diff --git a/server/sonar-ui-common/components/charts/ZoomTimeLine.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/ZoomTimeLine.tsx index de281613fbe..8b37a6a2587 100644 --- a/server/sonar-ui-common/components/charts/ZoomTimeLine.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/ZoomTimeLine.tsx @@ -55,7 +55,7 @@ type YScale = any; export default class ZoomTimeLine extends React.PureComponent<Props, State> { static defaultProps = { padding: [0, 0, 18, 0], - showXTicks: true, + showXTicks: true }; constructor(props: Props) { @@ -65,11 +65,15 @@ export default class ZoomTimeLine extends React.PureComponent<Props, State> { } getRatingScale = (availableHeight: number) => { - return scalePoint<number>().domain([5, 4, 3, 2, 1]).range([availableHeight, 0]); + return scalePoint<number>() + .domain([5, 4, 3, 2, 1]) + .range([availableHeight, 0]); }; getLevelScale = (availableHeight: number) => { - return scalePoint().domain(['ERROR', 'WARN', 'OK']).range([availableHeight, 0]); + return scalePoint() + .domain(['ERROR', 'WARN', 'OK']) + .range([availableHeight, 0]); }; getYScale = (availableHeight: number, flatData: T.Chart.Point[]): YScale => { @@ -77,17 +81,16 @@ export default class ZoomTimeLine extends React.PureComponent<Props, State> { return this.getRatingScale(availableHeight); } else if (this.props.metricType === 'LEVEL') { return this.getLevelScale(availableHeight); - } else { - return scaleLinear() - .range([availableHeight, 0]) - .domain([0, max(flatData, (d) => Number(d.y || 0)) as number]) - .nice(); } + return scaleLinear() + .range([availableHeight, 0]) + .domain([0, max(flatData, d => Number(d.y || 0)) as number]) + .nice(); }; getXScale = (availableWidth: number, flatData: T.Chart.Point[]): XScale => { return scaleTime() - .domain(extent(flatData, (d) => d.x) as [Date, Date]) + .domain(extent(flatData, d => d.x) as [Date, Date]) .range([0, availableWidth]) .clamp(true); }; @@ -95,10 +98,10 @@ export default class ZoomTimeLine extends React.PureComponent<Props, State> { getScales = () => { const availableWidth = this.props.width - this.props.padding[1] - this.props.padding[3]; const availableHeight = this.props.height - this.props.padding[0] - this.props.padding[2]; - const flatData = flatten(this.props.series.map((serie) => serie.data)); + const flatData = flatten(this.props.series.map(serie => serie.data)); return { xScale: this.getXScale(availableWidth, flatData), - yScale: this.getYScale(availableHeight, flatData), + yScale: this.getYScale(availableHeight, flatData) }; }; @@ -138,7 +141,7 @@ export default class ZoomTimeLine extends React.PureComponent<Props, State> { const overlayLeftPos = data.node.getBoundingClientRect().left; this.setState({ overlayLeftPos, - newZoomStart: Math.round(Math.max(xDim[0], Math.min(data.x - overlayLeftPos, xDim[1]))), + newZoomStart: Math.round(Math.max(xDim[0], Math.min(data.x - overlayLeftPos, xDim[1]))) }); }; @@ -199,6 +202,7 @@ export default class ZoomTimeLine extends React.PureComponent<Props, State> { const nextTick = index + 1 < ticks.length ? ticks[index + 1] : xScale.domain()[1]; const x = (xScale(tick) + xScale(nextTick)) / 2; return ( + // eslint-disable-next-line react/no-array-index-key <text className="chart-zoom-tick" dy="1.3em" key={index} x={x} y={y}> {format(tick)} </text> @@ -216,7 +220,7 @@ export default class ZoomTimeLine extends React.PureComponent<Props, State> { const yRange = yScale.range(); return ( <ThemeConsumer> - {(theme) => ( + {theme => ( <rect fill={theme.colors.leakPrimaryColor} height={yRange[0] - yRange[yRange.length - 1]} @@ -231,9 +235,9 @@ export default class ZoomTimeLine extends React.PureComponent<Props, State> { renderLines = (xScale: XScale, yScale: YScale) => { const lineGenerator = d3Line<T.Chart.Point>() - .defined((d) => Boolean(d.y || d.y === 0)) - .x((d) => xScale(d.x)) - .y((d) => yScale(d.y)); + .defined(d => Boolean(d.y || d.y === 0)) + .x(d => xScale(d.x)) + .y(d => yScale(d.y)); if (this.props.basisCurve) { lineGenerator.curve(curveBasis); } @@ -252,9 +256,9 @@ export default class ZoomTimeLine extends React.PureComponent<Props, State> { renderAreas = (xScale: XScale, yScale: YScale) => { const areaGenerator = area<T.Chart.Point>() - .defined((d) => Boolean(d.y || d.y === 0)) - .x((d) => xScale(d.x)) - .y1((d) => yScale(d.y)) + .defined(d => Boolean(d.y || d.y === 0)) + .x(d => xScale(d.x)) + .y1(d => yScale(d.y)) .y0(yScale(0)); if (this.props.basisCurve) { areaGenerator.curve(curveBasis); @@ -359,7 +363,7 @@ export default class ZoomTimeLine extends React.PureComponent<Props, State> { fixedPos: endX, xDim, yDim, - direction: 'left', + direction: 'left' })} {showZoomArea && this.renderZoomHandle({ @@ -368,7 +372,7 @@ export default class ZoomTimeLine extends React.PureComponent<Props, State> { fixedPos: startX, xDim, yDim, - direction: 'right', + direction: 'right' })} </g> ); diff --git a/server/sonar-ui-common/components/charts/__tests__/AdvancedTimeline-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/AdvancedTimeline-test.tsx index 1e16ab14f49..77f2aafcceb 100644 --- a/server/sonar-ui-common/components/charts/__tests__/AdvancedTimeline-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/AdvancedTimeline-test.tsx @@ -30,7 +30,7 @@ jest.mock('d3-scale', () => { return { ...others, - scaleTime: scaleUtc, + scaleTime: scaleUtc }; }); @@ -44,7 +44,7 @@ it('should render correctly', () => { expect(shallowRender({ disableZoom: false, updateZoom: () => {} })).toMatchSnapshot( 'Zoom enabled' ); - expect(shallowRender({ formatYTick: (t) => `Nicer tick ${t}` })).toMatchSnapshot('format y tick'); + expect(shallowRender({ formatYTick: t => `Nicer tick ${t}` })).toMatchSnapshot('format y tick'); expect(shallowRender({ width: undefined })).toMatchSnapshot('no width'); expect(shallowRender({ height: undefined })).toMatchSnapshot('no height'); expect(shallowRender({ showAreas: undefined })).toMatchSnapshot('no areas'); @@ -53,7 +53,10 @@ it('should render correctly', () => { it('should render leak correctly', () => { const wrapper = shallowRender({ leakPeriodDate: new Date('2019-10-02') }); - const leakNode = wrapper.find(ThemeConsumer).dive().find('.leak-chart-rect'); + const leakNode = wrapper + .find(ThemeConsumer) + .dive() + .find('.leak-chart-rect'); expect(leakNode.exists()).toBe(true); expect(leakNode.getElement().props.width).toBe(15); }); @@ -61,7 +64,7 @@ it('should render leak correctly', () => { it('should render leak legend correctly', () => { const wrapper = shallowRender({ displayNewCodeLegend: true, - leakPeriodDate: new Date('2019-10-02'), + leakPeriodDate: new Date('2019-10-02') }); const leakNode = wrapper.find(ThemeConsumer).dive(); @@ -81,8 +84,8 @@ it('should render leak legend correctly for small leak', () => { mockData(4, '2020-02-04'), mockData(5, '2020-02-05'), mockData(6, '2020-02-06'), - mockData(7, '2020-02-07'), - ], + mockData(7, '2020-02-07') + ] }); const leakNode = wrapper.find(ThemeConsumer).dive(); @@ -94,7 +97,7 @@ it('should set leakLegendTextWidth correctly', () => { const wrapper = shallowRender(); wrapper.instance().setLeakLegendTextWidth({ - getBoundingClientRect: () => ({ width: 12 } as DOMRect), + getBoundingClientRect: () => ({ width: 12 } as DOMRect) } as SVGTextElement); expect(wrapper.state().leakLegendTextWidth).toBe(12); @@ -107,7 +110,10 @@ it('should set leakLegendTextWidth correctly', () => { it('should render old leak correctly', () => { const wrapper = shallowRender({ leakPeriodDate: new Date('2014-10-02') }); - const leakNode = wrapper.find(ThemeConsumer).dive().find('.leak-chart-rect'); + const leakNode = wrapper + .find(ThemeConsumer) + .dive() + .find('.leak-chart-rect'); expect(leakNode.exists()).toBe(true); expect(leakNode.getElement().props.width).toBe(30); }); @@ -172,9 +178,9 @@ it('should handle scroll correcly', () => { top: 10, x: 12, y: 23, - toJSON: () => '', - }), - } as any) as SVGElement, + toJSON: () => '' + }) + } as any) as SVGElement } as any) as React.WheelEvent<SVGElement>); expect(preventDefault).toBeCalled(); expect(updateZoom).toBeCalledWith(new Date('2019-10-01T06:24:00.000Z'), undefined); @@ -200,9 +206,9 @@ it('should handle scroll correcly', () => { top: 10, x: 12, y: 23, - toJSON: () => '', - }), - } as any) as SVGElement, + toJSON: () => '' + }) + } as any) as SVGElement } as any) as React.WheelEvent<SVGElement>); expect(preventDefault).toBeCalled(); expect(updateZoom).toBeCalledWith(undefined, new Date('2019-10-02T20:48:00.000Z')); @@ -215,7 +221,7 @@ it('should handle mouse out correcly', () => { mouseOver: true, selectedDate: new Date(), selectedDateXPos: 1, - selectedDateIdx: 1, + selectedDateIdx: 1 }); wrapper.instance().handleMouseOut(); expect(wrapper.state().mouseOver).toBe(true); @@ -257,13 +263,13 @@ function shallowRender(props?: Partial<AdvancedTimeline['props']>) { data: [ { x: new Date('2019-10-01'), - y: 1, + y: 1 }, { x: new Date('2019-10-02'), - y: 2, - }, - ], + y: 2 + } + ] }, { name: 'test-2', @@ -272,10 +278,10 @@ function shallowRender(props?: Partial<AdvancedTimeline['props']>) { data: [ { x: new Date('2019-10-03'), - y: 3, - }, - ], - }, + y: 3 + } + ] + } ]} width={100} zoomSpeed={1} @@ -289,6 +295,6 @@ function mockData(i: number, date: string): T.Chart.Serie { name: `t${i}`, type: 'type', translatedName: '', - data: [{ x: new Date(date), y: i }], + data: [{ x: new Date(date), y: i }] }; } diff --git a/server/sonar-ui-common/components/charts/__tests__/BarChart-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/BarChart-test.tsx index b578e564fad..794bb3ace38 100644 --- a/server/sonar-ui-common/components/charts/__tests__/BarChart-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/BarChart-test.tsx @@ -25,7 +25,7 @@ it('should display bars', () => { const data = [ { x: 1, y: 10 }, { x: 2, y: 30 }, - { x: 3, y: 20 }, + { x: 3, y: 20 } ]; const chart = shallow(<BarChart barsWidth={20} data={data} height={100} width={100} />); expect(chart.find('.bar-chart-bar').length).toBe(3); @@ -35,7 +35,7 @@ it('should display ticks', () => { const data = [ { x: 1, y: 10 }, { x: 2, y: 30 }, - { x: 3, y: 20 }, + { x: 3, y: 20 } ]; const ticks = ['A', 'B', 'C']; const chart = shallow( @@ -48,7 +48,7 @@ it('should display values', () => { const data = [ { x: 1, y: 10 }, { x: 2, y: 30 }, - { x: 3, y: 20 }, + { x: 3, y: 20 } ]; const values = ['A', 'B', 'C']; const chart = shallow( @@ -61,7 +61,7 @@ it('should display bars, ticks and values', () => { const data = [ { x: 1, y: 10 }, { x: 2, y: 30 }, - { x: 3, y: 20 }, + { x: 3, y: 20 } ]; const ticks = ['A', 'B', 'C']; const values = ['A', 'B', 'C']; diff --git a/server/sonar-ui-common/components/charts/__tests__/BubbleChart-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/BubbleChart-test.tsx index dd68ae319b5..3be36c3677d 100644 --- a/server/sonar-ui-common/components/charts/__tests__/BubbleChart-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/BubbleChart-test.tsx @@ -23,16 +23,16 @@ import { AutoSizerProps } from 'react-virtualized'; import BubbleChart from '../BubbleChart'; jest.mock('react-virtualized/dist/commonjs/AutoSizer', () => ({ - AutoSizer: ({ children }: AutoSizerProps) => children({ width: 100, height: NaN }), + AutoSizer: ({ children }: AutoSizerProps) => children({ width: 100, height: NaN }) })); it('should display bubbles', () => { const items = [ { x: 1, y: 10, size: 7 }, - { x: 2, y: 30, size: 5 }, + { x: 2, y: 30, size: 5 } ]; const chart = mount(<BubbleChart height={100} items={items} padding={[0, 0, 0, 0]} />); - chart.find('Bubble').forEach((bubble) => expect(bubble).toMatchSnapshot()); + chart.find('Bubble').forEach(bubble => expect(bubble).toMatchSnapshot()); chart.setProps({ height: 120 }); }); @@ -40,20 +40,20 @@ it('should display bubbles', () => { it('should render bubble links', () => { const items = [ { x: 1, y: 10, size: 7, link: 'foo' }, - { x: 2, y: 30, size: 5, link: 'bar' }, + { x: 2, y: 30, size: 5, link: 'bar' } ]; const chart = mount(<BubbleChart height={100} items={items} padding={[0, 0, 0, 0]} />); - chart.find('Bubble').forEach((bubble) => expect(bubble).toMatchSnapshot()); + chart.find('Bubble').forEach(bubble => expect(bubble).toMatchSnapshot()); }); it('should render bubbles with click handlers', () => { const onClick = jest.fn(); const items = [ { x: 1, y: 10, size: 7, data: 'foo' }, - { x: 2, y: 30, size: 5, data: 'bar' }, + { x: 2, y: 30, size: 5, data: 'bar' } ]; const chart = mount( <BubbleChart height={100} items={items} onBubbleClick={onClick} padding={[0, 0, 0, 0]} /> ); - chart.find('Bubble').forEach((bubble) => expect(bubble).toMatchSnapshot()); + chart.find('Bubble').forEach(bubble => expect(bubble).toMatchSnapshot()); }); diff --git a/server/sonar-ui-common/components/charts/__tests__/ColorGradientLegend-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/ColorGradientLegend-test.tsx index 76a7c853758..636a0d9c50f 100644 --- a/server/sonar-ui-common/components/charts/__tests__/ColorGradientLegend-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/ColorGradientLegend-test.tsx @@ -27,7 +27,9 @@ const { colors } = testTheme; const COLORS = [colors.green, colors.lightGreen, colors.yellow, colors.orange, colors.red]; it('should render properly', () => { - const colorScale = scaleLinear<string, string>().domain([0, 25, 50, 75, 100]).range(COLORS); + const colorScale = scaleLinear<string, string>() + .domain([0, 25, 50, 75, 100]) + .range(COLORS); const wrapper = shallow( <ColorGradientLegend className="measure-details-treemap-legend" diff --git a/server/sonar-ui-common/components/charts/__tests__/DonutChart-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/DonutChart-test.tsx index a26593699ce..5a21985e96f 100644 --- a/server/sonar-ui-common/components/charts/__tests__/DonutChart-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/DonutChart-test.tsx @@ -24,7 +24,12 @@ import DonutChart, { DonutChartProps } from '../DonutChart'; it('should render correctly', () => { const wrapper = shallowRender(); expect(wrapper).toMatchSnapshot(); - expect(wrapper.find('Sector').first().dive()).toMatchSnapshot(); + expect( + wrapper + .find('Sector') + .first() + .dive() + ).toMatchSnapshot(); }); it('should render correctly with padding and pad angle too', () => { @@ -36,7 +41,7 @@ function shallowRender(props: Partial<DonutChartProps> = {}) { <DonutChart data={[ { fill: '#000000', value: 25 }, - { fill: '#ffffff', value: 75 }, + { fill: '#ffffff', value: 75 } ]} height={20} thickness={2} diff --git a/server/sonar-ui-common/components/charts/__tests__/Histogram-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/Histogram-test.tsx index 15f4754aae0..15f4754aae0 100644 --- a/server/sonar-ui-common/components/charts/__tests__/Histogram-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/Histogram-test.tsx diff --git a/server/sonar-ui-common/components/charts/__tests__/LineChart-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/LineChart-test.tsx index b9c609ac202..9e42fe3395b 100644 --- a/server/sonar-ui-common/components/charts/__tests__/LineChart-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/LineChart-test.tsx @@ -25,7 +25,7 @@ it('should display line', () => { const data = [ { x: 1, y: 10 }, { x: 2, y: 30 }, - { x: 3, y: 20 }, + { x: 3, y: 20 } ]; const chart = shallow(<LineChart data={data} height={100} width={100} />); expect(chart.find('.line-chart-path').length).toBe(1); @@ -35,7 +35,7 @@ it('should display ticks', () => { const data = [ { x: 1, y: 10 }, { x: 2, y: 30 }, - { x: 3, y: 20 }, + { x: 3, y: 20 } ]; const ticks = ['A', 'B', 'C']; const chart = shallow(<LineChart data={data} height={100} width={100} xTicks={ticks} />); @@ -46,7 +46,7 @@ it('should display values', () => { const data = [ { x: 1, y: 10 }, { x: 2, y: 30 }, - { x: 3, y: 20 }, + { x: 3, y: 20 } ]; const values = ['A', 'B', 'C']; const chart = shallow(<LineChart data={data} height={100} width={100} xValues={values} />); diff --git a/server/sonar-ui-common/components/charts/__tests__/TreeMap-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/TreeMap-test.tsx index 8b951a9d215..d4879956f2b 100644 --- a/server/sonar-ui-common/components/charts/__tests__/TreeMap-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/TreeMap-test.tsx @@ -31,8 +31,8 @@ it('should render correctly', () => { size: 20, gradient: '#777', label: 'SonarQube :: Search', - metric: { key: 'coverage', type: 'PERCENT' }, - }, + metric: { key: 'coverage', type: 'PERCENT' } + } ]; const onRectClick = jest.fn(); const chart = mount( @@ -42,7 +42,7 @@ it('should render correctly', () => { expect(rects).toHaveLength(3); const event: React.MouseEvent<HTMLAnchorElement> = { - stopPropagation: jest.fn(), + stopPropagation: jest.fn() } as any; (rects.first().instance() as TreeMapRect).handleLinkClick(event); diff --git a/server/sonar-ui-common/components/charts/__tests__/ZoomTimeLine-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/ZoomTimeLine-test.tsx index 27f3b5c854e..cd354a45b20 100644 --- a/server/sonar-ui-common/components/charts/__tests__/ZoomTimeLine-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/ZoomTimeLine-test.tsx @@ -28,17 +28,17 @@ const series = [ data: [ { x: new Date('2020-01-01'), - y: 'beginning', + y: 'beginning' }, { x: new Date('2020-02-01'), - y: 'end', - }, + y: 'end' + } ], name: 'foo', translatedName: 'foo-translated', - type: 'bar', - }, + type: 'bar' + } ]; it('should render correctly', () => { @@ -55,7 +55,11 @@ it('should draw a graph with lines', () => { }); it('should be zoomable', () => { - expect(shallowRender().find('.chart-zoom').exists()).toBe(true); + expect( + shallowRender() + .find('.chart-zoom') + .exists() + ).toBe(true); }); it('should render a leak period', () => { @@ -69,7 +73,11 @@ it('should render a leak period', () => { }); it('should render areas under the graph lines', () => { - expect(shallowRender({ showAreas: true }).find('.line-chart-area').exists()).toBe(true); + expect( + shallowRender({ showAreas: true }) + .find('.line-chart-area') + .exists() + ).toBe(true); }); it('should handle zoom update correctly', () => { @@ -77,9 +85,12 @@ it('should handle zoom update correctly', () => { const startDate = new Date('1970-01-01T00:00:00.001Z'); const endDate = new Date('2000-01-01T00:00:00.001Z'); let wrapper = shallowRender({ updateZoom, startDate, endDate }); - wrapper - .instance() - .handleZoomUpdate(scaleTime().domain([startDate, endDate]).range([0, 150]), [3, 50]); + wrapper.instance().handleZoomUpdate( + scaleTime() + .domain([startDate, endDate]) + .range([0, 150]), + [3, 50] + ); expect(updateZoom).toBeCalledWith( new Date('1970-08-08T03:21:36.001Z'), new Date('1980-01-01T08:00:00.001Z') @@ -89,9 +100,12 @@ it('should handle zoom update correctly', () => { // We throttle the handleZoomUpdate so re-render to avoid issue wrapper = shallowRender({ updateZoom, startDate, endDate }); - wrapper - .instance() - .handleZoomUpdate(scaleTime().domain([startDate, endDate]).range([0, 150]), [-1, 151]); + wrapper.instance().handleZoomUpdate( + scaleTime() + .domain([startDate, endDate]) + .range([0, 150]), + [-1, 151] + ); expect(updateZoom).toBeCalledWith(undefined, undefined); }); diff --git a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/AdvancedTimeline-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/AdvancedTimeline-test.tsx.snap index f4569f0f9fa..f4569f0f9fa 100644 --- a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/AdvancedTimeline-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/AdvancedTimeline-test.tsx.snap diff --git a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/BubbleChart-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/BubbleChart-test.tsx.snap index b0f69f95417..b0f69f95417 100644 --- a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/BubbleChart-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/BubbleChart-test.tsx.snap diff --git a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/ColorGradientLegend-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/ColorGradientLegend-test.tsx.snap index 0bbe8ee462d..0bbe8ee462d 100644 --- a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/ColorGradientLegend-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/ColorGradientLegend-test.tsx.snap diff --git a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/DonutChart-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/DonutChart-test.tsx.snap index f4da702a0d2..f4da702a0d2 100644 --- a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/DonutChart-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/DonutChart-test.tsx.snap diff --git a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/Histogram-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/Histogram-test.tsx.snap index f52a4ea6cf3..f52a4ea6cf3 100644 --- a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/Histogram-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/Histogram-test.tsx.snap diff --git a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/ZoomTimeLine-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/ZoomTimeLine-test.tsx.snap index adb3c28e914..adb3c28e914 100644 --- a/server/sonar-ui-common/components/charts/__tests__/__snapshots__/ZoomTimeLine-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/charts/__tests__/__snapshots__/ZoomTimeLine-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/ActionsDropdown.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ActionsDropdown.tsx index e4de6ff3baa..0f161597a07 100644 --- a/server/sonar-ui-common/components/controls/ActionsDropdown.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ActionsDropdown.tsx @@ -49,7 +49,7 @@ export default function ActionsDropdown(props: ActionsDropdownProps) { overlayPlacement={overlayPlacement}> <Button className={classNames('dropdown-toggle', toggleClassName, { - 'button-small': small, + 'button-small': small })}> <SettingsIcon size={small ? 12 : 14} /> <DropdownIcon className="little-spacer-left" /> diff --git a/server/sonar-ui-common/components/controls/BackButton.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/BackButton.tsx index 0022b4f322e..3a4010a7a86 100644 --- a/server/sonar-ui-common/components/controls/BackButton.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/BackButton.tsx @@ -41,7 +41,7 @@ export default class BackButton extends React.PureComponent<Props> { renderIcon = () => ( <ThemeConsumer> - {(theme) => ( + {theme => ( <svg height="24" viewBox="0 0 21 24" width="21"> <path d="M3.845 12.9992l5.993 5.993.052.056c.049.061.093.122.129.191.082.159.121.339.111.518-.006.102-.028.203-.064.298-.149.39-.537.652-.954.644-.102-.002-.204-.019-.301-.052-.148-.05-.273-.135-.387-.241l-8.407-8.407 8.407-8.407.056-.052c.061-.048.121-.092.19-.128.116-.06.237-.091.366-.108.076-.004.075-.004.153-.003.155.015.3.052.437.129.088.051.169.115.239.19.246.266.33.656.214.999-.051.149-.135.273-.241.387l-5.983 5.984c5.287-.044 10.577-.206 15.859.013.073.009.091.009.163.027.187.047.359.15.49.292.075.081.136.175.18.276.044.101.072.209.081.319.032.391-.175.775-.521.962-.097.052-.202.089-.311.107-.073.012-.091.01-.165.013H3.845z" diff --git a/server/sonar-ui-common/components/controls/BoxedGroupAccordion.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/BoxedGroupAccordion.tsx index ce713c7c9c1..619b59ca330 100644 --- a/server/sonar-ui-common/components/controls/BoxedGroupAccordion.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/BoxedGroupAccordion.tsx @@ -55,7 +55,7 @@ export default class BoxedGroupAccordion extends React.PureComponent<Props, Stat return ( <div className={classNames('boxed-group boxed-group-accordion', className, { - 'no-hover': this.state.hoveringInner, + 'no-hover': this.state.hoveringInner })}> <div className="boxed-group-header" onClick={this.handleClick} role="listitem"> <span className="boxed-group-accordion-title"> diff --git a/server/sonar-ui-common/components/controls/BoxedTabs.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/BoxedTabs.tsx index 976cb63f348..4429741e96b 100644 --- a/server/sonar-ui-common/components/controls/BoxedTabs.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/BoxedTabs.tsx @@ -42,7 +42,7 @@ const highlightHoverMixin = ({ theme }: ThemedProps) => ` const StyledTab = styled.button<{ active: boolean }>` position: relative; - background-color: ${(props) => (props.active ? 'white' : props.theme.colors.barBackgroundColor)}; + background-color: ${props => (props.active ? 'white' : props.theme.colors.barBackgroundColor)}; border-top: ${baseBorder}; border-left: ${baseBorder}; border-right: none; @@ -50,11 +50,11 @@ const StyledTab = styled.button<{ active: boolean }>` margin-bottom: -1px; min-width: 128px; min-height: 56px; - ${(props) => !props.active && 'cursor: pointer;'} + ${props => !props.active && 'cursor: pointer;'} outline: 0; padding: calc(2 * ${themeSize('gridSize')}); - ${(props) => (!props.active ? highlightHoverMixin : null)} + ${props => (!props.active ? highlightHoverMixin : null)} &:last-child { border-right: ${baseBorder}; @@ -62,7 +62,7 @@ const StyledTab = styled.button<{ active: boolean }>` `; const ActiveBorder = styled.div<{ active: boolean }>` - display: ${(props) => (props.active ? 'block' : 'none')}; + display: ${props => (props.active ? 'block' : 'none')}; background-color: ${themeColor('blue')}; height: 3px; width: 100%; @@ -79,6 +79,7 @@ export default function BoxedTabs<K>(props: BoxedTabsProps<K>) { {tabs.map(({ key, label }, i) => ( <StyledTab active={selected === key} + // eslint-disable-next-line react/no-array-index-key key={i} onClick={() => selected !== key && props.onSelect(key)} type="button"> diff --git a/server/sonar-ui-common/components/controls/Checkbox.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Checkbox.css index 6306f855eb6..6306f855eb6 100644 --- a/server/sonar-ui-common/components/controls/Checkbox.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Checkbox.css diff --git a/server/sonar-ui-common/components/controls/Checkbox.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Checkbox.tsx index 1526eb501fc..5fb87ddbf03 100644 --- a/server/sonar-ui-common/components/controls/Checkbox.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Checkbox.tsx @@ -17,6 +17,10 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* eslint-disable jsx-a11y/anchor-has-content */ +/* eslint-disable jsx-a11y/control-has-associated-label */ + import * as classNames from 'classnames'; import * as React from 'react'; import DeferredSpinner from '../ui/DeferredSpinner'; @@ -37,7 +41,7 @@ interface Props { export default class Checkbox extends React.PureComponent<Props> { static defaultProps = { - thirdState: false, + thirdState: false }; handleClick = (event: React.SyntheticEvent<HTMLElement>) => { @@ -53,7 +57,7 @@ export default class Checkbox extends React.PureComponent<Props> { const className = classNames('icon-checkbox', { 'icon-checkbox-checked': checked, 'icon-checkbox-single': thirdState, - 'icon-checkbox-disabled': disabled, + 'icon-checkbox-disabled': disabled }); if (children) { @@ -62,7 +66,7 @@ export default class Checkbox extends React.PureComponent<Props> { aria-checked={checked} className={classNames('link-checkbox', this.props.className, { note: disabled, - disabled, + disabled })} href="#" id={id} diff --git a/server/sonar-ui-common/components/controls/ClickEventBoundary.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ClickEventBoundary.tsx index 64891b31b47..db7d0dc1c93 100644 --- a/server/sonar-ui-common/components/controls/ClickEventBoundary.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ClickEventBoundary.tsx @@ -30,6 +30,6 @@ export default function ClickEventBoundary({ children }: ClickEventBoundaryProps if (typeof children.props.onClick === 'function') { children.props.onClick(e); } - }, + } }); } diff --git a/server/sonar-ui-common/components/controls/ConfirmButton.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ConfirmButton.tsx index 9ab6717f2b7..9ab6717f2b7 100644 --- a/server/sonar-ui-common/components/controls/ConfirmButton.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ConfirmButton.tsx diff --git a/server/sonar-ui-common/components/controls/ConfirmModal.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ConfirmModal.tsx index 44a4010beb7..61bf510c57d 100644 --- a/server/sonar-ui-common/components/controls/ConfirmModal.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ConfirmModal.tsx @@ -55,10 +55,9 @@ export default class ConfirmModal<T = string> extends React.PureComponent<Props< const result = this.props.onConfirm(this.props.confirmData); if (result) { return result.then(this.props.onClose, () => {}); - } else { - this.props.onClose(); - return undefined; } + this.props.onClose(); + return undefined; }; renderModalContent = ({ onCloseClick, onFormSubmit, submitting }: ChildrenProps) => { @@ -69,7 +68,7 @@ export default class ConfirmModal<T = string> extends React.PureComponent<Props< header, headerDescription, isDestructive, - cancelButtonText = translate('cancel'), + cancelButtonText = translate('cancel') } = this.props; return ( <ClickEventBoundary> diff --git a/server/sonar-ui-common/components/controls/DocumentClickHandler.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/DocumentClickHandler.tsx index 45765c95874..45765c95874 100644 --- a/server/sonar-ui-common/components/controls/DocumentClickHandler.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/DocumentClickHandler.tsx diff --git a/server/sonar-ui-common/components/controls/Dropdown.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Dropdown.css index 41b7bd79b15..41b7bd79b15 100644 --- a/server/sonar-ui-common/components/controls/Dropdown.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Dropdown.css diff --git a/server/sonar-ui-common/components/controls/Dropdown.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Dropdown.tsx index 89b5733cf9a..92b1444aeb7 100644 --- a/server/sonar-ui-common/components/controls/Dropdown.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Dropdown.tsx @@ -68,13 +68,13 @@ export default class Dropdown extends React.PureComponent<Props, State> { event.preventDefault(); event.currentTarget.blur(); } - this.setState((state) => ({ open: !state.open })); + this.setState(state => ({ open: !state.open })); }; render() { const a11yAttrs = { 'aria-expanded': String(this.state.open), - 'aria-haspopup': 'true', + 'aria-haspopup': 'true' }; const child = React.isValidElement(this.props.children) @@ -82,7 +82,7 @@ export default class Dropdown extends React.PureComponent<Props, State> { : this.props.children({ closeDropdown: this.closeDropdown, onToggleClick: this.handleToggleClick, - open: this.state.open, + open: this.state.open }); const { closeOnClick = true, closeOnClickOutside = false } = this.props; @@ -153,8 +153,7 @@ export class DropdownOverlay extends React.Component<OverlayProps> { {({ leftFix, topFix }) => this.renderPopup(leftFix, topFix)} </ScreenPositionFixer> ); - } else { - return this.renderPopup(); } + return this.renderPopup(); } } diff --git a/server/sonar-ui-common/components/controls/EscKeydownHandler.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/EscKeydownHandler.tsx index 487bf13a6af..487bf13a6af 100644 --- a/server/sonar-ui-common/components/controls/EscKeydownHandler.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/EscKeydownHandler.tsx diff --git a/server/sonar-ui-common/components/controls/FavoriteButton.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/FavoriteButton.tsx index e3727dd338a..e3727dd338a 100644 --- a/server/sonar-ui-common/components/controls/FavoriteButton.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/FavoriteButton.tsx diff --git a/server/sonar-ui-common/components/controls/GlobalMessages.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/GlobalMessages.tsx index d59f8d131e8..8a68c914bda 100644 --- a/server/sonar-ui-common/components/controls/GlobalMessages.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/GlobalMessages.tsx @@ -41,7 +41,7 @@ export default function GlobalMessages({ closeGlobalMessage, messages }: GlobalM return ( <MessagesContainer> - {messages.map((message) => ( + {messages.map(message => ( <GlobalMessage closeGlobalMessage={closeGlobalMessage} key={message.id} message={message} /> ))} </MessagesContainer> diff --git a/server/sonar-ui-common/components/controls/HelpTooltip.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/HelpTooltip.css index 11376bc7c33..11376bc7c33 100644 --- a/server/sonar-ui-common/components/controls/HelpTooltip.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/HelpTooltip.css diff --git a/server/sonar-ui-common/components/controls/HelpTooltip.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/HelpTooltip.tsx index 00a4bf4610c..a046f726147 100644 --- a/server/sonar-ui-common/components/controls/HelpTooltip.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/HelpTooltip.tsx @@ -44,7 +44,7 @@ export default function HelpTooltip({ size = 12, ...props }: Props) { <span className="display-inline-flex-center"> {props.children || ( <ThemeConsumer> - {(theme) => <HelpIcon fill={theme.colors.gray71} size={size} />} + {theme => <HelpIcon fill={theme.colors.gray71} size={size} />} </ThemeConsumer> )} </span> diff --git a/server/sonar-ui-common/components/controls/IdentityProviderLink.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/IdentityProviderLink.css index 889f14acf90..889f14acf90 100644 --- a/server/sonar-ui-common/components/controls/IdentityProviderLink.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/IdentityProviderLink.css diff --git a/server/sonar-ui-common/components/controls/IdentityProviderLink.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/IdentityProviderLink.tsx index 53c85f31a03..31dd2da7e00 100644 --- a/server/sonar-ui-common/components/controls/IdentityProviderLink.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/IdentityProviderLink.tsx @@ -42,7 +42,7 @@ export default function IdentityProviderLink({ name, onClick, small, - url, + url }: Props) { const size = small ? 14 : 20; diff --git a/server/sonar-ui-common/components/controls/InputValidationField.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/InputValidationField.tsx index bb9cfcab90f..bb9cfcab90f 100644 --- a/server/sonar-ui-common/components/controls/InputValidationField.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/InputValidationField.tsx diff --git a/server/sonar-ui-common/components/controls/ListFooter.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ListFooter.tsx index 8617c126d65..8617c126d65 100644 --- a/server/sonar-ui-common/components/controls/ListFooter.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ListFooter.tsx diff --git a/server/sonar-ui-common/components/controls/Modal.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Modal.css index 04e3de15a21..04e3de15a21 100644 --- a/server/sonar-ui-common/components/controls/Modal.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Modal.css diff --git a/server/sonar-ui-common/components/controls/Modal.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Modal.tsx index 4583856b3c6..d97d9e1522b 100644 --- a/server/sonar-ui-common/components/controls/Modal.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Modal.tsx @@ -66,7 +66,7 @@ export default function Modal(props: Props) { className={classNames('modal', { 'modal-small': props.size === 'small', 'modal-medium': props.size === 'medium', - 'modal-large': props.size === 'large', + 'modal-large': props.size === 'large' })} isOpen={true} overlayClassName={classNames('modal-overlay', { 'modal-no-backdrop': props.noBackdrop })} diff --git a/server/sonar-ui-common/components/controls/ModalButton.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ModalButton.tsx index 2166b6464c4..7008f3e3979 100644 --- a/server/sonar-ui-common/components/controls/ModalButton.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ModalButton.tsx @@ -71,7 +71,7 @@ export default class ModalButton extends React.PureComponent<Props, State> { <> {this.props.children({ onClick: this.handleButtonClick, - onFormSubmit: this.handleFormSubmit, + onFormSubmit: this.handleFormSubmit })} {this.state.modal && this.props.modal({ onClose: this.handleCloseModal })} </> diff --git a/server/sonar-ui-common/components/controls/ModalValidationField.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ModalValidationField.tsx index 2aa649de238..2aa649de238 100644 --- a/server/sonar-ui-common/components/controls/ModalValidationField.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ModalValidationField.tsx diff --git a/server/sonar-ui-common/components/controls/OutsideClickHandler.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/OutsideClickHandler.tsx index eaea43f89ba..eaea43f89ba 100644 --- a/server/sonar-ui-common/components/controls/OutsideClickHandler.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/OutsideClickHandler.tsx diff --git a/server/sonar-ui-common/components/controls/Radio.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Radio.css index 6d53c4b383b..6d53c4b383b 100644 --- a/server/sonar-ui-common/components/controls/Radio.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Radio.css diff --git a/server/sonar-ui-common/components/controls/Radio.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Radio.tsx index c664c6f2499..c664c6f2499 100644 --- a/server/sonar-ui-common/components/controls/Radio.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Radio.tsx diff --git a/server/sonar-ui-common/components/controls/RadioCard.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/RadioCard.css index f51fe41c930..f51fe41c930 100644 --- a/server/sonar-ui-common/components/controls/RadioCard.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/RadioCard.css diff --git a/server/sonar-ui-common/components/controls/RadioCard.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/RadioCard.tsx index 0fdd1348a9d..223e597e6d9 100644 --- a/server/sonar-ui-common/components/controls/RadioCard.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/RadioCard.tsx @@ -48,7 +48,7 @@ export default function RadioCard(props: Props) { recommended, selected, titleInfo, - vertical = false, + vertical = false } = props; const isActionable = Boolean(onClick); return ( @@ -60,7 +60,7 @@ export default function RadioCard(props: Props) { 'radio-card-actionable': isActionable, 'radio-card-vertical': vertical, disabled, - selected, + selected }, className )} diff --git a/server/sonar-ui-common/components/controls/RadioToggle.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/RadioToggle.css index 4ca9c28df7c..4ca9c28df7c 100644 --- a/server/sonar-ui-common/components/controls/RadioToggle.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/RadioToggle.css diff --git a/server/sonar-ui-common/components/controls/RadioToggle.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/RadioToggle.tsx index 51187d25cbb..2ccf856ce30 100644 --- a/server/sonar-ui-common/components/controls/RadioToggle.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/RadioToggle.tsx @@ -41,7 +41,7 @@ interface Props { export default class RadioToggle extends React.PureComponent<Props> { static defaultProps = { disabled: false, - value: null, + value: null }; renderOption = (option: Option) => { diff --git a/server/sonar-ui-common/components/controls/ReloadButton.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ReloadButton.tsx index 0d7d7960d4c..1ab7a529fd5 100644 --- a/server/sonar-ui-common/components/controls/ReloadButton.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ReloadButton.tsx @@ -46,7 +46,7 @@ export default class ReloadButton extends React.PureComponent<Props> { onClick={this.handleClick}> { <ThemeConsumer> - {(theme) => ( + {theme => ( <svg height="24" viewBox="0 0 18 24" width="18"> <path d="M16.6454 8.1084c-.3-.5-.9-.7-1.4-.4-.5.3-.7.9-.4 1.4.9 1.6 1.1 3.4.6 5.1-.5 1.7-1.7 3.2-3.2 4-3.3 1.8-7.4.6-9.1-2.7-1.8-3.1-.8-6.9 2.1-8.8v3.3h2v-7h-7v2h3.9c-3.7 2.5-5 7.5-2.8 11.4 1.6 3 4.6 4.6 7.7 4.6 1.4 0 2.8-.3 4.2-1.1 2-1.1 3.5-3 4.2-5.2.6-2.2.3-4.6-.8-6.6z" diff --git a/server/sonar-ui-common/components/controls/ScreenPositionFixer.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ScreenPositionFixer.tsx index 0065201d22e..0065201d22e 100644 --- a/server/sonar-ui-common/components/controls/ScreenPositionFixer.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ScreenPositionFixer.tsx diff --git a/server/sonar-ui-common/components/controls/SearchBox.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SearchBox.css index 3e91462ef5c..3e91462ef5c 100644 --- a/server/sonar-ui-common/components/controls/SearchBox.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SearchBox.css diff --git a/server/sonar-ui-common/components/controls/SearchBox.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SearchBox.tsx index c3889b50825..d03081e26bc 100644 --- a/server/sonar-ui-common/components/controls/SearchBox.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SearchBox.tsx @@ -126,7 +126,7 @@ export default class SearchBox extends React.PureComponent<Props, State> { const { value } = this.state; const inputClassName = classNames('search-box-input', { - touched: value.length > 0 && (!minLength || minLength > value.length), + touched: value.length > 0 && (!minLength || minLength > value.length) }); const tooShort = minLength !== undefined && value.length > 0 && value.length < minLength; diff --git a/server/sonar-ui-common/components/controls/SearchSelect.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SearchSelect.tsx index be783afe805..cf18ce100f2 100644 --- a/server/sonar-ui-common/components/controls/SearchSelect.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SearchSelect.tsx @@ -81,11 +81,11 @@ export default class SearchSelect<T extends { value: string }> extends React.Pur // Ignore the result if the query changed const currentQuery = query; this.props.onSearch(currentQuery).then( - (options) => { + options => { if (this.mounted) { - this.setState((state) => ({ + this.setState(state => ({ loading: false, - options: state.query === currentQuery ? options : state.options, + options: state.query === currentQuery ? options : state.options })); } }, diff --git a/server/sonar-ui-common/components/controls/Select.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Select.css index 8f89447cc47..8f89447cc47 100644 --- a/server/sonar-ui-common/components/controls/Select.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Select.css diff --git a/server/sonar-ui-common/components/controls/Select.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Select.tsx index f100c9a2cde..44657a87991 100644 --- a/server/sonar-ui-common/components/controls/Select.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Select.tsx @@ -22,7 +22,7 @@ import { defaultFilterOptions as reactSelectDefaultFilterOptions, ReactAsyncSelectProps, ReactCreatableSelectProps, - ReactSelectProps, + ReactSelectProps } from 'react-select'; import { lazyLoadComponent } from '../lazyLoadComponent'; import { ClearButton } from './buttons'; @@ -35,9 +35,9 @@ declare module 'react-select' { const ReactSelectLib = import('react-select'); const ReactSelect = lazyLoadComponent(() => ReactSelectLib); const ReactCreatable = lazyLoadComponent(() => - ReactSelectLib.then((lib) => ({ default: lib.Creatable })) + ReactSelectLib.then(lib => ({ default: lib.Creatable })) ); -const ReactAsync = lazyLoadComponent(() => ReactSelectLib.then((lib) => ({ default: lib.Async }))); +const ReactAsync = lazyLoadComponent(() => ReactSelectLib.then(lib => ({ default: lib.Async }))); function renderInput() { return <ClearButton className="button-tiny spacer-left text-middle" iconProps={{ size: 12 }} />; diff --git a/server/sonar-ui-common/components/controls/SelectList.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SelectList.css index 30b95c80033..30b95c80033 100644 --- a/server/sonar-ui-common/components/controls/SelectList.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SelectList.css diff --git a/server/sonar-ui-common/components/controls/SelectList.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SelectList.tsx index 1e49c82d3ed..600dcefa22d 100644 --- a/server/sonar-ui-common/components/controls/SelectList.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SelectList.tsx @@ -28,7 +28,7 @@ import SelectListListContainer from './SelectListListContainer'; export enum SelectListFilter { All = 'all', Selected = 'selected', - Unselected = 'deselected', + Unselected = 'deselected' } interface Props { @@ -75,9 +75,9 @@ export default class SelectList extends React.PureComponent<Props, State> { filter: SelectListFilter.Selected, page: 1, pageSize: props.pageSize ? props.pageSize : DEFAULT_PAGE_SIZE, - query: '', + query: '' }, - loading: false, + loading: false }; } @@ -103,9 +103,9 @@ export default class SelectList extends React.PureComponent<Props, State> { search = (searchParams: Partial<SelectListSearchParams>) => this.setState( - (prevState) => ({ + prevState => ({ loading: true, - lastSearchParams: { ...prevState.lastSearchParams, ...searchParams }, + lastSearchParams: { ...prevState.lastSearchParams, ...searchParams } }), () => this.props @@ -113,7 +113,7 @@ export default class SelectList extends React.PureComponent<Props, State> { filter: this.getFilter(), page: this.props.withPaging ? this.state.lastSearchParams.page : undefined, pageSize: this.props.withPaging ? this.state.lastSearchParams.pageSize : undefined, - query: this.state.lastSearchParams.query, + query: this.state.lastSearchParams.query }) .then(this.stopLoading) .catch(this.stopLoading) @@ -126,7 +126,7 @@ export default class SelectList extends React.PureComponent<Props, State> { onLoadMore = () => this.search({ page: - this.state.lastSearchParams.page != null ? this.state.lastSearchParams.page + 1 : undefined, + this.state.lastSearchParams.page != null ? this.state.lastSearchParams.page + 1 : undefined }); onReload = () => this.search({ page: 1 }); @@ -135,7 +135,7 @@ export default class SelectList extends React.PureComponent<Props, State> { const { labelSelected = translate('selected'), labelUnselected = translate('unselected'), - labelAll = translate('all'), + labelAll = translate('all') } = this.props; const { filter } = this.state.lastSearchParams; @@ -151,7 +151,7 @@ export default class SelectList extends React.PureComponent<Props, State> { options={[ { disabled, label: labelSelected, value: SelectListFilter.Selected }, { disabled, label: labelUnselected, value: SelectListFilter.Unselected }, - { disabled, label: labelAll, value: SelectListFilter.All }, + { disabled, label: labelAll, value: SelectListFilter.All } ]} value={filter} /> diff --git a/server/sonar-ui-common/components/controls/SelectListListContainer.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SelectListListContainer.tsx index c39d45133c7..160317b1951 100644 --- a/server/sonar-ui-common/components/controls/SelectListListContainer.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SelectListListContainer.tsx @@ -70,11 +70,11 @@ export default class SelectListListContainer extends React.PureComponent<Props, handleBulkChange = (checked: boolean) => { this.setState({ loading: true }); if (checked) { - Promise.all(this.props.elements.map((element) => this.props.onSelect(element))) + Promise.all(this.props.elements.map(element => this.props.onSelect(element))) .then(this.stopLoading) .catch(this.stopLoading); } else { - Promise.all(this.props.selectedElements.map((element) => this.props.onUnselect(element))) + Promise.all(this.props.selectedElements.map(element => this.props.onUnselect(element))) .then(this.stopLoading) .catch(this.stopLoading); } @@ -111,7 +111,7 @@ export default class SelectListListContainer extends React.PureComponent<Props, elements.length > 0 && filter === SelectListFilter.All && this.renderBulkSelector()} - {elements.map((element) => ( + {elements.map(element => ( <SelectListListElement disabled={this.isDisabled(element)} element={element} diff --git a/server/sonar-ui-common/components/controls/SelectListListElement.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SelectListListElement.tsx index defd493f344..defd493f344 100644 --- a/server/sonar-ui-common/components/controls/SelectListListElement.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SelectListListElement.tsx diff --git a/server/sonar-ui-common/components/controls/SimpleModal.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SimpleModal.tsx index a0b8bc103b3..4f95af38211 100644 --- a/server/sonar-ui-common/components/controls/SimpleModal.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/SimpleModal.tsx @@ -93,7 +93,7 @@ export default class SimpleModal extends React.Component<Props, State> { onCloseClick: this.handleCloseClick, onFormSubmit: this.handleFormSubmit, onSubmitClick: this.handleSubmitClick, - submitting: this.state.submitting, + submitting: this.state.submitting })} </Modal> ); diff --git a/server/sonar-ui-common/components/controls/Tabs.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Tabs.css index 334fe14f255..334fe14f255 100644 --- a/server/sonar-ui-common/components/controls/Tabs.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Tabs.css diff --git a/server/sonar-ui-common/components/controls/Tabs.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Tabs.tsx index b187255ad46..6c25ae0c21f 100644 --- a/server/sonar-ui-common/components/controls/Tabs.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Tabs.tsx @@ -30,7 +30,7 @@ interface Props<T extends string> { export default function Tabs<T extends string>({ onChange, selected, tabs }: Props<T>) { return ( <ul className="flex-tabs"> - {tabs.map((tab) => ( + {tabs.map(tab => ( <Tab disabled={tab.disabled} key={tab.key} diff --git a/server/sonar-ui-common/components/controls/Toggle.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Toggle.css index f9b0cfeb75b..f9b0cfeb75b 100644 --- a/server/sonar-ui-common/components/controls/Toggle.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Toggle.css diff --git a/server/sonar-ui-common/components/controls/Toggle.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Toggle.tsx index 52448e8b074..52448e8b074 100644 --- a/server/sonar-ui-common/components/controls/Toggle.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Toggle.tsx diff --git a/server/sonar-ui-common/components/controls/Toggler.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Toggler.tsx index b610a9b9fd5..fe76b7a1a41 100644 --- a/server/sonar-ui-common/components/controls/Toggler.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Toggler.tsx @@ -39,7 +39,7 @@ export default class Toggler extends React.Component<Props> { closeOnClickOutside = true, closeOnEscape = true, onRequestClose, - overlay, + overlay } = this.props; let renderedOverlay; @@ -57,9 +57,8 @@ export default class Toggler extends React.Component<Props> { return ( <OutsideClickHandler onClickOutside={onRequestClose}>{renderedOverlay}</OutsideClickHandler> ); - } else { - return renderedOverlay; } + return renderedOverlay; } render() { diff --git a/server/sonar-ui-common/components/controls/Tooltip.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Tooltip.css index d49494f1f77..d49494f1f77 100644 --- a/server/sonar-ui-common/components/controls/Tooltip.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Tooltip.css diff --git a/server/sonar-ui-common/components/controls/Tooltip.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Tooltip.tsx index de4f670a637..7f21fcf7c49 100644 --- a/server/sonar-ui-common/components/controls/Tooltip.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/Tooltip.tsx @@ -57,7 +57,7 @@ const FLIP_MAP: { [key in Placement]: Placement } = { left: 'right', right: 'left', top: 'bottom', - bottom: 'top', + bottom: 'top' }; function isMeasured(state: State): state is OwnState & Measurements { @@ -84,7 +84,7 @@ export class TooltipInner extends React.Component<TooltipProps, State> { mouseIn = false; static defaultProps = { - mouseEnterDelay: 0.1, + mouseEnterDelay: 0.1 }; constructor(props: TooltipProps) { @@ -92,7 +92,7 @@ export class TooltipInner extends React.Component<TooltipProps, State> { this.state = { flipped: false, placement: props.placement, - visible: props.visible !== undefined ? props.visible : false, + visible: props.visible !== undefined ? props.visible : false }; this.throttledPositionTooltip = throttle(this.positionTooltip, 10); } @@ -225,7 +225,7 @@ export class TooltipInner extends React.Component<TooltipProps, State> { left: window.pageXOffset + left, top: window.pageYOffset + top, width, - height, + height }); } }; @@ -237,7 +237,7 @@ export class TooltipInner extends React.Component<TooltipProps, State> { top: undefined, width: undefined, height: undefined, - placement: this.props.placement, + placement: this.props.placement }); }; @@ -320,7 +320,7 @@ export class TooltipInner extends React.Component<TooltipProps, State> { // Set height to undefined to force ScreenPositionFixer to // re-compute our positioning. height: undefined, - placement: FLIP_MAP[placement], + placement: FLIP_MAP[placement] }), () => { if (this.state.visible) { @@ -342,7 +342,7 @@ export class TooltipInner extends React.Component<TooltipProps, State> { left: this.state.left + leftFix, top: this.state.top + topFix, width: this.state.width, - height: this.state.height, + height: this.state.height } : undefined; @@ -371,7 +371,7 @@ export class TooltipInner extends React.Component<TooltipProps, State> { <> {React.cloneElement(this.props.children, { onMouseEnter: this.handleMouseEnter, - onMouseLeave: this.handleMouseLeave, + onMouseLeave: this.handleMouseLeave })} {this.isVisible() && ( <TooltipPortal> diff --git a/server/sonar-ui-common/components/controls/ValidationForm.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ValidationForm.tsx index 37e7127014a..37e7127014a 100644 --- a/server/sonar-ui-common/components/controls/ValidationForm.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ValidationForm.tsx diff --git a/server/sonar-ui-common/components/controls/ValidationInput.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ValidationInput.tsx index 1f966232028..1f966232028 100644 --- a/server/sonar-ui-common/components/controls/ValidationInput.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ValidationInput.tsx diff --git a/server/sonar-ui-common/components/controls/ValidationModal.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ValidationModal.tsx index 7dd77c81eea..e3df97e8591 100644 --- a/server/sonar-ui-common/components/controls/ValidationModal.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/ValidationModal.tsx @@ -55,7 +55,7 @@ export default class ValidationModal<V> extends React.PureComponent<Props<V>> { isInitialValid={this.props.isInitialValid} onSubmit={this.handleSubmit} validate={this.props.validate}> - {(props) => ( + {props => ( <> <header className="modal-head"> <h2>{this.props.header}</h2> diff --git a/server/sonar-ui-common/components/controls/__tests__/ActionsDropdown-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ActionsDropdown-test.tsx index a74b20fd933..8646ec806c0 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ActionsDropdown-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ActionsDropdown-test.tsx @@ -17,7 +17,6 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -/* eslint-disable sonarjs/no-duplicate-string */ import { mount, shallow } from 'enzyme'; import * as React from 'react'; import { click } from '../../../helpers/testUtils'; @@ -25,7 +24,7 @@ import { PopupPlacement } from '../../ui/popups'; import ActionsDropdown, { ActionsDropdownDivider, ActionsDropdownItem, - ActionsDropdownProps, + ActionsDropdownProps } from '../ActionsDropdown'; describe('ActionsDropdown', () => { diff --git a/server/sonar-ui-common/components/controls/__tests__/BackButton-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/BackButton-test.tsx index 0f206076ad9..34770ec005b 100644 --- a/server/sonar-ui-common/components/controls/__tests__/BackButton-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/BackButton-test.tsx @@ -42,7 +42,7 @@ function shallowRender(props: Partial<BackButton['props']> = {}) { return shallow<BackButton>(<BackButton onClick={jest.fn()} {...props} />, { wrappingComponent: ThemeProvider, wrappingComponentProps: { - theme: testTheme, - }, + theme: testTheme + } }); } diff --git a/server/sonar-ui-common/components/controls/__tests__/BoxedGroupAccordion-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/BoxedGroupAccordion-test.tsx index 970a3546c3a..970a3546c3a 100644 --- a/server/sonar-ui-common/components/controls/__tests__/BoxedGroupAccordion-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/BoxedGroupAccordion-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/BoxedTabs-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/BoxedTabs-test.tsx index 6db0b5c28e1..12a58f34fe5 100644 --- a/server/sonar-ui-common/components/controls/__tests__/BoxedTabs-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/BoxedTabs-test.tsx @@ -29,7 +29,10 @@ it('should call onSelect when a tab is clicked', () => { const onSelect = jest.fn(); const wrapper = shallowRender({ onSelect }); - wrapper.find('Styled(button)').get(1).props.onClick(); + wrapper + .find('Styled(button)') + .get(1) + .props.onClick(); expect(onSelect).toHaveBeenCalledWith('b'); }); @@ -57,8 +60,8 @@ function dom<K>(overrides: Partial<BoxedTabsProps<K>>) { <span> Complex label <strong>!!!</strong> </span> - ), - }, + ) + } ]} {...overrides} /> diff --git a/server/sonar-ui-common/components/controls/__tests__/Checkbox-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Checkbox-test.tsx index b56cce6c559..b56cce6c559 100644 --- a/server/sonar-ui-common/components/controls/__tests__/Checkbox-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Checkbox-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/ClickEventBoundary-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ClickEventBoundary-test.tsx index c2f6d701a76..c2f6d701a76 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ClickEventBoundary-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ClickEventBoundary-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/ConfirmButton-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ConfirmButton-test.tsx index 69b6fde10d5..39e315f1254 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ConfirmButton-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ConfirmButton-test.tsx @@ -27,7 +27,9 @@ it('should display a modal button', () => { it('should display a confirm modal', () => { expect( - shallowRender().find('ModalButton').prop<Function>('modal')({ onClose: jest.fn() }) + shallowRender() + .find('ModalButton') + .prop<Function>('modal')({ onClose: jest.fn() }) ).toMatchSnapshot(); }); diff --git a/server/sonar-ui-common/components/controls/__tests__/ConfirmModal-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ConfirmModal-test.tsx index cfefbac465a..cfefbac465a 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ConfirmModal-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ConfirmModal-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/Dropdown-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Dropdown-test.tsx index 6c051fefb3e..e08d8293fba 100644 --- a/server/sonar-ui-common/components/controls/__tests__/Dropdown-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Dropdown-test.tsx @@ -17,6 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* eslint-disable jest/expect-expect */ + import { mount, shallow, ShallowWrapper } from 'enzyme'; import * as React from 'react'; import { click } from '../../../helpers/testUtils'; @@ -97,7 +100,13 @@ describe('DropdownOverlay', () => { ); expect(wrapper.is(ScreenPositionFixer)).toBe(true); - expect(wrapper.dive().dive().dive().is(Popup)).toBe(true); + expect( + wrapper + .dive() + .dive() + .dive() + .is(Popup) + ).toBe(true); }); it('should render overlay without screen fixer', () => { diff --git a/server/sonar-ui-common/components/controls/__tests__/EscKeydownHandler-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/EscKeydownHandler-test.tsx index 6c852477b81..6c852477b81 100644 --- a/server/sonar-ui-common/components/controls/__tests__/EscKeydownHandler-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/EscKeydownHandler-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/FavoriteButton-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/FavoriteButton-test.tsx index d0978f050d4..d0978f050d4 100644 --- a/server/sonar-ui-common/components/controls/__tests__/FavoriteButton-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/FavoriteButton-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/GlobalMessages-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/GlobalMessages-test.tsx index af48c1a9701..61bf771401a 100644 --- a/server/sonar-ui-common/components/controls/__tests__/GlobalMessages-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/GlobalMessages-test.tsx @@ -32,22 +32,36 @@ it('should not render when no message', () => { it('should render correctly with a message', () => { const wrapper = shallowRender(); expect(wrapper).toMatchSnapshot(); - expect(wrapper.find('GlobalMessage').first().dive()).toMatchSnapshot(); - expect(wrapper.find('GlobalMessage').last().dive()).toMatchSnapshot(); + expect( + wrapper + .find('GlobalMessage') + .first() + .dive() + ).toMatchSnapshot(); + expect( + wrapper + .find('GlobalMessage') + .last() + .dive() + ).toMatchSnapshot(); }); it('should render with correct css', () => { const wrapper = shallowRender(); expect(wrapper.render()).toMatchSnapshot(); - expect(wrapper.find('GlobalMessage').first().render()).toHaveStyleRule( - 'background-color', - testTheme.colors.red - ); + expect( + wrapper + .find('GlobalMessage') + .first() + .render() + ).toHaveStyleRule('background-color', testTheme.colors.red); - expect(wrapper.find('GlobalMessage').last().render()).toHaveStyleRule( - 'background-color', - testTheme.colors.green - ); + expect( + wrapper + .find('GlobalMessage') + .last() + .render() + ).toHaveStyleRule('background-color', testTheme.colors.green); }); function shallowRender(props: Partial<GlobalMessagesProps> = {}) { @@ -56,7 +70,7 @@ function shallowRender(props: Partial<GlobalMessagesProps> = {}) { closeGlobalMessage={jest.fn()} messages={[ { id: '1', level: 'ERROR', message: 'Test' }, - { id: '2', level: 'SUCCESS', message: 'Test 2' }, + { id: '2', level: 'SUCCESS', message: 'Test 2' } ]} {...props} /> diff --git a/server/sonar-ui-common/components/controls/__tests__/HelpTooltip-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/HelpTooltip-test.tsx index 6bd89e53b25..0df9d3af2a4 100644 --- a/server/sonar-ui-common/components/controls/__tests__/HelpTooltip-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/HelpTooltip-test.tsx @@ -27,26 +27,36 @@ it('should render properly', () => { const wrapper = shallow(<HelpTooltip overlay={<div className="my-overlay" />} />, { wrappingComponent: ThemeProvider, wrappingComponentProps: { - theme: testTheme, - }, + theme: testTheme + } }); expect(wrapper).toMatchSnapshot('default'); expect(wrapper.find('ContextConsumer').dive()).toMatchSnapshot('default icon'); wrapper.setProps({ size: 18 }); - expect(wrapper.find('ContextConsumer').dive().prop('size')).toBe(18); + expect( + wrapper + .find('ContextConsumer') + .dive() + .prop('size') + ).toBe(18); }); it('should render dark helptooltip properly', () => { const wrapper = shallow(<DarkHelpTooltip overlay={<div className="my-overlay" />} size={14} />, { wrappingComponent: ThemeProvider, wrappingComponentProps: { - theme: testTheme, - }, + theme: testTheme + } }); expect(wrapper).toMatchSnapshot('dark'); expect(wrapper.find('ContextConsumer').dive()).toMatchSnapshot('dark icon'); wrapper.setProps({ size: undefined }); - expect(wrapper.find('ContextConsumer').dive().prop('size')).toBe(12); + expect( + wrapper + .find('ContextConsumer') + .dive() + .prop('size') + ).toBe(12); }); diff --git a/server/sonar-ui-common/components/controls/__tests__/IdentityProviderLink-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/IdentityProviderLink-test.tsx index 0050cd6f277..14f346879ad 100644 --- a/server/sonar-ui-common/components/controls/__tests__/IdentityProviderLink-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/IdentityProviderLink-test.tsx @@ -25,7 +25,7 @@ const identityProvider = { backgroundColor: '#000', iconPath: '/some/path', key: 'foo', - name: 'Foo', + name: 'Foo' }; it('should render correctly', () => { diff --git a/server/sonar-ui-common/components/controls/__tests__/InputValidationField-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/InputValidationField-test.tsx index 6c7c421452c..6c7c421452c 100644 --- a/server/sonar-ui-common/components/controls/__tests__/InputValidationField-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/InputValidationField-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/ListFooter-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ListFooter-test.tsx index 8970e984359..8970e984359 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ListFooter-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ListFooter-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/ModalButton-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ModalButton-test.tsx index 490609803a7..3d7062aa3c9 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ModalButton-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ModalButton-test.tsx @@ -17,6 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* eslint-disable jsx-a11y/control-has-associated-label */ + import { shallow } from 'enzyme'; import * as React from 'react'; import { click } from '../../../helpers/testUtils'; diff --git a/server/sonar-ui-common/components/controls/__tests__/ModalValidationField-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ModalValidationField-test.tsx index 27f9743870d..34a074f8267 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ModalValidationField-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ModalValidationField-test.tsx @@ -39,6 +39,7 @@ function getWrapper(props = {}) { <ModalValidationField dirty={true} error="Is required" + // eslint-disable-next-line jsx-a11y/label-has-associated-control label={<label>Foo</label>} touched={true} {...props}> diff --git a/server/sonar-ui-common/components/controls/__tests__/OutsideClickHandler-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/OutsideClickHandler-test.tsx index 4f540f59fec..4f540f59fec 100644 --- a/server/sonar-ui-common/components/controls/__tests__/OutsideClickHandler-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/OutsideClickHandler-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/Radio-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Radio-test.tsx index 60d2050a45d..60d2050a45d 100644 --- a/server/sonar-ui-common/components/controls/__tests__/Radio-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Radio-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/RadioCard-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/RadioCard-test.tsx index 2232f38b252..2232f38b252 100644 --- a/server/sonar-ui-common/components/controls/__tests__/RadioCard-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/RadioCard-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/RadioToggle-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/RadioToggle-test.tsx index 3653374e31a..d5bd7362015 100644 --- a/server/sonar-ui-common/components/controls/__tests__/RadioToggle-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/RadioToggle-test.tsx @@ -39,9 +39,9 @@ it('handles numeric values', () => { onCheck, options: [ { value: 1, label: 'first', tooltip: 'foo' }, - { value: 2, label: 'second', tooltip: 'bar' }, + { value: 2, label: 'second', tooltip: 'bar' } ], - value: 1, + value: 1 }); change(wrapper.find('input[id="sample__2"]'), ''); expect(onCheck).toBeCalledWith(2); @@ -53,9 +53,9 @@ it('handles boolean values', () => { onCheck, options: [ { value: true, label: 'yes', tooltip: 'foo' }, - { value: false, label: 'no', tooltip: 'bar' }, + { value: false, label: 'no', tooltip: 'bar' } ], - value: true, + value: true }); change(wrapper.find('input[id="sample__false"]'), ''); expect(onCheck).toBeCalledWith(false); @@ -67,9 +67,9 @@ it('initialize value', () => { onCheck, options: [ { value: 1, label: 'first', tooltip: 'foo' }, - { value: 2, label: 'second', tooltip: 'bar', disabled: true }, + { value: 2, label: 'second', tooltip: 'bar', disabled: true } ], - value: 2, + value: 2 }); expect(wrapper.find('input[checked=true]').prop('id')).toBe('sample__2'); }); @@ -79,8 +79,8 @@ it('accepts advanced options fields', () => { shallowRender({ options: [ { value: 'one', label: 'first', tooltip: 'foo' }, - { value: 'two', label: 'second', tooltip: 'bar', disabled: true }, - ], + { value: 'two', label: 'second', tooltip: 'bar', disabled: true } + ] }) ).toMatchSnapshot(); }); @@ -88,7 +88,7 @@ it('accepts advanced options fields', () => { function shallowRender(props?: Partial<RadioToggle['props']>) { const options = [ { value: 'one', label: 'first' }, - { value: 'two', label: 'second' }, + { value: 'two', label: 'second' } ]; return shallow(<RadioToggle name="sample" onCheck={() => true} options={options} {...props} />); } diff --git a/server/sonar-ui-common/components/controls/__tests__/ReloadButton-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ReloadButton-test.tsx index c22fd1f313e..a6d1ea88ad0 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ReloadButton-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ReloadButton-test.tsx @@ -42,7 +42,7 @@ function shallowRender(props: Partial<ReloadButton['props']> = {}) { return shallow<ReloadButton>(<ReloadButton onClick={jest.fn()} {...props} />, { wrappingComponent: ThemeProvider, wrappingComponentProps: { - theme: testTheme, - }, + theme: testTheme + } }); } diff --git a/server/sonar-ui-common/components/controls/__tests__/ScreenPositionFixer-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ScreenPositionFixer-test.tsx index f857666cecd..cb109c941a4 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ScreenPositionFixer-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ScreenPositionFixer-test.tsx @@ -30,7 +30,7 @@ jest.mock('lodash', () => { }); jest.mock('react-dom', () => ({ - findDOMNode: jest.fn(), + findDOMNode: jest.fn() })); beforeEach(() => { diff --git a/server/sonar-ui-common/components/controls/__tests__/SearchBox-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SearchBox-test.tsx index 7afa1839c5f..7afa1839c5f 100644 --- a/server/sonar-ui-common/components/controls/__tests__/SearchBox-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SearchBox-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/SearchSelect-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SearchSelect-test.tsx index ed13eea6fa7..bf647766f37 100644 --- a/server/sonar-ui-common/components/controls/__tests__/SearchSelect-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SearchSelect-test.tsx @@ -22,8 +22,8 @@ import * as React from 'react'; import SearchSelect from '../SearchSelect'; jest.mock('lodash', () => { - const lodash = require.requireActual('lodash'); - lodash.debounce = jest.fn((fn) => fn); + const lodash = jest.requireActual('lodash'); + lodash.debounce = jest.fn(fn => fn); return lodash; }); diff --git a/server/sonar-ui-common/components/controls/__tests__/SelectList-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SelectList-test.tsx index ab3eb4f8072..aa71805cd65 100644 --- a/server/sonar-ui-common/components/controls/__tests__/SelectList-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SelectList-test.tsx @@ -43,7 +43,7 @@ it('should display properly with advanced features', async () => { elementsTotalCount: 125, pageSize: 10, readOnly: true, - withPaging: true, + withPaging: true }); await waitAndUpdate(wrapper); @@ -73,7 +73,7 @@ it('should cancel filter selection when search is active', async () => { query: '', filter: SelectListFilter.Unselected, page: undefined, - pageSize: undefined, + pageSize: undefined }); expect(wrapper).toMatchSnapshot(); @@ -83,7 +83,7 @@ it('should cancel filter selection when search is active', async () => { query, filter: SelectListFilter.All, page: undefined, - pageSize: undefined, + pageSize: undefined }); await waitAndUpdate(wrapper); @@ -94,7 +94,7 @@ it('should cancel filter selection when search is active', async () => { query: '', filter: SelectListFilter.Unselected, page: undefined, - pageSize: undefined, + pageSize: undefined }); await waitAndUpdate(wrapper); @@ -109,7 +109,7 @@ it('should display pagination element properly and call search method with corre query: '', filter: SelectListFilter.Selected, page: 1, - pageSize: 100, + pageSize: 100 }); // Basic default call wrapper.instance().onLoadMore(); @@ -117,7 +117,7 @@ it('should display pagination element properly and call search method with corre query: '', filter: SelectListFilter.Selected, page: 2, - pageSize: 100, + pageSize: 100 }); // Load more call wrapper.instance().onReload(); @@ -125,7 +125,7 @@ it('should display pagination element properly and call search method with corre query: '', filter: SelectListFilter.Selected, page: 1, - pageSize: 100, + pageSize: 100 }); // Reload call wrapper.setProps({ needToReload: true }); diff --git a/server/sonar-ui-common/components/controls/__tests__/SelectListListContainer-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SelectListListContainer-test.tsx index 1b24bc866c1..1b24bc866c1 100644 --- a/server/sonar-ui-common/components/controls/__tests__/SelectListListContainer-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SelectListListContainer-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/SelectListListElement-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SelectListListElement-test.tsx index ca127222e04..ca127222e04 100644 --- a/server/sonar-ui-common/components/controls/__tests__/SelectListListElement-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SelectListListElement-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/SimpleModal-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SimpleModal-test.tsx index 5a8e6bb0cd7..5a8e6bb0cd7 100644 --- a/server/sonar-ui-common/components/controls/__tests__/SimpleModal-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/SimpleModal-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/Tabs-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Tabs-test.tsx index 11cf4e5e353..60982c290e4 100644 --- a/server/sonar-ui-common/components/controls/__tests__/Tabs-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Tabs-test.tsx @@ -29,7 +29,7 @@ it('should render correctly', () => { selected="bar" tabs={[ { key: 'foo', node: 'Foo' }, - { key: 'bar', node: 'Bar' }, + { key: 'bar', node: 'Bar' } ]} /> ); @@ -45,7 +45,7 @@ it('should switch tabs', () => { selected="bar" tabs={[ { key: 'foo', node: 'Foo' }, - { key: 'bar', node: 'Bar' }, + { key: 'bar', node: 'Bar' } ]} /> ); diff --git a/server/sonar-ui-common/components/controls/__tests__/Toggle-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Toggle-test.tsx index f3e39aca5df..f3e39aca5df 100644 --- a/server/sonar-ui-common/components/controls/__tests__/Toggle-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Toggle-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/Toggler-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Toggler-test.tsx index 679177cfda3..679177cfda3 100644 --- a/server/sonar-ui-common/components/controls/__tests__/Toggler-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Toggler-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/Tooltip-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Tooltip-test.tsx index e2a395b609e..ae4b58e7b35 100644 --- a/server/sonar-ui-common/components/controls/__tests__/Tooltip-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/Tooltip-test.tsx @@ -25,7 +25,7 @@ jest.useFakeTimers(); jest.mock('react-dom', () => { const actual = jest.requireActual('react-dom'); return Object.assign({}, actual, { - findDOMNode: jest.fn().mockReturnValue(undefined), + findDOMNode: jest.fn().mockReturnValue(undefined) }); }); @@ -88,16 +88,16 @@ it('should adjust arrow position', () => { const wrapper = shallowRenderTooltipInner(); expect(wrapper.instance().adjustArrowPosition('left', { leftFix: 10, topFix: 20 })).toEqual({ - marginTop: -20, + marginTop: -20 }); expect(wrapper.instance().adjustArrowPosition('right', { leftFix: 10, topFix: 20 })).toEqual({ - marginTop: -20, + marginTop: -20 }); expect(wrapper.instance().adjustArrowPosition('top', { leftFix: 10, topFix: 20 })).toEqual({ - marginLeft: -10, + marginLeft: -10 }); expect(wrapper.instance().adjustArrowPosition('bottom', { leftFix: 10, topFix: 20 })).toEqual({ - marginLeft: -10, + marginLeft: -10 }); }); diff --git a/server/sonar-ui-common/components/controls/__tests__/ValidationForm-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ValidationForm-test.tsx index 64827f932ed..64827f932ed 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ValidationForm-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ValidationForm-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/ValidationInput-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ValidationInput-test.tsx index 97d4a2a5937..97d4a2a5937 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ValidationInput-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ValidationInput-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/ValidationModal-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ValidationModal-test.tsx index e3825083577..3bbb8e5dc4d 100644 --- a/server/sonar-ui-common/components/controls/__tests__/ValidationModal-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/ValidationModal-test.tsx @@ -26,7 +26,12 @@ import ValidationModal from '../ValidationModal'; it('should render correctly', () => { const wrapper = shallowRender(); expect(wrapper).toMatchSnapshot(); - expect(wrapper.find(ValidationForm).dive().dive()).toMatchSnapshot(); + expect( + wrapper + .find(ValidationForm) + .dive() + .dive() + ).toMatchSnapshot(); }); it('should handle submit', async () => { @@ -54,7 +59,7 @@ function shallowRender(props: Partial<ValidationModal<{ field: string }>['props' onSubmit={jest.fn()} validate={jest.fn()} {...props}> - {(props) => ( + {props => ( <input name="field" onBlur={props.handleBlur} diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ActionsDropdown-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ActionsDropdown-test.tsx.snap index 4bd6a2ea46d..4bd6a2ea46d 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ActionsDropdown-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ActionsDropdown-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/BackButton-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/BackButton-test.tsx.snap index 57a5f2c6135..57a5f2c6135 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/BackButton-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/BackButton-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/BoxedGroupAccordion-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/BoxedGroupAccordion-test.tsx.snap index 0c7b74b79d9..0c7b74b79d9 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/BoxedGroupAccordion-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/BoxedGroupAccordion-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/BoxedTabs-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/BoxedTabs-test.tsx.snap index 22d8f761533..22d8f761533 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/BoxedTabs-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/BoxedTabs-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Checkbox-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Checkbox-test.tsx.snap index 69c0c60af8c..69c0c60af8c 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Checkbox-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Checkbox-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ClickEventBoundary-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ClickEventBoundary-test.tsx.snap index 62eac278e7f..62eac278e7f 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ClickEventBoundary-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ClickEventBoundary-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ConfirmButton-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ConfirmButton-test.tsx.snap index f94c3829503..f94c3829503 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ConfirmButton-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ConfirmButton-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ConfirmModal-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ConfirmModal-test.tsx.snap index f1367ae048a..f1367ae048a 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ConfirmModal-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ConfirmModal-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/EscKeydownHandler-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/EscKeydownHandler-test.tsx.snap index 239d6bfe358..239d6bfe358 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/EscKeydownHandler-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/EscKeydownHandler-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/FavoriteButton-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/FavoriteButton-test.tsx.snap index f66e2ddd464..f66e2ddd464 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/FavoriteButton-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/FavoriteButton-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/GlobalMessages-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/GlobalMessages-test.tsx.snap index fdeaf6c28e4..fdeaf6c28e4 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/GlobalMessages-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/GlobalMessages-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/HelpTooltip-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/HelpTooltip-test.tsx.snap index abf28dfdd32..abf28dfdd32 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/HelpTooltip-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/HelpTooltip-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/IdentityProviderLink-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/IdentityProviderLink-test.tsx.snap index d3a38a52376..d3a38a52376 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/IdentityProviderLink-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/IdentityProviderLink-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/InputValidationField-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/InputValidationField-test.tsx.snap index 16f3e1c2dfa..16f3e1c2dfa 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/InputValidationField-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/InputValidationField-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ListFooter-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ListFooter-test.tsx.snap index 2d55aa0d03b..2d55aa0d03b 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ListFooter-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ListFooter-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ModalValidationField-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ModalValidationField-test.tsx.snap index 4b4e605c0ad..4b4e605c0ad 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ModalValidationField-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ModalValidationField-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/OutsideClickHandler-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/OutsideClickHandler-test.tsx.snap index a4f533d8e3a..a4f533d8e3a 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/OutsideClickHandler-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/OutsideClickHandler-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Radio-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Radio-test.tsx.snap index 8649fba79b8..8649fba79b8 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Radio-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Radio-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/RadioCard-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/RadioCard-test.tsx.snap index e58f9d73597..e58f9d73597 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/RadioCard-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/RadioCard-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/RadioToggle-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/RadioToggle-test.tsx.snap index 791d312e720..791d312e720 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/RadioToggle-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/RadioToggle-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ReloadButton-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ReloadButton-test.tsx.snap index 9510ca69cca..9510ca69cca 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ReloadButton-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ReloadButton-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SearchBox-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SearchBox-test.tsx.snap index 4ed69eb6a29..4ed69eb6a29 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SearchBox-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SearchBox-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SearchSelect-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SearchSelect-test.tsx.snap index 792343f1a73..792343f1a73 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SearchSelect-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SearchSelect-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectList-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectList-test.tsx.snap index 14d46bbffc3..14d46bbffc3 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectList-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectList-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectListListContainer-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectListListContainer-test.tsx.snap index bf96116e95a..bf96116e95a 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectListListContainer-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectListListContainer-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectListListElement-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectListListElement-test.tsx.snap index e5d4ba3601f..e5d4ba3601f 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectListListElement-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SelectListListElement-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SimpleModal-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SimpleModal-test.tsx.snap index 49b14a9e20f..49b14a9e20f 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/SimpleModal-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/SimpleModal-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Tabs-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Tabs-test.tsx.snap index 2db4cec05a8..2db4cec05a8 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Tabs-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Tabs-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Toggle-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Toggle-test.tsx.snap index 8862993eb41..8862993eb41 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Toggle-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Toggle-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Toggler-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Toggler-test.tsx.snap index dfe5d96a394..dfe5d96a394 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Toggler-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Toggler-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Tooltip-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Tooltip-test.tsx.snap index 786b1bfe0ad..786b1bfe0ad 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/Tooltip-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/Tooltip-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationForm-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationForm-test.tsx.snap index e00f009ef2f..e00f009ef2f 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationForm-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationForm-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationInput-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationInput-test.tsx.snap index c2d68a1d2bf..c2d68a1d2bf 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationInput-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationInput-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationModal-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationModal-test.tsx.snap index 67db9979a9e..67db9979a9e 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationModal-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/ValidationModal-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/buttons-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/buttons-test.tsx.snap index 8d915b89387..8d915b89387 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/buttons-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/buttons-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/clipboard-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/clipboard-test.tsx.snap index de2081cb464..de2081cb464 100644 --- a/server/sonar-ui-common/components/controls/__tests__/__snapshots__/clipboard-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/__snapshots__/clipboard-test.tsx.snap diff --git a/server/sonar-ui-common/components/controls/__tests__/buttons-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/buttons-test.tsx index c199c5778cc..c199c5778cc 100644 --- a/server/sonar-ui-common/components/controls/__tests__/buttons-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/buttons-test.tsx diff --git a/server/sonar-ui-common/components/controls/__tests__/clipboard-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/clipboard-test.tsx index 36b2d6f02db..891f667e98b 100644 --- a/server/sonar-ui-common/components/controls/__tests__/clipboard-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/__tests__/clipboard-test.tsx @@ -29,11 +29,11 @@ const on = jest.fn(); jest.mock( 'clipboard', () => - function (...args: any) { + function(...args: any) { constructor(...args); return { destroy, - on, + on }; } ); diff --git a/server/sonar-ui-common/components/controls/buttons.css b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/buttons.css index 8a8f9447cb3..8a8f9447cb3 100644 --- a/server/sonar-ui-common/components/controls/buttons.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/buttons.css diff --git a/server/sonar-ui-common/components/controls/buttons.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/buttons.tsx index f43c62bc9a6..742b50f1191 100644 --- a/server/sonar-ui-common/components/controls/buttons.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/buttons.tsx @@ -73,7 +73,6 @@ export class Button extends React.PureComponent<ButtonProps> { ...props } = this.props; return ( - // eslint-disable-next-line react/button-has-type <button {...props} aria-disabled={disabled} @@ -81,6 +80,7 @@ export class Button extends React.PureComponent<ButtonProps> { id={this.props.id} onClick={this.handleClick} ref={this.props.innerRef} + // eslint-disable-next-line react/button-has-type type={type} /> ); @@ -114,7 +114,7 @@ export function ButtonIcon(props: ButtonIconProps) { const { className, color, tooltip, tooltipProps, ...other } = props; return ( <ThemeConsumer> - {(theme) => ( + {theme => ( <Tooltip mouseEnterDelay={0.4} overlay={tooltip} {...tooltipProps}> <Button className={classNames(className, 'button-icon')} @@ -137,7 +137,7 @@ interface ClearButtonProps extends ButtonIconProps { export function ClearButton({ color, iconProps = {}, ...props }: ClearButtonProps) { return ( <ThemeConsumer> - {(theme) => ( + {theme => ( <ButtonIcon color={color || theme.colors.gray60} {...props}> <ClearIcon {...iconProps} /> </ButtonIcon> @@ -155,7 +155,7 @@ interface ActionButtonProps extends ButtonIconProps { export function DeleteButton({ iconProps = {}, ...props }: ActionButtonProps) { return ( <ThemeConsumer> - {(theme) => ( + {theme => ( <ButtonIcon color={theme.colors.red} {...props}> <DeleteIcon {...iconProps} /> </ButtonIcon> diff --git a/server/sonar-ui-common/components/controls/clipboard.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/clipboard.tsx index 427000c17a7..6d91192275c 100644 --- a/server/sonar-ui-common/components/controls/clipboard.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/controls/clipboard.tsx @@ -87,7 +87,7 @@ export class ClipboardBase extends React.PureComponent<BaseProps, State> { render() { return this.props.children({ setCopyButton: this.setCopyButton, - copySuccess: this.state.copySuccess, + copySuccess: this.state.copySuccess }); } } diff --git a/server/sonar-ui-common/components/icons/AlertErrorIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/AlertErrorIcon.tsx index c6c71782d7a..c6c71782d7a 100644 --- a/server/sonar-ui-common/components/icons/AlertErrorIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/AlertErrorIcon.tsx diff --git a/server/sonar-ui-common/components/icons/AlertSuccessIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/AlertSuccessIcon.tsx index 707d0f9e9f6..707d0f9e9f6 100644 --- a/server/sonar-ui-common/components/icons/AlertSuccessIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/AlertSuccessIcon.tsx diff --git a/server/sonar-ui-common/components/icons/AlertWarnIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/AlertWarnIcon.tsx index 7dc322657d2..7dc322657d2 100644 --- a/server/sonar-ui-common/components/icons/AlertWarnIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/AlertWarnIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ArrowIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ArrowIcon.tsx index c27e7307897..c27e7307897 100644 --- a/server/sonar-ui-common/components/icons/ArrowIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ArrowIcon.tsx diff --git a/server/sonar-ui-common/components/icons/BackIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BackIcon.tsx index 34974ee8374..34974ee8374 100644 --- a/server/sonar-ui-common/components/icons/BackIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BackIcon.tsx diff --git a/server/sonar-ui-common/components/icons/BranchIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BranchIcon.tsx index b6e9207cc58..b6e9207cc58 100644 --- a/server/sonar-ui-common/components/icons/BranchIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BranchIcon.tsx diff --git a/server/sonar-ui-common/components/icons/BubblesIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BubblesIcon.tsx index 50a40c5c2f5..50a40c5c2f5 100644 --- a/server/sonar-ui-common/components/icons/BubblesIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BubblesIcon.tsx diff --git a/server/sonar-ui-common/components/icons/BugIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BugIcon.tsx index 77f19836614..77f19836614 100644 --- a/server/sonar-ui-common/components/icons/BugIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BugIcon.tsx diff --git a/server/sonar-ui-common/components/icons/BugTrackerIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BugTrackerIcon.tsx index db03eee3115..db03eee3115 100644 --- a/server/sonar-ui-common/components/icons/BugTrackerIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BugTrackerIcon.tsx diff --git a/server/sonar-ui-common/components/icons/BulletListIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BulletListIcon.tsx index bceb30427a4..bceb30427a4 100644 --- a/server/sonar-ui-common/components/icons/BulletListIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/BulletListIcon.tsx diff --git a/server/sonar-ui-common/components/icons/CalendarIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CalendarIcon.tsx index bb70dfd4d6e..bb70dfd4d6e 100644 --- a/server/sonar-ui-common/components/icons/CalendarIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CalendarIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ChartLegendIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChartLegendIcon.tsx index 4d4d305190a..4d4d305190a 100644 --- a/server/sonar-ui-common/components/icons/ChartLegendIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChartLegendIcon.tsx diff --git a/server/sonar-ui-common/components/icons/CheckIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CheckIcon.tsx index 9248e6178e8..9248e6178e8 100644 --- a/server/sonar-ui-common/components/icons/CheckIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CheckIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ChevronDownIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChevronDownIcon.tsx index 0931930ee5c..0931930ee5c 100644 --- a/server/sonar-ui-common/components/icons/ChevronDownIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChevronDownIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ChevronLeftIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChevronLeftIcon.tsx index 8f4824699ab..8f4824699ab 100644 --- a/server/sonar-ui-common/components/icons/ChevronLeftIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChevronLeftIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ChevronRightIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChevronRightIcon.tsx index 21d6049ed6f..21d6049ed6f 100644 --- a/server/sonar-ui-common/components/icons/ChevronRightIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChevronRightIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ChevronUpIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChevronUpIcon.tsx index 842fc9f69a8..842fc9f69a8 100644 --- a/server/sonar-ui-common/components/icons/ChevronUpIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChevronUpIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ChevronsIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChevronsIcon.tsx index 2ad6f90ed97..2ad6f90ed97 100644 --- a/server/sonar-ui-common/components/icons/ChevronsIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ChevronsIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ClearIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ClearIcon.tsx index 91eb6f706d6..91eb6f706d6 100644 --- a/server/sonar-ui-common/components/icons/ClearIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ClearIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ClockIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ClockIcon.tsx index c777a4a8e60..c777a4a8e60 100644 --- a/server/sonar-ui-common/components/icons/ClockIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ClockIcon.tsx diff --git a/server/sonar-ui-common/components/icons/CodeSmellIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CodeSmellIcon.tsx index d705bcd0ec7..d705bcd0ec7 100644 --- a/server/sonar-ui-common/components/icons/CodeSmellIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CodeSmellIcon.tsx diff --git a/server/sonar-ui-common/components/icons/CogIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CogIcon.tsx index 4d7da4238f6..4d7da4238f6 100644 --- a/server/sonar-ui-common/components/icons/CogIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CogIcon.tsx diff --git a/server/sonar-ui-common/components/icons/CollapseIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CollapseIcon.tsx index 688f7e1a54f..688f7e1a54f 100644 --- a/server/sonar-ui-common/components/icons/CollapseIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CollapseIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ContinuousIntegrationIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ContinuousIntegrationIcon.tsx index 62ab2447fd1..62ab2447fd1 100644 --- a/server/sonar-ui-common/components/icons/ContinuousIntegrationIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ContinuousIntegrationIcon.tsx diff --git a/server/sonar-ui-common/components/icons/CopyIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CopyIcon.tsx index 2787990b1f3..2787990b1f3 100644 --- a/server/sonar-ui-common/components/icons/CopyIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/CopyIcon.tsx diff --git a/server/sonar-ui-common/components/icons/DeleteIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/DeleteIcon.tsx index 1fb013182da..1fb013182da 100644 --- a/server/sonar-ui-common/components/icons/DeleteIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/DeleteIcon.tsx diff --git a/server/sonar-ui-common/components/icons/DetachIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/DetachIcon.tsx index 4066ddf3327..4066ddf3327 100644 --- a/server/sonar-ui-common/components/icons/DetachIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/DetachIcon.tsx diff --git a/server/sonar-ui-common/components/icons/DropdownIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/DropdownIcon.tsx index 7abed26df45..7abed26df45 100644 --- a/server/sonar-ui-common/components/icons/DropdownIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/DropdownIcon.tsx diff --git a/server/sonar-ui-common/components/icons/EditIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/EditIcon.tsx index 45bf6814d46..45bf6814d46 100644 --- a/server/sonar-ui-common/components/icons/EditIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/EditIcon.tsx diff --git a/server/sonar-ui-common/components/icons/EllipsisIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/EllipsisIcon.tsx index c584514131a..c584514131a 100644 --- a/server/sonar-ui-common/components/icons/EllipsisIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/EllipsisIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ExpandIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ExpandIcon.tsx index 2de2405df9a..2de2405df9a 100644 --- a/server/sonar-ui-common/components/icons/ExpandIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ExpandIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ExpandSnippetIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ExpandSnippetIcon.tsx index 1b6a2ce7f52..1b6a2ce7f52 100644 --- a/server/sonar-ui-common/components/icons/ExpandSnippetIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ExpandSnippetIcon.tsx diff --git a/server/sonar-ui-common/components/icons/FavoriteIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/FavoriteIcon.tsx index af3ae770ebd..76af77cd4cc 100644 --- a/server/sonar-ui-common/components/icons/FavoriteIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/FavoriteIcon.tsx @@ -29,7 +29,7 @@ interface Props extends IconProps { export default function FavoriteIcon({ className, favorite, fill, ...iconProps }: Props) { return ( <ThemeConsumer> - {(theme) => ( + {theme => ( <Icon className={classNames('icon-outline', { 'is-filled': favorite }, className)} style={{ color: fill || theme.colors.orange }} diff --git a/server/sonar-ui-common/components/icons/FilterIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/FilterIcon.tsx index 8d5851eb570..8d5851eb570 100644 --- a/server/sonar-ui-common/components/icons/FilterIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/FilterIcon.tsx diff --git a/server/sonar-ui-common/components/icons/GroupIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/GroupIcon.tsx index 9efe35a17ab..9efe35a17ab 100644 --- a/server/sonar-ui-common/components/icons/GroupIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/GroupIcon.tsx diff --git a/server/sonar-ui-common/components/icons/HelpIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/HelpIcon.tsx index 641e76849d2..641e76849d2 100644 --- a/server/sonar-ui-common/components/icons/HelpIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/HelpIcon.tsx diff --git a/server/sonar-ui-common/components/icons/HistoryIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/HistoryIcon.tsx index 55d61aff599..55d61aff599 100644 --- a/server/sonar-ui-common/components/icons/HistoryIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/HistoryIcon.tsx diff --git a/server/sonar-ui-common/components/icons/HomeIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/HomeIcon.tsx index e6d28870174..c7814d90ed7 100644 --- a/server/sonar-ui-common/components/icons/HomeIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/HomeIcon.tsx @@ -29,7 +29,7 @@ interface Props extends IconProps { export default function HomeIcon({ className, fill, filled = false, ...iconProps }: Props) { return ( <ThemeConsumer> - {(theme) => ( + {theme => ( <Icon className={classNames(className, 'icon-outline', { 'is-filled': filled })} style={{ color: fill || theme.colors.orange }} diff --git a/server/sonar-ui-common/components/icons/HouseIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/HouseIcon.tsx index c4ff402ebb1..c4ff402ebb1 100644 --- a/server/sonar-ui-common/components/icons/HouseIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/HouseIcon.tsx diff --git a/server/sonar-ui-common/components/icons/Icon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/Icon.tsx index d0d6356b4b9..c47b1bd5391 100644 --- a/server/sonar-ui-common/components/icons/Icon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/Icon.tsx @@ -57,7 +57,7 @@ export default function Icon({ clipRule: 'evenodd', strokeLinejoin: 'round', strokeMiterlimit: 1.41421, - ...style, + ...style }} version="1.1" viewBox={viewBox} @@ -76,6 +76,6 @@ interface ThemedProps extends Props { export function ThemedIcon({ children, ...iconProps }: ThemedProps) { return ( - <ThemeConsumer>{(theme) => <Icon {...iconProps}>{children({ theme })}</Icon>}</ThemeConsumer> + <ThemeConsumer>{theme => <Icon {...iconProps}>{children({ theme })}</Icon>}</ThemeConsumer> ); } diff --git a/server/sonar-ui-common/components/icons/InfoIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/InfoIcon.tsx index 80029d0e93b..80029d0e93b 100644 --- a/server/sonar-ui-common/components/icons/InfoIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/InfoIcon.tsx diff --git a/server/sonar-ui-common/components/icons/IssueIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/IssueIcon.tsx index e78a91bbc44..e78a91bbc44 100644 --- a/server/sonar-ui-common/components/icons/IssueIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/IssueIcon.tsx diff --git a/server/sonar-ui-common/components/icons/IssueTypeIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/IssueTypeIcon.tsx index 9815ce40a84..9815ce40a84 100644 --- a/server/sonar-ui-common/components/icons/IssueTypeIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/IssueTypeIcon.tsx diff --git a/server/sonar-ui-common/components/icons/LightBulbIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/LightBulbIcon.tsx index 1ebcef9ed4e..1ebcef9ed4e 100644 --- a/server/sonar-ui-common/components/icons/LightBulbIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/LightBulbIcon.tsx diff --git a/server/sonar-ui-common/components/icons/LinkIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/LinkIcon.tsx index 04288a05331..04288a05331 100644 --- a/server/sonar-ui-common/components/icons/LinkIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/LinkIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ListIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ListIcon.tsx index fdc9e5c840d..fdc9e5c840d 100644 --- a/server/sonar-ui-common/components/icons/ListIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ListIcon.tsx diff --git a/server/sonar-ui-common/components/icons/LockIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/LockIcon.tsx index f9cd73e4981..f9cd73e4981 100644 --- a/server/sonar-ui-common/components/icons/LockIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/LockIcon.tsx diff --git a/server/sonar-ui-common/components/icons/LongLivingBranchIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/LongLivingBranchIcon.tsx index 893c07178e4..893c07178e4 100644 --- a/server/sonar-ui-common/components/icons/LongLivingBranchIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/LongLivingBranchIcon.tsx diff --git a/server/sonar-ui-common/components/icons/MeasuresIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/MeasuresIcon.tsx index 07ad0c47ecd..07ad0c47ecd 100644 --- a/server/sonar-ui-common/components/icons/MeasuresIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/MeasuresIcon.tsx diff --git a/server/sonar-ui-common/components/icons/MinimizeIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/MinimizeIcon.tsx index 66f64ed6157..66f64ed6157 100644 --- a/server/sonar-ui-common/components/icons/MinimizeIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/MinimizeIcon.tsx diff --git a/server/sonar-ui-common/components/icons/NotificationIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/NotificationIcon.tsx index 10bf7da86d9..10bf7da86d9 100644 --- a/server/sonar-ui-common/components/icons/NotificationIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/NotificationIcon.tsx diff --git a/server/sonar-ui-common/components/icons/OnboardingAddMembersIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/OnboardingAddMembersIcon.tsx index 255c2d8f391..255c2d8f391 100644 --- a/server/sonar-ui-common/components/icons/OnboardingAddMembersIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/OnboardingAddMembersIcon.tsx diff --git a/server/sonar-ui-common/components/icons/OnboardingProjectIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/OnboardingProjectIcon.tsx index 79fedae1598..79fedae1598 100644 --- a/server/sonar-ui-common/components/icons/OnboardingProjectIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/OnboardingProjectIcon.tsx diff --git a/server/sonar-ui-common/components/icons/OnboardingTeamIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/OnboardingTeamIcon.tsx index be4ab97b640..be4ab97b640 100644 --- a/server/sonar-ui-common/components/icons/OnboardingTeamIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/OnboardingTeamIcon.tsx diff --git a/server/sonar-ui-common/components/icons/OpenCloseIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/OpenCloseIcon.tsx index 8b50014773d..8b50014773d 100644 --- a/server/sonar-ui-common/components/icons/OpenCloseIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/OpenCloseIcon.tsx diff --git a/server/sonar-ui-common/components/icons/PendingIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/PendingIcon.tsx index 437abb33a70..437abb33a70 100644 --- a/server/sonar-ui-common/components/icons/PendingIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/PendingIcon.tsx diff --git a/server/sonar-ui-common/components/icons/PinIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/PinIcon.tsx index 4521f86a5e8..4521f86a5e8 100644 --- a/server/sonar-ui-common/components/icons/PinIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/PinIcon.tsx diff --git a/server/sonar-ui-common/components/icons/PlusCircleIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/PlusCircleIcon.tsx index 2591a7737db..2591a7737db 100644 --- a/server/sonar-ui-common/components/icons/PlusCircleIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/PlusCircleIcon.tsx diff --git a/server/sonar-ui-common/components/icons/PlusIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/PlusIcon.tsx index 39df3134c6f..39df3134c6f 100644 --- a/server/sonar-ui-common/components/icons/PlusIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/PlusIcon.tsx diff --git a/server/sonar-ui-common/components/icons/ProjectLinkIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ProjectLinkIcon.tsx index b158f9839b2..b158f9839b2 100644 --- a/server/sonar-ui-common/components/icons/ProjectLinkIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ProjectLinkIcon.tsx diff --git a/server/sonar-ui-common/components/icons/PullRequestIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/PullRequestIcon.tsx index dc249a94b71..dc249a94b71 100644 --- a/server/sonar-ui-common/components/icons/PullRequestIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/PullRequestIcon.tsx diff --git a/server/sonar-ui-common/components/icons/QualifierIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/QualifierIcon.tsx index 0fb2a5d0045..c95948b878c 100644 --- a/server/sonar-ui-common/components/icons/QualifierIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/QualifierIcon.tsx @@ -35,7 +35,7 @@ const qualifierIcons: T.Dict<(props: IconProps) => React.ReactElement> = { cla: UnitTestIcon, dev_prj: ProjectIcon, lib: LibraryIcon, - pac: DirectoryIcon, + pac: DirectoryIcon }; interface QualifierIconProps { diff --git a/server/sonar-ui-common/components/icons/RecommendedIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/RecommendedIcon.tsx index 06b7abb5483..06b7abb5483 100644 --- a/server/sonar-ui-common/components/icons/RecommendedIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/RecommendedIcon.tsx diff --git a/server/sonar-ui-common/components/icons/RocketIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/RocketIcon.tsx index ad24c87365f..ad24c87365f 100644 --- a/server/sonar-ui-common/components/icons/RocketIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/RocketIcon.tsx diff --git a/server/sonar-ui-common/components/icons/RuleScopeIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/RuleScopeIcon.tsx index 115da520908..115da520908 100644 --- a/server/sonar-ui-common/components/icons/RuleScopeIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/RuleScopeIcon.tsx diff --git a/server/sonar-ui-common/components/icons/SCMIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SCMIcon.tsx index fdbd75fab76..fdbd75fab76 100644 --- a/server/sonar-ui-common/components/icons/SCMIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SCMIcon.tsx diff --git a/server/sonar-ui-common/components/icons/SearchIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SearchIcon.tsx index 0da433a21e2..0da433a21e2 100644 --- a/server/sonar-ui-common/components/icons/SearchIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SearchIcon.tsx diff --git a/server/sonar-ui-common/components/icons/SecurityHotspotIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SecurityHotspotIcon.tsx index 6ac2e9297ae..6ac2e9297ae 100644 --- a/server/sonar-ui-common/components/icons/SecurityHotspotIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SecurityHotspotIcon.tsx diff --git a/server/sonar-ui-common/components/icons/SettingsIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SettingsIcon.tsx index 9156f96aa28..9156f96aa28 100644 --- a/server/sonar-ui-common/components/icons/SettingsIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SettingsIcon.tsx diff --git a/server/sonar-ui-common/components/icons/SeverityIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SeverityIcon.tsx index 298d39aaeff..dbf482baa8d 100644 --- a/server/sonar-ui-common/components/icons/SeverityIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SeverityIcon.tsx @@ -29,7 +29,7 @@ const severityIcons: T.Dict<(props: IconProps) => React.ReactElement> = { critical: CriticalSeverityIcon, major: MajorSeverityIcon, minor: MinorSeverityIcon, - info: InfoSeverityIcon, + info: InfoSeverityIcon }; export default function SeverityIcon({ severity, ...iconProps }: Props) { diff --git a/server/sonar-ui-common/components/icons/ShortLivingBranchIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ShortLivingBranchIcon.tsx index 388bc50a262..388bc50a262 100644 --- a/server/sonar-ui-common/components/icons/ShortLivingBranchIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/ShortLivingBranchIcon.tsx diff --git a/server/sonar-ui-common/components/icons/SortAscIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SortAscIcon.tsx index 34dc1ca3002..34dc1ca3002 100644 --- a/server/sonar-ui-common/components/icons/SortAscIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SortAscIcon.tsx diff --git a/server/sonar-ui-common/components/icons/SortDescIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SortDescIcon.tsx index 9a4cba2e914..9a4cba2e914 100644 --- a/server/sonar-ui-common/components/icons/SortDescIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/SortDescIcon.tsx diff --git a/server/sonar-ui-common/components/icons/StatusIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/StatusIcon.tsx index d5cf66bef86..70f2219c2b8 100644 --- a/server/sonar-ui-common/components/icons/StatusIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/StatusIcon.tsx @@ -32,7 +32,7 @@ const statusIcons: T.Dict<(props: IconProps) => React.ReactElement> = { closed: ClosedStatusIcon, to_review: OpenStatusIcon, in_review: ConfirmedStatusIcon, - reviewed: ResolvedStatusIcon, + reviewed: ResolvedStatusIcon }; export default function StatusIcon({ status, ...iconProps }: Props) { diff --git a/server/sonar-ui-common/components/icons/TagsIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/TagsIcon.tsx index 649256cf8fa..649256cf8fa 100644 --- a/server/sonar-ui-common/components/icons/TagsIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/TagsIcon.tsx diff --git a/server/sonar-ui-common/components/icons/TestStatusIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/TestStatusIcon.tsx index cbcb77ad3a2..f555a85cffc 100644 --- a/server/sonar-ui-common/components/icons/TestStatusIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/TestStatusIcon.tsx @@ -28,7 +28,7 @@ const statusIcons: T.Dict<(props: IconProps) => React.ReactElement> = { ok: OkTestStatusIcon, failure: FailureTestStatusIcon, error: ErrorTestStatusIcon, - skipped: SkippedTestStatusIcon, + skipped: SkippedTestStatusIcon }; export default function TestStatusIcon({ status, ...iconProps }: Props) { diff --git a/server/sonar-ui-common/components/icons/TreeIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/TreeIcon.tsx index 5b9992352e3..5b9992352e3 100644 --- a/server/sonar-ui-common/components/icons/TreeIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/TreeIcon.tsx diff --git a/server/sonar-ui-common/components/icons/TreemapIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/TreemapIcon.tsx index 66d14f39793..66d14f39793 100644 --- a/server/sonar-ui-common/components/icons/TreemapIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/TreemapIcon.tsx diff --git a/server/sonar-ui-common/components/icons/VisibleIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/VisibleIcon.tsx index d50d4d873d3..d50d4d873d3 100644 --- a/server/sonar-ui-common/components/icons/VisibleIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/VisibleIcon.tsx diff --git a/server/sonar-ui-common/components/icons/VulnerabilityIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/VulnerabilityIcon.tsx index 34da45580b4..34da45580b4 100644 --- a/server/sonar-ui-common/components/icons/VulnerabilityIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/VulnerabilityIcon.tsx diff --git a/server/sonar-ui-common/components/icons/WarningIcon.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/WarningIcon.tsx index ceda2ea90ae..ceda2ea90ae 100644 --- a/server/sonar-ui-common/components/icons/WarningIcon.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/WarningIcon.tsx diff --git a/server/sonar-ui-common/components/icons/__tests__/Icon-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/Icon-test.tsx index 341eb88a17e..341eb88a17e 100644 --- a/server/sonar-ui-common/components/icons/__tests__/Icon-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/Icon-test.tsx diff --git a/server/sonar-ui-common/components/icons/__tests__/IssueIcon-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/IssueIcon-test.tsx index 852beec5385..852beec5385 100644 --- a/server/sonar-ui-common/components/icons/__tests__/IssueIcon-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/IssueIcon-test.tsx diff --git a/server/sonar-ui-common/components/icons/__tests__/IssueTypeIcon-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/IssueTypeIcon-test.tsx index dbd892fdb52..dbd892fdb52 100644 --- a/server/sonar-ui-common/components/icons/__tests__/IssueTypeIcon-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/IssueTypeIcon-test.tsx diff --git a/server/sonar-ui-common/components/icons/__tests__/TestStatusIcon-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/TestStatusIcon-test.tsx index c683e6cd02f..c683e6cd02f 100644 --- a/server/sonar-ui-common/components/icons/__tests__/TestStatusIcon-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/TestStatusIcon-test.tsx diff --git a/server/sonar-ui-common/components/icons/__tests__/__snapshots__/Icon-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/__snapshots__/Icon-test.tsx.snap index a61c0314f87..a61c0314f87 100644 --- a/server/sonar-ui-common/components/icons/__tests__/__snapshots__/Icon-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/__snapshots__/Icon-test.tsx.snap diff --git a/server/sonar-ui-common/components/icons/__tests__/__snapshots__/IssueIcon-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/__snapshots__/IssueIcon-test.tsx.snap index f3f5fcf1a7a..f3f5fcf1a7a 100644 --- a/server/sonar-ui-common/components/icons/__tests__/__snapshots__/IssueIcon-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/__snapshots__/IssueIcon-test.tsx.snap diff --git a/server/sonar-ui-common/components/icons/__tests__/__snapshots__/IssueTypeIcon-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/__snapshots__/IssueTypeIcon-test.tsx.snap index 4373bb03f4c..4373bb03f4c 100644 --- a/server/sonar-ui-common/components/icons/__tests__/__snapshots__/IssueTypeIcon-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/__snapshots__/IssueTypeIcon-test.tsx.snap diff --git a/server/sonar-ui-common/components/icons/__tests__/__snapshots__/TestStatusIcon-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/__snapshots__/TestStatusIcon-test.tsx.snap index 12b493c10ed..12b493c10ed 100644 --- a/server/sonar-ui-common/components/icons/__tests__/__snapshots__/TestStatusIcon-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/icons/__tests__/__snapshots__/TestStatusIcon-test.tsx.snap diff --git a/server/sonar-ui-common/components/intl/DateFormatter.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/DateFormatter.tsx index c33b8a78ff5..c33b8a78ff5 100644 --- a/server/sonar-ui-common/components/intl/DateFormatter.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/DateFormatter.tsx diff --git a/server/sonar-ui-common/components/intl/DateFromNow.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/DateFromNow.tsx index 13c383d5288..713b31fdf8d 100644 --- a/server/sonar-ui-common/components/intl/DateFromNow.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/DateFromNow.tsx @@ -51,7 +51,7 @@ export default function DateFromNow(props: DateFromNowProps) { return ( <DateTimeFormatter date={parsedDate}> - {(formattedDate) => ( + {formattedDate => ( <span title={formattedDate}> <FormattedRelative value={parsedDate}>{children}</FormattedRelative> </span> diff --git a/server/sonar-ui-common/components/intl/DateTimeFormatter.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/DateTimeFormatter.tsx index ebc3e37b473..64394b80c58 100644 --- a/server/sonar-ui-common/components/intl/DateTimeFormatter.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/DateTimeFormatter.tsx @@ -31,7 +31,7 @@ export const formatterOption = { month: 'long', day: 'numeric', hour: 'numeric', - minute: 'numeric', + minute: 'numeric' }; export default function DateTimeFormatter({ children, date }: Props) { diff --git a/server/sonar-ui-common/components/intl/TimeFormatter.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/TimeFormatter.tsx index 8fb5af05440..8fb5af05440 100644 --- a/server/sonar-ui-common/components/intl/TimeFormatter.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/TimeFormatter.tsx diff --git a/server/sonar-ui-common/components/intl/__mocks__/DateFromNow.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__mocks__/DateFromNow.tsx index 76a585b4045..76a585b4045 100644 --- a/server/sonar-ui-common/components/intl/__mocks__/DateFromNow.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__mocks__/DateFromNow.tsx diff --git a/server/sonar-ui-common/components/intl/__tests__/DateFormatter-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/DateFormatter-test.tsx index 6780d67d21c..d978428ced6 100644 --- a/server/sonar-ui-common/components/intl/__tests__/DateFormatter-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/DateFormatter-test.tsx @@ -29,7 +29,7 @@ it('should render correctly', () => { function shallowRender(overrides: Partial<DateFormatterProps> = {}) { return shallow( <DateFormatter date={new Date('2020-02-20T20:20:20Z')} {...overrides}> - {(formatted) => <span>{formatted}</span>} + {formatted => <span>{formatted}</span>} </DateFormatter> ); } diff --git a/server/sonar-ui-common/components/intl/__tests__/DateFromNow-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/DateFromNow-test.tsx index c7edcfaa1a4..901b5cbba0c 100644 --- a/server/sonar-ui-common/components/intl/__tests__/DateFromNow-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/DateFromNow-test.tsx @@ -59,7 +59,7 @@ function shallowRender(overrides: Partial<DateFromNowProps> = {}, children: jest return shallow<DateFromNowProps>( <IntlProvider defaultLocale="en-US" locale="en"> <DateFromNow date={date} {...overrides}> - {(formattedDate) => children(formattedDate)} + {formattedDate => children(formattedDate)} </DateFromNow> </IntlProvider> ).dive(); diff --git a/server/sonar-ui-common/components/intl/__tests__/DateTimeFormatter-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/DateTimeFormatter-test.tsx index 8d6dbf2add7..5fd7e0c0987 100644 --- a/server/sonar-ui-common/components/intl/__tests__/DateTimeFormatter-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/DateTimeFormatter-test.tsx @@ -28,7 +28,7 @@ it('should render correctly', () => { function shallowRender() { return shallow( <DateTimeFormatter date={new Date('2020-02-20T20:20:20Z')}> - {(formatted) => <span>{formatted}</span>} + {formatted => <span>{formatted}</span>} </DateTimeFormatter> ); } diff --git a/server/sonar-ui-common/components/intl/__tests__/TimeFormatter-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/TimeFormatter-test.tsx index 0af517feb93..ac73332ca38 100644 --- a/server/sonar-ui-common/components/intl/__tests__/TimeFormatter-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/TimeFormatter-test.tsx @@ -29,7 +29,7 @@ it('should render correctly', () => { function shallowRender(overrides: Partial<TimeFormatterProps> = {}) { return shallow( <TimeFormatter date={new Date('2020-02-20T20:20:20Z')} {...overrides}> - {(formatted) => <span>{formatted}</span>} + {formatted => <span>{formatted}</span>} </TimeFormatter> ); } diff --git a/server/sonar-ui-common/components/intl/__tests__/__snapshots__/DateFormatter-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/__snapshots__/DateFormatter-test.tsx.snap index 2f603c6c1bd..2f603c6c1bd 100644 --- a/server/sonar-ui-common/components/intl/__tests__/__snapshots__/DateFormatter-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/__snapshots__/DateFormatter-test.tsx.snap diff --git a/server/sonar-ui-common/components/intl/__tests__/__snapshots__/DateFromNow-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/__snapshots__/DateFromNow-test.tsx.snap index 19ee5460047..19ee5460047 100644 --- a/server/sonar-ui-common/components/intl/__tests__/__snapshots__/DateFromNow-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/__snapshots__/DateFromNow-test.tsx.snap diff --git a/server/sonar-ui-common/components/intl/__tests__/__snapshots__/DateTimeFormatter-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/__snapshots__/DateTimeFormatter-test.tsx.snap index c991112f771..c991112f771 100644 --- a/server/sonar-ui-common/components/intl/__tests__/__snapshots__/DateTimeFormatter-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/__snapshots__/DateTimeFormatter-test.tsx.snap diff --git a/server/sonar-ui-common/components/intl/__tests__/__snapshots__/TimeFormatter-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/__snapshots__/TimeFormatter-test.tsx.snap index 7c19be3a479..7c19be3a479 100644 --- a/server/sonar-ui-common/components/intl/__tests__/__snapshots__/TimeFormatter-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/intl/__tests__/__snapshots__/TimeFormatter-test.tsx.snap diff --git a/server/sonar-ui-common/components/lazyLoadComponent.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/lazyLoadComponent.tsx index 25b96db6c36..25b96db6c36 100644 --- a/server/sonar-ui-common/components/lazyLoadComponent.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/lazyLoadComponent.tsx diff --git a/server/sonar-ui-common/components/theme.ts b/server/sonar-web/src/main/js/sonar-ui-common/components/theme.ts index a63104f1e56..1dabe475f62 100644 --- a/server/sonar-ui-common/components/theme.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/theme.ts @@ -23,7 +23,7 @@ import { ThemeProvider as EmotionThemeProvider, ThemeProviderProps, useTheme as emotionUseTheme, - withTheme, + withTheme } from 'emotion-theming'; import * as React from 'react'; @@ -50,7 +50,7 @@ export const ThemeProvider = EmotionThemeProvider as React.ProviderExoticCompone export const useTheme = emotionUseTheme as () => Theme; export function themeGet(type: keyof Theme, name: string | number) { - return function ({ theme }: Partial<ThemedProps>) { + return function({ theme }: Partial<ThemedProps>) { return theme?.[type][name]; }; } diff --git a/server/sonar-ui-common/components/ui/Alert.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/Alert.tsx index 376d6e5fec6..abd339da10d 100644 --- a/server/sonar-ui-common/components/ui/Alert.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/Alert.tsx @@ -100,32 +100,32 @@ function getAlertVariantInfo({ colors }: Theme, variant: AlertVariant): AlertVar icon: <AlertErrorIcon fill={colors.alertIconError} />, color: colors.alertTextError, borderColor: colors.alertBorderError, - backGroundColor: colors.alertBackgroundError, + backGroundColor: colors.alertBackgroundError }, warning: { icon: <AlertWarnIcon fill={colors.alertIconWarning} />, color: colors.alertTextWarning, borderColor: colors.alertBorderWarning, - backGroundColor: colors.alertBackgroundWarning, + backGroundColor: colors.alertBackgroundWarning }, success: { icon: <AlertSuccessIcon fill={colors.alertIconSuccess} />, color: colors.alertTextSuccess, borderColor: colors.alertBorderSuccess, - backGroundColor: colors.alertBackgroundSuccess, + backGroundColor: colors.alertBackgroundSuccess }, info: { icon: <InfoIcon fill={colors.alertIconInfo} />, color: colors.alertTextInfo, borderColor: colors.alertBorderInfo, - backGroundColor: colors.alertBackgroundInfo, + backGroundColor: colors.alertBackgroundInfo }, loading: { icon: <DeferredSpinner timeout={0} />, color: colors.alertTextInfo, borderColor: colors.alertBorderInfo, - backGroundColor: colors.alertBackgroundInfo, - }, + backGroundColor: colors.alertBackgroundInfo + } }; return variantList[variant]; diff --git a/server/sonar-ui-common/components/ui/AutoEllipsis.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/AutoEllipsis.tsx index ee2ed0ae7da..f1ceb43ddea 100644 --- a/server/sonar-ui-common/components/ui/AutoEllipsis.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/AutoEllipsis.tsx @@ -48,7 +48,7 @@ export default function AutoEllipsis(props: Props) { return React.cloneElement(children, { className: classNames(children.props.className, { 'text-ellipsis': autoEllispis }), - ref, + ref }); } diff --git a/server/sonar-ui-common/components/ui/ContextNavBar.css b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/ContextNavBar.css index 2c3865a835d..2c3865a835d 100644 --- a/server/sonar-ui-common/components/ui/ContextNavBar.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/ContextNavBar.css diff --git a/server/sonar-ui-common/components/ui/ContextNavBar.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/ContextNavBar.tsx index 07a75d15ae5..07a75d15ae5 100644 --- a/server/sonar-ui-common/components/ui/ContextNavBar.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/ContextNavBar.tsx diff --git a/server/sonar-ui-common/components/ui/DeferredSpinner.css b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/DeferredSpinner.css index 22569c0c6b6..22569c0c6b6 100644 --- a/server/sonar-ui-common/components/ui/DeferredSpinner.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/DeferredSpinner.css diff --git a/server/sonar-ui-common/components/ui/DeferredSpinner.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/DeferredSpinner.tsx index 7021917c0bc..7021917c0bc 100644 --- a/server/sonar-ui-common/components/ui/DeferredSpinner.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/DeferredSpinner.tsx diff --git a/server/sonar-ui-common/components/ui/DuplicationsRating.css b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/DuplicationsRating.css index 82f4024bca3..82f4024bca3 100644 --- a/server/sonar-ui-common/components/ui/DuplicationsRating.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/DuplicationsRating.css diff --git a/server/sonar-ui-common/components/ui/DuplicationsRating.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/DuplicationsRating.tsx index 9289f587960..1c1d2595e32 100644 --- a/server/sonar-ui-common/components/ui/DuplicationsRating.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/DuplicationsRating.tsx @@ -38,7 +38,7 @@ export default function DuplicationsRating({ muted = false, size = 'normal', val 'duplications-rating-B': inRange(value || 0, 3, 5), 'duplications-rating-C': inRange(value || 0, 5, 10), 'duplications-rating-D': inRange(value || 0, 10, 20), - 'duplications-rating-E': (value || 0) >= 20, + 'duplications-rating-E': (value || 0) >= 20 }); return <div className={className} />; diff --git a/server/sonar-ui-common/components/ui/FilesCounter.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/FilesCounter.tsx index 60b96c223fa..60b96c223fa 100644 --- a/server/sonar-ui-common/components/ui/FilesCounter.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/FilesCounter.tsx diff --git a/server/sonar-ui-common/components/ui/GenericAvatar.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/GenericAvatar.tsx index 1d9aab2aa9f..d9c78da675d 100644 --- a/server/sonar-ui-common/components/ui/GenericAvatar.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/GenericAvatar.tsx @@ -32,7 +32,7 @@ export default function GenericAvatar({ className, name, round, size }: Props) { const color = stringToColor(name); let text = ''; - const words = name.split(/\s+/).filter((word) => word.length > 0); + const words = name.split(/\s+/).filter(word => word.length > 0); if (words.length >= 2) { text = words[0][0] + words[1][0]; } else if (name.length > 0) { @@ -53,7 +53,7 @@ export default function GenericAvatar({ className, name, round, size }: Props) { lineHeight: `${size}px`, textAlign: 'center', verticalAlign: 'top', - width: size, + width: size }}> {text.toUpperCase()} </div> diff --git a/server/sonar-ui-common/components/ui/Level.css b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/Level.css index a4d722f01ce..a4d722f01ce 100644 --- a/server/sonar-ui-common/components/ui/Level.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/Level.css diff --git a/server/sonar-ui-common/components/ui/Level.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/Level.tsx index 8d2284df17e..5b5174470cc 100644 --- a/server/sonar-ui-common/components/ui/Level.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/Level.tsx @@ -35,7 +35,7 @@ export default function Level(props: LevelProps) { const formatted = formatMeasure(props.level, 'LEVEL'); const className = classNames(props.className, 'level', 'level-' + props.level, { 'level-small': props.small, - 'level-muted': props.muted, + 'level-muted': props.muted }); return ( diff --git a/server/sonar-ui-common/components/ui/MandatoryFieldMarker.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/MandatoryFieldMarker.tsx index bedf016d2a6..bedf016d2a6 100644 --- a/server/sonar-ui-common/components/ui/MandatoryFieldMarker.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/MandatoryFieldMarker.tsx diff --git a/server/sonar-ui-common/components/ui/MandatoryFieldsExplanation.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/MandatoryFieldsExplanation.tsx index 67ef7370bca..67ef7370bca 100644 --- a/server/sonar-ui-common/components/ui/MandatoryFieldsExplanation.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/MandatoryFieldsExplanation.tsx diff --git a/server/sonar-ui-common/components/ui/NavBar.css b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NavBar.css index c9e5757121d..c9e5757121d 100644 --- a/server/sonar-ui-common/components/ui/NavBar.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NavBar.css diff --git a/server/sonar-ui-common/components/ui/NavBar.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NavBar.tsx index 5f6de14ffaa..5f6de14ffaa 100644 --- a/server/sonar-ui-common/components/ui/NavBar.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NavBar.tsx diff --git a/server/sonar-ui-common/components/ui/NavBarTabs.css b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NavBarTabs.css index f43e1389f07..f43e1389f07 100644 --- a/server/sonar-ui-common/components/ui/NavBarTabs.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NavBarTabs.css diff --git a/server/sonar-ui-common/components/ui/NavBarTabs.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NavBarTabs.tsx index 0cc09e5abc6..0cc09e5abc6 100644 --- a/server/sonar-ui-common/components/ui/NavBarTabs.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NavBarTabs.tsx diff --git a/server/sonar-ui-common/components/ui/NewsBox.css b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NewsBox.css index 1adae9f9102..1adae9f9102 100644 --- a/server/sonar-ui-common/components/ui/NewsBox.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NewsBox.css diff --git a/server/sonar-ui-common/components/ui/NewsBox.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NewsBox.tsx index 27626765848..27626765848 100644 --- a/server/sonar-ui-common/components/ui/NewsBox.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/NewsBox.tsx diff --git a/server/sonar-ui-common/components/ui/PageActions.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/PageActions.tsx index 8c2e4106b16..8c2e4106b16 100644 --- a/server/sonar-ui-common/components/ui/PageActions.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/PageActions.tsx diff --git a/server/sonar-ui-common/components/ui/Rating.css b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/Rating.css index 8bd2dda1a3d..8bd2dda1a3d 100644 --- a/server/sonar-ui-common/components/ui/Rating.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/Rating.css diff --git a/server/sonar-ui-common/components/ui/Rating.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/Rating.tsx index 91c661ffc97..91c661ffc97 100644 --- a/server/sonar-ui-common/components/ui/Rating.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/Rating.tsx diff --git a/server/sonar-ui-common/components/ui/SizeRating.css b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/SizeRating.css index 4403c162271..4403c162271 100644 --- a/server/sonar-ui-common/components/ui/SizeRating.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/SizeRating.css diff --git a/server/sonar-ui-common/components/ui/SizeRating.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/SizeRating.tsx index 190c5a3205a..c6c71072fdb 100644 --- a/server/sonar-ui-common/components/ui/SizeRating.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/SizeRating.tsx @@ -48,7 +48,7 @@ export default function SizeRating({ small = false, muted = false, value }: Prop const className = classNames('size-rating', { 'size-rating-small': small, - 'size-rating-muted': muted, + 'size-rating-muted': muted }); return ( diff --git a/server/sonar-ui-common/components/ui/__tests__/Alert-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/Alert-test.tsx index baed94e98bc..f7df09a4d99 100644 --- a/server/sonar-ui-common/components/ui/__tests__/Alert-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/Alert-test.tsx @@ -27,22 +27,26 @@ it('should render properly', () => { it('verification of all variants of alert', () => { const variants: AlertProps['variant'][] = ['error', 'warning', 'success', 'info', 'loading']; - variants.forEach((variant) => { + variants.forEach(variant => { const wrapper = shallowRender({ variant }); expect(wrapper.prop('variantInfo')).toMatchSnapshot(); }); }); it('should render inline alert', () => { - expect(shallowRender({ display: 'inline' }).find('Styled(div)[isInline=true]').exists()).toBe( - true - ); + expect( + shallowRender({ display: 'inline' }) + .find('Styled(div)[isInline=true]') + .exists() + ).toBe(true); }); it('should render banner alert', () => { - expect(shallowRender({ display: 'banner' }).find('Styled(div)[isBanner=true]').exists()).toBe( - true - ); + expect( + shallowRender({ display: 'banner' }) + .find('Styled(div)[isBanner=true]') + .exists() + ).toBe(true); }); it('should render banner alert with correct css', () => { diff --git a/server/sonar-ui-common/components/ui/__tests__/AutoEllipsis-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/AutoEllipsis-test.tsx index 5d3411078cf..5d3411078cf 100644 --- a/server/sonar-ui-common/components/ui/__tests__/AutoEllipsis-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/AutoEllipsis-test.tsx diff --git a/server/sonar-ui-common/components/ui/__tests__/DeferredSpinner-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/DeferredSpinner-test.tsx index 8a7bc268499..8a7bc268499 100644 --- a/server/sonar-ui-common/components/ui/__tests__/DeferredSpinner-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/DeferredSpinner-test.tsx diff --git a/server/sonar-ui-common/components/ui/__tests__/FilesCounter-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/FilesCounter-test.tsx index 2f020368cdb..2f020368cdb 100644 --- a/server/sonar-ui-common/components/ui/__tests__/FilesCounter-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/FilesCounter-test.tsx diff --git a/server/sonar-ui-common/components/ui/__tests__/GenericAvatar-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/GenericAvatar-test.tsx index d244490dcd9..d244490dcd9 100644 --- a/server/sonar-ui-common/components/ui/__tests__/GenericAvatar-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/GenericAvatar-test.tsx diff --git a/server/sonar-ui-common/components/ui/__tests__/Level-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/Level-test.tsx index 8f52a420665..8f52a420665 100644 --- a/server/sonar-ui-common/components/ui/__tests__/Level-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/Level-test.tsx diff --git a/server/sonar-ui-common/components/ui/__tests__/MandatoryFieldMarker-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/MandatoryFieldMarker-test.tsx index 8cd043086c2..8cd043086c2 100644 --- a/server/sonar-ui-common/components/ui/__tests__/MandatoryFieldMarker-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/MandatoryFieldMarker-test.tsx diff --git a/server/sonar-ui-common/components/ui/__tests__/MandatoryFieldsExplanation-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/MandatoryFieldsExplanation-test.tsx index 5104f1cfbad..8ba8b451e08 100644 --- a/server/sonar-ui-common/components/ui/__tests__/MandatoryFieldsExplanation-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/MandatoryFieldsExplanation-test.tsx @@ -20,7 +20,7 @@ import { shallow } from 'enzyme'; import * as React from 'react'; import MandatoryFieldsExplanation, { - MandatoryFieldsExplanationProps, + MandatoryFieldsExplanationProps } from '../MandatoryFieldsExplanation'; it('should render correctly', () => { diff --git a/server/sonar-ui-common/components/ui/__tests__/NavBar-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/NavBar-test.tsx index 1db05af50e0..1db05af50e0 100644 --- a/server/sonar-ui-common/components/ui/__tests__/NavBar-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/NavBar-test.tsx diff --git a/server/sonar-ui-common/components/ui/__tests__/NewsBox-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/NewsBox-test.tsx index 8b46a49efbc..8b46a49efbc 100644 --- a/server/sonar-ui-common/components/ui/__tests__/NewsBox-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/NewsBox-test.tsx diff --git a/server/sonar-ui-common/components/ui/__tests__/PageActions-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/PageActions-test.tsx index 46594418d3a..46594418d3a 100644 --- a/server/sonar-ui-common/components/ui/__tests__/PageActions-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/PageActions-test.tsx diff --git a/server/sonar-ui-common/components/ui/__tests__/Rating-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/Rating-test.tsx index f8f1540adfc..f8f1540adfc 100644 --- a/server/sonar-ui-common/components/ui/__tests__/Rating-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/Rating-test.tsx diff --git a/server/sonar-ui-common/components/ui/__tests__/SizeRating-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/SizeRating-test.tsx index 7c3b8e3b005..7c3b8e3b005 100644 --- a/server/sonar-ui-common/components/ui/__tests__/SizeRating-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/SizeRating-test.tsx diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/Alert-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/Alert-test.tsx.snap index 893212cc564..893212cc564 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/Alert-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/Alert-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/AutoEllipsis-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/AutoEllipsis-test.tsx.snap index 84212d45e27..84212d45e27 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/AutoEllipsis-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/AutoEllipsis-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/DeferredSpinner-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/DeferredSpinner-test.tsx.snap index 6822674e7d2..6822674e7d2 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/DeferredSpinner-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/DeferredSpinner-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/FilesCounter-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/FilesCounter-test.tsx.snap index bb01a6121da..bb01a6121da 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/FilesCounter-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/FilesCounter-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/GenericAvatar-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/GenericAvatar-test.tsx.snap index 9c2bb0fa7fd..9c2bb0fa7fd 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/GenericAvatar-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/GenericAvatar-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/Level-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/Level-test.tsx.snap index 089171fcc17..089171fcc17 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/Level-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/Level-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/MandatoryFieldMarker-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/MandatoryFieldMarker-test.tsx.snap index 1adb77718dd..1adb77718dd 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/MandatoryFieldMarker-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/MandatoryFieldMarker-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/MandatoryFieldsExplanation-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/MandatoryFieldsExplanation-test.tsx.snap index ca469b7e71c..ca469b7e71c 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/MandatoryFieldsExplanation-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/MandatoryFieldsExplanation-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/NavBar-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/NavBar-test.tsx.snap index a039d0ebb24..a039d0ebb24 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/NavBar-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/NavBar-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/NewsBox-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/NewsBox-test.tsx.snap index 91e58894fbf..91e58894fbf 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/NewsBox-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/NewsBox-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/PageActions-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/PageActions-test.tsx.snap index bb220fbacaf..bb220fbacaf 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/PageActions-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/PageActions-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/Rating-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/Rating-test.tsx.snap index 9455ce98965..9455ce98965 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/Rating-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/Rating-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/SizeRating-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/SizeRating-test.tsx.snap index a35517cc685..a35517cc685 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/SizeRating-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/SizeRating-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/popups-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/popups-test.tsx.snap index 87b7811eb17..87b7811eb17 100644 --- a/server/sonar-ui-common/components/ui/__tests__/__snapshots__/popups-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/__snapshots__/popups-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/__tests__/popups-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/popups-test.tsx index c014d824b6f..d790073ba5d 100644 --- a/server/sonar-ui-common/components/ui/__tests__/popups-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/__tests__/popups-test.tsx @@ -25,7 +25,7 @@ import { Popup, PopupArrow, PopupPlacement, PortalPopup } from '../popups'; jest.mock('react-dom', () => ({ ...jest.requireActual('react-dom'), - findDOMNode: jest.fn().mockReturnValue(undefined), + findDOMNode: jest.fn().mockReturnValue(undefined) })); describe('Popup', () => { @@ -56,7 +56,13 @@ describe('PortalPopup', () => { const wrapper = shallowRender(); wrapper.setState({ left: 0, top: 0, width: 10, height: 10 }); expect(wrapper).toMatchSnapshot(); - expect(wrapper.find(ScreenPositionFixer).dive().dive().dive()).toMatchSnapshot(); + expect( + wrapper + .find(ScreenPositionFixer) + .dive() + .dive() + .dive() + ).toMatchSnapshot(); }); it('should correctly compute the popup positioning', () => { @@ -70,8 +76,8 @@ describe('PortalPopup', () => { wrapper.instance().popupNode = { current: { - getBoundingClientRect: jest.fn().mockReturnValue({ width: 8, height: 8 }), - } as any, + getBoundingClientRect: jest.fn().mockReturnValue({ width: 8, height: 8 }) + } as any }; wrapper.instance().positionPopup(); diff --git a/server/sonar-ui-common/components/ui/popups.css b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/popups.css index f7bb71b188c..f7bb71b188c 100644 --- a/server/sonar-ui-common/components/ui/popups.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/popups.css diff --git a/server/sonar-ui-common/components/ui/popups.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/popups.tsx index 01bb28f658f..5873d0f658f 100644 --- a/server/sonar-ui-common/components/ui/popups.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/popups.tsx @@ -17,6 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* eslint-disable prefer-destructuring */ + import * as classNames from 'classnames'; import { throttle } from 'lodash'; import * as React from 'react'; @@ -42,7 +45,7 @@ export enum PopupPlacement { LeftTop = 'left-top', RightTop = 'right-top', RightBottom = 'right-bottom', - TopLeft = 'top-left', + TopLeft = 'top-left' } interface PopupProps { @@ -216,7 +219,7 @@ export class PortalPopup extends React.Component<PortalPopupProps, State> { left: window.pageXOffset + left, top: window.pageYOffset + top, width, - height, + height }); } }; @@ -231,7 +234,7 @@ export class PortalPopup extends React.Component<PortalPopupProps, State> { left: this.state.left + leftFix, top: this.state.top + topFix, width: this.state.width, - height: this.state.height, + height: this.state.height }; arrowStyle = this.adjustArrowPosition(placement, { leftFix, topFix }); } diff --git a/server/sonar-ui-common/components/ui/update-center/MetaData.css b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/MetaData.css index 6bc5a632fb1..6bc5a632fb1 100644 --- a/server/sonar-ui-common/components/ui/update-center/MetaData.css +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/MetaData.css diff --git a/server/sonar-ui-common/components/ui/update-center/MetaData.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/MetaData.tsx index 017527abcde..b6918749d99 100644 --- a/server/sonar-ui-common/components/ui/update-center/MetaData.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/MetaData.tsx @@ -59,11 +59,10 @@ export default class MetaData extends React.Component<Props, State> { .then((response: Response) => { if (isSuccessStatus(response.status)) { return response.json(); - } else { - return Promise.reject(response); } + return Promise.reject(response); }) - .then((data) => { + .then(data => { if (this.mounted) { this.setState({ data }); } diff --git a/server/sonar-ui-common/components/ui/update-center/MetaDataVersion.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/MetaDataVersion.tsx index d91a1bd3bc6..b8c3bbe37e6 100644 --- a/server/sonar-ui-common/components/ui/update-center/MetaDataVersion.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/MetaDataVersion.tsx @@ -34,20 +34,20 @@ export default function MetaDataVersion(props: MetaDataVersionProps) { date, description, downloadURL, - version, - }, + version + } } = props; const fallbackLabel = 'Download'; const advancedDownloadUrls = isAdvancedDownloadUrlArray(downloadURL) - ? downloadURL.map((url) => ({ ...url, label: url.label || fallbackLabel })) + ? downloadURL.map(url => ({ ...url, label: url.label || fallbackLabel })) : [{ label: fallbackLabel, url: downloadURL }]; return ( <div className={classNames('update-center-meta-data-version', { - 'update-center-meta-data-version-archived': archived, + 'update-center-meta-data-version-archived': archived })}> <div className="update-center-meta-data-version-version">{version}</div> diff --git a/server/sonar-ui-common/components/ui/update-center/MetaDataVersions.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/MetaDataVersions.tsx index f51e11e730a..b92f9efac03 100644 --- a/server/sonar-ui-common/components/ui/update-center/MetaDataVersions.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/MetaDataVersions.tsx @@ -31,7 +31,7 @@ interface State { export default class MetaDataVersions extends React.Component<Props, State> { state: State = { - collapsed: true, + collapsed: true }; componentDidUpdate(prevProps: Props) { @@ -50,8 +50,8 @@ export default class MetaDataVersions extends React.Component<Props, State> { const { versions } = this.props; const { collapsed } = this.state; - const archivedVersions = versions.filter((version) => version.archived); - const currentVersions = versions.filter((version) => !version.archived); + const archivedVersions = versions.filter(version => version.archived); + const currentVersions = versions.filter(version => !version.archived); return ( <div className="update-center-meta-data-versions"> @@ -64,7 +64,7 @@ export default class MetaDataVersions extends React.Component<Props, State> { </button> )} - {currentVersions.map((versionInformation) => ( + {currentVersions.map(versionInformation => ( <MetaDataVersion key={versionInformation.version} versionInformation={versionInformation} @@ -72,7 +72,7 @@ export default class MetaDataVersions extends React.Component<Props, State> { ))} {!collapsed && - archivedVersions.map((archivedVersionInformation) => ( + archivedVersions.map(archivedVersionInformation => ( <MetaDataVersion key={archivedVersionInformation.version} versionInformation={archivedVersionInformation} diff --git a/server/sonar-ui-common/components/ui/update-center/__tests__/MetaData-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/MetaData-test.tsx index 85c6ce0ac71..e89307b350a 100644 --- a/server/sonar-ui-common/components/ui/update-center/__tests__/MetaData-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/MetaData-test.tsx @@ -44,7 +44,7 @@ it('should render correctly', async () => { it('should render correctly with organization', async () => { const metaDataInfo = mockMetaDataInformation({ - organization: { name: 'test-org', url: 'test-org-url' }, + organization: { name: 'test-org', url: 'test-org-url' } }); mockFetchReturnValue(metaDataInfo); diff --git a/server/sonar-ui-common/components/ui/update-center/__tests__/MetaDataVersion-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/MetaDataVersion-test.tsx index f1e5b947224..285a0f8e346 100644 --- a/server/sonar-ui-common/components/ui/update-center/__tests__/MetaDataVersion-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/MetaDataVersion-test.tsx @@ -27,13 +27,13 @@ it('should render correctly', () => { expect( shallowRender({ versionInformation: mockMetaDataVersionInformation({ - downloadURL: [{ label: 'macos 64 bits', url: '' }], - }), + downloadURL: [{ label: 'macos 64 bits', url: '' }] + }) }) ).toMatchSnapshot('with advanced downloadUrl'); expect( shallowRender({ - versionInformation: { version: '2.0' }, + versionInformation: { version: '2.0' } }) ).toMatchSnapshot('with very few info'); }); diff --git a/server/sonar-ui-common/components/ui/update-center/__tests__/MetaDataVersions-test.tsx b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/MetaDataVersions-test.tsx index 0648c0fd59d..15eb7348b2c 100644 --- a/server/sonar-ui-common/components/ui/update-center/__tests__/MetaDataVersions-test.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/MetaDataVersions-test.tsx @@ -43,7 +43,7 @@ function shallowRender(props?: Partial<MetaDataVersions['props']>) { versions={[ mockMetaDataVersionInformation({ version: '3.0' }), mockMetaDataVersionInformation({ version: '2.0', archived: true }), - mockMetaDataVersionInformation({ version: '1.0', archived: true }), + mockMetaDataVersionInformation({ version: '1.0', archived: true }) ]} {...props} /> diff --git a/server/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaData-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaData-test.tsx.snap index 89e8d74a6d1..89e8d74a6d1 100644 --- a/server/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaData-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaData-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaDataVersion-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaDataVersion-test.tsx.snap index 7fd964fe2ab..7fd964fe2ab 100644 --- a/server/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaDataVersion-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaDataVersion-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaDataVersions-test.tsx.snap b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaDataVersions-test.tsx.snap index 109fe964473..109fe964473 100644 --- a/server/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaDataVersions-test.tsx.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/__tests__/__snapshots__/MetaDataVersions-test.tsx.snap diff --git a/server/sonar-ui-common/components/ui/update-center/mocks/update-center-metadata.ts b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/mocks/update-center-metadata.ts index 52e8c660d15..e4d389546e6 100644 --- a/server/sonar-ui-common/components/ui/update-center/mocks/update-center-metadata.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/mocks/update-center-metadata.ts @@ -29,7 +29,7 @@ export function mockMetaDataVersionInformation( archived: false, downloadURL: 'https://example.com/sonar-java-plugin-5.13.0.18197.jar', changeLogUrl: 'https://example.com/sonar-java-plugin/release', - ...overrides, + ...overrides }; } @@ -42,7 +42,7 @@ export function mockMetaDataInformation( isSonarSourceCommercial: true, organization: { name: 'SonarSource', - url: 'http://www.sonarsource.com/', + url: 'http://www.sonarsource.com/' }, category: 'Languages', license: 'SonarSource', @@ -50,8 +50,8 @@ export function mockMetaDataInformation( sourcesURL: 'https://github.com/SonarSource/sonar-java', versions: [ mockMetaDataVersionInformation({ version: '2.0' }), - mockMetaDataVersionInformation({ version: '1.0', archived: true }), + mockMetaDataVersionInformation({ version: '1.0', archived: true }) ], - ...overrides, + ...overrides }; } diff --git a/server/sonar-ui-common/components/ui/update-center/update-center-metadata.ts b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/update-center-metadata.ts index a88b385c3b6..a88b385c3b6 100644 --- a/server/sonar-ui-common/components/ui/update-center/update-center-metadata.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/components/ui/update-center/update-center-metadata.ts diff --git a/server/sonar-ui-common/config/jest/CSSStub.js b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/CSSStub.js index 2a89db848b0..2a89db848b0 100644 --- a/server/sonar-ui-common/config/jest/CSSStub.js +++ b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/CSSStub.js diff --git a/server/sonar-ui-common/config/jest/FileStub.js b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/FileStub.js index 3afbc40ae7c..3afbc40ae7c 100644 --- a/server/sonar-ui-common/config/jest/FileStub.js +++ b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/FileStub.js diff --git a/server/sonar-ui-common/config/jest/SetupEnzyme.js b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/SetupEnzyme.js index 8cb3f810f01..8cb3f810f01 100644 --- a/server/sonar-ui-common/config/jest/SetupEnzyme.js +++ b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/SetupEnzyme.js diff --git a/server/sonar-ui-common/config/jest/SetupSUC.ts b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/SetupSUC.ts index 4b29cdee1ba..5466f2826d1 100644 --- a/server/sonar-ui-common/config/jest/SetupSUC.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/SetupSUC.ts @@ -21,9 +21,11 @@ import ThemeContext from '../../components/theme'; import Initializer, { DEFAULT_LOCALE } from '../../helpers/init'; import testTheme from './testTheme'; -Initializer.setLocale(DEFAULT_LOCALE).setMessages({}).setUrlContext(''); +Initializer.setLocale(DEFAULT_LOCALE) + .setMessages({}) + .setUrlContext(''); // Hack : override the default value of the context used for theme by emotion // This allows tests to get the theme value without specifiying a theme provider -ThemeContext['_currentValue'] = testTheme; -ThemeContext['_currentValue2'] = testTheme; +(ThemeContext as any)['_currentValue'] = testTheme; +(ThemeContext as any)['_currentValue2'] = testTheme; diff --git a/server/sonar-ui-common/config/jest/SetupTestEnvironment.js b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/SetupTestEnvironment.js index 9e9df7cd5e3..9e9df7cd5e3 100644 --- a/server/sonar-ui-common/config/jest/SetupTestEnvironment.js +++ b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/SetupTestEnvironment.js diff --git a/server/sonar-ui-common/config/jest/testTheme.ts b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/testTheme.ts index 7d219c34a0f..d1fffad306b 100644 --- a/server/sonar-ui-common/config/jest/testTheme.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/config/jest/testTheme.ts @@ -100,7 +100,7 @@ export default { alertBorderInfo: '#b1dff3', alertBackgroundInfo: '#d9edf7', alertTextInfo: '#0e516f', - alertIconInfo: '#0271b9', + alertIconInfo: '#0271b9' }, sizes: { @@ -125,14 +125,14 @@ export default { maxPageWidth: '1320px', minPageWidth: '1080px', - pagePadding: '20px', + pagePadding: '20px' }, rawSizes: { grid, globalNavHeightRaw: 6 * grid, globalNavContentHeightRaw: 4 * grid, - contextNavHeightRaw: 9 * grid, + contextNavHeightRaw: 9 * grid }, fonts: { @@ -140,7 +140,7 @@ export default { systemFontFamily: "-apple-system,'BlinkMacSystemFont','Segoe UI','Helvetica','Arial',sans-serif", sonarcloudFontFamily: - "Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif", + "Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif" }, // z-index @@ -171,10 +171,10 @@ export default { dropdownMenuZIndex: '7500', - tooltipZIndex: '8000', + tooltipZIndex: '8000' }, others: { - defaultShadow: '0 6px 12px rgba(0, 0, 0, 0.175)', - }, + defaultShadow: '0 6px 12px rgba(0, 0, 0, 0.175)' + } }; diff --git a/server/sonar-ui-common/helpers/__tests__/__snapshots__/query-test.ts.snap b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/__snapshots__/query-test.ts.snap index 4f0b5538ba8..4f0b5538ba8 100644 --- a/server/sonar-ui-common/helpers/__tests__/__snapshots__/query-test.ts.snap +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/__snapshots__/query-test.ts.snap diff --git a/server/sonar-ui-common/helpers/__tests__/colors-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/colors-test.ts index ae80a29e093..ae80a29e093 100644 --- a/server/sonar-ui-common/helpers/__tests__/colors-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/colors-test.ts diff --git a/server/sonar-ui-common/helpers/__tests__/dates-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/dates-test.ts index 9482f6d6476..9482f6d6476 100644 --- a/server/sonar-ui-common/helpers/__tests__/dates-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/dates-test.ts diff --git a/server/sonar-ui-common/helpers/__tests__/handleRequiredAuthentication-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/handleRequiredAuthentication-test.ts index abb391a2e21..dfb377e6a7a 100644 --- a/server/sonar-ui-common/helpers/__tests__/handleRequiredAuthentication-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/handleRequiredAuthentication-test.ts @@ -21,7 +21,7 @@ import getHistory from '../getHistory'; import handleRequiredAuthentication from '../handleRequiredAuthentication'; jest.mock('../getHistory', () => ({ - default: jest.fn(), + default: jest.fn() })); it('should not render for anonymous user', () => { diff --git a/server/sonar-ui-common/helpers/__tests__/init-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/init-test.ts index 8f7e927a867..d1251f06697 100644 --- a/server/sonar-ui-common/helpers/__tests__/init-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/init-test.ts @@ -24,7 +24,7 @@ import Initializer, { getLocale, getMessages, getReactDomContainerSelector, - getUrlContext, + getUrlContext } from '../init'; const originalConsoleWarn = console.warn; @@ -35,7 +35,9 @@ beforeEach(() => { }); afterAll(() => { - Initializer.setLocale('en').setMessages({}).setUrlContext(''); + Initializer.setLocale('en') + .setMessages({}) + .setUrlContext(''); // @ts-ignore: initialize everything to undefined, not possible by respecting types Initializer.setReactDomContainer(undefined); console.warn = originalConsoleWarn; @@ -43,7 +45,9 @@ afterAll(() => { it('should throw when trying to get a value without initializing first', () => { // @ts-ignore: initialize react dom container to undefined, not possible by respecting types - Initializer.setLocale(undefined).setMessages(undefined).setUrlContext(undefined); + Initializer.setLocale(undefined) + .setMessages(undefined) + .setUrlContext(undefined); expect(getLocale()).toBe(DEFAULT_LOCALE); expect(console.warn).toHaveBeenLastCalledWith( diff --git a/server/sonar-ui-common/helpers/__tests__/l10n-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/l10n-test.ts index 523ac99b30b..0a607a1f911 100644 --- a/server/sonar-ui-common/helpers/__tests__/l10n-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/l10n-test.ts @@ -28,7 +28,7 @@ import { getWeekDayName, hasMessage, translate, - translateWithParameters, + translateWithParameters } from '../l10n'; const originalMessages = getMessages(); @@ -137,7 +137,7 @@ describe('getLocalizedMetricName', () => { describe('getLocalizedCategoryMetricName', () => { it('should return metric category name translation', () => { Initializer.setMessages({ - 'metric.new_code.extra_short_name': 'metric.new_code.extra_short_name_t', + 'metric.new_code.extra_short_name': 'metric.new_code.extra_short_name_t' }); expect(getLocalizedCategoryMetricName({ key: 'new_code' })).toBe( 'metric.new_code.extra_short_name_t' diff --git a/server/sonar-ui-common/helpers/__tests__/measures-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/measures-test.ts index f9cb4ab04ce..21b7e35fbe6 100644 --- a/server/sonar-ui-common/helpers/__tests__/measures-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/measures-test.ts @@ -36,7 +36,7 @@ beforeAll(() => { 'metric.level.OK': 'Ok', 'short_number_suffix.g': 'G', 'short_number_suffix.k': 'k', - 'short_number_suffix.m': 'M', + 'short_number_suffix.m': 'M' }); }); @@ -202,7 +202,7 @@ describe('getMinDecimalsCountToBeDistinctFromThreshold', () => { }); it('should return 1 if the delta is larger than 0.1', () => { - [0.1, 0.15, 0.2, 0.5, 0.8, 1].forEach((delta) => { + [0.1, 0.15, 0.2, 0.5, 0.8, 1].forEach(delta => { expect(getMinDecimalsCountToBeDistinctFromThreshold(2.5 + delta, 2.5)).toBe(1); expect(getMinDecimalsCountToBeDistinctFromThreshold(2.5 - delta, 2.5)).toBe(1); }); diff --git a/server/sonar-ui-common/helpers/__tests__/pages-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/pages-test.ts index 9f4ba96c172..6f25c33c951 100644 --- a/server/sonar-ui-common/helpers/__tests__/pages-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/pages-test.ts @@ -23,14 +23,14 @@ import { addWhitePageClass, removeNoFooterPageClass, removeSideBarClass, - removeWhitePageClass, + removeWhitePageClass } from '../pages'; describe('class adders', () => { it.each([ [addSideBarClass, 'sidebar-page'], [addNoFooterPageClass, 'no-footer-page'], - [addWhitePageClass, 'white-page'], + [addWhitePageClass, 'white-page'] ])('%s should add the class', (fct, cls) => { const toggle = jest.spyOn(document.body.classList, 'toggle'); fct(); @@ -42,7 +42,7 @@ describe('class removers', () => { it.each([ [removeSideBarClass, 'sidebar-page'], [removeNoFooterPageClass, 'no-footer-page'], - [removeWhitePageClass, 'white-page'], + [removeWhitePageClass, 'white-page'] ])('%s should add the class', (fct, cls) => { const toggle = jest.spyOn(document.body.classList, 'toggle'); fct(); diff --git a/server/sonar-ui-common/helpers/__tests__/path-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/path-test.ts index 12f32ab7d0c..e354e19f7f2 100644 --- a/server/sonar-ui-common/helpers/__tests__/path-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/path-test.ts @@ -23,7 +23,7 @@ import { cutLongWords, fileFromPath, limitComponentName, - splitPath, + splitPath } from '../path'; describe('#collapsedDirFromPath()', () => { @@ -109,7 +109,7 @@ describe('splitPath', () => { expect(splitPath('my/super/path')).toEqual({ head: 'my/super', tail: 'path' }); expect(splitPath('my/super/very/long/path')).toEqual({ head: 'my/super/very/long', - tail: 'path', + tail: 'path' }); }); }); diff --git a/server/sonar-ui-common/helpers/__tests__/query-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/query-test.ts index 4a6a671005c..5598fe04d14 100644 --- a/server/sonar-ui-common/helpers/__tests__/query-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/query-test.ts @@ -67,7 +67,7 @@ describe('parseAsOptionalArray', () => { expect(query.parseAsOptionalArray('true,false,false', query.parseAsBoolean)).toEqual([ true, false, - false, + false ]); expect(query.parseAsOptionalArray(undefined, query.parseAsString)).toBeUndefined(); }); diff --git a/server/sonar-ui-common/helpers/__tests__/ratings-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/ratings-test.ts index 619ef1cdbd7..46fe5029c96 100644 --- a/server/sonar-ui-common/helpers/__tests__/ratings-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/ratings-test.ts @@ -23,7 +23,7 @@ import { getDuplicationsRatingAverageValue, getDuplicationsRatingLabel, getSizeRatingAverageValue, - getSizeRatingLabel, + getSizeRatingLabel } from '../ratings'; describe('getCoverageRatingLabel', () => { @@ -37,7 +37,7 @@ describe('getCoverageRatingLabel', () => { [2, '70% - 80%'], [3, '50% - 70%'], [4, '30% - 50%'], - [5, '< 30%'], + [5, '< 30%'] ])('should return the correct label for %s', (rating, label) => { expect(getCoverageRatingLabel(rating)).toBe(label); }); @@ -49,7 +49,7 @@ describe('getCoverageRatingAverageValue', () => { [2, 75], [3, 60], [4, 40], - [5, 15], + [5, 15] ])('should return the correct value', (rating, value) => { expect(getCoverageRatingAverageValue(rating)).toBe(value); }); @@ -66,7 +66,7 @@ describe('getDuplicationsRatingLabel', () => { [2, '3% - 5%'], [3, '5% - 10%'], [4, '10% - 20%'], - [5, '> 20%'], + [5, '> 20%'] ])('should return the correct label for %s', (rating, label) => { expect(getDuplicationsRatingLabel(rating)).toBe(label); }); @@ -78,7 +78,7 @@ describe('getDuplicationsRatingAverageValue', () => { [2, 4], [3, 7.5], [4, 15], - [5, 30], + [5, 30] ])('should return the correct value', (rating, value) => { expect(getDuplicationsRatingAverageValue(rating)).toBe(value); }); @@ -95,7 +95,7 @@ describe('getSizeRatingLabel', () => { [2, '1k - 10k'], [3, '10k - 100k'], [4, '100k - 500k'], - [5, '> 500k'], + [5, '> 500k'] ])('should return the correct label for %s', (rating, label) => { expect(getSizeRatingLabel(rating)).toBe(label); }); @@ -107,7 +107,7 @@ describe('getSizeRatingAverageValue', () => { [2, 5000], [3, 50000], [4, 250000], - [5, 750000], + [5, 750000] ])('should return the correct value', (rating, value) => { expect(getSizeRatingAverageValue(rating)).toBe(value); }); diff --git a/server/sonar-ui-common/helpers/__tests__/request-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/request-test.ts index a6ffa480d2d..6cdb0e4b1e0 100644 --- a/server/sonar-ui-common/helpers/__tests__/request-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/request-test.ts @@ -17,6 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +/* eslint-disable no-await-in-loop */ + import handleRequiredAuthentication from '../handleRequiredAuthentication'; import { checkStatus, @@ -30,7 +33,7 @@ import { post, postJSON, postJSONBody, - requestTryAndRepeatUntil, + requestTryAndRepeatUntil } from '../request'; jest.mock('../handleRequiredAuthentication', () => ({ default: jest.fn() })); @@ -39,7 +42,7 @@ jest.mock('../init', () => { const module = jest.requireActual('../init'); return { ...module, - getRequestOptions: jest.fn().mockReturnValue({}), + getRequestOptions: jest.fn().mockReturnValue({}) }; }); const url = '/my-url'; @@ -92,7 +95,7 @@ describe('getText', () => { describe('parseError', () => { it('should parse error and return the message', async () => { const response = new Response(JSON.stringify({ errors: [{ msg: 'Error1' }] }), { - status: HttpStatus.BadRequest, + status: HttpStatus.BadRequest }); await expect(parseError(response)).resolves.toBe('Error1'); }); @@ -171,7 +174,7 @@ describe('postJSONBody', () => { expect.objectContaining({ headers: { Accept: 'application/json', 'Content-Type': 'application/json' }, body: '{"nested":{"data":"test","withArray":[1,2]}}', - method: 'POST', + method: 'POST' }) ); }); @@ -314,7 +317,7 @@ describe('checkStatus', () => { it('should bybass the redirect with a 401 error', async () => { const mockedResponse = mockResponse({}, HttpStatus.Unauthorized); - await checkStatus(mockedResponse, true).catch((response) => { + await checkStatus(mockedResponse, true).catch(response => { expect(handleRequiredAuthentication).not.toBeCalled(); expect(response).toEqual(mockedResponse); }); diff --git a/server/sonar-ui-common/helpers/__tests__/scrolling-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/scrolling-test.ts index 43ec5664178..27b6e356cd1 100644 --- a/server/sonar-ui-common/helpers/__tests__/scrolling-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/scrolling-test.ts @@ -215,5 +215,5 @@ const mockGetBoundingClientRect = (overrides: Partial<ClientRect>) => () => right: 0, top: 0, width: 0, - ...overrides, + ...overrides } as DOMRect); diff --git a/server/sonar-ui-common/helpers/__tests__/strings-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/strings-test.ts index 00711cf1c1d..06c7a61c37d 100644 --- a/server/sonar-ui-common/helpers/__tests__/strings-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/strings-test.ts @@ -26,7 +26,7 @@ describe('#decodeJwt', () => { exp: 1541062205, iat: 1541058605, iss: 'ari:cloud:bitbucket::app/{327713ed-f1b2-4659-9c91-c8ecf8be7f3e}/sonarcloud-greg', - qsh: 'a6c93addd971c05d08da1e1669c2640fba529e98fbb5b2b9effadf00bf484277', + qsh: 'a6c93addd971c05d08da1e1669c2640fba529e98fbb5b2b9effadf00bf484277' }; expect( decodeJwt( diff --git a/server/sonar-ui-common/helpers/__tests__/urls-test.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/urls-test.ts index 1eb75452a8d..113838447bd 100644 --- a/server/sonar-ui-common/helpers/__tests__/urls-test.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/__tests__/urls-test.ts @@ -74,7 +74,7 @@ describe('#getHostUrl', () => { it('should return host url on client side', () => { jest.mock('../init', () => ({ getUrlContext: () => '', - IS_SSR: false, + IS_SSR: false })); const mockedUrls = require('../urls'); expect(mockedUrls.getHostUrl()).toBe('http://localhost'); @@ -82,7 +82,7 @@ describe('#getHostUrl', () => { it('should throw on server-side', () => { jest.mock('../init', () => ({ getUrlContext: () => '', - IS_SSR: true, + IS_SSR: true })); const mockedUrls = require('../urls'); expect(mockedUrls.getHostUrl).toThrowErrorMatchingInlineSnapshot( diff --git a/server/sonar-ui-common/helpers/colors.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/colors.ts index 839586b4e20..839586b4e20 100644 --- a/server/sonar-ui-common/helpers/colors.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/colors.ts diff --git a/server/sonar-ui-common/helpers/cookies.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/cookies.ts index 6c060726711..d717044f4b0 100644 --- a/server/sonar-ui-common/helpers/cookies.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/cookies.ts @@ -23,7 +23,7 @@ const parseCookies = memoize( (documentCookie: string): T.Dict<string> => { const rawCookies = documentCookie.split('; '); const cookies: T.Dict<string> = {}; - rawCookies.forEach((candidate) => { + rawCookies.forEach(candidate => { const [key, value] = candidate.split('='); cookies[key] = value; }); diff --git a/server/sonar-ui-common/helpers/csv.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/csv.ts index d162d018f3c..d162d018f3c 100644 --- a/server/sonar-ui-common/helpers/csv.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/csv.ts diff --git a/server/sonar-ui-common/helpers/dates.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/dates.ts index daa25a7b603..daa25a7b603 100644 --- a/server/sonar-ui-common/helpers/dates.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/dates.ts diff --git a/server/sonar-ui-common/helpers/getHistory.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/getHistory.ts index f7162fd06e4..ea76f47a724 100644 --- a/server/sonar-ui-common/helpers/getHistory.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/getHistory.ts @@ -26,7 +26,7 @@ let history: History; function ensureHistory() { // eslint-disable-next-line react-hooks/rules-of-hooks history = useRouterHistory(createHistory)({ - basename: getUrlContext(), + basename: getUrlContext() }); return history; } diff --git a/server/sonar-ui-common/helpers/handleRequiredAuthentication.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/handleRequiredAuthentication.ts index 061cde8c09a..061cde8c09a 100644 --- a/server/sonar-ui-common/helpers/handleRequiredAuthentication.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/handleRequiredAuthentication.ts diff --git a/server/sonar-ui-common/helpers/init.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/init.ts index 7d2dceaccfd..fd9ab571dd6 100644 --- a/server/sonar-ui-common/helpers/init.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/init.ts @@ -17,9 +17,9 @@ * along with this program; if not, write to the Free Software Foundation, * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -import type { Messages } from './l10n'; +import { Messages } from './l10n'; -let urlContext: string; // Is the base path (web context) in SQ +let urlContext: string | undefined; // Is the base path (web context) in SQ let messages: Messages | undefined; let locale: string | undefined; let reactDomContainerSelector: string | undefined; // CSS selector of the DOM node where the React App is attached @@ -28,12 +28,12 @@ export const IS_SSR = typeof window === 'undefined'; export const DEFAULT_LOCALE = 'en'; export const DEFAULT_MESSAGES = { // eslint-disable-next-line camelcase - default_error_message: 'The request cannot be processed. Try again later.', + default_error_message: 'The request cannot be processed. Try again later.' }; const LOGGER_PREFIX = 'sonar-ui-common init:'; export default { - setUrlContext(newUrlContext: string) { + setUrlContext(newUrlContext?: string) { urlContext = newUrlContext; return this; }, @@ -41,14 +41,14 @@ export default { locale = newLocale; return this; }, - setMessages(newMessages: Messages) { + setMessages(newMessages?: Messages) { messages = newMessages; return this; }, setReactDomContainer(nodeSelector: string) { reactDomContainerSelector = nodeSelector; return this; - }, + } }; export function getMessages() { diff --git a/server/sonar-ui-common/helpers/keycodes.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/keycodes.ts index 2dad00a7fc0..c57d397ae89 100644 --- a/server/sonar-ui-common/helpers/keycodes.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/keycodes.ts @@ -64,5 +64,5 @@ export enum KeyCodes { W = 87, X = 88, Y = 89, - Z = 90, + Z = 90 } diff --git a/server/sonar-ui-common/helpers/l10n.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/l10n.ts index 818726ca8b1..7758fa52d36 100644 --- a/server/sonar-ui-common/helpers/l10n.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/l10n.ts @@ -38,15 +38,14 @@ export function translateWithParameters( const message = getMessages()[messageKey]; if (message) { return parameters - .map((parameter) => String(parameter)) + .map(parameter => String(parameter)) .reduce((acc, parameter, index) => acc.replace(`{${index}}`, () => parameter), message); - } else { - if (process.env.NODE_ENV === 'development') { - // eslint-disable-next-line no-console - console.error(`No message for: ${messageKey}`); - } - return `${messageKey}.${parameters.join('.')}`; } + if (process.env.NODE_ENV === 'development') { + // eslint-disable-next-line no-console + console.error(`No message for: ${messageKey}`); + } + return `${messageKey}.${parameters.join('.')}`; } export function hasMessage(...keys: string[]): boolean { @@ -63,9 +62,8 @@ export function getLocalizedMetricName( return translate(bundleKey); } else if (short) { return getLocalizedMetricName(metric); - } else { - return metric.name || metric.key; } + return metric.name || metric.key; } export function getLocalizedCategoryMetricName(metric: { key: string; name?: string }) { @@ -95,7 +93,7 @@ export function getShortMonthName(index: number) { 'Sep', 'Oct', 'Nov', - 'Dec', + 'Dec' ]; return translate(months[index]); } diff --git a/server/sonar-ui-common/helpers/measures.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/measures.ts index 53715b40731..80e46bd1239 100644 --- a/server/sonar-ui-common/helpers/measures.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/measures.ts @@ -75,9 +75,8 @@ export function getMinDecimalsCountToBeDistinctFromThreshold( const delta = Math.abs(threshold - value); if (delta < 0.1 && delta > 0) { return -Math.floor(Math.log10(delta)); - } else { - return DEFAULT_DECIMALS; } + return DEFAULT_DECIMALS; } function useFormatter( @@ -98,7 +97,7 @@ function getFormatter(type: string): Formatter { SHORT_WORK_DUR: shortDurationFormatter, RATING: ratingFormatter, LEVEL: levelFormatter, - MILLISEC: millisecondsFormatter, + MILLISEC: millisecondsFormatter }; return FORMATTERS[type] || noFormatter; } @@ -110,7 +109,7 @@ function numberFormatter( ) { const { format } = new Intl.NumberFormat(getCurrentLocale(), { minimumFractionDigits, - maximumFractionDigits, + maximumFractionDigits }); if (typeof value === 'string') { return format(parseFloat(value)); @@ -132,7 +131,7 @@ const shortIntFormats = [ { unit: 1e7, formatUnit: 1e6, fraction: 0, suffix: 'short_number_suffix.m' }, { unit: 1e6, formatUnit: 1e6, fraction: 1, suffix: 'short_number_suffix.m' }, { unit: 1e4, formatUnit: 1e3, fraction: 0, suffix: 'short_number_suffix.k' }, - { unit: 1e3, formatUnit: 1e3, fraction: 1, suffix: 'short_number_suffix.k' }, + { unit: 1e3, formatUnit: 1e3, fraction: 1, suffix: 'short_number_suffix.k' } ]; function shortIntFormatter( @@ -191,9 +190,8 @@ function percentFormatter( // - omitExtraDecimalZeros: false, value: 85 => 85.000 // - omitExtraDecimalZeros: true, value: 85 => 85.0 return `${numberFormatter(value, 1, decimals)}%`; - } else { - return `${numberFormatter(value, decimals || 1)}%`; } + return `${numberFormatter(value, decimals || 1)}%`; } function ratingFormatter(value: string | number): string { @@ -226,9 +224,8 @@ function millisecondsFormatter(value: string | number): string { } else if (value >= ONE_SECOND) { const seconds = Math.round(value / ONE_SECOND); return `${seconds}s`; - } else { - return `${value}ms`; } + return `${value}ms`; } /* diff --git a/server/sonar-ui-common/helpers/pages.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/pages.ts index 40c686e43fa..40c686e43fa 100644 --- a/server/sonar-ui-common/helpers/pages.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/pages.ts diff --git a/server/sonar-ui-common/helpers/path.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/path.ts index 2a124bf1a63..cf42d393aaf 100644 --- a/server/sonar-ui-common/helpers/path.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/path.ts @@ -64,12 +64,10 @@ export function collapsedDirFromPath(path: string | null): string | null { } const body = [head, ...(cut ? ['...'] : []), ...middle, tail]; return body.join('/') + '/'; - } else { - return tokens.join('/') + '/'; } - } else { - return null; + return tokens.join('/') + '/'; } + return null; } /** @@ -82,30 +80,28 @@ export function fileFromPath(path: string | null): string | null { if (typeof path === 'string') { const tokens = path.split('/'); return tokens[tokens.length - 1]; - } else { - return null; } + return null; } export function splitPath(path: string) { const tokens = path.split('/'); return { head: tokens.slice(0, -1).join('/'), - tail: tokens[tokens.length - 1], + tail: tokens[tokens.length - 1] }; } export function cutLongWords(str: string, limit = 30) { return str .split(' ') - .map((word) => (word.length > limit ? word.substr(0, limit) + '...' : word)) + .map(word => (word.length > limit ? word.substr(0, limit) + '...' : word)) .join(' '); } export function limitComponentName(str: string, limit = 30): string { if (typeof str === 'string') { return str.length > limit ? str.substr(0, limit) + '...' : str; - } else { - return ''; } + return ''; } diff --git a/server/sonar-ui-common/helpers/query.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/query.ts index 479b84dda37..bc5fa4dd6d2 100644 --- a/server/sonar-ui-common/helpers/query.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/query.ts @@ -28,7 +28,7 @@ export function queriesEqual(a: T.RawQuery, b: T.RawQuery): boolean { return false; } - return keysA.every((key) => isEqual(a[key], b[key])); + return keysA.every(key => isEqual(a[key], b[key])); } export function cleanQuery(query: T.RawQuery): T.RawQuery { @@ -50,9 +50,8 @@ export function parseAsOptionalBoolean(value: string | undefined): boolean | und return true; } else if (value === 'false') { return false; - } else { - return undefined; } + return undefined; } export function parseAsDate(value?: string): Date | undefined { @@ -108,7 +107,6 @@ export function serializeOptionalBoolean(value: boolean | undefined): string | u return 'true'; } else if (value === false) { return 'false'; - } else { - return undefined; } + return undefined; } diff --git a/server/sonar-ui-common/helpers/ratings.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/ratings.ts index 6470ce2c0bf..6470ce2c0bf 100644 --- a/server/sonar-ui-common/helpers/ratings.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/ratings.ts diff --git a/server/sonar-ui-common/helpers/request.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/request.ts index 6cf106ba815..e3ede0d9843 100644 --- a/server/sonar-ui-common/helpers/request.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/request.ts @@ -60,14 +60,14 @@ const DEFAULT_OPTIONS: { method: string; } = { credentials: 'same-origin', - method: 'GET', + method: 'GET' }; /** * Default request headers */ const DEFAULT_HEADERS = { - Accept: 'application/json', + Accept: 'application/json' }; /** @@ -77,6 +77,7 @@ class Request { private data?: RequestData; private isJSON = false; + // eslint-disable-next-line no-useless-constructor constructor(private readonly url: string, private readonly options: { method?: string } = {}) {} getSubmitData(customHeaders: any = {}): { url: string; options: RequestInit } { @@ -102,7 +103,7 @@ class Request { options.headers = { ...DEFAULT_HEADERS, - ...customHeaders, + ...customHeaders }; return { url, options }; } @@ -139,7 +140,7 @@ export function request(url: string): Request { export function corsRequest(url: string, mode: RequestMode = 'cors'): Request { const options: RequestInit = { mode }; const request = new Request(url, options); - request.submit = function () { + request.submit = function() { const { url, options } = this.getSubmitData(); return window.fetch(url, options); }; @@ -153,7 +154,7 @@ export function checkStatus(response: Response, bypassRedirect?: boolean): Promi return new Promise((resolve, reject) => { if (response.status === HttpStatus.Unauthorized && !bypassRedirect) { import('./handleRequiredAuthentication') - .then((i) => i.default()) + .then(i => i.default()) .then(reject, reject); } else if (isSuccessStatus(response.status)) { resolve(response); @@ -194,7 +195,7 @@ export function get(url: string, data?: RequestData, bypassRedirect?: boolean): return request(url) .setData(data) .submit() - .then((response) => checkStatus(response, bypassRedirect)); + .then(response => checkStatus(response, bypassRedirect)); } /** @@ -222,12 +223,11 @@ export function getCorsJSON(url: string, data?: RequestData): Promise<any> { return corsRequest(url) .setData(data) .submit() - .then((response) => { + .then(response => { if (isSuccessStatus(response.status)) { return parseJSON(response); - } else { - return Promise.reject(response); } + return Promise.reject(response); }); } @@ -239,7 +239,7 @@ export function postJSON(url: string, data?: RequestData, bypassRedirect?: boole .setMethod('POST') .setData(data) .submit() - .then((response) => checkStatus(response, bypassRedirect)) + .then(response => checkStatus(response, bypassRedirect)) .then(parseJSON); } @@ -255,7 +255,7 @@ export function postJSONBody( .setMethod('POST') .setData(data, true) .submit() - .then((response) => checkStatus(response, bypassRedirect)) + .then(response => checkStatus(response, bypassRedirect)) .then(parseJSON); } @@ -268,7 +268,7 @@ export function post(url: string, data?: RequestData, bypassRedirect?: boolean): .setMethod('POST') .setData(data) .submit() - .then((response) => checkStatus(response, bypassRedirect)) + .then(response => checkStatus(response, bypassRedirect)) .then(() => resolve(), reject); }); } @@ -282,7 +282,7 @@ function tryRequestAgain<T>( ) { tries.max--; if (tries.max !== 0) { - return new Promise<T>((resolve) => { + return new Promise<T>(resolve => { setTimeout( () => resolve(requestTryAndRepeatUntil(repeatAPICall, tries, stopRepeat, repeatErrors)), tries.max > tries.slowThreshold ? 500 : 3000 @@ -299,7 +299,7 @@ export function requestTryAndRepeatUntil<T>( repeatErrors: number[] = [] ) { return repeatAPICall().then( - (r) => { + r => { if (stopRepeat(r)) { return r; } @@ -333,5 +333,5 @@ export enum HttpStatus { NotImplemented = 501, BadGateway = 502, ServiceUnavailable = 503, - GatewayTimeout = 504, + GatewayTimeout = 504 } diff --git a/server/sonar-ui-common/helpers/scrolling.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/scrolling.ts index 49473f88cea..9fe5cbe92ae 100644 --- a/server/sonar-ui-common/helpers/scrolling.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/scrolling.ts @@ -50,7 +50,7 @@ function smoothScroll( const step = Math.ceil(Math.abs(target - current) / SCROLLING_STEPS); let stepsDone = 0; - return new Promise((resolve) => { + return new Promise(resolve => { const interval = setInterval(() => { if (current === target || SCROLLING_STEPS === stepsDone) { clearInterval(interval); @@ -72,12 +72,12 @@ function smoothScroll( function smoothScrollTop(parent: Element | Window, position: number) { const scroll = getScroll(parent); - return smoothScroll(position, scroll.y, (position) => scrollElement(parent, scroll.x, position)); + return smoothScroll(position, scroll.y, position => scrollElement(parent, scroll.x, position)); } function smoothScrollLeft(parent: Element | Window, position: number) { const scroll = getScroll(parent); - return smoothScroll(position, scroll.x, (position) => scrollElement(parent, position, scroll.y)); + return smoothScroll(position, scroll.x, position => scrollElement(parent, position, scroll.y)); } export function scrollToElement( @@ -188,7 +188,9 @@ function processQueue() { if (queue.length > 0) { queueRunning = true; const { fn, element, x, y } = queue.shift()!; - fn(element, x, y).then(processQueue).catch(processQueue); + fn(element, x, y) + .then(processQueue) + .catch(processQueue); } else { queueRunning = false; } diff --git a/server/sonar-ui-common/helpers/search.tsx b/server/sonar-web/src/main/js/sonar-ui-common/helpers/search.tsx index c12152d33c2..c12152d33c2 100644 --- a/server/sonar-ui-common/helpers/search.tsx +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/search.tsx diff --git a/server/sonar-ui-common/helpers/storage.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/storage.ts index c2a16726b87..c2a16726b87 100644 --- a/server/sonar-ui-common/helpers/storage.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/storage.ts diff --git a/server/sonar-ui-common/helpers/strings.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/strings.ts index 391bcdb334e..7b701a7f7bd 100644 --- a/server/sonar-ui-common/helpers/strings.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/strings.ts @@ -25,377 +25,377 @@ const defaultDiacriticsRemovalap = [ { base: 'A', letters: - '\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F', + '\u0041\u24B6\uFF21\u00C0\u00C1\u00C2\u1EA6\u1EA4\u1EAA\u1EA8\u00C3\u0100\u0102\u1EB0\u1EAE\u1EB4\u1EB2\u0226\u01E0\u00C4\u01DE\u1EA2\u00C5\u01FA\u01CD\u0200\u0202\u1EA0\u1EAC\u1EB6\u1E00\u0104\u023A\u2C6F' }, { base: 'AA', - letters: '\uA732', + letters: '\uA732' }, { base: 'AE', - letters: '\u00C6\u01FC\u01E2', + letters: '\u00C6\u01FC\u01E2' }, { base: 'AO', - letters: '\uA734', + letters: '\uA734' }, { base: 'AU', - letters: '\uA736', + letters: '\uA736' }, { base: 'AV', - letters: '\uA738\uA73A', + letters: '\uA738\uA73A' }, { base: 'AY', - letters: '\uA73C', + letters: '\uA73C' }, { base: 'B', - letters: '\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181', + letters: '\u0042\u24B7\uFF22\u1E02\u1E04\u1E06\u0243\u0182\u0181' }, { base: 'C', - letters: '\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E', + letters: '\u0043\u24B8\uFF23\u0106\u0108\u010A\u010C\u00C7\u1E08\u0187\u023B\uA73E' }, { base: 'D', - letters: '\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779', + letters: '\u0044\u24B9\uFF24\u1E0A\u010E\u1E0C\u1E10\u1E12\u1E0E\u0110\u018B\u018A\u0189\uA779' }, { base: 'DZ', - letters: '\u01F1\u01C4', + letters: '\u01F1\u01C4' }, { base: 'Dz', - letters: '\u01F2\u01C5', + letters: '\u01F2\u01C5' }, { base: 'E', letters: - '\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E', + '\u0045\u24BA\uFF25\u00C8\u00C9\u00CA\u1EC0\u1EBE\u1EC4\u1EC2\u1EBC\u0112\u1E14\u1E16\u0114\u0116\u00CB\u1EBA\u011A\u0204\u0206\u1EB8\u1EC6\u0228\u1E1C\u0118\u1E18\u1E1A\u0190\u018E' }, { base: 'F', - letters: '\u0046\u24BB\uFF26\u1E1E\u0191\uA77B', + letters: '\u0046\u24BB\uFF26\u1E1E\u0191\uA77B' }, { base: 'G', letters: - '\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E', + '\u0047\u24BC\uFF27\u01F4\u011C\u1E20\u011E\u0120\u01E6\u0122\u01E4\u0193\uA7A0\uA77D\uA77E' }, { base: 'H', - letters: '\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D', + letters: '\u0048\u24BD\uFF28\u0124\u1E22\u1E26\u021E\u1E24\u1E28\u1E2A\u0126\u2C67\u2C75\uA78D' }, { base: 'I', letters: - '\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197', + '\u0049\u24BE\uFF29\u00CC\u00CD\u00CE\u0128\u012A\u012C\u0130\u00CF\u1E2E\u1EC8\u01CF\u0208\u020A\u1ECA\u012E\u1E2C\u0197' }, { base: 'J', - letters: '\u004A\u24BF\uFF2A\u0134\u0248', + letters: '\u004A\u24BF\uFF2A\u0134\u0248' }, { base: 'K', - letters: '\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2', + letters: '\u004B\u24C0\uFF2B\u1E30\u01E8\u1E32\u0136\u1E34\u0198\u2C69\uA740\uA742\uA744\uA7A2' }, { base: 'L', letters: - '\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780', + '\u004C\u24C1\uFF2C\u013F\u0139\u013D\u1E36\u1E38\u013B\u1E3C\u1E3A\u0141\u023D\u2C62\u2C60\uA748\uA746\uA780' }, { base: 'LJ', - letters: '\u01C7', + letters: '\u01C7' }, { base: 'Lj', - letters: '\u01C8', + letters: '\u01C8' }, { base: 'M', - letters: '\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C', + letters: '\u004D\u24C2\uFF2D\u1E3E\u1E40\u1E42\u2C6E\u019C' }, { base: 'N', letters: - '\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4', + '\u004E\u24C3\uFF2E\u01F8\u0143\u00D1\u1E44\u0147\u1E46\u0145\u1E4A\u1E48\u0220\u019D\uA790\uA7A4' }, { base: 'NJ', - letters: '\u01CA', + letters: '\u01CA' }, { base: 'Nj', - letters: '\u01CB', + letters: '\u01CB' }, { base: 'O', letters: - '\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C', + '\u004F\u24C4\uFF2F\u00D2\u00D3\u00D4\u1ED2\u1ED0\u1ED6\u1ED4\u00D5\u1E4C\u022C\u1E4E\u014C\u1E50\u1E52\u014E\u022E\u0230\u00D6\u022A\u1ECE\u0150\u01D1\u020C\u020E\u01A0\u1EDC\u1EDA\u1EE0\u1EDE\u1EE2\u1ECC\u1ED8\u01EA\u01EC\u00D8\u01FE\u0186\u019F\uA74A\uA74C' }, { base: 'OI', - letters: '\u01A2', + letters: '\u01A2' }, { base: 'OO', - letters: '\uA74E', + letters: '\uA74E' }, { base: 'OU', - letters: '\u0222', + letters: '\u0222' }, { base: 'OE', - letters: '\u008C\u0152', + letters: '\u008C\u0152' }, { base: 'oe', - letters: '\u009C\u0153', + letters: '\u009C\u0153' }, { base: 'P', - letters: '\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754', + letters: '\u0050\u24C5\uFF30\u1E54\u1E56\u01A4\u2C63\uA750\uA752\uA754' }, { base: 'Q', - letters: '\u0051\u24C6\uFF31\uA756\uA758\u024A', + letters: '\u0051\u24C6\uFF31\uA756\uA758\u024A' }, { base: 'R', letters: - '\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782', + '\u0052\u24C7\uFF32\u0154\u1E58\u0158\u0210\u0212\u1E5A\u1E5C\u0156\u1E5E\u024C\u2C64\uA75A\uA7A6\uA782' }, { base: 'S', letters: - '\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784', + '\u0053\u24C8\uFF33\u1E9E\u015A\u1E64\u015C\u1E60\u0160\u1E66\u1E62\u1E68\u0218\u015E\u2C7E\uA7A8\uA784' }, { base: 'T', letters: - '\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786', + '\u0054\u24C9\uFF34\u1E6A\u0164\u1E6C\u021A\u0162\u1E70\u1E6E\u0166\u01AC\u01AE\u023E\uA786' }, { base: 'TZ', - letters: '\uA728', + letters: '\uA728' }, { base: 'U', letters: - '\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244', + '\u0055\u24CA\uFF35\u00D9\u00DA\u00DB\u0168\u1E78\u016A\u1E7A\u016C\u00DC\u01DB\u01D7\u01D5\u01D9\u1EE6\u016E\u0170\u01D3\u0214\u0216\u01AF\u1EEA\u1EE8\u1EEE\u1EEC\u1EF0\u1EE4\u1E72\u0172\u1E76\u1E74\u0244' }, { base: 'V', - letters: '\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245', + letters: '\u0056\u24CB\uFF36\u1E7C\u1E7E\u01B2\uA75E\u0245' }, { base: 'VY', - letters: '\uA760', + letters: '\uA760' }, { base: 'W', - letters: '\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72', + letters: '\u0057\u24CC\uFF37\u1E80\u1E82\u0174\u1E86\u1E84\u1E88\u2C72' }, { base: 'X', - letters: '\u0058\u24CD\uFF38\u1E8A\u1E8C', + letters: '\u0058\u24CD\uFF38\u1E8A\u1E8C' }, { base: 'Y', letters: - '\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE', + '\u0059\u24CE\uFF39\u1EF2\u00DD\u0176\u1EF8\u0232\u1E8E\u0178\u1EF6\u1EF4\u01B3\u024E\u1EFE' }, { base: 'Z', - letters: '\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762', + letters: '\u005A\u24CF\uFF3A\u0179\u1E90\u017B\u017D\u1E92\u1E94\u01B5\u0224\u2C7F\u2C6B\uA762' }, { base: 'a', letters: - '\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250', + '\u0061\u24D0\uFF41\u1E9A\u00E0\u00E1\u00E2\u1EA7\u1EA5\u1EAB\u1EA9\u00E3\u0101\u0103\u1EB1\u1EAF\u1EB5\u1EB3\u0227\u01E1\u00E4\u01DF\u1EA3\u00E5\u01FB\u01CE\u0201\u0203\u1EA1\u1EAD\u1EB7\u1E01\u0105\u2C65\u0250' }, { base: 'aa', - letters: '\uA733', + letters: '\uA733' }, { base: 'ae', - letters: '\u00E6\u01FD\u01E3', + letters: '\u00E6\u01FD\u01E3' }, { base: 'ao', - letters: '\uA735', + letters: '\uA735' }, { base: 'au', - letters: '\uA737', + letters: '\uA737' }, { base: 'av', - letters: '\uA739\uA73B', + letters: '\uA739\uA73B' }, { base: 'ay', - letters: '\uA73D', + letters: '\uA73D' }, { base: 'b', - letters: '\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253', + letters: '\u0062\u24D1\uFF42\u1E03\u1E05\u1E07\u0180\u0183\u0253' }, { base: 'c', - letters: '\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184', + letters: '\u0063\u24D2\uFF43\u0107\u0109\u010B\u010D\u00E7\u1E09\u0188\u023C\uA73F\u2184' }, { base: 'd', - letters: '\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A', + letters: '\u0064\u24D3\uFF44\u1E0B\u010F\u1E0D\u1E11\u1E13\u1E0F\u0111\u018C\u0256\u0257\uA77A' }, { base: 'dz', - letters: '\u01F3\u01C6', + letters: '\u01F3\u01C6' }, { base: 'e', letters: - '\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD', + '\u0065\u24D4\uFF45\u00E8\u00E9\u00EA\u1EC1\u1EBF\u1EC5\u1EC3\u1EBD\u0113\u1E15\u1E17\u0115\u0117\u00EB\u1EBB\u011B\u0205\u0207\u1EB9\u1EC7\u0229\u1E1D\u0119\u1E19\u1E1B\u0247\u025B\u01DD' }, { base: 'f', - letters: '\u0066\u24D5\uFF46\u1E1F\u0192\uA77C', + letters: '\u0066\u24D5\uFF46\u1E1F\u0192\uA77C' }, { base: 'g', letters: - '\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F', + '\u0067\u24D6\uFF47\u01F5\u011D\u1E21\u011F\u0121\u01E7\u0123\u01E5\u0260\uA7A1\u1D79\uA77F' }, { base: 'h', letters: - '\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265', + '\u0068\u24D7\uFF48\u0125\u1E23\u1E27\u021F\u1E25\u1E29\u1E2B\u1E96\u0127\u2C68\u2C76\u0265' }, { base: 'hv', - letters: '\u0195', + letters: '\u0195' }, { base: 'i', letters: - '\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131', + '\u0069\u24D8\uFF49\u00EC\u00ED\u00EE\u0129\u012B\u012D\u00EF\u1E2F\u1EC9\u01D0\u0209\u020B\u1ECB\u012F\u1E2D\u0268\u0131' }, { base: 'j', - letters: '\u006A\u24D9\uFF4A\u0135\u01F0\u0249', + letters: '\u006A\u24D9\uFF4A\u0135\u01F0\u0249' }, { base: 'k', - letters: '\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3', + letters: '\u006B\u24DA\uFF4B\u1E31\u01E9\u1E33\u0137\u1E35\u0199\u2C6A\uA741\uA743\uA745\uA7A3' }, { base: 'l', letters: - '\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747', + '\u006C\u24DB\uFF4C\u0140\u013A\u013E\u1E37\u1E39\u013C\u1E3D\u1E3B\u017F\u0142\u019A\u026B\u2C61\uA749\uA781\uA747' }, { base: 'lj', - letters: '\u01C9', + letters: '\u01C9' }, { base: 'm', - letters: '\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F', + letters: '\u006D\u24DC\uFF4D\u1E3F\u1E41\u1E43\u0271\u026F' }, { base: 'n', letters: - '\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5', + '\u006E\u24DD\uFF4E\u01F9\u0144\u00F1\u1E45\u0148\u1E47\u0146\u1E4B\u1E49\u019E\u0272\u0149\uA791\uA7A5' }, { base: 'nj', - letters: '\u01CC', + letters: '\u01CC' }, { base: 'o', letters: - '\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275', + '\u006F\u24DE\uFF4F\u00F2\u00F3\u00F4\u1ED3\u1ED1\u1ED7\u1ED5\u00F5\u1E4D\u022D\u1E4F\u014D\u1E51\u1E53\u014F\u022F\u0231\u00F6\u022B\u1ECF\u0151\u01D2\u020D\u020F\u01A1\u1EDD\u1EDB\u1EE1\u1EDF\u1EE3\u1ECD\u1ED9\u01EB\u01ED\u00F8\u01FF\u0254\uA74B\uA74D\u0275' }, { base: 'oi', - letters: '\u01A3', + letters: '\u01A3' }, { base: 'ou', - letters: '\u0223', + letters: '\u0223' }, { base: 'oo', - letters: '\uA74F', + letters: '\uA74F' }, { base: 'p', - letters: '\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755', + letters: '\u0070\u24DF\uFF50\u1E55\u1E57\u01A5\u1D7D\uA751\uA753\uA755' }, { base: 'q', - letters: '\u0071\u24E0\uFF51\u024B\uA757\uA759', + letters: '\u0071\u24E0\uFF51\u024B\uA757\uA759' }, { base: 'r', letters: - '\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783', + '\u0072\u24E1\uFF52\u0155\u1E59\u0159\u0211\u0213\u1E5B\u1E5D\u0157\u1E5F\u024D\u027D\uA75B\uA7A7\uA783' }, { base: 's', letters: - '\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B', + '\u0073\u24E2\uFF53\u00DF\u015B\u1E65\u015D\u1E61\u0161\u1E67\u1E63\u1E69\u0219\u015F\u023F\uA7A9\uA785\u1E9B' }, { base: 't', letters: - '\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787', + '\u0074\u24E3\uFF54\u1E6B\u1E97\u0165\u1E6D\u021B\u0163\u1E71\u1E6F\u0167\u01AD\u0288\u2C66\uA787' }, { base: 'tz', - letters: '\uA729', + letters: '\uA729' }, { base: 'u', letters: - '\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289', + '\u0075\u24E4\uFF55\u00F9\u00FA\u00FB\u0169\u1E79\u016B\u1E7B\u016D\u00FC\u01DC\u01D8\u01D6\u01DA\u1EE7\u016F\u0171\u01D4\u0215\u0217\u01B0\u1EEB\u1EE9\u1EEF\u1EED\u1EF1\u1EE5\u1E73\u0173\u1E77\u1E75\u0289' }, { base: 'v', - letters: '\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C', + letters: '\u0076\u24E5\uFF56\u1E7D\u1E7F\u028B\uA75F\u028C' }, { base: 'vy', - letters: '\uA761', + letters: '\uA761' }, { base: 'w', - letters: '\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73', + letters: '\u0077\u24E6\uFF57\u1E81\u1E83\u0175\u1E87\u1E85\u1E98\u1E89\u2C73' }, { base: 'x', - letters: '\u0078\u24E7\uFF58\u1E8B\u1E8D', + letters: '\u0078\u24E7\uFF58\u1E8B\u1E8D' }, { base: 'y', letters: - '\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF', + '\u0079\u24E8\uFF59\u1EF3\u00FD\u0177\u1EF9\u0233\u1E8F\u00FF\u1EF7\u1E99\u1EF5\u01B4\u024F\u1EFF' }, { base: 'z', - letters: '\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763', - }, + letters: '\u007A\u24E9\uFF5A\u017A\u1E91\u017C\u017E\u1E93\u1E95\u01B6\u0225\u0240\u2C6C\uA763' + } ]; const diacriticsMap: T.Dict<string> = {}; -defaultDiacriticsRemovalap.forEach((defaultDiacritic) => - defaultDiacritic.letters.split('').forEach((letter) => { +defaultDiacriticsRemovalap.forEach(defaultDiacritic => + defaultDiacritic.letters.split('').forEach(letter => { diacriticsMap[letter] = defaultDiacritic.base; }) ); @@ -403,7 +403,7 @@ defaultDiacriticsRemovalap.forEach((defaultDiacritic) => // "what?" version ... http://jsperf.com/diacritics/12 export function latinize(str: string): string { // eslint-disable-next-line no-control-regex - return str.replace(/[^\u0000-\u007E]/g, (a) => diacriticsMap[a] || a); + return str.replace(/[^\u0000-\u007E]/g, a => diacriticsMap[a] || a); } // Inspired from https://github.com/SonarSource/sonar-enterprise/blob/master/sonar-core/src/main/java/org/sonar/core/util/Slug.java diff --git a/server/sonar-ui-common/helpers/testUtils.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/testUtils.ts index 9ca54c122a0..9a7b019eef1 100644 --- a/server/sonar-ui-common/helpers/testUtils.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/testUtils.ts @@ -25,7 +25,7 @@ export function mockEvent(overrides = {}) { currentTarget: { blur() {} }, preventDefault() {}, stopPropagation() {}, - ...overrides, + ...overrides } as any; } @@ -48,7 +48,7 @@ export function clickOutside(event = {}): void { export function submit(element: ShallowWrapper | ReactWrapper): void { element.simulate('submit', { - preventDefault() {}, + preventDefault() {} }); } @@ -63,7 +63,7 @@ export function change(element: ShallowWrapper | ReactWrapper, value: string, ev element.simulate('change', { target: { value }, currentTarget: { value }, - ...event, + ...event }); } } @@ -73,7 +73,7 @@ export const KEYCODE_MAP: { [keycode: number]: string } = { 37: 'left', 38: 'up', 39: 'right', - 40: 'down', + 40: 'down' }; export function keydown(key: number | string): void { @@ -98,7 +98,7 @@ export function elementKeydown(element: ShallowWrapper, keyCode: number): void { const event = { currentTarget: { element }, keyCode, - preventDefault() {}, + preventDefault() {} }; if (typeof element.type() === 'string') { @@ -116,13 +116,13 @@ export function resizeWindowTo(width?: number, height?: number) { if (width) { Object.defineProperty(document.documentElement, 'clientWidth', { configurable: true, - value: width, + value: width }); } if (height) { Object.defineProperty(document.documentElement, 'clientHeight', { configurable: true, - value: height, + value: height }); } @@ -141,13 +141,13 @@ export function setNodeRect({ width = 50, height = 50, left = 0, top = 0 }) { const { findDOMNode } = require('react-dom'); const element = document.createElement('div'); Object.defineProperty(element, 'getBoundingClientRect', { - value: () => ({ width, height, left, top }), + value: () => ({ width, height, left, top }) }); findDOMNode.mockReturnValue(element); } export function doAsync(fn?: Function): Promise<void> { - return new Promise((resolve) => { + return new Promise(resolve => { setImmediate(() => { if (fn) { fn(); diff --git a/server/sonar-ui-common/helpers/types.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/types.ts index 85ca9976b09..85ca9976b09 100644 --- a/server/sonar-ui-common/helpers/types.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/types.ts diff --git a/server/sonar-ui-common/helpers/urls.ts b/server/sonar-web/src/main/js/sonar-ui-common/helpers/urls.ts index 296091d7b3c..296091d7b3c 100644 --- a/server/sonar-ui-common/helpers/urls.ts +++ b/server/sonar-web/src/main/js/sonar-ui-common/helpers/urls.ts diff --git a/server/sonar-web/src/main/js/types/extension.ts b/server/sonar-web/src/main/js/types/extension.ts index 7ad50afb69e..57c9d181ae0 100644 --- a/server/sonar-web/src/main/js/types/extension.ts +++ b/server/sonar-web/src/main/js/types/extension.ts @@ -19,8 +19,8 @@ */ import { InjectedIntl } from 'react-intl'; import { Store as ReduxStore } from 'redux'; -import { Theme } from 'sonar-ui-common/components/theme'; import { Location, Router } from '../components/hoc/withRouter'; +import { Theme } from '../sonar-ui-common/components/theme'; import { Store } from '../store/rootReducer'; import { L10nBundle } from './l10n'; diff --git a/server/sonar-web/src/main/js/types/types.d.ts b/server/sonar-web/src/main/js/types/types.d.ts index f76fc328fc5..5f1b977765c 100644 --- a/server/sonar-web/src/main/js/types/types.d.ts +++ b/server/sonar-web/src/main/js/types/types.d.ts @@ -19,6 +19,8 @@ */ declare namespace T { // Type ordered alphabetically to prevent merge conflicts + export type Dict<T> = { [key: string]: T }; + export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>; export interface A11ySkipLink { key: string; @@ -108,6 +110,20 @@ declare namespace T { qualifier: string; } + export namespace Chart { + export interface Point { + x: Date; + y: number | string | undefined; + } + + export interface Serie { + data: Point[]; + name: string; + translatedName: string; + type: string; + } + } + export interface Component extends LightComponent { alm?: { key: string; url: string }; analysisDate?: string; @@ -382,6 +398,9 @@ declare namespace T { export interface IssuesByLine { [key: number]: Issue[]; } + + export type IssueType = 'BUG' | 'VULNERABILITY' | 'CODE_SMELL' | 'SECURITY_HOTSPOT'; + export interface Language { key: string; name: string; @@ -613,6 +632,8 @@ declare namespace T { name: string; } + export type RawQuery = T.Dict<any>; + export interface Rule { isTemplate?: boolean; key: string; |