Add field for deleted in the app members environment form

atst/domain/environment_roles.py

@@ -29,6 +29,7 @@ class EnvironmentRoles(object):
                 EnvironmentRole.application_role_id == application_role_id,
                 EnvironmentRole.environment_id == environment_id,
                 EnvironmentRole.deleted == False,
+                EnvironmentRole.status != EnvironmentRole.Status.DISABLED,
             )
             .one_or_none()
         )

atst/forms/application_member.py

@@ -18,6 +18,7 @@ class EnvironmentForm(Form):
         default=NO_ACCESS,
         filters=[lambda x: None if x == "None" else x],
     )
+    deleted = BooleanField("Revoke Access", default=False)
 
     @property
     def data(self):

atst/routes/applications/settings.py

@@ -77,6 +77,7 @@ def filter_env_roles_form_data(member, environments):
             "environment_id": str(env.id),
             "environment_name": env.name,
             "role": NO_ACCESS,
+            "deleted": env.deleted,
         }
         env_roles_set = set(env.roles).intersection(set(member.environment_roles))
         if len(env_roles_set) == 1: