From f8422ab807d32b342a69e1dbb17137a3985be891 Mon Sep 17 00:00:00 2001 From: Siegfried Ehret Date: Tue, 25 Jun 2019 09:11:21 +0200 Subject: Update configure analysis screen for GitHub on SonarCloud (#1728) --- server/sonar-docs/src/pages/sonarcloud/autoscan.md | 2 +- server/sonar-web/.eslintrc | 7 +- server/sonar-web/package.json | 27 +- .../sonarcloud/analysis/Waiting-for-analysis.svg | 1 + .../public/images/sonarcloud/analysis/galaxy.svg | 1 + .../public/images/sonarcloud/analysis/helmet.svg | 1 + .../public/images/sonarcloud/analysis/manual.svg | 1 + .../public/images/sonarcloud/analysis/rocket.svg | 1 + .../sonar-web/src/main/js/api/alm-integration.ts | 9 +- .../src/main/js/app/styles/components/columns.css | 4 + server/sonar-web/src/main/js/app/styles/style.css | 3 +- .../sonar-web/src/main/js/app/utils/getHistory.ts | 1 + .../__tests__/CreateProjectPageSonarCloud-test.tsx | 2 +- .../CreateProjectPageSonarCloud-test.tsx.snap | 2 +- .../src/main/js/apps/overview/components/App.tsx | 4 +- .../js/apps/overview/components/EmptyOverview.tsx | 28 +- .../overview/components/__tests__/App-test.tsx | 8 - .../main/js/apps/tutorials/__tests__/utils-test.ts | 44 + .../tutorials/analyzeProject/AnalyzeTutorial.tsx | 2 +- .../analyzeProject/AnalyzeTutorialSonarCloud.css | 119 + .../analyzeProject/AnalyzeTutorialSonarCloud.tsx | 364 ++ .../analyzeProject/AnalyzeTutorialSuggestion.tsx | 134 +- .../__tests__/AnalyzeTutorialSonarCloud-test.tsx | 177 + .../__tests__/AnalyzeTutorialSuggestion-test.tsx | 30 +- .../AnalyzeTutorialSonarCloud-test.tsx.snap | 207 + .../AnalyzeTutorialSuggestion-test.tsx.snap | 8 +- .../analyzeProject/__tests__/utils-test.tsx | 59 + .../configurations/AutoScanAlert.tsx | 71 + .../configurations/ConfigureWithAutoScan.tsx | 126 + .../configurations/ConfigureWithLocalScanner.tsx | 54 + .../configurations/ConfigureWithOtherCI.tsx | 54 + .../configurations/ConfigureWithTravis.tsx | 119 + .../__tests__/AutoScanAlert-test.tsx | 30 + .../__tests__/ConfigureOtherCI-test.tsx | 41 + .../__tests__/ConfigureWithAutoScan-test.tsx | 41 + .../__tests__/ConfigureWithLocalScanner-test.tsx | 41 + .../__tests__/ConfigureWithTravis-test.tsx | 71 + .../__snapshots__/AutoScanAlert-test.tsx.snap | 37 + .../__snapshots__/ConfigureOtherCI-test.tsx.snap | 53 + .../ConfigureWithAutoScan-test.tsx.snap | 40 + .../ConfigureWithLocalScanner-test.tsx.snap | 53 + .../ConfigureWithTravis-test.tsx.snap | 84 + .../steps/CreateSonarPropertiesStep.tsx | 93 + .../analyzeProject/steps/EditTokenModal.tsx | 235 + .../analyzeProject/steps/EditTravisYmlStep.tsx | 111 + .../analyzeProject/steps/EncryptYourTokenStep.tsx | 112 + .../__tests__/CreateSonarPropertiesStep-test.tsx | 39 + .../steps/__tests__/EditTokenModal-test.tsx | 132 + .../steps/__tests__/EditTravisYmlStep-test.tsx | 49 + .../steps/__tests__/EncryptYourTokenStep-test.tsx | 43 + .../CreateSonarPropertiesStep-test.tsx.snap | 27 + .../__snapshots__/EditTokenModal-test.tsx.snap | 56 + .../__snapshots__/EditTravisYmlStep-test.tsx.snap | 59 + .../EncryptYourTokenStep-test.tsx.snap | 13 + .../main/js/apps/tutorials/analyzeProject/utils.ts | 119 + .../tutorials/components/AnalyzeTutorialDone.tsx | 72 + .../apps/tutorials/components/BuildSystemForm.tsx | 39 + .../js/apps/tutorials/components/LanguageForm.tsx | 80 +- .../apps/tutorials/components/NewProjectForm.tsx | 2 +- .../tutorials/components/ProjectAnalysisStep.tsx | 12 +- .../ProjectAnalysisStepFromBuildTool.tsx | 148 + .../js/apps/tutorials/components/RenderOptions.tsx | 55 + .../src/main/js/apps/tutorials/components/Step.tsx | 4 +- .../js/apps/tutorials/components/TokenStep.tsx | 22 +- .../__tests__/AnalyzeTutorialDone-test.tsx | 26 + .../components/__tests__/BuildSystemForm-test.tsx | 28 + .../components/__tests__/LanguageForm-test.tsx | 62 - .../components/__tests__/NewProjectForm-test.tsx | 6 +- .../__tests__/ProjectAnalysisStep-test.tsx | 31 + .../ProjectAnalysisStepFromBuildTool-test.tsx | 69 + .../components/__tests__/TokenStep-test.tsx | 2 +- .../AnalyzeTutorialDone-test.tsx.snap | 64 + .../__snapshots__/BuildSystemForm-test.tsx.snap | 19 + .../__snapshots__/LanguageForm-test.tsx.snap | 565 +- .../__snapshots__/NewProjectForm-test.tsx.snap | 414 +- .../ProjectAnalysisStep-test.tsx.snap | 13 + .../ProjectAnalysisStepFromBuildTool-test.tsx.snap | 91 + .../components/commands/AnalysisCommand.tsx | 21 +- .../components/commands/AnalysisCommandCustom.tsx | 175 + .../components/commands/AnalysisCommandOtherCI.tsx | 174 + .../components/commands/AnalysisCommandTravis.tsx | 207 + .../tutorials/components/commands/ClangGCC.tsx | 2 +- .../components/commands/Custom/ClangGCCCustom.tsx | 132 + .../commands/Custom/JavaGradleCustom.tsx | 69 + .../components/commands/Custom/JavaMavenCustom.tsx | 130 + .../components/commands/Custom/OtherCustom.tsx | 96 + .../Custom/__tests__/ClangGCCCustom-test.tsx | 58 + .../Custom/__tests__/JavaGradleCustom-test.tsx | 67 + .../Custom/__tests__/JavaMavenCustom-test.tsx | 80 + .../commands/Custom/__tests__/OtherCustom-test.tsx | 43 + .../__snapshots__/ClangGCCCustom-test.tsx.snap | 85 + .../__snapshots__/JavaGradleCustom-test.tsx.snap | 68 + .../__snapshots__/JavaMavenCustom-test.tsx.snap | 83 + .../__snapshots__/OtherCustom-test.tsx.snap | 54 + .../apps/tutorials/components/commands/DotNet.tsx | 2 +- .../tutorials/components/commands/JavaGradle.tsx | 2 +- .../tutorials/components/commands/JavaMaven.tsx | 2 +- .../apps/tutorials/components/commands/Other.tsx | 2 +- .../commands/OtherCI/ClangGCCOtherCI.tsx | 108 + .../components/commands/OtherCI/OtherOtherCI.tsx | 110 + .../OtherCI/__tests__/ClangGCCOtherCI-test.tsx | 39 + .../OtherCI/__tests__/OtherOtherCI-test.tsx | 41 + .../__snapshots__/ClangGCCOtherCI-test.tsx.snap | 45 + .../__snapshots__/OtherOtherCI-test.tsx.snap | 67 + .../TravisSonarCloud/ClangGCCTravisSonarCloud.tsx | 57 + .../JavaGradleTravisSonarCloud.tsx | 115 + .../TravisSonarCloud/JavaMavenTravisSonarCloud.tsx | 80 + .../TravisSonarCloud/OtherTravisSonarCloud.tsx | 43 + .../__tests__/ClangGCCTravisSonarCloud-test.tsx | 37 + .../__tests__/JavaGradleTravisSonarCloud-test.tsx | 35 + .../__tests__/JavaMavenTravisSonarCloud-test.tsx | 35 + .../__tests__/OtherTravisSonarCloud-test.tsx | 36 + .../ClangGCCTravisSonarCloud-test.tsx.snap | 23 + .../JavaGradleTravisSonarCloud-test.tsx.snap | 89 + .../JavaMavenTravisSonarCloud-test.tsx.snap | 48 + .../OtherTravisSonarCloud-test.tsx.snap | 16 + .../components/commands/TravisSonarCloud/utils.tsx | 72 + .../__tests__/AnalysisCommandCustom-test.tsx | 131 + .../__tests__/AnalysisCommandOtherCI-test.tsx | 146 + .../__tests__/AnalysisCommandTravis-test.tsx | 123 + .../commands/__tests__/ClangGCC-test.tsx | 11 +- .../components/commands/__tests__/DotNet-test.tsx | 24 +- .../components/commands/__tests__/Other-test.tsx | 10 +- .../AnalysisCommandCustom-test.tsx.snap | 253 + .../AnalysisCommandOtherCI-test.tsx.snap | 231 + .../AnalysisCommandTravis-test.tsx.snap | 137 + .../__tests__/__snapshots__/ClangGCC-test.tsx.snap | 2 +- .../__tests__/__snapshots__/DotNet-test.tsx.snap | 61 +- .../__tests__/__snapshots__/Other-test.tsx.snap | 2 +- .../js/apps/tutorials/components/commands/utils.ts | 45 + .../apps/tutorials/onboarding/OnboardingModal.tsx | 4 +- .../apps/tutorials/onboarding/OnboardingPage.tsx | 2 +- .../onboarding/OrganizationsShortList.tsx | 2 +- .../onboarding/OrganizationsShortListItem.tsx | 2 +- .../sonar-web/src/main/js/apps/tutorials/utils.ts | 26 + .../src/main/js/components/common/CodeSnippet.css | 33 +- .../src/main/js/components/common/CodeSnippet.tsx | 20 +- .../__snapshots__/CodeSnippet-test.tsx.snap | 12 +- .../src/main/js/components/controls/BackButton.tsx | 2 +- .../js/components/controls/ClipboardButton.tsx | 2 +- .../__snapshots__/ClipboardButton-test.tsx.snap | 8 +- .../src/main/js/components/ui/buttons.tsx | 2 +- .../src/main/js/helpers/almIntegrations.ts | 8 +- server/sonar-web/src/main/js/helpers/measures.ts | 1 + server/sonar-web/yarn.lock | 6053 ++++++++++---------- .../main/resources/org/sonar/l10n/core.properties | 79 +- 146 files changed, 10944 insertions(+), 4209 deletions(-) create mode 100644 server/sonar-web/public/images/sonarcloud/analysis/Waiting-for-analysis.svg create mode 100644 server/sonar-web/public/images/sonarcloud/analysis/galaxy.svg create mode 100644 server/sonar-web/public/images/sonarcloud/analysis/helmet.svg create mode 100644 server/sonar-web/public/images/sonarcloud/analysis/manual.svg create mode 100644 server/sonar-web/public/images/sonarcloud/analysis/rocket.svg create mode 100644 server/sonar-web/src/main/js/apps/tutorials/__tests__/utils-test.ts create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSonarCloud.css create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSonarCloud.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorialSonarCloud-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorialSonarCloud-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/utils-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/AutoScanAlert.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithAutoScan.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithLocalScanner.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithOtherCI.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithTravis.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/AutoScanAlert-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureOtherCI-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithAutoScan-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithLocalScanner-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithTravis-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/AutoScanAlert-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureOtherCI-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithAutoScan-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithLocalScanner-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithTravis-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/CreateSonarPropertiesStep.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EditTokenModal.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EditTravisYmlStep.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EncryptYourTokenStep.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/CreateSonarPropertiesStep-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EditTokenModal-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EditTravisYmlStep-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EncryptYourTokenStep-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/CreateSonarPropertiesStep-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EditTokenModal-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EditTravisYmlStep-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EncryptYourTokenStep-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/analyzeProject/utils.ts create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/AnalyzeTutorialDone.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/BuildSystemForm.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/ProjectAnalysisStepFromBuildTool.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/RenderOptions.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/__tests__/AnalyzeTutorialDone-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/__tests__/BuildSystemForm-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/__tests__/ProjectAnalysisStep-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/__tests__/ProjectAnalysisStepFromBuildTool-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/AnalyzeTutorialDone-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/BuildSystemForm-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/ProjectAnalysisStep-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/ProjectAnalysisStepFromBuildTool-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandCustom.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandOtherCI.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandTravis.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/ClangGCCCustom.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/JavaGradleCustom.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/JavaMavenCustom.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/OtherCustom.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/ClangGCCCustom-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/JavaGradleCustom-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/JavaMavenCustom-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/OtherCustom-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/ClangGCCCustom-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/JavaGradleCustom-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/JavaMavenCustom-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/OtherCustom-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/ClangGCCOtherCI.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/OtherOtherCI.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/ClangGCCOtherCI-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/OtherOtherCI-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/__snapshots__/ClangGCCOtherCI-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/__snapshots__/OtherOtherCI-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/ClangGCCTravisSonarCloud.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/JavaGradleTravisSonarCloud.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/JavaMavenTravisSonarCloud.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/OtherTravisSonarCloud.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/ClangGCCTravisSonarCloud-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/JavaGradleTravisSonarCloud-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/JavaMavenTravisSonarCloud-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/OtherTravisSonarCloud-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/ClangGCCTravisSonarCloud-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/JavaGradleTravisSonarCloud-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/JavaMavenTravisSonarCloud-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/OtherTravisSonarCloud-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/utils.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandCustom-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandOtherCI-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandTravis-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandCustom-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandOtherCI-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandTravis-test.tsx.snap create mode 100644 server/sonar-web/src/main/js/apps/tutorials/components/commands/utils.ts diff --git a/server/sonar-docs/src/pages/sonarcloud/autoscan.md b/server/sonar-docs/src/pages/sonarcloud/autoscan.md index 5e6e3b08c0f..69b3c990709 100644 --- a/server/sonar-docs/src/pages/sonarcloud/autoscan.md +++ b/server/sonar-docs/src/pages/sonarcloud/autoscan.md @@ -49,7 +49,7 @@ If you're starting from scratch: 1. Do the [setup for your project](/#sonarcloud#/projects/create) (from the `+ > Analyze new project` top right menu) * ![](/images/exclamation.svg) Remember that your project must absolutely be created by selecting a GitHub repository - otherwise it won't work. -1. Once the setup is done on SonarCloud, you end up on the project home page which shows a tutorial. Ignore it and simply add a `.sonarcloud.properties` file in the base directory of your default branch (or on a PR which targets this default branch). +1. Once the setup is done on SonarCloud, you end up on the project home page which shows a tutorial. Ignore it and simply add a `.sonarcloud.properties` file in the base directory of your default branch or on a PR. 1. After a while, the analysis results will be visible in SonarCloud (and your PR will be annotated with comments if you pushed the file on a PR) Here are the supported optional settings for the `.sonarcloud.properties` file: diff --git a/server/sonar-web/.eslintrc b/server/sonar-web/.eslintrc index 652d22c0c7d..b10c9ca35a9 100644 --- a/server/sonar-web/.eslintrc +++ b/server/sonar-web/.eslintrc @@ -1,6 +1,11 @@ { "extends": "sonarqube", + "plugins": [ + "react-hooks" + ], "rules": { - "camelcase": "off" + "camelcase": "off", + "react-hooks/rules-of-hooks": "error", + "react-hooks/exhaustive-deps": "warn" } } diff --git a/server/sonar-web/package.json b/server/sonar-web/package.json index 6a94ebb3ea1..9b053fcfa53 100644 --- a/server/sonar-web/package.json +++ b/server/sonar-web/package.json @@ -5,7 +5,6 @@ "repository": "SonarSource/sonarqube", "license": "LGPL-3.0", "dependencies": { - "@types/dompurify": "^0.0.32", "classnames": "2.2.6", "clipboard": "2.0.1", "core-js": "3.0.0", @@ -17,7 +16,7 @@ "d3-shape": "1.2.2", "d3-zoom": "1.7.3", "date-fns": "1.29.0", - "dompurify": "^1.0.11", + "dompurify": "1.0.11", "formik": "1.2.0", "history": "3.3.0", "intl-relativeformat": "2.1.0", @@ -26,10 +25,10 @@ "lunr": "2.3.4", "mdast-util-toc": "2.1.0", "prop-types": "15.7.2", - "react": "16.8.5", + "react": "16.8.6", "react-countup": "4.1.1", "react-day-picker": "7.3.0", - "react-dom": "16.8.5", + "react-dom": "16.8.6", "react-draggable": "3.2.1", "react-helmet": "5.2.0", "react-intl": "2.8.0", @@ -66,13 +65,14 @@ "@types/d3-selection": "1.3.2", "@types/d3-shape": "1.2.4", "@types/d3-zoom": "1.7.2", - "@types/enzyme": "3.9.1", - "@types/jest": "24.0.11", + "@types/dompurify": "0.0.32", + "@types/enzyme": "3.9.3", + "@types/jest": "24.0.15", "@types/keymaster": "1.6.28", "@types/lodash": "4.14.123", "@types/prop-types": "15.7.0", - "@types/react": "16.8.8", - "@types/react-dom": "16.8.3", + "@types/react": "16.8.22", + "@types/react-dom": "16.8.4", "@types/react-helmet": "5.0.8", "@types/react-intl": "2.3.17", "@types/react-modal": "3.8.1", @@ -85,7 +85,7 @@ "@typescript-eslint/parser": "1.5.0", "autoprefixer": "9.5.0", "babel-core": "7.0.0-bridge.0", - "babel-jest": "24.5.0", + "babel-jest": "24.8.0", "babel-loader": "8.0.5", "babel-plugin-dynamic-import-node": "2.2.0", "babel-plugin-lodash": "3.3.4", @@ -94,8 +94,8 @@ "copy-webpack-plugin": "5.0.1", "css-loader": "2.1.1", "cssnano": "4.1.10", - "enzyme": "3.9.0", - "enzyme-adapter-react-16": "1.10.0", + "enzyme": "3.10.0", + "enzyme-adapter-react-16": "1.14.0", "enzyme-to-json": "3.3.5", "escape-string-regexp": "1.0.5", "eslint": "5.15.3", @@ -104,12 +104,13 @@ "eslint-plugin-jsx-a11y": "6.2.1", "eslint-plugin-promise": "4.0.1", "eslint-plugin-react": "7.12.4", + "eslint-plugin-react-hooks": "1.6.0", "eslint-plugin-sonarjs": "0.3.0", "expose-loader": "0.7.5", "glob": "7.1.3", "glob-promise": "3.4.0", "html-webpack-plugin": "3.2.0", - "jest": "24.5.0", + "jest": "24.8.0", "lint-staged": "7.3.0", "lodash-webpack-plugin": "0.11.5", "mini-css-extract-plugin": "0.6.0", @@ -120,7 +121,7 @@ "raw-loader": "2.0.0", "react-dev-utils": "5.0.1", "react-error-overlay": "1.0.7", - "react-test-renderer": "16.8.5", + "react-test-renderer": "16.8.6", "remark": "9.0.0", "remark-react": "4.0.3", "style-loader": "0.23.1", diff --git a/server/sonar-web/public/images/sonarcloud/analysis/Waiting-for-analysis.svg b/server/sonar-web/public/images/sonarcloud/analysis/Waiting-for-analysis.svg new file mode 100644 index 00000000000..67eb3d56d1b --- /dev/null +++ b/server/sonar-web/public/images/sonarcloud/analysis/Waiting-for-analysis.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/server/sonar-web/public/images/sonarcloud/analysis/galaxy.svg b/server/sonar-web/public/images/sonarcloud/analysis/galaxy.svg new file mode 100644 index 00000000000..84f05b2e9a2 --- /dev/null +++ b/server/sonar-web/public/images/sonarcloud/analysis/galaxy.svg @@ -0,0 +1 @@ + diff --git a/server/sonar-web/public/images/sonarcloud/analysis/helmet.svg b/server/sonar-web/public/images/sonarcloud/analysis/helmet.svg new file mode 100644 index 00000000000..eac1fa3cd14 --- /dev/null +++ b/server/sonar-web/public/images/sonarcloud/analysis/helmet.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/server/sonar-web/public/images/sonarcloud/analysis/manual.svg b/server/sonar-web/public/images/sonarcloud/analysis/manual.svg new file mode 100644 index 00000000000..362cbcdae82 --- /dev/null +++ b/server/sonar-web/public/images/sonarcloud/analysis/manual.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/server/sonar-web/public/images/sonarcloud/analysis/rocket.svg b/server/sonar-web/public/images/sonarcloud/analysis/rocket.svg new file mode 100644 index 00000000000..9b152ca4f3c --- /dev/null +++ b/server/sonar-web/public/images/sonarcloud/analysis/rocket.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/server/sonar-web/src/main/js/api/alm-integration.ts b/server/sonar-web/src/main/js/api/alm-integration.ts index 37995275ecb..b4b55ebe9fd 100644 --- a/server/sonar-web/src/main/js/api/alm-integration.ts +++ b/server/sonar-web/src/main/js/api/alm-integration.ts @@ -17,8 +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, postJSON, post, requestTryAndRepeatUntil } from '../helpers/request'; +import { getJSON, postJSON, post, requestTryAndRepeatUntil, getCorsJSON } from '../helpers/request'; import throwGlobalError from '../app/utils/throwGlobalError'; +import { AlmLanguagesStats } from '../apps/tutorials/analyzeProject/utils'; export function bindAlmOrganization(data: { installationId: string; organization: string }) { return post('/api/alm_integration/bind_organization', data).catch(throwGlobalError); @@ -75,3 +76,9 @@ export function provisionProject(data: { installationKeys: data.installationKeys.join(',') }).catch(throwGlobalError); } + +export function getGithubLanguages(url: string): Promise { + // We don't want to throwGlobalError + const apiUrl = url.replace('https://github.com/', 'https://api.github.com/repos/'); + return getCorsJSON(`${apiUrl}/languages`); +} diff --git a/server/sonar-web/src/main/js/app/styles/components/columns.css b/server/sonar-web/src/main/js/app/styles/components/columns.css index f6690edaf21..9c3b0b55b6c 100644 --- a/server/sonar-web/src/main/js/app/styles/components/columns.css +++ b/server/sonar-web/src/main/js/app/styles/components/columns.css @@ -53,6 +53,10 @@ margin-left: 20px; } +.flex-column-full { + width: 100%; +} + .flex-column-half { width: 50%; } diff --git a/server/sonar-web/src/main/js/app/styles/style.css b/server/sonar-web/src/main/js/app/styles/style.css index a41005d2dc3..90d9e8a052c 100644 --- a/server/sonar-web/src/main/js/app/styles/style.css +++ b/server/sonar-web/src/main/js/app/styles/style.css @@ -136,7 +136,8 @@ } .rule-desc code, -.markdown code { +.markdown code, +code.rule { padding: 0.2em 0.45em; margin: 0; background-color: rgba(0, 0, 0, 0.06); diff --git a/server/sonar-web/src/main/js/app/utils/getHistory.ts b/server/sonar-web/src/main/js/app/utils/getHistory.ts index efd5ba0b011..e27e4924de1 100644 --- a/server/sonar-web/src/main/js/app/utils/getHistory.ts +++ b/server/sonar-web/src/main/js/app/utils/getHistory.ts @@ -23,6 +23,7 @@ import { createHistory, History } from 'history'; let history: History; function ensureHistory() { + // eslint-disable-next-line react-hooks/rules-of-hooks history = useRouterHistory(createHistory)({ // do not use `getBaseUrl` from `helpers/urls` to no import this file with all its dependecies basename: (window as any).baseUrl diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPageSonarCloud-test.tsx b/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPageSonarCloud-test.tsx index 5d3f92ab7d8..0a5dc60407f 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPageSonarCloud-test.tsx +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/CreateProjectPageSonarCloud-test.tsx @@ -60,7 +60,7 @@ it('should render correctly', async () => { expect(wrapper).toMatchSnapshot(); }); -it('should render with Manual creation only', () => { +it('should render with Custom creation only', () => { expect(getWrapper({ currentUser: { ...user, externalProvider: 'microsoft' } })).toMatchSnapshot(); }); diff --git a/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/CreateProjectPageSonarCloud-test.tsx.snap b/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/CreateProjectPageSonarCloud-test.tsx.snap index c0407c7e630..e2fc083cdee 100644 --- a/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/CreateProjectPageSonarCloud-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/create/project/__tests__/__snapshots__/CreateProjectPageSonarCloud-test.tsx.snap @@ -100,7 +100,7 @@ exports[`should render correctly 2`] = ` `; -exports[`should render with Manual creation only 1`] = ` +exports[`should render with Custom creation only 1`] = ` import('./EmptyOverview')); interface Props { branchLike?: T.BranchLike; 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 f3b647f23dc..c31504cb059 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 @@ -21,12 +21,14 @@ import * as React from 'react'; import { connect } from 'react-redux'; import { FormattedMessage } from 'react-intl'; import AnalyzeTutorial from '../../tutorials/analyzeProject/AnalyzeTutorial'; +import AnalyzeTutorialSonarCloud from '../../tutorials/analyzeProject/AnalyzeTutorialSonarCloud'; import MetaContainer from '../meta/MetaContainer'; import { isLongLivingBranch, isBranch, isMainBranch } from '../../../helpers/branches'; import { translate } from '../../../helpers/l10n'; import { isLoggedIn } from '../../../helpers/users'; import { getCurrentUser, Store } from '../../../store/rootReducer'; import { Alert } from '../../../components/ui/Alert'; +import { isSonarCloud } from '../../../helpers/system'; interface OwnProps { branchLike?: T.BranchLike; @@ -70,9 +72,13 @@ export function EmptyOverview({ } /> )} - {!hasBranches && !hasAnalyses && ( - - )} + {!hasBranches && + !hasAnalyses && + (isSonarCloud() ? ( + + ) : ( + + ))} ) : ( -
- -
+ {!isSonarCloud() && ( +
+ +
+ )} ); diff --git a/server/sonar-web/src/main/js/apps/overview/components/__tests__/App-test.tsx b/server/sonar-web/src/main/js/apps/overview/components/__tests__/App-test.tsx index 540d84b3890..ea7d83aa658 100644 --- a/server/sonar-web/src/main/js/apps/overview/components/__tests__/App-test.tsx +++ b/server/sonar-web/src/main/js/apps/overview/components/__tests__/App-test.tsx @@ -47,14 +47,6 @@ it('should render OverviewApp', () => { ).toBeTruthy(); }); -it('should render EmptyOverview', () => { - expect( - getWrapper({ component: { key: 'foo' } as T.Component }) - .find('Connect(EmptyOverview)') - .exists() - ).toBeTruthy(); -}); - function getWrapper(props = {}) { return shallow( { + const userTokens: T.UserToken[] = []; + + expect(getUniqueTokenName(userTokens, initialTokenName)).toBe(initialTokenName); +}); + +it('should generate a token with the given name', () => { + const userTokens = [{ name: initialTokenName, createdAt: '2019-06-14T09:45:52+0200' }]; + + expect(getUniqueTokenName(userTokens, 'Analyze "project"')).toBe('Analyze "project"'); +}); + +it('should generate a unique token when the name already exists', () => { + const userTokens = [ + { name: initialTokenName, createdAt: '2019-06-14T09:45:52+0200' }, + { name: `${initialTokenName} 1`, createdAt: '2019-06-14T09:45:52+0200' } + ]; + + expect(getUniqueTokenName(userTokens, initialTokenName)).toBe('Analyze "lightsaber" 2'); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorial.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorial.tsx index 9f9924795c6..51ce869fa03 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorial.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorial.tsx @@ -27,7 +27,7 @@ import InstanceMessage from '../../../components/common/InstanceMessage'; import { isSonarCloud } from '../../../helpers/system'; import '../styles.css'; -enum Steps { +export enum Steps { ANALYSIS, TOKEN } diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSonarCloud.css b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSonarCloud.css new file mode 100644 index 00000000000..c6153cda452 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSonarCloud.css @@ -0,0 +1,119 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ + +.page-analysis { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + margin: 0 auto; +} + +.page-analysis .page-header { + text-align: center; +} + +.page-analysis h1 { + font-weight: bold; +} + +.page-analysis-container-sonarcloud .onboarding-step { + padding: 0 calc(var(--gridSize) * 4); +} + +.analysis-selector { + display: flex; + flex-direction: column; + justify-content: space-around; +} + +.analysis-modes { + display: flex; + justify-content: space-around; + width: 80%; +} + +.mode-type { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +.mode-type .icon { + position: relative; + display: flex; + align-items: center; + justify-content: center; + width: 100px; + height: 100px; + background-repeat: no-repeat; + background-position: center; +} + +.mode-type .name { + font-weight: bold; +} + +.mode-type-autoscan { + padding: calc(var(--gridSize) * 6) calc(var(--gridSize) * 10); + background: white; + box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.3); +} + +.mode-type-autoscan .icon { + background-image: url(/images/sonarcloud-square-logo.svg); +} + +.mode-type-autoscan .icon .badge { + position: absolute; + top: 12px; + right: 0; +} + +.mode-type-travis .icon { + background-image: url(/images/sonarcloud/analysis/helmet.svg); +} + +.mode-type-other .icon { + background-image: url(/images/sonarcloud/analysis/galaxy.svg); +} + +.mode-type-manual .icon { + background-image: url(/images/sonarcloud/analysis/manual.svg); +} + +.step-selector { + display: flex; +} + +.page-analysis-waiting { + text-align: center; +} + +.page-analysis-waiting .links { + padding: calc(var(--gridSize) * 6) calc(var(--gridSize) * 10); + background: white; +} + +.onboarding-step hr.no-horizontal-margins { + margin-left: 0; + margin-right: 0; +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSonarCloud.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSonarCloud.tsx new file mode 100644 index 00000000000..50b32bbf6e4 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSonarCloud.tsx @@ -0,0 +1,364 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as classnames from 'classnames'; +import * as React from 'react'; +import ConfigureWithAutoScan from './configurations/ConfigureWithAutoScan'; +import ConfigureWithTravis from './configurations/ConfigureWithTravis'; +import ConfigureWithLocalScanner from './configurations/ConfigureWithLocalScanner'; +import ConfigureOtherCI from './configurations/ConfigureWithOtherCI'; +import { TutorialSuggestionBitbucket, TutorialSuggestionVSTS } from './AnalyzeTutorialSuggestion'; +import { + Alm, + ALM_KEYS, + AlmLanguagesStats, + alms, + AnalysisMode, + autoScanMode, + isAutoScannable, + modes, + PROJECT_ONBOARDING_DONE, + PROJECT_ONBOARDING_MODE_ID, + PROJECT_STEP_PROGRESS, + TutorialProps +} from './utils'; +import { getUniqueTokenName } from '../utils'; +import AnalyzeTutorialDone from '../components/AnalyzeTutorialDone'; +import InstanceMessage from '../../../components/common/InstanceMessage'; +import BackButton from '../../../components/controls/BackButton'; +import TokenStep from '../components/TokenStep'; +import ProjectAnalysisStep from '../components/ProjectAnalysisStep'; +import { generateToken, getTokens } from '../../../api/user-tokens'; +import { getGithubLanguages } from '../../../api/alm-integration'; +import { isBitbucket, isGithub, isVSTS } from '../../../helpers/almIntegrations'; +import { translate } from '../../../helpers/l10n'; +import { get, remove, save } from '../../../helpers/storage'; +import { isSonarCloud } from '../../../helpers/system'; +import '../styles.css'; +import './AnalyzeTutorialSonarCloud.css'; +import DeferredSpinner from '../../../components/common/DeferredSpinner'; + +interface Props { + component: T.Component; + currentUser: T.LoggedInUser; +} + +const tutorials: { + [k: string]: (props: Props & TutorialProps) => JSX.Element; +} = { + autoscan: ConfigureWithAutoScan, + manual: ConfigureWithLocalScanner, + other: ConfigureOtherCI, + travis: ConfigureWithTravis +}; + +enum Steps { + ANALYSIS = 'ANALYSIS', + TOKEN = 'TOKEN' +} + +interface State { + alm?: Alm; + almLanguageStats?: AlmLanguagesStats; + isTutorialDone: boolean; + mode?: AnalysisMode; + loading: boolean; + step: Steps; + token?: string; +} + +export default class AnalyzeTutorialSonarCloud extends React.PureComponent { + mounted = false; + + constructor(props: Props) { + super(props); + this.state = { + loading: true, + isTutorialDone: get(PROJECT_ONBOARDING_DONE, props.component.key) === 'true', + step: Steps.TOKEN + }; + } + + componentDidMount() { + this.mounted = true; + const { component, currentUser } = this.props; + + const almKey = (component.alm && component.alm.key) || currentUser.externalProvider; + + if (!almKey) { + return; + } + + if (isBitbucket(almKey)) { + this.configureBitbucket(); + } else if (isGithub(almKey)) { + this.configureGithub(); + } else if (isVSTS(almKey)) { + this.configureMicrosoft(); + } + + if (currentUser) { + getTokens(currentUser.login).then( + t => { + this.getNewToken(getUniqueTokenName(t, `Analyze "${component.name}"`)); + }, + () => {} + ); + } + } + + componentWillUnmount() { + this.mounted = false; + } + + configureBitbucket = () => { + this.setState({ alm: alms[ALM_KEYS.BITBUCKET], loading: false }); + }; + + configureGithub = () => { + const { component } = this.props; + + this.setState({ + alm: alms[ALM_KEYS.GITHUB] + }); + + const savedModeId = get(PROJECT_ONBOARDING_MODE_ID, component.key); + const mode = + autoScanMode.id === savedModeId ? autoScanMode : modes.find(m => m.id === savedModeId); + if (mode) { + this.setState({ mode }); + } + + if (!component.alm) { + return; + } + + const { url } = component.alm; + + if (!url) { + return; + } + + getGithubLanguages(url).then( + almLanguagesStats => { + if (this.mounted) { + this.setState({ + almLanguageStats: almLanguagesStats, + loading: false + }); + } + }, + () => { + this.setState({ loading: false }); + } + ); + }; + + configureMicrosoft = () => { + this.setState({ alm: alms[ALM_KEYS.MICROSOFT], loading: false }); + }; + + getNewToken = (tokenName: string) => { + generateToken({ name: tokenName }).then( + ({ token }: { token: string }) => { + this.setToken(token); + }, + () => {} + ); + }; + + setToken = (token: string) => { + if (this.mounted) { + this.setState({ token }); + } + }; + + setTutorialDone = (value: boolean) => { + save(PROJECT_ONBOARDING_DONE, String(value), this.props.component.key); + this.setState({ isTutorialDone: value }); + }; + + spinner = () => ( +
+ +
+ ); + + renderBitbucket = () => { + const { component, currentUser } = this.props; + const { step, token } = this.state; + + const handleTokenDone = (t: string) => { + if (this.mounted) { + this.setState({ + step: Steps.ANALYSIS, + token: t + }); + } + }; + + const handleTokenOpen = () => { + this.setState({ step: Steps.TOKEN }); + }; + + return ( + <> + + + + + + + ); + }; + + renderGithub = () => { + const { almLanguageStats, isTutorialDone, mode, token } = this.state; + + if (isTutorialDone) { + return ; + } + + const { component, currentUser } = this.props; + const Tutorial = mode && tutorials[mode.id]; + + const getClassnames = (item: AnalysisMode) => + classnames(`mode-type mode-type-${item.id}`, { + [`mode-type-selected`]: mode && mode.id === item.id + }); + + const isAutoScanEnabled = + almLanguageStats && isAutoScannable(almLanguageStats).withAllowedLanguages; + + const setMode = (mode: AnalysisMode | undefined) => { + if (mode) { + save(PROJECT_ONBOARDING_MODE_ID, mode.id, component.key); + remove(PROJECT_STEP_PROGRESS, component.key); + } else { + remove(PROJECT_ONBOARDING_MODE_ID, component.key); + } + + this.setState({ mode }); + }; + + if (!mode || !Tutorial) { + return ( +
+
+
+

+ {translate('onboarding.project_analysis.header')} +

+

+ +

+
+ + {isAutoScanEnabled && ( +
+
+
BETA
+
+

{autoScanMode.name}

+ +
+ )} + +
+ {modes.map(el => ( +
+
+
{el.name}
+ +
+ ))} +
+
+
+ ); + } + + return ( +
+ setMode(undefined)} + tooltip={translate('onboarding.tutorial.return_to_list')}> + {translate('back')} + + + this.setTutorialDone(true)} + setToken={this.setToken} + token={token} + /> +
+ ); + }; + + renderMicrosoft = () => { + return ; + }; + + render() { + const { alm, loading } = this.state; + + if (!alm) { + return null; + } + + return ( + } loading={loading}> + {!loading && ( + <> + {alm.id === ALM_KEYS.BITBUCKET && this.renderBitbucket()} + {alm.id === ALM_KEYS.GITHUB && this.renderGithub()} + {alm.id === ALM_KEYS.MICROSOFT && this.renderMicrosoft()} + + )} + + ); + } +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSuggestion.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSuggestion.tsx index d6687891953..fb2428ad727 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSuggestion.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/AnalyzeTutorialSuggestion.tsx @@ -24,71 +24,83 @@ import { translate } from '../../../helpers/l10n'; import { getBaseUrl } from '../../../helpers/urls'; import { Alert } from '../../../components/ui/Alert'; +export function TutorialSuggestionBitbucket() { + return ( + +

{translate('onboarding.project_analysis.commands_for_analysis')}

+

{translate('onboarding.project_analysis.suggestions.bitbucket')}

+ + {translate('onboarding.project_analysis.guide_to_integrate_pipelines')} + + ) + }} + /> + + ); +} + +export function TutorialSuggestionGithub() { + return ( + +

{translate('onboarding.project_analysis.commands_for_analysis')}

+

{translate('onboarding.project_analysis.suggestions.github')}

+ + {translate('onboarding.project_analysis.guide_to_integrate_travis')} + + ) + }} + /> + + ); +} + +export function TutorialSuggestionVSTS() { + return ( + + + {translate('onboarding.project_analysis.guide_to_integrate_vsts')} + + ) + }} + /> + + ); +} + export default function AnalyzeTutorialSuggestion({ almKey }: { almKey?: string }) { if (isBitbucket(almKey)) { - return ( - -

{translate('onboarding.project_analysis.commands_for_analysis')}

-

{translate('onboarding.project_analysis.suggestions.bitbucket')}

- - {translate('onboarding.project_analysis.guide_to_integrate_piplines')} - - ) - }} - /> - - ); + return ; } else if (isGithub(almKey)) { - return ( - -

{translate('onboarding.project_analysis.commands_for_analysis')}

-

{translate('onboarding.project_analysis.suggestions.github')}

- - {translate('onboarding.project_analysis.guide_to_integrate_travis')} - - ) - }} - /> - - ); + return ; } else if (isVSTS(almKey)) { - return ( - - - {translate('onboarding.project_analysis.guide_to_integrate_vsts')} - - ) - }} - /> - - ); + return ; } return null; } diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorialSonarCloud-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorialSonarCloud-test.tsx new file mode 100644 index 00000000000..7352248c892 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorialSonarCloud-test.tsx @@ -0,0 +1,177 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import AnalyzeTutorialSonarCloud from '../AnalyzeTutorialSonarCloud'; +import { mockComponent, mockLoggedInUser } from '../../../../helpers/testMocks'; +import { get } from '../../../../helpers/storage'; +import { waitAndUpdate } from '../../../../helpers/testUtils'; +import { generateToken, getTokens } from '../../../../api/user-tokens'; +import { getUniqueTokenName } from '../../utils'; + +jest.mock('../../../../helpers/storage', () => ({ + get: jest.fn(), + remove: jest.fn(), + save: jest.fn() +})); + +jest.mock('../../../../api/alm-integration', () => ({ + getGithubLanguages: jest.fn().mockResolvedValue({ + JavaScript: 512636, + TypeScript: 425475, + HTML: 390075, + CSS: 14099, + Makefile: 536, + Dockerfile: 319 + }) +})); + +jest.mock('../../../../api/user-tokens', () => ({ + generateToken: jest.fn().mockResolvedValue({ + name: 'baz', + createdAt: '2019-01-21T08:06:00+0100', + login: 'luke', + token: 'token_value' + }), + getTokens: jest.fn().mockResolvedValue([ + { + name: 'foo', + createdAt: '2019-01-15T15:06:33+0100', + lastConnectionDate: '2019-01-18T15:06:33+0100' + }, + { name: 'bar', createdAt: '2019-01-18T15:06:33+0100' } + ]), + revokeToken: jest.fn().mockResolvedValue(Promise.resolve()) +})); + +jest.mock('../../utils', () => ({ + getUniqueTokenName: jest.fn().mockReturnValue('lightsaber-9000') +})); + +const component = mockComponent(); + +beforeEach(() => { + jest.clearAllMocks(); +}); + +it('shows a loading screen', () => { + expect(shallowRender() + .find('DeferredSpinner') + .prop('loading') as boolean).toBe(true); +}); + +it('renders for GitHub', async () => { + const comp = { + ...component, + alm: { key: 'github', url: 'https://github.com/luke/lightsaber' } + }; + const wrapper = shallowRender({ component: comp }); + await waitAndUpdate(wrapper); + + expect(wrapper).toMatchSnapshot(); + + wrapper + .find('button') + .first() + .simulate('click'); + expect(wrapper.state('mode')).toEqual({ + id: 'autoscan', + name: 'SonarCloud Automatic Analysis' + }); +}); + +it('renders for BitBucket', () => { + const comp = { + ...component, + alm: { key: 'bitbucket', url: 'https://bitbucket.com/luke/lightsaber' } + }; + const wrapper = shallowRender({ component: comp }); + + expect(wrapper).toMatchSnapshot(); + + (wrapper.find('TokenStep').prop('onContinue') as Function)('abc123'); + + expect(wrapper.state('token')).toBe('abc123'); + expect(wrapper.state('step')).toBe('ANALYSIS'); +}); + +it('renders for Azure', () => { + const comp = { + ...component, + alm: { key: 'microsoft', url: 'https://azuredevops.com/luke/lightsaber' } + }; + expect(shallowRender({ component: comp })).toMatchSnapshot(); +}); + +it('renders for a non supported component', async () => { + const wrapper = shallowRender(); + await waitAndUpdate(wrapper); + + expect(wrapper).toMatchSnapshot(); +}); + +it('renders the finished state', async () => { + (get as jest.Mock).mockReturnValue('true'); + + const comp = { + ...component, + alm: { key: 'github', url: 'https://github.com/luke/lightsaber' } + }; + const wrapper = shallowRender({ component: comp }); + await waitAndUpdate(wrapper); + expect(wrapper.find('AnalyzeTutorialDone').exists()).toBe(true); +}); + +it('should get tokens and unique name', async () => { + const wrapper = shallowRender(); + await waitAndUpdate(wrapper); + + expect(getTokens).toHaveBeenCalled(); + expect(getUniqueTokenName).toHaveBeenCalled(); + expect(generateToken).toHaveBeenCalled(); + expect(wrapper.state('token')).toBe('token_value'); +}); + +it('should set tutorial done', () => { + const wrapper = shallowRender(); + const instance = wrapper.instance(); + + instance.setTutorialDone(false); + expect(wrapper.state('isTutorialDone')).toBeFalsy(); + + instance.setTutorialDone(true); + expect(wrapper.state('isTutorialDone')).toBeTruthy(); +}); + +it('should have a spinner', () => { + const wrapper = shallowRender(); + const instance = wrapper.instance(); + expect(instance.spinner()).toMatchSnapshot(); +}); + +function shallowRender(props: Partial = {}) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorialSuggestion-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorialSuggestion-test.tsx index a3d03c31213..c6fc1992727 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorialSuggestion-test.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/AnalyzeTutorialSuggestion-test.tsx @@ -19,20 +19,42 @@ */ import * as React from 'react'; import { shallow } from 'enzyme'; -import AnalyzeTutorialSuggestion from '../AnalyzeTutorialSuggestion'; +import AnalyzeTutorialSuggestion, { + TutorialSuggestionBitbucket, + TutorialSuggestionGithub, + TutorialSuggestionVSTS +} from '../AnalyzeTutorialSuggestion'; it('should not render', () => { expect(shallow().type()).toBeNull(); }); it('renders bitbucket suggestions correctly', () => { - expect(shallow()).toMatchSnapshot(); + expect( + shallow().find(TutorialSuggestionBitbucket) + ).toHaveLength(1); }); it('renders github suggestions correctly', () => { - expect(shallow()).toMatchSnapshot(); + expect( + shallow().find(TutorialSuggestionGithub) + ).toHaveLength(1); }); it('renders vsts suggestions correctly', () => { - expect(shallow()).toMatchSnapshot(); + expect( + shallow().find(TutorialSuggestionVSTS) + ).toHaveLength(1); +}); + +it('renders bitbucket tutorial correctly', () => { + expect(shallow()).toMatchSnapshot(); +}); + +it('renders github tutorial correctly', () => { + expect(shallow()).toMatchSnapshot(); +}); + +it('renders microsoft tutorial correctly', () => { + expect(shallow()).toMatchSnapshot(); }); diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorialSonarCloud-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorialSonarCloud-test.tsx.snap new file mode 100644 index 00000000000..65cf812dc0d --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorialSonarCloud-test.tsx.snap @@ -0,0 +1,207 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`renders for Azure 1`] = ` +} + loading={false} + timeout={100} +> + + +`; + +exports[`renders for BitBucket 1`] = ` +} + loading={false} + timeout={100} +> + + + + +`; + +exports[`renders for GitHub 1`] = ` +} + loading={false} + timeout={100} +> +
+
+
+

+ onboarding.project_analysis.header +

+

+ +

+
+
+
+
+ BETA +
+
+

+ SonarCloud Automatic Analysis +

+ +
+
+
+
+
+ With Travis CI +
+ +
+
+
+
+ With other CI tools +
+ +
+
+
+
+ Manually +
+ +
+
+
+
+ +`; + +exports[`renders for a non supported component 1`] = ` +} + loading={true} + timeout={100} +/> +`; + +exports[`should have a spinner 1`] = ` +
+ +
+`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorialSuggestion-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorialSuggestion-test.tsx.snap index b917e6c7a44..e89e8e2d821 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorialSuggestion-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/__tests__/__snapshots__/AnalyzeTutorialSuggestion-test.tsx.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`renders bitbucket suggestions correctly 1`] = ` +exports[`renders bitbucket tutorial correctly 1`] = ` - onboarding.project_analysis.guide_to_integrate_piplines + onboarding.project_analysis.guide_to_integrate_pipelines , } } @@ -29,7 +29,7 @@ exports[`renders bitbucket suggestions correctly 1`] = ` `; -exports[`renders github suggestions correctly 1`] = ` +exports[`renders github tutorial correctly 1`] = ` `; -exports[`renders vsts suggestions correctly 1`] = ` +exports[`renders microsoft tutorial correctly 1`] = ` { + expect( + isAutoScannable({ + JavaScript: 512636, + TypeScript: 425475, + HTML: 390075, + CSS: 14099, + Makefile: 536, + Dockerfile: 319 + }) + ).toEqual({ + withAllowedLanguages: true, + withNotAllowedLanguages: false + }); +}); + +it('should work for non supported languages', () => { + expect( + isAutoScannable({ + Java: 434 + }) + ).toEqual({ + withAllowedLanguages: false, + withNotAllowedLanguages: true + }); +}); + +it('should work for mixed languages', () => { + expect( + isAutoScannable({ + JavaScript: 512636, + Java: 434 + }) + ).toEqual({ + withAllowedLanguages: true, + withNotAllowedLanguages: true + }); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/AutoScanAlert.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/AutoScanAlert.tsx new file mode 100644 index 00000000000..73616bc80d4 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/AutoScanAlert.tsx @@ -0,0 +1,71 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { FormattedMessage } from 'react-intl'; +import { Alert } from '../../../../components/ui/Alert'; +import DocTooltip from '../../../../components/docs/DocTooltip'; +import { translate } from '../../../../helpers/l10n'; + +const caveats = { + default: ` +No visual feedback (yet) in the UI. +Only Pull Requests from the same repository are analyzed. +Not supported: code coverage, import of external rule engine reports. + +--- + +[Read more](https://sonarcloud.io/documentation/autoscan/) and join [the forum](https://community.sonarsource.com/tags/c/help/sc/autoscan) to ask your questions +` +}; + +const limitedScope = { + default: ` +The following languages are currently supported: + +ABAP, Apex, CSS, Flex, Go, HTML, JS, Kotlin, PHP, Python, Ruby, Scala, Swift, TypeScript, TSQL, XML. +` +}; + +export function AutoScanAlert() { + return ( + +
+ + {translate('onboarding.analysis.with.autoscan.alert.caveats')}{' '} + + + ), + scopes: ( + <> + {translate('onboarding.analysis.with.autoscan.alert.scopes')}{' '} + + + ) + }} + /> +
+ + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithAutoScan.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithAutoScan.tsx new file mode 100644 index 00000000000..55f2e3d7b33 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithAutoScan.tsx @@ -0,0 +1,126 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { FormattedMessage } from 'react-intl'; +import { AutoScanAlert } from './AutoScanAlert'; +import CodeSnippet from '../../../../components/common/CodeSnippet'; +import { translate } from '../../../../helpers/l10n'; +import { Button, ResetButtonLink } from '../../../../components/ui/buttons'; +import Step from '../../components/Step'; +import DropdownIcon from '../../../../components/icons-components/DropdownIcon'; +import { TutorialProps } from '../utils'; + +export default function ConfigureWithAutoScan({ onDone }: TutorialProps) { + const [showCustomizationOptions, setCustomizationOptions] = React.useState(false); + + const command = `# Path to sources +#sonar.sources=. +#sonar.exclusions= +#sonar.inclusions= + +# Path to tests +#sonar.tests= +#sonar.test.exclusions= +#sonar.test.inclusions= + +# Source encoding +#sonar.sourceEncoding=UTF-8 + +# Exclusions for copy-paste detection +#sonar.cpd.exclusions=`; + + const renderForm = () => ( +
+
+
+

+ Add this file in the base directory of your default branch or on a PR. +

+

+ You can push an empty .sonarcloud.properties file, this will work fine. In + this case, every file in the repository will be considered as a source file. +

+ + setCustomizationOptions(!showCustomizationOptions)}> + {showCustomizationOptions ? 'Hide customization options' : 'Show customization options'} + + + + +
+
+
+ +
+
+ ); + + const renderResult = () => null; + + return ( + <> +

+ {translate('onboarding.analysis.with.autoscan.title')} +

+ +

{translate('onboarding.analysis.with.autoscan.text')}

+ + + + {}} + open={true} + renderForm={renderForm} + renderResult={renderResult} + stepNumber={1} + stepTitle={ + .sonarcloud.properties + }} + /> + } + /> + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithLocalScanner.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithLocalScanner.tsx new file mode 100644 index 00000000000..6c54a287c51 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithLocalScanner.tsx @@ -0,0 +1,54 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import ProjectAnalysisStepFromBuildTool, { + ProjectAnalysisModes +} from '../../components/ProjectAnalysisStepFromBuildTool'; +import { TutorialProps } from '../utils'; +import { translate } from '../../../../helpers/l10n'; + +export default function ConfigureWithLocalScanner({ + component, + currentUser, + onDone, + setToken, + token +}: TutorialProps) { + return ( + <> +

+ {translate('onboarding.analysis.with.local.title')} +

+ + + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithOtherCI.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithOtherCI.tsx new file mode 100644 index 00000000000..a9be6faa269 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithOtherCI.tsx @@ -0,0 +1,54 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import ProjectAnalysisStepFromBuildTool, { + ProjectAnalysisModes +} from '../../components/ProjectAnalysisStepFromBuildTool'; +import { TutorialProps } from '../utils'; +import { translate } from '../../../../helpers/l10n'; + +export default function ConfigureWithOtherCI({ + component, + currentUser, + onDone, + setToken, + token +}: TutorialProps) { + return ( + <> +

+ {translate('onboarding.analysis.with.yourci.title')} +

+ + + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithTravis.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithTravis.tsx new file mode 100644 index 00000000000..3b7c5729fe3 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/ConfigureWithTravis.tsx @@ -0,0 +1,119 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import EncryptYourTokenStep from '../steps/EncryptYourTokenStep'; +import CreateSonarPropertiesStep from '../steps/CreateSonarPropertiesStep'; +import EditTravisYmlStep from '../steps/EditTravisYmlStep'; +import { isSonarCloud } from '../../../../helpers/system'; +import { PROJECT_STEP_PROGRESS, TutorialProps } from '../utils'; +import { translate } from '../../../../helpers/l10n'; +import { get, save } from '../../../../helpers/storage'; + +enum Steps { + ENCRYPT_TOKEN = 1, + EDIT_TRAVIS_YML = 2, + CREATE_SONAR_PROPERTIES = 3 +} + +export default function ConfigureWithTravis({ + component, + currentUser, + onDone, + setToken, + token +}: TutorialProps) { + const [build, setBuild] = React.useState(undefined); + const [step, setStep] = React.useState(Steps.ENCRYPT_TOKEN); + const [hasStepAfterTravisYml, setHasStepAfterTravilYml] = React.useState(false); + + React.useEffect(() => { + const value = get(PROJECT_STEP_PROGRESS, component.key); + if (value) { + try { + const data = JSON.parse(value); + setBuild(data.build); + setStep(data.step); + setHasStepAfterTravilYml(data.hasStepAfterTravisYml); + } catch (e) { + // Let's start from scratch + } + } + }, [component.key]); + + const saveAndFinish = () => { + save( + PROJECT_STEP_PROGRESS, + JSON.stringify({ + build, + hasStepAfterTravisYml, + step + }), + component.key + ); + + onDone(); + }; + + return ( + <> +

+ {translate('onboarding.analysis.with.travis.title')} +

+ + setStep(Steps.EDIT_TRAVIS_YML)} + onOpen={() => setStep(Steps.ENCRYPT_TOKEN)} + open={step === Steps.ENCRYPT_TOKEN} + setToken={setToken} + stepNumber={1} + token={token} + /> + + = 2} + hasStepAfter={setHasStepAfterTravilYml} + onContinue={() => + hasStepAfterTravisYml ? setStep(Steps.CREATE_SONAR_PROPERTIES) : saveAndFinish() + } + onOpen={() => setStep(Steps.EDIT_TRAVIS_YML)} + open={step === Steps.EDIT_TRAVIS_YML} + organization={isSonarCloud() ? component.organization : undefined} + stepNumber={2} + token={token} + /> + + {hasStepAfterTravisYml && ( + = 3} + onContinue={saveAndFinish} + onOpen={() => setStep(Steps.CREATE_SONAR_PROPERTIES)} + open={step === Steps.CREATE_SONAR_PROPERTIES} + stepNumber={3} + /> + )} + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/AutoScanAlert-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/AutoScanAlert-test.tsx new file mode 100644 index 00000000000..199befdf043 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/AutoScanAlert-test.tsx @@ -0,0 +1,30 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import { AutoScanAlert } from '../AutoScanAlert'; + +it('should renders correctly', () => { + expect(shallowRender()).toMatchSnapshot(); +}); + +function shallowRender() { + return shallow(); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureOtherCI-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureOtherCI-test.tsx new file mode 100644 index 00000000000..f236a32788d --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureOtherCI-test.tsx @@ -0,0 +1,41 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import ConfigureWithOtherCI from '../ConfigureWithOtherCI'; +import { TutorialProps } from '../../utils'; +import { mockComponent, mockLoggedInUser } from '../../../../../helpers/testMocks'; + +it('should render correctly', () => { + expect(shallowRender()).toMatchSnapshot(); +}); + +function shallowRender(props: Partial = {}) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithAutoScan-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithAutoScan-test.tsx new file mode 100644 index 00000000000..55e70d552a8 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithAutoScan-test.tsx @@ -0,0 +1,41 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import ConfigureWithAutoScan from '../ConfigureWithAutoScan'; +import { TutorialProps } from '../../utils'; +import { mockComponent, mockLoggedInUser } from '../../../../../helpers/testMocks'; + +it('should render correctly', () => { + expect(shallowRender()).toMatchSnapshot(); +}); + +function shallowRender(props: Partial = {}) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithLocalScanner-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithLocalScanner-test.tsx new file mode 100644 index 00000000000..c206bfe6e89 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithLocalScanner-test.tsx @@ -0,0 +1,41 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import ConfigureWithLocalScanner from '../ConfigureWithLocalScanner'; +import { TutorialProps } from '../../utils'; +import { mockComponent, mockLoggedInUser } from '../../../../../helpers/testMocks'; + +it('should render correctly', () => { + expect(shallowRender()).toMatchSnapshot(); +}); + +function shallowRender(props: Partial = {}) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithTravis-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithTravis-test.tsx new file mode 100644 index 00000000000..7f563ed805f --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/ConfigureWithTravis-test.tsx @@ -0,0 +1,71 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import ConfigureWithTravis from '../ConfigureWithTravis'; +import { TutorialProps } from '../../utils'; +import { mockComponent, mockLoggedInUser } from '../../../../../helpers/testMocks'; + +jest.mock('../../../../../helpers/storage', () => ({ + get: jest.fn().mockReturnValue( + JSON.stringify({ + build: 'maven', + hasStepAfterTravisYml: true, + step: 3 + }) + ), + save: jest.fn() +})); + +it('should render correctly', () => { + expect(shallowRender()).toMatchSnapshot(); +}); + +it('should react to EditTravisYmlStep onContinue', () => { + const wrapper = shallowRender(); + expect(wrapper.find('EditTravisYmlStep').prop('open') as Boolean).toBeFalsy(); + + (wrapper.find('EncryptYourTokenStep').prop('onContinue') as Function)(); + + expect(wrapper.find('EditTravisYmlStep').prop('open') as Boolean).toBeTruthy(); +}); + +it('should react to EditTravisYmlStep onOpen', () => { + const wrapper = shallowRender(); + (wrapper.find('EncryptYourTokenStep').prop('onContinue') as Function)(); + expect(wrapper.find('EncryptYourTokenStep').prop('open') as Boolean).toBeFalsy(); + + (wrapper.find('EncryptYourTokenStep').prop('onOpen') as Function)(); + + expect(wrapper.find('EncryptYourTokenStep').prop('open') as Boolean).toBeTruthy(); +}); + +function shallowRender(props: Partial = {}) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/AutoScanAlert-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/AutoScanAlert-test.tsx.snap new file mode 100644 index 00000000000..61f34997842 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/AutoScanAlert-test.tsx.snap @@ -0,0 +1,37 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should renders correctly 1`] = ` + +
+ + + onboarding.analysis.with.autoscan.alert.caveats + + + + , + "scopes": + + onboarding.analysis.with.autoscan.alert.scopes + + + + , + } + } + /> +
+ +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureOtherCI-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureOtherCI-test.tsx.snap new file mode 100644 index 00000000000..75f2731d7db --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureOtherCI-test.tsx.snap @@ -0,0 +1,53 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + +

+ onboarding.analysis.with.yourci.title +

+ + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithAutoScan-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithAutoScan-test.tsx.snap new file mode 100644 index 00000000000..b32e0142d3d --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithAutoScan-test.tsx.snap @@ -0,0 +1,40 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + +

+ onboarding.analysis.with.autoscan.title +

+

+ onboarding.analysis.with.autoscan.text +

+ + + .sonarcloud.properties + , + } + } + /> + } + /> + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithLocalScanner-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithLocalScanner-test.tsx.snap new file mode 100644 index 00000000000..eca965ac35a --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithLocalScanner-test.tsx.snap @@ -0,0 +1,53 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + +

+ onboarding.analysis.with.local.title +

+ + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithTravis-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithTravis-test.tsx.snap new file mode 100644 index 00000000000..a5be30a7b81 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/__tests__/__snapshots__/ConfigureWithTravis-test.tsx.snap @@ -0,0 +1,84 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + +

+ onboarding.analysis.with.travis.title +

+ + + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/CreateSonarPropertiesStep.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/CreateSonarPropertiesStep.tsx new file mode 100644 index 00000000000..eca879fd1a6 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/CreateSonarPropertiesStep.tsx @@ -0,0 +1,93 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { FormattedMessage } from 'react-intl'; +import CodeSnippet from '../../../../components/common/CodeSnippet'; +import { Button } from '../../../../components/ui/buttons'; +import { translate } from '../../../../helpers/l10n'; +import Step from '../../components/Step'; +import { StepProps } from '../../utils'; + +export default function CreateSonarPropertiesStep({ + component, + finished, + onContinue, + onOpen, + open, + stepNumber +}: StepProps) { + const command = `sonar.projectKey=${component ? component.key : 'my:project'} +# this is the name and version displayed in the SonarCloud UI. +sonar.projectName=${component ? component.name : 'My project'} +sonar.projectVersion=1.0 + +# Path is relative to the sonar-project.properties file. Replace "\\" by "/" on Windows. +# This property is optional if sonar.modules is set. +sonar.sources=. + +# Encoding of the source code. Default is default system encoding +#sonar.sourceEncoding=UTF-8`; + + const renderForm = () => ( +
+
+
+

+ sonar-project.properties + }} + /> +

+ +
+
+
+ +
+
+ ); + + const renderResult = () => null; + + return ( + sonar.properties + }} + /> + } + /> + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EditTokenModal.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EditTokenModal.tsx new file mode 100644 index 00000000000..609f82cdba3 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EditTokenModal.tsx @@ -0,0 +1,235 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router'; +import { generateToken, getTokens, revokeToken } from '../../../../api/user-tokens'; +import { getUniqueTokenName } from '../../utils'; +import { translate, translateWithParameters } from '../../../../helpers/l10n'; +import ConfirmModal from '../../../../components/controls/ConfirmModal'; +import { Button, DeleteButton } from '../../../../components/ui/buttons'; +import { RenderOptions } from '../../components/RenderOptions'; +import { Alert } from '../../../../components/ui/Alert'; + +export enum TokenMode { + use_existing_token = 'use_existing_token', + generate_token = 'generate_token' +} + +interface State { + existingToken?: string; + mode: TokenMode; + token?: string; + tokenName: string; +} + +interface Props { + component: T.Component; + currentUser: T.LoggedInUser; + onClose: VoidFunction; + onSave: (token: string) => void; +} + +export default class EditTokenModal extends React.PureComponent { + mounted = false; + initialTokenName = ''; + state = { + mode: TokenMode.use_existing_token, + existingToken: '', + token: '', + tokenName: '' + }; + + componentDidMount() { + this.mounted = true; + const { component } = this.props; + this.initialTokenName = `Analyze "${component.name}"`; + this.getTokensAndName(); + } + + componentWillUnmount() { + this.mounted = false; + } + + getTokensAndName = () => { + const { currentUser } = this.props; + + getTokens(currentUser.login).then( + t => { + if (this.mounted) { + this.setState({ tokenName: getUniqueTokenName(t, this.initialTokenName) }); + } + }, + () => {} + ); + }; + + getNewToken = () => { + const { tokenName = this.initialTokenName } = this.state; + + generateToken({ name: tokenName }).then( + ({ token }: { token: string }) => { + if (this.mounted) { + this.setState({ + token, + tokenName + }); + } + }, + () => {} + ); + }; + + handleChange = (event: React.ChangeEvent) => { + if (this.mounted) { + this.setState({ + tokenName: event.target.value + }); + } + }; + + handleTokenRevoke = () => { + const { tokenName } = this.state; + + if (tokenName) { + revokeToken({ name: tokenName }).then( + () => { + if (this.mounted) { + this.setState({ + mode: TokenMode.use_existing_token, + token: '', + tokenName: '' + }); + } + }, + () => {} + ); + } + }; + + setExistingToken = (event: React.ChangeEvent) => { + if (this.mounted) { + this.setState({ + existingToken: event.target.value + }); + } + }; + + setMode = (mode: TokenMode) => { + this.setState({ mode }); + }; + + render() { + const { onClose, onSave } = this.props; + const { existingToken, mode, token, tokenName } = this.state; + + const header = translate('onboarding.token.header'); + + const isConfirmEnabled = + (mode === TokenMode.generate_token && token) || + (mode === TokenMode.use_existing_token && existingToken); + + const onConfirm = () => { + if (mode === TokenMode.generate_token && token) { + onSave(token); + } else if (mode === TokenMode.use_existing_token && existingToken) { + onSave(existingToken); + } + }; + + return ( + +

+ + {translate('onboarding.token.text.user_account')} + + ) + }} + /> +

+ + {token ? ( + <> + + {tokenName} + {': '} + + {token} + + + + + {translateWithParameters('users.tokens.new_token_created', token)} + + + ) : ( + <> + + +
+ {mode === TokenMode.generate_token && ( + <> + + + + )} + + {mode === TokenMode.use_existing_token && ( + + )} +
+ + )} + + ); + } +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EditTravisYmlStep.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EditTravisYmlStep.tsx new file mode 100644 index 00000000000..dcfd5619f27 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EditTravisYmlStep.tsx @@ -0,0 +1,111 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { FormattedMessage } from 'react-intl'; +import AnalysisCommandTravis from '../../components/commands/AnalysisCommandTravis'; +import { Button } from '../../../../components/ui/buttons'; +import { translate } from '../../../../helpers/l10n'; +import Step from '../../components/Step'; +import BuildSystemForm from '../../components/BuildSystemForm'; +import { StepProps } from '../../utils'; + +interface BuildProps { + buildCallback: (build: string) => void; + buildType?: string; +} + +export default function EditTravisYmlStep({ + buildCallback, + buildType, + component, + finished, + hasStepAfter, + onContinue, + onOpen, + open, + organization, + stepNumber, + token +}: StepProps & BuildProps) { + const [build, setBuild] = React.useState(buildType || undefined); + + if (!build && buildType) { + setBuild(buildType); + } + + const isJavaBuild = build && ['gradle', 'maven'].includes(build); + + if (hasStepAfter && build) { + hasStepAfter(!isJavaBuild); + } + + const chooseBuild = (build: string) => { + buildCallback(build); + setBuild(build); + }; + + const renderForm = () => ( +
+
+
+ + + {build && ( + + )} +
+
+
+ {build && ( + + )} +
+
+ ); + + const renderResult = () => null; + + return ( + .travis.yml + }} + /> + } + /> + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EncryptYourTokenStep.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EncryptYourTokenStep.tsx new file mode 100644 index 00000000000..2bfaa7bdb34 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/EncryptYourTokenStep.tsx @@ -0,0 +1,112 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import EditTokenModal from './EditTokenModal'; +import { Button, EditButton } from '../../../../components/ui/buttons'; +import { translate } from '../../../../helpers/l10n'; +import Step from '../../components/Step'; +import CodeSnippet from '../../../../components/common/CodeSnippet'; + +export interface YourTokenProps { + component: T.Component; + currentUser: T.LoggedInUser; + hasStepAfter?: (hasStepAfter: boolean) => void; + onContinue: VoidFunction; + onOpen: VoidFunction; + open: boolean; + organization?: string; + setToken: (token: string) => void; + stepNumber: number; + token?: string; +} + +export default function EncryptYourTokenStep({ + component, + currentUser, + onContinue, + onOpen, + open, + setToken, + stepNumber, + token +}: YourTokenProps) { + const [showModal, toggleModal] = React.useState(false); + + const close = () => toggleModal(!showModal); + + const save = (token: string) => { + setToken(token); + close(); + }; + + const command = `travis encrypt {token}`; + const renderCommand = () => ( +
+ travis encrypt {token} + toggleModal(true)} /> +
+ ); + + const renderForm = () => ( +
+ {showModal && ( + + )} + + + +
+ +
+
+ ); + + const renderResult = () => null; + + return ( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/CreateSonarPropertiesStep-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/CreateSonarPropertiesStep-test.tsx new file mode 100644 index 00000000000..88738c53dbd --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/CreateSonarPropertiesStep-test.tsx @@ -0,0 +1,39 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import CreateSonarPropertiesStep from '../CreateSonarPropertiesStep'; +import { StepProps } from '../../../utils'; + +it('should render correctly', () => { + expect(shallowRender()).toMatchSnapshot(); +}); + +function shallowRender(props: Partial = {}) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EditTokenModal-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EditTokenModal-test.tsx new file mode 100644 index 00000000000..125cdff3e7c --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EditTokenModal-test.tsx @@ -0,0 +1,132 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import EditTokenModal, { TokenMode } from '../EditTokenModal'; +import { mockComponent, mockEvent, mockLoggedInUser } from '../../../../../helpers/testMocks'; +import { waitAndUpdate } from '../../../../../helpers/testUtils'; +import { generateToken, getTokens, revokeToken } from '../../../../../api/user-tokens'; +import { getUniqueTokenName } from '../../../utils'; + +jest.mock('../../../../../api/user-tokens', () => ({ + generateToken: jest.fn().mockResolvedValue({ + name: 'baz', + createdAt: '2019-01-21T08:06:00+0100', + login: 'luke', + token: 'token_value' + }), + getTokens: jest.fn().mockResolvedValue([ + { + name: 'foo', + createdAt: '2019-01-15T15:06:33+0100', + lastConnectionDate: '2019-01-18T15:06:33+0100' + }, + { name: 'bar', createdAt: '2019-01-18T15:06:33+0100' } + ]), + revokeToken: jest.fn().mockResolvedValue(Promise.resolve()) +})); + +jest.mock('../../../utils', () => ({ + getUniqueTokenName: jest.fn().mockReturnValue('lightsaber-9000') +})); + +beforeEach(() => { + jest.clearAllMocks(); +}); + +it('should render correctly', () => { + expect(shallowRender()).toMatchSnapshot(); +}); + +it('should get tokens and unique name', async () => { + const wrapper = shallowRender(); + const { getTokensAndName } = wrapper.instance(); + + getTokensAndName(); + await waitAndUpdate(wrapper); + + expect(getTokens).toHaveBeenCalled(); + expect(getUniqueTokenName).toHaveBeenCalled(); + expect(wrapper.state('tokenName')).toBe('lightsaber-9000'); +}); + +it('should get a new token', async () => { + const wrapper = shallowRender(); + const { getNewToken } = wrapper.instance(); + + getNewToken(); + await waitAndUpdate(wrapper); + + expect(generateToken).toHaveBeenCalled(); + expect(wrapper.state('token')).toBe('token_value'); +}); + +it('should handle token revocation', async () => { + const wrapper = shallowRender(); + const { getTokensAndName, handleTokenRevoke } = wrapper.instance(); + + getTokensAndName(); + await waitAndUpdate(wrapper); + handleTokenRevoke(); + await waitAndUpdate(wrapper); + + expect(revokeToken).toHaveBeenCalled(); + expect(wrapper.state('token')).toBe(''); + expect(wrapper.state('tokenName')).toBe(''); +}); + +it('should handle change on user input', () => { + const wrapper = shallowRender(); + const instance = wrapper.instance(); + + instance.handleChange(mockEvent({ target: { value: 'my-token' } })); + expect(wrapper.state('tokenName')).toBe('my-token'); +}); + +it('should set existing token', () => { + const wrapper = shallowRender(); + const instance = wrapper.instance(); + + instance.setExistingToken(mockEvent({ target: { value: 'my-token' } })); + expect(wrapper.state('existingToken')).toBe('my-token'); +}); + +it('should set mode', () => { + const wrapper = shallowRender(); + const instance = wrapper.instance(); + + instance.setMode(TokenMode.generate_token); + expect(wrapper.state('mode')).toBe(TokenMode.generate_token); + instance.setMode(TokenMode.use_existing_token); + expect(wrapper.state('mode')).toBe(TokenMode.use_existing_token); +}); + +it('should call onSave with the token', () => {}); + +function shallowRender() { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EditTravisYmlStep-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EditTravisYmlStep-test.tsx new file mode 100644 index 00000000000..2ce447bd6cb --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EditTravisYmlStep-test.tsx @@ -0,0 +1,49 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import EditTravisYmlStep from '../EditTravisYmlStep'; +import { StepProps } from '../../../utils'; + +it('should render correctly', () => { + expect(shallowRender()).toMatchSnapshot(); +}); + +it('should render the form correctly', () => { + expect( + shallowRender() + .find('Step') + .prop('renderForm')() + ).toMatchSnapshot(); +}); + +function shallowRender(props: Partial = {}) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EncryptYourTokenStep-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EncryptYourTokenStep-test.tsx new file mode 100644 index 00000000000..68f7c392b37 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/EncryptYourTokenStep-test.tsx @@ -0,0 +1,43 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import EncryptYourTokenStep from '../EncryptYourTokenStep'; +import { StepProps } from '../../../utils'; +import { mockComponent, mockLoggedInUser } from '../../../../../helpers/testMocks'; + +it('should render correctly', () => { + expect(shallowRender()).toMatchSnapshot(); +}); + +function shallowRender(props: Partial = {}) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/CreateSonarPropertiesStep-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/CreateSonarPropertiesStep-test.tsx.snap new file mode 100644 index 00000000000..ede1a3626f1 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/CreateSonarPropertiesStep-test.tsx.snap @@ -0,0 +1,27 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + + sonar.properties + , + } + } + /> + } +/> +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EditTokenModal-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EditTokenModal-test.tsx.snap new file mode 100644 index 00000000000..816783b465a --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EditTokenModal-test.tsx.snap @@ -0,0 +1,56 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + +

+ + onboarding.token.text.user_account + , + } + } + /> +

+ +
+ +
+ +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EditTravisYmlStep-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EditTravisYmlStep-test.tsx.snap new file mode 100644 index 00000000000..a4313a5fcc8 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EditTravisYmlStep-test.tsx.snap @@ -0,0 +1,59 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + + .travis.yml + , + } + } + /> + } +/> +`; + +exports[`should render the form correctly 1`] = ` +
+
+
+ + +
+
+
+ +
+
+`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EncryptYourTokenStep-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EncryptYourTokenStep-test.tsx.snap new file mode 100644 index 00000000000..298d36cdb6d --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/steps/__tests__/__snapshots__/EncryptYourTokenStep-test.tsx.snap @@ -0,0 +1,13 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/utils.ts b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/utils.ts new file mode 100644 index 00000000000..f9aa0ea1425 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/utils.ts @@ -0,0 +1,119 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ + +export const PROJECT_ONBOARDING_DONE = 'sonarcloud.project.onboarding.finished'; +export const PROJECT_ONBOARDING_MODE_ID = 'sonarcloud.project.onboarding.mode.id'; +export const PROJECT_STEP_PROGRESS = 'sonarcloud.project.onboarding.step.progress'; + +export interface AlmLanguagesStats { + [k: string]: number; +} + +export interface Alm { + id: string; + name: string; +} + +export interface AnalysisMode { + icon?: string; + id: string; + name: string; +} + +export enum ALM_KEYS { + BITBUCKET = 'BITBUCKET', + GITHUB = 'GITHUB', + MICROSOFT = 'MICROSOFT' +} + +export const alms: { [k: string]: Alm } = { + [ALM_KEYS.BITBUCKET]: { + id: ALM_KEYS.BITBUCKET, + name: 'BitBucket' + }, + [ALM_KEYS.GITHUB]: { + id: ALM_KEYS.GITHUB, + name: 'GitHub' + }, + [ALM_KEYS.MICROSOFT]: { + id: ALM_KEYS.MICROSOFT, + name: 'Microsoft' + } +}; + +export const modes: AnalysisMode[] = [ + { + id: 'travis', + name: 'With Travis CI' + }, + { + id: 'other', + name: 'With other CI tools' + }, + { + id: 'manual', + name: 'Manually' + } +]; + +export const autoScanMode: AnalysisMode = { + id: 'autoscan', + name: 'SonarCloud Automatic Analysis' +}; + +export interface TutorialProps { + component: T.Component; + currentUser: T.LoggedInUser; + onDone: VoidFunction; + setToken: (token: string) => void; + style?: object; + token: string | undefined; +} + +interface AutoScannableProps { + [k: string]: number; +} + +export function isAutoScannable(languages: AutoScannableProps = {}) { + const allowed = [ + 'ABAP', + 'Apex', + 'CSS', + 'Flex', + 'Go', + 'HTML', + 'JavaScript', + 'Kotlin', + 'PHP', + 'Python', + 'Ruby', + 'Scala', + 'Swift', + 'TypeScript', + 'TSQL', + 'XML' + ]; + const notAllowed = ['Java', 'C#', 'Visual Basic', 'C', 'C++', 'Objective-C']; + + const withAllowedLanguages = !!Object.keys(languages).find(l => allowed.includes(l)); + const withNotAllowedLanguages = !!Object.keys(languages).find(l => notAllowed.includes(l)); + + return { withAllowedLanguages, withNotAllowedLanguages }; +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/AnalyzeTutorialDone.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/AnalyzeTutorialDone.tsx new file mode 100644 index 00000000000..68bc9705bbf --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/AnalyzeTutorialDone.tsx @@ -0,0 +1,72 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { getBaseUrl } from '../../../helpers/urls'; +import { translate } from '../../../helpers/l10n'; +import BackButton from '../../../components/controls/BackButton'; + +interface Props { + setTutorialDone: (done: boolean) => void; +} + +export default function AnalyzeTutorialDone({ setTutorialDone }: Props) { + return ( +
+ setTutorialDone(false)} + tooltip={translate('onboarding.tutorial.return_to_tutorial')}> + {translate('back')} + +
+ SonarCloud +

+ {translate('onboarding.finished.title')} +

+

{translate('onboarding.finished.text')}

+ +
+

{translate('onboarding.finished.links.title')}

+ +
+
+
+ ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/BuildSystemForm.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/BuildSystemForm.tsx new file mode 100644 index 00000000000..8001f5a1d68 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/BuildSystemForm.tsx @@ -0,0 +1,39 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { RenderOptions } from './RenderOptions'; + +interface Props { + build: string | undefined; + setBuild: (build: string) => void; +} + +export default function BuildSystemForm({ build, setBuild }: Props) { + return ( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/LanguageForm.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/LanguageForm.tsx index f8835b42641..0ac0e87f557 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/LanguageForm.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/LanguageForm.tsx @@ -18,6 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; +import { RenderOptions } from './RenderOptions'; import NewProjectForm from './NewProjectForm'; import RadioToggle from '../../../components/controls/RadioToggle'; import { translate } from '../../../helpers/l10n'; @@ -28,12 +29,29 @@ interface Props { component?: T.Component; config?: LanguageConfig; onDone: (config: LanguageConfig) => void; - onReset: () => void; + onReset: VoidFunction; organization?: string; } type State = LanguageConfig; +export interface RenderOSProps { + os: string | undefined; + setOS: (os: string) => void; +} +export function RenderOS(props: RenderOSProps) { + return ( + + ); +} + export default class LanguageForm extends React.PureComponent { constructor(props: Props) { super(props); @@ -76,48 +94,25 @@ export default class LanguageForm extends React.PureComponent { }; renderJavaBuild = () => ( -
-

{translate('onboarding.language.java.build_technology')}

- ({ - label: translate('onboarding.language.java.build_technology', build), - value: build - }))} - value={this.state.javaBuild} - /> -
+ ); renderCFamilyCompiler = () => ( -
-

{translate('onboarding.language.c-family.compiler')}

- ({ - label: translate('onboarding.language.c-family.compiler', compiler), - value: compiler - }))} - value={this.state.cFamilyCompiler} - /> -
- ); - - renderOS = () => ( -
-

{translate('onboarding.language.os')}

- ({ - label: translate('onboarding.language.os', os), - value: os - }))} - value={this.state.os} - /> -
+ ); renderProjectKey = () => { @@ -164,8 +159,9 @@ export default class LanguageForm extends React.PureComponent {
{language === 'java' && this.renderJavaBuild()} {language === 'c-family' && this.renderCFamilyCompiler()} - {((language === 'c-family' && cFamilyCompiler === 'clang-gcc') || language === 'other') && - this.renderOS()} + {((language === 'c-family' && cFamilyCompiler === 'clang-gcc') || language === 'other') && ( + + )} {this.renderProjectKey()} ); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/NewProjectForm.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/NewProjectForm.tsx index f1d8c111111..e166bace23a 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/NewProjectForm.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/NewProjectForm.tsx @@ -23,7 +23,7 @@ import { DeleteButton, SubmitButton } from '../../../components/ui/buttons'; import { translate } from '../../../helpers/l10n'; interface Props { - onDelete: () => void; + onDelete: VoidFunction; onDone: (projectKey: string) => void; organization?: string; projectKey?: string; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/ProjectAnalysisStep.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/ProjectAnalysisStep.tsx index ba4ca781ec3..1a220fbd42e 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/ProjectAnalysisStep.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/ProjectAnalysisStep.tsx @@ -28,7 +28,7 @@ interface Props { component?: T.Component; displayRowLayout?: boolean; onFinish?: (projectKey?: string) => void; - onReset?: () => void; + onReset?: VoidFunction; open: boolean; organization?: string; stepNumber: number; @@ -39,17 +39,17 @@ interface State { config?: LanguageConfig; } +export function getProjectKey(config?: LanguageConfig, component?: T.Component) { + return (component && component.key) || (config && config.projectKey); +} + export default class ProjectAnalysisStep extends React.PureComponent { state: State = {}; - getProjectKey = ({ config } = this.state, { component } = this.props) => { - return (component && component.key) || (config && config.projectKey); - }; - handleLanguageSelect = (config: LanguageConfig) => { this.setState({ config }); if (this.props.onFinish) { - const projectKey = config.language !== 'java' ? this.getProjectKey({ config }) : undefined; + const projectKey = config.language !== 'java' ? getProjectKey(config) : undefined; this.props.onFinish(projectKey); } }; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/ProjectAnalysisStepFromBuildTool.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/ProjectAnalysisStepFromBuildTool.tsx new file mode 100644 index 00000000000..6a9bfc7169b --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/ProjectAnalysisStepFromBuildTool.tsx @@ -0,0 +1,148 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import Step from './Step'; +import BuildSystemForm from './BuildSystemForm'; +import AnalysisCommandCustom from './commands/AnalysisCommandCustom'; +import AnalysisCommandOtherCI from './commands/AnalysisCommandOtherCI'; +import { translate } from '../../../helpers/l10n'; +import { get, save } from '../../../helpers/storage'; +import { PROJECT_STEP_PROGRESS } from '../analyzeProject/utils'; + +export enum ProjectAnalysisModes { + CI = 'CI', + Custom = 'Custom' +} + +export interface Props { + component: T.Component; + currentUser: T.LoggedInUser; + displayRowLayout?: boolean; + mode: ProjectAnalysisModes; + onDone: VoidFunction; + onReset?: VoidFunction; + open: boolean; + organization?: string; + setToken: (token: string) => void; + stepNumber: number; + token?: string; +} + +export default function ProjectAnalysisStepFromBuildTool({ + component, + currentUser, + displayRowLayout, + mode, + onDone, + open, + organization, + setToken, + stepNumber, + token +}: Props) { + const [build, setBuild] = React.useState(undefined); + const [os, setOS] = React.useState(undefined); + + React.useEffect(() => { + const value = get(PROJECT_STEP_PROGRESS, component.key); + if (value) { + try { + const data = JSON.parse(value); + setBuild(data.build); + setOS(data.os); + } catch (e) { + // Let's start from scratch + } + } + }, [component.key]); + + const saveAndFinish = (data: object) => { + save( + PROJECT_STEP_PROGRESS, + JSON.stringify({ + ...data, + build + }), + component.key + ); + + onDone(); + }; + + const renderForm = () => { + const languageComponent = ; + + let AnalysisComponent = null; + + if (mode === ProjectAnalysisModes.Custom) { + AnalysisComponent = AnalysisCommandCustom; + } else if (mode === ProjectAnalysisModes.CI) { + AnalysisComponent = AnalysisCommandOtherCI; + } + + if (displayRowLayout) { + return ( +
+
+ {languageComponent} + {AnalysisComponent && ( +
+ +
+ )} +
+
+ ); + } + + return ( +
+
+
{languageComponent}
+
{AnalysisComponent}
+
+
+ ); + }; + + const renderResult = () => null; + + return ( + {}} + open={open} + renderForm={renderForm} + renderResult={renderResult} + stepNumber={stepNumber} + stepTitle={translate('onboarding.analysis.header')} + /> + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/RenderOptions.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/RenderOptions.tsx new file mode 100644 index 00000000000..406c3d74f92 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/RenderOptions.tsx @@ -0,0 +1,55 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { translate } from '../../../helpers/l10n'; +import RadioToggle from '../../../components/controls/RadioToggle'; + +interface RenderOptionsProps { + checked: string | undefined; + name: string; + onCheck: (checked: string) => void; + optionLabelKey: string; + options: string[]; + titleLabelKey?: string; +} + +export function RenderOptions({ + checked, + onCheck, + optionLabelKey, + options, + titleLabelKey +}: RenderOptionsProps) { + return ( +
+ {titleLabelKey &&

{translate(titleLabelKey)}

} + + ({ + label: translate(optionLabelKey, build), + value: build + }))} + value={checked} + /> +
+ ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/Step.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/Step.tsx index 3ff8f7bc8bf..34e6327e0c2 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/Step.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/Step.tsx @@ -22,8 +22,8 @@ import * as React from 'react'; import * as classNames from 'classnames'; interface Props { - finished: boolean; - onOpen: () => void; + finished?: boolean; + onOpen: VoidFunction; open: boolean; renderForm: () => React.ReactNode; renderResult: () => React.ReactNode; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/TokenStep.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/TokenStep.tsx index 6c92ab9c35b..895073b3f2a 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/TokenStep.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/TokenStep.tsx @@ -27,14 +27,15 @@ import AlertSuccessIcon from '../../../components/icons-components/AlertSuccessI import { DeleteButton, SubmitButton, Button } from '../../../components/ui/buttons'; import { getTokens, generateToken, revokeToken } from '../../../api/user-tokens'; import { translate } from '../../../helpers/l10n'; +import { getUniqueTokenName } from '../utils'; interface Props { - currentUser: { login: string }; + currentUser: Pick; finished: boolean; initialTokenName?: string; open: boolean; onContinue: (token: string) => void; - onOpen: () => void; + onOpen: VoidFunction; stepNumber: number; } @@ -70,7 +71,7 @@ export default class TokenStep extends React.PureComponent { this.props.initialTokenName !== undefined && this.props.initialTokenName === this.state.tokenName ) { - this.setState({ tokenName: this.getUniqueTokenName(tokens) }); + this.setState({ tokenName: getUniqueTokenName(tokens) }); } } }, @@ -85,21 +86,6 @@ export default class TokenStep extends React.PureComponent { getToken = () => this.state.selection === 'generate' ? this.state.token : this.state.existingToken; - getUniqueTokenName = (tokens: T.UserToken[]) => { - const { initialTokenName = '' } = this.props; - const hasToken = (name: string) => tokens.find(token => token.name === name) !== undefined; - - if (!hasToken(initialTokenName)) { - return initialTokenName; - } - - let i = 1; - while (hasToken(`${initialTokenName} ${i}`)) { - i++; - } - return `${initialTokenName} ${i}`; - }; - canContinue = () => { const { existingToken, selection, token } = this.state; const validExistingToken = existingToken.match(/^[a-z0-9]+$/) != null; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/AnalyzeTutorialDone-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/AnalyzeTutorialDone-test.tsx new file mode 100644 index 00000000000..f0dede54998 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/AnalyzeTutorialDone-test.tsx @@ -0,0 +1,26 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import AnalyzeTutorialDone from '../AnalyzeTutorialDone'; + +it('should render correctly', () => { + expect(shallow()).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/BuildSystemForm-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/BuildSystemForm-test.tsx new file mode 100644 index 00000000000..a478875edc8 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/BuildSystemForm-test.tsx @@ -0,0 +1,28 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import BuildSystemForm from '../BuildSystemForm'; + +it('should render correctly', () => { + const build = 'maven'; + const setBuild = jest.fn(); + expect(shallow()).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/LanguageForm-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/LanguageForm-test.tsx index 02b399fbfca..18af8e638b5 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/LanguageForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/LanguageForm-test.tsx @@ -35,22 +35,6 @@ it('selects java', () => { (wrapper.find('RadioToggle').prop('onCheck') as Function)('java'); wrapper.update(); expect(wrapper).toMatchSnapshot(); - - (wrapper - .find('RadioToggle') - .at(1) - .prop('onCheck') as Function)('maven'); - wrapper.update(); - expect(wrapper).toMatchSnapshot(); - expect(onDone).lastCalledWith({ language: 'java', javaBuild: 'maven' }); - - (wrapper - .find('RadioToggle') - .at(1) - .prop('onCheck') as Function)('gradle'); - wrapper.update(); - expect(wrapper).toMatchSnapshot(); - expect(onDone).lastCalledWith({ language: 'java', javaBuild: 'gradle' }); }); it('selects c#', () => { @@ -73,42 +57,6 @@ it('selects c-family', () => { (wrapper.find('RadioToggle').prop('onCheck') as Function)('c-family'); wrapper.update(); expect(wrapper).toMatchSnapshot(); - - (wrapper - .find('RadioToggle') - .at(1) - .prop('onCheck') as Function)('msvc'); - wrapper.update(); - expect(wrapper).toMatchSnapshot(); - - (wrapper.find('NewProjectForm').prop('onDone') as Function)('project-foo'); - expect(onDone).lastCalledWith({ - language: 'c-family', - cFamilyCompiler: 'msvc', - projectKey: 'project-foo' - }); - - (wrapper - .find('RadioToggle') - .at(1) - .prop('onCheck') as Function)('clang-gcc'); - wrapper.update(); - expect(wrapper).toMatchSnapshot(); - - (wrapper - .find('RadioToggle') - .at(2) - .prop('onCheck') as Function)('linux'); - wrapper.update(); - expect(wrapper).toMatchSnapshot(); - - (wrapper.find('NewProjectForm').prop('onDone') as Function)('project-foo'); - expect(onDone).lastCalledWith({ - language: 'c-family', - cFamilyCompiler: 'clang-gcc', - os: 'linux', - projectKey: 'project-foo' - }); }); it('selects other', () => { @@ -118,14 +66,4 @@ it('selects other', () => { (wrapper.find('RadioToggle').prop('onCheck') as Function)('other'); wrapper.update(); expect(wrapper).toMatchSnapshot(); - - (wrapper - .find('RadioToggle') - .at(1) - .prop('onCheck') as Function)('mac'); - wrapper.update(); - expect(wrapper).toMatchSnapshot(); - - (wrapper.find('NewProjectForm').prop('onDone') as Function)('project-foo'); - expect(onDone).lastCalledWith({ language: 'other', os: 'mac', projectKey: 'project-foo' }); }); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/NewProjectForm-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/NewProjectForm-test.tsx index 0cb47e200d4..0d534cd9a59 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/NewProjectForm-test.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/NewProjectForm-test.tsx @@ -18,7 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; -import { mount } from 'enzyme'; +import { shallow } from 'enzyme'; import NewProjectForm from '../NewProjectForm'; import { change, submit, waitAndUpdate } from '../../../../helpers/testUtils'; @@ -31,7 +31,7 @@ jest.mock('../../../../components/icons-components/DeleteIcon'); it('creates new project', async () => { const onDone = jest.fn(); - const wrapper = mount(); + const wrapper = shallow(); expect(wrapper).toMatchSnapshot(); change(wrapper.find('input'), 'foo'); submit(wrapper.find('form')); @@ -43,7 +43,7 @@ it('creates new project', async () => { it('deletes project', async () => { const onDelete = jest.fn(); - const wrapper = mount(); + const wrapper = shallow(); wrapper.setState({ done: true, loading: false, projectKey: 'foo' }); expect(wrapper).toMatchSnapshot(); (wrapper.find('DeleteButton').prop('onClick') as Function)(); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/ProjectAnalysisStep-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/ProjectAnalysisStep-test.tsx new file mode 100644 index 00000000000..45d666de5db --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/ProjectAnalysisStep-test.tsx @@ -0,0 +1,31 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import { mockComponent } from '../../../../helpers/testMocks'; +import ProjectAnalysisStep from '../ProjectAnalysisStep'; + +it('should render correctly', () => { + expect(shallowRender()).toMatchSnapshot(); +}); + +function shallowRender() { + return shallow(); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/ProjectAnalysisStepFromBuildTool-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/ProjectAnalysisStepFromBuildTool-test.tsx new file mode 100644 index 00000000000..ac35e13598b --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/ProjectAnalysisStepFromBuildTool-test.tsx @@ -0,0 +1,69 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import ProjectAnalysisStepFromBuildTool, { + ProjectAnalysisModes, + Props +} from '../ProjectAnalysisStepFromBuildTool'; +import { mockComponent, mockLoggedInUser } from '../../../../helpers/testMocks'; + +jest.mock('../../../../helpers/storage', () => ({ + get: jest.fn().mockReturnValue( + JSON.stringify({ + build: 'maven', + os: 'linux' + }) + ), + save: jest.fn() +})); + +it('should render correctly', () => { + expect(shallowRender()).toMatchSnapshot(); +}); + +it('should render the form correctly', () => { + expect( + shallowRender({ mode: ProjectAnalysisModes.CI }) + .find('Step') + .prop('renderForm')() + ).toMatchSnapshot(); + + expect( + shallowRender({ displayRowLayout: true }) + .find('Step') + .prop('renderForm')() + ).toMatchSnapshot(); +}); + +function shallowRender(props: Partial = {}) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/TokenStep-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/TokenStep-test.tsx index a51a10d3f3a..cdd6c63d6ce 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/TokenStep-test.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/TokenStep-test.tsx @@ -28,7 +28,7 @@ jest.mock('../../../../api/user-tokens', () => ({ revokeToken: () => Promise.resolve() })); -const currentUser = { login: 'user' }; +const currentUser: Pick = { login: 'user' }; it('generates token', async () => { const wrapper = shallow( diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/AnalyzeTutorialDone-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/AnalyzeTutorialDone-test.tsx.snap new file mode 100644 index 00000000000..4b204df6c50 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/AnalyzeTutorialDone-test.tsx.snap @@ -0,0 +1,64 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` +
+ + back + +
+ SonarCloud +

+ onboarding.finished.title +

+

+ onboarding.finished.text +

+
+

+ onboarding.finished.links.title +

+ +
+
+
+`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/BuildSystemForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/BuildSystemForm-test.tsx.snap new file mode 100644 index 00000000000..888b7848b22 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/BuildSystemForm-test.tsx.snap @@ -0,0 +1,19 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/LanguageForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/LanguageForm-test.tsx.snap index 6b2d8f1871e..791e3e6121a 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/LanguageForm-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/LanguageForm-test.tsx.snap @@ -73,298 +73,17 @@ exports[`selects c-family 1`] = ` value="c-family" />
-
-

- onboarding.language.c-family.compiler -

- -
- -`; - -exports[`selects c-family 2`] = ` - -
-

- onboarding.language -

- -
-
-

- onboarding.language.c-family.compiler -

- -
- - -`; - -exports[`selects c-family 3`] = ` - -
-

- onboarding.language -

- -
-
-

- onboarding.language.c-family.compiler -

- -
-
-

- onboarding.language.os -

- -
- -`; - -exports[`selects c-family 4`] = ` - -
-

- onboarding.language -

- -
-
-

- onboarding.language.c-family.compiler -

- -
-
-

- onboarding.language.os -

- -
- `; @@ -400,155 +119,18 @@ exports[`selects java 1`] = ` value="java" />
-
-

- onboarding.language.java.build_technology -

- -
- -`; - -exports[`selects java 2`] = ` - -
-

- onboarding.language -

- -
-
-

- onboarding.language.java.build_technology -

- -
- -`; - -exports[`selects java 3`] = ` - -
-

- onboarding.language -

- -
-
-

- onboarding.language.java.build_technology -

- -
+ `; @@ -583,105 +165,8 @@ exports[`selects other 1`] = ` value="other" />
-
-

- onboarding.language.os -

- -
- -`; - -exports[`selects other 2`] = ` - -
-

- onboarding.language -

- -
-
-

- onboarding.language.os -

- -
- `; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/NewProjectForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/NewProjectForm-test.tsx.snap index 07ce9faa675..dd54fa9066c 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/NewProjectForm-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/NewProjectForm-test.tsx.snap @@ -1,321 +1,177 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[`creates new project 1`] = ` - -
-

+
+ + - onboarding.language.project_key -

- +
- - - - - -
- onboarding.project_key_requirement -
- -
- + onboarding.project_key_requirement +
+ + `; exports[`creates new project 2`] = ` - -
-

- onboarding.language.project_key -

-
+ + + +
- - -
- onboarding.project_key_requirement -
- -
- + onboarding.project_key_requirement +
+ + `; exports[`creates new project 3`] = ` - -
-

+
+ - onboarding.language.project_key -

-
- - foo - - - - - - - -
+ foo + +
- + `; exports[`deletes project 1`] = ` - -
-

+
+ - onboarding.language.project_key -

-
- - foo - - - - - - - -
+ foo + +
- + `; exports[`deletes project 2`] = ` - -
-

+
+ - onboarding.language.project_key -

-
- - foo - - -
+ foo + +
- + `; exports[`deletes project 3`] = ` - -
-

+
+ + - onboarding.language.project_key -

- +
- - - - - -
- onboarding.project_key_requirement -
- -
- + onboarding.project_key_requirement +
+ + `; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/ProjectAnalysisStep-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/ProjectAnalysisStep-test.tsx.snap new file mode 100644 index 00000000000..0380c578d47 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/ProjectAnalysisStep-test.tsx.snap @@ -0,0 +1,13 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/ProjectAnalysisStepFromBuildTool-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/ProjectAnalysisStepFromBuildTool-test.tsx.snap new file mode 100644 index 00000000000..2394ed2feb0 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/__tests__/__snapshots__/ProjectAnalysisStepFromBuildTool-test.tsx.snap @@ -0,0 +1,91 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + +`; + +exports[`should render the form correctly 1`] = ` +
+
+
+ +
+
+ [Function] +
+
+
+`; + +exports[`should render the form correctly 2`] = ` +
+
+ +
+ +
+
+
+`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommand.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommand.tsx index 48490533f1c..03c4a3f7071 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommand.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommand.tsx @@ -26,6 +26,7 @@ import ClangGCC from './ClangGCC'; import Other from './Other'; import { getHostUrl } from '../../../../helpers/urls'; import { LanguageConfig } from '../../utils'; +import { getProjectKey } from '../ProjectAnalysisStep'; interface Props { component?: T.Component; @@ -36,10 +37,6 @@ interface Props { } export default class AnalysisCommand extends React.PureComponent { - getProjectKey = ({ component, languageConfig } = this.props) => { - return (component && component.key) || languageConfig.projectKey; - }; - renderCommandForMaven = () => { const { component, token } = this.props; if (!token) { @@ -71,8 +68,8 @@ export default class AnalysisCommand extends React.PureComponent { }; renderCommandForDotNet = () => { - const { small, token } = this.props; - const projectKey = this.getProjectKey(); + const { component, languageConfig, small, token } = this.props; + const projectKey = getProjectKey(languageConfig, component); if (!projectKey || !token) { return null; } @@ -88,8 +85,8 @@ export default class AnalysisCommand extends React.PureComponent { }; renderCommandForMSVC = () => { - const { small, token } = this.props; - const projectKey = this.getProjectKey(); + const { component, languageConfig, small, token } = this.props; + const projectKey = getProjectKey(languageConfig, component); if (!projectKey || !token) { return null; } @@ -105,8 +102,8 @@ export default class AnalysisCommand extends React.PureComponent { }; renderCommandForClangGCC = () => { - const { languageConfig, small, token } = this.props; - const projectKey = this.getProjectKey(); + const { component, languageConfig, small, token } = this.props; + const projectKey = getProjectKey(languageConfig, component); if (!languageConfig || !projectKey || !languageConfig.os || !token) { return null; } @@ -123,8 +120,8 @@ export default class AnalysisCommand extends React.PureComponent { }; renderCommandForOther = () => { - const { languageConfig, token } = this.props; - const projectKey = this.getProjectKey(); + const { component, languageConfig, token } = this.props; + const projectKey = getProjectKey(languageConfig, component); if (!languageConfig || !projectKey || !languageConfig.os || !token) { return null; } diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandCustom.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandCustom.tsx new file mode 100644 index 00000000000..5cc1c167e1a --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandCustom.tsx @@ -0,0 +1,175 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import JavaMavenCustom from './Custom/JavaMavenCustom'; +import JavaGradleCustom from './Custom/JavaGradleCustom'; +import ClangGCCCustom from './Custom/ClangGCCCustom'; +import OtherCustom from './Custom/OtherCustom'; +import { AnalysisCommandProps, AnalysisCommandRenderProps } from './utils'; +import { AnalysisCommandCommon } from './AnalysisCommandOtherCI'; +import { getHostUrl } from '../../../../helpers/urls'; +import { getProjectKey } from '../ProjectAnalysisStep'; +import { ProjectAnalysisModes } from '../ProjectAnalysisStepFromBuildTool'; +import { RenderOS, RenderOSProps } from '../LanguageForm'; + +export function RenderCommandForMaven({ + component, + mode, + onDone, + organization, + toggleModal, + token +}: AnalysisCommandRenderProps) { + if (!token) { + return null; + } + + return ( + + ); +} + +export function RenderCommandForGradle({ + component, + mode, + onDone, + organization, + toggleModal, + token +}: AnalysisCommandRenderProps) { + if (!token) { + return null; + } + + return ( + + ); +} + +export function RenderCommandForClangOrGCC({ + component, + mode, + onDone, + organization, + os, + small, + toggleModal, + token +}: AnalysisCommandRenderProps) { + const projectKey = getProjectKey(undefined, component); + if (!projectKey || !os || !token) { + return null; + } + return ( + + ); +} + +export function RenderCommandForOther({ + component, + currentUser, + mode, + onDone, + organization, + os, + toggleModal, + token +}: AnalysisCommandRenderProps) { + const projectKey = getProjectKey(undefined, component); + if (!component || !projectKey || !os || !token) { + return null; + } + return ( + + ); +} + +function getBuildOptions({ + os, + setOS +}: RenderOSProps): { [k: string]: (props: AnalysisCommandRenderProps) => JSX.Element | null } { + return { + gradle: RenderCommandForGradle, + make: function make(props: AnalysisCommandRenderProps) { + return ( + <> + + + + ); + }, + maven: RenderCommandForMaven, + other: function other(props: AnalysisCommandRenderProps) { + return ( + <> + + + + ); + } + }; +} + +export default function AnalysisCommandCustom(props: AnalysisCommandProps) { + return ( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandOtherCI.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandOtherCI.tsx new file mode 100644 index 00000000000..0537afaa24c --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandOtherCI.tsx @@ -0,0 +1,174 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import OtherOtherCI from './OtherCI/OtherOtherCI'; +import ClangGCCOtherCI from './OtherCI/ClangGCCOtherCI'; +import { AnalysisCommandProps, AnalysisCommandRenderProps } from './utils'; +import { RenderCommandForGradle, RenderCommandForMaven } from './AnalysisCommandCustom'; +import { getHostUrl } from '../../../../helpers/urls'; +import { getProjectKey } from '../ProjectAnalysisStep'; +import { RenderOS, RenderOSProps } from '../LanguageForm'; +import { ProjectAnalysisModes } from '../ProjectAnalysisStepFromBuildTool'; +import EditTokenModal from '../../analyzeProject/steps/EditTokenModal'; + +export function RenderCommandForClangOrGCC({ + component, + onDone, + organization, + os, + small, + toggleModal, + token +}: AnalysisCommandRenderProps) { + const projectKey = getProjectKey(undefined, component); + if (!projectKey || !os || !token) { + return null; + } + return ( + + ); +} + +export function RenderCommandForOther({ + component, + currentUser, + onDone, + organization, + os, + toggleModal, + token +}: AnalysisCommandRenderProps) { + const projectKey = getProjectKey(undefined, component); + if (!component || !projectKey || !os || !token) { + return null; + } + return ( + + ); +} + +function getBuildOptions({ + os, + setOS +}: RenderOSProps): { [k: string]: (props: AnalysisCommandRenderProps) => JSX.Element | null } { + return { + gradle: RenderCommandForGradle, + make: function make(props) { + return ( + <> + + + + ); + }, + maven: RenderCommandForMaven, + other: function other(props) { + return ( + <> + + + + ); + } + }; +} + +interface AnalysisCommandExtraProps { + mode: ProjectAnalysisModes; + getBuildOptions: ( + props: RenderOSProps + ) => { [k: string]: (props: AnalysisCommandRenderProps) => JSX.Element | null }; +} + +export function AnalysisCommandCommon(props: AnalysisCommandProps & AnalysisCommandExtraProps) { + const [os, setOS] = React.useState(undefined); + const [isModalVisible, toggleModal] = React.useState(false); + const { buildType } = props; + + if (!os && props.os) { + setOS(props.os); + } + + const toggleTokenModal = () => toggleModal(!isModalVisible); + + const close = () => toggleModal(false); + + const save = (t: string) => { + props.setToken(t); + close(); + }; + + const callOnDone = () => { + props.onDone({ os }); + }; + + const Build = (buildType && props.getBuildOptions({ os, setOS })[buildType]) || undefined; + + return Build ? ( + <> + {isModalVisible && ( + + )} + + + + ) : null; +} + +export default function AnalysisCommandOtherCI(props: AnalysisCommandProps) { + return ( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandTravis.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandTravis.tsx new file mode 100644 index 00000000000..112e8ad5193 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/AnalysisCommandTravis.tsx @@ -0,0 +1,207 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { JavaMavenTravisSonarCloud } from './TravisSonarCloud/JavaMavenTravisSonarCloud'; +import { JavaGradleTravisSonarCloud } from './TravisSonarCloud/JavaGradleTravisSonarCloud'; +import { OtherTravisSonarCloud } from './TravisSonarCloud/OtherTravisSonarCloud'; +import { ClangGCCTravisSonarCloud } from './TravisSonarCloud/ClangGCCTravisSonarCloud'; +import { getHostUrl } from '../../../../helpers/urls'; +import CodeSnippet from '../../../../components/common/CodeSnippet'; +import { translate } from '../../../../helpers/l10n'; +import { getProjectKey } from '../ProjectAnalysisStep'; + +interface Props { + buildType: string | undefined; + component?: T.Component; + organization?: string; + small?: boolean; + token?: string; +} + +interface RenderProps { + component?: T.Component; + organization?: string; + small?: boolean; + token?: string; +} + +export function getSonarcloudAddonYml(organization: string = '') { + return `addons: + sonarcloud: + organization: ${organization ? `"${organization}"` : `"Add your organization key"`} + token: + secure: "**************************" # encrypted value of your token`; +} + +export function getSonarcloudAddonYmlRender(organization: string = '') { + return ( + <> + {`addons: + sonarcloud: + organization: ${organization ? `"${organization}"` : `"Add your organization key"`} + token: + secure: `} + { + + {'"**************************"'} # encrypted value of your token + + } +
+ + ); +} + +export function RequirementJavaBuild() { + return ( + <> +

{translate('onboarding.analysis.with.travis.environments')}

+ +
+ + +
+ + + ); +} + +export function RequirementOtherBuild() { + return ( + <> +

+ {translate('onboarding.analysis.with.travis.environment')}{' '} + + {translate('onboarding.analysis.with.travis.environment.image.ci')} + +

+ + + + ); +} + +export function RenderCommandForClangOrGCC({ component, organization, small, token }: RenderProps) { + const projectKey = getProjectKey(undefined, component); + if (!projectKey || !token) { + return null; + } + return ( + + ); +} + +export function RenderCommandForGradle({ component, organization, token }: RenderProps) { + if (!token) { + return null; + } + + return ( + + ); +} + +export function RenderCommandForMaven({ component, organization, token }: RenderProps) { + if (!token) { + return null; + } + + return ( + + ); +} + +export function RenderCommandForOther({ component, organization, token }: RenderProps) { + const projectKey = getProjectKey(undefined, component); + if (!projectKey || !token) { + return null; + } + return ( + + ); +} + +function getBuildOptions(): { + [k: string]: (props: Props) => JSX.Element | null; +} { + return { + gradle: RenderCommandForGradle, + make: RenderCommandForClangOrGCC, + maven: RenderCommandForMaven, + other: RenderCommandForOther + }; +} + +export default function AnalysisCommandTravis(props: Props) { + const { buildType } = props; + + const Build = (buildType && getBuildOptions()[buildType]) || undefined; + + return Build ? : null; +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/ClangGCC.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/ClangGCC.tsx index 43958932470..ffd7ded0454 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/ClangGCC.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/ClangGCC.tsx @@ -26,7 +26,7 @@ import InstanceMessage from '../../../../components/common/InstanceMessage'; import { translate } from '../../../../helpers/l10n'; import { quote } from '../../utils'; -interface Props { +export interface Props { host: string; os: string; organization?: string; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/ClangGCCCustom.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/ClangGCCCustom.tsx new file mode 100644 index 00000000000..940ae4fbef8 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/ClangGCCCustom.tsx @@ -0,0 +1,132 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { FormattedMessage } from 'react-intl'; +import { quote } from '../../../utils'; +import SQScanner from '../SQScanner'; +import BuildWrapper from '../BuildWrapper'; +import { translate } from '../../../../../helpers/l10n'; +import CodeSnippet from '../../../../../components/common/CodeSnippet'; +import { Button, EditButton } from '../../../../../components/ui/buttons'; +import { ProjectAnalysisModes } from '../../ProjectAnalysisStepFromBuildTool'; + +export interface Props { + host: string; + mode: ProjectAnalysisModes; + onDone: VoidFunction; + os: string; + organization?: string; + projectKey: string; + small?: boolean; + toggleModal: VoidFunction; + token: string; +} + +const executables: T.Dict = { + linux: 'build-wrapper-linux-x86-64', + win: 'build-wrapper-win-x86-64.exe', + mac: 'build-wrapper-macosx-x86' +}; + +interface ClangGCCProps extends Pick { + command1: string; + command2: (string | undefined)[]; + renderCommand2: () => JSX.Element; +} + +export function ClangGCCCommon(props: ClangGCCProps) { + return ( + <> +

+ {translate('onboarding.analysis.sq_scanner.execute')} +

+ +

+ {translate('onboarding.analysis.sq_scanner.execute.text.custom')} +

+ + + + + + + {translate('onboarding.analysis.sq_scanner.docs_link')} + + ) + }} + /> + +
+ +
+ + ); +} + +export default function ClangGCCCustom(props: Props) { + const command1 = `${executables[props.os]} --out-dir bw-output make clean all`; + + const q = quote(props.os); + const command2 = [ + props.os === 'win' ? 'sonar-scanner.bat' : 'sonar-scanner', + '-D' + q(`sonar.projectKey=${props.projectKey}`), + props.organization && '-D' + q(`sonar.organization=${props.organization}`), + '-D' + q('sonar.sources=.'), + '-D' + q('sonar.cfamily.build-wrapper-output=bw-output'), + '-D' + q(`sonar.host.url=${props.host}`), + '-D' + q(`sonar.login=${props.token}`) + ]; + + const renderCommand2 = () => ( + <> + {command2.join(' \\\n ')}{' '} + + + ); + + return ( +
+ + + +
+ ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/JavaGradleCustom.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/JavaGradleCustom.tsx new file mode 100644 index 00000000000..4743c348ce2 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/JavaGradleCustom.tsx @@ -0,0 +1,69 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { FormattedMessage } from 'react-intl'; +import { JavaCustomProps, RenderCustomContent } from './JavaMavenCustom'; +import { translate } from '../../../../../helpers/l10n'; +import CodeSnippet from '../../../../../components/common/CodeSnippet'; +import { ProjectAnalysisModes } from '../../ProjectAnalysisStepFromBuildTool'; + +export default function JavaGradleCustom(props: JavaCustomProps) { + const suffix = props.mode === ProjectAnalysisModes.CI ? '.ci' : ''; + const config = 'plugins {\n id "org.sonarqube" version "2.7"\n}'; + + const command = [ + './gradlew sonarqube', + props.projectKey && `-Dsonar.projectKey=${props.projectKey}`, + props.organization && `-Dsonar.organization=${props.organization}`, + `-Dsonar.host.url=${props.host}`, + `-Dsonar.login=${props.token}` + ]; + + return ( +
+

+ {translate(`onboarding.analysis.java.gradle.header${suffix}`)} +

+ + build.gradle, + plugin: org.sonarqube + }} + /> + + + +

+ {translate('onboarding.analysis.java.gradle.text.2')} +

+ + +
+ ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/JavaMavenCustom.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/JavaMavenCustom.tsx new file mode 100644 index 00000000000..c5758791803 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/JavaMavenCustom.tsx @@ -0,0 +1,130 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { FormattedMessage } from 'react-intl'; +import { translate } from '../../../../../helpers/l10n'; +import InstanceMessage from '../../../../../components/common/InstanceMessage'; +import CodeSnippet from '../../../../../components/common/CodeSnippet'; +import { Button, EditButton } from '../../../../../components/ui/buttons'; +import { ProjectAnalysisModes } from '../../ProjectAnalysisStepFromBuildTool'; + +export interface JavaCustomProps { + host: string; + mode: ProjectAnalysisModes; + onDone: VoidFunction; + organization?: string; + projectKey?: string; + toggleModal: VoidFunction; + token: string; +} + +interface RenderCustomCommandProps { + command: (string | undefined)[]; + toggleModal: VoidFunction; +} + +export function RenderCustomCommand({ + command, + toggleModal +}: RenderCustomCommandProps): JSX.Element { + return ( + <> + {command.join(' \\\n ')}{' '} + + + ); +} + +interface RenderCustomContent { + linkText: string; + linkUrl: string; + onDone: VoidFunction; +} + +export function RenderCustomContent({ + command, + linkText, + linkUrl, + onDone, + toggleModal +}: RenderCustomCommandProps & RenderCustomContent) { + return ( + <> + } + snippet={command} + wrap={true} + /> + +

+ + {translate(linkText)} + + ) + }} + /> +

+ +
+ +
+ + ); +} + +export default function JavaMavenCustom(props: JavaCustomProps) { + const suffix = props.mode === ProjectAnalysisModes.CI ? '.ci' : ''; + const command = [ + 'mvn sonar:sonar', + props.projectKey && `-Dsonar.projectKey=${props.projectKey}`, + props.organization && `-Dsonar.organization=${props.organization}`, + `-Dsonar.host.url=${props.host}`, + `-Dsonar.login=${props.token}` + ]; + + return ( +
+

+ {translate(`onboarding.analysis.java.maven.header${suffix}`)} +

+ +

+ +

+ + +
+ ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/OtherCustom.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/OtherCustom.tsx new file mode 100644 index 00000000000..9fd5b17bd50 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/OtherCustom.tsx @@ -0,0 +1,96 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import SQScanner from '..//SQScanner'; +import CodeSnippet from '../../../../../components/common/CodeSnippet'; +import InstanceMessage from '../../../../../components/common/InstanceMessage'; +import { translate } from '../../../../../helpers/l10n'; +import { quote } from '../../../utils'; +import { Button, EditButton } from '../../../../../components/ui/buttons'; +import { ProjectAnalysisModes } from '../../ProjectAnalysisStepFromBuildTool'; + +export interface Props { + component: T.Component; + currentUser: T.LoggedInUser; + host: string; + mode: ProjectAnalysisModes; + onDone: VoidFunction; + organization?: string; + os: string; + projectKey: string; + toggleModal: VoidFunction; + token: string; +} + +export default function OtherCustom(props: Props) { + const q = quote(props.os); + const command = [ + props.os === 'win' ? 'sonar-scanner.bat' : 'sonar-scanner', + '-D' + q(`sonar.projectKey=${props.projectKey}`), + props.organization && '-D' + q(`sonar.organization=${props.organization}`), + '-D' + q('sonar.sources=.'), + '-D' + q(`sonar.host.url=${props.host}`), + '-D' + q(`sonar.login=${props.token}`) + ]; + + const renderCommand = () => ( + <> + {command.join(' \\\n ')}{' '} + + + ); + + return ( +
+ + +

+ {translate('onboarding.analysis.sq_scanner.execute')} +

+ + + {transformedMessage => ( +

+ )} + + + + +

+ +

+ +
+
+ ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/ClangGCCCustom-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/ClangGCCCustom-test.tsx new file mode 100644 index 00000000000..37af8eddc42 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/ClangGCCCustom-test.tsx @@ -0,0 +1,58 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import ClangGCCCustom, { ClangGCCCommon } from '../ClangGCCCustom'; +import { ProjectAnalysisModes } from '../../../ProjectAnalysisStepFromBuildTool'; + +it('should render correctly', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); + +it('should render common elements correctly', () => { + const command1 = `command1`; + const command2 = [`command2`]; + const renderCommand2 = () => <>render command 2; + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/JavaGradleCustom-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/JavaGradleCustom-test.tsx new file mode 100644 index 00000000000..f86c99772ee --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/JavaGradleCustom-test.tsx @@ -0,0 +1,67 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import { ProjectAnalysisModes } from '../../../ProjectAnalysisStepFromBuildTool'; +import JavaGradleCustom from '../JavaGradleCustom'; +import { RenderCustomContent } from '../JavaMavenCustom'; + +const host = 'https://sonarcloud.io'; +const organization = 'use-the-force'; +const projectKey = 'luke-lightsaber'; +const token = 'sonarsource123'; + +it('should render correctly', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); + +it('should render gradle custom content', () => { + const command = [ + './gradlew sonarqube', + projectKey && `-Dsonar.projectKey=${projectKey}`, + organization && `-Dsonar.organization=${organization}`, + `-Dsonar.host.url=${host}`, + `-Dsonar.login=${token}` + ]; + const onDone = jest.fn(); + const toggleModal = jest.fn(); + + expect( + + ).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/JavaMavenCustom-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/JavaMavenCustom-test.tsx new file mode 100644 index 00000000000..21d987eb0e1 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/JavaMavenCustom-test.tsx @@ -0,0 +1,80 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import { ProjectAnalysisModes } from '../../../ProjectAnalysisStepFromBuildTool'; +import JavaMavenCustom, { RenderCustomContent } from '../JavaMavenCustom'; + +const host = 'https://sonarcloud.io'; +const organization = 'use-the-force'; +const projectKey = 'luke-lightsaber'; +const token = 'sonarsource123'; + +it('should render correctly', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); + +it('should render common elements correctly', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); + +it('should render maven custom content', () => { + const command = [ + 'mvn sonar:sonar', + projectKey && `-Dsonar.projectKey=${projectKey}`, + organization && `-Dsonar.organization=${organization}`, + `-Dsonar.host.url=${host}`, + `-Dsonar.login=${token}` + ]; + const onDone = jest.fn(); + const toggleModal = jest.fn(); + + expect( + + ).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/OtherCustom-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/OtherCustom-test.tsx new file mode 100644 index 00000000000..e9768fd08a8 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/OtherCustom-test.tsx @@ -0,0 +1,43 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import { ProjectAnalysisModes } from '../../../ProjectAnalysisStepFromBuildTool'; +import OtherCustom from '../OtherCustom'; +import { mockComponent, mockLoggedInUser } from '../../../../../../helpers/testMocks'; + +it('should render correctly', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/ClangGCCCustom-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/ClangGCCCustom-test.tsx.snap new file mode 100644 index 00000000000..db2f9576b45 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/ClangGCCCustom-test.tsx.snap @@ -0,0 +1,85 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render common elements correctly 1`] = ` + +

+ onboarding.analysis.sq_scanner.execute +

+

+ onboarding.analysis.sq_scanner.execute.text.custom +

+ + + + onboarding.analysis.sq_scanner.docs_link + , + } + } + /> +
+ +
+ +`; + +exports[`should render correctly 1`] = ` +
+ + + +
+`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/JavaGradleCustom-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/JavaGradleCustom-test.tsx.snap new file mode 100644 index 00000000000..c9917f8bc73 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/JavaGradleCustom-test.tsx.snap @@ -0,0 +1,68 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` +
+

+ onboarding.analysis.java.gradle.header +

+ + build.gradle + , + "plugin": + org.sonarqube + , + } + } + /> + +

+ onboarding.analysis.java.gradle.text.2 +

+ +
+`; + +exports[`should render gradle custom content 1`] = ` + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/JavaMavenCustom-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/JavaMavenCustom-test.tsx.snap new file mode 100644 index 00000000000..d5bba362ed7 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/JavaMavenCustom-test.tsx.snap @@ -0,0 +1,83 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render common elements correctly 1`] = ` +
+

+ onboarding.analysis.java.maven.header +

+

+ +

+ +
+`; + +exports[`should render correctly 1`] = ` +
+

+ onboarding.analysis.java.maven.header +

+

+ +

+ +
+`; + +exports[`should render maven custom content 1`] = ` + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/OtherCustom-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/OtherCustom-test.tsx.snap new file mode 100644 index 00000000000..a42ad5accc3 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Custom/__tests__/__snapshots__/OtherCustom-test.tsx.snap @@ -0,0 +1,54 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` +
+ +

+ onboarding.analysis.sq_scanner.execute +

+ + + + +

+

+ +
+
+`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/DotNet.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/DotNet.tsx index a6fe98e0c2e..9c7542f7733 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/DotNet.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/DotNet.tsx @@ -24,7 +24,7 @@ import CodeSnippet from '../../../../components/common/CodeSnippet'; import InstanceMessage from '../../../../components/common/InstanceMessage'; import { translate } from '../../../../helpers/l10n'; -interface Props { +export interface Props { host: string; organization?: string; projectKey: string; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaGradle.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaGradle.tsx index dfe6ff42834..5ee1c5c1954 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaGradle.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaGradle.tsx @@ -23,7 +23,7 @@ import CodeSnippet from '../../../../components/common/CodeSnippet'; import InstanceMessage from '../../../../components/common/InstanceMessage'; import { translate } from '../../../../helpers/l10n'; -interface Props { +export interface Props { host: string; organization?: string; projectKey?: string; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaMaven.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaMaven.tsx index 778796e0eb0..e0a234c706f 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaMaven.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/JavaMaven.tsx @@ -23,7 +23,7 @@ import CodeSnippet from '../../../../components/common/CodeSnippet'; import InstanceMessage from '../../../../components/common/InstanceMessage'; import { translate } from '../../../../helpers/l10n'; -interface Props { +export interface Props { host: string; organization?: string; projectKey?: string; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Other.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Other.tsx index c9445156179..8e5fd2dc32f 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/Other.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/Other.tsx @@ -25,7 +25,7 @@ import InstanceMessage from '../../../../components/common/InstanceMessage'; import { translate } from '../../../../helpers/l10n'; import { quote } from '../../utils'; -interface Props { +export interface Props { host: string; organization?: string; os: string; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/ClangGCCOtherCI.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/ClangGCCOtherCI.tsx new file mode 100644 index 00000000000..2e7c1921abc --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/ClangGCCOtherCI.tsx @@ -0,0 +1,108 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { quote } from '../../../utils'; +import SQScanner from '../SQScanner'; +import BuildWrapper from '../BuildWrapper'; +import { translate } from '../../../../../helpers/l10n'; +import CodeSnippet from '../../../../../components/common/CodeSnippet'; +import { EditButton } from '../../../../../components/ui/buttons'; +import { ClangGCCCommon } from '../Custom/ClangGCCCustom'; + +export interface Props { + host: string; + onDone: VoidFunction; + os: string; + organization?: string; + projectKey: string; + small?: boolean; + toggleModal: VoidFunction; + token: string; +} + +const executables: T.Dict = { + linux: 'build-wrapper-linux-x86-64', + win: 'build-wrapper-win-x86-64.exe', + mac: 'build-wrapper-macosx-x86' +}; + +export default function ClangGCCOtherCI(props: Props) { + const command1 = `${executables[props.os]} --out-dir bw-output make clean all`; + + const q = quote(props.os); + const command2 = [ + props.os === 'win' ? 'sonar-scanner.bat' : 'sonar-scanner', + '-D' + q(`sonar.projectKey=${props.projectKey}`), + props.organization && '-D' + q(`sonar.organization=${props.organization}`), + '-D' + q('sonar.sources=.'), + '-D' + q('sonar.cfamily.build-wrapper-output=bw-output'), + '-D' + q(`sonar.host.url=${props.host}`), + '-D' + q(`sonar.login=${props.token}`) + ]; + + const renderCommand2 = () => ( + <> + {command2.join(' \\\n ')}{' '} + + + ); + + const commandLinuxMac = ` +local SONAR_SCANNER_VERSION=${translate('onboarding.analysis.sonar_scanner_version')} +export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION +rm -rf $SONAR_SCANNER_HOME +mkdir -p $SONAR_SCANNER_HOME +curl -sSLo $HOME/.sonar/sonar-scanner.zip http://repo1.maven.org/maven2/org/sonarsource/scanner/cli/sonar-scanner-cli/$SONAR_SCANNER_VERSION/sonar-scanner-cli-$SONAR_SCANNER_VERSION.zip +unzip $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/ +rm $HOME/.sonar/sonar-scanner.zip +export PATH=$SONAR_SCANNER_HOME/bin:$PATH +export SONAR_SCANNER_OPTS="-server" + +curl -LsS https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip > build-wrapper-linux-x86.zip +unzip build-wrapper-linux-x86.zip`; + + return ( +
+ {props.os === 'win' ? ( + <> + + + + + ) : ( + <> +

+ {translate('onboarding.analysis.sq_scanner.header.ci')} +

+ + + + )} + + +
+ ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/OtherOtherCI.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/OtherOtherCI.tsx new file mode 100644 index 00000000000..2701ee3fe0e --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/OtherOtherCI.tsx @@ -0,0 +1,110 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import SQScanner from '..//SQScanner'; +import CodeSnippet from '../../../../../components/common/CodeSnippet'; +import InstanceMessage from '../../../../../components/common/InstanceMessage'; +import { translate } from '../../../../../helpers/l10n'; +import { quote } from '../../../utils'; +import { Button, EditButton } from '../../../../../components/ui/buttons'; + +export interface Props { + component: T.Component; + currentUser: T.LoggedInUser; + host: string; + onDone: VoidFunction; + organization?: string; + os: string; + projectKey: string; + toggleModal: VoidFunction; + token: string; +} + +export default function OtherOtherCI(props: Props) { + const q = quote(props.os); + const command = [ + props.os === 'win' ? 'sonar-scanner.bat' : 'sonar-scanner', + '-D' + q(`sonar.projectKey=${props.projectKey}`), + props.organization && '-D' + q(`sonar.organization=${props.organization}`), + '-D' + q('sonar.sources=.'), + '-D' + q(`sonar.host.url=${props.host}`), + '-D' + q(`sonar.login=${props.token}`) + ]; + + const renderCommand = () => ( + <> + {command.join(' \\\n ')}{' '} + + + ); + + const commandLinuxMac = ` +local SONAR_SCANNER_VERSION=${translate('onboarding.analysis.sonar_scanner_version')} +export SONAR_SCANNER_HOME=$HOME/.sonar/sonar-scanner-$SONAR_SCANNER_VERSION +rm -rf $SONAR_SCANNER_HOME +mkdir -p $SONAR_SCANNER_HOME +curl -sSLo $HOME/.sonar/sonar-scanner.zip http://repo1.maven.org/maven2/org/sonarsource/scanner/cli/sonar-scanner-cli/$SONAR_SCANNER_VERSION/sonar-scanner-cli-$SONAR_SCANNER_VERSION.zip +unzip $HOME/.sonar/sonar-scanner.zip -d $HOME/.sonar/ +rm $HOME/.sonar/sonar-scanner.zip +export PATH=$SONAR_SCANNER_HOME/bin:$PATH +export SONAR_SCANNER_OPTS="-server"`; + + return ( +
+ {props.os === 'win' ? ( + + ) : ( + <> +

+ {translate('onboarding.analysis.sq_scanner.header.ci')} +

+ + + + )} + +

+ {translate('onboarding.analysis.sq_scanner.execute.ci')} +

+ + + {transformedMessage => ( +

+ )} + + + + +

+ +

+ +
+
+ ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/ClangGCCOtherCI-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/ClangGCCOtherCI-test.tsx new file mode 100644 index 00000000000..ee38c21387c --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/ClangGCCOtherCI-test.tsx @@ -0,0 +1,39 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import ClangGCCOtherCI from '../ClangGCCOtherCI'; + +it('should render correctly', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/OtherOtherCI-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/OtherOtherCI-test.tsx new file mode 100644 index 00000000000..09321998252 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/OtherOtherCI-test.tsx @@ -0,0 +1,41 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import OtherOtherCI from '../OtherOtherCI'; +import { mockComponent, mockLoggedInUser } from '../../../../../../helpers/testMocks'; + +it('should render correctly', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/__snapshots__/ClangGCCOtherCI-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/__snapshots__/ClangGCCOtherCI-test.tsx.snap new file mode 100644 index 00000000000..ac5fd2ea7a8 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/__snapshots__/ClangGCCOtherCI-test.tsx.snap @@ -0,0 +1,45 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` +
+

+ onboarding.analysis.sq_scanner.header.ci +

+ build-wrapper-linux-x86.zip +unzip build-wrapper-linux-x86.zip" + /> + +
+`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/__snapshots__/OtherOtherCI-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/__snapshots__/OtherOtherCI-test.tsx.snap new file mode 100644 index 00000000000..42d6478713f --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/OtherCI/__tests__/__snapshots__/OtherOtherCI-test.tsx.snap @@ -0,0 +1,67 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` +
+

+ onboarding.analysis.sq_scanner.header.ci +

+ +

+ onboarding.analysis.sq_scanner.execute.ci +

+ + + + +

+

+ +
+
+`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/ClangGCCTravisSonarCloud.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/ClangGCCTravisSonarCloud.tsx new file mode 100644 index 00000000000..7a75cdcf909 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/ClangGCCTravisSonarCloud.tsx @@ -0,0 +1,57 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { CommonTravisSonarCloud } from './utils'; +import { getSonarcloudAddonYml, getSonarcloudAddonYmlRender } from '../AnalysisCommandTravis'; +import { Props } from '../ClangGCC'; + +export function ClangGCCTravisSonarCloud(props: Props) { + const command = `${getSonarcloudAddonYml(props.organization)} + +script: + - make clean + # Wraps the compilation with the Build Wrapper to generate configuration (used + # later by the SonarQube Scanner) into the "bw-output" folder + - build-wrapper-linux-x86-64 --out-dir bw-output make all + # Execute some tests + - make test + # And finally run the SonarQube analysis - read the "sonar-project.properties" + # file to see the specific configuration + - sonar-scanner`; + + const renderCommand = () => ( + <> + {getSonarcloudAddonYmlRender(props.organization)} +
+ {`script: + - make clean + # Wraps the compilation with the Build Wrapper to generate configuration (used + # later by the SonarQube Scanner) into the "bw-output" folder + - build-wrapper-linux-x86-64 --out-dir bw-output make all + # Execute some tests + - make test + # And finally run the SonarQube analysis - read the "sonar-project.properties" + # file to see the specific configuration + - sonar-scanner`} + + ); + + return ; +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/JavaGradleTravisSonarCloud.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/JavaGradleTravisSonarCloud.tsx new file mode 100644 index 00000000000..6393b7baa9c --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/JavaGradleTravisSonarCloud.tsx @@ -0,0 +1,115 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { FormattedMessage } from 'react-intl'; +import { + getSonarcloudAddonYml, + RequirementJavaBuild, + getSonarcloudAddonYmlRender +} from '../AnalysisCommandTravis'; +import { Props } from '../JavaGradle'; +import { translate } from '../../../../../helpers/l10n'; +import CodeSnippet from '../../../../../components/common/CodeSnippet'; + +export function JavaGradleTravisSonarCloud(props: Props) { + const config = `plugins { + id "org.sonarqube" version "2.7" +} + +sonarqube { + properties { + sonar.projectKey: ${props.projectKey} + } +}`; + + const command = `${getSonarcloudAddonYml(props.organization)} + +script: + - ./gradlew sonarqube`; + + const renderCommand = () => ( + <> + {getSonarcloudAddonYmlRender(props.organization)} +
+ {` script: + - ./gradlew sonarqube`} + + ); + + return ( +
+

+ {translate('onboarding.analysis.with.travis.setup.title.a')} +

+ + + +
+ +

+ {translate('onboarding.analysis.with.travis.setup.title.b')} +

+ + build.gradle, + plugin: org.sonarqube + }} + /> + + + + .travis.yml + }} + /> + + + + + {translate('onboarding.analysis.sqscanner.docs.gradle.title')} + + ), + useCaseLink: ( + + {translate('onboarding.analysis.sqscanner.docs.gradle.example_project.title')} + + ) + }} + /> +
+ ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/JavaMavenTravisSonarCloud.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/JavaMavenTravisSonarCloud.tsx new file mode 100644 index 00000000000..5a5fa44c0dd --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/JavaMavenTravisSonarCloud.tsx @@ -0,0 +1,80 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { Props } from '../JavaMaven'; +import { + getSonarcloudAddonYml, + RequirementJavaBuild, + getSonarcloudAddonYmlRender +} from '../AnalysisCommandTravis'; +import { translate } from '../../../../../helpers/l10n'; +import CodeSnippet from '../../../../../components/common/CodeSnippet'; + +export function JavaMavenTravisSonarCloud(props: Props) { + const command = `${getSonarcloudAddonYml(props.organization)} + +script: + # the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis + - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar`; + + const renderCommand = () => ( + <> + {getSonarcloudAddonYmlRender(props.organization)} +
+ {`script: + # the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis + - mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent install sonar:sonar -Dsonar.projectKey=${ + props.projectKey + }`} + + ); + + return ( +
+

+ {translate('onboarding.analysis.with.travis.setup.title.a')} +

+ + + +
+ +

+ {translate('onboarding.analysis.with.travis.setup.title.b')} +

+ +

+ + + +

+

+ ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/OtherTravisSonarCloud.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/OtherTravisSonarCloud.tsx new file mode 100644 index 00000000000..0a89214429c --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/OtherTravisSonarCloud.tsx @@ -0,0 +1,43 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { CommonTravisSonarCloud } from './utils'; +import { getSonarcloudAddonYml, getSonarcloudAddonYmlRender } from '../AnalysisCommandTravis'; +import { Props } from '../Other'; + +export function OtherTravisSonarCloud(props: Props) { + const command = `${getSonarcloudAddonYml(props.organization)} + +script: + # the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis + - sonar-scanner`; + + const renderCommand = () => ( + <> + {getSonarcloudAddonYmlRender(props.organization)} +
+ {`script: + # the following command line builds the project, runs the tests with coverage and then execute the SonarCloud analysis + - sonar-scanner`} + + ); + + return ; +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/ClangGCCTravisSonarCloud-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/ClangGCCTravisSonarCloud-test.tsx new file mode 100644 index 00000000000..2a2094233ed --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/ClangGCCTravisSonarCloud-test.tsx @@ -0,0 +1,37 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import { ClangGCCTravisSonarCloud } from '../ClangGCCTravisSonarCloud'; + +it('should render correctly', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/JavaGradleTravisSonarCloud-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/JavaGradleTravisSonarCloud-test.tsx new file mode 100644 index 00000000000..9d107303906 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/JavaGradleTravisSonarCloud-test.tsx @@ -0,0 +1,35 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import { JavaGradleTravisSonarCloud } from '../JavaGradleTravisSonarCloud'; + +it('should render correctly', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/JavaMavenTravisSonarCloud-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/JavaMavenTravisSonarCloud-test.tsx new file mode 100644 index 00000000000..d41e247c5f9 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/JavaMavenTravisSonarCloud-test.tsx @@ -0,0 +1,35 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import { JavaMavenTravisSonarCloud } from '../JavaMavenTravisSonarCloud'; + +it('should render correctly', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/OtherTravisSonarCloud-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/OtherTravisSonarCloud-test.tsx new file mode 100644 index 00000000000..6f8cd9aacc7 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/OtherTravisSonarCloud-test.tsx @@ -0,0 +1,36 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import { OtherTravisSonarCloud } from '../OtherTravisSonarCloud'; + +it('should render correctly', () => { + expect( + shallow( + + ) + ).toMatchSnapshot(); +}); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/ClangGCCTravisSonarCloud-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/ClangGCCTravisSonarCloud-test.tsx.snap new file mode 100644 index 00000000000..7d58d40a12c --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/ClangGCCTravisSonarCloud-test.tsx.snap @@ -0,0 +1,23 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/JavaGradleTravisSonarCloud-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/JavaGradleTravisSonarCloud-test.tsx.snap new file mode 100644 index 00000000000..9485912cb17 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/JavaGradleTravisSonarCloud-test.tsx.snap @@ -0,0 +1,89 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` +
+

+ onboarding.analysis.with.travis.setup.title.a +

+ +
+

+ onboarding.analysis.with.travis.setup.title.b +

+ + build.gradle + , + "plugin": + org.sonarqube + , + } + } + /> + + + .travis.yml + , + } + } + /> + + + onboarding.analysis.sqscanner.docs.gradle.title + , + "useCaseLink": + onboarding.analysis.sqscanner.docs.gradle.example_project.title + , + } + } + /> +
+`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/JavaMavenTravisSonarCloud-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/JavaMavenTravisSonarCloud-test.tsx.snap new file mode 100644 index 00000000000..8e8ee41639a --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/JavaMavenTravisSonarCloud-test.tsx.snap @@ -0,0 +1,48 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` +
+

+ onboarding.analysis.with.travis.setup.title.a +

+ +
+

+ onboarding.analysis.with.travis.setup.title.b +

+

+ +

+

+`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/OtherTravisSonarCloud-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/OtherTravisSonarCloud-test.tsx.snap new file mode 100644 index 00000000000..a4ef135c144 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/__tests__/__snapshots__/OtherTravisSonarCloud-test.tsx.snap @@ -0,0 +1,16 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/utils.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/utils.tsx new file mode 100644 index 00000000000..ae2b2ec06dc --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/TravisSonarCloud/utils.tsx @@ -0,0 +1,72 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { FormattedMessage } from 'react-intl'; +import { translate } from '../../../../../helpers/l10n'; +import { RequirementOtherBuild } from '../AnalysisCommandTravis'; +import CodeSnippet from '../../../../../components/common/CodeSnippet'; + +interface CommonTravisSonarCloudProps { + command: string; + renderCommand: () => JSX.Element; +} + +export function CommonTravisSonarCloud({ command, renderCommand }: CommonTravisSonarCloudProps) { + return ( +
+

+ {translate('onboarding.analysis.with.travis.setup.title.a')} +

+ + + +
+ +

+ {translate('onboarding.analysis.with.travis.setup.title.b')} +

+ + .travis.yml + }} + /> + + + + + {translate('onboarding.analysis.sq_scanner.docs_link')} + + ) + }} + /> +
+ ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandCustom-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandCustom-test.tsx new file mode 100644 index 00000000000..afeec8bd0ad --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandCustom-test.tsx @@ -0,0 +1,131 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import AnalysisCommandTravis, { + RenderCommandForClangOrGCC, + RenderCommandForGradle, + RenderCommandForMaven, + RenderCommandForOther +} from '../AnalysisCommandCustom'; +import { ProjectAnalysisModes } from '../../ProjectAnalysisStepFromBuildTool'; +import { mockComponent, mockLoggedInUser } from '../../../../../helpers/testMocks'; + +const organization = 'org'; +const token = '123'; + +it('should render for Clang or GCC', () => { + expect(shallowRender('make')).toMatchSnapshot(); +}); + +it('should render for Gradle', () => { + expect(shallowRender('gradle')).toMatchSnapshot(); +}); + +it('should render for Maven', () => { + expect(shallowRender('maven')).toMatchSnapshot(); +}); + +it('should render for other', () => { + expect(shallowRender('other')).toMatchSnapshot(); +}); + +it('should render for unsupported build systems', () => { + expect(shallowRender('whatever')).toMatchSnapshot(); +}); + +it('should render RenderCommandForClangOrGCC', () => { + const render = (token?: string) => + shallow( + + ); + + expect(render()).toMatchSnapshot(); + expect(render('123')).toMatchSnapshot(); +}); + +it('should render RenderCommandForGradle', () => { + const render = (token?: string) => + shallow( + + ); + + expect(render()).toMatchSnapshot(); + expect(render('123')).toMatchSnapshot(); +}); + +it('should render RenderCommandForMaven', () => { + const render = (token?: string) => + shallow( + + ); + + expect(render()).toMatchSnapshot(); + expect(render('123')).toMatchSnapshot(); +}); + +it('should render RenderCommandForOther', () => { + const render = (token?: string) => + shallow( + + ); + + expect(render()).toMatchSnapshot(); + expect(render('123')).toMatchSnapshot(); +}); + +function shallowRender(buildType: string) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandOtherCI-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandOtherCI-test.tsx new file mode 100644 index 00000000000..897f028f755 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandOtherCI-test.tsx @@ -0,0 +1,146 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import AnalysisCommandOtherCI, { + AnalysisCommandCommon, + RenderCommandForClangOrGCC, + RenderCommandForOther +} from '../AnalysisCommandOtherCI'; +import { ProjectAnalysisModes } from '../../ProjectAnalysisStepFromBuildTool'; +import { mockComponent, mockLoggedInUser } from '../../../../../helpers/testMocks'; + +const organization = 'org'; +const token = '123'; + +it('should render for Clang or GCC', () => { + expect(shallowRender('make')).toMatchSnapshot(); +}); + +it('should render for Gradle', () => { + expect(shallowRender('gradle')).toMatchSnapshot(); +}); + +it('should render for Maven', () => { + expect(shallowRender('maven')).toMatchSnapshot(); +}); + +it('should render for other', () => { + expect(shallowRender('other')).toMatchSnapshot(); +}); + +it('should render for unsupported build systems', () => { + expect(shallowRender('whatever')).toMatchSnapshot(); +}); + +it('should render AnalysisCommandCustom correctly', () => { + const getBuildOptions = jest.fn().mockResolvedValue(null); + const wrapper = shallow( + + ); + + expect(wrapper).toMatchSnapshot(); + expect(getBuildOptions).toHaveBeenCalled(); +}); + +// TODO make it work +// it('should execute function when the user interacts with the component', async () => { +// const getBuildOptions = jest.fn().mockReturnValue({ +// maven: RenderCommandForMaven +// }); +// const onDone = jest.fn(); +// const setToken = jest.fn(); +// const wrapper = shallow( +// +// ); +// +// (wrapper.find('RenderCommandForMaven').prop('toggleTokenModal') as Function)(); +// await waitAndUpdate(wrapper); +// (wrapper.find('EditTokenModal').prop('onSave') as Function)(); +// +// expect(setToken).toHaveBeenCalledWith(token); +// }); + +it('should render RenderCommandForClangOrGCC', () => { + const render = (token?: string) => + shallow( + + ); + + expect(render()).toMatchSnapshot(); + expect(render('123')).toMatchSnapshot(); +}); + +it('should render RenderCommandForOther', () => { + const render = (token?: string) => + shallow( + + ); + + expect(render()).toMatchSnapshot(); + expect(render('123')).toMatchSnapshot(); +}); + +function shallowRender(buildType: string) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandTravis-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandTravis-test.tsx new file mode 100644 index 00000000000..ad5f0bad139 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/AnalysisCommandTravis-test.tsx @@ -0,0 +1,123 @@ +/* + * SonarQube + * Copyright (C) 2009-2019 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. + */ +import * as React from 'react'; +import { shallow } from 'enzyme'; +import AnalysisCommandTravis, { + getSonarcloudAddonYml, + getSonarcloudAddonYmlRender, + RenderCommandForClangOrGCC, + RenderCommandForGradle, + RenderCommandForMaven, + RenderCommandForOther, + RequirementJavaBuild, + RequirementOtherBuild +} from '../AnalysisCommandTravis'; + +const component = { + key: 'foo', + analysisDate: '2016-01-01', + breadcrumbs: [], + name: 'Foo', + organization: 'org', + qualifier: 'TRK', + version: '0.0.1' +}; + +const organization = 'org'; +const token = '123'; + +it('should render for Clang or GCC', () => { + expect( + shallowRender('make') + .find(RenderCommandForClangOrGCC) + .exists() + ).toBeTruthy(); +}); + +it('should render for Gradle', () => { + expect( + shallowRender('gradle') + .find(RenderCommandForGradle) + .exists() + ).toBeTruthy(); +}); + +it('should render for Maven', () => { + expect( + shallowRender('maven') + .find(RenderCommandForMaven) + .exists() + ).toBeTruthy(); +}); + +it('should render for other', () => { + expect( + shallowRender('other') + .find(RenderCommandForOther) + .exists() + ).toBeTruthy(); +}); + +it('should render nothing for unsupported build', () => { + expect( + shallowRender() + .find(RenderCommandForOther) + .exists() + ).toBeFalsy(); + + expect( + shallowRender('anotherBuild') + .find(RenderCommandForOther) + .exists() + ).toBeFalsy(); +}); + +it('should render nothing when there is no project key', () => { + expect(shallow().html()).toBe(null); + expect(shallow().html()).toBe(null); + expect(shallow().html()).toBe(null); + expect(shallow().html()).toBe(null); +}); + +it('should render the sonarcloud yaml for travis', () => { + expect(getSonarcloudAddonYml()).toMatchSnapshot(); + expect(getSonarcloudAddonYml('SonarSource')).toMatchSnapshot(); +}); + +it('should render the sonarcloud yaml for travis', () => { + expect(getSonarcloudAddonYmlRender()).toMatchSnapshot(); + expect(getSonarcloudAddonYmlRender('SonarSource')).toMatchSnapshot(); +}); + +it('should render the requirements for builds', () => { + expect(shallow()).toMatchSnapshot(); + expect(shallow()).toMatchSnapshot(); +}); + +function shallowRender(buildType?: string) { + return shallow( + + ); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/ClangGCC-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/ClangGCC-test.tsx index a98ddc4b2a4..67ccb52e35e 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/ClangGCC-test.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/ClangGCC-test.tsx @@ -31,15 +31,6 @@ it('renders correctly', () => { ).toMatchSnapshot(); expect( - shallow( - - ) + shallow() ).toMatchSnapshot(); }); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/DotNet-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/DotNet-test.tsx index ee08b95614c..9729e6e12b6 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/DotNet-test.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/DotNet-test.tsx @@ -19,19 +19,19 @@ */ import * as React from 'react'; import { shallow } from 'enzyme'; -import DotNet from '../DotNet'; +import DotNet, { Props } from '../DotNet'; + +it('DotNet renders correctly', () => { + expect(shallowRender).toMatchSnapshot(); -it('renders correctly', () => { - expect(shallow()).toMatchSnapshot(); expect( - shallow( - - ) + shallowRender({ + organization: 'organization', + small: true + }) ).toMatchSnapshot(); }); + +function shallowRender(props: Partial = {}) { + return shallow(); +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/Other-test.tsx b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/Other-test.tsx index 9fc3b3a8af2..d73e4dd5545 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/Other-test.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/Other-test.tsx @@ -31,14 +31,6 @@ it('renders correctly', () => { ).toMatchSnapshot(); expect( - shallow( - - ) + shallow() ).toMatchSnapshot(); }); diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandCustom-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandCustom-test.tsx.snap new file mode 100644 index 00000000000..54355357c90 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandCustom-test.tsx.snap @@ -0,0 +1,253 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render RenderCommandForClangOrGCC 1`] = `""`; + +exports[`should render RenderCommandForClangOrGCC 2`] = `""`; + +exports[`should render RenderCommandForGradle 1`] = `""`; + +exports[`should render RenderCommandForGradle 2`] = ` + +`; + +exports[`should render RenderCommandForMaven 1`] = `""`; + +exports[`should render RenderCommandForMaven 2`] = ` + +`; + +exports[`should render RenderCommandForOther 1`] = `""`; + +exports[`should render RenderCommandForOther 2`] = `""`; + +exports[`should render for Clang or GCC 1`] = ` + +`; + +exports[`should render for Gradle 1`] = ` + +`; + +exports[`should render for Maven 1`] = ` + +`; + +exports[`should render for other 1`] = ` + +`; + +exports[`should render for unsupported build systems 1`] = ` + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandOtherCI-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandOtherCI-test.tsx.snap new file mode 100644 index 00000000000..e76b7c16838 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandOtherCI-test.tsx.snap @@ -0,0 +1,231 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render AnalysisCommandCustom correctly 1`] = `""`; + +exports[`should render RenderCommandForClangOrGCC 1`] = `""`; + +exports[`should render RenderCommandForClangOrGCC 2`] = `""`; + +exports[`should render RenderCommandForOther 1`] = `""`; + +exports[`should render RenderCommandForOther 2`] = `""`; + +exports[`should render for Clang or GCC 1`] = ` + +`; + +exports[`should render for Gradle 1`] = ` + +`; + +exports[`should render for Maven 1`] = ` + +`; + +exports[`should render for other 1`] = ` + +`; + +exports[`should render for unsupported build systems 1`] = ` + +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandTravis-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandTravis-test.tsx.snap new file mode 100644 index 00000000000..766d1f7633b --- /dev/null +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/AnalysisCommandTravis-test.tsx.snap @@ -0,0 +1,137 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render the requirements for builds 1`] = ` + +

+ onboarding.analysis.with.travis.environments +

+
+ +
+ + +`; + +exports[`should render the requirements for builds 2`] = ` + +

+ onboarding.analysis.with.travis.environment + + + onboarding.analysis.with.travis.environment.image.ci + +

+ + +`; + +exports[`should render the sonarcloud yaml for travis 1`] = ` +"addons: + sonarcloud: + organization: \\"Add your organization key\\" + token: + secure: \\"**************************\\" # encrypted value of your token" +`; + +exports[`should render the sonarcloud yaml for travis 2`] = ` +"addons: + sonarcloud: + organization: \\"SonarSource\\" + token: + secure: \\"**************************\\" # encrypted value of your token" +`; + +exports[`should render the sonarcloud yaml for travis 3`] = ` + + addons: + sonarcloud: + organization: "Add your organization key" + token: + secure: + + "**************************" + # encrypted value of your token + +
+ +`; + +exports[`should render the sonarcloud yaml for travis 4`] = ` + + addons: + sonarcloud: + organization: "SonarSource" + token: + secure: + + "**************************" + # encrypted value of your token + +
+ +`; diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap index be959ee6158..1cb370c9652 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/ClangGCC-test.tsx.snap @@ -145,7 +145,7 @@ exports[`renders correctly 3`] = ` Array [ "sonar-scanner", "-Dsonar.projectKey=projectKey", - "-Dsonar.organization=organization", + undefined, "-Dsonar.sources=.", "-Dsonar.cfamily.build-wrapper-output=bw-output", "-Dsonar.host.url=host", diff --git a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/DotNet-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/DotNet-test.tsx.snap index f455da670c8..19a293729fb 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/DotNet-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/tutorials/components/commands/__tests__/__snapshots__/DotNet-test.tsx.snap @@ -1,65 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`renders correctly 1`] = ` -
- -

- onboarding.analysis.msbuild.execute -

- - - - - - -

- - onboarding.analysis.msbuild.docs_link - , - } - } - /> -

-
-`; +exports[`DotNet renders correctly 1`] = `[Function]`; -exports[`renders correctly 2`] = ` +exports[`DotNet renders correctly 2`] = `

void; + organization?: string; + os?: string; + setToken: (token: string) => void; + small?: boolean; + token?: string; +} + +export interface AnalysisCommandRenderProps { + component?: T.Component; + currentUser: T.LoggedInUser; + mode: ProjectAnalysisModes; + onDone: (data?: object) => void; + organization?: string; + os?: string; + small?: boolean; + toggleModal: VoidFunction; + token?: string; +} diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingModal.tsx b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingModal.tsx index 3051b630d83..be329f2055e 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingModal.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingModal.tsx @@ -30,8 +30,8 @@ import '../styles.css'; export interface Props { currentUser: T.LoggedInUser; - onClose: () => void; - onOpenProjectOnboarding: () => void; + onClose: VoidFunction; + onOpenProjectOnboarding: VoidFunction; userOrganizations: T.Organization[]; } diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingPage.tsx b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingPage.tsx index 52644d6b02e..68cbd0559f6 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingPage.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OnboardingPage.tsx @@ -26,7 +26,7 @@ import { Router } from '../../../components/hoc/withRouter'; interface Props { router: Router; - skipOnboarding: () => void; + skipOnboarding: VoidFunction; } export class OnboardingPage extends React.PureComponent { diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationsShortList.tsx b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationsShortList.tsx index d7685c0cffb..2cb0f4c2b13 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationsShortList.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationsShortList.tsx @@ -25,7 +25,7 @@ import { translate, translateWithParameters } from '../../../helpers/l10n'; export interface Props { organizations: T.Organization[]; - onClick: () => void; + onClick: VoidFunction; } export default function OrganizationsShortList({ onClick, organizations }: Props) { diff --git a/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationsShortListItem.tsx b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationsShortListItem.tsx index c9740ebd5e8..81f8a8219af 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationsShortListItem.tsx +++ b/server/sonar-web/src/main/js/apps/tutorials/onboarding/OrganizationsShortListItem.tsx @@ -24,7 +24,7 @@ import { withRouter, Router } from '../../../components/hoc/withRouter'; import { getOrganizationUrl } from '../../../helpers/urls'; interface Props { - onClick: () => void; + onClick: VoidFunction; organization: T.Organization; router: Router; } diff --git a/server/sonar-web/src/main/js/apps/tutorials/utils.ts b/server/sonar-web/src/main/js/apps/tutorials/utils.ts index d689b874efd..c8a3aa5fb6a 100644 --- a/server/sonar-web/src/main/js/apps/tutorials/utils.ts +++ b/server/sonar-web/src/main/js/apps/tutorials/utils.ts @@ -25,6 +25,18 @@ export interface LanguageConfig { projectKey?: string; } +export interface StepProps { + component?: T.Component; + finished?: boolean; + hasStepAfter?: (hasStepAfter: boolean) => void; + onContinue: VoidFunction; + onOpen: VoidFunction; + open: boolean; + organization?: string; + stepNumber: number; + token?: string; +} + export function isLanguageConfigured(config?: LanguageConfig) { if (!config) { return false; @@ -42,3 +54,17 @@ export function isLanguageConfigured(config?: LanguageConfig) { export function quote(os: string): (s: string) => string { return os === 'win' ? (s: string) => `"${s}"` : (s: string) => s; } + +export function getUniqueTokenName(tokens: T.UserToken[], initialTokenName = '') { + const hasToken = (name: string) => tokens.find(token => token.name === name) !== undefined; + + if (!hasToken(initialTokenName)) { + return initialTokenName; + } + + let i = 1; + while (hasToken(`${initialTokenName} ${i}`)) { + i++; + } + return `${initialTokenName} ${i}`; +} diff --git a/server/sonar-web/src/main/js/components/common/CodeSnippet.css b/server/sonar-web/src/main/js/components/common/CodeSnippet.css index 31d5b089804..30f2e3bf358 100644 --- a/server/sonar-web/src/main/js/components/common/CodeSnippet.css +++ b/server/sonar-web/src/main/js/components/common/CodeSnippet.css @@ -30,7 +30,7 @@ overflow: auto; } -.code-snippet button { +.code-snippet > button { position: absolute; top: calc(2 * var(--gridSize)); right: calc(2 * var(--gridSize)); @@ -42,9 +42,9 @@ user-select: none; } -.code-snippet button:hover, -.code-snippet button:focus, -.code-snippet button:active { +.code-snippet > button:hover, +.code-snippet > button:focus, +.code-snippet > button:active { background-color: #fff; color: var(--gray40); } @@ -53,7 +53,28 @@ padding-bottom: 40px; } -.code-snippet-oneline button { +.code-snippet-oneline > button { top: auto; - top: 40px; + bottom: 16px; +} + +.code-snippet-wrap pre { + white-space: pre-wrap; + word-break: break-all; +} + +.code-snippet .highlight { + font-weight: bold; + color: var(--alertBorderError); +} + +.code-snippet .button-icon { + color: #fff !important; +} + +.code-snippet .button-icon:hover svg, +.code-snippet .button-icon:focus svg, +.code-snippet .button-icon:active svg { + background-color: #fff; + color: var(--gray40); } 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 b7c5592d79d..660cbcbe196 100644 --- a/server/sonar-web/src/main/js/components/common/CodeSnippet.tsx +++ b/server/sonar-web/src/main/js/components/common/CodeSnippet.tsx @@ -26,21 +26,35 @@ interface Props { className?: string; isOneLine?: boolean; noCopy?: boolean; + render?: () => JSX.Element; snippet: string | (string | undefined)[]; + wrap?: boolean; } // keep this "useless" concatentation for the readability reason // eslint-disable-next-line no-useless-concat const s = ' \\' + '\n '; -export default function CodeSnippet({ className, isOneLine, noCopy, snippet }: Props) { +export default function CodeSnippet({ + className, + isOneLine, + noCopy, + render, + snippet, + wrap +}: Props) { const snippetArray = Array.isArray(snippet) ? snippet.filter(line => line !== undefined) : [snippet]; const finalSnippet = isOneLine ? snippetArray.join(' ') : snippetArray.join(s); return ( -
- 
{finalSnippet}
+
+ 
{render ? render() : finalSnippet}
{!noCopy && }
); diff --git a/server/sonar-web/src/main/js/components/common/__tests__/__snapshots__/CodeSnippet-test.tsx.snap b/server/sonar-web/src/main/js/components/common/__tests__/__snapshots__/CodeSnippet-test.tsx.snap index 734f034202e..57eb740cd03 100644 --- a/server/sonar-web/src/main/js/components/common/__tests__/__snapshots__/CodeSnippet-test.tsx.snap +++ b/server/sonar-web/src/main/js/components/common/__tests__/__snapshots__/CodeSnippet-test.tsx.snap @@ -26,7 +26,7 @@ bar" visible={false} >