Update form to nest all envs in one form

atst/domain/environments.py

@@ -73,7 +73,7 @@ class Environments(object):
     def update_env_role(cls, environment, user, new_role):
         updated = False
 
-        if new_role == "no_access":
+        if new_role == None:
             updated = EnvironmentRoles.delete(user.id, environment.id)
         else:
             env_role = EnvironmentRoles.get(user.id, environment.id)
@@ -113,6 +113,27 @@ class Environments(object):
                 environment=environment, user=member, new_role=new_role
             )
 
+    @classmethod
+    def get_members_by_role(cls, env, role):
+        env_roles = (
+            db.session.query(EnvironmentRole)
+            .filter(EnvironmentRole.environment_id == env.id)
+            .filter(EnvironmentRole.role == role)
+            .all()
+        )
+
+        members_list = []
+        for env_role in env_roles:
+            members_list.append(
+                {
+                    "user_id": env_role.user_id,
+                    "user_name": env_role.user.full_name,
+                    "role": role,
+                }
+            )
+
+        return members_list
+
     @classmethod
     def revoke_access(cls, environment, target_user):
         EnvironmentRoles.delete(environment.id, target_user.id)

atst/forms/app_settings.py

@@ -1,21 +1,33 @@
 from flask_wtf import FlaskForm
-from wtforms.fields import FieldList, FormField, HiddenField, RadioField
+from wtforms.fields import FieldList, FormField, HiddenField, RadioField, StringField
 
 from .forms import BaseForm
 from .data import ENV_ROLES
 
 
-class EnvMemberRoleForm(FlaskForm):
+class MemberForm(FlaskForm):
     user_id = HiddenField()
+    user_name = StringField()
     role = RadioField(choices=ENV_ROLES, default="no_access")
 
     @property
     def data(self):
         _data = super().data
-        _data.pop("csrf_token", None)
+        for field in _data:
+            if field == "role" and _data[field] == "no_access":
+                _data[field] = None
         return _data
 
 
-class EnvironmentRolesForm(BaseForm):
-    team_roles = FieldList(FormField(EnvMemberRoleForm))
+class RoleForm(FlaskForm):
+    role = HiddenField()
+    members = FieldList(FormField(MemberForm))
+
+
+class EnvironmentRolesForm(FlaskForm):
+    team_roles = FieldList(FormField(RoleForm))
     env_id = HiddenField()
+
+
+class AppEnvRolesForm(BaseForm):
+    envs = FieldList(FormField(EnvironmentRolesForm))

atst/models/environment.py

@@ -21,7 +21,7 @@ class Environment(
 
     @property
     def users(self):
-        return [r.user for r in self.roles]
+        return {r.user for r in self.roles}
 
     @property
     def num_users(self):

atst/routes/applications/settings.py

@@ -1,10 +1,9 @@
 from flask import redirect, render_template, request as http_request, url_for
 
 from . import applications_bp
-from atst.domain.environment_roles import EnvironmentRoles
 from atst.domain.environments import Environments
 from atst.domain.applications import Applications
-from atst.forms.app_settings import EnvironmentRolesForm
+from atst.forms.app_settings import AppEnvRolesForm
 from atst.forms.application import ApplicationForm, EditEnvironmentForm
 from atst.domain.authz.decorator import user_can_access_decorator as user_can
 from atst.models.environment_role import CSPRole
@@ -20,8 +19,8 @@ def get_environments_obj_for_app(application):
             "id": env.id,
             "name": env.name,
             "edit_form": EditEnvironmentForm(obj=env),
-            "members_form": EnvironmentRolesForm(data=data_for_env_members_form(env)),
-            "members": sort_env_users_by_role(env),
+            "member_count": len(env.users),
+            "members": [user.full_name for user in env.users],
         }
         environments_obj.append(env_data)
 
@@ -29,33 +28,34 @@ def get_environments_obj_for_app(application):
 
 
 def sort_env_users_by_role(env):
-    users_dict = {"no_access": []}
+    users_list = []
+    no_access_users = env.application.users - env.users
+    no_access_list = [
+        {"user_id": user.id, "user_name": user.full_name, "role": "no_access"}
+        for user in no_access_users
+    ]
+    users_list.append({"role": "no_access", "members": no_access_list})
+
     for role in CSPRole:
-        users_dict[role.value] = []
+        users_list.append(
+            {
+                "role": role.value,
+                "members": Environments.get_members_by_role(env, role.value),
+            }
+        )
 
-    for user in env.application.users:
-        if user in env.users:
-            role = EnvironmentRoles.get(user.id, env.id)
-            users_dict[role.displayname].append(
-                {"name": user.full_name, "user_id": user.id}
-            )
-        else:
-            users_dict["no_access"].append({"name": user.full_name, "user_id": user.id})
-
-    return users_dict
+    return users_list
 
 
-def data_for_env_members_form(environment):
-    data = {"env_id": environment.id, "team_roles": []}
-    for user in environment.application.users:
-        env_role = EnvironmentRoles.get(user.id, environment.id)
-
-        if env_role:
-            role = env_role.displayname
-        else:
-            role = "no_access"
-
-        data["team_roles"].append({"user_id": user.id, "role": role})
+def data_for_app_env_roles_form(application):
+    data = {"envs": []}
+    for environment in application.environments:
+        data["envs"].append(
+            {
+                "env_id": environment.id,
+                "team_roles": sort_env_users_by_role(environment),
+            }
+        )
 
     return data
 
@@ -73,12 +73,15 @@ def check_users_are_in_application(user_ids, application):
 def settings(application_id):
     application = Applications.get(application_id)
     form = ApplicationForm(name=application.name, description=application.description)
+    environments_obj = get_environments_obj_for_app(application=application)
+    members_form = AppEnvRolesForm(data=data_for_app_env_roles_form(application))
 
     return render_template(
         "portfolios/applications/settings.html",
         application=application,
         form=form,
-        environments_obj=get_environments_obj_for_app(application=application),
+        environments_obj=environments_obj,
+        members_form=members_form,
     )
 
 
@@ -146,13 +149,17 @@ def update(application_id):
 def update_env_roles(environment_id):
     environment = Environments.get(environment_id)
     application = environment.application
-    form = EnvironmentRolesForm(formdata=http_request.form)
+    form = AppEnvRolesForm(formdata=http_request.form)
 
     if form.validate():
-
+        env_data = []
         try:
-            user_ids = [user["user_id"] for user in form.data["team_roles"]]
-            check_users_are_in_application(user_ids, application)
+            for env in form.envs.data:
+                if env["env_id"] == str(environment.id):
+                    for role in env["team_roles"]:
+                        user_ids = [user["user_id"] for user in role["members"]]
+                        check_users_are_in_application(user_ids, application)
+                        env_data = env_data + role["members"]
         except NotFoundError as err:
             app.logger.warning(
                 "User {} requested environment role change for unauthorized user {} in application {}.".format(
@@ -162,9 +169,9 @@ def update_env_roles(environment_id):
             )
 
             raise (err)
-        env_data = form.data
+
         Environments.update_env_roles_by_environment(
-            environment_id=environment_id, team_roles=env_data["team_roles"]
+            environment_id=environment_id, team_roles=env_data
         )
 
         flash("application_environment_members_updated")