From c7ac967870a858c9667fd512fccf56c4dfb73665 Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Tue, 26 Mar 2019 14:21:52 -0400
Subject: [PATCH] present flash message when new portfolio member is added

---
 atst/app.py                                      | 2 +-
 atst/routes/portfolios/members.py                | 7 ++++++-
 atst/utils/flash.py                              | 5 ++---
 js/components/forms/multi_step_modal_form.js     | 2 +-
 styles/components/_portfolio_layout.scss         | 4 ++++
 templates/fragments/admin/portfolio_members.html | 6 ++++--
 templates/portfolios/admin.html                  | 2 --
 7 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/atst/app.py b/atst/app.py
index 4413a55f..adf018ed 100644
--- a/atst/app.py
+++ b/atst/app.py
@@ -84,7 +84,7 @@ def make_flask_callbacks(app):
     def _set_globals():
         g.current_user = None
         g.dev = os.getenv("FLASK_ENV", "dev") == "dev"
-        g.matchesPath = lambda href: re.match("^" + href, request.path)
+        g.matchesPath = lambda href: re.search(href, request.full_path)
         g.modal = request.args.get("modal", None)
         g.Authorization = Authorization
         g.Permissions = Permissions
diff --git a/atst/routes/portfolios/members.py b/atst/routes/portfolios/members.py
index 46aaf8fb..1db59cfb 100644
--- a/atst/routes/portfolios/members.py
+++ b/atst/routes/portfolios/members.py
@@ -92,7 +92,12 @@ def create_member(portfolio_id):
             flash("new_portfolio_member", new_member=member, portfolio=portfolio)
 
             return redirect(
-                url_for("portfolios.portfolio_members", portfolio_id=portfolio.id)
+                url_for(
+                    "portfolios.portfolio_admin",
+                    portfolio_id=portfolio.id,
+                    fragment="portfolio-members",
+                    _anchor="portfolio-members",
+                )
             )
         except AlreadyExistsError:
             return render_template(
diff --git a/atst/utils/flash.py b/atst/utils/flash.py
index 7b1db8c2..69239977 100644
--- a/atst/utils/flash.py
+++ b/atst/utils/flash.py
@@ -22,10 +22,9 @@ MESSAGES = {
         "category": "success",
     },
     "new_portfolio_member": {
-        "title_template": "Member added successfully",
+        "title_template": "Success!",
         "message_template": """
-          <p>{{ new_member.user_name }} was successfully invited via email to this portfolio. They do not yet have access to any environments.</p>
-          <p><a href="{{ url_for('portfolios.update_member', portfolio_id=portfolio.id, member_id=new_member.user_id) }}">Add environment access.</a></p>
+          <p>You have successfully invited {{ new_member.user_name }} to the portfolio admin.</p>
         """,
         "category": "success",
     },
diff --git a/js/components/forms/multi_step_modal_form.js b/js/components/forms/multi_step_modal_form.js
index 8ddac376..4bf540e0 100644
--- a/js/components/forms/multi_step_modal_form.js
+++ b/js/components/forms/multi_step_modal_form.js
@@ -64,7 +64,7 @@ export default {
     },
     handleModalOpen: function(_bool) {
       this.step = 0
-    }
+    },
   },
 
   computed: {},
diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss
index acd1c882..539ef47b 100644
--- a/styles/components/_portfolio_layout.scss
+++ b/styles/components/_portfolio_layout.scss
@@ -310,6 +310,10 @@
       }
 
     }
+
+    .alert {
+      margin: 4rem;
+    }
   }
 
   .application-content {
diff --git a/templates/fragments/admin/portfolio_members.html b/templates/fragments/admin/portfolio_members.html
index f307c01f..e7ff7be4 100644
--- a/templates/fragments/admin/portfolio_members.html
+++ b/templates/fragments/admin/portfolio_members.html
@@ -1,10 +1,12 @@
 {% from "components/icon.html" import Icon %}
 {% from "components/options_input.html" import OptionsInput %}
 
-<section class="member-list">
+<section class="member-list" id="portfolio-members">
   <div class='responsive-table-wrapper panel'>
+    {% if g.matchesPath("portfolio-members") %}
+      {% include "fragments/flash.html" %}
+    {% endif %}
     <form method='POST' autocomplete="off" enctype="multipart/form-data">
-
     <div class='member-list-header'>
       <div class='left'>
         <div class='h3'>{{ "portfolios.admin.portfolio_members_title" | translate }}</div>
diff --git a/templates/portfolios/admin.html b/templates/portfolios/admin.html
index 8f3f4ea1..ad7a0872 100644
--- a/templates/portfolios/admin.html
+++ b/templates/portfolios/admin.html
@@ -9,8 +9,6 @@
 
 {% block portfolio_content %}
 
-  {% include "fragments/flash.html" %}
-
   <div v-cloak class="portfolio-admin portfolio-content">
 
     <div class="panel">