From 863d8a11ad8dcc3bdeedf13539e3aca9d4b45ad3 Mon Sep 17 00:00:00 2001 From: Philippe Perrin Date: Tue, 25 Aug 2020 11:37:57 +0200 Subject: [PATCH] SONAR-13806 Move target of documentation links to the embedded doc when possible --- .../apps/about/components/AboutCleanCode.tsx | 2 +- .../apps/about/components/AboutLeakPeriod.tsx | 2 +- .../about/components/AboutQualityGates.tsx | 2 +- .../apps/about/components/AboutScanners.tsx | 21 ++-- .../apps/about/components/AboutStandards.tsx | 2 +- .../js/apps/about/components/ReadMore.tsx | 5 +- .../__tests__/AboutScanners-test.tsx | 32 ++++++ .../__snapshots__/AboutScanners-test.tsx.snap | 108 ++++++++++++++++++ .../settings/encryption/EncryptionForm.tsx | 8 +- .../encryption/GenerateSecretKeyForm.tsx | 8 +- .../EncryptionForm-test.tsx.snap | 9 +- .../GenerateSecretKeyForm-test.tsx.snap | 9 +- .../tutorials/manual/commands/DotNet.tsx | 8 +- .../tutorials/manual/commands/JavaGradle.tsx | 8 +- .../tutorials/manual/commands/JavaMaven.tsx | 8 +- .../manual/commands/MSBuildScanner.tsx | 8 +- .../tutorials/manual/commands/Other.tsx | 8 +- .../tutorials/manual/commands/SQScanner.tsx | 9 +- .../__snapshots__/DotNet-test.tsx.snap | 9 +- .../__snapshots__/JavaGradle-test.tsx.snap | 27 +++-- .../__snapshots__/JavaMaven-test.tsx.snap | 27 +++-- .../MSBuildScanner-test.tsx.snap | 9 +- .../__snapshots__/Other-test.tsx.snap | 27 +++-- .../__snapshots__/SQScanner-test.tsx.snap | 27 +++-- .../resources/org/sonar/l10n/core.properties | 3 - 25 files changed, 265 insertions(+), 121 deletions(-) create mode 100644 server/sonar-web/src/main/js/apps/about/components/__tests__/AboutScanners-test.tsx create mode 100644 server/sonar-web/src/main/js/apps/about/components/__tests__/__snapshots__/AboutScanners-test.tsx.snap diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx index 0e01c2bf8c6..46840d43d08 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutCleanCode.tsx @@ -21,7 +21,7 @@ import * as React from 'react'; import { translate } from 'sonar-ui-common/helpers/l10n'; import ReadMore from './ReadMore'; -const link = 'https://redirect.sonarsource.com/doc/issues.html'; +const link = '/documentation/user-guide/issues/'; export default function AboutCleanCode() { return ( diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx index f13b5165d7f..040eed76dbc 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutLeakPeriod.tsx @@ -21,7 +21,7 @@ import * as React from 'react'; import { translate } from 'sonar-ui-common/helpers/l10n'; import ReadMore from './ReadMore'; -const link = 'https://redirect.sonarsource.com/doc/fix-the-leak.html'; +const link = '/documentation/user-guide/clean-as-you-code/'; export default function AboutLeakPeriod() { return ( diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx index b16f009f7e1..24b0fd97036 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutQualityGates.tsx @@ -21,7 +21,7 @@ import * as React from 'react'; import { translate } from 'sonar-ui-common/helpers/l10n'; import ReadMore from './ReadMore'; -const link = 'https://redirect.sonarsource.com/doc/quality-gates.html'; +const link = '/documentation/user-guide/quality-gates/'; export default function AboutQualityGates() { return ( diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx index b9ea8f79e2f..d5ec72741e7 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutScanners.tsx @@ -18,33 +18,34 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; +import { Link } from 'react-router'; import { translate } from 'sonar-ui-common/helpers/l10n'; import { getBaseUrl } from 'sonar-ui-common/helpers/urls'; const scanners = [ { key: 'sonarqube', - link: 'https://redirect.sonarsource.com/doc/install-configure-scanner.html' + link: '/documentation/analysis/scan/sonarscanner/' }, { key: 'msbuild', - link: 'https://redirect.sonarsource.com/doc/install-configure-scanner-msbuild.html' + link: '/documentation/analysis/scan/sonarscanner-for-msbuild/' }, { key: 'maven', - link: 'https://redirect.sonarsource.com/doc/install-configure-scanner-maven.html' + link: '/documentation/analysis/scan/sonarscanner-for-maven/' }, { key: 'gradle', - link: 'https://redirect.sonarsource.com/doc/gradle.html' + link: '/documentation/analysis/scan/sonarscanner-for-gradle/' }, { key: 'jenkins', - link: 'https://redirect.sonarsource.com/plugins/jenkins.html' + link: '/documentation/analysis/scan/sonarscanner-for-jenkins/' }, { key: 'ant', - link: 'https://redirect.sonarsource.com/doc/install-configure-scanner-ant.html' + link: '/documentation/analysis/scan/sonarscanner-for-ant/' } ]; @@ -56,13 +57,17 @@ export default function AboutScanners() {

{translate('about_page.scanners.text')}

{scanners.map(scanner => ( - + {translate('about_page.scanners', - + ))}
diff --git a/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx b/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx index 5b9ae90d65b..6b4dc1aaf83 100644 --- a/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/AboutStandards.tsx @@ -24,7 +24,7 @@ import { translate } from 'sonar-ui-common/helpers/l10n'; import { getRulesUrl } from '../../../helpers/urls'; import ReadMore from './ReadMore'; -const link = 'https://redirect.sonarsource.com/doc/rules.html'; +const link = '/documentation/user-guide/rules/'; const owaspTags = 'owasp-a1,owasp-a2,owasp-a3,owasp-a4,owasp-a5,owasp-a6,owasp-a7,owasp-a8,owasp-a9,owasp-a10'; diff --git a/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx b/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx index 7e19aa1e4ef..ff31f0087db 100644 --- a/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx +++ b/server/sonar-web/src/main/js/apps/about/components/ReadMore.tsx @@ -18,6 +18,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; +import { Link } from 'react-router'; import { translate } from 'sonar-ui-common/helpers/l10n'; interface Props { @@ -27,9 +28,9 @@ interface Props { export default function ReadMore({ link }: Props) { return (
- + {translate('about_page.read_more')} - +
); } diff --git a/server/sonar-web/src/main/js/apps/about/components/__tests__/AboutScanners-test.tsx b/server/sonar-web/src/main/js/apps/about/components/__tests__/AboutScanners-test.tsx new file mode 100644 index 00000000000..52245dbbc7f --- /dev/null +++ b/server/sonar-web/src/main/js/apps/about/components/__tests__/AboutScanners-test.tsx @@ -0,0 +1,32 @@ +/* + * SonarQube + * Copyright (C) 2009-2020 SonarSource SA + * mailto:info AT sonarsource DOT com + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +import { shallow } from 'enzyme'; +import * as React from 'react'; +import AboutScanners from '../AboutScanners'; + +it('should render correctly', () => { + const wrapper = shallowRender(); + expect(wrapper).toMatchSnapshot(); +}); + +function shallowRender() { + return shallow(); +} diff --git a/server/sonar-web/src/main/js/apps/about/components/__tests__/__snapshots__/AboutScanners-test.tsx.snap b/server/sonar-web/src/main/js/apps/about/components/__tests__/__snapshots__/AboutScanners-test.tsx.snap new file mode 100644 index 00000000000..ad4dd1080e0 --- /dev/null +++ b/server/sonar-web/src/main/js/apps/about/components/__tests__/__snapshots__/AboutScanners-test.tsx.snap @@ -0,0 +1,108 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`should render correctly 1`] = ` +
+

+ about_page.scanners +

+
+

+ about_page.scanners.text +

+
+ + about_page.scanners.sonarqube + + + about_page.scanners.msbuild + + + about_page.scanners.maven + + + about_page.scanners.gradle + + + about_page.scanners.jenkins + + + about_page.scanners.ant + +
+
+
+`; diff --git a/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionForm.tsx b/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionForm.tsx index b3448b76492..a36c8bc80b8 100644 --- a/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/encryption/EncryptionForm.tsx @@ -19,6 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router'; import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; import { ClipboardButton } from 'sonar-ui-common/components/controls/clipboard'; import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; @@ -128,12 +129,9 @@ export default class EncryptionForm extends React.PureComponent { id="encryption.form_note" values={{ moreInformationLink: ( - + {translate('more_information')} - + ) }} /> diff --git a/server/sonar-web/src/main/js/apps/settings/encryption/GenerateSecretKeyForm.tsx b/server/sonar-web/src/main/js/apps/settings/encryption/GenerateSecretKeyForm.tsx index 0853dc4494c..b8d229d6a98 100644 --- a/server/sonar-web/src/main/js/apps/settings/encryption/GenerateSecretKeyForm.tsx +++ b/server/sonar-web/src/main/js/apps/settings/encryption/GenerateSecretKeyForm.tsx @@ -19,6 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router'; import { SubmitButton } from 'sonar-ui-common/components/controls/buttons'; import { ClipboardButton } from 'sonar-ui-common/components/controls/clipboard'; import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner'; @@ -111,12 +112,9 @@ export default class GenerateSecretKeyForm extends React.PureComponent + {translate('more_information')} - + ) }} /> diff --git a/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/__snapshots__/EncryptionForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/__snapshots__/EncryptionForm-test.tsx.snap index c61cdf87c6d..ca902a240e6 100644 --- a/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/__snapshots__/EncryptionForm-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/__snapshots__/EncryptionForm-test.tsx.snap @@ -51,13 +51,14 @@ exports[`should render correctly 1`] = ` id="encryption.form_note" values={ Object { - "moreInformationLink": more_information - , + , } } /> diff --git a/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/__snapshots__/GenerateSecretKeyForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/__snapshots__/GenerateSecretKeyForm-test.tsx.snap index 664a3d0e7dc..5671ceec700 100644 --- a/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/__snapshots__/GenerateSecretKeyForm-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/settings/encryption/__tests__/__snapshots__/GenerateSecretKeyForm-test.tsx.snap @@ -16,13 +16,14 @@ exports[`should render correctly 1`] = ` id="encryption.secret_key_description" values={ Object { - "moreInformationLink": more_information - , + , } } /> diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNet.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNet.tsx index e33ea195efa..cb69448c200 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNet.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/DotNet.tsx @@ -19,6 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router'; import { translate } from 'sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; @@ -64,12 +65,9 @@ export default function DotNet(props: Props) { id="onboarding.analysis.docs" values={{ link: ( - + {translate('onboarding.analysis.msbuild.docs_link')} - + ) }} /> diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx index 8a3be3f0034..8358364358d 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaGradle.tsx @@ -19,6 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router'; import { translate } from 'sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; @@ -69,12 +70,9 @@ export default function JavaGradle(props: Props) { id="onboarding.analysis.docs" values={{ link: ( - + {translate('onboarding.analysis.java.gradle.docs_link')} - + ) }} /> diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx index 488fb76aa72..060b0d3863e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/JavaMaven.tsx @@ -19,6 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router'; import { translate } from 'sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; @@ -52,12 +53,9 @@ export default function JavaMaven(props: Props) { id="onboarding.analysis.docs" values={{ link: ( - + {translate('onboarding.analysis.java.maven.docs_link')} - + ) }} /> diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/MSBuildScanner.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/MSBuildScanner.tsx index 9ff8c9a4be2..f4f4195fd1e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/MSBuildScanner.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/MSBuildScanner.tsx @@ -19,6 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router'; import { translate } from 'sonar-ui-common/helpers/l10n'; interface Props { @@ -37,13 +38,12 @@ export default function MSBuildScanner(props: Props) { />

- {translate('download_verb')} - +

); diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/Other.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/Other.tsx index 61e3f9f40a4..89ac7b6dbae 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/Other.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/Other.tsx @@ -19,6 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router'; import { translate } from 'sonar-ui-common/helpers/l10n'; import CodeSnippet from '../../../common/CodeSnippet'; import InstanceMessage from '../../../common/InstanceMessage'; @@ -61,12 +62,9 @@ export default function Other(props: Props) { id="onboarding.analysis.sq_scanner.docs" values={{ link: ( - + {translate('onboarding.analysis.sq_scanner.docs_link')} - + ) }} /> diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/SQScanner.tsx b/server/sonar-web/src/main/js/components/tutorials/manual/commands/SQScanner.tsx index 663fda6a3ce..f6c3362ad29 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/SQScanner.tsx +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/SQScanner.tsx @@ -19,6 +19,7 @@ */ import * as React from 'react'; import { FormattedMessage } from 'react-intl'; +import { Link } from 'react-router'; import { translate } from 'sonar-ui-common/helpers/l10n'; interface Props { @@ -43,13 +44,9 @@ export default function SQScanner(props: Props) { />

- + {translate('download_verb')} - +

); diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/DotNet-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/DotNet-test.tsx.snap index ab84c22563e..855871ad583 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/DotNet-test.tsx.snap +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/DotNet-test.tsx.snap @@ -48,13 +48,14 @@ exports[`DotNet renders correctly 2`] = ` id="onboarding.analysis.docs" values={ Object { - "link": onboarding.analysis.msbuild.docs_link - , + , } } /> diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap index 7e1208e8dce..9aaa8263e36 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/JavaGradle-test.tsx.snap @@ -41,13 +41,14 @@ exports[`renders correctly 1`] = ` id="onboarding.analysis.docs" values={ Object { - "link": onboarding.analysis.java.gradle.docs_link - , + , } } /> @@ -101,13 +102,14 @@ exports[`renders correctly 2`] = ` id="onboarding.analysis.docs" values={ Object { - "link": onboarding.analysis.java.gradle.docs_link - , + , } } /> @@ -161,13 +163,14 @@ exports[`renders with projectKey 1`] = ` id="onboarding.analysis.docs" values={ Object { - "link": onboarding.analysis.java.gradle.docs_link - , + , } } /> diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap index 7ee4d3becba..c4e572ed480 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/JavaMaven-test.tsx.snap @@ -33,13 +33,14 @@ exports[`renders correctly 1`] = ` id="onboarding.analysis.docs" values={ Object { - "link": onboarding.analysis.java.maven.docs_link - , + , } } /> @@ -85,13 +86,14 @@ exports[`renders correctly 2`] = ` id="onboarding.analysis.docs" values={ Object { - "link": onboarding.analysis.java.maven.docs_link - , + , } } /> @@ -137,13 +139,14 @@ exports[`renders with projectKey 1`] = ` id="onboarding.analysis.docs" values={ Object { - "link": onboarding.analysis.java.maven.docs_link - , + , } } /> diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/MSBuildScanner-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/MSBuildScanner-test.tsx.snap index f1d82f50660..16c37faf14e 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/MSBuildScanner-test.tsx.snap +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/MSBuildScanner-test.tsx.snap @@ -23,14 +23,15 @@ exports[`renders correctly 1`] = ` />

- download_verb - +

`; diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/Other-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/Other-test.tsx.snap index 51b1479f109..6a822115cbf 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/Other-test.tsx.snap +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/Other-test.tsx.snap @@ -36,13 +36,14 @@ exports[`renders correctly 1`] = ` id="onboarding.analysis.sq_scanner.docs" values={ Object { - "link": onboarding.analysis.sq_scanner.docs_link - , + , } } /> @@ -86,13 +87,14 @@ exports[`renders correctly 2`] = ` id="onboarding.analysis.sq_scanner.docs" values={ Object { - "link": onboarding.analysis.sq_scanner.docs_link - , + , } } /> @@ -136,13 +138,14 @@ exports[`renders correctly 3`] = ` id="onboarding.analysis.sq_scanner.docs" values={ Object { - "link": onboarding.analysis.sq_scanner.docs_link - , + , } } /> diff --git a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/SQScanner-test.tsx.snap b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/SQScanner-test.tsx.snap index 6ad4425a0a8..dd388d90562 100644 --- a/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/SQScanner-test.tsx.snap +++ b/server/sonar-web/src/main/js/components/tutorials/manual/commands/__tests__/__snapshots__/SQScanner-test.tsx.snap @@ -26,14 +26,15 @@ exports[`renders correctly 1`] = ` />

- download_verb - +

`; @@ -64,14 +65,15 @@ exports[`renders correctly 2`] = ` />

- download_verb - +

`; @@ -102,14 +104,15 @@ exports[`renders correctly 3`] = ` />

- download_verb - +

`; diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 82a366f2f12..2a9fe575fa3 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -3278,7 +3278,6 @@ onboarding.analysis.java.maven.text.custom=Run the following command in your pro onboarding.analysis.java.maven.text.custom.ci=Run the following command in the project's folder. onboarding.analysis.java.maven.header.sonarcloud=Execute the Scanner for Maven from Travis onboarding.analysis.java.maven.text.sonarcloud=Add the following lines to your .travis.yml file: -onboarding.analysis.java.maven.docs.sonarcloud=Please visit the official documentation of the Scanner for Maven for more details, and the live Maven-based example project to know more about this use case. onboarding.analysis.java.gradle.header=Execute the Scanner for Gradle from your computer onboarding.analysis.java.gradle.header.ci=Execute the Scanner for Gradle from your CI @@ -3298,7 +3297,6 @@ onboarding.analysis.msbuild.header.sonarcloud=Download and unzip the Scanner for onboarding.analysis.msbuild.text.sonarcloud=And add the executable's directory to the %PATH% environment variable onboarding.analysis.msbuild.execute.sonarcloud=Execute the Scanner for MSBuild from your computer onboarding.analysis.msbuild.execute.text.sonarcloud=Execute the following commands at the root of your solution. -onboarding.analysis.msbuild.docs.sonarcloud=Please visit the official documentation of the Scanner for MSBuild for more details. onboarding.analysis.sq_scanner.header.linux=Download and unzip the Scanner for Linux onboarding.analysis.sq_scanner.header.win=Download and unzip the Scanner for Windows @@ -3315,7 +3313,6 @@ onboarding.analysis.sq_scanner.execute.text.custom=Run the following commands in onboarding.analysis.sq_scanner.docs=Please visit the {link} for more details. onboarding.analysis.sq_scanner.docs_use_case=Please visit the {link} for more details, and the {useCaseLink} to know more about this use case. onboarding.analysis.sq_scanner.docs_link=official documentation of the Scanner -onboarding.analysis.standard.docs=Please visit the official documentation of the Scanner for more details, and the live standard example project to know more about this use case. onboarding.analysis.sqscanner.docs.gradle.title=official documentation of the Scanner for Gradle onboarding.analysis.sqscanner.docs.gradle.example_project.title=live Gradle-based example project -- 2.39.5