aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorMathieu Suen <mathieu.suen@sonarsource.com>2021-06-22 16:06:56 +0200
committersonartech <sonartech@sonarsource.com>2021-06-23 20:03:04 +0000
commitb123a8332adb61970e78e846428928cca675e7d3 (patch)
tree85fab955aae5dff11429e1ef6e7acfbf710f2ed3 /server
parent89d54b6b5bfcdddd547c6d379d2bfe3331806a68 (diff)
downloadsonarqube-b123a8332adb61970e78e846428928cca675e7d3.tar.gz
sonarqube-b123a8332adb61970e78e846428928cca675e7d3.zip
SONAR-15069 Adding tooltips for github DevOps settings
Diffstat (limited to 'server')
-rw-r--r--server/sonar-docs/src/pages/analysis/github-integration.md2
-rw-r--r--server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx4
-rw-r--r--server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap8
3 files changed, 13 insertions, 1 deletions
diff --git a/server/sonar-docs/src/pages/analysis/github-integration.md b/server/sonar-docs/src/pages/analysis/github-integration.md
index 39f57e1a033..265e3980aa7 100644
--- a/server/sonar-docs/src/pages/analysis/github-integration.md
+++ b/server/sonar-docs/src/pages/analysis/github-integration.md
@@ -86,7 +86,7 @@ Navigate to **Administration > Configuration > General Settings > ALM Integratio
- **GitHub App ID** – The App ID is found on your GitHub App's page on GitHub at **Settings > Developer Settings > GitHub Apps**.
- **Client ID** – The Client ID is found on your GitHub App's page.
- **Client secret** – The Client secret is found on your GitHub App's page.
-- **Private Key** – Your GitHub App's private key. You can generate a `.pem` file from your GitHub App's page under **Private keys**. Copy and paste the contents of the file here.
+- **Private Key** – Your GitHub App's private key. You can generate a `.pem` file from your GitHub App's page under **Private keys**. Copy and paste the whole contents of the file here.
## Analyzing projects with GitHub Actions
SonarScanners running in GitHub Actions can automatically detect branches and pull requests being built so you don't need to specifically pass them as parameters to the scanner.
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx
index 1219f0d494c..a1a782a2241 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/GithubForm.tsx
@@ -60,6 +60,7 @@ export default function GithubForm(props: GithubFormProps) {
value={formData.url}
/>
<AlmBindingDefinitionFormField
+ help={translate('settings.almintegration.form.app_id.github.help')}
id="app_id"
maxLength={80}
onFieldChange={onFieldChange}
@@ -67,6 +68,7 @@ export default function GithubForm(props: GithubFormProps) {
value={formData.appId}
/>
<AlmBindingDefinitionFormField
+ help={translate('settings.almintegration.form.client_id.github.help')}
id="client_id.github"
maxLength={80}
onFieldChange={onFieldChange}
@@ -74,6 +76,7 @@ export default function GithubForm(props: GithubFormProps) {
value={formData.clientId}
/>
<AlmBindingDefinitionFormField
+ help={translate('settings.almintegration.form.client_secret.github.help')}
id="client_secret.github"
maxLength={80}
onFieldChange={onFieldChange}
@@ -82,6 +85,7 @@ export default function GithubForm(props: GithubFormProps) {
value={formData.clientSecret}
/>
<AlmBindingDefinitionFormField
+ help={translate('settings.almintegration.form.private_key.github.help')}
id="private_key"
isTextArea={true}
onFieldChange={onFieldChange}
diff --git a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap
index 79359f8817a..5727233d11d 100644
--- a/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/settings/components/almIntegration/__tests__/__snapshots__/GithubForm-test.tsx.snap
@@ -34,6 +34,7 @@ exports[`should render correctly 1`] = `
value=""
/>
<AlmBindingDefinitionFormField
+ help="settings.almintegration.form.app_id.github.help"
id="app_id"
maxLength={80}
onFieldChange={[MockFunction]}
@@ -41,6 +42,7 @@ exports[`should render correctly 1`] = `
value=""
/>
<AlmBindingDefinitionFormField
+ help="settings.almintegration.form.client_id.github.help"
id="client_id.github"
maxLength={80}
onFieldChange={[MockFunction]}
@@ -48,6 +50,7 @@ exports[`should render correctly 1`] = `
value=""
/>
<AlmBindingDefinitionFormField
+ help="settings.almintegration.form.client_secret.github.help"
id="client_secret.github"
maxLength={80}
onFieldChange={[MockFunction]}
@@ -56,6 +59,7 @@ exports[`should render correctly 1`] = `
value=""
/>
<AlmBindingDefinitionFormField
+ help="settings.almintegration.form.private_key.github.help"
id="private_key"
isTextArea={true}
onFieldChange={[MockFunction]}
@@ -100,6 +104,7 @@ exports[`should render correctly 2`] = `
value="http://github.enterprise.com"
/>
<AlmBindingDefinitionFormField
+ help="settings.almintegration.form.app_id.github.help"
id="app_id"
maxLength={80}
onFieldChange={[MockFunction]}
@@ -107,6 +112,7 @@ exports[`should render correctly 2`] = `
value="123456"
/>
<AlmBindingDefinitionFormField
+ help="settings.almintegration.form.client_id.github.help"
id="client_id.github"
maxLength={80}
onFieldChange={[MockFunction]}
@@ -114,6 +120,7 @@ exports[`should render correctly 2`] = `
value="client1"
/>
<AlmBindingDefinitionFormField
+ help="settings.almintegration.form.client_secret.github.help"
id="client_secret.github"
maxLength={80}
onFieldChange={[MockFunction]}
@@ -122,6 +129,7 @@ exports[`should render correctly 2`] = `
value="**clientsecret**"
/>
<AlmBindingDefinitionFormField
+ help="settings.almintegration.form.private_key.github.help"
id="private_key"
isTextArea={true}
onFieldChange={[MockFunction]}