Remove unused router from overview Meta component

diff --git a/server/sonar-web/src/main/js/apps/overview/events/AnalysesList.js b/server/sonar-web/src/main/js/apps/overview/events/AnalysesList.js
index 47f75499e055111eb08c7549b45c33d457e96e1e..bff7894acb7ca9423222e10a1e37a58f9eb297f4 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/events/AnalysesList.js
+++ b/server/sonar-web/src/main/js/apps/overview/events/AnalysesList.js
@@ -33,8 +33,7 @@ type Props = {
   branch?: string,
   component: Object,
   history: ?History,
-  qualifier: string,
-  router: { push: ({ pathname: string, query?: {} }) => void }
+  qualifier: string
 };
 */
 

diff --git a/server/sonar-web/src/main/js/apps/overview/meta/Meta.js b/server/sonar-web/src/main/js/apps/overview/meta/Meta.js
index 5cce8904100bdc5430be3965ca130b054f3d2f97..9b0f6afe1496109a8698c1c8955e1f83c5ea971a 100644 (file)
--- a/server/sonar-web/src/main/js/apps/overview/meta/Meta.js
+++ b/server/sonar-web/src/main/js/apps/overview/meta/Meta.js
@@ -18,7 +18,6 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import React from 'react';
-import { withRouter } from 'react-router';
 import { connect } from 'react-redux';
 import MetaKey from './MetaKey';
 import MetaOrganizationKey from './MetaOrganizationKey';
@@ -37,7 +36,7 @@ const Meta = ({
   measures,
   areThereCustomOrganizations,
   onComponentChange,
-  router
+  onSonarCloud
 }) => {
   const { qualifier, description, qualityProfiles, qualityGate } = component;
 
@@ -66,7 +65,6 @@ const Meta = ({
         component={component}
         qualifier={component.qualifier}
         history={history}
-        router={router}
       />
 
       {shouldShowQualityGate && (
@@ -93,8 +91,12 @@ const Meta = ({
   );
 };
 
-const mapStateToProps = state => ({
-  areThereCustomOrganizations: areThereCustomOrganizations(state)
-});
+const mapStateToProps = state => {
+  const sonarCloudSetting = getGlobalSettingValue(state, 'sonar.sonarcloud.enabled');
+  return {
+    areThereCustomOrganizations: areThereCustomOrganizations(state),
+    onSonarCloud: Boolean(sonarCloudSetting && sonarCloudSetting.value === 'true')
+  };
+};
 
-export default connect(mapStateToProps)(withRouter(Meta));
+export default connect(mapStateToProps)(Meta);