From d134ebd2e8231a7689c1d2566f5ecf33af0531bf Mon Sep 17 00:00:00 2001
From: Jeremy Davis <jeremy.davis@sonarsource.com>
Date: Fri, 23 Apr 2021 10:45:34 +0200
Subject: [PATCH] SONAR-14662 Better Plugin Risk Consent page

---
 .../js/app/components/PluginRiskConsent.tsx   | 21 ++++-------------
 .../PluginRiskConsent-test.tsx.snap           | 23 ++-----------------
 .../resources/org/sonar/l10n/core.properties  |  4 +---
 3 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/server/sonar-web/src/main/js/app/components/PluginRiskConsent.tsx b/server/sonar-web/src/main/js/app/components/PluginRiskConsent.tsx
index e251fba3900..4a64fe97bbd 100644
--- a/server/sonar-web/src/main/js/app/components/PluginRiskConsent.tsx
+++ b/server/sonar-web/src/main/js/app/components/PluginRiskConsent.tsx
@@ -18,8 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import * as React from 'react';
-import { FormattedMessage } from 'react-intl';
-import { Link } from 'react-router';
 import { Button } from 'sonar-ui-common/components/controls/buttons';
 import { translate } from 'sonar-ui-common/helpers/l10n';
 import { setSimpleSettingValue } from '../../api/settings';
@@ -66,22 +64,11 @@ export function PluginRiskConsent(props: PluginRiskConsentProps) {
         <div className="boxed-group-inner text-center">
           <h1 className="big-spacer-bottom">{translate('plugin_risk_consent.title')}</h1>
           <p className="big big-spacer-bottom">{translate('plugin_risk_consent.description')}</p>
-          <p className="big big-spacer-bottom">{translate('plugin_risk_consent.description2')}</p>
-          <p className="big huge-spacer-bottom">
-            <FormattedMessage
-              id="plugin_risk_consent.description3"
-              defaultMessage={translate('plugin_risk_consent.description3')}
-              values={{
-                link: (
-                  <Link to="/documentation/instance-administration/marketplace/" target="_blank">
-                    {translate('plugin_risk_consent.description3.link')}
-                  </Link>
-                )
-              }}
-            />
-          </p>
+          <p className="big huge-spacer-bottom">{translate('plugin_risk_consent.description2')}</p>
 
-          <Button onClick={acknowledgeRisk}>{translate('plugin_risk_consent.action')}</Button>
+          <Button className="big-spacer-bottom" onClick={acknowledgeRisk}>
+            {translate('plugin_risk_consent.action')}
+          </Button>
         </div>
       </div>
     </div>
diff --git a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/PluginRiskConsent-test.tsx.snap b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/PluginRiskConsent-test.tsx.snap
index aecc22a2247..5e5cb14f15e 100644
--- a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/PluginRiskConsent-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/PluginRiskConsent-test.tsx.snap
@@ -21,32 +21,13 @@ exports[`should render correctly: default 1`] = `
       >
         plugin_risk_consent.description
       </p>
-      <p
-        className="big big-spacer-bottom"
-      >
-        plugin_risk_consent.description2
-      </p>
       <p
         className="big huge-spacer-bottom"
       >
-        <FormattedMessage
-          defaultMessage="plugin_risk_consent.description3"
-          id="plugin_risk_consent.description3"
-          values={
-            Object {
-              "link": <Link
-                onlyActiveOnIndex={false}
-                style={Object {}}
-                target="_blank"
-                to="/documentation/instance-administration/marketplace/"
-              >
-                plugin_risk_consent.description3.link
-              </Link>,
-            }
-          }
-        />
+        plugin_risk_consent.description2
       </p>
       <Button
+        className="big-spacer-bottom"
         onClick={[Function]}
       >
         plugin_risk_consent.action
diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index 8910233ceee..4dd601e7046 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2755,10 +2755,8 @@ marketplace.risk_consent.installation=You can install plugins directly from the
 marketplace.risk_consent.action=I understand the risk.
 
 plugin_risk_consent.title=Installation of plugins
-plugin_risk_consent.description=A third-party plugin has been detected.
+plugin_risk_consent.description=A plugin has been detected.
 plugin_risk_consent.description2=Plugins are not provided by SonarSource and are therefore installed at your own risk. SonarSource disclaims all liability for installing and using such plugins.
-plugin_risk_consent.description3=If you wish to uninstall the plugin(s) instead, you may refer to the {link}.
-plugin_risk_consent.description3.link=documentation
 plugin_risk_consent.action=I understand the risk
 
 #------------------------------------------------------------------------------
-- 
2.39.5