Make checkboxes work

atst/forms/application_member.py

@@ -108,6 +108,5 @@ class UpdatePermissionsForm(FlaskForm):
 
 
 class UpdateMemberForm(BaseForm):
-    member_role_id = HiddenField()
-    permission_sets = FormField(UpdatePermissionsForm)
+    permission_sets = FormField(PermissionsForm)
     environment_roles = FieldList(FormField(EnvironmentForm))

atst/models/application_role.py

@@ -71,6 +71,20 @@ class ApplicationRole(
         elif self.latest_invitation:
             return self.latest_invitation.user_name
 
+    @property
+    def user_first_name(self):
+        if self.user:
+            return self.user.first_name
+        elif self.latest_invitation:
+            return self.latest_invitation.first_name
+
+    @property
+    def user_last_name(self):
+        if self.user:
+            return self.user.last_name
+        elif self.latest_invitation:
+            return self.latest_invitation.last_name
+
     def __repr__(self):
         return "<ApplicationRole(application='{}', user_id='{}', id='{}', permissions={})>".format(
             self.application.name, self.user_id, self.id, self.permissions

atst/routes/applications/settings.py

@@ -9,7 +9,7 @@ from atst.domain.audit_log import AuditLog
 from atst.domain.common import Paginator
 from atst.domain.environment_roles import EnvironmentRoles
 from atst.forms.application import ApplicationForm, EditEnvironmentForm
-from atst.forms.application_member import NewForm as NewMemberForm
+from atst.forms.application_member import NewForm as MemberForm, UpdateMemberForm
 from atst.forms.data import ENV_ROLE_NO_ACCESS as NO_ACCESS
 from atst.domain.authz.decorator import user_can_access_decorator as user_can
 from atst.models.environment_role import CSPRole
@@ -36,6 +36,7 @@ def get_environments_obj_for_app(application):
 
 
 def data_for_app_env_roles_form(application):
+    # this whole thing can be deleted when #1067 is rebased/merged! (and check other fns here)
     csp_roles = [role.value for role in CSPRole]
     csp_roles.insert(0, NO_ACCESS)
     # dictionary for sorting application members by environments
@@ -95,16 +96,19 @@ def get_form_permission_value(member, edit_perm_set):
 def get_members_data(application):
     members_data = []
     for member in application.members:
+        perms_team_mgmt = get_form_permission_value(
+            member, PermissionSets.EDIT_APPLICATION_TEAM
+        )
+        perms_env_mgmt = get_form_permission_value(
+            member, PermissionSets.EDIT_APPLICATION_ENVIRONMENTS
+        )
+        perms_del_env = get_form_permission_value(
+            member, PermissionSets.DELETE_APPLICATION_ENVIRONMENTS
+        )
         permission_sets = {
-            "perms_team_mgmt": get_form_permission_value(
-                member, PermissionSets.EDIT_APPLICATION_TEAM
-            ),
-            "perms_env_mgmt": get_form_permission_value(
-                member, PermissionSets.EDIT_APPLICATION_ENVIRONMENTS
-            ),
-            "perms_del_env": get_form_permission_value(
-                member, PermissionSets.DELETE_APPLICATION_ENVIRONMENTS
-            ),
+            "perms_team_mgmt": perms_team_mgmt,
+            "perms_env_mgmt": perms_env_mgmt,
+            "perms_del_env": perms_del_env,
         }
         roles = EnvironmentRoles.get_for_application_member(member.id)
         environment_roles = [
@@ -115,6 +119,15 @@ def get_members_data(application):
             }
             for role in roles
         ]
+        form_data = {
+            "environment_roles": environment_roles,
+            "permission_sets": { "perms_env_mgmt": 'selected' },
+        }
+        # ['edit_application_environments', 'edit_application_team', 'delete_application_environments']
+        # ['edit_application_team']
+
+        # {'perms_team_mgmt': 'edit_application_team', 'perms_env_mgmt': 'view_application', 'perms_del_env': 'view_application'}
+        form = UpdateMemberForm(data=form_data)
         members_data.append(
             {
                 "role_id": member.id,
@@ -122,6 +135,7 @@ def get_members_data(application):
                 "permission_sets": permission_sets,
                 "environment_roles": environment_roles,
                 "role_status": member.status.value,
+                "form": form,
             }
         )
 
@@ -134,7 +148,7 @@ def get_new_member_form(application):
         for e in application.environments
     ]
 
-    return NewMemberForm(data={"environment_roles": env_roles})
+    return MemberForm(data={"environment_roles": env_roles})
 
 
 def render_settings_page(application, **kwargs):
@@ -304,7 +318,7 @@ def delete_environment(environment_id):
 )
 def create_member(application_id):
     application = Applications.get(application_id)
-    form = NewMemberForm(http_request.form)
+    form = MemberForm(http_request.form)
 
     if form.validate():
         try: