Handle setting no access for user environment roles:

- use constant for no access string
- update no access constant
- update language and permissions for rendering remove app member button

atst/forms/app_settings.py

@@ -2,18 +2,18 @@ from flask_wtf import FlaskForm
 from wtforms.fields import FieldList, FormField, HiddenField, RadioField, StringField
 
 from .forms import BaseForm
-from .data import ENV_ROLES
+from .data import ENV_ROLES, ENV_ROLE_NO_ACCESS as NO_ACCESS
 
 
 class MemberForm(FlaskForm):
     user_id = HiddenField()
     user_name = StringField()
-    role_name = RadioField(choices=ENV_ROLES, default="no_access")
+    role_name = RadioField(choices=ENV_ROLES, default=NO_ACCESS)
 
     @property
     def data(self):
         _data = super().data
-        if "role_name" in _data and _data["role_name"] == "no_access":
+        if "role_name" in _data and _data["role_name"] == NO_ACCESS:
             _data["role_name"] = None
         return _data
 

atst/forms/data.py

@@ -217,6 +217,7 @@ REQUIRED_DISTRIBUTIONS = [
     ("other", "Other as necessary"),
 ]
 
+ENV_ROLE_NO_ACCESS = "No Access"
 ENV_ROLES = [(role.value, role.value) for role in CSPRole] + [
-    ("no_access", "No access")
+    (ENV_ROLE_NO_ACCESS, "No access")
 ]

atst/forms/team.py

@@ -3,7 +3,7 @@ from wtforms.fields import FormField, FieldList, HiddenField, RadioField, String
 from wtforms.validators import Required
 
 from .application_member import EnvironmentForm as BaseEnvironmentForm
-from .data import ENV_ROLES
+from .data import ENV_ROLES, ENV_ROLE_NO_ACCESS as NO_ACCESS
 from .forms import BaseForm
 from atst.forms.fields import SelectField
 from atst.domain.permission_sets import PermissionSets
@@ -18,6 +18,13 @@ class EnvironmentForm(BaseEnvironmentForm):
         filters=[lambda x: None if x == "None" else x],
     )
 
+    @property
+    def data(self):
+        _data = super().data
+        if "role" in _data and _data["role"] == NO_ACCESS:
+            _data["role"] = None
+        return _data
+
 
 class PermissionsForm(FlaskForm):
     perms_team_mgmt = SelectField(

atst/routes/applications/settings.py

@@ -5,6 +5,7 @@ from atst.domain.environments import Environments
 from atst.domain.applications import Applications
 from atst.forms.app_settings import AppEnvRolesForm
 from atst.forms.application import ApplicationForm, EditEnvironmentForm
+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
 from atst.domain.exceptions import NotFoundError
@@ -46,10 +47,10 @@ def sort_env_users_by_role(env):
     users_list = []
     no_access_users = env.application.users - env.users
     no_access_list = [
-        {"user_id": str(user.id), "user_name": user.full_name, "role_name": "no_access"}
+        {"user_id": str(user.id), "user_name": user.full_name, "role_name": NO_ACCESS}
         for user in no_access_users
     ]
-    users_list.append({"role": "no_access", "members": no_access_list})
+    users_list.append({"role": NO_ACCESS, "members": no_access_list})
 
     for role in CSPRole:
         users_list.append(

atst/routes/applications/team.py

@@ -113,7 +113,7 @@ def update_team(application_id):
                     environment_role_form.environment_id.data
                 )
                 Environments.update_env_role(
-                    environment, user, environment_role_form.role.data
+                    environment, user, environment_role_form.data.get("role")
                 )
 
         flash("updated_application_team_settings", application_name=application.name)