From a3fd5e44071f2ffec5dc9b019f2b2026d40d2c61 Mon Sep 17 00:00:00 2001
From: Siegfried Ehret <siegfried.ehret@sonarsource.com>
Date: Wed, 10 Jul 2019 13:53:04 +0200
Subject: [PATCH] SC-833 Update text about external PR analysis in AutoScan
 (#1907)

---
 .../src/pages/sonarcloud/autoscan.md          |  2 +-
 .../src/tooltips/autoscan/caveats.md          |  6 ++++
 .../src/tooltips/autoscan/limited-scope.md    |  3 ++
 .../configurations/AutoScanAlert.tsx          | 28 ++++---------------
 4 files changed, 16 insertions(+), 23 deletions(-)
 create mode 100644 server/sonar-docs/src/tooltips/autoscan/caveats.md
 create mode 100644 server/sonar-docs/src/tooltips/autoscan/limited-scope.md

diff --git a/server/sonar-docs/src/pages/sonarcloud/autoscan.md b/server/sonar-docs/src/pages/sonarcloud/autoscan.md
index 69b3c990709..e4171f9dc0d 100644
--- a/server/sonar-docs/src/pages/sonarcloud/autoscan.md
+++ b/server/sonar-docs/src/pages/sonarcloud/autoscan.md
@@ -19,7 +19,7 @@ SonarCloud can autonomously scan your code, by simply reading it from your repos
 
 Once activated, SonarCloud will automatically analyze: 
 * the default branch of the repository
-* the pull requests (PR) on that default branch
+* the pull requests (PR)
 
 It will take care of doing it whenever you push on your repository.
 
diff --git a/server/sonar-docs/src/tooltips/autoscan/caveats.md b/server/sonar-docs/src/tooltips/autoscan/caveats.md
new file mode 100644
index 00000000000..2006fc1b3f1
--- /dev/null
+++ b/server/sonar-docs/src/tooltips/autoscan/caveats.md
@@ -0,0 +1,6 @@
+No visual feedback (yet) in the UI.  
+Not supported: code coverage, import of external rule engine reports.
+
+---
+
+[Read more](https://sonarcloud.io/documentation/autoscan/) and join [the forum](https://community.sonarsource.com/tags/c/help/sc/autoscan) to ask your questions
diff --git a/server/sonar-docs/src/tooltips/autoscan/limited-scope.md b/server/sonar-docs/src/tooltips/autoscan/limited-scope.md
new file mode 100644
index 00000000000..dcb88cae13c
--- /dev/null
+++ b/server/sonar-docs/src/tooltips/autoscan/limited-scope.md
@@ -0,0 +1,3 @@
+The following languages are currently supported:
+
+ABAP, Apex, CSS, Flex, Go, HTML, JS, Kotlin, PHP, Python, Ruby, Scala, Swift, TypeScript, TSQL, XML.
diff --git a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/AutoScanAlert.tsx b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/AutoScanAlert.tsx
index 73616bc80d4..67a27489673 100644
--- a/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/AutoScanAlert.tsx
+++ b/server/sonar-web/src/main/js/apps/tutorials/analyzeProject/configurations/AutoScanAlert.tsx
@@ -23,26 +23,6 @@ import { Alert } from '../../../../components/ui/Alert';
 import DocTooltip from '../../../../components/docs/DocTooltip';
 import { translate } from '../../../../helpers/l10n';
 
-const caveats = {
-  default: `
-No visual feedback (yet) in the UI.  
-Only Pull Requests from the same repository are analyzed.  
-Not supported: code coverage, import of external rule engine reports.
-
----
-
-[Read more](https://sonarcloud.io/documentation/autoscan/) and join [the forum](https://community.sonarsource.com/tags/c/help/sc/autoscan) to ask your questions
-`
-};
-
-const limitedScope = {
-  default: `
-The following languages are currently supported:
-
-ABAP, Apex, CSS, Flex, Go, HTML, JS, Kotlin, PHP, Python, Ruby, Scala, Swift, TypeScript, TSQL, XML.
-`
-};
-
 export function AutoScanAlert() {
   return (
     <Alert className="big-spacer-top" variant="info">
@@ -54,13 +34,17 @@ export function AutoScanAlert() {
             caveats: (
               <>
                 <strong>{translate('onboarding.analysis.with.autoscan.alert.caveats')}</strong>{' '}
-                <DocTooltip doc={Promise.resolve(caveats)} />
+                <DocTooltip
+                  doc={import(/* webpackMode: "eager" */ 'Docs/tooltips/autoscan/caveats.md')}
+                />
               </>
             ),
             scopes: (
               <>
                 <strong>{translate('onboarding.analysis.with.autoscan.alert.scopes')}</strong>{' '}
-                <DocTooltip doc={Promise.resolve(limitedScope)} />
+                <DocTooltip
+                  doc={import(/* webpackMode: "eager" */ 'Docs/tooltips/autoscan/limited-scope.md')}
+                />
               </>
             )
           }}
-- 
2.39.5