From: Grégoire Aubert <gregoire.aubert@sonarsource.com>
Date: Thu, 7 Jun 2018 09:44:15 +0000 (+0200)
Subject: SONAR-10611 Fix quality gate and quality profile badge tooltips
X-Git-Tag: 7.5~1065
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=b61ddb3f840fbc36e6aade3a51c4d36a30862521;p=sonarqube.git

SONAR-10611 Fix quality gate and quality profile badge tooltips
---

diff --git a/server/sonar-web/src/main/js/apps/quality-gates/components/BuiltInQualityGateBadge.tsx b/server/sonar-web/src/main/js/apps/quality-gates/components/BuiltInQualityGateBadge.tsx
index 4ebd702fa00..674d46470a2 100644
--- a/server/sonar-web/src/main/js/apps/quality-gates/components/BuiltInQualityGateBadge.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-gates/components/BuiltInQualityGateBadge.tsx
@@ -19,8 +19,7 @@
  */
 import * as React from 'react';
 import * as classNames from 'classnames';
-import Tooltip from '../../../components/controls/Tooltip';
-import DocInclude from '../../../components/docs/DocInclude';
+import DocTooltip from '../../../components/docs/DocTooltip';
 import { translate } from '../../../helpers/l10n';
 
 interface Props {
@@ -34,12 +33,5 @@ export default function BuiltInQualityGateBadge({ className }: Props) {
     </div>
   );
 
-  const overlay = (
-    <DocInclude
-      className="abs-width-300 cut-margins"
-      path="/tooltips/quality-gates/built-in-quality-gate"
-    />
-  );
-
-  return <Tooltip overlay={overlay}>{badge}</Tooltip>;
+  return <DocTooltip doc="quality-gates/built-in-quality-gate">{badge}</DocTooltip>;
 }
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/components/BuiltInQualityProfileBadge.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/components/BuiltInQualityProfileBadge.tsx
index 16b64e80812..b3b4c651758 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/components/BuiltInQualityProfileBadge.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/components/BuiltInQualityProfileBadge.tsx
@@ -19,8 +19,7 @@
  */
 import * as React from 'react';
 import * as classNames from 'classnames';
-import Tooltip from '../../../components/controls/Tooltip';
-import DocInclude from '../../../components/docs/DocInclude';
+import DocTooltip from '../../../components/docs/DocTooltip';
 import { translate } from '../../../helpers/l10n';
 
 interface Props {
@@ -35,12 +34,8 @@ export default function BuiltInQualityProfileBadge({ className, tooltip = true }
     </div>
   );
 
-  const overlay = (
-    <DocInclude
-      className="abs-width-300 cut-margins"
-      path="/tooltips/quality-profiles/built-in-quality-profile"
-    />
-  );
-
-  return <Tooltip overlay={tooltip ? overlay : undefined}>{badge}</Tooltip>;
+  if (tooltip) {
+    return <DocTooltip doc="quality-profiles/built-in-quality-profile">{badge}</DocTooltip>;
+  }
+  return badge;
 }
diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.tsx b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.tsx
index d05b77b2fda..4be2c924b0d 100644
--- a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.tsx
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.tsx
@@ -28,7 +28,7 @@ import { getRulesUrl } from '../../../helpers/urls';
 import { isStagnant } from '../utils';
 import { Profile } from '../types';
 import Tooltip from '../../../components/controls/Tooltip';
-import DocInclude from '../../../components/docs/DocInclude';
+import DocTooltip from '../../../components/docs/DocTooltip';
 
 interface Props {
   onRequestFail: (reason: any) => void;
@@ -61,15 +61,9 @@ export default class ProfilesListRow extends React.PureComponent<Props> {
 
     if (profile.isDefault) {
       return (
-        <Tooltip
-          overlay={
-            <DocInclude
-              className="abs-width-300 cut-margins"
-              path="/tooltips/quality-profiles/default-quality-profile"
-            />
-          }>
+        <DocTooltip doc="quality-profiles/default-quality-profile">
           <span className="badge">{translate('default')}</span>
-        </Tooltip>
+        </DocTooltip>
       );
     }