adding update consumption role capability

backend/dataall/core/environment/api/input_types.py

@@ -118,3 +118,11 @@ class EnvironmentSortField(GraphQLEnumMapper):
         gql.Argument(name='groupUri', type=gql.String),
     ],
 )
+
+UpdateConsumptionRoleInput = gql.InputType(
+    name='UpdateConsumptionRoleInput',
+    arguments=[
+        gql.Argument('consumptionRoleName', gql.String),
+        gql.Argument('groupUri', gql.String),
+    ],
+)

backend/dataall/core/environment/api/mutations.py

@@ -5,7 +5,8 @@
     NewEnvironmentInput,
     EnableDataSubscriptionsInput,
     InviteGroupOnEnvironmentInput,
-    AddConsumptionRoleToEnvironmentInput
+    AddConsumptionRoleToEnvironmentInput,
+    UpdateConsumptionRoleInput,
 )
 from dataall.core.environment.api.resolvers import *
 
@@ -110,3 +111,14 @@
     resolver=disable_subscriptions,
     type=gql.Boolean,
 )
+
+updateConsumptionRole = gql.MutationField(
+    name='updateConsumptionRole',
+    args=[
+        gql.Argument('environmentUri', type=gql.NonNullableType(gql.String)),
+        gql.Argument('consumptionRoleUri', type=gql.NonNullableType(gql.String)),
+        gql.Argument('input', type=UpdateConsumptionRoleInput),
+    ],
+    type=gql.Ref('ConsumptionRole'),
+    resolver=update_consumption_role,
+)

backend/dataall/core/environment/api/resolvers.py

@@ -222,6 +222,17 @@ def remove_consumption_role(context: Context, source, environmentUri=None, consu
     return status
 
 
+def update_consumption_role(context: Context, source, environmentUri=None, consumptionRoleUri=None, input={}):
+    with context.engine.scoped_session() as session:
+        consumption_role = EnvironmentService.update_consumption_role(
+            session=session,
+            uri=consumptionRoleUri,
+            env_uri=environmentUri,
+            input=input,
+        )
+    return consumption_role
+
+
 def list_environment_invited_groups(
     context: Context, source, environmentUri=None, filter=None
 ):

backend/dataall/core/environment/services/environment_service.py

@@ -459,6 +459,31 @@ def remove_consumption_role(session, uri, env_uri):
         )
         return True
 
+    @staticmethod
+    @has_tenant_permission(permissions.MANAGE_ENVIRONMENTS)
+    @has_resource_permission(permissions.REMOVE_ENVIRONMENT_CONSUMPTION_ROLE)
+    def update_consumption_role(session, uri, env_uri, input):
+        if not input:
+            raise exceptions.RequiredParameter('input')
+        if not input.get('groupUri'):
+            raise exceptions.RequiredParameter('groupUri')
+        if not input.get('consumptionRoleName'):
+            raise exceptions.RequiredParameter('consumptionRoleName')
+        consumption_role = EnvironmentService.get_environment_consumption_role(session, uri, env_uri)
+        if consumption_role:
+            ResourcePolicy.update_resource_policy(
+                session=session,
+                resource_uri=uri,
+                resource_type=ConsumptionRole.__name__,
+                old_group=consumption_role.groupUri,
+                new_group=input['groupUri'],
+                new_permissions=permissions.CONSUMPTION_ROLE_ALL
+            )
+            for key, value in input.items():
+                setattr(consumption_role, key, value)
+            session.commit()
+        return consumption_role
+
     @staticmethod
     def query_user_environments(session, username, groups, filter) -> Query:
         query = (
@@ -699,7 +724,7 @@ def query_user_environment_consumption_roles(session, groups, uri, filter) -> Qu
                     ConsumptionRole.groupUri == group,
                 )
             )
-        return query
+        return query.order_by(ConsumptionRole.consumptionRoleUri)
 
     @staticmethod
     @has_resource_permission(permissions.LIST_ENVIRONMENT_CONSUMPTION_ROLES)
@@ -731,7 +756,7 @@ def query_all_environment_consumption_roles(session, uri, filter) -> Query:
                     ConsumptionRole.groupUri == group,
                 )
             )
-        return query
+        return query.order_by(ConsumptionRole.consumptionRoleUri)
 
     @staticmethod
     @has_resource_permission(permissions.LIST_ENVIRONMENT_CONSUMPTION_ROLES)
@@ -817,7 +842,7 @@ def get_environment_group(session, group_uri, environment_uri):
         return env_group
 
     @staticmethod
-    def get_environment_consumption_role(session, role_uri, environment_uri):
+    def get_environment_consumption_role(session, role_uri, environment_uri) -> ConsumptionRole:
         role = (
             session.query(ConsumptionRole)
             .filter(

backend/dataall/core/permissions/db/resource_policy_repositories.py

@@ -122,6 +122,29 @@ def find_resource_policy(
         )
         return resource_policy
 
+    @staticmethod
+    def update_resource_policy(
+            session,
+            resource_uri: str,
+            resource_type: str,
+            old_group: str,
+            new_group: str,
+            new_permissions: [str]
+    ) -> models.ResourcePolicy:
+        ResourcePolicy.delete_resource_policy(
+            session=session,
+            group=old_group,
+            resource_uri=resource_uri,
+            resource_type=resource_type,
+        )
+        return ResourcePolicy.attach_resource_policy(
+            session=session,
+            group=new_group,
+            resource_uri=resource_uri,
+            permissions=new_permissions,
+            resource_type=resource_type,
+        )
+
     @staticmethod
     def attach_resource_policy(
         session,

frontend/src/modules/Environments/components/EnvironmentRoleAddForm.js

@@ -12,53 +12,17 @@ import {
 import { Formik } from 'formik';
 import { useSnackbar } from 'notistack';
 import PropTypes from 'prop-types';
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import * as Yup from 'yup';
-import { Defaults } from 'design';
 import { SET_ERROR, useDispatch } from 'globalErrors';
-import { listEnvironmentGroups, useClient } from 'services';
+import { useClient, useFetchGroups } from 'services';
 import { addConsumptionRoleToEnvironment } from '../services';
+
 export const EnvironmentRoleAddForm = (props) => {
   const { environment, onClose, open, reloadRoles, ...other } = props;
   const { enqueueSnackbar } = useSnackbar();
   const dispatch = useDispatch();
   const client = useClient();
-  const [loadingGroups, setLoadingGroups] = useState(true);
-  const [groupOptions, setGroupOptions] = useState([]);
-
-  const fetchGroups = async (environmentUri) => {
-    try {
-      setLoadingGroups(true);
-      const response = await client.query(
-        listEnvironmentGroups({
-          filter: Defaults.selectListFilter,
-          environmentUri
-        })
-      );
-      if (!response.errors) {
-        setGroupOptions(
-          response.data.listEnvironmentGroups.nodes.map((g) => ({
-            value: g.groupUri,
-            label: g.groupUri
-          }))
-        );
-      } else {
-        dispatch({ type: SET_ERROR, error: response.errors[0].message });
-      }
-    } catch (e) {
-      dispatch({ type: SET_ERROR, error: e.message });
-    } finally {
-      setLoadingGroups(false);
-    }
-  };
-
-  useEffect(() => {
-    if (client && environment) {
-      fetchGroups(environment.environmentUri).catch((e) =>
-        dispatch({ type: SET_ERROR, error: e.message })
-      );
-    }
-  }, [client, environment, dispatch]);
 
   async function submit(values, setStatus, setSubmitting, setErrors) {
     try {
@@ -98,6 +62,8 @@ export const EnvironmentRoleAddForm = (props) => {
     }
   }
 
+  let { groupOptions, loadingGroups } = useFetchGroups(environment);
+
   if (!environment) {
     return null;
   }