From 41b2fff7746a76257d95fa1b765c0cccb5afe838 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Mon, 3 Feb 2020 15:51:38 -0500
Subject: [PATCH] Add success flash message for revoked portfolio invite and
 update flash message and translations to be generalized

---
 atst/routes/applications/settings.py  |  5 +++--
 atst/routes/portfolios/invitations.py |  8 +++++++-
 atst/utils/flash.py                   | 10 +++++-----
 translations.yaml                     |  6 +++---
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/atst/routes/applications/settings.py b/atst/routes/applications/settings.py
index 8b744b04..8807c7f1 100644
--- a/atst/routes/applications/settings.py
+++ b/atst/routes/applications/settings.py
@@ -467,9 +467,10 @@ def revoke_invite(application_id, application_role_id):
     if invite.is_pending:
         ApplicationInvitations.revoke(invite.token)
         flash(
-            "application_invite_revoked",
+            "invite_revoked",
+            resource="Application",
             user_name=app_role.user_name,
-            application_name=g.application.name,
+            resource_name=g.application.name,
         )
     else:
         flash(
diff --git a/atst/routes/portfolios/invitations.py b/atst/routes/portfolios/invitations.py
index 9ec56aa3..80375e75 100644
--- a/atst/routes/portfolios/invitations.py
+++ b/atst/routes/portfolios/invitations.py
@@ -37,8 +37,14 @@ def accept_invitation(portfolio_token):
 )
 @user_can(Permissions.EDIT_PORTFOLIO_USERS, message="revoke invitation")
 def revoke_invitation(portfolio_id, portfolio_token):
-    PortfolioInvitations.revoke(portfolio_token)
+    invite = PortfolioInvitations.revoke(portfolio_token)
 
+    flash(
+        "invite_revoked",
+        resource="Portfolio",
+        user_name=invite.user_name,
+        resource_name=g.portfolio.name,
+    )
     return redirect(
         url_for(
             "portfolios.admin",
diff --git a/atst/utils/flash.py b/atst/utils/flash.py
index ea85f1ef..b7ca0cb9 100644
--- a/atst/utils/flash.py
+++ b/atst/utils/flash.py
@@ -33,11 +33,6 @@ MESSAGES = {
         "message": "flash.application_invite.resent.message",
         "category": "success",
     },
-    "application_invite_revoked": {
-        "title": "flash.application_invite.revoked.title",
-        "message": "flash.application_invite.revoked.message",
-        "category": "success",
-    },
     "application_member_removed": {
         "title": "flash.application_member.removed.title",
         "message": "flash.application_member.removed.message",
@@ -103,6 +98,11 @@ MESSAGES = {
         "message": None,
         "category": "warning",
     },
+    "invite_revoked": {
+        "title": "flash.invite_revoked.title",
+        "message": "flash.invite_revoked.message",
+        "category": "success",
+    },
     "logged_out": {
         "title": "flash.logged_out.title",
         "message": "flash.logged_out.message",
diff --git a/translations.yaml b/translations.yaml
index 44dd2a92..c16f89c6 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -128,9 +128,6 @@ flash:
       message: There was an error processing the invitation for {user_name} from {application_name}
     resent:
       message: "{email} has been sent an invitation to access this Application"
-    revoked:
-      title: Application invitation revoked
-      message: You have successfully revoked the invite for {user_name} from {application_name}
   application_member:
     removed:
       title: Team member removed from application
@@ -166,6 +163,9 @@ flash:
     errors:
       title: There were some errors
       message: Please see below.
+  invite_revoked:
+    title: "{resource} invitation revoked"
+    message: "You have successfully revoked the invite for {user_name} from {resource_name}"
   login_required_message: After you log in, you will be redirected to your destination page.
   login_required_title: Log in required
   logged_out: