Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations

# Conflicts:
#	app/assets/sass/uswds/_uswds-theme-custom-styles.scss
#	app/templates/views/dashboard/dashboard.html
#	gulpfile.js
#	tests/app/main/views/test_dashboard.py

app/templates/views/dashboard/_jobs.html

@@ -1,6 +1,6 @@
 {% from "components/table.html" import list_table, field, right_aligned_field_heading, row_heading %}
 
-<div class="table-wrapper">
+<div class="table-overflow-x-auto">
   <div class='dashboard-table ajax-block-container'>
     {% call(item, row_number) list_table(
       jobs,

app/templates/views/dashboard/all-template-statistics.html

@@ -28,7 +28,7 @@
           No messages sent
         </p>
       {% else %}
-        <div class='template-statistics-table'>
+        <div class='template-statistics-table table-overflow-x-auto'>
           {% call(item, row_number) list_table(
             month.templates_used,
             caption=month.name,

app/templates/views/dashboard/dashboard.html

@@ -60,9 +60,10 @@
 
     {% if current_user.has_permissions('manage_service') %}{% endif %}
 
-    <h2 class="margin-top-4">Recent Batches</h2>
-    <div class="table-wrapper">
-      <table class="usa-table job-table margin-top-0">
+    {{ ajax_block(partials, updates_url, 'template-statistics') }}
+    <h2 class="margin-top-4 margin-bottom-1">Recent Batches</h2>
+    <div class="table-overflow-x-auto">
+      <table class="usa-table usa-table--borderless job-table">
         <thead class="table-field-headings">
           <tr>
             <th scope="col" class="table-field-heading-first">
@@ -86,31 +87,30 @@
           </tr>
         </thead>
         <tbody>
-          {% if job_and_notifications %}
-            {% for job in job_and_notifications[:5] %}
-              {% if job.job_id and job.notifications %}
+          {% if jobs %}
+            {% for job in jobs[:5] %}
                 {% set notification = job.notifications[0] %}
                 <tr id="{{ job.job_id }}">
                   <td class="table-field file-name">
-                    {{ notification.job.original_file_name[:12] if notification.job.original_file_name else 'Manually entered number'}}
+                    {{ job.original_file_name[:12] if job.original_file_name else 'Manually entered number'}}
                     <br>
                     <a class="usa-link file-list-filename" href="{{ job.view_job_link }}">View Batch</a>
                   </td>
                   <td class="table-field template">
-                    {{ notification.template.name }}
+                    {{ job.template_name }}
                   </td>
                   <td class="table-field time-sent">
                     {{ (job.processing_finished if job.processing_finished else job.processing_started
                       if job.processing_started else job.created_at)|format_datetime_table }}
                   </td>
                   <td class="table-field sender">
-                    {{ notification.created_by.name }}
+                    {{ job.created_by.name }}
                   </td>
                   <td class="table-field count-of-recipients">
                     {{ job.notification_count}}
                   </td>
                   <td class="table-field report">
-                    {% if notification and job.time_left != "Data no longer available" %}
+                    {% if job.time_left != "Data no longer available" %}
                       <a class="usa-link file-list-filename" href="{{ job.download_link }}">Download</a>
                       <span class="usa-hint">{{ job.time_left }}</span>
                     {% elif job %}
@@ -118,7 +118,6 @@
                     {% endif %}
                   </td>
                 </tr>
-              {% endif %}
             {% endfor %}
           {% else %}
             <tr class="table-row">

app/templates/views/dashboard/template-statistics.html

@@ -2,7 +2,7 @@
 
 <div class="ajax-block-container">
   {% if template_statistics|length > 1 %}
-    <div class='template-statistics-table'>
+    <div class='template-statistics-table table-overflow-x-auto'>
       {% call(item, row_number) list_table(
         template_statistics,
         caption="Messages sent by template",