pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #799 from dod-ccpo/edit-env-form-view-part-2

Browse Source 
Edit env form view part 2
This commit is contained in:
leigh-mil
2019-05-14 11:14:46 -04:00
committed by GitHub
parent 547d813970 c5e85c4f1e
commit 4c2b6c331b
18 changed files with 613 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
atst/domain/environments.py
View File

@@ -98,7 +98,7 @@ class Environments(object):
environment = Environments.get(environment_id)
for member in team_roles:
new_role = member["role"]
new_role = member["role_name"]
user = Users.get(member["user_id"])
Environments.update_env_role(
environment=environment, user=user, new_role=new_role
@@ -113,6 +113,15 @@ class Environments(object):
environment=environment, user=member, new_role=new_role
)
@classmethod
def get_members_by_role(cls, env, role):
return (
db.session.query(EnvironmentRole)
.filter(EnvironmentRole.environment_id == env.id)
.filter(EnvironmentRole.role == role)
.all()
)
@classmethod
def revoke_access(cls, environment, target_user):
EnvironmentRoles.delete(environment.id, target_user.id)

28
atst/forms/app_settings.py
View File

@@ -1,16 +1,32 @@
from flask_wtf import FlaskForm
from wtforms.fields import StringField, HiddenField, RadioField, FieldList, FormField
from wtforms.fields import FieldList, FormField, HiddenField, RadioField, StringField
from .forms import BaseForm
from .data import ENV_ROLES
class EnvMemberRoleForm(FlaskForm):
name = StringField()
class MemberForm(FlaskForm):
user_id = HiddenField()
role = RadioField(choices=ENV_ROLES, coerce=BaseForm.remove_empty_string)
user_name = StringField()
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":
_data["role_name"] = 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))

4
atst/forms/data.py
View File

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

2
atst/models/environment.py
View File

@@ -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):

132
atst/routes/applications/settings.py
View File

@@ -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,37 +19,59 @@ 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)
return environments_obj
def serialize_members(member_list, role):
serialized_list = []
for member in member_list:
serialized_list.append(
{
"user_id": str(member.user_id),
"user_name": member.user.full_name,
"role_name": role,
}
)
return serialized_list
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": 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})
for role in CSPRole:
users_dict[role.value] = []
users_list.append(
{
"role": role.value,
"members": serialize_members(
Environments.get_members_by_role(env, role.value), 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.users:
env_role = EnvironmentRoles.get(user.id, environment.id)
data["team_roles"].append(
{"name": user.full_name, "user_id": user.id, "role": env_role.displayname}
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
@@ -67,15 +88,19 @@ def check_users_are_in_application(user_ids, application):
@applications_bp.route("/applications/<application_id>/settings")
@user_can(Permissions.VIEW_APPLICATION, message="view application edit form")
def settings(application_id):
# refactor like portfolio admin render function
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,
active_toggler=http_request.args.get("active_toggler"),
active_toggler_section=http_request.args.get("active_toggler_section"),
)
@@ -98,6 +123,8 @@ def update_environment(environment_id):
application_id=application.id,
fragment="application-environments",
_anchor="application-environments",
active_toggler=environment.id,
active_toggler_section="edit",
)
)
else:
@@ -109,6 +136,11 @@ def update_environment(environment_id):
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)
),
active_toggler=environment.id,
active_toggler_section="edit",
),
400,
)
@@ -143,13 +175,17 @@ def update(application_id):
def update_env_roles(environment_id):
environment = Environments.get(environment_id)
application = environment.application
env_roles_form = EnvironmentRolesForm(http_request.form)
if env_roles_form.validate():
form = AppEnvRolesForm(formdata=http_request.form)
if form.validate():
env_data = []
try:
user_ids = [user["user_id"] for user in env_roles_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(
@@ -159,22 +195,36 @@ def update_env_roles(environment_id):
)
raise (err)
env_data = env_roles_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")
return redirect(
url_for(
"applications.settings",
application_id=application.id,
fragment="application-environments",
_anchor="application-environments",
active_toggler=environment.id,
active_toggler_section="members",
)
)
return redirect(url_for("applications.settings", application_id=application.id))
else:
# TODO: Create a better pattern to handle when a form doesn't validate
# if a user is submitting the data via the web page then they
# should never have any form validation errors
return render_template(
"portfolios/applications/settings.html",
application=application,
form=ApplicationForm(
name=application.name, description=application.description
return (
render_template(
"portfolios/applications/settings.html",
application=application,
form=ApplicationForm(
name=application.name, description=application.description
),
environments_obj=get_environments_obj_for_app(application=application),
active_toggler=environment.id,
active_toggler_section="edit",
),
environments_obj=get_environments_obj_for_app(application=application),
400,
)

5
atst/utils/flash.py
View File

@@ -7,6 +7,11 @@ MESSAGES = {
"message_template": 'The environment "{{ environment_name }}" has been deleted',
"category": "success",
},
"application_environment_members_updated": {
"title_template": "Application environment members updated",
"message_template": "Application environment members have been updated",
"category": "success",
},
"application_environments_updated": {
"title_template": "Application environments updated",
"message_template": "Application environments have been updated",