From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Thu, 21 Jun 2018 14:38:13 +0000 (+0200)
Subject: SONARCLOUD-81 Change canonical url to be absolute (#421)
X-Git-Tag: 7.5~938
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2b0f05f4442cb3e3b9c798adf9d93f64e19a6b01;p=sonarqube.git

SONARCLOUD-81 Change canonical url to be absolute (#421)
---

diff --git a/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.tsx b/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.tsx
index 8ef2e875509..68a7d1bbb1d 100644
--- a/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.tsx
+++ b/server/sonar-web/src/main/js/apps/overview/components/OverviewApp.tsx
@@ -48,7 +48,8 @@ import { fetchMetrics } from '../../../store/rootActions';
 import { getMetrics } from '../../../store/rootReducer';
 import { BranchLike, Component, Metric } from '../../../app/types';
 import { translate } from '../../../helpers/l10n';
-import { getPathUrlAsString, getProjectUrl } from '../../../helpers/urls';
+import { getProjectUrl, getSonarCloudUrlAsString } from '../../../helpers/urls';
+import { isSonarCloud } from '../../../helpers/system';
 import '../styles.css';
 
 interface OwnProps {
@@ -239,9 +240,12 @@ export class OverviewApp extends React.PureComponent<Props, State> {
       <div className="page page-limited">
         <div className="overview page-with-sidebar">
           <Suggestions suggestions="overview" />
-          <Helmet>
-            <link href={getPathUrlAsString(getProjectUrl(component.key))} rel="canonical" />
-          </Helmet>
+
+          {isSonarCloud() && (
+            <Helmet>
+              <link href={getSonarCloudUrlAsString(getProjectUrl(component.key))} rel="canonical" />
+            </Helmet>
+          )}
 
           {this.renderMain()}
 
diff --git a/server/sonar-web/src/main/js/helpers/urls.ts b/server/sonar-web/src/main/js/helpers/urls.ts
index a04d8376536..93e531c52df 100644
--- a/server/sonar-web/src/main/js/helpers/urls.ts
+++ b/server/sonar-web/src/main/js/helpers/urls.ts
@@ -49,6 +49,10 @@ export function getPathUrlAsString(path: Location): string {
   return `${getBaseUrl()}${path.pathname}?${stringify(omitBy(path.query, isNil))}`;
 }
 
+export function getSonarCloudUrlAsString(location: Location) {
+  return 'https://sonarcloud.io' + getPathUrlAsString(location);
+}
+
 export function getProjectUrl(project: string): Location {
   return { pathname: '/dashboard', query: { id: project } };
 }