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

Add save button and temp member role toggle to env member form

Browse Source
This commit is contained in:
leigh-mil 2019-05-01 13:52:49 -04:00
parent aab01b3947
commit 060c6834bf
12 changed files with 148 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/domain/environments.py
View File

@ -73,7 +73,7 @@ class Environments(object):
def update_env_role(cls, environment, user, new_role):
updated = False
if new_role is None:
if new_role == "no_access":
updated = EnvironmentRoles.delete(user.id, environment.id)
else:
env_role = EnvironmentRoles.get(user.id, environment.id)

11
atst/forms/app_settings.py
View File

@ -1,14 +1,19 @@
from flask_wtf import FlaskForm
from wtforms.fields import StringField, HiddenField, RadioField, FieldList, FormField
from wtforms.fields import FieldList, FormField, HiddenField, RadioField
from .forms import BaseForm
from .data import ENV_ROLES
class EnvMemberRoleForm(FlaskForm):
name = StringField()
user_id = HiddenField()
role = RadioField(choices=ENV_ROLES, coerce=BaseForm.remove_empty_string)
role = RadioField(choices=ENV_ROLES, default="no_access")
@property
def data(self):
_data = super().data
_data.pop("csrf_token", None)
return _data
class EnvironmentRolesForm(BaseForm):

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")
]

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

@ -9,7 +9,6 @@ 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
from atst.domain.exceptions import NotFoundError
from atst.models.environment_role import CSPRole
from atst.models.permissions import Permissions
from atst.utils.flash import formatted_flash as flash
@ -48,11 +47,15 @@ def sort_env_users_by_role(env):
def data_for_env_members_form(environment):
data = {"env_id": environment.id, "team_roles": []}
for user in environment.users:
for user in environment.application.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}
)
if env_role:
role = env_role.displayname
else:
role = "no_access"
data["team_roles"].append({"user_id": user.id, "role": role})
return data
@ -68,10 +71,8 @@ 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)
csp_roles = [role.value for role in CSPRole]
return render_template(
"portfolios/applications/settings.html",
@ -145,12 +146,12 @@ 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)
form = EnvironmentRolesForm(formdata=http_request.form)
if env_roles_form.validate():
if form.validate():
try:
user_ids = [user["user_id"] for user in env_roles_form.data["team_roles"]]
user_ids = [user["user_id"] for user in form.data["team_roles"]]
check_users_are_in_application(user_ids, application)
except NotFoundError as err:
app.logger.warning(
@ -161,11 +162,21 @@ def update_env_roles(environment_id):
)
raise (err)
env_data = env_roles_form.data
env_data = form.data
Environments.update_env_roles_by_environment(
environment_id=environment_id, team_roles=env_data["team_roles"]
)
return redirect(url_for("applications.settings", application_id=application.id))
flash("application_environment_members_updated")
return redirect(
url_for(
"applications.settings",
application_id=application.id,
fragment="application-environments",
_anchor="application-environments",
)
)
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

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",

1
js/components/toggler.js
View File

@ -8,6 +8,7 @@ export default {
mixins: [FormMixin],
components: {
optionsinput,
textinput,
optionsinput,
},

48
styles/sections/_application_edit.scss
View File

@ -25,11 +25,14 @@
.app-team-settings-link {
font-size: $small-font-size;
font-weight: $font-normal;
padding-left: $gap * 2;
}
.environment-roles {
padding: 0 ($gap * 3) ($gap * 3);
}
.environment-role {
padding: $gap * 3;
padding: ($gap * 2) 0;
h4 {
margin-bottom: $gap / 4;
@ -50,10 +53,35 @@
margin: $gap;
white-space: nowrap;
width: 20rem;
position: relative;
&.unassigned {
border: solid 1px $color-gray-light;
}
.icon-link {
padding: 0;
}
.environment-role__user-field {
position: absolute;
background-color: $color-white;
margin-top: $gap * 2;
padding: $gap;
left: -0.1rem;
border: solid 1px $color-gray-light;
width: 20rem;
z-index: 3;
.usa-input {
margin: 0;
li {
background-color: white;
border: none;
}
}
}
}
.environment-role__no-user {
@ -94,3 +122,19 @@
font-weight: $font-normal;
color: $color-gray-medium;
}
.application-list-item {
.usa-button-primary {
width: $search-button-width * 2;
}
.action-group-cancel {
position: relative;
.action-group-cancel__action {
position: absolute;
right: ($search-button-width * 2) + ($gap * 2);
top: -($gap * 8);
}
}
}

4
templates/components/toggle_list.html
View File

@ -9,8 +9,8 @@
</span>
{% endmacro %}
{% macro ToggleSection(section_name) %}
<div v-show="selectedSection === '{{ section_name }}'">
{% macro ToggleSection(section_name, classes) %}
<div v-show="selectedSection === '{{ section_name }}'" class='{{ classes }}'>
{{ caller() }}
</div>
{% endmacro %}

55
templates/fragments/applications/edit_environments.html
View File

@ -1,11 +1,12 @@
{% from "components/delete_confirmation.html" import DeleteConfirmation %}
{% from "components/icon.html" import Icon %}
{% from "components/modal.html" import Modal %}
{% from "components/options_input.html" import OptionsInput %}
{% from "components/save_button.html" import SaveButton %}
{% from "components/text_input.html" import TextInput %}
{% from "components/toggle_list.html" import ToggleButton, ToggleSection %}
{% macro RolePanel(users=[], role='no_access') %}
{% macro RolePanel(users=[], role='no_access', members_form=[]) %}
{% if role == 'no_access' %}
{% set role = 'Unassigned (No Access)' %}
{% set unassigned = True %}
@ -15,8 +16,31 @@
<h4>{{ role }}</h4>
<ul class='environment-role__users'>
{% for user in users %}
{% set section_name = "env_member_{}".format(user.user_id) %}
<li class="environment-role__user {{ 'unassigned' if unassigned }}">
{{ user.name }}{{ Icon('edit', classes="icon--medium right") }}
{{ user.name }}
<span class="icon-link right">
{% set edit_env_members_button %}
{{ Icon('edit', classes="icon--medium") }}
{% endset %}
{{
ToggleButton(
open_html=edit_env_members_button,
close_html=edit_env_members_button,
section_name=section_name
)
}}
</span>
{% call ToggleSection(section_name=section_name, classes="environment-role__user-field") %}
{% for member in members_form %}
{% if member.user_id.data == user.user_id %}
{{ OptionsInput(member.role, label=False) }}
{{ member.user_id() }}
{% endif %}
{% endfor %}
{% endcall %}
</li>
{% endfor %}
@ -101,11 +125,30 @@
</div>
</div>
{% call ToggleSection(section_name="members") %}
{% call ToggleSection(section_name="members", classes="environment-roles") %}
<div class='app-team-settings-link'>Need to add someone new to the team? <a href='{{ url_for("applications.team", application_id=application.id) }}'>Jump to Team Settings</a></div>
{% for role, members in members_by_role.items() %}
{{ RolePanel(users=members, role=role) }}
{% endfor %}
<toggler inline-template>
{% set members_form = env['members_form'] %}
<form action="{{ url_for('applications.update_env_roles', environment_id=env['id']) }}" method="post">
{{ members_form.csrf_token }}
{% for role, members in members_by_role.items() %}
{{ RolePanel(users=members, role=role, members_form=env['members_form']['team_roles']) }}
{% endfor %}
{{ env['members_form'].env_id() }}
<div class='action-group'>
{{
SaveButton(
text=("portfolios.applications.update_button_text" | translate)
)
}}
</div>
</form>
</toggler>
<div class='action-group-cancel'>
<a class='action-group-cancel__action icon-link icon-link--default' v-on:click="toggleSection('members')">
{{ "common.cancel" | translate }}
</a>
</div>
{% endcall %}
{% call ToggleSection(section_name="edit") %}

8
tests/domain/test_environments.py
View File

@ -39,7 +39,9 @@ def test_update_env_role_no_access():
user=env_role.user, application=env_role.environment.application
)
assert Environments.update_env_role(env_role.environment, env_role.user, None)
assert Environments.update_env_role(
env_role.environment, env_role.user, "no_access"
)
assert not EnvironmentRoles.get(env_role.user.id, env_role.environment.id)
@ -90,7 +92,7 @@ def test_update_env_roles_by_environment():
{
"user_id": env_role_3.user.id,
"name": env_role_3.user.full_name,
"role": None,
"role": "no_access",
},
]
@ -125,7 +127,7 @@ def test_update_env_roles_by_member():
{"id": dev.id, "role": CSPRole.NETWORK_ADMIN.value},
{"id": staging.id, "role": CSPRole.BUSINESS_READ.value},
{"id": prod.id, "role": CSPRole.TECHNICAL_READ.value},
{"id": testing.id, "role": None},
{"id": testing.id, "role": "no_access"},
]
Environments.update_env_roles_by_member(user, env_roles)

12
tests/routes/applications/test_settings.py
View File

@ -123,13 +123,13 @@ def test_edit_application_environments_obj(app, client, user_session):
assert isinstance(env_obj["members_form"], EnvironmentRolesForm)
assert env_obj["members"] == {
"no_access": [
{"name": app_role.user.full_name, "user_id": app_role.user_id}
{"user_id": app_role.user_id, "name": app_role.user.full_name}
],
CSPRole.BASIC_ACCESS.value: [
{"name": env_role1.user.full_name, "user_id": env_role1.user_id}
{"user_id": env_role1.user_id, "name": env_role1.user.full_name}
],
CSPRole.NETWORK_ADMIN.value: [
{"name": env_role2.user.full_name, "user_id": env_role2.user_id}
{"user_id": env_role2.user_id, "name": env_role2.user.full_name}
],
CSPRole.BUSINESS_READ.value: [],
CSPRole.TECHNICAL_READ.value: [],
@ -236,16 +236,12 @@ def test_update_team_env_roles(client, user_session):
form_data = {
"env_id": environment.id,
"team_roles-0-user_id": env_role_1.user.id,
"team_roles-0-name": env_role_1.user.full_name,
"team_roles-0-role": CSPRole.NETWORK_ADMIN.value,
"team_roles-1-user_id": env_role_2.user.id,
"team_roles-1-name": env_role_2.user.full_name,
"team_roles-1-role": CSPRole.BASIC_ACCESS.value,
"team_roles-2-user_id": env_role_3.user.id,
"team_roles-2-name": env_role_3.user.full_name,
"team_roles-2-role": "",
"team_roles-2-role": "no_access",
"team_roles-3-user_id": app_role.user.id,
"team_roles-3-name": app_role.user.full_name,
"team_roles-3-role": CSPRole.TECHNICAL_READ.value,
}

2
tests/test_access.py
View File

@ -16,7 +16,7 @@ from tests.factories import (
ApplicationRoleFactory,
EnvironmentFactory,
EnvironmentRoleFactory,
InvitationFactory,
PortfolioInvitationFactory,
PortfolioFactory,
PortfolioRoleFactory,
TaskOrderFactory,