From: Grégoire Aubert
Date: Fri, 3 Nov 2017 12:54:44 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/branch-6.7'
X-Git-Tag: 7.0-RC1~385
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2634bf7e6e4f166f1c1fc3ad613d1cde62282f6d;p=sonarqube.git
Merge remote-tracking branch 'origin/branch-6.7'
---
2634bf7e6e4f166f1c1fc3ad613d1cde62282f6d
diff --cc server/sonar-web/src/main/js/app/components/nav/settings/SettingsEditionsNotif.tsx
index 2c4cebc6a29,d2e8548ff72..9df1a73d51b
--- a/server/sonar-web/src/main/js/app/components/nav/settings/SettingsEditionsNotif.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/settings/SettingsEditionsNotif.tsx
@@@ -46,18 -47,57 +47,53 @@@ export default class SettingsEditionsNo
() => {}
);
+ renderStatusMsg(edition?: Edition) {
+ const { editionStatus } = this.props;
+ return (
+
+
+
- {edition ? (
- translateWithParameters(
- 'marketplace.status_x.' + editionStatus.installationStatus,
- edition.name
- )
- ) : (
- translate('marketplace.status', editionStatus.installationStatus)
- )}
++ {edition
++ ? translateWithParameters(
++ 'marketplace.status_x.' + editionStatus.installationStatus,
++ edition.name
++ )
++ : translate('marketplace.status', editionStatus.installationStatus)}
+
+
+ );
+ }
+
renderRestartMsg(edition?: Edition) {
const { editionStatus, preventRestart } = this.props;
return (
- {edition ? (
- translateWithParameters(
- 'marketplace.status_x.' + editionStatus.installationStatus,
- edition.name
- )
- ) : (
- translate('marketplace.status', editionStatus.installationStatus)
- )}
+ {edition
+ ? translateWithParameters(
+ 'marketplace.status_x.' + editionStatus.installationStatus,
+ edition.name
+ )
+ : translate('marketplace.status', editionStatus.installationStatus)}
+ {edition &&
- edition.key === 'datacenter' && (
-
-
- {edition.name}
-
- )
- }}
- />
-
- )}
++ edition.key === 'datacenter' && (
++
++
++ {edition.name}
++
++ )
++ }}
++ />
++
++ )}
{!preventRestart && (
);
}
diff --cc server/sonar-web/src/main/js/apps/marketplace/components/UninstallEditionForm.tsx
index c2bd0bf7711,2802634d264..483d2fc9f07
--- a/server/sonar-web/src/main/js/apps/marketplace/components/UninstallEditionForm.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/UninstallEditionForm.tsx
@@@ -73,9 -73,14 +73,9 @@@ export default class UninstallEditionFo
const { edition } = this.props;
const { loading } = this.state;
const currentEdition = edition ? edition.name : translate('marketplace.commercial_edition');
- const header = translateWithParameters('marketplace.uninstall_x', currentEdition);
+ const header = translateWithParameters('marketplace.downgrade_to_community_edition');
return (
-
+
diff --cc server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionBoxBadge-test.tsx.snap
index 0d5724e6fc1,7e824591e02..733b0062157
--- a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionBoxBadge-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionBoxBadge-test.tsx.snap
@@@ -1,29 -1,9 +1,29 @@@
// Jest Snapshot v1, https://goo.gl/fbAQLP
-exports[`should display installed badge 1`] = `null`;
+exports[`should display installed badge 1`] = `
+
+
+ marketplace.installed
+
+`;
-exports[`should display installing badge 1`] = `null`;
+exports[`should display installing badge 1`] = `
+
+ marketplace.installing
+
+`;
-exports[`should display pending badge 1`] = `null`;
-
-exports[`should not display a badge 1`] = `null`;
+exports[`should display pending badge 1`] = `
+
+ marketplace.pending
+
+`;
diff --cc server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/UninstallEditionForm-test.tsx.snap
index 0b3ad80dd5c,a8d55e70b19..0493fdbf245
--- a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/UninstallEditionForm-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/UninstallEditionForm-test.tsx.snap
@@@ -2,8 -2,17 +2,8 @@@
exports[`should display correctly 1`] = `