SONAR-8729 Create organization's permissions page

3 files changed, 47 insertions, 30 deletions

diff --git a/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.js b/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.js
index dd781c3cd25..1b1c6c2da78 100644
--- a/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.js
+++ b/server/sonar-web/src/main/js/apps/permissions/global/components/AllHoldersList.js
@@ -48,6 +48,12 @@ const PERMISSIONS_ORDER = [
   'provisioning'
 ];
 
+const PERMISSIONS_FOR_CUSTOM_ORG = [
+  'admin',
+  'scan',
+  'provisioning'
+];
+
 class AllHoldersList extends React.Component {
   componentDidMount () {
     this.props.loadHolders();
@@ -74,10 +80,16 @@ class AllHoldersList extends React.Component {
   }
 
   render () {
-    const permissions = PERMISSIONS_ORDER.map(p => ({
+    const order = (this.props.organization && !this.props.organization.isDefault) ?
+        PERMISSIONS_FOR_CUSTOM_ORG :
+        PERMISSIONS_ORDER;
+
+    const l10nPrefix = this.props.organization ? 'organizations_permissions' : 'global_permissions';
+
+    const permissions = order.map(p => ({
       key: p,
-      name: translate('global_permissions', p),
-      description: translate('global_permissions', p, 'desc')
+      name: translate(l10nPrefix, p),
+      description: translate(l10nPrefix, p, 'desc')
     }));
 
     return (
@@ -109,19 +121,19 @@ const mapStateToProps = state => ({
   selectedPermission: getPermissionsAppSelectedPermission(state)
 });
 
-const mapDispatchToProps = dispatch => ({
-  loadHolders: () => dispatch(loadHolders()),
-  onSearch: query => dispatch(updateQuery(query)),
-  onFilter: filter => dispatch(updateFilter(filter)),
-  onSelectPermission: permission => dispatch(selectPermission(permission)),
+const mapDispatchToProps = (dispatch, ownProps) => ({
+  loadHolders: () => dispatch(loadHolders(ownProps.organization)),
+  onSearch: query => dispatch(updateQuery(query, ownProps.organization)),
+  onFilter: filter => dispatch(updateFilter(filter, ownProps.organization)),
+  onSelectPermission: permission => dispatch(selectPermission(permission, ownProps.organization)),
   grantPermissionToUser: (login, permission) =>
-      dispatch(grantToUser(login, permission)),
+      dispatch(grantToUser(login, permission, ownProps.organization)),
   revokePermissionFromUser: (login, permission) =>
-      dispatch(revokeFromUser(login, permission)),
+      dispatch(revokeFromUser(login, permission, ownProps.organization)),
   grantPermissionToGroup: (groupName, permission) =>
-      dispatch(grantToGroup(groupName, permission)),
+      dispatch(grantToGroup(groupName, permission, ownProps.organization)),
   revokePermissionFromGroup: (groupName, permission) =>
-      dispatch(revokeFromGroup(groupName, permission))
+      dispatch(revokeFromGroup(groupName, permission, ownProps.organization))
 });
 
 export default connect(
diff --git a/server/sonar-web/src/main/js/apps/permissions/global/components/App.js b/server/sonar-web/src/main/js/apps/permissions/global/components/App.js
index 71ff949fd87..b0cdc95a4ad 100644
--- a/server/sonar-web/src/main/js/apps/permissions/global/components/App.js
+++ b/server/sonar-web/src/main/js/apps/permissions/global/components/App.js
@@ -17,6 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
+// @flow
 import React from 'react';
 import PageHeader from './PageHeader';
 import AllHoldersList from './AllHoldersList';
@@ -26,12 +27,16 @@ import '../../styles.css';
 // TODO helmet
 
 export default class App extends React.Component {
+  props: {
+    organization?: {}
+  };
+
   render () {
     return (
         <div className="page page-limited">
           <PageHeader/>
           <PageError/>
-          <AllHoldersList/>
+          <AllHoldersList organization={this.props.organization}/>
         </div>
     );
   }
diff --git a/server/sonar-web/src/main/js/apps/permissions/global/store/actions.js b/server/sonar-web/src/main/js/apps/permissions/global/store/actions.js
index eb2021a3b19..2a163720e38 100644
--- a/server/sonar-web/src/main/js/apps/permissions/global/store/actions.js
+++ b/server/sonar-web/src/main/js/apps/permissions/global/store/actions.js
@@ -37,7 +37,7 @@ import {
   getPermissionsAppSelectedPermission
 } from '../../../../store/rootReducer';
 
-export const loadHolders = () => (dispatch, getState) => {
+export const loadHolders = organization => (dispatch, getState) => {
   const query = getPermissionsAppQuery(getState());
   const filter = getPermissionsAppFilter(getState());
   const selectedPermission = getPermissionsAppSelectedPermission(getState());
@@ -47,13 +47,13 @@ export const loadHolders = () => (dispatch, getState) => {
   const requests = [];
 
   if (filter !== 'groups') {
-    requests.push(api.getGlobalPermissionsUsers(query, selectedPermission));
+    requests.push(api.getGlobalPermissionsUsers(query, selectedPermission, organization));
   } else {
     requests.push(Promise.resolve([]));
   }
 
   if (filter !== 'users') {
-    requests.push(api.getGlobalPermissionsGroups(query, selectedPermission));
+    requests.push(api.getGlobalPermissionsGroups(query, selectedPermission, organization));
   } else {
     requests.push(Promise.resolve([]));
   }
@@ -70,46 +70,46 @@ export const loadHolders = () => (dispatch, getState) => {
   });
 };
 
-export const updateQuery = (query = '') => dispatch => {
+export const updateQuery = (query = '', organization) => dispatch => {
   dispatch({ type: UPDATE_QUERY, query });
   if (query.length === 0 || query.length > 2) {
-    dispatch(loadHolders());
+    dispatch(loadHolders(organization));
   }
 };
 
-export const updateFilter = filter => dispatch => {
+export const updateFilter = (filter, organization) => dispatch => {
   dispatch({ type: UPDATE_FILTER, filter });
-  dispatch(loadHolders());
+  dispatch(loadHolders(organization));
 };
 
-export const selectPermission = permission => (dispatch, getState) => {
+export const selectPermission = (permission, organization) => (dispatch, getState) => {
   const selectedPermission = getPermissionsAppSelectedPermission(getState());
   if (selectedPermission !== permission) {
     dispatch({ type: SELECT_PERMISSION, permission });
   } else {
     dispatch({ type: SELECT_PERMISSION, permission: null });
   }
-  dispatch(loadHolders());
+  dispatch(loadHolders(organization));
 };
 
-export const grantToUser = (login, permission) => dispatch => {
-  api.grantPermissionToUser(null, login, permission).then(() => {
+export const grantToUser = (login, permission, organization) => dispatch => {
+  api.grantPermissionToUser(null, login, permission, organization).then(() => {
     dispatch({ type: GRANT_PERMISSION_TO_USER, login, permission });
   }).catch(e => {
     return parseError(e).then(message => dispatch(raiseError(message)));
   });
 };
 
-export const revokeFromUser = (login, permission) => dispatch => {
-  api.revokePermissionFromUser(null, login, permission).then(() => {
+export const revokeFromUser = (login, permission, organization) => dispatch => {
+  api.revokePermissionFromUser(null, login, permission, organization).then(() => {
     dispatch({ type: REVOKE_PERMISSION_TO_USER, login, permission });
   }).catch(e => {
     return parseError(e).then(message => dispatch(raiseError(message)));
   });
 };
 
-export const grantToGroup = (groupName, permission) => dispatch => {
-  api.grantPermissionToGroup(null, groupName, permission).then(() => {
+export const grantToGroup = (groupName, permission, organization) => dispatch => {
+  api.grantPermissionToGroup(null, groupName, permission, organization).then(() => {
     dispatch({
       type: GRANT_PERMISSION_TO_GROUP,
       groupName,
@@ -120,8 +120,8 @@ export const grantToGroup = (groupName, permission) => dispatch => {
   });
 };
 
-export const revokeFromGroup = (groupName, permission) => dispatch => {
-  api.revokePermissionFromGroup(null, groupName, permission).then(() => {
+export const revokeFromGroup = (groupName, permission, organization) => dispatch => {
+  api.revokePermissionFromGroup(null, groupName, permission, organization).then(() => {
     dispatch({
       type: REVOKE_PERMISSION_FROM_GROUP,
       groupName,