From 13bc830536cf69932f9dbf338ba02534ad7b1b68 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Mon, 30 Sep 2019 16:24:03 -0400 Subject: [PATCH] Add update invite form to settings page and move user info page of member form into its own macro --- .secrets.baseline | 2 +- atst/routes/applications/settings.py | 8 ++ .../fragments/member_form_fields.html | 71 ++++++++++++++++ .../fragments/member_perms_form_fields.html | 52 ------------ .../fragments/new_member_modal_content.html | 24 +----- templates/applications/settings.html | 10 ++- templates/fragments/members.html | 82 ++++++++++++++----- 7 files changed, 151 insertions(+), 98 deletions(-) create mode 100644 templates/applications/fragments/member_form_fields.html delete mode 100644 templates/applications/fragments/member_perms_form_fields.html diff --git a/.secrets.baseline b/.secrets.baseline index a203d223..bc5bea51 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -3,7 +3,7 @@ "files": "^.secrets.baseline$", "lines": null }, - "generated_at": "2019-09-30T16:06:53Z", + "generated_at": "2019-10-02T23:24:50Z", "plugins_used": [ { "base64_limit": 4.5, diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py index 87b5dd7f..18b92603 100644 --- a/atst/routes/applications/settings.py +++ b/atst/routes/applications/settings.py @@ -96,6 +96,13 @@ def get_members_data(application): form = UpdateMemberForm( environment_roles=env_roles_form_data, **permission_sets ) + update_invite_form = None + + if member.latest_invitation and member.latest_invitation.can_resend: + update_invite_form = MemberForm(obj=member.latest_invitation) + else: + update_invite_form = MemberForm() + members_data.append( { "role_id": member.id, @@ -104,6 +111,7 @@ def get_members_data(application): "environment_roles": environment_roles, "role_status": member.status.value, "form": form, + "update_invite_form": update_invite_form, } ) diff --git a/templates/applications/fragments/member_form_fields.html b/templates/applications/fragments/member_form_fields.html new file mode 100644 index 00000000..96c6966b --- /dev/null +++ b/templates/applications/fragments/member_form_fields.html @@ -0,0 +1,71 @@ +{% from "components/checkbox_input.html" import CheckboxInput %} +{% from "components/text_input.html" import TextInput %} +{% from "components/phone_input.html" import PhoneInput %} + +{% macro PermsFields(form, new=False, member_role_id=None) %} +

{{ "portfolios.applications.members.form.project_perms" | translate }}

+
+ {% if new %} + {% set team_mgmt = form.perms_team_mgmt.name %} + {% set env_mgmt = form.perms_env_mgmt.name %} + {% set del_env = form.perms_del_env.name %} + {% else %} + {% set team_mgmt = "perms_team_mgmt-{}".format(member_role_id) %} + {% set env_mgmt = "perms_env_mgmt-{}".format(member_role_id) %} + {% set del_env = "perms_del_env-{}".format(member_role_id) %} + {% endif %} + + {{ CheckboxInput(form.perms_team_mgmt, classes="input__inline-fields", key=team_mgmt, id=team_mgmt, optional=True) }} + {{ CheckboxInput(form.perms_env_mgmt, classes="input__inline-fields", key=env_mgmt, id=env_mgmt, optional=True) }} + {{ CheckboxInput(form.perms_del_env, classes="input__inline-fields", key=del_env, id=del_env, optional=True) }} +
+
+

{{ "portfolios.applications.members.form.env_access" | translate }}

+
+ {% for environment_data in form.environment_roles %} + +
+
+
+
+ +
+ {{ environment_data.environment_name.data }} +
+ +
+
+ {{ environment_data.role(**{"v-model": "value"}) }} +
+
+
+
+ + {{ environment_data.environment_id() }} +
+ {% endfor %} +
+{% endmacro %} + +{% macro InfoFields(member_form) %} +
+ {{ TextInput(member_form.first_name, validation='requiredField', optional=False) }} +
+
+ {{ TextInput(member_form.last_name, validation='requiredField', optional=False) }} +
+
+ {{ TextInput(member_form.email, validation='email', optional=False) }} +
+
+ {{ PhoneInput(member_form.phone_number, member_form.phone_ext)}} +
+
+ {{ TextInput(member_form.dod_id, validation='dodId', optional=False) }} +
+ How do I find the DoD ID? +{% endmacro %} diff --git a/templates/applications/fragments/member_perms_form_fields.html b/templates/applications/fragments/member_perms_form_fields.html deleted file mode 100644 index c0261ed3..00000000 --- a/templates/applications/fragments/member_perms_form_fields.html +++ /dev/null @@ -1,52 +0,0 @@ -{% from "components/checkbox_input.html" import CheckboxInput %} - -{% macro MemberPermsFields(form, new=False, member_role_id=None) %} -
-

{{ "portfolios.applications.members.form.project_perms" | translate }}

-
- {% if new %} - {% set team_mgmt = form.perms_team_mgmt.name %} - {% set env_mgmt = form.perms_env_mgmt.name %} - {% set del_env = form.perms_del_env.name %} - {% else %} - {% set team_mgmt = "perms_team_mgmt-{}".format(member_role_id) %} - {% set env_mgmt = "perms_env_mgmt-{}".format(member_role_id) %} - {% set del_env = "perms_del_env-{}".format(member_role_id) %} - {% endif %} - - {{ CheckboxInput(form.perms_team_mgmt, classes="input__inline-fields", key=team_mgmt, id=team_mgmt, optional=True) }} - {{ CheckboxInput(form.perms_env_mgmt, classes="input__inline-fields", key=env_mgmt, id=env_mgmt, optional=True) }} - {{ CheckboxInput(form.perms_del_env, classes="input__inline-fields", key=del_env, id=del_env, optional=True) }} -
-
-

{{ "portfolios.applications.members.form.env_access" | translate }}

-
- {% for environment_data in form.environment_roles %} - -
-
-
-
- -
- {{ environment_data.environment_name.data }} -
- -
-
- {{ environment_data.role(**{"v-model": "value"}) }} -
-
-
-
- - {{ environment_data.environment_id() }} -
- {% endfor %} -
-
-{% endmacro %} diff --git a/templates/applications/fragments/new_member_modal_content.html b/templates/applications/fragments/new_member_modal_content.html index bc3bd4d2..94bbc64e 100644 --- a/templates/applications/fragments/new_member_modal_content.html +++ b/templates/applications/fragments/new_member_modal_content.html @@ -1,8 +1,5 @@ {% from "components/icon.html" import Icon %} -{% from "components/text_input.html" import TextInput %} -{% from "components/checkbox_input.html" import CheckboxInput %} -{% from "components/phone_input.html" import PhoneInput %} -{% from "applications/fragments/member_perms_form_fields.html" import MemberPermsFields %} +{% import "applications/fragments/member_form_fields.html" as member_fields %} {% macro MemberFormTemplate(title, next_button, previous=True) %}
@@ -36,22 +33,7 @@ {% endset %} {% call MemberFormTemplate(title="portfolios.applications.members.form.add_member"|translate, next_button=next_button, previous=False) %} -
- {{ TextInput(member_form.user_data.first_name, validation='requiredField', optional=False) }} -
-
- {{ TextInput(member_form.user_data.last_name, validation='requiredField', optional=False) }} -
-
- {{ TextInput(member_form.user_data.email, validation='email', optional=False) }} -
-
- {{ PhoneInput(member_form.user_data.phone_number, member_form.user_data.phone_ext)}} -
-
- {{ TextInput(member_form.user_data.dod_id, validation='dodId', optional=False) }} -
- How do I find the DoD ID? + {{ member_fields.InfoFields(member_form.user_data) }} {% endcall %} {% endmacro %} {% macro MemberStepTwo(member_form, application) %} @@ -64,6 +46,6 @@ {% endset %} {% call MemberFormTemplate(title="portfolios.applications.members.form.step_2_title"|translate, next_button=next_button) %} - {{ MemberPermsFields(form=member_form) }} + {{ member_fields.PermsFields(form=member_form) }} {% endcall %} {% endmacro %} diff --git a/templates/applications/settings.html b/templates/applications/settings.html index c33db395..ad9cb377 100644 --- a/templates/applications/settings.html +++ b/templates/applications/settings.html @@ -4,7 +4,6 @@ {% from "components/delete_confirmation.html" import DeleteConfirmation %} {% from "components/icon.html" import Icon %} {% import "applications/fragments/new_member_modal_content.html" as member_steps %} -{% from "applications/fragments/member_perms_form_fields.html" import MemberPermsFields %} {% from "fragments/members.html" import MemberManagementTemplate %} {% from "components/modal.html" import Modal %} {% from "components/multi_step_modal_form.html" import MultiStepModalForm %} @@ -75,11 +74,14 @@ {% endif %} {{ MemberManagementTemplate( - application, - members, + application, + members, new_member_form, "applications.create_member", - user_can(permissions.CREATE_APPLICATION_MEMBER)) }} + user_can(permissions.CREATE_APPLICATION_MEMBER), + user_can(permissions.EDIT_APPLICATION_MEMBER), + user_can(permissions.DELETE_APPLICATION_MEMBER), + ) }}
{{ 'common.resource_names.environments' | translate }} diff --git a/templates/fragments/members.html b/templates/fragments/members.html index 9f43c93e..117e8923 100644 --- a/templates/fragments/members.html +++ b/templates/fragments/members.html @@ -1,20 +1,22 @@ {% from "components/alert.html" import Alert %} {% from "components/icon.html" import Icon %} {% import "applications/fragments/new_member_modal_content.html" as member_steps %} -{% from "applications/fragments/member_perms_form_fields.html" import MemberPermsFields %} +{% import "applications/fragments/member_form_fields.html" as member_fields %} {% from "components/modal.html" import Modal %} {% from "components/multi_step_modal_form.html" import MultiStepModalForm %} {% from "components/save_button.html" import SaveButton %} {% macro MemberManagementTemplate( - application, + application, members, new_member_form, action, - user_can_create_app_member=False + user_can_create_app_member=False, + user_can_edit_app_member=False, + user_can_delete_app_member=False ) %} - + {% if g.matchesPath("application-members") %} {% include "fragments/flash.html" %} {% endif %} @@ -52,28 +54,65 @@ {% else %} {% set new_member_modal_name = "add-app-mem" %} - + {% for member in members %} - {% set modal_name = "edit_member-{}".format(loop.index) %} - {% call Modal(modal_name) %} + {%- if user_can_edit_app_member %} + {% set modal_name = "edit_member-{}".format(loop.index) %} + {% call Modal(modal_name) %} +
+

{{ Icon('avatar') }} {{ member.user_name }}

+
+
+ + + + {% endcall %} + + {%- if member.role_status == 'pending' %} + {% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %} + {% call Modal(resend_invite_modal) %}
-

{{ Icon('avatar') }} {{ member.user_name }}

+

Verify Member Information

- {% endcall %} - {% endfor %} + {% endif -%} + {% endif -%} + + {% if user_can_delete_app_member and member.role_status == 'pending' -%} + {% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %} + {% call Modal(name=revoke_invite_modal, dismissable=True) %} +
+
+ {{ member.form.csrf_token }} +

{{ "invites.revoke.modal_heading" | translate({'user_name': member.user_name}) }}

+
+ + +
+
+
+ {% endcall %} + {%- endif %} + {% endfor %} -
@@ -112,10 +151,14 @@ {% endfor %} {% endfor %} @@ -129,7 +172,6 @@ {% if user_can_create_app_member %} - {% import "applications/fragments/new_member_modal_content.html" as member_steps %} {{ MultiStepModalForm( name=new_member_modal_name, form=new_member_form,
- {% if member.role_status == 'pending' %} - Resend Invite
- Revoke Invite - {% endif %} + {% if member.role_status == 'pending' -%} + {% set revoke_invite_modal = "revoke_invite_{}".format(member.role_id) %} + {% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %} + Resend Invite
+ {% if user_can_delete_app_member -%} + {{ 'invites.revoke.button' | translate }} + {%- endif %} + {%- endif %}