Fix documentation links inside SQ

diff --git a/server/sonar-docs/static/SonarCloudNavigationTree.json b/server/sonar-docs/static/SonarCloudNavigationTree.json
index 77f9677e168e669bf848d11b2e2ece58a8b80d9d..0b2a38005a138a29e23527f43aa5e4b5ff07216d 100644 (file)
--- 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 27f6dbb208a5d7d49903f6ae1724416739e147fb..f6a961127b185226e06df6f19ed8ea7893905711 100644 (file)
--- 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() {
           </Link>
         </li>
         <li className="page-footer-menu-item">
-          <Link to="/documentation/privacy">{translate('footer.privacy')}</Link>
+          <Link to="/documentation/privacy/">{translate('footer.privacy')}</Link>
         </li>
         <li className="page-footer-menu-item">
-          <Link to="/documentation/security">{translate('footer.security')}</Link>
+          <Link to="/documentation/security/">{translate('footer.security')}</Link>
         </li>
         <li className="page-footer-menu-item">
           <a

diff --git a/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx b/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx
index 374be478fcd4d94119ecf751a5bb4cff3b67121a..7e076dd9410981c9ada18cd1bbd87b95a2c34021 100644 (file)
--- a/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx
+++ b/server/sonar-web/src/main/js/app/components/__tests__/StartupModal-test.tsx
@@ -87,7 +87,7 @@ it('should render only the children', async () => {
     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 b185e8631db0166d10edd8a1514e2d9d242756d2..13848875327796d3cb1f515255d198b484a7953c 100644 (file)
--- 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`] = `
       <Link
         onlyActiveOnIndex={false}
         style={Object {}}
-        to="/documentation/privacy"
+        to="/documentation/privacy/"
       >
         footer.privacy
       </Link>
@@ -72,7 +72,7 @@ exports[`should render correctly 1`] = `
       <Link
         onlyActiveOnIndex={false}
         style={Object {}}
-        to="/documentation/security"
+        to="/documentation/security/"
       >
         footer.security
       </Link>

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 5dd6848f7675f11fddcc6d04a4d61c7d92f72d1c..e5336f98577f32e2b1f22f23c1fc4f0bef7939a4 100644 (file)
--- 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() {
                 </Link>
               </li>
               <li className="spacer-top">
-                <Link className="sc-footer-link" to="/documentation/privacy">
+                <Link className="sc-footer-link" to="/documentation/privacy/">
                   Privacy
                 </Link>
               </li>
               <li className="spacer-top">
-                <Link className="sc-footer-link" to="/documentation/security">
+                <Link className="sc-footer-link" to="/documentation/security/">
                   Security
                 </Link>
               </li>

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 8340323d357c06e816757915c567983af2ab1a90..89d4308b71f66a7e5e106cfe337f611c0434eb78 100644 (file)
--- 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 <span className="sc-pricing-price">10€</span>
           /mo
         </strong>
-        <Link className="sc-news-link" to="/documentation/sonarcloud-pricing">
+        <Link className="sc-news-link" to="/documentation/sonarcloud-pricing/">
           see prices
         </Link>
       </div>

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 93fe91a443516bba2966d8d0e953684a3984d953..51f8e53e2fb575e6d99f1f740445fbafdbf8b697 100644 (file)
--- 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) {
         <Link
           className="spacer-left"
           target="_blank"
-          to={{ pathname: '/documentation/analysis/background-tasks' }}>
+          to={{ pathname: '/documentation/analysis/background-tasks/' }}>
           {translate('learn_more')}
         </Link>
       </p>

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 171dfc48aa8e87ae655d17a8d9f41c41e2bd91e1..42470f5f90c32ab6c38b47912457282ebbe6ca4b 100644 (file)
--- 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: (
-              <Link to="/documentation/organizations/manage-team">
+              <Link to="/documentation/organizations/manage-team/">
                 {translate('organization.members.manage_a_team')}
               </Link>
             )

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 86a16038cda34676ec7de73e0ecd6d5a064c805a..95179079487ffeb79e7e38b7fb1a18ea9c2200d6 100644 (file)
--- 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": <Link
             onlyActiveOnIndex={false}
             style={Object {}}
-            to="/documentation/organizations/manage-team"
+            to="/documentation/organizations/manage-team/"
           >
             organization.members.manage_a_team
           </Link>,

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 d064cfb708cb3e44576cb7c3622fcbd0b1dd73fa..b674d118d137a617b2ade4504394cad7b5c9c360 100644 (file)
--- 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<Props, State> {
           <Link
             className="spacer-left"
             target="_blank"
-            to={{ pathname: '/documentation/quality-profiles' }}>
+            to={{
+              pathname: '/documentation/instance-administration/quality-profiles/'
+            }}>
             {translate('learn_more')}
           </Link>
         </div>

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 01b31f1e82093a32cf08725034d84e10a087620d..2dd70f90ee1ef17d4d4966ae1b4af06d10ebd4ec 100755 (executable)
--- 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<Props, State> {
             <Link
               className="spacer-left"
               target="_blank"
-              to={{ pathname: '/documentation/security-reports' }}>
+              to={{ pathname: '/documentation/user-guide/security-reports/' }}>
               {translate('learn_more')}
             </Link>
             <p className="alert alert-info spacer-top display-inline-block">

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 f4efc4acd65e9f078f1e4dfc7619d3755d413f60..d3cbb28a78d9b0da10de3f2fd3681cae49c1fb08 100755 (executable)
--- 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<Props, State>
         <Link
           className="spacer-left"
           target="_blank"
-          to={{ pathname: '/documentation/security-reports' }}>
+          to={{ pathname: '/documentation/user-guide/security-reports/' }}>
           Security Reports
         </Link>
         <DetachIcon

diff --git a/server/sonar-web/src/main/js/apps/securityReports/components/__tests__/__snapshots__/App-test.tsx.snap b/server/sonar-web/src/main/js/apps/securityReports/components/__tests__/__snapshots__/App-test.tsx.snap
index 2ab1a498552214ee9dd4456cfe81b4e74ef697f3..abab05f553e6cc710f613b6efb7cdca0f44321e9 100644 (file)
--- a/server/sonar-web/src/main/js/apps/securityReports/components/__tests__/__snapshots__/App-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/securityReports/components/__tests__/__snapshots__/App-test.tsx.snap
@@ -32,7 +32,7 @@ exports[`handle checkbox for cwe display 1`] = `
         target="_blank"
         to={
           Object {
-            "pathname": "/documentation/security-reports",
+            "pathname": "/documentation/user-guide/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 93237f3481c32c4c39b632fbe4965018fc85e726..c12288a152b2d0965158d877ad39aa84350b082c 100644 (file)
--- 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 })
               <a
                 href={
                   getBaseUrl() +
-                  '/documentation/integrations/bitbucketcloud#analyzing-with-pipelines'
+                  '/documentation/integrations/bitbucketcloud/#analyzing-with-pipelines'
                 }
                 target="_blank">
                 {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: (
-              <a href={getBaseUrl() + '/documentation/integrations/vsts'} target="_blank">
+              <a href={getBaseUrl() + '/documentation/integrations/vsts/'} target="_blank">
                 {translate('onboarding.project_analysis.guide_to_integrate_vsts')}
               </a>
             )

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 b682fbd8ed086bb87e46ddbced4b902020ecb3a1..885aa00d88244d66662e858e27447f8637f1366c 100644 (file)
--- 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": <a
-          href="/documentation/integrations/bitbucketcloud#analyzing-with-pipelines"
+          href="/documentation/integrations/bitbucketcloud/#analyzing-with-pipelines"
           target="_blank"
         >
           onboarding.project_analysis.guide_to_integrate_piplines
@@ -66,7 +66,7 @@ exports[`renders vsts suggestions correctly 1`] = `
     values={
       Object {
         "link": <a
-          href="/documentation/integrations/vsts"
+          href="/documentation/integrations/vsts/"
           target="_blank"
         >
           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 0763e82b9ab7cdeb0bf41a3cfe7f75c1839f6566..1e2441d771d202f77f01cb258751fb77429d16bf 100644 (file)
--- 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<Props> {
               id="onboarding.team.how_to_join"
               values={{
                 link: (
-                  <Link onClick={this.props.onFinish} to="/documentation/organizations/manage-team">
+                  <Link onClick={this.props.onFinish} to="/documentation/organizations/manage-team/">
                     {translate('as_explained_here')}
                   </Link>
                 )

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 a510b0e0eb913d041b686b4721e82fc85ec59903..362251e8c4245a4f93a7f114a7155012760fcbc3 100644 (file)
--- 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
             </Link>,

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 c2898e6725f078fdbb9cbadb9840d296ea5deeb7..cf2c2bb1c74125d7077b4d65f1df5da2d92d430e 100644 (file)
--- 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: (
-              <Link to="/documentation/webhooks">{translate('webhooks.documentation_link')}</Link>
+              <Link to="/documentation/project-administration/webhooks/">
+                {translate('webhooks.documentation_link')}
+              </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 ce4b526d41de97f27d0521e2214b451a35fbfc5d..f8a71f5b264760b1270f94a2bbdbdc6b80a3db87 100644 (file)
--- 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": <Link
             onlyActiveOnIndex={false}
             style={Object {}}
-            to="/documentation/webhooks"
+            to="/documentation/project-administration/webhooks/"
           >
             webhooks.documentation_link
           </Link>,