From e8c6d6921a93f5bfe29de8f2790413b7954bec1d Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Thu, 1 Oct 2020 11:22:12 +0200
Subject: [PATCH] SONAR-12695 Add a single Community link in the footer

---
 .../main/js/app/components/GlobalFooter.tsx   | 24 ++++++---
 .../__snapshots__/GlobalFooter-test.tsx.snap  | 51 ++++++++-----------
 .../resources/org/sonar/l10n/core.properties  |  1 -
 3 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx
index 02e1509599b..63e806e974d 100644
--- a/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx
+++ b/server/sonar-web/src/main/js/app/components/GlobalFooter.tsx
@@ -70,21 +70,29 @@ export default function GlobalFooter({
           </li>
         )}
         <li className="page-footer-menu-item">
-          <a href="http://www.gnu.org/licenses/lgpl-3.0.txt">{translate('footer.license')}</a>
+          <a
+            href="http://www.gnu.org/licenses/lgpl-3.0.txt"
+            rel="noopener noreferrer"
+            target="_blank">
+            {translate('footer.license')}
+          </a>
         </li>
         <li className="page-footer-menu-item">
-          <a href="http://www.sonarqube.org?referrer=sonarqube">{translate('footer.community')}</a>
+          <a
+            href="https://community.sonarsource.com/c/help/sq"
+            rel="noopener noreferrer"
+            target="_blank">
+            {translate('footer.community')}
+          </a>
         </li>
         <li className="page-footer-menu-item">
           <Link to="/documentation">{translate('footer.documentation')}</Link>
         </li>
         <li className="page-footer-menu-item">
-          <a href="https://redirect.sonarsource.com/doc/community.html">
-            {translate('footer.support')}
-          </a>
-        </li>
-        <li className="page-footer-menu-item">
-          <a href="https://redirect.sonarsource.com/doc/plugin-library.html">
+          <a
+            href="https://redirect.sonarsource.com/doc/plugin-library.html"
+            rel="noopener noreferrer"
+            target="_blank">
             {translate('footer.plugins')}
           </a>
         </li>
diff --git a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap
index ed878998720..cb115f4ab66 100644
--- a/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap
+++ b/server/sonar-web/src/main/js/app/components/__tests__/__snapshots__/GlobalFooter-test.tsx.snap
@@ -24,6 +24,8 @@ exports[`should display the sq version 1`] = `
     >
       <a
         href="http://www.gnu.org/licenses/lgpl-3.0.txt"
+        rel="noopener noreferrer"
+        target="_blank"
       >
         footer.license
       </a>
@@ -32,7 +34,9 @@ exports[`should display the sq version 1`] = `
       className="page-footer-menu-item"
     >
       <a
-        href="http://www.sonarqube.org?referrer=sonarqube"
+        href="https://community.sonarsource.com/c/help/sq"
+        rel="noopener noreferrer"
+        target="_blank"
       >
         footer.community
       </a>
@@ -48,20 +52,13 @@ exports[`should display the sq version 1`] = `
         footer.documentation
       </Link>
     </li>
-    <li
-      className="page-footer-menu-item"
-    >
-      <a
-        href="https://redirect.sonarsource.com/doc/community.html"
-      >
-        footer.support
-      </a>
-    </li>
     <li
       className="page-footer-menu-item"
     >
       <a
         href="https://redirect.sonarsource.com/doc/plugin-library.html"
+        rel="noopener noreferrer"
+        target="_blank"
       >
         footer.plugins
       </a>
@@ -106,6 +103,8 @@ exports[`should not render the only logged in information 1`] = `
     >
       <a
         href="http://www.gnu.org/licenses/lgpl-3.0.txt"
+        rel="noopener noreferrer"
+        target="_blank"
       >
         footer.license
       </a>
@@ -114,7 +113,9 @@ exports[`should not render the only logged in information 1`] = `
       className="page-footer-menu-item"
     >
       <a
-        href="http://www.sonarqube.org?referrer=sonarqube"
+        href="https://community.sonarsource.com/c/help/sq"
+        rel="noopener noreferrer"
+        target="_blank"
       >
         footer.community
       </a>
@@ -130,20 +131,13 @@ exports[`should not render the only logged in information 1`] = `
         footer.documentation
       </Link>
     </li>
-    <li
-      className="page-footer-menu-item"
-    >
-      <a
-        href="https://redirect.sonarsource.com/doc/community.html"
-      >
-        footer.support
-      </a>
-    </li>
     <li
       className="page-footer-menu-item"
     >
       <a
         href="https://redirect.sonarsource.com/doc/plugin-library.html"
+        rel="noopener noreferrer"
+        target="_blank"
       >
         footer.plugins
       </a>
@@ -173,6 +167,8 @@ exports[`should render the only logged in information 1`] = `
     >
       <a
         href="http://www.gnu.org/licenses/lgpl-3.0.txt"
+        rel="noopener noreferrer"
+        target="_blank"
       >
         footer.license
       </a>
@@ -181,7 +177,9 @@ exports[`should render the only logged in information 1`] = `
       className="page-footer-menu-item"
     >
       <a
-        href="http://www.sonarqube.org?referrer=sonarqube"
+        href="https://community.sonarsource.com/c/help/sq"
+        rel="noopener noreferrer"
+        target="_blank"
       >
         footer.community
       </a>
@@ -197,20 +195,13 @@ exports[`should render the only logged in information 1`] = `
         footer.documentation
       </Link>
     </li>
-    <li
-      className="page-footer-menu-item"
-    >
-      <a
-        href="https://redirect.sonarsource.com/doc/community.html"
-      >
-        footer.support
-      </a>
-    </li>
     <li
       className="page-footer-menu-item"
     >
       <a
         href="https://redirect.sonarsource.com/doc/plugin-library.html"
+        rel="noopener noreferrer"
+        target="_blank"
       >
         footer.plugins
       </a>
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 e1c61454671..16c432c77d0 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -3102,7 +3102,6 @@ footer.privacy=Privacy
 footer.production_database_explanation=The embedded database will not scale, it will not support upgrading to newer versions of {instance}, and there is no support for migrating your data out of it into a different database engine.
 footer.production_database_warning=Embedded database should be used for evaluation purposes only
 footer.security=Security
-footer.support=Get Support
 footer.status=Status
 footer.terms=Terms
 footer.twitter=Twitter
-- 
2.39.5