Add activity history to Portfolio admin page

atst/routes/portfolios/index.py

@@ -22,7 +22,18 @@ def portfolios():
 def portfolio(portfolio_id):
     portfolio = Portfolios.get_for_update_information(g.current_user, portfolio_id)
     form = PortfolioForm(data={"name": portfolio.name})
-    return render_template("portfolios/edit.html", form=form, portfolio=portfolio)
+    pagination_opts = Paginator.get_pagination_opts(http_request)
+    audit_events = AuditLog.get_portfolio_events(
+        g.current_user, portfolio, pagination_opts
+    )
+    return render_template(
+        "portfolios/edit.html",
+        form=form,
+        portfolio=portfolio,
+        portfolio_name=portfolio.name,
+        portfolio_id=portfolio_id,
+        audit_events=audit_events,
+    )
 
 
 @portfolios_bp.route("/portfolios/<portfolio_id>/edit", methods=["POST"])

styles/components/_portfolio_layout.scss

@@ -350,3 +350,9 @@
     border-bottom: none;
   }
 }
+
+.portfolio-admin {
+  .edit-portfolio-name.action-group {
+    margin-top: 2rem;
+  }
+}

templates/portfolios/edit.html

@@ -1,5 +1,6 @@
 {% extends "portfolios/base.html" %}
 
+{% from "components/pagination.html" import Pagination %}
 {% from "components/icon.html" import Icon %}
 {% from "components/text_input.html" import TextInput %}
 
@@ -9,30 +10,24 @@
 
   {% include "fragments/flash.html" %}
 
+  <div v-cloak class="portfolio-admin">
+
     <form method="POST" action="{{ url_for('portfolios.edit_portfolio', portfolio_id=portfolio.id) }}" autocomplete="false">
       {{ form.csrf_token }}
-
-  <div class="panel">
-
-    <div class="panel__heading">
-      <h1>Portfolio Settings</h1>
-    </div>
-
-    <div class="panel__content">
+      <div class='form-row'>
+        <div class='form-col form-col--half'>
           {{ TextInput(form.name, validation="portfolioName") }}
         </div>
-  </div>
 
-
-  <div class='action-group'>
+        <div class='form-col form-col--half'>
+          <div class='edit-portfolio-name action-group'>
             <button type="submit" class="usa-button usa-button-big usa-button-primary" tabindex="0">Save</button>
-    <a href='{{ url_for("portfolios.portfolio_applications", portfolio_id=portfolio.id) }}' class='action-group__action icon-link'>
-      {{ Icon('x') }}
-      <span>Cancel</span>
-    </a>
           </div>
-
-
+        </div>
+      </div>
     </form>
+    {% include "fragments/audit_events_log.html" %}
 
+    {{ Pagination(audit_events, 'portfolios.portfolio_activity', portfolio_id=portfolio_id) }}
+  </div>
 {% endblock %}