End to end woes continue.

Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
Working on getting the service to be used.
2026-08-22 23:36:26 -04:00 · 2025-05-12 12:43:12 -04:00 · 2025-04-30 12:45:55 -04:00 · 2025-04-14 12:29:36 -04:00 · 2025-04-08 12:56:47 -04:00 · 2025-03-21 11:03:22 -04:00
36 changed files with 751 additions and 448 deletions
--- a/.github/ISSUE_TEMPLATE/issue_template.yml
+++ b/.github/ISSUE_TEMPLATE/issue_template.yml
@@ -64,17 +64,6 @@ body:
    validations:
      required: false

-  - type: markdown
-    attributes:
-      value: '**Accessibility:**'
-  - type: textarea
-    id: notes
-    attributes:
-      label: "List any specific accessibility guidance or tests that need to be considered for this user story."
-      description: "List what type of accessibility tests need to pass."
-    validations:
-      required: false
-
  - type: markdown
    attributes:
      value: '**Notes:**'
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -1,8 +1,7 @@
 (function (window) {

    if (document.getElementById('activityChartContainer')) {
-        const tableContainer = document.getElementById('activityContainer');
-        const currentUserName = tableContainer.getAttribute('data-currentUserName');
+
        const COLORS = {
            delivered: '#0076d6',
            failed: '#fa9441',
@@ -271,58 +270,27 @@
        subTitle.textContent = `${selectedText} - last 7 days`;
        fetchData(selectedValue);

+        // Update ARIA live region
        const liveRegion = document.getElementById('aria-live-account');
        liveRegion.textContent = `Data updated for ${selectedText} - last 7 days`;

-        const tableHeading = document.querySelector('#tableActivity h2');
-        const senderColumns = document.querySelectorAll('.sender-column');
-        const allRows = document.querySelectorAll('#activity-table tbody tr');
-        const caption = document.querySelector('#activity-table caption');
-
-        if (selectedValue === 'individual') {
-
-            tableHeading.textContent = 'My activity';
-            caption.textContent = `Table showing the sent jobs for ${currentUserName}`;
-
-            senderColumns.forEach(col => {
-            col.style.display = 'none';
-            });
-
-            allRows.forEach(row => row.style.display = 'none');
-
-            const userRows = Array.from(allRows).filter(row => {
-                const senderCell = row.querySelector('.sender-column');
-                const rowSender = senderCell ? senderCell.textContent.trim() : '';
-                return rowSender === currentUserName;
-            });
-
-            userRows.slice(0, 5).forEach(row => {
-                row.style.display = '';
-            });
-        } else {
-
-            tableHeading.textContent = 'Service activity';
-            caption.textContent = `Table showing the sent jobs for service`;
-
-            senderColumns.forEach(col => {
-            col.style.display = '';
-            });
-
-            allRows.forEach((row, index) => {
-                row.style.display = (index < 5) ? '' : 'none';
-            });
-        }
+        // Switch tables based on dropdown selection
+        const selectedTable = selectedValue === "individual" ? "table1" : "table2";
+        const tables = document.querySelectorAll('.table-overflow-x-auto');
+        tables.forEach(function(table) {
+            table.classList.add('hidden'); // Hide all tables by adding the hidden class
+            table.classList.remove('visible'); // Ensure they are not visible
+        });
+        const tableToShow = document.getElementById(selectedTable);
+        tableToShow.classList.remove('hidden'); // Remove hidden class
+        tableToShow.classList.add('visible'); // Add visible class
    };

    document.addEventListener('DOMContentLoaded', function() {
        // Initialize activityChart chart and table with service data by default
        fetchData('service');

-        const allRows = Array.from(document.querySelectorAll('#activity-table tbody tr'));
-        allRows.forEach((row, index) => {
-            row.style.display = (index < 5) ? '' : 'none';
-        });
-
+        // Add event listener to the dropdown
        const dropdown = document.getElementById('options');
        dropdown.addEventListener('change', handleDropdownChange);
    });
--- a/app/config.py
+++ b/app/config.py
@@ -183,6 +183,16 @@ class E2ETest(Staging):
        "notify-admin-logo-upload-bucket-staging"
    )

+    API_HOST_NAME = "http://localhost:6011"  # nosec B105 - only used in development
+    # credential overrides
+    DANGEROUS_SALT = "development-notify-salt"
+    SECRET_KEY = "dev-notify-secret-key"  # nosec B105 - only used in development
+    # ADMIN_CLIENT_USER_NAME is called ADMIN_CLIENT_ID in api repo, they should match
+    ADMIN_CLIENT_USER_NAME = "notify-admin"
+    ADMIN_CLIENT_SECRET = (
+        "dev-notify-secret-key"  # nosec B105 - only used in development
+    )
+

 class Demo(Staging):
    HEADER_COLOUR = "#6F72AF"  # $mauve
--- a/app/content/get-started.md
+++ b/app/content/get-started.md
@@ -5,7 +5,7 @@
 Explore Notify, add team members, and practice [sending messages to teammates](/using-notify/trial-mode).

 2. ## Personalize content
-Learn how to [personalize messages](/using-notify/how-to) to increase response.
+Learn how to [personalize messages](/using-notify/guidance) to increase response.

 3. ## Check delivery status
 [Analyze the delivery](/using-notify/delivery-status) of your messages and download reports
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -14,7 +14,7 @@ from app import (
    service_api_client,
    template_statistics_client,
 )
-from app.formatters import format_date_numeric, format_datetime_numeric
+from app.formatters import format_date_numeric, format_datetime_numeric, get_time_left
 from app.main import main
 from app.main.views.user_profile import set_timezone
 from app.statistics_utils import get_formatted_percentage
@@ -62,14 +62,32 @@ def service_dashboard(service_id):
    job_response = job_api_client.get_jobs(service_id)["data"]
    service_data_retention_days = 7

-    filtered_jobs = [job for job in job_response if job["job_status"] != "cancelled"]
-    sorted_jobs = sorted(filtered_jobs, key=lambda job: job["created_at"], reverse=True)
-
+    jobs = [
+        {
+            "job_id": job["id"],
+            "time_left": get_time_left(job["created_at"]),
+            "download_link": url_for(
+                ".view_job_csv", service_id=current_service.id, job_id=job["id"]
+            ),
+            "view_job_link": url_for(
+                ".view_job", service_id=current_service.id, job_id=job["id"]
+            ),
+            "created_at": job["created_at"],
+            "processing_finished": job.get("processing_finished"),
+            "processing_started": job.get("processing_started"),
+            "notification_count": job["notification_count"],
+            "created_by": job["created_by"],
+            "template_name": job["template_name"],
+            "original_file_name": job["original_file_name"],
+        }
+        for job in job_response
+        if job["job_status"] != "cancelled"
+    ]
    return render_template(
        "views/dashboard/dashboard.html",
        updates_url=url_for(".service_dashboard_updates", service_id=service_id),
        partials=get_dashboard_partials(service_id),
-        jobs=sorted_jobs,
+        jobs=jobs,
        service_data_retention_days=service_data_retention_days,
        sms_sent=sms_sent,
        sms_allowance_remaining=sms_allowance_remaining,
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -217,11 +217,11 @@ def benchmark_performance():
    )


-@main.route("/using-notify/how-to")
+@main.route("/using-notify/guidance")
@user_is_logged_in
-def how_to():
+def guidance_index():
    return render_template(
-        "views/how-to/index.html",
+        "views/guidance/index.html",
        navigation_links=using_notify_nav(),
    )

@@ -266,29 +266,29 @@ def join_notify():
    )


-@main.route("/using-notify/how-to/create-and-send-messages")
+@main.route("/using-notify/guidance/create-and-send-messages")
@user_is_logged_in
 def create_and_send_messages():
    return render_template(
-        "views/how-to/create-and-send-messages.html",
+        "views/guidance/create-and-send-messages.html",
        navigation_links=using_notify_nav(),
    )


-@main.route("/using-notify/how-to/edit-and-format-messages")
+@main.route("/using-notify/guidance/edit-and-format-messages")
@user_is_logged_in
 def edit_and_format_messages():
    return render_template(
-        "views/how-to/edit-and-format-messages.html",
+        "views/guidance/edit-and-format-messages.html",
        navigation_links=using_notify_nav(),
    )


-@main.route("/using-notify/how-to/send-files-by-email")
+@main.route("/using-notify/guidance/send-files-by-email")
@user_is_logged_in
 def send_files_by_email():
    return render_template(
-        "views/how-to/send-files-by-email.html",
+        "views/guidance/send-files-by-email.html",
        navigation_links=using_notify_nav(),
    )

--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -57,6 +57,7 @@ def view_job(service_id, job_id):

    filter_args = parse_filter_args(request.args)
    filter_args["status"] = set_status_filters(filter_args)
+
    return render_template(
        "views/jobs/job.html",
        job=job,
@@ -401,7 +402,7 @@ def get_job_partials(job):
    )

    if request.referrer is not None:
-        session["arrived_from_preview_page"] = ("check" in request.referrer) or ("help=0" in request.referrer)
+        session["arrived_from_preview_page"] = "check" in request.referrer
    else:
        session["arrived_from_preview_page"] = False

--- a/app/main/views/sub_navigation_dictionaries.py
+++ b/app/main/views/sub_navigation_dictionaries.py
@@ -2,7 +2,7 @@ def using_notify_nav():
    nav_items = [
        {"name": "Get started", "link": "main.get_started"},
        {
-            "name": "Best practices",
+            "name": "Best Practices",
            "link": "main.best_practices",
            "sub_navigation_items": [
                {
@@ -33,8 +33,8 @@ def using_notify_nav():
        },
        {"name": "Trial mode", "link": "main.trial_mode_new"},
        {"name": "Tracking usage", "link": "main.pricing"},
-        {"name": "Delivery status", "link": "main.message_status"},
-        {"name": "How to", "link": "main.how_to"},
+        {"name": "Delivery Status", "link": "main.message_status"},
+        {"name": "Guidance", "link": "main.guidance_index"},
    ]

    return nav_items
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -54,7 +54,7 @@ class HeaderNavigation(Navigation):
            "pricing",
            "trial_mode_new",
            "message_status",
-            "how_to",
+            "guidance_index",
        },
        "accounts-or-dashboard": {
            "conversation",
--- a/app/notify_client/init.py
+++ b/app/notify_client/init.py
@@ -85,8 +85,9 @@ class NotifyAdminAPIClient(BaseAPIClient):
            abort(403)

    def post(self, *args, **kwargs):
-        self.check_inactive_service()
-        self.check_inactive_user(args)
+        if os.getenv('NOTIFY_ENVIRONMENT') != "e2etest":
+            self.check_inactive_service()
+            self.check_inactive_user(args)
        return super().post(*args, **kwargs)

    def put(self, *args, **kwargs):
--- a/app/templates/partials/jobs/status.html
+++ b/app/templates/partials/jobs/status.html
@@ -21,11 +21,11 @@

 <div class="ajax-block-container">
  <p class='bottom-gutter'>
-    {% if not job.finished_processing %}
+    {% if job.still_processing or arrived_from_preview_page_url %}
      {% if job.scheduled_for %}
        <div class="usa-alert usa-alert--info">
          <div class="usa-alert__body">
-            <h2 class="usa-alert__heading">Your message has been scheduled</h2>
+            <h2 class="usa-alert__heading">Your text has been scheduled</h2>
            <p class="usa-alert__text">
              {{ job.template_name }} - {{ current_service.name }} was scheduled on {{ job.scheduled_for|format_datetime_normal }} by {{ job.created_by.name }}
            </p>
@@ -33,46 +33,18 @@
        </div>
        {{display_message_status}}
      {% else %}
-        {% if job.processing_started %}
-          <div class="usa-alert usa-alert--success">
-            <div class="usa-alert__body">
-              <h2 class="usa-alert__heading">
-                Your message is sending
-              </h2>
-              <p class="usa-alert__text">
-                {{ job.template_name }} - {{ current_service.name }}
-                has been sending since {{job.processing_started| format_datetime_normal}} by {{ job.created_by.name }}
-              </p>
-            </div>
+        <div class="usa-alert usa-alert--success">
+          <div class="usa-alert__body">
+            <h2 class="usa-alert__heading">Your text has been sent</h2>
+            <p class="usa-alert__text">
+              {{ job.template_name }} - {{ current_service.name }} was sent on {% if job.processing_started %}
+              {{ job.processing_started|format_datetime_table }} {% else %}
+              {{ job.created_at|format_datetime_table }} {% endif %} by {{ job.created_by.name }}
+            </p>
          </div>
-        {% else %}
-          <div class="usa-alert usa-alert--info">
-            <div class="usa-alert__body">
-              <h2 class="usa-alert__heading">
-                Your message is pending
-              </h2>
-              <p class="usa-alert__text">
-                {{ job.template_name }} - {{ current_service.name }}
-                has been pending since {{job.created_at|format_datetime_normal}} by {{ job.created_by.name }}
-              </p>
-            </div>
-          </div>
-        {% endif %}
+        </div>
        {{display_message_status}}
      {% endif %}
-    {% elif arrived_from_preview_page_url %}
-      <div class="usa-alert usa-alert--success">
-        <div class="usa-alert__body">
-          <h2 class="usa-alert__heading">
-              Your message has been sent
-          </h2>
-          <p class="usa-alert__text">
-            {{ job.template_name }} - {{ current_service.name }}
-              was sent on {{job.processing_started|format_datetime_normal}} by {{ job.created_by.name }}
-          </p>
-        </div>
-      </div>
-      {{display_message_status}}
    {% endif %}
  </p>
  {% if job.status == 'sending limits exceeded'%}
--- a/app/templates/views/dashboard/activity-table.html
+++ b/app/templates/views/dashboard/activity-table.html
@@ -1,72 +0,0 @@
-<h2 class="line-height-sans-2 margin-bottom-0 margin-top-4">Recent activity</h2>
-<div id="activityChartContainer">
-    <form class="usa-form">
-        <label class="usa-label" for="options">Account</label>
-        <select class="usa-select margin-bottom-2" name="options" id="options">
-            <option value disabled>- Select -</option>
-            <option value="service" selected>{{ current_service.name }}</option>
-            <option value="individual">{{ current_user.name }}</option>
-        </select>
-    </form>
-    <div id="activityChart">
-        <div class="chart-header">
-            <div class="chart-subtitle">{{ current_service.name }} - last 7 days</div>
-            <div class="chart-legend" role="region" aria-label="Legend"></div>
-        </div>
-        <div class="chart-container" id="weeklyChart"></div>
-        <table id="weeklyTable" class="usa-sr-only usa-table"></table>
-    </div>
-</div>
-<div id="aria-live-account" class="usa-sr-only" aria-live="polite"></div>
-<div class="table-container" id="activityContainer" data-currentUserName="{{ current_user.name }}">
-    <div id="tableActivity" class="table-overflow-x-auto">
-        <h2 id="table-heading" class="margin-top-4 margin-bottom-1">Service activity</h2>
-
-        <table class="usa-table job-table" id="activity-table">
-            <caption class="usa-sr-only">Table showing the sent jobs for {{current_service.name}}</caption>
-
-            <thead class="table-field-headings">
-                <tr>
-                    <th scope="col" class="table-field-heading-first" id="jobId">Job ID#</th>
-                    <th data-sortable scope="col" class="table-field-heading" scope="col">Template</th>
-                    <th data-sortable scope="col" class="table-field-heading">Job status</th>
-                    <th data-sortable scope="col" role="columnheader" class="table-field-heading sender-column">Sender
-                    </th>
-                    <th data-sortable scope="col" class="table-field-heading"># of Recipients</th>
-                </tr>
-            </thead>
-            <tbody>
-                {% if jobs %}
-                {% for job in jobs %}
-                <tr id="{{ job.id }}">
-                    <td class="table-field jobid" role="rowheader">
-                        <a class="usa-link" href="{{ url_for('.view_job', service_id=current_service.id, job_id=job.id )}}">
-                            {{ job.id[:8] if job.id else 'Manually entered number' }}
-                        </a>
-                    </td>
-                    <td class="table-field template">{{ job.template_name }}</td>
-                    <td class="table-field time-sent">
-                        {% if job.scheduled_for and not job.processing_finished %}
-                        Scheduled for {{ job.scheduled_for|format_datetime_table }}
-                        {% elif job.processing_finished and not job.statistics|selectattr('status', 'equalto', 'sending')|list %}
-                        Sent on {{ job.processing_finished|format_datetime_table }}
-                        {% elif job.processing_started %}
-                            Sending since {{ job.processing_started|format_datetime_table }}
-                        {% else %}
-                            Pending since {{ job.created_at|format_datetime_table }}
-                        {% endif %}
-                    </td>
-                    <td class="table-field sender sender-column">{{ job.created_by.name }}</td>
-                    <td class="table-field count-of-recipients">{{ job.notification_count }}</td>
-                </tr>
-                {% endfor %}
-                {% else %}
-                <tr class="table-row">
-                    <td class="table-empty-message" colspan="10">No batched job messages found &thinsp;(messages are
-                        kept for {{ service_data_retention_days }} days).</td>
-                </tr>
-                {% endif %}
-            </tbody>
-        </table>
-    </div>
-</div>
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -6,38 +6,140 @@
 {% from "components/ajax-block.html" import ajax_block %}

 {% block service_page_title %}
-    Dashboard
+  Dashboard
 {% endblock %}

 {% block maincolumn_content %}
-<script type="text/javascript" src="{{ asset_url('js/setTimezone.js') }}"></script>
+  <script type="text/javascript" src="{{ asset_url('js/setTimezone.js') }}"></script>


-<div class="dashboard margin-top-0 margin-bottom-2">
+  <div class="dashboard margin-top-0 margin-bottom-2">

-<h1 class="usa-sr-only">Dashboard</h1>
-{% if current_user.has_permissions('manage_templates') and not current_service.all_templates %}
-    {% include 'views/dashboard/write-first-messages.html' %}
-{% endif %}
+    <h1 class="usa-sr-only">Dashboard</h1>
+    {% if current_user.has_permissions('manage_templates') and not current_service.all_templates %}
+      {% include 'views/dashboard/write-first-messages.html' %}
+    {% endif %}

-{{ ajax_block(partials, updates_url, 'upcoming') }}
+    {{ ajax_block(partials, updates_url, 'upcoming') }}

-<h2 class="font-body-2xl line-height-sans-2 margin-top-0">{{ current_service.name }} Dashboard</h2>
+    <h2 class="font-body-2xl line-height-sans-2 margin-top-0">{{ current_service.name }} Dashboard</h2>

-{{ ajax_block(partials, updates_url, 'inbox') }}
+    {{ ajax_block(partials, updates_url, 'inbox') }}

-<div id="totalMessageChartContainer" data-sms-sent="{{ sms_sent }}" data-sms-allowance-remaining="{{ sms_allowance_remaining }}">
-    <h2 id="chartTitle">Total messages</h2>
-    <svg id="totalMessageChart"></svg>
-    <div id="message"></div>
-</div>
-<div id="totalMessageTable" class="margin-0"></div>
+    <div id="totalMessageChartContainer" data-sms-sent="{{ sms_sent }}" data-sms-allowance-remaining="{{ sms_allowance_remaining }}">
+      <h2 id="chartTitle">Total messages</h2>
+      <svg id="totalMessageChart"></svg>
+      <div id="message"></div>
+    </div>
+    <div id="totalMessageTable" class="margin-0"></div>

-{% include 'views/dashboard/activity-table.html'   %}
+    <h2 class="line-height-sans-2 margin-bottom-0 margin-top-4">Recent activity</h2>
+    <div id="activityChartContainer">
+      <form class="usa-form">
+        <label class="usa-label" for="options">Account</label>
+        <select class="usa-select margin-bottom-2" name="options" id="options">
+          <option value disabled>- Select -</option>
+          <option value="service" selected>{{ current_service.name }}</option>
+          <option value="individual">{{ current_user.name }}</option>
+        </select>
+      </form>
+      <div id="activityChart">
+        <div class="chart-header">
+          <div class="chart-subtitle">{{ current_service.name }} - last 7 days</div>
+          <div class="chart-legend" role="region" aria-label="Legend"></div>
+        </div>
+        <div class="chart-container" id="weeklyChart"></div>
+        <table id="weeklyTable" class="usa-sr-only usa-table"></table>
+      </div>
+    </div>
+    <div id="aria-live-account" class="usa-sr-only" aria-live="polite"></div>

-{% if current_user.has_permissions('manage_service') %}{% endif %}
+    {% if current_user.has_permissions('manage_service') %}{% endif %}

-{{ ajax_block(partials, updates_url, 'template-statistics') }}
-</div>
+    <div class="table-container">
+      <div id="table1" class="table-overflow-x-auto hidden">
+        <h2 class="margin-top-4 margin-bottom-1">My activity</h2>
+        <table class="usa-table job-table">
+          <caption class="usa-sr-only">Table showing the sent jobs for {{current_user.name}}</caption>
+          <thead class="table-field-headings">
+            <tr>
+              <th scope="col" class="table-field-heading-first" id="jobId"><span>Job ID#</span></th>
+              <th data-sortable scope="col" class="table-field-heading"><span>Template</span></th>
+              <th data-sortable scope="col" class="table-field-heading"><span>Job status</span></th>
+              <th data-sortable scope="col" class="table-field-heading"><span># of Recipients</span></th>
+            </tr>
+          </thead>
+          <tbody>
+            {% if jobs %}
+              {% for job in jobs[:5] %}
+                {% if job.created_by.name == current_user.name %}
+                  {% set notification = job.notifications[0] %}
+                  <tr id="{{ job.job_id }}">
+                    <td class="table-field jobid" role="rowheader">
+                      <a class="usa-link" href="{{ job.view_job_link }}">
+                        {{ job.job_id[:8] if job.job_id else 'Manually entered number' }}
+                      </a>
+                    </td>
+                    <td class="table-field template">{{ job.template_name }}</td>
+                    <td class="table-field time-sent">Sent on
+                      {{ (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 count-of-recipients">{{ job.notification_count }}</td>
+                  </tr>
+                {% endif %}
+              {% endfor %}
+            {% else %}
+              <tr class="table-row">
+                <td class="table-empty-message" colspan="10">No batched job messages found &thinsp;(messages are kept for {{ service_data_retention_days }} days).</td>
+              </tr>
+            {% endif %}
+          </tbody>
+        </table>
+      </div>
+
+      <div id="table2" class="table-overflow-x-auto visible">
+        <h2 class="margin-top-4 margin-bottom-1">Service activity</h2>
+        <table class="usa-table job-table">
+          <caption class="usa-sr-only">Table showing the sent jobs for this service</caption>
+          <thead class="table-field-headings">
+            <tr>
+              <th scope="col" role="columnheader" class="table-field-heading-first" id="jobId"><span>Job ID#</span></th>
+              <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span>Template</span></th>
+              <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span>Job status</span></th>
+              <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span>Sender</span></th>
+              <th data-sortable scope="col" role="columnheader" class="table-field-heading"><span># of Recipients</span></th>
+            </tr>
+          </thead>
+          <tbody>
+            {% if jobs %}
+              {% for job in jobs[:5] %}
+                {% set notification = job.notifications[0] %}
+                <tr id="{{ job.job_id }}">
+                  <td class="table-field jobid" role="rowheader">
+                    <a class="usa-link" href="{{ job.view_job_link }}">
+                      {{ job.job_id[:8] if job.job_id else 'Manually entered number' }}
+                    </a>
+                  </td>
+                  <td class="table-field template">{{ job.template_name }}</td>
+                  <td class="table-field time-sent">Sent on
+                    {{ (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">{{ job.created_by.name }}</td>
+                  <td class="table-field count-of-recipients">{{ job.notification_count }}</td>
+                </tr>
+              {% endfor %}
+            {% else %}
+              <tr class="table-row">
+                <td class="table-empty-message" colspan="10">No batched job messages found &thinsp;(messages are kept for {{ service_data_retention_days }} days).</td>
+              </tr>
+            {% endif %}
+          </tbody>
+        </table>
+      </div>
+    </div>
+    {{ ajax_block(partials, updates_url, 'template-statistics') }}
+  </div>

 {% endblock %}
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -28,7 +28,7 @@

 <h2 class="heading-medium" id="personalised-messages">Personalized content</h2>
 <p class="usa-body">Notify makes it easy to send personalized messages from a single template.</p>
-<p class="usa-body">See <a class="usa-link" href="{{ url_for('.how_to', _anchor='personalized-content') }}">how to personalize your content</a>.</p>
+<p class="usa-body">See <a class="usa-link" href="{{ url_for('.guidance_index', _anchor='personalized-content') }}">how to personalize your content</a>.</p>

 <h2 class="heading-medium" id="bulk-sending">Bulk sending</h2>
 <p class="usa-body">To send a batch of messages at once, upload a list of contact details to Notify. You can also schedule the date and time you want them to be sent.</p>
--- a/app/templates/views/guidance/create-and-send-messages.html
+++ b/app/templates/views/guidance/create-and-send-messages.html
--- a/app/templates/views/guidance/edit-and-format-messages.html
+++ b/app/templates/views/guidance/edit-and-format-messages.html
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/guidance/index.html
@@ -4,11 +4,11 @@
 {% from "components/service-link.html" import service_link %}

 {% block per_page_title %}
-  How to
+  Guidance
 {% endblock %}

 {% block content_column_content %}
-<h1 class="font-body-2xl margin-bottom-3">How to</h1>
+<h1 class="font-body-2xl margin-bottom-3">Guidance</h1>

 <p>Notify allows you to easily create templates for messages for your recipients. You can customize messages to encourage
 your recipient to manage their benefits and increase follow-through.</p>
@@ -61,7 +61,7 @@ your recipient to manage their benefits and increase follow-through.</p>
 <ol class="list">
  <li>Add a placeholder to your content by placing two brackets around the personalized elements.</li>
  <li>You can manually enter the personalized content or you can upload a spreadsheet with the details and let Notify do the
-  work for you.</li>
+  work for you. See <a href="#prepare-data">data preparation</a>.</li>
 </ol>

 <h4>Example</h4>
@@ -80,7 +80,7 @@ all or part of the message contingent upon specific criteria associated with the
 <ol class="list">
  <li>Use two brackets and ?? to define the conditional content.</li>
  <li>You can manually enter the conditional content or you can upload a spreadsheet with the personal details and let Notify
-  do the work for you.</li>
+  do the work for you. See <a href="#prepare-data">data preparation</a>.</li>
 </ol>

 <h4>Examples</h4>
--- a/app/templates/views/guidance/send-files-by-email.html
+++ b/app/templates/views/guidance/send-files-by-email.html
--- a/app/templates/views/guides/benchmark-performance.html
+++ b/app/templates/views/guides/benchmark-performance.html
@@ -8,7 +8,7 @@
 {% endblock %}

 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Best practices", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}

 <section class="usa-prose">
  <h1>{{page_title}}</h1>
--- a/app/templates/views/guides/best-practices.html
+++ b/app/templates/views/guides/best-practices.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}

-{% set page_title = "Best practices" %}
+{% set page_title = "Best Practices" %}

 {% block per_page_title %}
 {{page_title}}
@@ -8,7 +8,7 @@

 {% block content_column_content %}
 <section class="usa-prose">
-  <h1>Best practices</h1>
+  <h1>Best Practices</h1>
  <p class="font-sans-lg text-base">For texting the public</p>
  <p>Effectively reaching your audience and supporting your program’s goals starts with strategically planning out what
    text messages can help you achieve and how to approach a thoughtful rollout.
--- a/app/templates/views/guides/clear-goals.html
+++ b/app/templates/views/guides/clear-goals.html
@@ -8,7 +8,7 @@
 {% endblock %}

 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Best practices", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}

 <section class="usa-prose">
  <h1>{{page_title}}</h1>
--- a/app/templates/views/guides/establish-trust.html
+++ b/app/templates/views/guides/establish-trust.html
@@ -10,7 +10,7 @@
 {% endblock %}

 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Best practices", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}

 <section class="usa-prose">
  <h1>{{page_title}}</h1>
--- a/app/templates/views/guides/multiple-languages.html
+++ b/app/templates/views/guides/multiple-languages.html
@@ -8,7 +8,7 @@
 {% endblock %}

 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Best practices", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}

 <section class="usa-prose">
  <h1>{{page_title}}</h1>
--- a/app/templates/views/guides/rules-and-regulations.html
+++ b/app/templates/views/guides/rules-and-regulations.html
@@ -8,7 +8,7 @@
 {% endblock %}

 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Best practices", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}

 <section class="usa-prose">
  <h1>{{page_title}}</h1>
--- a/app/templates/views/guides/write-for-action.html
+++ b/app/templates/views/guides/write-for-action.html
@@ -9,7 +9,7 @@
 {% endblock %}

 {% block content_column_content %}
-{{ breadcrumbs.breadcrumb(page_title, "Best practices", "main.best_practices") }}
+{{ breadcrumbs.breadcrumb(page_title, "Best Practices", "main.best_practices") }}

 <section class="usa-prose">
  <h1>{{page_title}}</h1>
--- a/app/templates/views/jobs/job.html
+++ b/app/templates/views/jobs/job.html
@@ -11,18 +11,7 @@
 {% block maincolumn_content %}

    {{ page_header("Message status") }}
-    {% if not job.processing_finished %}
-      <div
-        data-module="update-content"
-        data-resource="{{ updates_url }}"
-        data-key="status"
-        data-form=""
-      >
-    {% endif %}
-      {{ partials['status']|safe }}
-    {% if not job.processing_finished  %}
-      </div>
-    {% endif %}
+    {{ partials['status']|safe }}
    {% if not finished %}
      <div
        data-module="update-content"
--- a/app/templates/views/support/index.html
+++ b/app/templates/views/support/index.html
@@ -13,8 +13,8 @@
  <h1 class="font-body-2xl margin-bottom-3">Contact us</h1>
  <p>Notify is designed to be easy to use.</p>
  <ul class="list list-bullet">
-    <li>For information on personalization, see <a href={{ url_for("main.how_to") }}>How to</a>.</li>
-    <li>For help interpreting delivery reports, see <a href={{ url_for("main.message_status") }}>Delivery status</a>.</li>
+    <li>For information on personalization and data preparation, see <a href={{ url_for("main.guidance_index") }}>Guidance</a>.</li>
+    <li>For help interpreting delivery reports, see <a href={{ url_for("main.message_status") }}>Delivery Status</a>.</li>
    <li>For details on pricing and what counts as a message part, see <a href={{ url_for("main.pricing") }}>Pricing</a>.</li>
  </ul>

--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
        "hogan": "1.0.2",
        "jquery": "3.7.1",
        "morphdom": "^2.7.4",
-        "playwright": "^1.50.0",
+        "playwright": "^1.49.1",
        "python": "^0.0.4",
        "query-command-supported": "1.0.0",
        "sass-embedded": "^1.83.4",
@@ -31,7 +31,7 @@
        "vinyl-source-stream": "^2.0.0"
      },
      "devDependencies": {
-        "@babel/core": "^7.26.7",
+        "@babel/core": "^7.26.0",
        "@babel/preset-env": "^7.26.0",
        "@uswds/compile": "^1.2.1",
        "backstopjs": "^6.3.25",
@@ -50,7 +50,7 @@
        "jest-environment-jsdom": "^29.2.2",
        "jshint": "2.13.6",
        "jshint-stylish": "2.2.1",
-        "rollup": "^4.32.0",
+        "rollup": "^4.31.0",
        "rollup-plugin-commonjs": "10.1.0",
        "rollup-plugin-node-resolve": "5.2.0"
      },
@@ -72,11 +72,10 @@
      }
    },
    "node_modules/@babel/code-frame": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.0.tgz",
+      "integrity": "sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "@babel/helper-validator-identifier": "^7.25.9",
        "js-tokens": "^4.0.0",
@@ -87,32 +86,30 @@
      }
    },
    "node_modules/@babel/compat-data": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz",
-      "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
+      "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
      "dev": true,
-      "license": "MIT",
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/core": {
-      "version": "7.26.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz",
-      "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.0.tgz",
+      "integrity": "sha512-i1SLeK+DzNnQ3LL/CswPCa/E5u4lh1k6IAEphON8F+cXt0t9euTshDru0q7/IqMa1PMPz5RnHuHscF8/ZJsStg==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.5",
-        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/code-frame": "^7.26.0",
+        "@babel/generator": "^7.26.0",
+        "@babel/helper-compilation-targets": "^7.25.9",
        "@babel/helper-module-transforms": "^7.26.0",
-        "@babel/helpers": "^7.26.7",
-        "@babel/parser": "^7.26.7",
+        "@babel/helpers": "^7.26.0",
+        "@babel/parser": "^7.26.0",
        "@babel/template": "^7.25.9",
-        "@babel/traverse": "^7.26.7",
-        "@babel/types": "^7.26.7",
+        "@babel/traverse": "^7.25.9",
+        "@babel/types": "^7.26.0",
        "convert-source-map": "^2.0.0",
        "debug": "^4.1.0",
        "gensync": "^1.0.0-beta.2",
@@ -128,14 +125,13 @@
      }
    },
    "node_modules/@babel/generator": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
-      "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.0.tgz",
+      "integrity": "sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/parser": "^7.26.5",
-        "@babel/types": "^7.26.5",
+        "@babel/parser": "^7.26.0",
+        "@babel/types": "^7.26.0",
        "@jridgewell/gen-mapping": "^0.3.5",
        "@jridgewell/trace-mapping": "^0.3.25",
        "jsesc": "^3.0.2"
@@ -170,13 +166,12 @@
      }
    },
    "node_modules/@babel/helper-compilation-targets": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
-      "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.9.tgz",
+      "integrity": "sha512-j9Db8Suy6yV/VHa4qzrj9yZfZxhLWQdVnRlXxmKLYlhWUVB1sB2G5sxuWYXk/whHD9iW76PmNzxZ4UCnTQTVEQ==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/compat-data": "^7.26.5",
+        "@babel/compat-data": "^7.25.9",
        "@babel/helper-validator-option": "^7.25.9",
        "browserslist": "^4.24.0",
        "lru-cache": "^5.1.1",
@@ -406,27 +401,25 @@
      }
    },
    "node_modules/@babel/helpers": {
-      "version": "7.26.7",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz",
-      "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
+      "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "@babel/template": "^7.25.9",
-        "@babel/types": "^7.26.7"
+        "@babel/types": "^7.26.0"
      },
      "engines": {
        "node": ">=6.9.0"
      }
    },
    "node_modules/@babel/parser": {
-      "version": "7.26.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
-      "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.0.tgz",
+      "integrity": "sha512-aP8x5pIw3xvYr/sXT+SEUwyhrXT8rUJRZltK/qN3Db80dcKpTett8cJxHyjk+xYSVXvNnl2SfcJVjbwxpOSscA==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/types": "^7.26.7"
+        "@babel/types": "^7.26.0"
      },
      "bin": {
        "parser": "bin/babel-parser.js"
@@ -1662,17 +1655,16 @@
      }
    },
    "node_modules/@babel/traverse": {
-      "version": "7.26.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz",
-      "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
+      "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.5",
-        "@babel/parser": "^7.26.7",
+        "@babel/code-frame": "^7.25.9",
+        "@babel/generator": "^7.25.9",
+        "@babel/parser": "^7.25.9",
        "@babel/template": "^7.25.9",
-        "@babel/types": "^7.26.7",
+        "@babel/types": "^7.25.9",
        "debug": "^4.3.1",
        "globals": "^11.1.0"
      },
@@ -1681,11 +1673,10 @@
      }
    },
    "node_modules/@babel/types": {
-      "version": "7.26.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
-      "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
+      "version": "7.26.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
+      "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
      "dev": true,
-      "license": "MIT",
      "dependencies": {
        "@babel/helper-string-parser": "^7.25.9",
        "@babel/helper-validator-identifier": "^7.25.9"
@@ -2630,9 +2621,9 @@
      }
    },
    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.32.0.tgz",
-      "integrity": "sha512-G2fUQQANtBPsNwiVFg4zKiPQyjVKZCUdQUol53R8E71J7AsheRMV/Yv/nB8giOcOVqP7//eB5xPqieBYZe9bGg==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz",
+      "integrity": "sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==",
      "cpu": [
        "arm"
      ],
@@ -2643,9 +2634,9 @@
      ]
    },
    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.32.0.tgz",
-      "integrity": "sha512-qhFwQ+ljoymC+j5lXRv8DlaJYY/+8vyvYmVx074zrLsu5ZGWYsJNLjPPVJJjhZQpyAKUGPydOq9hRLLNvh1s3A==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz",
+      "integrity": "sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==",
      "cpu": [
        "arm64"
      ],
@@ -2656,9 +2647,9 @@
      ]
    },
    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.32.0.tgz",
-      "integrity": "sha512-44n/X3lAlWsEY6vF8CzgCx+LQaoqWGN7TzUfbJDiTIOjJm4+L2Yq+r5a8ytQRGyPqgJDs3Rgyo8eVL7n9iW6AQ==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz",
+      "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==",
      "cpu": [
        "arm64"
      ],
@@ -2669,9 +2660,9 @@
      ]
    },
    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.32.0.tgz",
-      "integrity": "sha512-F9ct0+ZX5Np6+ZDztxiGCIvlCaW87HBdHcozUfsHnj1WCUTBUubAoanhHUfnUHZABlElyRikI0mgcw/qdEm2VQ==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz",
+      "integrity": "sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==",
      "cpu": [
        "x64"
      ],
@@ -2682,9 +2673,9 @@
      ]
    },
    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.32.0.tgz",
-      "integrity": "sha512-JpsGxLBB2EFXBsTLHfkZDsXSpSmKD3VxXCgBQtlPcuAqB8TlqtLcbeMhxXQkCDv1avgwNjF8uEIbq5p+Cee0PA==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz",
+      "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==",
      "cpu": [
        "arm64"
      ],
@@ -2695,9 +2686,9 @@
      ]
    },
    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.32.0.tgz",
-      "integrity": "sha512-wegiyBT6rawdpvnD9lmbOpx5Sph+yVZKHbhnSP9MqUEDX08G4UzMU+D87jrazGE7lRSyTRs6NEYHtzfkJ3FjjQ==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz",
+      "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==",
      "cpu": [
        "x64"
      ],
@@ -2708,9 +2699,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.32.0.tgz",
-      "integrity": "sha512-3pA7xecItbgOs1A5H58dDvOUEboG5UfpTq3WzAdF54acBbUM+olDJAPkgj1GRJ4ZqE12DZ9/hNS2QZk166v92A==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz",
+      "integrity": "sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==",
      "cpu": [
        "arm"
      ],
@@ -2721,9 +2712,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.32.0.tgz",
-      "integrity": "sha512-Y7XUZEVISGyge51QbYyYAEHwpGgmRrAxQXO3siyYo2kmaj72USSG8LtlQQgAtlGfxYiOwu+2BdbPjzEpcOpRmQ==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz",
+      "integrity": "sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==",
      "cpu": [
        "arm"
      ],
@@ -2734,9 +2725,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.32.0.tgz",
-      "integrity": "sha512-r7/OTF5MqeBrZo5omPXcTnjvv1GsrdH8a8RerARvDFiDwFpDVDnJyByYM/nX+mvks8XXsgPUxkwe/ltaX2VH7w==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz",
+      "integrity": "sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==",
      "cpu": [
        "arm64"
      ],
@@ -2747,9 +2738,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.32.0.tgz",
-      "integrity": "sha512-HJbifC9vex9NqnlodV2BHVFNuzKL5OnsV2dvTw6e1dpZKkNjPG6WUq+nhEYV6Hv2Bv++BXkwcyoGlXnPrjAKXw==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz",
+      "integrity": "sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==",
      "cpu": [
        "arm64"
      ],
@@ -2760,9 +2751,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.32.0.tgz",
-      "integrity": "sha512-VAEzZTD63YglFlWwRj3taofmkV1V3xhebDXffon7msNz4b14xKsz7utO6F8F4cqt8K/ktTl9rm88yryvDpsfOw==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz",
+      "integrity": "sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==",
      "cpu": [
        "loong64"
      ],
@@ -2773,9 +2764,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.32.0.tgz",
-      "integrity": "sha512-Sts5DST1jXAc9YH/iik1C9QRsLcCoOScf3dfbY5i4kH9RJpKxiTBXqm7qU5O6zTXBTEZry69bGszr3SMgYmMcQ==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz",
+      "integrity": "sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==",
      "cpu": [
        "ppc64"
      ],
@@ -2786,9 +2777,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.32.0.tgz",
-      "integrity": "sha512-qhlXeV9AqxIyY9/R1h1hBD6eMvQCO34ZmdYvry/K+/MBs6d1nRFLm6BOiITLVI+nFAAB9kUB6sdJRKyVHXnqZw==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz",
+      "integrity": "sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==",
      "cpu": [
        "riscv64"
      ],
@@ -2799,9 +2790,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.32.0.tgz",
-      "integrity": "sha512-8ZGN7ExnV0qjXa155Rsfi6H8M4iBBwNLBM9lcVS+4NcSzOFaNqmt7djlox8pN1lWrRPMRRQ8NeDlozIGx3Omsw==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz",
+      "integrity": "sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==",
      "cpu": [
        "s390x"
      ],
@@ -2812,9 +2803,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.32.0.tgz",
-      "integrity": "sha512-VDzNHtLLI5s7xd/VubyS10mq6TxvZBp+4NRWoW+Hi3tgV05RtVm4qK99+dClwTN1McA6PHwob6DEJ6PlXbY83A==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz",
+      "integrity": "sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==",
      "cpu": [
        "x64"
      ],
@@ -2825,9 +2816,9 @@
      ]
    },
    "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.32.0.tgz",
-      "integrity": "sha512-qcb9qYDlkxz9DxJo7SDhWxTWV1gFuwznjbTiov289pASxlfGbaOD54mgbs9+z94VwrXtKTu+2RqwlSTbiOqxGg==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz",
+      "integrity": "sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==",
      "cpu": [
        "x64"
      ],
@@ -2838,9 +2829,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.32.0.tgz",
-      "integrity": "sha512-pFDdotFDMXW2AXVbfdUEfidPAk/OtwE/Hd4eYMTNVVaCQ6Yl8et0meDaKNL63L44Haxv4UExpv9ydSf3aSayDg==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz",
+      "integrity": "sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==",
      "cpu": [
        "arm64"
      ],
@@ -2851,9 +2842,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.32.0.tgz",
-      "integrity": "sha512-/TG7WfrCAjeRNDvI4+0AAMoHxea/USWhAzf9PVDFHbcqrQ7hMMKp4jZIy4VEjk72AAfN5k4TiSMRXRKf/0akSw==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz",
+      "integrity": "sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==",
      "cpu": [
        "ia32"
      ],
@@ -2864,9 +2855,9 @@
      ]
    },
    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.32.0.tgz",
-      "integrity": "sha512-5hqO5S3PTEO2E5VjCePxv40gIgyS2KvO7E7/vvC/NbIW4SIRamkMr1hqj+5Y67fbBWv/bQLB6KelBQmXlyCjWA==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz",
+      "integrity": "sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==",
      "cpu": [
        "x64"
      ],
@@ -11811,12 +11802,11 @@
      }
    },
    "node_modules/playwright": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.0.tgz",
-      "integrity": "sha512-+GinGfGTrd2IfX1TA4N2gNmeIksSb+IAe589ZH+FlmpV3MYTx6+buChGIuDLQwrGNCw2lWibqV50fU510N7S+w==",
-      "license": "Apache-2.0",
+      "version": "1.49.1",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.1.tgz",
+      "integrity": "sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==",
      "dependencies": {
-        "playwright-core": "1.50.0"
+        "playwright-core": "1.49.1"
      },
      "bin": {
        "playwright": "cli.js"
@@ -11829,10 +11819,9 @@
      }
    },
    "node_modules/playwright-core": {
-      "version": "1.50.0",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.0.tgz",
-      "integrity": "sha512-CXkSSlr4JaZs2tZHI40DsZUN/NIwgaUPsyLuOAaIZp2CyF2sN5MM5NJsyB188lFSSozFxQ5fPT4qM+f0tH/6wQ==",
-      "license": "Apache-2.0",
+      "version": "1.49.1",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.1.tgz",
+      "integrity": "sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==",
      "bin": {
        "playwright-core": "cli.js"
      },
@@ -12753,9 +12742,9 @@
      "license": "Unlicense"
    },
    "node_modules/rollup": {
-      "version": "4.32.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.32.0.tgz",
-      "integrity": "sha512-JmrhfQR31Q4AuNBjjAX4s+a/Pu/Q8Q9iwjWBsjRH1q52SPFE2NqRMK6fUZKKnvKO6id+h7JIRf0oYsph53eATg==",
+      "version": "4.31.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz",
+      "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==",
      "license": "MIT",
      "dependencies": {
        "@types/estree": "1.0.6"
@@ -12768,25 +12757,25 @@
        "npm": ">=8.0.0"
      },
      "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.32.0",
-        "@rollup/rollup-android-arm64": "4.32.0",
-        "@rollup/rollup-darwin-arm64": "4.32.0",
-        "@rollup/rollup-darwin-x64": "4.32.0",
-        "@rollup/rollup-freebsd-arm64": "4.32.0",
-        "@rollup/rollup-freebsd-x64": "4.32.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.32.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.32.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.32.0",
-        "@rollup/rollup-linux-arm64-musl": "4.32.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.32.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.32.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.32.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.32.0",
-        "@rollup/rollup-linux-x64-gnu": "4.32.0",
-        "@rollup/rollup-linux-x64-musl": "4.32.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.32.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.32.0",
-        "@rollup/rollup-win32-x64-msvc": "4.32.0",
+        "@rollup/rollup-android-arm-eabi": "4.31.0",
+        "@rollup/rollup-android-arm64": "4.31.0",
+        "@rollup/rollup-darwin-arm64": "4.31.0",
+        "@rollup/rollup-darwin-x64": "4.31.0",
+        "@rollup/rollup-freebsd-arm64": "4.31.0",
+        "@rollup/rollup-freebsd-x64": "4.31.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.31.0",
+        "@rollup/rollup-linux-arm-musleabihf": "4.31.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.31.0",
+        "@rollup/rollup-linux-arm64-musl": "4.31.0",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.31.0",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.31.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.31.0",
+        "@rollup/rollup-linux-s390x-gnu": "4.31.0",
+        "@rollup/rollup-linux-x64-gnu": "4.31.0",
+        "@rollup/rollup-linux-x64-musl": "4.31.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.31.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.31.0",
+        "@rollup/rollup-win32-x64-msvc": "4.31.0",
        "fsevents": "~2.3.2"
      }
    },
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
    "hogan": "1.0.2",
    "jquery": "3.7.1",
    "morphdom": "^2.7.4",
-    "playwright": "^1.50.0",
+    "playwright": "^1.49.1",
    "python": "^0.0.4",
    "query-command-supported": "1.0.0",
    "sass-embedded": "^1.83.4",
@@ -47,7 +47,7 @@
    "vinyl-source-stream": "^2.0.0"
  },
  "devDependencies": {
-    "@babel/core": "^7.26.7",
+    "@babel/core": "^7.26.0",
    "@babel/preset-env": "^7.26.0",
    "@uswds/compile": "^1.2.1",
    "backstopjs": "^6.3.25",
@@ -66,7 +66,7 @@
    "jest-environment-jsdom": "^29.2.2",
    "jshint": "2.13.6",
    "jshint-stylish": "2.2.1",
-    "rollup": "^4.32.0",
+    "rollup": "^4.31.0",
    "rollup-plugin-commonjs": "10.1.0",
    "rollup-plugin-node-resolve": "5.2.0"
  }
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -657,8 +657,9 @@ def test_should_show_recent_templates_on_dashboard(
    ]
    assert "Total messages" in headers

-    table_rows = page.find_all("tbody")[1].find_all("tr")
-    assert len(table_rows) == 2
+    table_rows = page.find_all("tbody")[0].find_all("tr")
+
+    assert len(table_rows) == 0


@pytest.mark.parametrize(
@@ -1942,6 +1943,7 @@ def test_service_dashboard_shows_batched_jobs(
    job_table_body = page.find("table", class_="job-table")

    rows = job_table_body.find_all("tbody")[0].find_all("tr")
-    assert len(rows) == 1
+
+    assert len(rows) == 0

    assert job_table_body is not None
--- a/tests/app/main/views/test_index.py
+++ b/tests/app/main/views/test_index.py
@@ -94,7 +94,7 @@ def test_hiding_pages_from_search_engines(
        "message_status",
        "how_to_pay",
        "get_started",
-        "how_to",
+        "guidance_index",
        "create_and_send_messages",
        "edit_and_format_messages",
        "send_files_by_email",
--- a/tests/app/test_navigation.py
+++ b/tests/app/test_navigation.py
@@ -111,7 +111,7 @@ EXCLUDED_ENDPOINTS = tuple(
            "get_started_old",
            "go_to_dashboard_after_tour",
            "guest_list",
-            "how_to",
+            "guidance_index",
            "history",
            "how_to_pay",
            "inbound_sms_admin",
--- a/tests/end_to_end/conftest.py
+++ b/tests/end_to_end/conftest.py
@@ -1,11 +1,53 @@
+import datetime
 import os
+from contextlib import contextmanager
+from unittest.mock import patch

 import pytest
 from axe_core_python.sync_playwright import Axe
+from flask import Flask, current_app, url_for
+from flask import session as flask_session
+from flask_login import login_user
+from flask.testing import FlaskClient
+
+from app import create_app
+from app.models.service import Service
+from app.models.user import User
+from app.notify_client.service_api_client import service_api_client
+from app.notify_client.user_api_client import user_api_client
+from notifications_python_client.errors import HTTPError
+from .. import TestClient
+

 E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")


+class TestClient(FlaskClient):
+    def login(self, user, mocker=None, service=None):
+        # Skipping authentication here and just log them in
+        model_user = User(user)
+        with self.session_transaction() as session:
+            session["current_session_id"] = model_user.current_session_id
+            session["user_id"] = model_user.id
+        if mocker:
+            mocker.patch("app.user_api_client.get_user", return_value=user)
+        if mocker and service:
+            with self.session_transaction() as session:
+                session["service_id"] = service["id"]
+            mocker.patch(
+                "app.service_api_client.get_service", return_value={"data": service}
+            )
+
+        with patch("app.events_api_client.create_event"):
+            login_user(model_user, force=True)  # forces the user to be logged in.
+        with self.session_transaction() as test_session:
+            for key, value in flask_session.items():
+                test_session[key] = value
+
+    def logout(self, user):
+        self.get(url_for("main.sign_out"))
+
+
@pytest.fixture
 def end_to_end_context(browser):
    context = browser.new_context()
@@ -36,3 +78,107 @@ def check_axe_report(page):
            "minor",
            "moderate",
        ], f"Accessibility violation: {violation}"
+
+
+@pytest.fixture
+def notify_admin_e2e():
+    os.environ["NOTIFY_ENVIRONMENT"] = "e2etest"
+
+    application = Flask("app")
+    create_app(application)
+
+    application.test_client_class = TestClient
+
+    with application.app_context():
+        yield application
+
+
+@pytest.fixture
+def default_user(notify_admin_e2e):
+    user_data = user_api_client.get_user_by_email(os.getenv("NOTIFY_E2E_TEST_EMAIL"))
+    return user_data
+
+
+@pytest.fixture
+def client(notify_admin_e2e, default_user):
+    """
+    Do not use this fixture directly – use `client_request` instead
+    """
+    with notify_admin_e2e.test_request_context(), notify_admin_e2e.test_client() as client:
+        client.allow_subdomain_redirects = True
+        try:
+            client.login(default_user)
+            yield client
+        finally:
+            client.logout(default_user)
+
+
+# Need e2e service defined here?
+@pytest.fixture()
+def default_service(browser, client, default_user):
+    current_date_time = datetime.datetime.now()
+    now = current_date_time.strftime("%m/%d/%Y %H:%M:%S")
+    browser_type = browser.browser_type.name
+    service_name = f"E2E Federal Test Service {now} - {browser_type}"
+
+    service_id = service_api_client.create_service(
+        service_name=service_name,
+        organization_type="federal",
+        message_limit=current_app.config["DEFAULT_SERVICE_LIMIT"],
+        restricted=True,
+        user_id=default_user["id"],
+        email_from=default_user["email_address"],
+    )
+
+    print("*" * 80)
+    print(service_id)
+
+    service_data = service_api_client.get_service(service_id)
+
+    service = Service(service_data)
+
+    from pprint import pprint
+    pprint(dir(service))
+
+    try:
+        yield service
+    finally:
+        service_api_client.archive_service(service.id, None)
+
+
+@contextmanager
+def _set_up_user(
+    default_service,
+    name,
+    email_addr,
+    phone,
+    password,
+    auth_type,
+    permissions,
+    folder_permissions,
+):
+    user = user_api_client.get_user_by_email_or_none(email_addr)
+    if user is None:
+        user = user_api_client.register_user(
+            name, email_addr, phone, password, auth_type
+        )
+    user_api_client.add_user_to_service(
+        default_service.id, user.id, permissions, folder_permissions
+    )
+    user_api_client.activate_user(user.id)
+    yield user
+    user_api_client.deactivate_user(user.id)
+    service_api_client.remove_user_from_service(user.id, default_service.id)
+
+
+@pytest.fixture
+def admin_user(default_service):
+    with _set_up_user(
+        default_service,
+        "E2E Admin Test",
+        "admin@nowhere.huh",
+        "1234567890",
+        "password",
+        "sms",
+    ) as user:
+        yield user
--- a/tests/end_to_end/test_campaign_manager_story.py
+++ b/tests/end_to_end/test_campaign_manager_story.py
@@ -0,0 +1,247 @@
+import datetime
+import os
+import re
+import uuid
+
+from playwright.sync_api import expect
+
+from tests.conftest import create_user
+from tests.end_to_end.conftest import check_axe_report
+
+E2E_TEST_URI = os.getenv("NOTIFY_E2E_TEST_URI")
+
+
+def create_new_template(page):
+
+    current_service_link = page.get_by_text("Current service")
+    expect(current_service_link).to_be_visible()
+    current_service_link.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    send_messages_button = page.get_by_role("link", name="Send messages")
+    expect(send_messages_button).to_be_visible()
+    send_messages_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    create_template_button = page.get_by_role("button", name="New template")
+    expect(create_template_button).to_be_visible()
+    create_template_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    start_with_a_blank_template_radio = page.get_by_text("Start with a blank template")
+    expect(start_with_a_blank_template_radio).to_be_visible()
+    start_with_a_blank_template_radio.click()
+
+    continue_button = page.get_by_role("button", name="Continue")
+
+    # continue_button = page.get_by_text("Continue")
+    expect(continue_button).to_be_visible()
+    continue_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    template_name_input = page.get_by_text("Template name")
+    expect(template_name_input).to_be_visible()
+    template_name = str(uuid.uuid4())
+    template_name_input.fill(template_name)
+    message_input = page.get_by_role("textbox", name="Message")
+    expect(message_input).to_be_visible()
+    message = "Test message for e2e test"
+    message_input.fill(message)
+
+    save_button = page.get_by_text("Save")
+    expect(save_button).to_be_visible()
+    save_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    assert template_name in page.content()
+    assert message in page.content()
+
+
+def update_template(page):
+    # Check update template button is visible
+    update_template_button = page.get_by_text("Edit this template")
+    expect(update_template_button).to_be_visible()
+    update_template_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    assert "Edit text message template" in page.content()
+
+    # Update template name and message
+    template_name_input = page.get_by_text("Template name")
+    expect(template_name_input).to_be_visible()
+    template_name = str(uuid.uuid4())
+    template_name_input.fill(template_name)
+    message_input = page.get_by_role("textbox", name="Message")
+    expect(message_input).to_be_visible()
+    message = "Test message is updated for e2e test"
+    message_input.fill(message)
+
+    # Save new template info
+    save_button = page.get_by_text("Save")
+    expect(save_button).to_be_visible()
+    save_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    # Check new template name, message and last edited text are on page.
+    assert template_name in page.content()
+    assert message in page.content()
+    # assert "Last edited just now" in page.content()
+
+
+def delete_template(page):
+    # Check delete template link is visible
+    delete_template_link = page.get_by_text("Delete this template")
+    expect(delete_template_link).to_be_visible()
+    delete_template_link.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    # Check confirmation text is visible
+    assert "Are you sure you want to delete" in page.content()
+
+    # Check that the delete button is visible
+    delete_button = page.get_by_text("Yes, delete")
+    expect(delete_button).to_be_visible()
+    delete_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    assert "Select or create a template" in page.content()
+
+
+def test_campaign_manager_core_user_story(default_service, end_to_end_context):
+    create_user()
+    page = end_to_end_context.new_page()
+    # page.goto(f"{E2E_TEST_URI}/sign-in")
+    # Wait for the next page to fully load.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    current_date_time = datetime.datetime.now()
+    # new_service_name = "E2E Federal Test Service {now} - {browser_type}".format(
+    #    now=current_date_time.strftime("%m/%d/%Y %H:%M:%S"),
+    #    browser_type=page.context.browser.browser_type.name,
+    # )
+    # page.goto(f"{E2E_TEST_URI}/accounts")
+
+    # Check to make sure that we've arrived at the next page.
+    # page.wait_for_load_state("domcontentloaded")
+    # check_axe_report(page)
+
+    # Check to make sure that we've arrived at the next page.
+    # Check the page title exists and matches what we expect.
+    # expect(page).to_have_title(re.compile("Choose service"))
+
+    # Check for the sign in heading.
+    # sign_in_heading = page.get_by_role("heading", name="Choose service")
+    # expect(sign_in_heading).to_be_visible()
+
+    # Retrieve some prominent elements on the page for testing.
+    # add_service_button = page.get_by_role(
+    #     "button", name=re.compile("Add a new service")
+    # )
+
+    # expect(add_service_button).to_be_visible()
+
+    # existing_service_link = page.get_by_role("link", name=new_service_name)
+
+    # Check to see if the service was already created - if so, we should fail.
+    # TODO:  Figure out how to make this truly isolated, and/or work in a
+    #        delete service workflow.
+    # expect(existing_service_link).to_have_count(0)
+
+    # Click on add a new service.
+    a  # dd_service_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    # page.wait_for_load_state("domcontentloaded")
+    # check_axe_report(page)
+
+    # Check for the sign in heading.
+    # about_heading = page.get_by_role("heading", name="About your service")
+    # expect(about_heading).to_be_visible()
+
+    # Retrieve some prominent elements on the page for testing.
+    # service_name_input = page.locator('xpath=//input[@name="name"]')
+    # add_service_button = page.get_by_role("button", name=re.compile("Add service"))
+
+    # expect(service_name_input).to_be_visible()
+    # expect(add_service_button).to_be_visible()
+
+    # Fill in the form.
+    # service_name_input.fill(new_service_name)
+
+    # Click on add service.
+    # add_service_button.click()
+
+    # Check to make sure that we've arrived at the next page.
+    # page.wait_for_load_state("domcontentloaded")
+    # check_axe_report(page)
+
+    # TODO this fails on staging due to duplicate results on 'get_by_text'
+    # Check for the service name title and heading.
+    # service_heading = page.get_by_text(new_service_name, exact=True)
+    # expect(service_heading).to_be_visible()
+
+    print("*" * 80)
+    print(default_service.name)
+    print("*" * 80)
+
+    expect(page).to_have_title(re.compile(default_service.name))
+
+    create_new_template(page)
+
+    update_template(page)
+
+    delete_template(page)
+
+    _teardown(page)
+
+
+def _teardown(page):
+    page.click("text='Settings'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    page.click("text='Delete this service'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    page.click("text='Yes, delete'")
+
+    # Check to make sure that we've arrived at the next page.
+    page.wait_for_load_state("domcontentloaded")
+    check_axe_report(page)
+
+    # Check to make sure that we've arrived at the next page.
+    # Check the page title exists and matches what we expect.
+    expect(page).to_have_title(re.compile("Choose service"))
--- a/tests/javascripts/activityChart.test.js
+++ b/tests/javascripts/activityChart.test.js
@@ -21,7 +21,7 @@ Object.defineProperty(HTMLElement.prototype, 'clientWidth', {
 beforeAll(done => {
  // Set up the DOM with the D3 script included
  document.body.innerHTML = `
-    <div id="activityChartContainer">
+    <div id="activityChartContainer"">
      <form class="usa-form">
        <label class="usa-label" for="options">Account</label>
        <select class="usa-select margin-bottom-2" name="options" id="options">
@@ -40,9 +40,6 @@ beforeAll(done => {
      </div>
    </div>
    <div id="aria-live-account" class="usa-sr-only" aria-live="polite"></div>
-    <div id="activityContainer" data-currentUserName="Test User"></div>
-
-    <div id="aria-live-account" class="usa-sr-only" aria-live="polite"></div>
  `;

  // Load the D3 script dynamically
@@ -181,59 +178,3 @@ const data = await fetchData('service');
 expect(global.fetch).toHaveBeenCalledWith('/daily_stats.json');
 expect(data).toEqual(mockResponse);
 });
-
-test('handleDropdownChange updates DOM for individual selection', () => {
-  document.body.innerHTML = `
-    <div id="activityChartContainer">
-      <div class="chart-subtitle"></div>
-    </div>
-    <div id="aria-live-account"></div>
-    <div id="activityContainer" data-currentUserName="Test User"></div>
-    <div id="tableActivity">
-      <h2 id="table-heading"></h2>
-      <table id="activity-table">
-        <caption id="caption"></caption>
-        <tbody>
-          <tr><td class="sender-column">Test User</td></tr>
-          <tr><td class="sender-column">Other User</td></tr>
-          <tr><td class="sender-column">Test User</td></tr>
-          <tr><td class="sender-column">Test User</td></tr>
-          <tr><td class="sender-column">Other User</td></tr>
-          <tr><td class="sender-column">Test User</td></tr>
-          <tr><td class="sender-column">Test User</td></tr>
-        </tbody>
-      </table>
-    </div>
-    <select id="options">
-      <option value="service">Service</option>
-      <option value="individual">Individual</option>
-    </select>
-  `;
-
-  window.currentUserName = "Test User";
-
-  jest.spyOn(window, 'fetchData').mockImplementation(() => {});
-
-  const selectElement = document.getElementById('options');
-  selectElement.value = 'individual';
-  const event = { target: selectElement };
-
-  window.handleDropdownChange(event);
-
-  expect(document.getElementById('table-heading').textContent).toBe('My activity');
-  expect(document.getElementById('caption').textContent).toContain('Test User');
-
-  document.querySelectorAll('.sender-column').forEach(col => {
-    expect(col.style.display).toBe('none');
-  });
-
-  const rows = Array.from(document.querySelectorAll('#activity-table tbody tr'));
-  const visibleRows = rows.filter(row => row.style.display !== 'none');
-  expect(visibleRows.length).toBeLessThanOrEqual(5);
-  visibleRows.forEach(row => {
-    const sender = row.querySelector('.sender-column').textContent.trim();
-    expect(sender).toBe('Test User');
-  });
-
-  window.fetchData.mockRestore();
-});
--- a/urls.js
+++ b/urls.js
@@ -8,7 +8,7 @@ const sublinks = [
  { label: 'Trial Mode', path: '/using-notify/trial-mode' },
  { label: 'Pricing', path: '/using-notify/pricing' },
  { label: 'Delivery Status', path: '/using-notify/delivery-status' },
-  { label: 'How To', path: '/using-notify/how-to' },
+  { label: 'Guidance', path: '/using-notify/guidance' },
  { label: 'Support', path: '/support' },
  { label: 'Best Practices', path: '/using-notify/best-practices' },
  { label: 'Clear Goals', path: '/using-notify/best-practices/clear-goals' },
Author	SHA1	Message	Date
Cliff Hill	eac8f8cddb	End to end woes continue. Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>	2025-05-12 12:43:12 -04:00
Cliff Hill	c22e216d79	Working on getting the service to be used. Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>	2025-04-30 12:45:55 -04:00
Cliff Hill	db3c4d170e	Getting closer... Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>	2025-04-14 12:29:36 -04:00
Cliff Hill	921985904c	More conftest goodness. Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>	2025-04-08 12:56:47 -04:00
Cliff Hill	53e1f792b3	Ok, looks like I can access the api finally. Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>	2025-03-21 11:03:22 -04:00
Cliff Hill	33ce7c8094	Attempting to make a new notify admin client for e2e that works. Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>	2025-03-10 15:36:51 -04:00
Cliff Hill	122a91e482	Stuff was done, will get back to this momentarily. Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>	2025-03-10 14:25:36 -04:00
Cliff Hill	34706ee839	Cleaning things up for an additional user. Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>	2025-02-13 11:02:02 -05:00
Cliff Hill	2f1acec0f5	Working on making a test user. Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>	2025-01-31 11:56:26 -05:00
Andrew Shumway	7fe7c0f095	Format	2025-01-28 09:06:08 -07:00