SONAR-9005 redirect from global to organization rules page

2 files changed, 29 insertions, 3 deletions

diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js
index 90249a0e7e2..1c7f395f741 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNavMenu.js
@@ -150,7 +150,7 @@ export default class GlobalNavMenu extends React.Component {
         {this.renderProjects()}
         {governanceInstalled && this.renderPortfolios()}
         {this.renderIssuesLink()}
-        {this.renderRulesLink()}
+        {!organizationsEnabled && this.renderRulesLink()}
         {!organizationsEnabled && this.renderProfilesLink()}
         {this.renderQualityGatesLink()}
         {this.renderAdministrationLink()}
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/CodingRulesAppContainer.js b/server/sonar-web/src/main/js/apps/coding-rules/components/CodingRulesAppContainer.js
index c7bb6c70ed3..de34c58dd33 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/components/CodingRulesAppContainer.js
+++ b/server/sonar-web/src/main/js/apps/coding-rules/components/CodingRulesAppContainer.js
@@ -19,18 +19,38 @@
  */
 // @flow
 import React from 'react';
+import { connect } from 'react-redux';
+import { withRouter } from 'react-router';
+import { getAppState } from '../../../store/rootReducer';
 import init from '../init';
 
-export default class CodingRulesAppContainer extends React.PureComponent {
+class CodingRulesAppContainer extends React.PureComponent {
   stop: ?() => void;
   props: {
+    appState: {
+      defaultOrganization: string,
+      organizationsEnabled: boolean
+    },
     params: {
       organizationKey?: string
+    },
+    router: {
+      replace: (string) => void
     }
   };
 
   componentDidMount() {
-    this.stop = init(this.refs.container, this.props.params.organizationKey);
+    if (this.props.appState.organizationsEnabled && !this.props.params.organizationKey) {
+      // redirect to organization-level rules page
+      this.props.router.replace(
+        '/organizations/' +
+          this.props.appState.defaultOrganization +
+          '/rules' +
+          window.location.hash
+      );
+    } else {
+      this.stop = init(this.refs.container, this.props.params.organizationKey);
+    }
   }
 
   componentWillUnmount() {
@@ -51,3 +71,9 @@ export default class CodingRulesAppContainer extends React.PureComponent {
     );
   }
 }
+
+const mapStateToProps = state => ({
+  appState: getAppState(state)
+});
+
+export default connect(mapStateToProps)(withRouter(CodingRulesAppContainer));