Add resend invite form/modal, update routes and tests as necessary.
This commit is contained in:
leigh-mil
parent
56c213285f
commit
4f345b462f
@ -38,20 +38,35 @@ def filter_perm_sets_data(member):
|
||||
return perm_sets_data
|
||||
|
||||
|
||||
def filter_members_data(members_list, portfolio):
|
||||
def filter_members_data(members_list):
|
||||
members_data = []
|
||||
for member in members_list:
|
||||
permission_sets = filter_perm_sets_data(member)
|
||||
members_data.append(
|
||||
{
|
||||
"role_id": member.id,
|
||||
"user_name": member.user_name,
|
||||
"permission_sets": filter_perm_sets_data(member),
|
||||
"status": member.display_status,
|
||||
"ppoc": PermissionSets.PORTFOLIO_POC in member.permission_sets,
|
||||
"form": member_forms.PermissionsForm(permission_sets),
|
||||
}
|
||||
)
|
||||
ppoc = PermissionSets.PORTFOLIO_POC in member.permission_sets
|
||||
member_data = {
|
||||
"role_id": member.id,
|
||||
"user_name": member.user_name,
|
||||
"permission_sets": filter_perm_sets_data(member),
|
||||
"status": member.display_status,
|
||||
"ppoc": ppoc,
|
||||
"form": member_forms.PermissionsForm(permission_sets),
|
||||
}
|
||||
|
||||
if not ppoc:
|
||||
update_invite_form = (
|
||||
member_forms.NewForm(user_data=member.latest_invitation)
|
||||
if member.latest_invitation and member.latest_invitation.can_resend
|
||||
else member_forms.NewForm()
|
||||
)
|
||||
invite_token = (
|
||||
member.latest_invitation.token
|
||||
if member.latest_invitation and member.latest_invitation.can_resend
|
||||
else None
|
||||
)
|
||||
member_data["update_invite_form"] = update_invite_form
|
||||
member_data["invite_token"] = invite_token
|
||||
|
||||
members_data.append(member_data)
|
||||
|
||||
return sorted(members_data, key=lambda member: member["user_name"])
|
||||
|
||||
@ -76,7 +91,7 @@ def render_admin_page(portfolio, form=None):
|
||||
"portfolios/admin.html",
|
||||
form=form,
|
||||
portfolio_form=portfolio_form,
|
||||
members=filter_members_data(member_list, portfolio),
|
||||
members=filter_members_data(member_list),
|
||||
new_manager_form=member_forms.NewForm(),
|
||||
assign_ppoc_form=assign_ppoc_form,
|
||||
portfolio=portfolio,
|
||||
|
||||
@ -54,13 +54,24 @@ def revoke_invitation(portfolio_id, portfolio_token):
|
||||
)
|
||||
@user_can(Permissions.EDIT_PORTFOLIO_USERS, message="resend invitation")
|
||||
def resend_invitation(portfolio_id, portfolio_token):
|
||||
invite = PortfolioInvitations.resend(g.current_user, portfolio_token)
|
||||
send_portfolio_invitation(
|
||||
invitee_email=invite.email,
|
||||
inviter_name=g.current_user.full_name,
|
||||
token=invite.token,
|
||||
)
|
||||
flash("resend_portfolio_invitation", user_name=invite.user_name)
|
||||
form = member_forms.NewForm(http_request.form)
|
||||
|
||||
if form.validate():
|
||||
invite = PortfolioInvitations.resend(
|
||||
g.current_user, portfolio_token, form.data["user_data"]
|
||||
)
|
||||
send_portfolio_invitation(
|
||||
invitee_email=invite.email,
|
||||
inviter_name=g.current_user.full_name,
|
||||
token=invite.token,
|
||||
)
|
||||
flash("resend_portfolio_invitation", user_name=invite.user_name)
|
||||
else:
|
||||
user_name = "{} {}".format(
|
||||
form["user_data"]["first_name"].data, form["user_data"]["last_name"].data
|
||||
)
|
||||
flash("resend_portfolio_invitation_error", user_name=user_name)
|
||||
|
||||
return redirect(
|
||||
url_for(
|
||||
"portfolios.admin",
|
||||
|
||||
@ -128,6 +128,11 @@ MESSAGES = {
|
||||
"message": "flash.portfolio_invite.resent.message",
|
||||
"category": "success",
|
||||
},
|
||||
"resend_portfolio_invitation_error": {
|
||||
"title_template": "Portfolio invitation error",
|
||||
"message_template": "There was an error processing the invitation for {{ user_name }}.",
|
||||
"category": "error",
|
||||
},
|
||||
"revoked_portfolio_access": {
|
||||
"title": "flash.portfolio_member.revoked.title",
|
||||
"message": "flash.portfolio_member.revoked.message",
|
||||
|
||||
@ -9,6 +9,9 @@
|
||||
|
||||
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) -%}
|
||||
{% for member in members -%}
|
||||
{% set invite_pending = member.status == 'invite_pending' %}
|
||||
{% set invite_expired = member.status == 'invite_expired' %}
|
||||
|
||||
{% set modal_name = "edit_member-{}".format(loop.index) %}
|
||||
{% call Modal(modal_name, classes="form-content--app-mem") %}
|
||||
<div class="modal__form--header">
|
||||
@ -27,6 +30,27 @@
|
||||
</form>
|
||||
</base-form>
|
||||
{% endcall %}
|
||||
|
||||
{% if invite_pending or invite_expired -%}
|
||||
{% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %}
|
||||
{% call Modal(resend_invite_modal, classes="form-content--app-mem") %}
|
||||
<div class="modal__form--header">
|
||||
<h1>{{ "portfolios.applications.members.new.verify" | translate }}</h1>
|
||||
</div>
|
||||
<base-form inline-template :enable-save="true">
|
||||
<form id='{{ resend_invite_modal }}' method="POST" action="{{ url_for('portfolios.resend_invitation', portfolio_id=portfolio.id, portfolio_token=member.invite_token) }}">
|
||||
{{ member.update_invite_form.csrf_token }}
|
||||
{{ member_form.SubmitStep(
|
||||
name=resend_invite_modal,
|
||||
form=member_form_fields.InfoFields(member.update_invite_form.user_data),
|
||||
submit_text="Resend Invite",
|
||||
previous=False,
|
||||
modal=resend_invite_modal
|
||||
) }}
|
||||
</form>
|
||||
</base-form>
|
||||
{% endcall %}
|
||||
{%- endif %}
|
||||
{%- endfor %}
|
||||
{%- endif %}
|
||||
|
||||
@ -43,7 +67,10 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for member in members -%}
|
||||
{% set invite_pending = member.status == 'invite_pending' %}
|
||||
{% set invite_expired = member.status == 'invite_expired' %}
|
||||
{% set perms_modal = "edit_member-{}".format(loop.index) %}
|
||||
{% set resend_invite_modal = "resend_invite-{}".format(member.role_id) %}
|
||||
<tr>
|
||||
<td>
|
||||
<strong>{{ member.user_name }}{% if member.role_id == current_member_id %} (You){% endif %}</strong>
|
||||
@ -64,8 +91,10 @@
|
||||
{% if user_can(permissions.EDIT_PORTFOLIO_USERS) -%}
|
||||
{% call ToggleMenu() %}
|
||||
<a v-on:click="openModal('{{ perms_modal }}')">Edit Permissions</a>
|
||||
<a href="#">Resend Invite</a>
|
||||
<a href="#">Revoke Invite</a>
|
||||
{% if invite_pending or invite_expired -%}
|
||||
<a v-on:click="openModal('{{ resend_invite_modal }}')">Resend Invite</a>
|
||||
<a href="#">Revoke Invite</a>
|
||||
{%- endif %}
|
||||
{% endcall %}
|
||||
{%- endif %}
|
||||
</td>
|
||||
|
||||
@ -219,11 +219,11 @@ def test_resend_invitation_sends_email(monkeypatch, client, user_session):
|
||||
monkeypatch.setattr("atst.jobs.send_mail.delay", job_mock)
|
||||
user = UserFactory.create()
|
||||
portfolio = PortfolioFactory.create()
|
||||
ws_role = PortfolioRoleFactory.create(
|
||||
portfolio_role = PortfolioRoleFactory.create(
|
||||
user=user, portfolio=portfolio, status=PortfolioRoleStatus.PENDING
|
||||
)
|
||||
invite = PortfolioInvitationFactory.create(
|
||||
user_id=user.id, role=ws_role, status=InvitationStatus.PENDING
|
||||
user_id=user.id, role=portfolio_role, status=InvitationStatus.PENDING
|
||||
)
|
||||
user_session(portfolio.owner)
|
||||
client.post(
|
||||
@ -231,43 +231,18 @@ def test_resend_invitation_sends_email(monkeypatch, client, user_session):
|
||||
"portfolios.resend_invitation",
|
||||
portfolio_id=portfolio.id,
|
||||
portfolio_token=invite.token,
|
||||
)
|
||||
),
|
||||
data={
|
||||
"user_data-dod_id": user.dod_id,
|
||||
"user_data-first_name": user.first_name,
|
||||
"user_data-last_name": user.last_name,
|
||||
"user_data-email": user.email,
|
||||
},
|
||||
)
|
||||
|
||||
assert job_mock.called
|
||||
|
||||
|
||||
def test_existing_member_invite_resent_to_email_submitted_in_form(
|
||||
monkeypatch, client, user_session
|
||||
):
|
||||
job_mock = Mock()
|
||||
monkeypatch.setattr("atst.jobs.send_mail.delay", job_mock)
|
||||
portfolio = PortfolioFactory.create()
|
||||
user = UserFactory.create()
|
||||
ws_role = PortfolioRoleFactory.create(
|
||||
user=user, portfolio=portfolio, status=PortfolioRoleStatus.PENDING
|
||||
)
|
||||
invite = PortfolioInvitationFactory.create(
|
||||
user_id=user.id,
|
||||
role=ws_role,
|
||||
status=InvitationStatus.PENDING,
|
||||
email="example@example.com",
|
||||
)
|
||||
user_session(portfolio.owner)
|
||||
client.post(
|
||||
url_for(
|
||||
"portfolios.resend_invitation",
|
||||
portfolio_id=portfolio.id,
|
||||
portfolio_token=invite.token,
|
||||
)
|
||||
)
|
||||
|
||||
assert user.email != "example@example.com"
|
||||
ordered_args, _unordered_args = job_mock.call_args
|
||||
recipients, _subject, _message = ordered_args
|
||||
assert recipients[0] == "example@example.com"
|
||||
|
||||
|
||||
_DEFAULT_PERMS_FORM_DATA = {
|
||||
"permission_sets-perms_app_mgmt": "n",
|
||||
"permission_sets-perms_funding": "n",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user