From: Grégoire Aubert
Date: Fri, 21 Sep 2018 13:48:10 +0000 (+0200)
Subject: Fix documentation links inside SQ
X-Git-Tag: 7.5~435
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=bbbc5847db9d04f26947a651bee75695709dec83;p=sonarqube.git
Fix documentation links inside SQ
---
diff --git a/server/sonar-docs/static/SonarCloudNavigationTree.json b/server/sonar-docs/static/SonarCloudNavigationTree.json
index 77f9677e168..0b2a38005a1 100644
--- a/server/sonar-docs/static/SonarCloudNavigationTree.json
+++ b/server/sonar-docs/static/SonarCloudNavigationTree.json
@@ -33,6 +33,7 @@
"/user-guide/fixing-the-water-leak/",
"/user-guide/keyboard-shortcuts/",
"/user-guide/quality-gates/",
+ "/instance-administration/quality-profiles/",
"/user-guide/metric-definitions/",
"/user-guide/security-reports/",
"/user-guide/user-account/"
diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooterSonarCloud.tsx b/server/sonar-web/src/main/js/app/components/GlobalFooterSonarCloud.tsx
index 27f6dbb208a..f6a961127b1 100644
--- a/server/sonar-web/src/main/js/app/components/GlobalFooterSonarCloud.tsx
+++ b/server/sonar-web/src/main/js/app/components/GlobalFooterSonarCloud.tsx
@@ -57,10 +57,10 @@ export default function GlobalFooterSonarCloud() {
- {translate('footer.privacy')}
+ {translate('footer.privacy')}
- {translate('footer.security')}
+ {translate('footer.security')}
{
getWrapper({
canAdmin: false,
currentUser: { ...LOGGED_IN_USER, showOnboardingTutorial: true },
- location: { pathname: 'documentation/index' }
+ location: { pathname: 'documentation/' }
})
);
});
diff --git a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterSonarCloud-test.tsx.snap b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterSonarCloud-test.tsx.snap
index b185e8631db..13848875327 100644
--- a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterSonarCloud-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooterSonarCloud-test.tsx.snap
@@ -61,7 +61,7 @@ exports[`should render correctly 1`] = `
footer.privacy
@@ -72,7 +72,7 @@ exports[`should render correctly 1`] = `
footer.security
diff --git a/server/sonar-web/src/main/js/apps/about/sonarcloud/Footer.tsx b/server/sonar-web/src/main/js/apps/about/sonarcloud/Footer.tsx
index 5dd6848f767..e5336f98577 100644
--- a/server/sonar-web/src/main/js/apps/about/sonarcloud/Footer.tsx
+++ b/server/sonar-web/src/main/js/apps/about/sonarcloud/Footer.tsx
@@ -99,12 +99,12 @@ export default function Footer() {
-
+
Privacy
-
+
Security
diff --git a/server/sonar-web/src/main/js/apps/about/sonarcloud/Pricing.tsx b/server/sonar-web/src/main/js/apps/about/sonarcloud/Pricing.tsx
index 8340323d357..89d4308b71f 100644
--- a/server/sonar-web/src/main/js/apps/about/sonarcloud/Pricing.tsx
+++ b/server/sonar-web/src/main/js/apps/about/sonarcloud/Pricing.tsx
@@ -36,7 +36,7 @@ export default function Pricing() {
From 10â¬
/mo
-
+
see prices
diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx b/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx
index 93fe91a4435..51f8e53e2fb 100644
--- a/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx
+++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Header.tsx
@@ -40,7 +40,7 @@ export default function Header(props: Props) {
+ to={{ pathname: '/documentation/analysis/background-tasks/' }}>
{translate('learn_more')}
diff --git a/server/sonar-web/src/main/js/apps/organizationMembers/MembersPageHeader.tsx b/server/sonar-web/src/main/js/apps/organizationMembers/MembersPageHeader.tsx
index 171dfc48aa8..42470f5f90c 100644
--- a/server/sonar-web/src/main/js/apps/organizationMembers/MembersPageHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/organizationMembers/MembersPageHeader.tsx
@@ -40,7 +40,7 @@ export default function MembersPageHeader(props: Props) {
id="organization.members.page.description"
values={{
link: (
-
+
{translate('organization.members.manage_a_team')}
)
diff --git a/server/sonar-web/src/main/js/apps/organizationMembers/__tests__/__snapshots__/MembersPageHeader-test.tsx.snap b/server/sonar-web/src/main/js/apps/organizationMembers/__tests__/__snapshots__/MembersPageHeader-test.tsx.snap
index 86a16038cda..95179079487 100644
--- a/server/sonar-web/src/main/js/apps/organizationMembers/__tests__/__snapshots__/MembersPageHeader-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/organizationMembers/__tests__/__snapshots__/MembersPageHeader-test.tsx.snap
@@ -27,7 +27,7 @@ exports[`should render 1`] = `
"link":
organization.members.manage_a_team
,
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/PageHeader.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/PageHeader.tsx
index d064cfb708c..b674d118d13 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/home/PageHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/PageHeader.tsx
@@ -103,7 +103,9 @@ export default class PageHeader extends React.PureComponent {
+ to={{
+ pathname: '/documentation/instance-administration/quality-profiles/'
+ }}>
{translate('learn_more')}
diff --git a/server/sonar-web/src/main/js/apps/securityReports/components/App.tsx b/server/sonar-web/src/main/js/apps/securityReports/components/App.tsx
index 01b31f1e820..2dd70f90ee1 100755
--- a/server/sonar-web/src/main/js/apps/securityReports/components/App.tsx
+++ b/server/sonar-web/src/main/js/apps/securityReports/components/App.tsx
@@ -142,7 +142,7 @@ export default class App extends React.PureComponent {
+ to={{ pathname: '/documentation/user-guide/security-reports/' }}>
{translate('learn_more')}
diff --git a/server/sonar-web/src/main/js/apps/securityReports/components/VulnerabilityList.tsx b/server/sonar-web/src/main/js/apps/securityReports/components/VulnerabilityList.tsx
index f4efc4acd65..d3cbb28a78d 100755
--- a/server/sonar-web/src/main/js/apps/securityReports/components/VulnerabilityList.tsx
+++ b/server/sonar-web/src/main/js/apps/securityReports/components/VulnerabilityList.tsx
@@ -106,7 +106,7 @@ export default class VulnerabilityList extends React.PureComponent
+ to={{ pathname: '/documentation/user-guide/security-reports/' }}>
Security Reports
@@ -142,7 +142,7 @@ exports[`handle checkbox for cwe display 2`] = `
target="_blank"
to={
Object {
- "pathname": "/documentation/security-reports",
+ "pathname": "/documentation/user-guide/security-reports/",
}
}
>
@@ -295,7 +295,7 @@ exports[`renders owaspTop10 1`] = `
target="_blank"
to={
Object {
- "pathname": "/documentation/security-reports",
+ "pathname": "/documentation/user-guide/security-reports/",
}
}
>
@@ -405,7 +405,7 @@ exports[`renders sansTop25 1`] = `
target="_blank"
to={
Object {
- "pathname": "/documentation/security-reports",
+ "pathname": "/documentation/user-guide/security-reports/",
}
}
>
@@ -515,7 +515,7 @@ exports[`renders with cwe 1`] = `
target="_blank"
to={
Object {
- "pathname": "/documentation/security-reports",
+ "pathname": "/documentation/user-guide/security-reports/",
}
}
>
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 93237f3481c..c12288a152b 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
@@ -37,7 +37,7 @@ export default function AnalyzeTutorialSuggestion({ almId }: { almId?: string })
{translate('onboarding.project_analysis.guide_to_integrate_piplines')}
@@ -76,7 +76,7 @@ export default function AnalyzeTutorialSuggestion({ almId }: { almId?: string })
id={'onboarding.project_analysis.simply_link'}
values={{
link: (
-
+
{translate('onboarding.project_analysis.guide_to_integrate_vsts')}
)
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 b682fbd8ed0..885aa00d882 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
@@ -16,7 +16,7 @@ exports[`renders bitbucket suggestions correctly 1`] = `
values={
Object {
"link":
onboarding.project_analysis.guide_to_integrate_piplines
@@ -66,7 +66,7 @@ exports[`renders vsts suggestions correctly 1`] = `
values={
Object {
"link":
onboarding.project_analysis.guide_to_integrate_vsts
diff --git a/server/sonar-web/src/main/js/apps/tutorials/teamOnboarding/TeamOnboardingModal.tsx b/server/sonar-web/src/main/js/apps/tutorials/teamOnboarding/TeamOnboardingModal.tsx
index 0763e82b9ab..1e2441d771d 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/teamOnboarding/TeamOnboardingModal.tsx
+++ b/server/sonar-web/src/main/js/apps/tutorials/teamOnboarding/TeamOnboardingModal.tsx
@@ -51,7 +51,7 @@ export default class TeamOnboardingModal extends React.PureComponent {
id="onboarding.team.how_to_join"
values={{
link: (
-
+
{translate('as_explained_here')}
)
diff --git a/server/sonar-web/src/main/js/apps/tutorials/teamOnboarding/__tests__/__snapshots__/TeamOnboardingModal-test.tsx.snap b/server/sonar-web/src/main/js/apps/tutorials/teamOnboarding/__tests__/__snapshots__/TeamOnboardingModal-test.tsx.snap
index a510b0e0eb9..362251e8c42 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/teamOnboarding/__tests__/__snapshots__/TeamOnboardingModal-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/tutorials/teamOnboarding/__tests__/__snapshots__/TeamOnboardingModal-test.tsx.snap
@@ -39,7 +39,7 @@ exports[`renders correctly 1`] = `
onClick={[MockFunction]}
onlyActiveOnIndex={false}
style={Object {}}
- to="/documentation/organizations/manage-team"
+ to="/documentation/organizations/manage-team/"
>
as_explained_here
,
diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/PageHeader.tsx b/server/sonar-web/src/main/js/apps/webhooks/components/PageHeader.tsx
index c2898e6725f..cf2c2bb1c74 100644
--- a/server/sonar-web/src/main/js/apps/webhooks/components/PageHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/webhooks/components/PageHeader.tsx
@@ -41,7 +41,9 @@ export default function PageHeader({ children, loading }: Props) {
id={'webhooks.description'}
values={{
url: (
- {translate('webhooks.documentation_link')}
+
+ {translate('webhooks.documentation_link')}
+
)
}}
/>
diff --git a/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/__snapshots__/PageHeader-test.tsx.snap b/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/__snapshots__/PageHeader-test.tsx.snap
index ce4b526d41d..f8a71f5b264 100644
--- a/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/__snapshots__/PageHeader-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/webhooks/components/__tests__/__snapshots__/PageHeader-test.tsx.snap
@@ -24,7 +24,7 @@ exports[`should render correctly 1`] = `
"url":
webhooks.documentation_link
,