From 17f758bace0509270e93129913a67c43ad011c52 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 12 Dec 2024 18:42:03 -0800
Subject: [PATCH 01/62] added id and also refactor error message on templates
 page

---
 .../sass/uswds/_uswds-theme-custom-styles.scss |  4 ++++
 app/templates/components/textbox.html          | 18 +++++++-----------
 app/templates/views/edit-sms-template.html     |  4 ++--
 app/templates/views/send-test.html             |  2 +-
 app/templates/views/templates/template.html    |  4 ----
 5 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index 38ae4059fe..8b5dc96842 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -932,3 +932,7 @@ li.linked-card:hover svg,
    font-size: units(3);
    font-weight: bold;
 }
+
+.form-control-error {
+   border: 4px solid #b10e1e
+}
diff --git a/app/templates/components/textbox.html b/app/templates/components/textbox.html
index 3e479cbceb..db3f27c648 100644
--- a/app/templates/components/textbox.html
+++ b/app/templates/components/textbox.html
@@ -16,19 +16,9 @@
   placeholder=''
 ) %}
   <div
-    class="form-group{% if field.errors %} form-group-error{% endif %} {{ extra_form_group_classes }}"
+    class="usa-form-group{% if field.errors %} usa-form-group--error{% endif %} {{ extra_form_group_classes }}"
     data-module="{% if autofocus %}autofocus{% elif colour_preview %}colour-preview{% endif %}"
   >
-    {% if field.errors %}
-      <div class="usa-alert usa-alert--error edit-textbox-error-mt" role="alert">
-        <div class="usa-alert__body">
-          <h4 class="usa-alert__heading">Error message</h4>
-          <p class="usa-alert__text" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}">
-            {% if not safe_error_message %}{{ field.errors[0] }}{% else %}{{ field.errors[0]|safe }}{% endif %}
-          </p>
-        </div>
-      </div>
-    {% endif %}
     <label class="usa-label" for="{{ field.name }}">
       {% if label %}
         {{ label }}
@@ -41,6 +31,12 @@ <h4 class="usa-alert__heading">Error message</h4>
         {{ hint }}
       </div>
     {% endif %}
+    {% if field.errors %}
+    <span class="usa-error-message" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}">
+      {% if not safe_error_message %}{{ field.errors[0] }}{% else %}{{ field.errors[0]|safe }}{% endif %}
+    </span>
+  {% endif %}
+
     {%
       if highlight_placeholders or autosize
     %}
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index 97eac73dc9..f0129ef1c9 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -32,7 +32,7 @@
         <div class="tablet:grid-col-9 mobile-lg:grid-col-12">
           {{ form.name(param_extensions={
             "extra_form_group_classes": "margin-bottom-2",
-            "hint": {"text": "Your recipients will not see this"}
+            "id": "template-name"
           }) }}
           {{ textbox(
             form.template_content,
@@ -41,7 +41,7 @@
             hint=content_hint,
             rows=5,
             extra_form_group_classes='margin-bottom-1',
-            placeholder='Edit me! Check out the Personalization section below for details on cool ((stuff)) you can do with your messages!'
+            placeholder='Edit me! Check out the Personalization section below for details on cool ((stuff)) you can do with your messages!',
           ) }}
           {% if current_user.platform_admin %}
             {{ form.process_type }}
diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html
index 8a4cf4c0d9..27bfe7965b 100644
--- a/app/templates/views/send-test.html
+++ b/app/templates/views/send-test.html
@@ -25,7 +25,7 @@
   ) %}
     <div class="grid-row">
       <div class="grid-col-12 {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
-        {{ form.placeholder_value(param_extensions={"classes": ""}) }}
+        {{ form.placeholder_value(param_extensions={"id": "phone-number"}) }}
       </div>
       {% if skip_link or link_to_upload %}
         <div class="grid-col-12 margin-top-1">
diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html
index f04f9f4907..00cd953031 100644
--- a/app/templates/views/templates/template.html
+++ b/app/templates/views/templates/template.html
@@ -88,8 +88,4 @@ <h3 class="margin-bottom-0">More actions</h3>
 
   </div>
 
-  <!--<div class="">
-    {{ copy_to_clipboard(template.id, name="Template ID", thing='template ID') }}
-  </div>-->
-
 {% endblock %}

From b731cd62bbec88b0d0327c06d84fc4296433a0a0 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 12 Dec 2024 23:08:25 -0800
Subject: [PATCH 02/62] adding error annoucement

---
 app/main/views/templates.py                         |  1 +
 .../components/components/input/template.njk        |  2 +-
 app/templates/components/textbox.html               |  7 ++++---
 app/templates/views/edit-sms-template.html          | 13 +++++++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index 5c59e1e7cc..3a7315db7e 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -645,6 +645,7 @@ def edit_service_template(service_id, template_id):
         return render_template(
             "views/edit-{}-template.html".format(template["template_type"]),
             form=form,
+            errors=form.errors if form.errors else None,
             template=template,
             heading_action="Edit",
         )
diff --git a/app/templates/components/components/input/template.njk b/app/templates/components/components/input/template.njk
index 7f56346517..f843f82b2c 100644
--- a/app/templates/components/components/input/template.njk
+++ b/app/templates/components/components/input/template.njk
@@ -5,7 +5,7 @@
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}
 {% set describedBy = params.describedBy if params.describedBy else "" %}
-<div class="usa-form-group {%- if params.errorMessage %} usa-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}">
+<div class="usa-form-group {%- if params.errorMessage %} usa-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}" aria-live="polite" role="alert">
   {{ usaLabel({
     html: params.label.html,
     text: params.label.text,
diff --git a/app/templates/components/textbox.html b/app/templates/components/textbox.html
index db3f27c648..77dc636a4e 100644
--- a/app/templates/components/textbox.html
+++ b/app/templates/components/textbox.html
@@ -17,7 +17,7 @@
 ) %}
   <div
     class="usa-form-group{% if field.errors %} usa-form-group--error{% endif %} {{ extra_form_group_classes }}"
-    data-module="{% if autofocus %}autofocus{% elif colour_preview %}colour-preview{% endif %}"
+    data-module="{% if autofocus %}autofocus{% elif colour_preview %}colour-preview{% endif %}" aria-live="polite" role="alert"
   >
     <label class="usa-label" for="{{ field.name }}">
       {% if label %}
@@ -32,11 +32,11 @@
       </div>
     {% endif %}
     {% if field.errors %}
-    <span class="usa-error-message" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}">
+    <span id="{{ field.name}}-error" class="usa-error-message" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}">
+      <span class="usa-sr-only">Error:</span>
       {% if not safe_error_message %}{{ field.errors[0] }}{% else %}{{ field.errors[0]|safe }}{% endif %}
     </span>
   {% endif %}
-
     {%
       if highlight_placeholders or autosize
     %}
@@ -55,6 +55,7 @@
       data_highlight_placeholders='true' if highlight_placeholders else 'false',
       rows=rows|string,
       placeholder=placeholder,
+      aria_describedby=field.name+"-error",
       **kwargs
     ) }}
     {% if suffix %}
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index f0129ef1c9..e27558aa07 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -15,6 +15,19 @@
   }) }}
 {% endblock %}
 
+{% block skipLink %}
+  {% set skipLink = usaSkipLink({
+    "href": '#main-content',
+    "text": 'Skip to main content'
+  }) %}
+  {% if errors %}
+    <div>{{ skipLink }}</div>
+  {% else %}
+    {{ skipLink }}
+  {% endif %}
+{% endblock %}
+
+
 {% block maincolumn_content %}
 
     {{ page_header('{} text message template'.format(heading_action)) }}

From 12636d6a69f28a44b3445a97f3276b3623c72066 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 12 Dec 2024 23:31:22 -0800
Subject: [PATCH 03/62] adding error annoucement

---
 app/templates/views/edit-sms-template.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index e27558aa07..84590ce576 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -64,8 +64,7 @@
           <div class="grid-col-12">
             <div class="template-content-count" bg-color="red">
               <div data-module="update-status" data-target="template_content"
-                data-updates-url="{{ url_for('.count_content_length', service_id=current_service.id, template_type='sms') }}"
-                aria-live="polite">
+                data-updates-url="{{ url_for('.count_content_length', service_id=current_service.id, template_type='sms') }}">
                 &nbsp;
               </div>
             </div>

From 56381f5b27941c599ab5e8faf4176c5e8d383e4c Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 17 Dec 2024 10:06:10 -0800
Subject: [PATCH 04/62] adding id

---
 app/templates/components/textbox.html      |  2 +-
 app/templates/views/edit-sms-template.html | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/templates/components/textbox.html b/app/templates/components/textbox.html
index 77dc636a4e..221a6c1227 100644
--- a/app/templates/components/textbox.html
+++ b/app/templates/components/textbox.html
@@ -17,7 +17,7 @@
 ) %}
   <div
     class="usa-form-group{% if field.errors %} usa-form-group--error{% endif %} {{ extra_form_group_classes }}"
-    data-module="{% if autofocus %}autofocus{% elif colour_preview %}colour-preview{% endif %}" aria-live="polite" role="alert"
+    data-module="{% if autofocus %}autofocus{% elif colour_preview %}colour-preview{% endif %}"
   >
     <label class="usa-label" for="{{ field.name }}">
       {% if label %}
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index 84590ce576..1b2c9d96ff 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -15,17 +15,6 @@
   }) }}
 {% endblock %}
 
-{% block skipLink %}
-  {% set skipLink = usaSkipLink({
-    "href": '#main-content',
-    "text": 'Skip to main content'
-  }) %}
-  {% if errors %}
-    <div>{{ skipLink }}</div>
-  {% else %}
-    {{ skipLink }}
-  {% endif %}
-{% endblock %}
 
 
 {% block maincolumn_content %}
@@ -42,10 +31,10 @@
 
     {% call form_wrapper() %}
       <div class="grid-row">
-        <div class="tablet:grid-col-9 mobile-lg:grid-col-12">
+        <div class="tablet:grid-col-9 mobile-lg:grid-col-12" aria-live="polite" role="alert">
           {{ form.name(param_extensions={
             "extra_form_group_classes": "margin-bottom-2",
-            "id": "template-name"
+            "id": "name"
           }) }}
           {{ textbox(
             form.template_content,

From 1df019e78ceada9f14bc8adca95c09d5582fae35 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Wed, 18 Dec 2024 12:40:45 -0800
Subject: [PATCH 05/62] adding required html field

---
 app/templates/components/components/input/template.njk | 6 ++++--
 app/templates/components/form.html                     | 1 -
 app/templates/components/textbox.html                  | 4 +++-
 app/templates/views/edit-sms-template.html             | 6 +++---
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/templates/components/components/input/template.njk b/app/templates/components/components/input/template.njk
index f843f82b2c..9e2cff08cb 100644
--- a/app/templates/components/components/input/template.njk
+++ b/app/templates/components/components/input/template.njk
@@ -5,7 +5,7 @@
 {#- a record of other elements that we need to associate with the input using
    aria-describedby – for example hints or error messages -#}
 {% set describedBy = params.describedBy if params.describedBy else "" %}
-<div class="usa-form-group {%- if params.errorMessage %} usa-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}" aria-live="polite" role="alert">
+<div class="usa-form-group {%- if params.errorMessage %} usa-form-group--error{% endif %} {%- if params.formGroup.classes %} {{ params.formGroup.classes }}{% endif %}">
   {{ usaLabel({
     html: params.label.html,
     text: params.label.text,
@@ -42,5 +42,7 @@
   {%- if describedBy %} aria-describedby="{{ describedBy }}"{% endif %}
   {%- if params.autocomplete %} autocomplete="{{ params.autocomplete}}"{% endif %}
   {%- if params.pattern %} pattern="{{ params.pattern }}"{% endif %}
-  {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor -%}>
+  {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor -%}
+  {%- if params.required %} required{% endif %}
+/>
 </div>
diff --git a/app/templates/components/form.html b/app/templates/components/form.html
index 17cabc7f09..5875a19a9a 100644
--- a/app/templates/components/form.html
+++ b/app/templates/components/form.html
@@ -19,7 +19,6 @@
         data-{{ key }}="{{ val }}"
       {% endif %}
     {% endfor %}
-    novalidate
   >
     {{ caller() }}
   </form>
diff --git a/app/templates/components/textbox.html b/app/templates/components/textbox.html
index 221a6c1227..e8b6f813d2 100644
--- a/app/templates/components/textbox.html
+++ b/app/templates/components/textbox.html
@@ -13,7 +13,8 @@
   safe_error_message=False,
   rows=8,
   extra_form_group_classes='',
-  placeholder=''
+  placeholder='',
+  required=None
 ) %}
   <div
     class="usa-form-group{% if field.errors %} usa-form-group--error{% endif %} {{ extra_form_group_classes }}"
@@ -56,6 +57,7 @@
       rows=rows|string,
       placeholder=placeholder,
       aria_describedby=field.name+"-error",
+      required='required' if required else None,
       **kwargs
     ) }}
     {% if suffix %}
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index 1b2c9d96ff..b46c20ffa6 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -15,8 +15,6 @@
   }) }}
 {% endblock %}
 
-
-
 {% block maincolumn_content %}
 
     {{ page_header('{} text message template'.format(heading_action)) }}
@@ -34,7 +32,8 @@
         <div class="tablet:grid-col-9 mobile-lg:grid-col-12" aria-live="polite" role="alert">
           {{ form.name(param_extensions={
             "extra_form_group_classes": "margin-bottom-2",
-            "id": "name"
+            "id": "name",
+            "required": True
           }) }}
           {{ textbox(
             form.template_content,
@@ -44,6 +43,7 @@
             rows=5,
             extra_form_group_classes='margin-bottom-1',
             placeholder='Edit me! Check out the Personalization section below for details on cool ((stuff)) you can do with your messages!',
+            required=True
           ) }}
           {% if current_user.platform_admin %}
             {{ form.process_type }}

From 1e261fd3531d6efd24738066f07962ef19f78482 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Wed, 18 Dec 2024 15:30:48 -0800
Subject: [PATCH 06/62] fixed testing

---
 app/main/views/send.py                     | 2 +-
 app/templates/views/edit-sms-template.html | 6 ++++--
 tests/app/main/views/test_send.py          | 2 +-
 tests/app/main/views/test_tour.py          | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/main/views/send.py b/app/main/views/send.py
index 2b7a66f96c..2b36e57239 100644
--- a/app/main/views/send.py
+++ b/app/main/views/send.py
@@ -483,7 +483,7 @@ def send_one_off_step(service_id, template_id, step_index):
         link_to_upload=(
             request.endpoint == "main.send_one_off_step" and step_index == 0
         ),
-        errors=form.errors if form.errors else None
+        errors=form.errors if form.errors else None,
     )
 
 
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index b46c20ffa6..728b92cd62 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -33,7 +33,8 @@
           {{ form.name(param_extensions={
             "extra_form_group_classes": "margin-bottom-2",
             "id": "name",
-            "required": True
+            "required": True,
+            "hint": {"text": "Your recipients will not see this"}
           }) }}
           {{ textbox(
             form.template_content,
@@ -53,7 +54,8 @@
           <div class="grid-col-12">
             <div class="template-content-count" bg-color="red">
               <div data-module="update-status" data-target="template_content"
-                data-updates-url="{{ url_for('.count_content_length', service_id=current_service.id, template_type='sms') }}">
+                data-updates-url="{{ url_for('.count_content_length', service_id=current_service.id, template_type='sms') }}"
+                aria-live="polite">
                 &nbsp;
               </div>
             </div>
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index 806474c491..0ab770c181 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -1521,7 +1521,7 @@ def test_link_to_upload_not_offered_when_entering_personalisation(
 
     # We’re entering personalization
     assert page.select_one("input[type=text]")["name"] == "placeholder_value"
-    assert page.select_one("label[for=placeholder_value]").text.strip() == "name"
+    assert page.select_one("label[for=phone-number]").text.strip() == "name"
     # No ‘Upload’ link shown
     assert len(page.select("main a")) == 0
     assert "Upload" not in page.select_one("main").text
diff --git a/tests/app/main/views/test_tour.py b/tests/app/main/views/test_tour.py
index 2916d08870..9a2b8f053b 100644
--- a/tests/app/main/views/test_tour.py
+++ b/tests/app/main/views/test_tour.py
@@ -175,7 +175,7 @@ def test_should_show_empty_text_box(
     # shouldn’t also be set on the textbox itself
     assert "data-module" not in textbox
     assert (
-        normalize_spaces(page.select_one("label[for=placeholder_value]").text) == "one"
+        normalize_spaces(page.select_one("label[for=phone-number]").text) == "one"
     )
 
 

From a3db0a9fc07c2c203c62381adc5492fae8633051 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 6 Jan 2025 16:31:52 -0800
Subject: [PATCH 07/62] first round

---
 app/assets/javascripts/activityChart.js      | 24 +++++---
 app/formatters.py                            |  2 +-
 app/main/views/dashboard.py                  | 63 ++++++++++++--------
 app/main/views/jobs.py                       | 14 ++++-
 app/notify_client/job_api_client.py          |  2 +-
 app/templates/components/big-number.html     |  1 +
 app/templates/components/pill.html           |  1 +
 app/templates/partials/count.html            |  1 +
 app/templates/partials/jobs/status.html      |  2 +-
 app/templates/views/dashboard/dashboard.html |  7 +--
 10 files changed, 74 insertions(+), 43 deletions(-)

diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index 62c1e6e3e6..1c1238c6b3 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -5,6 +5,7 @@
         const COLORS = {
             delivered: '#0076d6',
             failed: '#fa9441',
+            pending: '#808080',
             text: '#666'
         };
 
@@ -45,7 +46,8 @@
                 // Show legend if there are messages
                 const legendData = [
                     { label: 'Delivered', color: COLORS.delivered },
-                    { label: 'Failed', color: COLORS.failed }
+                    { label: 'Failed', color: COLORS.failed },
+                    { label: 'Pending', color: COLORS.pending }
                 ];
 
                 const legendItem = legendContainer.selectAll('.legend-item')
@@ -100,12 +102,13 @@
             const stackData = labels.map((label, i) => ({
                 label: label,
                 delivered: deliveredData[i],
-                failed: failedData[i] || 0 // Ensure there's a value for failed, even if it's 0
+                failed: failedData[i] || 0, // Ensure there's a value for failed, even if it's 0
+                pending: pendingData[i] || 0
             }));
 
             // Stack the data
             const stack = d3.stack()
-                .keys(['delivered', 'failed'])
+                .keys(['delivered', 'failed', 'pending'])
                 .order(d3.stackOrderNone)
                 .offset(d3.stackOffsetNone);
 
@@ -113,8 +116,8 @@
 
             // Color scale
             const color = d3.scaleOrdinal()
-                .domain(['delivered', 'failed'])
-                .range([COLORS.delivered, COLORS.failed]);
+                .domain(['delivered', 'failed', 'pending'])
+                .range([COLORS.delivered, COLORS.failed, COLORS.pending]);
 
         // Create bars with animation
         const barGroups = svg.selectAll('.bar-group')
@@ -164,7 +167,7 @@
 
         // Create table header
         const headerRow = document.createElement('tr');
-        const headers = ['Day', 'Delivered', 'Failed'];
+        const headers = ['Day', 'Delivered', 'Failed', 'Pending'];
         headers.forEach(headerText => {
             const th = document.createElement('th');
             th.textContent = headerText;
@@ -187,6 +190,10 @@
             cellFailed.textContent = failedData[index];
             row.appendChild(cellFailed);
 
+            const cellPending = document.createElement('td');
+            cellPending.textContent = pendingData[index];
+            row.appendChild(cellPending);
+
             tbody.appendChild(row);
         });
 
@@ -213,6 +220,7 @@
                 labels = [];
                 deliveredData = [];
                 failedData = [];
+                pendingData = [];
 
                 let totalMessages = 0;
 
@@ -224,7 +232,7 @@
                         labels.push(formattedDate);
                         deliveredData.push(data[dateString].sms.delivered);
                         failedData.push(data[dateString].sms.failure);
-
+                        pendingData.push(data[dateString].sms.pending || 0);
                         // Calculate the total number of messages
                         totalMessages += data[dateString].sms.delivered + data[dateString].sms.failure;
                     }
@@ -260,7 +268,7 @@
             })
             .catch(error => console.error('Error fetching daily stats:', error));
     };
-
+    // setInterval(() => fetchData('service'), 1000);
     const handleDropdownChange = function(event) {
         const selectedValue = event.target.value;
         const subTitle = document.querySelector(`#activityChartContainer .chart-subtitle`);
diff --git a/app/formatters.py b/app/formatters.py
index c427c2a9a9..448e5d6cb6 100644
--- a/app/formatters.py
+++ b/app/formatters.py
@@ -493,7 +493,7 @@ def message_count_noun(count, template_type):
 
 
 def message_count(count, template_type):
-    return f"{format_thousands(count)} " f"{message_count_noun(count, template_type)}"
+    return f"format_message_count{format_thousands(count)} " f"{message_count_noun(count, template_type)}"
 
 
 def recipient_count_label(count, template_type):
diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 8013acb9d2..ce10d5f772 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -48,16 +48,8 @@ def service_dashboard(service_id):
     if not current_user.has_permissions("view_activity"):
         return redirect(url_for("main.choose_template", service_id=service_id))
 
-    yearly_usage = billing_api_client.get_annual_usage_for_service(
-        service_id,
-        get_current_financial_year(),
-    )
-    free_sms_allowance = billing_api_client.get_free_sms_fragment_limit_for_year(
-        current_service.id,
-    )
-    usage_data = get_annual_usage_breakdown(yearly_usage, free_sms_allowance)
-    sms_sent = usage_data["sms_sent"]
-    sms_allowance_remaining = usage_data["sms_allowance_remaining"]
+
+
 
     job_response = job_api_client.get_jobs(service_id)["data"]
     service_data_retention_days = 7
@@ -89,24 +81,11 @@ def service_dashboard(service_id):
         partials=get_dashboard_partials(service_id),
         jobs=jobs,
         service_data_retention_days=service_data_retention_days,
-        sms_sent=sms_sent,
-        sms_allowance_remaining=sms_allowance_remaining,
     )
 
 
-@main.route("/daily_stats.json")
-def get_daily_stats():
-    service_id = session.get("service_id")
-    date_range = get_stats_date_range()
-
-    stats = service_api_client.get_service_notification_statistics_by_day(
-        service_id, start_date=date_range["start_date"], days=date_range["days"]
-    )
-    return jsonify(stats)
-
-
-@main.route("/daily_stats_by_user.json")
-def get_daily_stats_by_user():
+@main.route("/services/<uuid:service_id>/daily_stats_by_user.json")
+def get_daily_stats_by_user(service_id):
     service_id = session.get("service_id")
     date_range = get_stats_date_range()
     user_id = current_user.id
@@ -360,7 +339,35 @@ def aggregate_notifications_stats(template_statistics):
     return notifications
 
 
+def fetch_daily_stats(service_id):
+    date_range = get_stats_date_range()
+    stats = service_api_client.get_service_notification_statistics_by_day(
+        service_id, start_date='2024-12-31', days=date_range["days"]
+    )
+    return stats
+
+# Route using the helper
+@main.route("/daily_stats.json")
+def get_daily_stats():
+    service_id = session.get("service_id")
+    stats = fetch_daily_stats(service_id)  # Use the helper
+    return jsonify(stats)
+
+
 def get_dashboard_partials(service_id):
+    date_range = get_stats_date_range()
+    yearly_usage = billing_api_client.get_annual_usage_for_service(
+        service_id,
+        get_current_financial_year(),
+    )
+    free_sms_allowance = billing_api_client.get_free_sms_fragment_limit_for_year(
+        current_service.id,
+    )
+
+    usage_data = get_annual_usage_breakdown(yearly_usage, free_sms_allowance)
+    sms_sent = usage_data["sms_sent"]
+    sms_allowance_remaining = usage_data["sms_allowance_remaining"]
+    activityStats = fetch_daily_stats
     all_statistics = template_statistics_client.get_template_statistics_for_service(
         service_id, limit_days=7
     )
@@ -384,6 +391,12 @@ def get_dashboard_partials(service_id):
         get_current_financial_year(),
     )
     return {
+        "activity": render_template(
+            "views/dashboard/_activity.html",
+            activityStats=activityStats,
+            sms_sent=sms_sent,
+            sms_allowance_remaining=sms_allowance_remaining,
+        ),
         "upcoming": render_template(
             "views/dashboard/_upcoming.html",
         ),
diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index dddf838a1c..784a37835f 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -334,6 +334,18 @@ def get_status_filters(service, message_type, statistics):
 
 
 def _get_job_counts(job):
+    print('''
+
+
+
+          job
+
+
+
+
+          ''', dir(job))
+    print(job.notifications_sending)
+
     job_type = job.template_type
     return [
         (
@@ -358,7 +370,7 @@ def _get_job_counts(job):
             ],
             [
                 Markup(
-                    f"""pending<span class="usa-sr-only">
+                    f"""pending--fdsjfisodj<span class="usa-sr-only">
                     {message_count_noun(job.notifications_sending, job_type)}</span>"""
                 ),
                 "pending",
diff --git a/app/notify_client/job_api_client.py b/app/notify_client/job_api_client.py
index 9a06e16bfa..2cf8f9b6d0 100644
--- a/app/notify_client/job_api_client.py
+++ b/app/notify_client/job_api_client.py
@@ -28,7 +28,7 @@ class JobApiClient(NotifyAdminAPIClient):
     def get_job(self, service_id, job_id):
         params = {}
         job = self.get(url=f"/service/{service_id}/job/{job_id}", params=params)
-
+    # comment
         return job
 
     def get_jobs(self, service_id, *, limit_days=None, statuses=None, page=1):
diff --git a/app/templates/components/big-number.html b/app/templates/components/big-number.html
index fcb89b7e93..ff050d15cd 100644
--- a/app/templates/components/big-number.html
+++ b/app/templates/components/big-number.html
@@ -2,6 +2,7 @@
   {% if link %}
     <a class="usa-link display-flex" href="{{ link }}">
   {% endif %}
+  big number
       <span class="big-number{% if smaller %}-smaller{% endif %}{% if smallest %}-smallest{% endif %}">
         <span class="big-number-number">
           {% if number is number %}
diff --git a/app/templates/components/pill.html b/app/templates/components/pill.html
index bb1bb033aa..8570d6fa9f 100644
--- a/app/templates/components/pill.html
+++ b/app/templates/components/pill.html
@@ -8,6 +8,7 @@
 ) %}
   <nav aria-labelledby='page-header'>
     <ul class='pill'>
+      Pill
       {% for label, option, link, count in items %}
         <li class="pill-item__container">
         {% if current_value == option %}
diff --git a/app/templates/partials/count.html b/app/templates/partials/count.html
index 188884cdfe..ebdbe04504 100644
--- a/app/templates/partials/count.html
+++ b/app/templates/partials/count.html
@@ -2,6 +2,7 @@
 
 <div class="ajax-block-container">
   <div class="tabs">
+    count
     {{ pill(counts, request.args.get('status', '')) }}
   </div>
 </div>
diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html
index fb0a745f8d..e3056a89ab 100644
--- a/app/templates/partials/jobs/status.html
+++ b/app/templates/partials/jobs/status.html
@@ -16,7 +16,7 @@ <h3>{{ job.original_file_name }}</h3>
     </ul>
   </div>
 {% endif %}
-<h2>Delivery Status</h2>
+<h2>Delivery Stadsadatus</h2>
 {% endset %}
 
 <div class="ajax-block-container">
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 04abe1afcc..80a957e144 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -25,13 +25,8 @@ <h1 class="usa-sr-only">Dashboard</h1>
     <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, 'activity') }}
 
-    <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>
 
     <h2 class="line-height-sans-2 margin-bottom-0 margin-top-4">Recent activity</h2>
     <div id="activityChartContainer">

From 9d09f75855d892b9add92cfdf3764bc7ca932fcb Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 9 Jan 2025 16:18:47 -0800
Subject: [PATCH 08/62] draft dash

---
 app/main/views/jobs.py                       | 6 +++---
 app/templates/views/dashboard/dashboard.html | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index 784a37835f..09462d0d62 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -344,7 +344,7 @@ def _get_job_counts(job):
 
 
           ''', dir(job))
-    print(job.notifications_sending)
+    print(job.notification_count)
 
     job_type = job.template_type
     return [
@@ -362,7 +362,7 @@ def _get_job_counts(job):
         for label, query_param, count in [
             [
                 Markup(
-                    f"""total<span class="usa-sr-only">
+                    f"""total notification_count<span class="usa-sr-only">
                     {"text message" if job_type == "sms" else job_type}s</span>"""
                 ),
                 "",
@@ -370,7 +370,7 @@ def _get_job_counts(job):
             ],
             [
                 Markup(
-                    f"""pending--fdsjfisodj<span class="usa-sr-only">
+                    f"""pending notifications_sending<span class="usa-sr-only">
                     {message_count_noun(job.notifications_sending, job_type)}</span>"""
                 ),
                 "pending",
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 80a957e144..04abe1afcc 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -25,8 +25,13 @@ <h1 class="usa-sr-only">Dashboard</h1>
     <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, 'activity') }}
 
+    <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>
 
     <h2 class="line-height-sans-2 margin-bottom-0 margin-top-4">Recent activity</h2>
     <div id="activityChartContainer">

From 30293d97748fff4c0168e82f7b5a012485b13462 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 9 Jan 2025 16:20:33 -0800
Subject: [PATCH 09/62] draft dash

---
 app/assets/javascripts/activityChart.js      | 372 +++++++++----------
 app/main/views/dashboard.py                  |  16 +-
 app/templates/views/dashboard/_activity.html |  10 +
 3 files changed, 209 insertions(+), 189 deletions(-)
 create mode 100644 app/templates/views/dashboard/_activity.html

diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index 1c1238c6b3..438271fa04 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -119,203 +119,203 @@
                 .domain(['delivered', 'failed', 'pending'])
                 .range([COLORS.delivered, COLORS.failed, COLORS.pending]);
 
-        // Create bars with animation
-        const barGroups = svg.selectAll('.bar-group')
-            .data(series)
-            .enter()
-            .append('g')
-            .attr('class', 'bar-group')
-            .attr('fill', d => color(d.key));
-
-        barGroups.selectAll('rect')
-            .data(d => d)
-            .enter()
-            .append('rect')
-            .attr('x', d => x(d.data.label))
-            .attr('y', height)
-            .attr('height', 0)
-            .attr('width', x.bandwidth())
-            .on('mouseover', function(event, d) {
-                const key = d3.select(this.parentNode).datum().key;
-                const capitalizedKey = key.charAt(0).toUpperCase() + key.slice(1);
-                tooltip.style('display', 'block')
-                    .html(`${d.data.label}<br>${capitalizedKey}: ${d.data[key]}`);
-            })
-            .on('mousemove', function(event) {
-                tooltip.style('left', `${event.pageX + 10}px`)
-                    .style('top', `${event.pageY - 20}px`);
-            })
-            .on('mouseout', function() {
-                tooltip.style('display', 'none');
-            })
-            .transition()
-            .duration(1000)
-            .attr('y', d => y(d[1]))
-            .attr('height', d => y(d[0]) - y(d[1]));
-    };
-
-    // Function to create an accessible table
-    const createTable = function(tableId, chartType, labels, deliveredData, failedData) {
-        const table = document.getElementById(tableId);
-        table.innerHTML = ""; // Clear previous data
-
-        const captionText = document.querySelector(`#${chartType} .chart-subtitle`).textContent;
-        const caption = document.createElement('caption');
-        caption.textContent = captionText;
-        const thead = document.createElement('thead');
-        const tbody = document.createElement('tbody');
-
-        // Create table header
-        const headerRow = document.createElement('tr');
-        const headers = ['Day', 'Delivered', 'Failed', 'Pending'];
-        headers.forEach(headerText => {
-            const th = document.createElement('th');
-            th.textContent = headerText;
-            headerRow.appendChild(th);
-        });
-        thead.appendChild(headerRow);
+            // Create bars with animation
+            const barGroups = svg.selectAll('.bar-group')
+                .data(series)
+                .enter()
+                .append('g')
+                .attr('class', 'bar-group')
+                .attr('fill', d => color(d.key));
+
+            barGroups.selectAll('rect')
+                .data(d => d)
+                .enter()
+                .append('rect')
+                .attr('x', d => x(d.data.label))
+                .attr('y', height)
+                .attr('height', 0)
+                .attr('width', x.bandwidth())
+                .on('mouseover', function(event, d) {
+                    const key = d3.select(this.parentNode).datum().key;
+                    const capitalizedKey = key.charAt(0).toUpperCase() + key.slice(1);
+                    tooltip.style('display', 'block')
+                        .html(`${d.data.label}<br>${capitalizedKey}: ${d.data[key]}`);
+                })
+                .on('mousemove', function(event) {
+                    tooltip.style('left', `${event.pageX + 10}px`)
+                        .style('top', `${event.pageY - 20}px`);
+                })
+                .on('mouseout', function() {
+                    tooltip.style('display', 'none');
+                })
+                .transition()
+                .duration(1000)
+                .attr('y', d => y(d[1]))
+                .attr('height', d => y(d[0]) - y(d[1]));
+        };
 
-        // Create table body
-        labels.forEach((label, index) => {
-            const row = document.createElement('tr');
-            const cellDay = document.createElement('td');
-            cellDay.textContent = label;
-            row.appendChild(cellDay);
+        // Function to create an accessible table
+        const createTable = function(tableId, chartType, labels, deliveredData, failedData) {
+            const table = document.getElementById(tableId);
+            table.innerHTML = ""; // Clear previous data
+
+            const captionText = document.querySelector(`#${chartType} .chart-subtitle`).textContent;
+            const caption = document.createElement('caption');
+            caption.textContent = captionText;
+            const thead = document.createElement('thead');
+            const tbody = document.createElement('tbody');
+
+            // Create table header
+            const headerRow = document.createElement('tr');
+            const headers = ['Day', 'Delivered', 'Failed', 'Pending'];
+            headers.forEach(headerText => {
+                const th = document.createElement('th');
+                th.textContent = headerText;
+                headerRow.appendChild(th);
+            });
+            thead.appendChild(headerRow);
+
+            // Create table body
+            labels.forEach((label, index) => {
+                const row = document.createElement('tr');
+                const cellDay = document.createElement('td');
+                cellDay.textContent = label;
+                row.appendChild(cellDay);
+
+                const cellDelivered = document.createElement('td');
+                cellDelivered.textContent = deliveredData[index];
+                row.appendChild(cellDelivered);
+
+                const cellFailed = document.createElement('td');
+                cellFailed.textContent = failedData[index];
+                row.appendChild(cellFailed);
+
+                const cellPending = document.createElement('td');
+                cellPending.textContent = pendingData[index];
+                row.appendChild(cellPending);
+
+                tbody.appendChild(row);
+            });
+
+            table.appendChild(caption);
+            table.appendChild(thead);
+            table.append(tbody);
+        };
 
-            const cellDelivered = document.createElement('td');
-            cellDelivered.textContent = deliveredData[index];
-            row.appendChild(cellDelivered);
+        const fetchData = function(type) {
+            var ctx = document.getElementById('weeklyChart');
+            if (!ctx) {
+                return;
+            }
 
-            const cellFailed = document.createElement('td');
-            cellFailed.textContent = failedData[index];
-            row.appendChild(cellFailed);
+            var url = type === 'service' ? `/daily_stats.json` : `/daily_stats_by_user.json`;
+            return fetch(url)
+                .then(response => {
+                    if (!response.ok) {
+                        throw new Error('Network response was not ok');
+                    }
+                    return response.json();
+                })
+                .then(data => {
+                    labels = [];
+                    deliveredData = [];
+                    failedData = [];
+                    pendingData = [];
+
+                    let totalMessages = 0;
+
+                    for (var dateString in data) {
+                        if (data.hasOwnProperty(dateString)) {
+                            const dateParts = dateString.split('-');
+                            const formattedDate = `${dateParts[1]}/${dateParts[2]}/${dateParts[0].slice(2)}`;
+
+                            labels.push(formattedDate);
+                            deliveredData.push(data[dateString].sms.delivered);
+                            failedData.push(data[dateString].sms.failure);
+                            pendingData.push(data[dateString].sms.pending || 0);
+                            // Calculate the total number of messages
+                            totalMessages += data[dateString].sms.delivered + data[dateString].sms.failure;
+                        }
+                    }
 
-            const cellPending = document.createElement('td');
-            cellPending.textContent = pendingData[index];
-            row.appendChild(cellPending);
+                    // Check if there are no messages sent
+                    const subTitle = document.querySelector(`#activityChartContainer .chart-subtitle`);
+                    if (totalMessages === 0) {
+                        // Remove existing chart and render the alert message
+                        d3.select('#weeklyChart').selectAll('*').remove();
+                        d3.select('#weeklyChart')
+                            .append('div')
+                            .html(`
+                                <div class="usa-alert usa-alert--info usa-alert--slim">
+                                    <div class="usa-alert__body">
+                                        <p class="usa-alert__text">
+                                            No messages sent in the last 7 days
+                                        </p>
+                                    </div>
+                                </div>
+                            `);
+                        // Hide the subtitle
+                        if (subTitle) {
+                            subTitle.style.display = 'none';
+                        }
+                    } else {
+                        // If there are messages, create the chart and table
+                        createChart('#weeklyChart', labels, deliveredData, failedData);
+                        createTable('weeklyTable', 'activityChart', labels, deliveredData, failedData);
+                    }
 
-            tbody.appendChild(row);
-        });
+                    return data;
+                })
+                .catch(error => console.error('Error fetching daily stats:', error));
+        };
+        setInterval(() => fetchData('service'), 10000);
+        const handleDropdownChange = function(event) {
+            const selectedValue = event.target.value;
+            const subTitle = document.querySelector(`#activityChartContainer .chart-subtitle`);
+            const selectElement = document.getElementById('options');
+            const selectedText = selectElement.options[selectElement.selectedIndex].text;
+
+            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`;
+
+            // 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
+        };
 
-        table.appendChild(caption);
-        table.appendChild(thead);
-        table.append(tbody);
-    };
+        document.addEventListener('DOMContentLoaded', function() {
+            // Initialize activityChart chart and table with service data by default
+            fetchData('service');
 
-    const fetchData = function(type) {
-        var ctx = document.getElementById('weeklyChart');
-        if (!ctx) {
-            return;
-        }
-
-        var url = type === 'service' ? `/daily_stats.json` : `/daily_stats_by_user.json`;
-        return fetch(url)
-            .then(response => {
-                if (!response.ok) {
-                    throw new Error('Network response was not ok');
-                }
-                return response.json();
-            })
-            .then(data => {
-                labels = [];
-                deliveredData = [];
-                failedData = [];
-                pendingData = [];
-
-                let totalMessages = 0;
-
-                for (var dateString in data) {
-                    if (data.hasOwnProperty(dateString)) {
-                        const dateParts = dateString.split('-');
-                        const formattedDate = `${dateParts[1]}/${dateParts[2]}/${dateParts[0].slice(2)}`;
-
-                        labels.push(formattedDate);
-                        deliveredData.push(data[dateString].sms.delivered);
-                        failedData.push(data[dateString].sms.failure);
-                        pendingData.push(data[dateString].sms.pending || 0);
-                        // Calculate the total number of messages
-                        totalMessages += data[dateString].sms.delivered + data[dateString].sms.failure;
-                    }
-                }
+            // Add event listener to the dropdown
+            const dropdown = document.getElementById('options');
+            dropdown.addEventListener('change', handleDropdownChange);
+        });
 
-                // Check if there are no messages sent
-                const subTitle = document.querySelector(`#activityChartContainer .chart-subtitle`);
-                if (totalMessages === 0) {
-                    // Remove existing chart and render the alert message
-                    d3.select('#weeklyChart').selectAll('*').remove();
-                    d3.select('#weeklyChart')
-                        .append('div')
-                        .html(`
-                            <div class="usa-alert usa-alert--info usa-alert--slim">
-                                <div class="usa-alert__body">
-                                    <p class="usa-alert__text">
-                                        No messages sent in the last 7 days
-                                    </p>
-                                </div>
-                            </div>
-                        `);
-                    // Hide the subtitle
-                    if (subTitle) {
-                        subTitle.style.display = 'none';
-                    }
-                } else {
-                    // If there are messages, create the chart and table
+            // Resize chart on window resize
+            window.addEventListener('resize', function() {
+                if (labels.length > 0 && deliveredData.length > 0 && failedData.length > 0) {
                     createChart('#weeklyChart', labels, deliveredData, failedData);
                     createTable('weeklyTable', 'activityChart', labels, deliveredData, failedData);
                 }
+            });
 
-                return data;
-            })
-            .catch(error => console.error('Error fetching daily stats:', error));
-    };
-    // setInterval(() => fetchData('service'), 1000);
-    const handleDropdownChange = function(event) {
-        const selectedValue = event.target.value;
-        const subTitle = document.querySelector(`#activityChartContainer .chart-subtitle`);
-        const selectElement = document.getElementById('options');
-        const selectedText = selectElement.options[selectElement.selectedIndex].text;
-
-        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`;
-
-        // 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');
-
-        // Add event listener to the dropdown
-        const dropdown = document.getElementById('options');
-        dropdown.addEventListener('change', handleDropdownChange);
-    });
-
-        // Resize chart on window resize
-        window.addEventListener('resize', function() {
-            if (labels.length > 0 && deliveredData.length > 0 && failedData.length > 0) {
-                createChart('#weeklyChart', labels, deliveredData, failedData);
-                createTable('weeklyTable', 'activityChart', labels, deliveredData, failedData);
-            }
-        });
-
-        // Export functions for testing
-        window.createChart = createChart;
-        window.createTable = createTable;
-        window.handleDropdownChange = handleDropdownChange;
-        window.fetchData = fetchData;
-    }
+            // Export functions for testing
+            window.createChart = createChart;
+            window.createTable = createTable;
+            window.handleDropdownChange = handleDropdownChange;
+            window.fetchData = fetchData;
+        }
 
 })(window);
diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index ce10d5f772..8ae5ce0b8f 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -48,8 +48,16 @@ def service_dashboard(service_id):
     if not current_user.has_permissions("view_activity"):
         return redirect(url_for("main.choose_template", service_id=service_id))
 
-
-
+    yearly_usage = billing_api_client.get_annual_usage_for_service(
+        service_id,
+        get_current_financial_year(),
+    )
+    free_sms_allowance = billing_api_client.get_free_sms_fragment_limit_for_year(
+        current_service.id,
+    )
+    usage_data = get_annual_usage_breakdown(yearly_usage, free_sms_allowance)
+    sms_sent = usage_data["sms_sent"]
+    sms_allowance_remaining = usage_data["sms_allowance_remaining"]
 
     job_response = job_api_client.get_jobs(service_id)["data"]
     service_data_retention_days = 7
@@ -81,6 +89,8 @@ def service_dashboard(service_id):
         partials=get_dashboard_partials(service_id),
         jobs=jobs,
         service_data_retention_days=service_data_retention_days,
+        sms_sent=sms_sent,
+        sms_allowance_remaining=sms_allowance_remaining,
     )
 
 
@@ -342,7 +352,7 @@ def aggregate_notifications_stats(template_statistics):
 def fetch_daily_stats(service_id):
     date_range = get_stats_date_range()
     stats = service_api_client.get_service_notification_statistics_by_day(
-        service_id, start_date='2024-12-31', days=date_range["days"]
+        service_id, start_date='2025-01-09', days=date_range["days"]
     )
     return stats
 
diff --git a/app/templates/views/dashboard/_activity.html b/app/templates/views/dashboard/_activity.html
new file mode 100644
index 0000000000..efd57f4f0a
--- /dev/null
+++ b/app/templates/views/dashboard/_activity.html
@@ -0,0 +1,10 @@
+<div class="ajax-block-container">
+  <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>

From 6d008d4e45414f7839528eab1369132a0f61a3c7 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 13 Jan 2025 15:54:04 -0800
Subject: [PATCH 10/62] clean up

---
 app/assets/javascripts/activityChart.js      | 380 ++++++++++---------
 app/main/views/dashboard.py                  |  49 +--
 app/main/views/jobs.py                       |  16 +-
 app/notify_client/job_api_client.py          |   2 +-
 app/templates/components/big-number.html     |   1 -
 app/templates/components/pill.html           |   1 -
 app/templates/partials/count.html            |   1 -
 app/templates/partials/jobs/status.html      |   2 +-
 app/templates/views/dashboard/dashboard.html |   1 +
 9 files changed, 209 insertions(+), 244 deletions(-)

diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index 438271fa04..820e47a168 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -13,7 +13,7 @@
         const FONT_WEIGHT = 'bold';
         const MAX_Y = 120;
 
-        const createChart = function(containerId, labels, deliveredData, failedData) {
+        const createChart = function(containerId, labels, deliveredData, failedData, pendingData) {
             const container = d3.select(containerId);
             container.selectAll('*').remove(); // Clear any existing content
 
@@ -36,7 +36,7 @@
             }
 
             // Calculate total messages
-            const totalMessages = d3.sum(deliveredData) + d3.sum(failedData);
+            const totalMessages = d3.sum(deliveredData) + d3.sum(failedData) + d3.sum(pendingData);
 
             // Create legend only if there are messages
             const legendContainer = d3.select('.chart-legend');
@@ -78,8 +78,9 @@
                 .range([0, width])
                 .padding(0.1);
                             // Adjust the y-axis domain to add some space above the tallest bar
-            const maxY = d3.max(deliveredData.map((d, i) => d + (failedData[i] || 0)));
-            const y = d3.scaleSqrt()
+            const maxY = d3.max(deliveredData.map((d, i) => d + (failedData[i] || 0) + (pendingData[i] || 0)));
+
+            const y = d3.scaleSymlog()
                 .domain([0, maxY + 2]) // Add 2 units of space at the top
                 .nice()
                 .range([height, 0]);
@@ -91,7 +92,7 @@
 
             // Generate the y-axis with whole numbers
             const yAxis = d3.axisLeft(y)
-                .ticks(Math.min(maxY + 2, 10)) // Generate up to 10 ticks based on the data
+                .ticks(Math.min(maxY + 2, 3))
                 .tickFormat(d3.format('d')); // Ensure whole numbers on the y-axis
 
             svg.append('g')
@@ -102,7 +103,7 @@
             const stackData = labels.map((label, i) => ({
                 label: label,
                 delivered: deliveredData[i],
-                failed: failedData[i] || 0, // Ensure there's a value for failed, even if it's 0
+                failed: failedData[i] || 0,
                 pending: pendingData[i] || 0
             }));
 
@@ -119,149 +120,150 @@
                 .domain(['delivered', 'failed', 'pending'])
                 .range([COLORS.delivered, COLORS.failed, COLORS.pending]);
 
-            // Create bars with animation
-            const barGroups = svg.selectAll('.bar-group')
-                .data(series)
-                .enter()
-                .append('g')
-                .attr('class', 'bar-group')
-                .attr('fill', d => color(d.key));
-
-            barGroups.selectAll('rect')
-                .data(d => d)
-                .enter()
-                .append('rect')
-                .attr('x', d => x(d.data.label))
-                .attr('y', height)
-                .attr('height', 0)
-                .attr('width', x.bandwidth())
-                .on('mouseover', function(event, d) {
-                    const key = d3.select(this.parentNode).datum().key;
-                    const capitalizedKey = key.charAt(0).toUpperCase() + key.slice(1);
-                    tooltip.style('display', 'block')
-                        .html(`${d.data.label}<br>${capitalizedKey}: ${d.data[key]}`);
-                })
-                .on('mousemove', function(event) {
-                    tooltip.style('left', `${event.pageX + 10}px`)
-                        .style('top', `${event.pageY - 20}px`);
-                })
-                .on('mouseout', function() {
-                    tooltip.style('display', 'none');
-                })
-                .transition()
-                .duration(1000)
-                .attr('y', d => y(d[1]))
-                .attr('height', d => y(d[0]) - y(d[1]));
-        };
+        // Create bars with animation
+        const barGroups = svg.selectAll('.bar-group')
+            .data(series)
+            .enter()
+            .append('g')
+            .attr('class', 'bar-group')
+            .attr('fill', d => color(d.key));
+
+        barGroups.selectAll('rect')
+            .data(d => d)
+            .enter()
+            .append('rect')
+            .attr('x', d => x(d.data.label))
+            .attr('y', height)
+            .attr('height', 0)
+            .attr('width', x.bandwidth())
+            .on('mouseover', function(event, d) {
+                const key = d3.select(this.parentNode).datum().key;
+                const capitalizedKey = key.charAt(0).toUpperCase() + key.slice(1);
+                tooltip.style('display', 'block')
+                    .html(`${d.data.label}<br>${capitalizedKey}: ${d.data[key]}`);
+            })
+            .on('mousemove', function(event) {
+                tooltip.style('left', `${event.pageX + 10}px`)
+                    .style('top', `${event.pageY - 20}px`);
+            })
+            .on('mouseout', function() {
+                tooltip.style('display', 'none');
+            })
+            .transition()
+            .duration(1000)
+            .attr('y', d => y(d[1]))
+            .attr('height', d => y(d[0]) - y(d[1]));
+    };
+
+    // Function to create an accessible table
+    const createTable = function(tableId, chartType, labels, deliveredData, failedData, pendingData) {
+        const table = document.getElementById(tableId);
+        table.innerHTML = ""; // Clear previous data
+
+        const captionText = document.querySelector(`#${chartType} .chart-subtitle`).textContent;
+        const caption = document.createElement('caption');
+        caption.textContent = captionText;
+        const thead = document.createElement('thead');
+        const tbody = document.createElement('tbody');
+
+        // Create table header
+        const headerRow = document.createElement('tr');
+        const headers = ['Day', 'Delivered', 'Failed', 'Pending'];
+        headers.forEach(headerText => {
+            const th = document.createElement('th');
+            th.textContent = headerText;
+            headerRow.appendChild(th);
+        });
+        thead.appendChild(headerRow);
 
-        // Function to create an accessible table
-        const createTable = function(tableId, chartType, labels, deliveredData, failedData) {
-            const table = document.getElementById(tableId);
-            table.innerHTML = ""; // Clear previous data
-
-            const captionText = document.querySelector(`#${chartType} .chart-subtitle`).textContent;
-            const caption = document.createElement('caption');
-            caption.textContent = captionText;
-            const thead = document.createElement('thead');
-            const tbody = document.createElement('tbody');
-
-            // Create table header
-            const headerRow = document.createElement('tr');
-            const headers = ['Day', 'Delivered', 'Failed', 'Pending'];
-            headers.forEach(headerText => {
-                const th = document.createElement('th');
-                th.textContent = headerText;
-                headerRow.appendChild(th);
-            });
-            thead.appendChild(headerRow);
-
-            // Create table body
-            labels.forEach((label, index) => {
-                const row = document.createElement('tr');
-                const cellDay = document.createElement('td');
-                cellDay.textContent = label;
-                row.appendChild(cellDay);
-
-                const cellDelivered = document.createElement('td');
-                cellDelivered.textContent = deliveredData[index];
-                row.appendChild(cellDelivered);
-
-                const cellFailed = document.createElement('td');
-                cellFailed.textContent = failedData[index];
-                row.appendChild(cellFailed);
-
-                const cellPending = document.createElement('td');
-                cellPending.textContent = pendingData[index];
-                row.appendChild(cellPending);
-
-                tbody.appendChild(row);
-            });
-
-            table.appendChild(caption);
-            table.appendChild(thead);
-            table.append(tbody);
-        };
+        // Create table body
+        labels.forEach((label, index) => {
+            const row = document.createElement('tr');
+            const cellDay = document.createElement('td');
+            cellDay.textContent = label;
+            row.appendChild(cellDay);
 
-        const fetchData = function(type) {
-            var ctx = document.getElementById('weeklyChart');
-            if (!ctx) {
-                return;
-            }
+            const cellDelivered = document.createElement('td');
+            cellDelivered.textContent = deliveredData[index];
+            row.appendChild(cellDelivered);
 
-            var url = type === 'service' ? `/daily_stats.json` : `/daily_stats_by_user.json`;
-            return fetch(url)
-                .then(response => {
-                    if (!response.ok) {
-                        throw new Error('Network response was not ok');
-                    }
-                    return response.json();
-                })
-                .then(data => {
-                    labels = [];
-                    deliveredData = [];
-                    failedData = [];
-                    pendingData = [];
-
-                    let totalMessages = 0;
-
-                    for (var dateString in data) {
-                        if (data.hasOwnProperty(dateString)) {
-                            const dateParts = dateString.split('-');
-                            const formattedDate = `${dateParts[1]}/${dateParts[2]}/${dateParts[0].slice(2)}`;
-
-                            labels.push(formattedDate);
-                            deliveredData.push(data[dateString].sms.delivered);
-                            failedData.push(data[dateString].sms.failure);
-                            pendingData.push(data[dateString].sms.pending || 0);
-                            // Calculate the total number of messages
-                            totalMessages += data[dateString].sms.delivered + data[dateString].sms.failure;
-                        }
+            const cellFailed = document.createElement('td');
+            cellFailed.textContent = failedData[index];
+            row.appendChild(cellFailed);
+
+            const cellPending = document.createElement('td');
+            cellPending.textContent = pendingData[index];
+            row.appendChild(cellPending);
+
+            tbody.appendChild(row);
+        });
+
+        table.appendChild(caption);
+        table.appendChild(thead);
+        table.append(tbody);
+    };
+
+    const fetchData = function(type) {
+        var ctx = document.getElementById('weeklyChart');
+        if (!ctx) {
+            return;
+        }
+
+        var url = type === 'service' ? `/daily_stats.json` : `/daily_stats_by_user.json`;
+        return fetch(url)
+            .then(response => {
+                if (!response.ok) {
+                    throw new Error('Network response was not ok');
+                }
+                return response.json();
+            })
+            .then(data => {
+                labels = [];
+                deliveredData = [];
+                failedData = [];
+                pendingData = [];
+                let totalMessages = 0;
+
+                for (var dateString in data) {
+                    if (data.hasOwnProperty(dateString)) {
+                        const dateParts = dateString.split('-');
+                        const formattedDate = `${dateParts[1]}/${dateParts[2]}/${dateParts[0].slice(2)}`;
+
+                        labels.push(formattedDate);
+                        deliveredData.push(data[dateString].sms.delivered);
+                        failedData.push(data[dateString].sms.failure);
+                        pendingData.push(data[dateString].sms.pending || 0);
+                        totalMessages += data[dateString].sms.delivered + data[dateString].sms.failure + data[dateString].sms.pending;
+
+                        // Calculate the total number of messages
+                        totalMessages += data[dateString].sms.delivered + data[dateString].sms.failure;
                     }
+                }
 
-                    // Check if there are no messages sent
-                    const subTitle = document.querySelector(`#activityChartContainer .chart-subtitle`);
-                    if (totalMessages === 0) {
-                        // Remove existing chart and render the alert message
-                        d3.select('#weeklyChart').selectAll('*').remove();
-                        d3.select('#weeklyChart')
-                            .append('div')
-                            .html(`
-                                <div class="usa-alert usa-alert--info usa-alert--slim">
-                                    <div class="usa-alert__body">
-                                        <p class="usa-alert__text">
-                                            No messages sent in the last 7 days
-                                        </p>
-                                    </div>
+                // Check if there are no messages sent
+                const subTitle = document.querySelector(`#activityChartContainer .chart-subtitle`);
+                if (totalMessages === 0) {
+                    // Remove existing chart and render the alert message
+                    d3.select('#weeklyChart').selectAll('*').remove();
+                    d3.select('#weeklyChart')
+                        .append('div')
+                        .html(`
+                            <div class="usa-alert usa-alert--info usa-alert--slim">
+                                <div class="usa-alert__body">
+                                    <p class="usa-alert__text">
+                                        No messages sent in the last 7 days
+                                    </p>
                                 </div>
-                            `);
-                        // Hide the subtitle
-                        if (subTitle) {
-                            subTitle.style.display = 'none';
-                        }
-                    } else {
-                        // If there are messages, create the chart and table
-                        createChart('#weeklyChart', labels, deliveredData, failedData);
-                        createTable('weeklyTable', 'activityChart', labels, deliveredData, failedData);
+                            </div>
+                        `);
+                    // Hide the subtitle
+                    if (subTitle) {
+                        subTitle.style.display = 'none';
+                    }
+                } else {
+                    // If there are messages, create the chart and table
+                    createChart('#weeklyChart', labels, deliveredData, failedData, pendingData);
+                    createTable('weeklyTable', 'activityChart', labels, deliveredData, failedData, pendingData);
                     }
 
                     return data;
@@ -269,53 +271,53 @@
                 .catch(error => console.error('Error fetching daily stats:', error));
         };
         setInterval(() => fetchData('service'), 10000);
-        const handleDropdownChange = function(event) {
-            const selectedValue = event.target.value;
-            const subTitle = document.querySelector(`#activityChartContainer .chart-subtitle`);
-            const selectElement = document.getElementById('options');
-            const selectedText = selectElement.options[selectElement.selectedIndex].text;
-
-            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`;
-
-            // 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');
-
-            // Add event listener to the dropdown
-            const dropdown = document.getElementById('options');
-            dropdown.addEventListener('change', handleDropdownChange);
+    const handleDropdownChange = function(event) {
+        const selectedValue = event.target.value;
+        const subTitle = document.querySelector(`#activityChartContainer .chart-subtitle`);
+        const selectElement = document.getElementById('options');
+        const selectedText = selectElement.options[selectElement.selectedIndex].text;
+
+        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`;
+
+        // 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');
+
+        // Add event listener to the dropdown
+        const dropdown = document.getElementById('options');
+        dropdown.addEventListener('change', handleDropdownChange);
+    });
+
+        // Resize chart on window resize
+        window.addEventListener('resize', function() {
+            if (labels.length > 0 && deliveredData.length > 0 && failedData.length > 0 && pendingData.length > 0) {
+                createChart('#weeklyChart', labels, deliveredData, failedData, pendingData);
+                createTable('weeklyTable', 'activityChart', labels, deliveredData, failedData, pendingData);
+            }
         });
 
-            // Resize chart on window resize
-            window.addEventListener('resize', function() {
-                if (labels.length > 0 && deliveredData.length > 0 && failedData.length > 0) {
-                    createChart('#weeklyChart', labels, deliveredData, failedData);
-                    createTable('weeklyTable', 'activityChart', labels, deliveredData, failedData);
-                }
-            });
-
-            // Export functions for testing
-            window.createChart = createChart;
-            window.createTable = createTable;
-            window.handleDropdownChange = handleDropdownChange;
-            window.fetchData = fetchData;
-        }
+        // Export functions for testing
+        window.createChart = createChart;
+        window.createTable = createTable;
+        window.handleDropdownChange = handleDropdownChange;
+        window.fetchData = fetchData;
+    }
 
 })(window);
diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 8ae5ce0b8f..8013acb9d2 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -94,8 +94,19 @@ def service_dashboard(service_id):
     )
 
 
-@main.route("/services/<uuid:service_id>/daily_stats_by_user.json")
-def get_daily_stats_by_user(service_id):
+@main.route("/daily_stats.json")
+def get_daily_stats():
+    service_id = session.get("service_id")
+    date_range = get_stats_date_range()
+
+    stats = service_api_client.get_service_notification_statistics_by_day(
+        service_id, start_date=date_range["start_date"], days=date_range["days"]
+    )
+    return jsonify(stats)
+
+
+@main.route("/daily_stats_by_user.json")
+def get_daily_stats_by_user():
     service_id = session.get("service_id")
     date_range = get_stats_date_range()
     user_id = current_user.id
@@ -349,35 +360,7 @@ def aggregate_notifications_stats(template_statistics):
     return notifications
 
 
-def fetch_daily_stats(service_id):
-    date_range = get_stats_date_range()
-    stats = service_api_client.get_service_notification_statistics_by_day(
-        service_id, start_date='2025-01-09', days=date_range["days"]
-    )
-    return stats
-
-# Route using the helper
-@main.route("/daily_stats.json")
-def get_daily_stats():
-    service_id = session.get("service_id")
-    stats = fetch_daily_stats(service_id)  # Use the helper
-    return jsonify(stats)
-
-
 def get_dashboard_partials(service_id):
-    date_range = get_stats_date_range()
-    yearly_usage = billing_api_client.get_annual_usage_for_service(
-        service_id,
-        get_current_financial_year(),
-    )
-    free_sms_allowance = billing_api_client.get_free_sms_fragment_limit_for_year(
-        current_service.id,
-    )
-
-    usage_data = get_annual_usage_breakdown(yearly_usage, free_sms_allowance)
-    sms_sent = usage_data["sms_sent"]
-    sms_allowance_remaining = usage_data["sms_allowance_remaining"]
-    activityStats = fetch_daily_stats
     all_statistics = template_statistics_client.get_template_statistics_for_service(
         service_id, limit_days=7
     )
@@ -401,12 +384,6 @@ def get_dashboard_partials(service_id):
         get_current_financial_year(),
     )
     return {
-        "activity": render_template(
-            "views/dashboard/_activity.html",
-            activityStats=activityStats,
-            sms_sent=sms_sent,
-            sms_allowance_remaining=sms_allowance_remaining,
-        ),
         "upcoming": render_template(
             "views/dashboard/_upcoming.html",
         ),
diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index 09462d0d62..dddf838a1c 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -334,18 +334,6 @@ def get_status_filters(service, message_type, statistics):
 
 
 def _get_job_counts(job):
-    print('''
-
-
-
-          job
-
-
-
-
-          ''', dir(job))
-    print(job.notification_count)
-
     job_type = job.template_type
     return [
         (
@@ -362,7 +350,7 @@ def _get_job_counts(job):
         for label, query_param, count in [
             [
                 Markup(
-                    f"""total notification_count<span class="usa-sr-only">
+                    f"""total<span class="usa-sr-only">
                     {"text message" if job_type == "sms" else job_type}s</span>"""
                 ),
                 "",
@@ -370,7 +358,7 @@ def _get_job_counts(job):
             ],
             [
                 Markup(
-                    f"""pending notifications_sending<span class="usa-sr-only">
+                    f"""pending<span class="usa-sr-only">
                     {message_count_noun(job.notifications_sending, job_type)}</span>"""
                 ),
                 "pending",
diff --git a/app/notify_client/job_api_client.py b/app/notify_client/job_api_client.py
index 2cf8f9b6d0..9a06e16bfa 100644
--- a/app/notify_client/job_api_client.py
+++ b/app/notify_client/job_api_client.py
@@ -28,7 +28,7 @@ class JobApiClient(NotifyAdminAPIClient):
     def get_job(self, service_id, job_id):
         params = {}
         job = self.get(url=f"/service/{service_id}/job/{job_id}", params=params)
-    # comment
+
         return job
 
     def get_jobs(self, service_id, *, limit_days=None, statuses=None, page=1):
diff --git a/app/templates/components/big-number.html b/app/templates/components/big-number.html
index ff050d15cd..fcb89b7e93 100644
--- a/app/templates/components/big-number.html
+++ b/app/templates/components/big-number.html
@@ -2,7 +2,6 @@
   {% if link %}
     <a class="usa-link display-flex" href="{{ link }}">
   {% endif %}
-  big number
       <span class="big-number{% if smaller %}-smaller{% endif %}{% if smallest %}-smallest{% endif %}">
         <span class="big-number-number">
           {% if number is number %}
diff --git a/app/templates/components/pill.html b/app/templates/components/pill.html
index 8570d6fa9f..bb1bb033aa 100644
--- a/app/templates/components/pill.html
+++ b/app/templates/components/pill.html
@@ -8,7 +8,6 @@
 ) %}
   <nav aria-labelledby='page-header'>
     <ul class='pill'>
-      Pill
       {% for label, option, link, count in items %}
         <li class="pill-item__container">
         {% if current_value == option %}
diff --git a/app/templates/partials/count.html b/app/templates/partials/count.html
index ebdbe04504..188884cdfe 100644
--- a/app/templates/partials/count.html
+++ b/app/templates/partials/count.html
@@ -2,7 +2,6 @@
 
 <div class="ajax-block-container">
   <div class="tabs">
-    count
     {{ pill(counts, request.args.get('status', '')) }}
   </div>
 </div>
diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html
index e3056a89ab..fb0a745f8d 100644
--- a/app/templates/partials/jobs/status.html
+++ b/app/templates/partials/jobs/status.html
@@ -16,7 +16,7 @@ <h3>{{ job.original_file_name }}</h3>
     </ul>
   </div>
 {% endif %}
-<h2>Delivery Stadsadatus</h2>
+<h2>Delivery Status</h2>
 {% endset %}
 
 <div class="ajax-block-container">
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 04abe1afcc..ba236ce21a 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -33,6 +33,7 @@ <h2 id="chartTitle">Total messages</h2>
     </div>
     <div id="totalMessageTable" class="margin-0"></div>
 
+
     <h2 class="line-height-sans-2 margin-bottom-0 margin-top-4">Recent activity</h2>
     <div id="activityChartContainer">
       <form class="usa-form">

From ce87e2162b9f2749ede78b4cd4da5ea1b0db04e7 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 13 Jan 2025 22:40:58 -0800
Subject: [PATCH 11/62] clean up

---
 app/formatters.py                            |  2 +-
 app/templates/views/dashboard/_activity.html | 10 ----------
 app/templates/views/dashboard/dashboard.html |  1 -
 3 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 app/templates/views/dashboard/_activity.html

diff --git a/app/formatters.py b/app/formatters.py
index 448e5d6cb6..c427c2a9a9 100644
--- a/app/formatters.py
+++ b/app/formatters.py
@@ -493,7 +493,7 @@ def message_count_noun(count, template_type):
 
 
 def message_count(count, template_type):
-    return f"format_message_count{format_thousands(count)} " f"{message_count_noun(count, template_type)}"
+    return f"{format_thousands(count)} " f"{message_count_noun(count, template_type)}"
 
 
 def recipient_count_label(count, template_type):
diff --git a/app/templates/views/dashboard/_activity.html b/app/templates/views/dashboard/_activity.html
deleted file mode 100644
index efd57f4f0a..0000000000
--- a/app/templates/views/dashboard/_activity.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="ajax-block-container">
-  <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>
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index ba236ce21a..04abe1afcc 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -33,7 +33,6 @@ <h2 id="chartTitle">Total messages</h2>
     </div>
     <div id="totalMessageTable" class="margin-0"></div>
 
-
     <h2 class="line-height-sans-2 margin-bottom-0 margin-top-4">Recent activity</h2>
     <div id="activityChartContainer">
       <form class="usa-form">

From 2159a9ddc51e20af805b7ebcccfcdec2ea3e9610 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 14 Jan 2025 11:48:23 -0800
Subject: [PATCH 12/62] clean up

---
 app/assets/javascripts/activityChart.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index 820e47a168..d1248a8a7c 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -235,7 +235,6 @@
                         pendingData.push(data[dateString].sms.pending || 0);
                         totalMessages += data[dateString].sms.delivered + data[dateString].sms.failure + data[dateString].sms.pending;
 
-                        // Calculate the total number of messages
                         totalMessages += data[dateString].sms.delivered + data[dateString].sms.failure;
                     }
                 }

From 5c0eb91dd47608b8a6d9ae01bb2ba5545ad7c7ca Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 14 Jan 2025 12:14:35 -0800
Subject: [PATCH 13/62] poetry

---
 app/assets/javascripts/activityChart.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index d1248a8a7c..820e47a168 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -235,6 +235,7 @@
                         pendingData.push(data[dateString].sms.pending || 0);
                         totalMessages += data[dateString].sms.delivered + data[dateString].sms.failure + data[dateString].sms.pending;
 
+                        // Calculate the total number of messages
                         totalMessages += data[dateString].sms.delivered + data[dateString].sms.failure;
                     }
                 }

From 5e61fb831dffbe6c3d471b9aa82b04869d62f2e0 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 14 Jan 2025 13:10:48 -0800
Subject: [PATCH 14/62] jest test

---
 package-lock.json                       | 2105 +++++------------------
 package.json                            |    2 +-
 tests/javascripts/activityChart.test.js |  131 +-
 3 files changed, 524 insertions(+), 1714 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c30a37eddd..288320e755 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -45,7 +45,7 @@
         "gulp-jshint": "2.1.0",
         "gulp-prettyerror": "2.0.0",
         "gulp-uglify": "3.0.2",
-        "jest": "29.7.0",
+        "jest": "^29.7.0",
         "jest-each": "^29.2.1",
         "jest-environment-jsdom": "^29.2.2",
         "jshint": "2.13.6",
@@ -524,6 +524,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
       "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -536,6 +537,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
       "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -548,6 +550,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
       "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.12.13"
       },
@@ -555,6 +558,22 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-syntax-import-assertions": {
       "version": "7.26.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.26.0.tgz",
@@ -590,6 +609,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
       "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -602,6 +622,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
       "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -610,12 +631,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-jsx": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.7.tgz",
-      "integrity": "sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz",
+      "integrity": "sha512-ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -629,6 +651,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
       "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -641,6 +664,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
       "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -653,6 +677,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
       "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.10.4"
       },
@@ -665,6 +690,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
       "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -677,6 +703,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
       "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -689,6 +716,7 @@
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
       "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.8.0"
       },
@@ -696,11 +724,28 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-syntax-top-level-await": {
       "version": "7.14.5",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
       "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
       },
@@ -712,12 +757,13 @@
       }
     },
     "node_modules/@babel/plugin-syntax-typescript": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.24.7.tgz",
-      "integrity": "sha512-c/+fVeJBB0FeKsFvwytYiUD+LBvhHjGSI0g446PRGdSVGZLRNArBUno2PETbAly3tpiNAQR5XaZ+JslxkotsbA==",
+      "version": "7.25.9",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
+      "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.24.7"
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1689,7 +1735,8 @@
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@bufbuild/protobuf": {
       "version": "2.2.3",
@@ -1722,6 +1769,7 @@
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
       "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "camelcase": "^5.3.1",
         "find-up": "^4.1.0",
@@ -1738,6 +1786,7 @@
       "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
       "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -1747,6 +1796,7 @@
       "resolved": "https://registry.npmjs.org/@jest/console/-/console-29.7.0.tgz",
       "integrity": "sha512-5Ni4CU7XHQi32IJ398EEP4RrB8eV09sXP2ROqD4bksHrnTree52PsxvX8tpL8LvTZ3pFzXyPbNQReSN41CAhOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/node": "*",
@@ -1759,72 +1809,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/console/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/console/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/console/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/console/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/console/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/core": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/core/-/core-29.7.0.tgz",
       "integrity": "sha512-n7aeXWKMnGtDA48y8TLWJPJmLmmZ642Ceo78cYWEpiD7FzDgmNDV/GCVRorPABdXLJZ/9wzzgZAlHjXjxDHGsg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/reporters": "^29.7.0",
@@ -1867,67 +1857,6 @@
         }
       }
     },
-    "node_modules/@jest/core/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/core/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/core/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/core/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/environment": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-29.7.0.tgz",
@@ -1948,6 +1877,7 @@
       "resolved": "https://registry.npmjs.org/@jest/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-8uMeAMycttpva3P1lBHB8VciS9V0XAr3GymPpipdyQXbBcuhkLQOSe8E/p92RyAdToS6ZD1tFkX+CkhoECE0dQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "expect": "^29.7.0",
         "jest-snapshot": "^29.7.0"
@@ -1961,6 +1891,7 @@
       "resolved": "https://registry.npmjs.org/@jest/expect-utils/-/expect-utils-29.7.0.tgz",
       "integrity": "sha512-GlsNBWiFQFCVi9QVSx7f5AgMeLxe9YCCs5PuP2O2LdjDAA8Jh9eX7lA1Jq/xdXw3Wb3hyvlFNfZIfcRetSzYcA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jest-get-type": "^29.6.3"
       },
@@ -1990,6 +1921,7 @@
       "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-29.7.0.tgz",
       "integrity": "sha512-mpiz3dutLbkW2MNFubUGUEVLkTGiqW6yLVTA+JbP6fI6J5iL9Y0Nlg8k95pcF8ctKwCS7WVxteBs29hhfAotzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -2005,6 +1937,7 @@
       "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-29.7.0.tgz",
       "integrity": "sha512-DApq0KJbJOEzAFYjHADNNxAE3KbhxQB1y5Kplb5Waqw6zVbuWatSnMjE5gs8FUgEPmNsnZA3NCWl9NG0ia04Pg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@bcoe/v8-coverage": "^0.2.3",
         "@jest/console": "^29.7.0",
@@ -2043,95 +1976,6 @@
         }
       }
     },
-    "node_modules/@jest/reporters/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/reporters/node_modules/istanbul-lib-instrument": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
-      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/core": "^7.23.9",
-        "@babel/parser": "^7.23.9",
-        "@istanbuljs/schema": "^0.1.3",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@jest/reporters/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/schemas": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
@@ -2149,6 +1993,7 @@
       "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-29.6.3.tgz",
       "integrity": "sha512-MHjT95QuipcPrpLM+8JMSzFx6eHp5Bm+4XeFDJlwsvVBjmKNiIAvasGK2fxz2WbGRlnvqehFbh07MMa7n3YJnw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.18",
         "callsites": "^3.0.0",
@@ -2163,6 +2008,7 @@
       "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-29.7.0.tgz",
       "integrity": "sha512-Fdx+tv6x1zlkJPcWXmMDAG2HBnaR9XPSd5aDWQVsfrZmLVT3lU1cwyxLgRmXR9yrq4NBoEm9BMsfgFzTQAbJYA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -2178,6 +2024,7 @@
       "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-29.7.0.tgz",
       "integrity": "sha512-GQwJ5WZVrKnOJuiYiAF52UNUJXgTZx1NHjFSEB0qEMmSZKAkdMoIzw/Cj6x6NF4AvV23AUqDpFzQkN/eYCYTxw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "graceful-fs": "^4.2.9",
@@ -2193,6 +2040,7 @@
       "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-29.7.0.tgz",
       "integrity": "sha512-ok/BTPFzFKVMwO5eOHRrvnBVHdRy9IrsrW1GpMaQ9MCnilNLXQKmAX8s1YXDFaai9xJpac2ySzV0YeRRECr2Vw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/types": "^29.6.3",
@@ -2214,67 +2062,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/transform/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/transform/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/transform/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jest/types": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/@jest/types/-/types-29.6.3.tgz",
@@ -2292,67 +2079,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/@jest/types/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@jest/types/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/@jest/types/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/@jest/types/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/@jest/types/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
@@ -2904,6 +2630,7 @@
       "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
       "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.20.7",
         "@babel/types": "^7.20.7",
@@ -2917,6 +2644,7 @@
       "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
       "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.0.0"
       }
@@ -2926,6 +2654,7 @@
       "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
       "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.1.0",
         "@babel/types": "^7.0.0"
@@ -2936,6 +2665,7 @@
       "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.6.tgz",
       "integrity": "sha512-r1bzfrm0tomOI8g1SzvCaQHo6Lcv6zu0EA+W2kHrt8dyrHQxGzBBL4kdkzIS+jBMV+EYcMAEAqXqYaLJq5rOZg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/types": "^7.20.7"
       }
@@ -2956,6 +2686,7 @@
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
       "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*"
       }
@@ -3596,6 +3327,7 @@
       "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
       "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "type-fest": "^0.21.3"
       },
@@ -3639,6 +3371,22 @@
         "node": ">=8"
       }
     },
+    "node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
     "node_modules/ansi-wrap": {
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz",
@@ -3690,6 +3438,7 @@
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
       "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "sprintf-js": "~1.0.2"
       }
@@ -3873,6 +3622,7 @@
       "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-29.7.0.tgz",
       "integrity": "sha512-BrvGY3xZSwEcCzKvKsCi2GgHqDqsYkOP4/by5xCgIwGXQxIEh+8ew3gmrE1y7XRR6LHZIj6yLYnUi/mm2KXKBg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/transform": "^29.7.0",
         "@types/babel__core": "^7.1.14",
@@ -3889,72 +3639,12 @@
         "@babel/core": "^7.8.0"
       }
     },
-    "node_modules/babel-jest/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/babel-jest/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/babel-jest/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/babel-jest/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/babel-jest/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
       "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.0.0",
         "@istanbuljs/load-nyc-config": "^1.0.0",
@@ -3966,11 +3656,29 @@
         "node": ">=8"
       }
     },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/babel-plugin-jest-hoist": {
       "version": "29.6.3",
       "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-29.6.3.tgz",
       "integrity": "sha512-ESAc/RJvGTFEzRwOTT4+lNDk/GNHMkKbNzsvT0qKRfDyyYTskxB5rnU2njIDYVxXCBHHEI1c0YwHob3WaYujOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.3.3",
         "@babel/types": "^7.3.3",
@@ -4021,23 +3729,27 @@
       }
     },
     "node_modules/babel-preset-current-node-syntax": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz",
-      "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.1.0.tgz",
+      "integrity": "sha512-ldYss8SbBlWva1bs28q78Ju5Zq1F+8BrqBZZ0VFhLBvhh6lCpC2o3gDJi/5DRLs9FgYZCnmPYIVFU4lRXCkyUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/plugin-syntax-async-generators": "^7.8.4",
         "@babel/plugin-syntax-bigint": "^7.8.3",
-        "@babel/plugin-syntax-class-properties": "^7.8.3",
-        "@babel/plugin-syntax-import-meta": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
         "@babel/plugin-syntax-json-strings": "^7.8.3",
-        "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-syntax-numeric-separator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
         "@babel/plugin-syntax-optional-chaining": "^7.8.3",
-        "@babel/plugin-syntax-top-level-await": "^7.8.3"
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5"
       },
       "peerDependencies": {
         "@babel/core": "^7.0.0"
@@ -4048,6 +3760,7 @@
       "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-29.6.3.tgz",
       "integrity": "sha512-0B3bhxR6snWXJZtR/RliHTDPRgn1sNHOR0yVtq/IiQFyuOVjFS+wuio/R4gSNkyYmKmJB4wGZv2NZanmKmTnNA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "babel-plugin-jest-hoist": "^29.6.3",
         "babel-preset-current-node-syntax": "^1.0.0"
@@ -4118,96 +3831,35 @@
         "npm": ">=8.0.0"
       }
     },
-    "node_modules/backstopjs/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/balanced-match": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "dev": true
+    },
+    "node_modules/bare-events": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
+      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
       "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
+      "optional": true
     },
-    "node_modules/backstopjs/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/bare-fs": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.4.tgz",
+      "integrity": "sha512-7YyxitZEq0ey5loOF5gdo1fZQFF7290GziT+VbAJ+JbYTJYaPZwuEz2r/Nq23sm4fjyTgUf2uJI2gkT3xAuSYA==",
       "dev": true,
+      "optional": true,
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "bare-events": "^2.0.0",
+        "bare-path": "^2.0.0",
+        "bare-stream": "^2.0.0"
       }
     },
-    "node_modules/backstopjs/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/backstopjs/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/backstopjs/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/balanced-match": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
-      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
-      "dev": true
-    },
-    "node_modules/bare-events": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.4.2.tgz",
-      "integrity": "sha512-qMKFd2qG/36aA4GwvKq8MxnPgCQAmBWmSyLWsJcbn8v03wvIPQ/hG1Ms8bPzndZxMDoHpxez5VOS+gC9Yi24/Q==",
-      "dev": true,
-      "optional": true
-    },
-    "node_modules/bare-fs": {
-      "version": "2.3.4",
-      "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-2.3.4.tgz",
-      "integrity": "sha512-7YyxitZEq0ey5loOF5gdo1fZQFF7290GziT+VbAJ+JbYTJYaPZwuEz2r/Nq23sm4fjyTgUf2uJI2gkT3xAuSYA==",
-      "dev": true,
-      "optional": true,
-      "dependencies": {
-        "bare-events": "^2.0.0",
-        "bare-path": "^2.0.0",
-        "bare-stream": "^2.0.0"
-      }
-    },
-    "node_modules/bare-os": {
-      "version": "2.4.3",
-      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.3.tgz",
-      "integrity": "sha512-FjkNiU3AwTQNQkcxFOmDcCfoN1LjjtU+ofGJh5DymZZLTqdw2i/CzV7G0h3snvh6G8jrWtdmNSgZPH4L2VOAsQ==",
+    "node_modules/bare-os": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-2.4.3.tgz",
+      "integrity": "sha512-FjkNiU3AwTQNQkcxFOmDcCfoN1LjjtU+ofGJh5DymZZLTqdw2i/CzV7G0h3snvh6G8jrWtdmNSgZPH4L2VOAsQ==",
       "dev": true,
       "optional": true
     },
@@ -4471,6 +4123,7 @@
       "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
       "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "node-int64": "^0.4.0"
       }
@@ -4529,7 +4182,8 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/builtin-modules": {
       "version": "3.3.0",
@@ -4585,6 +4239,7 @@
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
       "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -4614,11 +4269,42 @@
       "resolved": "https://registry.npmjs.org/cbor-js/-/cbor-js-0.1.0.tgz",
       "integrity": "sha512-7sQ/TvDZPl7csT1Sif9G0+MA0I0JOVah8+wWlJVQdVEgIbCzlN/ab3x+uvMNsc34TUvO6osQTAmB2ls80JX6tw=="
     },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/chalk/node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/char-regex": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
       "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -4715,10 +4401,11 @@
       }
     },
     "node_modules/cjs-module-lexer": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.3.1.tgz",
-      "integrity": "sha512-a3KdPAANPbNE4ZUv9h6LckSl9zLsYOP4MBmhIPkRaeyybt+r4UghLvq+xw/YwUcC1gqylCkL4rdVs3Lwupjm4Q==",
-      "dev": true
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.1.tgz",
+      "integrity": "sha512-cuSVIHi9/9E/+821Qjdvngor+xpnlwnuwIyZOaLmHBVdXL+gP+I6QQB9VkO7RI77YIcTV+S1W9AreJ5eN63JBA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/clean-css": {
       "version": "4.2.3",
@@ -4801,6 +4488,7 @@
       "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
       "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "iojs": ">= 1.0.0",
         "node": ">= 0.12.0"
@@ -4810,7 +4498,28 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
       "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/color-support": {
       "version": "1.1.3",
@@ -4999,6 +4708,7 @@
       "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
       "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "chalk": "^4.0.0",
@@ -5015,67 +4725,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/create-jest/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/create-jest/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/create-jest/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/create-jest/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/create-jest/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
@@ -5652,6 +5301,7 @@
       "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
       "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "babel-plugin-macros": "^3.1.0"
       },
@@ -5785,6 +5435,16 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/devtools-protocol": {
       "version": "0.0.1312386",
       "resolved": "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz",
@@ -5805,6 +5465,7 @@
       "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
       "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
@@ -5966,6 +5627,7 @@
       "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
       "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -6159,6 +5821,7 @@
       "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
       "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cross-spawn": "^7.0.3",
         "get-stream": "^6.0.0",
@@ -6203,6 +5866,7 @@
       "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
       "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/expect-utils": "^29.7.0",
         "jest-get-type": "^29.6.3",
@@ -6369,7 +6033,8 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "3.0.0",
@@ -6403,6 +6068,7 @@
       "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
       "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "bser": "2.1.1"
       }
@@ -6479,6 +6145,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
       "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^5.0.0",
         "path-exists": "^4.0.0"
@@ -6733,6 +6400,7 @@
       "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
       "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8.0.0"
       }
@@ -6742,6 +6410,7 @@
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
       "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -7119,55 +6788,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/gulp-cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/gulp-cli/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/gulp-cli/node_modules/glogg": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/glogg/-/glogg-2.2.0.tgz",
@@ -7201,18 +6821,6 @@
         "node": ">= 10.13.0"
       }
     },
-    "node_modules/gulp-cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/gulp-concat": {
       "version": "2.6.1",
       "resolved": "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz",
@@ -8129,7 +7737,8 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
       "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/htmlparser2": {
       "version": "8.0.2",
@@ -8198,6 +7807,7 @@
       "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
       "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=10.17.0"
       }
@@ -8273,10 +7883,11 @@
       }
     },
     "node_modules/import-local": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz",
-      "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==",
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "pkg-dir": "^4.2.0",
         "resolve-cwd": "^3.0.0"
@@ -8296,6 +7907,7 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -8460,6 +8072,7 @@
       "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
       "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -8557,6 +8170,7 @@
       "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
       "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -8640,24 +8254,39 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
       "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=8"
       }
     },
     "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz",
+      "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
+        "@babel/core": "^7.23.9",
+        "@babel/parser": "^7.23.9",
+        "@istanbuljs/schema": "^0.1.3",
         "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
       }
     },
     "node_modules/istanbul-lib-report": {
@@ -8665,6 +8294,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
       "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "istanbul-lib-coverage": "^3.0.0",
         "make-dir": "^4.0.0",
@@ -8679,6 +8309,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -8691,6 +8322,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
       "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "debug": "^4.1.1",
         "istanbul-lib-coverage": "^3.0.0",
@@ -8705,6 +8337,7 @@
       "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
       "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "html-escaper": "^2.0.0",
         "istanbul-lib-report": "^3.0.0"
@@ -8734,6 +8367,7 @@
       "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
       "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -8760,6 +8394,7 @@
       "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
       "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "execa": "^5.0.0",
         "jest-util": "^29.7.0",
@@ -8774,6 +8409,7 @@
       "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
       "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/expect": "^29.7.0",
@@ -8800,72 +8436,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-circus/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-circus/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-circus/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-circus/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-cli": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
       "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/core": "^29.7.0",
         "@jest/test-result": "^29.7.0",
@@ -8894,42 +8470,12 @@
         }
       }
     },
-    "node_modules/jest-cli/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-cli/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
     "node_modules/jest-cli/node_modules/cliui": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz",
       "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "string-width": "^4.2.0",
         "strip-ansi": "^6.0.1",
@@ -8939,41 +8485,12 @@
         "node": ">=12"
       }
     },
-    "node_modules/jest-cli/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-cli/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-cli/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-cli/node_modules/yargs": {
       "version": "17.7.2",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
       "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cliui": "^8.0.1",
         "escalade": "^3.1.1",
@@ -8992,6 +8509,7 @@
       "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
       "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@jest/test-sequencer": "^29.7.0",
@@ -9032,289 +8550,100 @@
         }
       }
     },
-    "node_modules/jest-config/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-convert": "^2.0.1"
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
+        "detect-newline": "^3.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
       "dev": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-config/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-config/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-environment-jsdom": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
+      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
       "dev": true,
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/jsdom": "^20.0.0",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jsdom": "^20.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
-    "node_modules/jest-diff": {
+    "node_modules/jest-environment-node": {
       "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.6.3",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-diff/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-diff/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-diff/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-docblock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
-      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
-      "dev": true,
-      "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-docblock/node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
-      "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-each": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
-      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-each/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-each/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-each/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-environment-jsdom": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
-      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/jsdom": "^20.0.0",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jsdom": "^20.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-environment-node": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
-      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
-      "dev": true,
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-get-type": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
       "dev": true,
       "engines": {
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
@@ -9325,6 +8654,7 @@
       "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
       "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "@types/graceful-fs": "^4.1.3",
@@ -9350,6 +8680,7 @@
       "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
       "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "jest-get-type": "^29.6.3",
         "pretty-format": "^29.7.0"
@@ -9363,6 +8694,7 @@
       "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
       "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "chalk": "^4.0.0",
         "jest-diff": "^29.7.0",
@@ -9373,67 +8705,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-matcher-utils/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-matcher-utils/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-message-util": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
@@ -9454,67 +8725,6 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-message-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-message-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-message-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-mock": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
@@ -9534,6 +8744,7 @@
       "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
       "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       },
@@ -9551,102 +8762,44 @@
       "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
       "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
-      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
-      "dev": true,
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^2.0.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
-      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
-      "dev": true,
-      "dependencies": {
-        "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-resolve/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-resolve/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/jest-resolve": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "color-name": "~1.1.4"
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-resolve/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-resolve/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
     "node_modules/jest-runner": {
@@ -9654,6 +8807,7 @@
       "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
       "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/console": "^29.7.0",
         "@jest/environment": "^29.7.0",
@@ -9681,72 +8835,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-runner/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runner/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-runner/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-runtime": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
       "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/environment": "^29.7.0",
         "@jest/fake-timers": "^29.7.0",
@@ -9775,72 +8869,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-runtime/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/jest-runtime/node_modules/strip-bom": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
       "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
       "dev": true,
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -9850,6 +8884,7 @@
       "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
       "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/core": "^7.11.6",
         "@babel/generator": "^7.7.2",
@@ -9876,60 +8911,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -9937,18 +8924,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/jest-snapshot/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-util": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
@@ -9960,61 +8935,12 @@
         "chalk": "^4.0.0",
         "ci-info": "^3.2.0",
         "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-util/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-util/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-util/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
+        "picomatch": "^2.2.3"
       },
       "engines": {
-        "node": ">=7.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-util/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/jest-util/node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
@@ -10027,23 +8953,12 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/jest-util/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-validate": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
       "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/types": "^29.6.3",
         "camelcase": "^6.2.0",
@@ -10056,26 +8971,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-validate/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
     "node_modules/jest-validate/node_modules/camelcase": {
       "version": "6.3.0",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
       "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -10083,57 +8984,12 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jest-validate/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-validate/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-validate/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-watcher": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
       "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jest/test-result": "^29.7.0",
         "@jest/types": "^29.6.3",
@@ -10148,72 +9004,12 @@
         "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-watcher/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dev": true,
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/jest-watcher/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
-    "node_modules/jest-watcher/node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dev": true,
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/jest-worker": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
       "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/node": "*",
         "jest-util": "^29.7.0",
@@ -10246,6 +9042,7 @@
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
       "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^1.0.7",
         "esprima": "^4.0.0"
@@ -10651,6 +9448,7 @@
       "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
       "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -10693,6 +9491,7 @@
       "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
       "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -10735,6 +9534,7 @@
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
       "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^4.1.0"
       },
@@ -10880,6 +9680,7 @@
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
       "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "semver": "^7.5.3"
       },
@@ -10891,10 +9692,11 @@
       }
     },
     "node_modules/make-dir/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -10922,6 +9724,7 @@
       "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
       "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "tmpl": "1.0.5"
       }
@@ -10974,7 +9777,8 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
       "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/merge2": {
       "version": "1.4.1",
@@ -11057,6 +9861,7 @@
       "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
       "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -11139,7 +9944,8 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/negotiator": {
       "version": "0.6.3",
@@ -11163,7 +9969,8 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
       "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/node-releases": {
       "version": "2.0.18",
@@ -11220,6 +10027,7 @@
       "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
       "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.0.0"
       },
@@ -11354,6 +10162,7 @@
       "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
       "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "mimic-fn": "^2.1.0"
       },
@@ -11397,6 +10206,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -11412,6 +10222,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
       "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^2.2.0"
       },
@@ -11424,6 +10235,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
       "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-try": "^2.0.0"
       },
@@ -11454,6 +10266,7 @@
       "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
       "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -11645,6 +10458,7 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -11663,6 +10477,7 @@
       "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
       "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -11745,6 +10560,7 @@
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
       "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -11775,6 +10591,7 @@
       "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
       "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "find-up": "^4.0.0"
       },
@@ -12064,6 +10881,7 @@
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
       "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "kleur": "^3.0.3",
         "sisteransi": "^1.0.5"
@@ -12242,7 +11060,8 @@
           "type": "opencollective",
           "url": "https://opencollective.com/fast-check"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/python": {
       "version": "0.0.4",
@@ -12635,6 +11454,7 @@
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
       "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "resolve-from": "^5.0.0"
       },
@@ -12660,6 +11480,7 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
       "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -12682,10 +11503,11 @@
       }
     },
     "node_modules/resolve.exports": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz",
-      "integrity": "sha512-X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz",
+      "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       }
@@ -13330,6 +12152,7 @@
       "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
       "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "shebang-regex": "^3.0.0"
       },
@@ -13342,6 +12165,7 @@
       "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
       "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -13368,13 +12192,15 @@
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
-      "dev": true
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/sisteransi": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
       "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/slash": {
       "version": "3.0.0",
@@ -13402,39 +12228,6 @@
         "url": "https://github.com/chalk/slice-ansi?sponsor=1"
       }
     },
-    "node_modules/slice-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/slice-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/smart-buffer": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
@@ -13508,6 +12301,7 @@
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
       "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "buffer-from": "^1.0.0",
         "source-map": "^0.6.0"
@@ -13545,7 +12339,8 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
       "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/stack-utils": {
       "version": "2.0.6",
@@ -13639,6 +12434,7 @@
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
       "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "char-regex": "^1.0.2",
         "strip-ansi": "^6.0.0"
@@ -13690,6 +12486,7 @@
       "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
       "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -13699,6 +12496,7 @@
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -13877,6 +12675,7 @@
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
       "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
         "glob": "^7.1.4",
@@ -14008,7 +12807,8 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
       "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
-      "dev": true
+      "dev": true,
+      "license": "BSD-3-Clause"
     },
     "node_modules/to-absolute-glob": {
       "version": "2.0.2",
@@ -14121,6 +12921,7 @@
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
       "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
       "dev": true,
+      "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=10"
       },
@@ -14383,6 +13184,7 @@
       "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.3.0.tgz",
       "integrity": "sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.12",
         "@types/istanbul-lib-coverage": "^2.0.1",
@@ -14664,6 +13466,7 @@
       "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
       "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "makeerror": "1.0.12"
       }
@@ -14716,6 +13519,7 @@
       "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
       "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "isexe": "^2.0.0"
       },
@@ -14743,39 +13547,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dev": true,
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dev": true,
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/wrap-ansi/node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
-      "dev": true
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -14787,6 +13558,7 @@
       "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz",
       "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "imurmurhash": "^0.1.4",
         "signal-exit": "^3.0.7"
@@ -14933,6 +13705,7 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
diff --git a/package.json b/package.json
index c5d86ecc74..d211399163 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
     "gulp-jshint": "2.1.0",
     "gulp-prettyerror": "2.0.0",
     "gulp-uglify": "3.0.2",
-    "jest": "29.7.0",
+    "jest": "^29.7.0",
     "jest-each": "^29.2.1",
     "jest-environment-jsdom": "^29.2.2",
     "jshint": "2.13.6",
diff --git a/tests/javascripts/activityChart.test.js b/tests/javascripts/activityChart.test.js
index 8e3d406eac..fbbb2394e8 100644
--- a/tests/javascripts/activityChart.test.js
+++ b/tests/javascripts/activityChart.test.js
@@ -61,13 +61,13 @@ test('D3 is loaded correctly', () => {
 
 test('Populates the accessible table for activity chart correctly', () => {
   const sampleData = {
-    '2024-07-01': { sms: { delivered: 50, failed: 5 } },
-    '2024-07-02': { sms: { delivered: 60, failed: 2 } },
-    '2024-07-03': { sms: { delivered: 70, failed: 1 } },
-    '2024-07-04': { sms: { delivered: 80, failed: 0 } },
-    '2024-07-05': { sms: { delivered: 90, failed: 3 } },
-    '2024-07-06': { sms: { delivered: 100, failed: 4 } },
-    '2024-07-07': { sms: { delivered: 110, failed: 2 } },
+    '2024-07-01': { sms: { delivered: 50, failed: 5, pending: 10 } },
+    '2024-07-02': { sms: { delivered: 60, failed: 2, pending: 5 } },
+    '2024-07-03': { sms: { delivered: 70, failed: 1, pending: 3 } },
+    '2024-07-04': { sms: { delivered: 80, failed: 0, pending: 0 } },
+    '2024-07-05': { sms: { delivered: 90, failed: 3, pending: 8 } },
+    '2024-07-06': { sms: { delivered: 100, failed: 4, pending: 7 } },
+    '2024-07-07': { sms: { delivered: 110, failed: 2, pending: 6 } },
   };
 
   const labels = Object.keys(sampleData).map(dateString => {
@@ -76,8 +76,9 @@ test('Populates the accessible table for activity chart correctly', () => {
   });
   const deliveredData = Object.values(sampleData).map(d => d.sms.delivered);
   const failedData = Object.values(sampleData).map(d => d.sms.failed);
+  const pendingData = Object.values(sampleData).map(d => d.sms.pending);
 
-  window.createTable('weeklyTable', 'activityChart', labels, deliveredData, failedData);
+  window.createTable('weeklyTable', 'activityChart', labels, deliveredData, failedData, pendingData);
 
   const table = document.getElementById('weeklyTable');
   expect(table).toBeDefined();
@@ -89,6 +90,7 @@ test('Populates the accessible table for activity chart correctly', () => {
   expect(headers[0].textContent).toBe('Day');
   expect(headers[1].textContent).toBe('Delivered');
   expect(headers[2].textContent).toBe('Failed');
+  expect(headers[3].textContent).toBe('Pending');
 
   const firstRowCells = rows[1].getElementsByTagName('td');
   expect(firstRowCells[0].textContent).toBe('07/01/24');
@@ -97,58 +99,73 @@ test('Populates the accessible table for activity chart correctly', () => {
 });
 
 test('SVG element is correctly set up', () => {
-  window.createChart('#weeklyChart', ['07/01/24', '07/02/24', '07/03/24', '07/04/24', '07/05/24', '07/06/24', '07/07/24'], [50, 60, 70, 80, 90, 100, 110], [5, 2, 1, 0, 3, 4, 2]);
+  window.createChart(
+    '#weeklyChart',
+    ['07/01/24', '07/02/24', '07/03/24', '07/04/24', '07/05/24', '07/06/24', '07/07/24'],
+    [50, 60, 70, 80, 90, 100, 110],
+    [5, 2, 1, 0, 3, 4, 2],
+    [10, 5, 3, 0, 8, 7, 6]
+  );
 
   const svg = document.getElementById('weeklyChart').querySelector('svg');
   expect(svg).not.toBeNull();
-  expect(svg.getAttribute('width')).toBe('0');
-  expect(svg.getAttribute('height')).toBe('400');
+  expect(svg.querySelectorAll('.bar-group').length).toBe(3);
 });
 
 test('Check HTML content after chart creation', () => {
-  // Create sample data for the chart
   const labels = ['07/01/24', '07/02/24', '07/03/24', '07/04/24', '07/05/24', '07/06/24', '07/07/24'];
   const deliveredData = [50, 60, 70, 80, 90, 100, 110];
   const failedData = [5, 2, 1, 0, 3, 4, 2];
+  const pendingData = [10, 5, 8, 3, 6, 7, 4];
 
-  // Ensure the container has the correct width
   const container = document.getElementById('weeklyChart');
-  container.style.width = '600px'; // Force a specific width
+  container.style.width = '600px';
   const containerWidth = container.clientWidth;
   expect(containerWidth).toBeGreaterThan(0);
 
-  // Call the function to create the chart
-  window.createChart('#weeklyChart', labels, deliveredData, failedData);
+  window.createChart('#weeklyChart', labels, deliveredData, failedData, pendingData);
 
-  // Optionally, you can add assertions to check for specific elements
-  expect(container.querySelector('svg')).not.toBeNull();
-  expect(container.querySelectorAll('rect').length).toBeGreaterThan(0);
+  const svg = container.querySelector('svg');
+  expect(svg).not.toBeNull();
+
+  const bars = container.querySelectorAll('rect');
+  expect(bars.length).toBeGreaterThan(0);
+
+  const barGroups = svg.querySelectorAll('.bar-group');
+  expect(barGroups.length).toBe(3);
+
+  const pendingBars = Array.from(bars).filter(bar =>
+    bar.parentNode.getAttribute('fill') === '#808080'
+  );
+  expect(pendingBars.length).toBe(labels.length);
 });
 
-test('Legend is visible when there are delivered or failed messages', () => {
-  // Example data with delivered and failed messages
+test('Legend includes pending when data exists', () => {
   const labels = ['Day 1', 'Day 2'];
-  const deliveredData = [10, 20];  // Mock delivered data
-  const failedData = [5, 0];  // Mock failed data
+  const deliveredData = [10, 20];
+  const failedData = [5, 0];
+  const pendingData = [3, 2];
 
-  // Call the createChart function
-  window.createChart('#weeklyChart', labels, deliveredData, failedData);
+  window.createChart('#weeklyChart', labels, deliveredData, failedData, pendingData);
 
-  // Check if the legend is displayed using computed style
   const legendContainer = document.querySelector('.chart-legend');
-  const legendDisplayStyle = window.getComputedStyle(legendContainer).display;
-  expect(legendDisplayStyle).toBe('flex');
-  expect(legendContainer.querySelectorAll('.legend-item').length).toBe(2); // Ensure two legend items
+  const legendItems = legendContainer.querySelectorAll('.legend-item');
+  expect(legendItems.length).toBe(3);
+
+  const pendingLegend = Array.from(legendItems).find(item =>
+    item.textContent.includes('Pending')
+  );
+  expect(pendingLegend).not.toBeNull();
 });
 
-test('Legend is hidden when there are no delivered or failed messages', () => {
-  // Example data with no delivered and no failed messages
+test('Legend is hidden when there are no delivered, failed, or pending messages', () => {
   const labels = ['Day 1', 'Day 2'];
-  const deliveredData = [0, 0];  // No delivered messages
-  const failedData = [0, 0];  // No failed messages
+  const deliveredData = [0, 0];
+  const failedData = [0, 0];
+  const pendingData = [0, 0];
 
   // Call the createChart function
-  window.createChart('#weeklyChart', labels, deliveredData, failedData);
+  window.createChart('#weeklyChart', labels, deliveredData, failedData, pendingData);
 
   // Check if the legend is hidden using computed style
   const legendContainer = document.querySelector('.chart-legend');
@@ -158,23 +175,43 @@ test('Legend is hidden when there are no delivered or failed messages', () => {
 
 test('Fetches data and creates chart and table correctly', async () => {
   const mockResponse = {
-    '2024-07-01': { sms: { delivered: 50, failed: 5 } },
-    '2024-07-02': { sms: { delivered: 60, failed: 2 } },
-    '2024-07-03': { sms: { delivered: 70, failed: 1 } },
-    '2024-07-04': { sms: { delivered: 80, failed: 0 } },
-    '2024-07-05': { sms: { delivered: 90, failed: 3 } },
-    '2024-07-06': { sms: { delivered: 100, failed: 4 } },
-    '2024-07-07': { sms: { delivered: 110, failed: 2 } },
+    '2024-07-01': { sms: { delivered: 50, failed: 5, pending: 10 } },
+    '2024-07-02': { sms: { delivered: 60, failed: 2, pending: 8 } },
+    '2024-07-03': { sms: { delivered: 70, failed: 1, pending: 6 } },
+    '2024-07-04': { sms: { delivered: 80, failed: 0, pending: 4 } },
+    '2024-07-05': { sms: { delivered: 90, failed: 3, pending: 7 } },
+    '2024-07-06': { sms: { delivered: 100, failed: 4, pending: 5 } },
+    '2024-07-07': { sms: { delivered: 110, failed: 2, pending: 3 } },
   };
+
   global.fetch = jest.fn(() =>
     Promise.resolve({
-        ok: true,
-        json: () => Promise.resolve(mockResponse),
+      ok: true,
+      json: () => Promise.resolve(mockResponse),
     })
-);
+  );
+
+  const data = await fetchData('service');
 
-const data = await fetchData('service');
+  expect(global.fetch).toHaveBeenCalledWith('/daily_stats.json');
+  expect(data).toEqual(mockResponse);
 
-expect(global.fetch).toHaveBeenCalledWith('/daily_stats.json');
-expect(data).toEqual(mockResponse);
+  const labels = Object.keys(mockResponse).map(dateString => {
+    const dateParts = dateString.split('-');
+    return `${dateParts[1]}/${dateParts[2]}/${dateParts[0].slice(2)}`;
+  });
+  const deliveredData = Object.values(mockResponse).map(d => d.sms.delivered);
+  const failedData = Object.values(mockResponse).map(d => d.sms.failed);
+  const pendingData = Object.values(mockResponse).map(d => d.sms.pending);
+
+  window.createChart('#weeklyChart', labels, deliveredData, failedData, pendingData);
+  window.createTable('weeklyTable', 'activityChart', labels, deliveredData, failedData, pendingData);
+
+  const chart = document.getElementById('weeklyChart').querySelector('svg');
+  expect(chart).not.toBeNull();
+
+  const table = document.getElementById('weeklyTable');
+  expect(table).toBeDefined();
+  const rows = table.getElementsByTagName('tr');
+  expect(rows.length).toBe(8);
 });

From cd90682958b19736d139b75eb230c410c973dd5d Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 14 Jan 2025 13:49:40 -0800
Subject: [PATCH 15/62] fixed drop down

---
 app/assets/javascripts/activityChart.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index 820e47a168..bbba1d2dc4 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -1,7 +1,7 @@
 (function (window) {
 
     if (document.getElementById('activityChartContainer')) {
-
+        let currentType = 'service';
         const COLORS = {
             delivered: '#0076d6',
             failed: '#fa9441',
@@ -204,6 +204,7 @@
     };
 
     const fetchData = function(type) {
+
         var ctx = document.getElementById('weeklyChart');
         if (!ctx) {
             return;
@@ -270,9 +271,10 @@
                 })
                 .catch(error => console.error('Error fetching daily stats:', error));
         };
-        setInterval(() => fetchData('service'), 10000);
+        setInterval(() => fetchData(currentType), 10000);
     const handleDropdownChange = function(event) {
         const selectedValue = event.target.value;
+        currentType = selectedValue;
         const subTitle = document.querySelector(`#activityChartContainer .chart-subtitle`);
         const selectElement = document.getElementById('options');
         const selectedText = selectElement.options[selectElement.selectedIndex].text;
@@ -298,7 +300,7 @@
 
     document.addEventListener('DOMContentLoaded', function() {
         // Initialize activityChart chart and table with service data by default
-        fetchData('service');
+        fetchData(currentType);
 
         // Add event listener to the dropdown
         const dropdown = document.getElementById('options');

From 607e1129050196063e56636e15b134565cac74ec Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Wed, 15 Jan 2025 12:07:40 -0800
Subject: [PATCH 16/62] updated fetching interval

---
 .ds.baseline                            | 6 +++---
 app/assets/javascripts/activityChart.js | 2 +-
 app/main/views/index.py                 | 8 +-------
 tests/app/main/views/test_index.py      | 4 +---
 tests/app/main/views/test_register.py   | 5 ++---
 5 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/.ds.baseline b/.ds.baseline
index df4be33a60..85c0f6ad12 100644
--- a/.ds.baseline
+++ b/.ds.baseline
@@ -555,7 +555,7 @@
         "filename": "tests/app/main/views/test_register.py",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 200,
+        "line_number": 199,
         "is_secret": false
       },
       {
@@ -563,7 +563,7 @@
         "filename": "tests/app/main/views/test_register.py",
         "hashed_secret": "bb5b7caa27d005d38039e3797c3ddb9bcd22c3c8",
         "is_verified": false,
-        "line_number": 273,
+        "line_number": 272,
         "is_secret": false
       }
     ],
@@ -684,5 +684,5 @@
       }
     ]
   },
-  "generated_at": "2025-01-13T20:16:58Z"
+  "generated_at": "2025-01-15T20:07:34Z"
 }
diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index bbba1d2dc4..adb41d6d4b 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -271,7 +271,7 @@
                 })
                 .catch(error => console.error('Error fetching daily stats:', error));
         };
-        setInterval(() => fetchData(currentType), 10000);
+        setInterval(() => fetchData(currentType), 25000);
     const handleDropdownChange = function(event) {
         const selectedValue = event.target.value;
         currentType = selectedValue;
diff --git a/app/main/views/index.py b/app/main/views/index.py
index 466a2dea5a..51c865b81d 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -32,11 +32,7 @@ def check_feature_flags():
 @main.route("/test/feature-flags")
 def test_feature_flags():
     return jsonify(
-        {
-            "FEATURE_ABOUT_PAGE_ENABLED": current_app.config[
-                "FEATURE_ABOUT_PAGE_ENABLED"
-            ]
-        }
+        {"FEATURE_ABOUT_PAGE_ENABLED": current_app.config["FEATURE_ABOUT_PAGE_ENABLED"]}
     )
 
 
@@ -235,7 +231,6 @@ def contact():
     return render_template(
         "views/contact.html",
         navigation_links=about_notify_nav(),
-
     )
 
 
@@ -268,7 +263,6 @@ def join_notify():
     return render_template(
         "views/join-notify.html",
         navigation_links=about_notify_nav(),
-
     )
 
 
diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py
index db166d21ed..eaa9134250 100644
--- a/tests/app/main/views/test_index.py
+++ b/tests/app/main/views/test_index.py
@@ -122,9 +122,7 @@ def test_static_pages(client_request, mock_get_organization_by_domain, view, moc
         session["user_id"] = None
     request(
         _expected_status=302,
-        _expected_redirect="/sign-in?next={}".format(
-            url_for("main.{}".format(view))
-        ),
+        _expected_redirect="/sign-in?next={}".format(url_for("main.{}".format(view))),
     )
 
 
diff --git a/tests/app/main/views/test_register.py b/tests/app/main/views/test_register.py
index 952aa82114..a55307a2bd 100644
--- a/tests/app/main/views/test_register.py
+++ b/tests/app/main/views/test_register.py
@@ -144,9 +144,8 @@ def test_should_return_200_when_email_is_not_gov_uk(
         _expected_status=200,
     )
 
-    assert (
-        "Enter a public sector email address."
-        in normalize_spaces(page.select_one(".usa-error-message").text)
+    assert "Enter a public sector email address." in normalize_spaces(
+        page.select_one(".usa-error-message").text
     )
 
 

From 8754c03a00542db8071008253aa4ba623c07d080 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Wed, 15 Jan 2025 14:28:47 -0800
Subject: [PATCH 17/62] updating job status states

---
 app/main/views/dashboard.py                  |  3 ++-
 app/templates/views/dashboard/dashboard.html | 18 ++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 8013acb9d2..22f7020951 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -75,6 +75,7 @@ def service_dashboard(service_id):
             "created_at": job["created_at"],
             "processing_finished": job.get("processing_finished"),
             "processing_started": job.get("processing_started"),
+            "scheduled_for": job.get("scheduled_for"),
             "notification_count": job["notification_count"],
             "created_by": job["created_by"],
             "template_name": job["template_name"],
@@ -87,7 +88,7 @@ def service_dashboard(service_id):
         "views/dashboard/dashboard.html",
         updates_url=url_for(".service_dashboard_updates", service_id=service_id),
         partials=get_dashboard_partials(service_id),
-        jobs=jobs,
+        jobs=sorted(jobs, key=lambda job: job["created_at"], reverse=True)[:5],
         service_data_retention_days=service_data_retention_days,
         sms_sent=sms_sent,
         sms_allowance_remaining=sms_allowance_remaining,
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 04abe1afcc..5e40d03191 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -113,7 +113,7 @@ <h2 class="margin-top-4 margin-bottom-1">Service activity</h2>
           </thead>
           <tbody>
             {% if jobs %}
-              {% for job in jobs[:5] %}
+              {% for job in jobs %}
                 {% set notification = job.notifications[0] %}
                 <tr id="{{ job.job_id }}">
                   <td class="table-field jobid" role="rowheader">
@@ -122,9 +122,19 @@ <h2 class="margin-top-4 margin-bottom-1">Service activity</h2>
                     </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 class="table-field time-sent">
+                    {% if job.scheduled_for and not job.processing_finished %}
+                      Scheduled for
+                      {{ job.scheduled_for|format_datetime_table }}
+                    {% else %}
+                        {% if job.processing_finished %}
+                          Sent on {{job.processing_finished|format_datetime_table}}
+                        {% elif job.processing_started %}
+                          Sending since {{job.processing_started|format_datetime_table}}
+                        {% else %}
+                          Created at {{job.created_at|format_datetime_table}}
+                        {% endif %}
+                    {% endif %}
                   </td>
                   <td class="table-field sender">{{ job.created_by.name }}</td>
                   <td class="table-field count-of-recipients">{{ job.notification_count }}</td>

From ae083f4b52e3806ed583da50aa657aff4d23bbd5 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Wed, 15 Jan 2025 17:08:21 -0800
Subject: [PATCH 18/62] update banner with different status states

---
 app/main/views/jobs.py                  |  1 +
 app/templates/partials/jobs/status.html | 43 +++++++++++++++++++------
 2 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index dddf838a1c..9de227bc3f 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -407,6 +407,7 @@ def get_job_partials(job):
         session["arrived_from_preview_page"] = False
 
     arrived_from_preview_page_url = session.get("arrived_from_preview_page", False)
+    print('job', dir(job))
 
     return {
         "counts": counts,
diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html
index fb0a745f8d..fc94d174af 100644
--- a/app/templates/partials/jobs/status.html
+++ b/app/templates/partials/jobs/status.html
@@ -21,7 +21,7 @@ <h2>Delivery Status</h2>
 
 <div class="ajax-block-container">
   <p class='bottom-gutter'>
-    {% if job.still_processing or arrived_from_preview_page_url %}
+    {% if not job.finished_processing or arrived_from_preview_page_url %}
       {% if job.scheduled_for %}
         <div class="usa-alert usa-alert--info">
           <div class="usa-alert__body">
@@ -33,16 +33,39 @@ <h2 class="usa-alert__heading">Your text has been scheduled</h2>
         </div>
         {{display_message_status}}
       {% else %}
-        <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>
+        {% if job.finished_processing or job.processing_started %}
+          <div class="usa-alert usa-alert--success">
+            <div class="usa-alert__body">
+              <h2 class="usa-alert__heading">
+                {% if job.finished_processing %}
+                  Your text has been sent
+                {% else %}
+                  Your text is sending
+                {% endif %}
+              </h2>
+              <p class="usa-alert__text">
+                {{ job.template_name }} - {{ current_service.name }}
+                {% if job.finished_processing %}
+                  was sent on {{job.processing_started|format_datetime_normal}}
+                {% else %}
+                  has been sending since {{job.processing_started| format_datetime_normal}}
+                {% endif %} by {{ job.created_by.name }}
+              </p>
+            </div>
           </div>
-        </div>
+        {% else %}
+          <div class="usa-alert usa-alert--info">
+            <div class="usa-alert__body">
+              <h2 class="usa-alert__heading">
+                Your text 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 %}
         {{display_message_status}}
       {% endif %}
     {% endif %}

From 3e8015ed50d853fcf1391897817936a18d5389dd Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Thu, 16 Jan 2025 08:38:51 -0800
Subject: [PATCH 19/62] get rid of some noise in status updates

---
 .ds.baseline                            |  6 +++---
 app/notify_client/billing_api_client.py | 12 ++++++++++++
 app/notify_client/service_api_client.py | 14 +++++++++++++-
 tests/app/main/views/test_index.py      |  4 +---
 tests/app/main/views/test_register.py   |  5 ++---
 5 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/.ds.baseline b/.ds.baseline
index df4be33a60..0ded707f2e 100644
--- a/.ds.baseline
+++ b/.ds.baseline
@@ -555,7 +555,7 @@
         "filename": "tests/app/main/views/test_register.py",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 200,
+        "line_number": 199,
         "is_secret": false
       },
       {
@@ -563,7 +563,7 @@
         "filename": "tests/app/main/views/test_register.py",
         "hashed_secret": "bb5b7caa27d005d38039e3797c3ddb9bcd22c3c8",
         "is_verified": false,
-        "line_number": 273,
+        "line_number": 272,
         "is_secret": false
       }
     ],
@@ -684,5 +684,5 @@
       }
     ]
   },
-  "generated_at": "2025-01-13T20:16:58Z"
+  "generated_at": "2025-01-16T16:38:48Z"
 }
diff --git a/app/notify_client/billing_api_client.py b/app/notify_client/billing_api_client.py
index a6226f14ae..b1ffc19f08 100644
--- a/app/notify_client/billing_api_client.py
+++ b/app/notify_client/billing_api_client.py
@@ -1,3 +1,6 @@
+import json
+
+from app.extensions import redis_client
 from app.notify_client import NotifyAdminAPIClient
 
 
@@ -15,10 +18,19 @@ def get_annual_usage_for_service(self, service_id, year=None):
         )
 
     def get_free_sms_fragment_limit_for_year(self, service_id, year=None):
+        frag_limit = redis_client.get(f"free-sms-fragment-limit-{service_id}-{year}")
+        if frag_limit is not None:
+            return json.loads(frag_limit.decode("utf-8"))
         result = self.get(
             "/service/{0}/billing/free-sms-fragment-limit".format(service_id),
             params=dict(financial_year_start=year),
         )
+
+        redis_client.set(
+            f"free-sms-fragment-limit-{service_id}-{year}",
+            json.dumps(result["free_sms_fragment_limit"]),
+            ex=30,
+        )
         return result["free_sms_fragment_limit"]
 
     def create_or_update_free_sms_fragment_limit(
diff --git a/app/notify_client/service_api_client.py b/app/notify_client/service_api_client.py
index 3a0655d9e9..0229fee3dd 100644
--- a/app/notify_client/service_api_client.py
+++ b/app/notify_client/service_api_client.py
@@ -1,3 +1,4 @@
+import json
 from datetime import datetime, timezone
 
 from app.extensions import redis_client
@@ -517,7 +518,18 @@ def get_notification_count(self, service_id):
         return int(count)
 
     def get_global_notification_count(self, service_id):
-        return self.get("/service/{}/notification-count".format(service_id))
+        notification_count = redis_client.get(f"notification-count-{service_id}")
+        if notification_count is not None:
+            return json.loads(notification_count.decode("utf-8"))
+
+        notification_count = self.get(
+            "/service/{}/notification-count".format(service_id)
+        )
+        redis_client.set(
+            f"notification-count-{service_id}", json.dumps(notification_count), ex=30
+        )
+
+        return notification_count
 
     def get_service_invite_data(self, redis_key):
         """
diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py
index db166d21ed..eaa9134250 100644
--- a/tests/app/main/views/test_index.py
+++ b/tests/app/main/views/test_index.py
@@ -122,9 +122,7 @@ def test_static_pages(client_request, mock_get_organization_by_domain, view, moc
         session["user_id"] = None
     request(
         _expected_status=302,
-        _expected_redirect="/sign-in?next={}".format(
-            url_for("main.{}".format(view))
-        ),
+        _expected_redirect="/sign-in?next={}".format(url_for("main.{}".format(view))),
     )
 
 
diff --git a/tests/app/main/views/test_register.py b/tests/app/main/views/test_register.py
index 952aa82114..a55307a2bd 100644
--- a/tests/app/main/views/test_register.py
+++ b/tests/app/main/views/test_register.py
@@ -144,9 +144,8 @@ def test_should_return_200_when_email_is_not_gov_uk(
         _expected_status=200,
     )
 
-    assert (
-        "Enter a public sector email address."
-        in normalize_spaces(page.select_one(".usa-error-message").text)
+    assert "Enter a public sector email address." in normalize_spaces(
+        page.select_one(".usa-error-message").text
     )
 
 

From 6f7202eb30820226cb6ac1cd5ce59c07e49e5b0d Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Thu, 16 Jan 2025 09:02:48 -0800
Subject: [PATCH 20/62] fix test

---
 app/main/views/index.py                        | 8 +-------
 tests/app/notify_client/test_billing_client.py | 8 ++++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/main/views/index.py b/app/main/views/index.py
index e05e72e870..8b63d2bd83 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -32,11 +32,7 @@ def check_feature_flags():
 @main.route("/test/feature-flags")
 def test_feature_flags():
     return jsonify(
-        {
-            "FEATURE_ABOUT_PAGE_ENABLED": current_app.config[
-                "FEATURE_ABOUT_PAGE_ENABLED"
-            ]
-        }
+        {"FEATURE_ABOUT_PAGE_ENABLED": current_app.config["FEATURE_ABOUT_PAGE_ENABLED"]}
     )
 
 
@@ -235,7 +231,6 @@ def contact():
     return render_template(
         "views/contact.html",
         navigation_links=about_notify_nav(),
-
     )
 
 
@@ -268,7 +263,6 @@ def join_notify():
     return render_template(
         "views/join-notify.html",
         navigation_links=about_notify_nav(),
-
     )
 
 
diff --git a/tests/app/notify_client/test_billing_client.py b/tests/app/notify_client/test_billing_client.py
index 9bb113efac..65898fec25 100644
--- a/tests/app/notify_client/test_billing_client.py
+++ b/tests/app/notify_client/test_billing_client.py
@@ -11,6 +11,9 @@ def test_get_free_sms_fragment_limit_for_year_correct_endpoint(mocker, api_user_
     client = BillingAPIClient()
 
     mock_get = mocker.patch("app.notify_client.billing_api_client.BillingAPIClient.get")
+    mocker.patch(
+        "app.notify_client.billing_api_client.redis_client.get", return_value=None
+    )
 
     client.get_free_sms_fragment_limit_for_year(service_id, year=1999)
     mock_get.assert_called_once_with(
@@ -28,6 +31,11 @@ def test_post_free_sms_fragment_limit_for_current_year_endpoint(
     )
     client = BillingAPIClient()
 
+    mocker.patch(
+        "app.notify_client.billing_api_client.redis_client.get", return_value=None
+    )
+
+    mocker.patch("app.notify_client.billing_api_client.redis_client.set")
     client.create_or_update_free_sms_fragment_limit(
         service_id=service_id, free_sms_fragment_limit=1111
     )

From 1c77f8d60f0c3199ed8f31f20d549bfc69dbe73d Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Thu, 16 Jan 2025 09:27:32 -0800
Subject: [PATCH 21/62] fix test

---
 tests/app/notify_client/test_billing_client.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/app/notify_client/test_billing_client.py b/tests/app/notify_client/test_billing_client.py
index 65898fec25..c102645d28 100644
--- a/tests/app/notify_client/test_billing_client.py
+++ b/tests/app/notify_client/test_billing_client.py
@@ -10,11 +10,16 @@ def test_get_free_sms_fragment_limit_for_year_correct_endpoint(mocker, api_user_
     expected_url = "/service/{}/billing/free-sms-fragment-limit".format(service_id)
     client = BillingAPIClient()
 
-    mock_get = mocker.patch("app.notify_client.billing_api_client.BillingAPIClient.get")
+    mock_get = mocker.patch(
+        "app.notify_client.billing_api_client.BillingAPIClient.get",
+        return_value={"free_sms_fragment_limit": 0},
+    )
     mocker.patch(
         "app.notify_client.billing_api_client.redis_client.get", return_value=None
     )
 
+    mocker.patch("app.notify_client.billing_api_client.redis_client.set")
+
     client.get_free_sms_fragment_limit_for_year(service_id, year=1999)
     mock_get.assert_called_once_with(
         expected_url, params={"financial_year_start": 1999}

From c6ed4a8661ccb296ae248c6e190640f46fa48eb5 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 16 Jan 2025 12:05:14 -0800
Subject: [PATCH 22/62] changed pending state

---
 app/templates/views/dashboard/dashboard.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 5e40d03191..21812a813e 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -132,7 +132,7 @@ <h2 class="margin-top-4 margin-bottom-1">Service activity</h2>
                         {% elif job.processing_started %}
                           Sending since {{job.processing_started|format_datetime_table}}
                         {% else %}
-                          Created at {{job.created_at|format_datetime_table}}
+                          Pending since {{job.created_at|format_datetime_table}}
                         {% endif %}
                     {% endif %}
                   </td>

From 7c5179994b8554cbeb974b01fa4a394db7560eb3 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 16 Jan 2025 12:09:09 -0800
Subject: [PATCH 23/62] update verbage

---
 app/templates/partials/jobs/status.html | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html
index fc94d174af..552d603344 100644
--- a/app/templates/partials/jobs/status.html
+++ b/app/templates/partials/jobs/status.html
@@ -1,3 +1,5 @@
+{% from "components/ajax-block.html" import ajax_block %}
+
 {% set display_message_status %}
 {% if job.template.content %}
   <h2 class="sms-message-header">Message</h2>
@@ -18,14 +20,18 @@ <h3>{{ job.original_file_name }}</h3>
 {% endif %}
 <h2>Delivery Status</h2>
 {% endset %}
-
+{{ ajax_block(
+  partials,
+  url_for('.get_notifications_as_json', service_id=current_service.id, message_type=message_type, status=status),
+  'job'
+) }}
 <div class="ajax-block-container">
   <p class='bottom-gutter'>
     {% if not job.finished_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 text has been scheduled</h2>
+            <h2 class="usa-alert__heading">Your message 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>
@@ -38,9 +44,9 @@ <h2 class="usa-alert__heading">Your text has been scheduled</h2>
             <div class="usa-alert__body">
               <h2 class="usa-alert__heading">
                 {% if job.finished_processing %}
-                  Your text has been sent
+                  Your message has been sent
                 {% else %}
-                  Your text is sending
+                  Your message is sending
                 {% endif %}
               </h2>
               <p class="usa-alert__text">
@@ -57,7 +63,7 @@ <h2 class="usa-alert__heading">
           <div class="usa-alert usa-alert--info">
             <div class="usa-alert__body">
               <h2 class="usa-alert__heading">
-                Your text is pending
+                Your message is pending
               </h2>
               <p class="usa-alert__text">
                 {{ job.template_name }} - {{ current_service.name }}

From dfe421b3614b5c6893e26da9800ff39282849a98 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 16 Jan 2025 17:33:55 -0800
Subject: [PATCH 24/62] refactor code

---
 app/assets/javascripts/activityChart.js      | 58 ++++++++++++----
 app/main/views/dashboard.py                  | 28 ++------
 app/templates/views/dashboard/dashboard.html | 69 +++++---------------
 3 files changed, 65 insertions(+), 90 deletions(-)

diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index 62c1e6e3e6..a3f615c655 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -1,7 +1,8 @@
 (function (window) {
 
     if (document.getElementById('activityChartContainer')) {
-
+        const tableContainer = document.getElementById('activityContainer');
+        const currentUserName = tableContainer.getAttribute('data-currentUserName');
         const COLORS = {
             delivered: '#0076d6',
             failed: '#fa9441',
@@ -270,27 +271,58 @@
         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`;
 
-        // 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
+        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';
+            });
+        }
     };
 
     document.addEventListener('DOMContentLoaded', function() {
         // Initialize activityChart chart and table with service data by default
         fetchData('service');
 
-        // Add event listener to the dropdown
+        const allRows = Array.from(document.querySelectorAll('#activity-table tbody tr'));
+        allRows.forEach((row, index) => {
+            row.style.display = (index < 5) ? '' : 'none';
+        });
+
         const dropdown = document.getElementById('options');
         dropdown.addEventListener('change', handleDropdownChange);
     });
diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 22f7020951..af081d6457 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -62,36 +62,18 @@ def service_dashboard(service_id):
     job_response = job_api_client.get_jobs(service_id)["data"]
     service_data_retention_days = 7
 
-    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"),
-            "scheduled_for": job.get("scheduled_for"),
-            "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"
-    ]
+    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)
+
     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, key=lambda job: job["created_at"], reverse=True)[:5],
+        jobs=sorted_jobs,
         service_data_retention_days=service_data_retention_days,
         sms_sent=sms_sent,
         sms_allowance_remaining=sms_allowance_remaining,
+        service_id=service_id,
     )
 
 
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 21812a813e..cd2167dcf7 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -56,69 +56,30 @@ <h2 class="line-height-sans-2 margin-bottom-0 margin-top-4">Recent activity</h2>
 
     {% if current_user.has_permissions('manage_service') %}{% endif %}
 
-    <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 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>
 
-      <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>
+              <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 %}
                 {% set notification = job.notifications[0] %}
-                <tr id="{{ job.job_id }}">
+                <tr id="{{ 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 class="usa-link" href="{{ url_for('.view_job', service_id=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>
@@ -136,7 +97,7 @@ <h2 class="margin-top-4 margin-bottom-1">Service activity</h2>
                         {% endif %}
                     {% endif %}
                   </td>
-                  <td class="table-field sender">{{ job.created_by.name }}</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 %}

From 79e8f02ec66204fd51ef51e398ab4543010dfb9d Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 16 Jan 2025 18:17:27 -0800
Subject: [PATCH 25/62] refactor code partial

---
 .../views/dashboard/activity-chart.html       | 19 +++++
 .../views/dashboard/activity-table.html       | 56 ++++++++++++++
 app/templates/views/dashboard/dashboard.html  | 77 +------------------
 3 files changed, 79 insertions(+), 73 deletions(-)
 create mode 100644 app/templates/views/dashboard/activity-chart.html
 create mode 100644 app/templates/views/dashboard/activity-table.html

diff --git a/app/templates/views/dashboard/activity-chart.html b/app/templates/views/dashboard/activity-chart.html
new file mode 100644
index 0000000000..b65a7c7865
--- /dev/null
+++ b/app/templates/views/dashboard/activity-chart.html
@@ -0,0 +1,19 @@
+<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>
diff --git a/app/templates/views/dashboard/activity-table.html b/app/templates/views/dashboard/activity-table.html
new file mode 100644
index 0000000000..cbb7e0c872
--- /dev/null
+++ b/app/templates/views/dashboard/activity-table.html
@@ -0,0 +1,56 @@
+<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 %}
+                {% set notification = job.notifications[0] %}
+                <tr id="{{ job.id }}">
+                    <td class="table-field jobid" role="rowheader">
+                        <a class="usa-link" href="{{ url_for('.view_job', service_id=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 }}
+                        {% else %}
+                        {% if job.processing_finished %}
+                        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 %}
+                        {% 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>
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index cd2167dcf7..92518ed9cd 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -33,83 +33,14 @@ <h2 id="chartTitle">Total messages</h2>
     </div>
     <div id="totalMessageTable" class="margin-0"></div>
 
-    <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>
+    {% include 'views/dashboard/activity-chart.html'   %}
+
     <div id="aria-live-account" class="usa-sr-only" aria-live="polite"></div>
 
+    {% include 'views/dashboard/activity-table.html'   %}
+
     {% if current_user.has_permissions('manage_service') %}{% endif %}
 
-    <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 %}
-                {% set notification = job.notifications[0] %}
-                <tr id="{{ job.id }}">
-                  <td class="table-field jobid" role="rowheader">
-                    <a class="usa-link" href="{{ url_for('.view_job', service_id=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 }}
-                    {% else %}
-                        {% if job.processing_finished %}
-                          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 %}
-                    {% 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>
     {{ ajax_block(partials, updates_url, 'template-statistics') }}
   </div>
 

From 839bd0b3a97646d4ffd5402039d556448243cc69 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 16 Jan 2025 18:20:32 -0800
Subject: [PATCH 26/62] remove service

---
 app/main/views/dashboard.py                       | 1 -
 app/templates/views/dashboard/activity-table.html | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index af081d6457..812586a952 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -73,7 +73,6 @@ def service_dashboard(service_id):
         service_data_retention_days=service_data_retention_days,
         sms_sent=sms_sent,
         sms_allowance_remaining=sms_allowance_remaining,
-        service_id=service_id,
     )
 
 
diff --git a/app/templates/views/dashboard/activity-table.html b/app/templates/views/dashboard/activity-table.html
index cbb7e0c872..7d4c4a07a1 100644
--- a/app/templates/views/dashboard/activity-table.html
+++ b/app/templates/views/dashboard/activity-table.html
@@ -21,7 +21,7 @@ <h2 id="table-heading" class="margin-top-4 margin-bottom-1">Service activity</h2
                 {% set notification = job.notifications[0] %}
                 <tr id="{{ job.id }}">
                     <td class="table-field jobid" role="rowheader">
-                        <a class="usa-link" href="{{ url_for('.view_job', service_id=service_id, job_id=job.id )}}">
+                        <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>

From 7422b6160a3cb8785fff2ac5e1ed5738a4e31af4 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 16 Jan 2025 18:22:13 -0800
Subject: [PATCH 27/62] Reformat

---
 .ds.baseline                                      | 6 +++---
 app/main/views/index.py                           | 8 +-------
 app/templates/views/dashboard/activity-table.html | 1 -
 tests/app/main/views/test_index.py                | 4 +---
 tests/app/main/views/test_register.py             | 5 ++---
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/.ds.baseline b/.ds.baseline
index df4be33a60..d2e47c7237 100644
--- a/.ds.baseline
+++ b/.ds.baseline
@@ -555,7 +555,7 @@
         "filename": "tests/app/main/views/test_register.py",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 200,
+        "line_number": 199,
         "is_secret": false
       },
       {
@@ -563,7 +563,7 @@
         "filename": "tests/app/main/views/test_register.py",
         "hashed_secret": "bb5b7caa27d005d38039e3797c3ddb9bcd22c3c8",
         "is_verified": false,
-        "line_number": 273,
+        "line_number": 272,
         "is_secret": false
       }
     ],
@@ -684,5 +684,5 @@
       }
     ]
   },
-  "generated_at": "2025-01-13T20:16:58Z"
+  "generated_at": "2025-01-17T02:22:09Z"
 }
diff --git a/app/main/views/index.py b/app/main/views/index.py
index e05e72e870..8b63d2bd83 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -32,11 +32,7 @@ def check_feature_flags():
 @main.route("/test/feature-flags")
 def test_feature_flags():
     return jsonify(
-        {
-            "FEATURE_ABOUT_PAGE_ENABLED": current_app.config[
-                "FEATURE_ABOUT_PAGE_ENABLED"
-            ]
-        }
+        {"FEATURE_ABOUT_PAGE_ENABLED": current_app.config["FEATURE_ABOUT_PAGE_ENABLED"]}
     )
 
 
@@ -235,7 +231,6 @@ def contact():
     return render_template(
         "views/contact.html",
         navigation_links=about_notify_nav(),
-
     )
 
 
@@ -268,7 +263,6 @@ def join_notify():
     return render_template(
         "views/join-notify.html",
         navigation_links=about_notify_nav(),
-
     )
 
 
diff --git a/app/templates/views/dashboard/activity-table.html b/app/templates/views/dashboard/activity-table.html
index 7d4c4a07a1..eec134ebfe 100644
--- a/app/templates/views/dashboard/activity-table.html
+++ b/app/templates/views/dashboard/activity-table.html
@@ -18,7 +18,6 @@ <h2 id="table-heading" class="margin-top-4 margin-bottom-1">Service activity</h2
             <tbody>
                 {% if jobs %}
                 {% for job in jobs %}
-                {% set notification = job.notifications[0] %}
                 <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 )}}">
diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py
index db166d21ed..eaa9134250 100644
--- a/tests/app/main/views/test_index.py
+++ b/tests/app/main/views/test_index.py
@@ -122,9 +122,7 @@ def test_static_pages(client_request, mock_get_organization_by_domain, view, moc
         session["user_id"] = None
     request(
         _expected_status=302,
-        _expected_redirect="/sign-in?next={}".format(
-            url_for("main.{}".format(view))
-        ),
+        _expected_redirect="/sign-in?next={}".format(url_for("main.{}".format(view))),
     )
 
 
diff --git a/tests/app/main/views/test_register.py b/tests/app/main/views/test_register.py
index 952aa82114..a55307a2bd 100644
--- a/tests/app/main/views/test_register.py
+++ b/tests/app/main/views/test_register.py
@@ -144,9 +144,8 @@ def test_should_return_200_when_email_is_not_gov_uk(
         _expected_status=200,
     )
 
-    assert (
-        "Enter a public sector email address."
-        in normalize_spaces(page.select_one(".usa-error-message").text)
+    assert "Enter a public sector email address." in normalize_spaces(
+        page.select_one(".usa-error-message").text
     )
 
 

From 9942ecf53e902a2f8f3ff109f3aad7d70e0d465f Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Fri, 17 Jan 2025 16:30:59 -0800
Subject: [PATCH 28/62] ajax applied to status

---
 app/main/views/jobs.py                  |  7 +++----
 app/templates/partials/jobs/status.html |  9 +++------
 app/templates/views/jobs/job.html       | 14 +++++++++++++-
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index 9de227bc3f..a5798b56d6 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -57,7 +57,7 @@ def view_job(service_id, job_id):
 
     filter_args = parse_filter_args(request.args)
     filter_args["status"] = set_status_filters(filter_args)
-
+    # updates_url
     return render_template(
         "views/jobs/job.html",
         job=job,
@@ -111,7 +111,7 @@ def cancel_job(service_id, job_id):
 @user_has_permissions()
 def view_job_updates(service_id, job_id):
     job = Job.from_id(job_id, service_id=service_id)
-
+# this could help
     return jsonify(**get_job_partials(job))
 
 
@@ -407,8 +407,7 @@ def get_job_partials(job):
         session["arrived_from_preview_page"] = False
 
     arrived_from_preview_page_url = session.get("arrived_from_preview_page", False)
-    print('job', dir(job))
-
+    # partials here
     return {
         "counts": counts,
         "notifications": render_template(
diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html
index 552d603344..c39f64b378 100644
--- a/app/templates/partials/jobs/status.html
+++ b/app/templates/partials/jobs/status.html
@@ -10,7 +10,8 @@ <h2 class="recipient-list">Recipient list</h2>
   <div>
     <ul class="usa-icon-list">
       <li class="usa-icon-list__item">
-        <img src="{{ url_for('static', filename='img/material-icons/description.svg') }}" alt="">
+        <img src="{{asset_url('img/material-icons/description.svg')}}" alt="">
+        <!-- fix this image reload on ajax -->
         <div class="usa-icon-list__content">
           <h3>{{ job.original_file_name }}</h3>
         </div>
@@ -20,13 +21,9 @@ <h3>{{ job.original_file_name }}</h3>
 {% endif %}
 <h2>Delivery Status</h2>
 {% endset %}
-{{ ajax_block(
-  partials,
-  url_for('.get_notifications_as_json', service_id=current_service.id, message_type=message_type, status=status),
-  'job'
-) }}
 <div class="ajax-block-container">
   <p class='bottom-gutter'>
+    <!-- do we need not job.finished_processing or arrived_from_preview_page_url?  -->
     {% if not job.finished_processing or arrived_from_preview_page_url %}
       {% if job.scheduled_for %}
         <div class="usa-alert usa-alert--info">
diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html
index 7014e1987d..7a61621109 100644
--- a/app/templates/views/jobs/job.html
+++ b/app/templates/views/jobs/job.html
@@ -11,7 +11,19 @@
 {% block maincolumn_content %}
 
     {{ page_header("Message status") }}
-    {{ partials['status']|safe }}
+    <!-- do i need arrived_from_preview_page_url? -->
+    {% 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 %}
     {% if not finished %}
       <div
         data-module="update-content"

From 3f1058f9b60543681a0686690935439542ec3fa8 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Fri, 17 Jan 2025 17:03:22 -0800
Subject: [PATCH 29/62] jest testing

---
 tests/javascripts/activityChart.test.js | 61 ++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/tests/javascripts/activityChart.test.js b/tests/javascripts/activityChart.test.js
index 8e3d406eac..427c93ac24 100644
--- 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,6 +40,9 @@ 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
@@ -178,3 +181,59 @@ 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();
+});

From b6b110765a2e7b2443776d305f126499c9ed3cfb Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 20 Jan 2025 14:05:15 -0800
Subject: [PATCH 30/62] flake8 and fixing conditionals

---
 app/main/views/dashboard.py                       |  2 +-
 app/templates/views/dashboard/activity-table.html | 13 +++++--------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 812586a952..1f8cac5730 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -14,7 +14,7 @@
     service_api_client,
     template_statistics_client,
 )
-from app.formatters import format_date_numeric, format_datetime_numeric, get_time_left
+from app.formatters import format_date_numeric, format_datetime_numeric
 from app.main import main
 from app.main.views.user_profile import set_timezone
 from app.statistics_utils import get_formatted_percentage
diff --git a/app/templates/views/dashboard/activity-table.html b/app/templates/views/dashboard/activity-table.html
index eec134ebfe..5739002e9b 100644
--- a/app/templates/views/dashboard/activity-table.html
+++ b/app/templates/views/dashboard/activity-table.html
@@ -27,16 +27,13 @@ <h2 id="table-heading" class="margin-top-4 margin-bottom-1">Service activity</h2
                     <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 }}
-                        {% else %}
-                        {% if job.processing_finished %}
-                        Sent on {{job.processing_finished|format_datetime_table}}
+                        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}}
+                            Sending since {{ job.processing_started|format_datetime_table }}
                         {% else %}
-                        Pending since {{job.created_at|format_datetime_table}}
-                        {% endif %}
+                            Pending since {{ job.created_at|format_datetime_table }}
                         {% endif %}
                     </td>
                     <td class="table-field sender sender-column">{{ job.created_by.name }}</td>

From 82230f9e8bc67bf05c30e43f3f02e8c3d74ca6e5 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 20 Jan 2025 14:34:11 -0800
Subject: [PATCH 31/62] fixed testing

---
 tests/app/main/views/test_dashboard.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tests/app/main/views/test_dashboard.py b/tests/app/main/views/test_dashboard.py
index 97cf42d688..461888c5c4 100644
--- a/tests/app/main/views/test_dashboard.py
+++ b/tests/app/main/views/test_dashboard.py
@@ -657,9 +657,8 @@ def test_should_show_recent_templates_on_dashboard(
     ]
     assert "Total messages" in headers
 
-    table_rows = page.find_all("tbody")[0].find_all("tr")
-
-    assert len(table_rows) == 0
+    table_rows = page.find_all("tbody")[1].find_all("tr")
+    assert len(table_rows) == 2
 
 
 @pytest.mark.parametrize(
@@ -1943,7 +1942,6 @@ 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) == 0
+    assert len(rows) == 1
 
     assert job_table_body is not None

From 261c2311bdba76377c89533bef87673f56bc2803 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 20 Jan 2025 23:15:43 +0000
Subject: [PATCH 32/62] Bump rollup from 4.30.1 to 4.31.0

Bumps [rollup](https://github.com/rollup/rollup) from 4.30.1 to 4.31.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.30.1...v4.31.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 180 +++++++++++++++++++++++++---------------------
 package.json      |   2 +-
 2 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 50641852e0..e501b84474 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,7 +50,7 @@
         "jest-environment-jsdom": "^29.2.2",
         "jshint": "2.13.6",
         "jshint-stylish": "2.2.1",
-        "rollup": "^4.30.1",
+        "rollup": "^4.31.0",
         "rollup-plugin-commonjs": "10.1.0",
         "rollup-plugin-node-resolve": "5.2.0"
       },
@@ -2621,228 +2621,247 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.30.1.tgz",
-      "integrity": "sha512-pSWY+EVt3rJ9fQ3IqlrEUtXh3cGqGtPDH1FQlNZehO2yYxCHEX1SPsz1M//NXwYfbTlcKr9WObLnJX9FsS9K1Q==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.30.1.tgz",
-      "integrity": "sha512-/NA2qXxE3D/BRjOJM8wQblmArQq1YoBVJjrjoTSBS09jgUisq7bqxNHJ8kjCHeV21W/9WDGwJEWSN0KQ2mtD/w==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "android"
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.30.1.tgz",
-      "integrity": "sha512-r7FQIXD7gB0WJ5mokTUgUWPl0eYIH0wnxqeSAhuIwvnnpjdVB8cRRClyKLQr7lgzjctkbp5KmswWszlwYln03Q==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.30.1.tgz",
-      "integrity": "sha512-x78BavIwSH6sqfP2xeI1hd1GpHL8J4W2BXcVM/5KYKoAD3nNsfitQhvWSw+TFtQTLZ9OmlF+FEInEHyubut2OA==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "darwin"
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.30.1.tgz",
-      "integrity": "sha512-HYTlUAjbO1z8ywxsDFWADfTRfTIIy/oUlfIDmlHYmjUP2QRDTzBuWXc9O4CXM+bo9qfiCclmHk1x4ogBjOUpUQ==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.30.1.tgz",
-      "integrity": "sha512-1MEdGqogQLccphhX5myCJqeGNYTNcmTyaic9S7CG3JhwuIByJ7J05vGbZxsizQthP1xpVx7kd3o31eOogfEirw==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "freebsd"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.30.1.tgz",
-      "integrity": "sha512-PaMRNBSqCx7K3Wc9QZkFx5+CX27WFpAMxJNiYGAXfmMIKC7jstlr32UhTgK6T07OtqR+wYlWm9IxzennjnvdJg==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.30.1.tgz",
-      "integrity": "sha512-B8Rcyj9AV7ZlEFqvB5BubG5iO6ANDsRKlhIxySXcF1axXYUyqwBok+XZPgIYGBgs7LDXfWfifxhw0Ik57T0Yug==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.30.1.tgz",
-      "integrity": "sha512-hqVyueGxAj3cBKrAI4aFHLV+h0Lv5VgWZs9CUGqr1z0fZtlADVV1YPOij6AhcK5An33EXaxnDLmJdQikcn5NEw==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.30.1.tgz",
-      "integrity": "sha512-i4Ab2vnvS1AE1PyOIGp2kXni69gU2DAUVt6FSXeIqUCPIR3ZlheMW3oP2JkukDfu3PsexYRbOiJrY+yVNSk9oA==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.30.1.tgz",
-      "integrity": "sha512-fARcF5g296snX0oLGkVxPmysetwUk2zmHcca+e9ObOovBR++9ZPOhqFUM61UUZ2EYpXVPN1redgqVoBB34nTpQ==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.30.1.tgz",
-      "integrity": "sha512-GLrZraoO3wVT4uFXh67ElpwQY0DIygxdv0BNW9Hkm3X34wu+BkqrDrkcsIapAY+N2ATEbvak0XQ9gxZtCIA5Rw==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.30.1.tgz",
-      "integrity": "sha512-0WKLaAUUHKBtll0wvOmh6yh3S0wSU9+yas923JIChfxOaaBarmb/lBKPF0w/+jTVozFnOXJeRGZ8NvOxvk/jcw==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.30.1.tgz",
-      "integrity": "sha512-GWFs97Ruxo5Bt+cvVTQkOJ6TIx0xJDD/bMAOXWJg8TCSTEK8RnFeOeiFTxKniTc4vMIaWvCplMAFBt9miGxgkA==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.30.1.tgz",
-      "integrity": "sha512-UtgGb7QGgXDIO+tqqJ5oZRGHsDLO8SlpE4MhqpY9Llpzi5rJMvrK6ZGhsRCST2abZdBqIBeXW6WPD5fGK5SDwg==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.30.1.tgz",
-      "integrity": "sha512-V9U8Ey2UqmQsBT+xTOeMzPzwDzyXmnAoO4edZhL7INkwQcaW1Ckv3WJX3qrrp/VHaDkEWIBWhRwP47r8cdrOow==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.30.1.tgz",
-      "integrity": "sha512-WabtHWiPaFF47W3PkHnjbmWawnX/aE57K47ZDT1BXTS5GgrBUEpvOzq0FI0V/UYzQJgdb8XlhVNH8/fwV8xDjw==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.30.1.tgz",
-      "integrity": "sha512-pxHAU+Zv39hLUTdQQHUVHf4P+0C47y/ZloorHpzs2SXMRqeAWmGghzAhfOlzFHHwjvgokdFAhC4V+6kC1lRRfw==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.30.1.tgz",
-      "integrity": "sha512-D6qjsXGcvhTjv0kI4fU8tUuBDF/Ueee4SVX79VfNDXZa64TfCW1Slkb6Z7O1p7vflqZjcmOVdZlqf8gvJxc6og==",
+      "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"
       ],
+      "license": "MIT",
       "optional": true,
       "os": [
         "win32"
@@ -12723,9 +12742,10 @@
       "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.30.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.30.1.tgz",
-      "integrity": "sha512-mlJ4glW020fPuLi7DkM/lN97mYEZGWeqBnrljzN0gs7GLctqX3lNWxKQ7Gl712UAX+6fog/L3jh4gb7R6aVi3w==",
+      "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"
       },
@@ -12737,25 +12757,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.30.1",
-        "@rollup/rollup-android-arm64": "4.30.1",
-        "@rollup/rollup-darwin-arm64": "4.30.1",
-        "@rollup/rollup-darwin-x64": "4.30.1",
-        "@rollup/rollup-freebsd-arm64": "4.30.1",
-        "@rollup/rollup-freebsd-x64": "4.30.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.30.1",
-        "@rollup/rollup-linux-arm-musleabihf": "4.30.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.30.1",
-        "@rollup/rollup-linux-arm64-musl": "4.30.1",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.30.1",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.30.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.30.1",
-        "@rollup/rollup-linux-s390x-gnu": "4.30.1",
-        "@rollup/rollup-linux-x64-gnu": "4.30.1",
-        "@rollup/rollup-linux-x64-musl": "4.30.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.30.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.30.1",
-        "@rollup/rollup-win32-x64-msvc": "4.30.1",
+        "@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"
       }
     },
diff --git a/package.json b/package.json
index 73197a4c83..0b13206bea 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "jest-environment-jsdom": "^29.2.2",
     "jshint": "2.13.6",
     "jshint-stylish": "2.2.1",
-    "rollup": "^4.30.1",
+    "rollup": "^4.31.0",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-resolve": "5.2.0"
   }

From 7be18729935417c9ed255f7a4ed21ac6b1fe2179 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 20 Jan 2025 15:21:32 -0800
Subject: [PATCH 33/62] clean up templates

---
 .../views/dashboard/activity-chart.html       | 19 --------
 .../views/dashboard/activity-table.html       | 20 +++++++++
 app/templates/views/dashboard/dashboard.html  | 44 +++++++++----------
 3 files changed, 40 insertions(+), 43 deletions(-)
 delete mode 100644 app/templates/views/dashboard/activity-chart.html

diff --git a/app/templates/views/dashboard/activity-chart.html b/app/templates/views/dashboard/activity-chart.html
deleted file mode 100644
index b65a7c7865..0000000000
--- a/app/templates/views/dashboard/activity-chart.html
+++ /dev/null
@@ -1,19 +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>
diff --git a/app/templates/views/dashboard/activity-table.html b/app/templates/views/dashboard/activity-table.html
index 5739002e9b..a40840033d 100644
--- a/app/templates/views/dashboard/activity-table.html
+++ b/app/templates/views/dashboard/activity-table.html
@@ -1,3 +1,23 @@
+<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>
diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html
index 92518ed9cd..bd19585c31 100644
--- a/app/templates/views/dashboard/dashboard.html
+++ b/app/templates/views/dashboard/dashboard.html
@@ -6,42 +6,38 @@
 {% 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-chart.html'   %}
+{% include 'views/dashboard/activity-table.html'   %}
 
-    <div id="aria-live-account" class="usa-sr-only" aria-live="polite"></div>
+{% if current_user.has_permissions('manage_service') %}{% endif %}
 
-    {% include 'views/dashboard/activity-table.html'   %}
-
-    {% if current_user.has_permissions('manage_service') %}{% endif %}
-
-    {{ ajax_block(partials, updates_url, 'template-statistics') }}
-  </div>
+{{ ajax_block(partials, updates_url, 'template-statistics') }}
+</div>
 
 {% endblock %}

From f91af940017dff679f6b97c0ab99f81433606779 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 20 Jan 2025 16:00:21 -0800
Subject: [PATCH 34/62] removed comments

---
 app/main/views/jobs.py                  |  5 ++---
 app/templates/partials/jobs/status.html |  2 --
 app/templates/views/jobs/job.html       | 13 -------------
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index a5798b56d6..d7a1d9bf48 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -57,7 +57,6 @@ def view_job(service_id, job_id):
 
     filter_args = parse_filter_args(request.args)
     filter_args["status"] = set_status_filters(filter_args)
-    # updates_url
     return render_template(
         "views/jobs/job.html",
         job=job,
@@ -111,7 +110,7 @@ def cancel_job(service_id, job_id):
 @user_has_permissions()
 def view_job_updates(service_id, job_id):
     job = Job.from_id(job_id, service_id=service_id)
-# this could help
+
     return jsonify(**get_job_partials(job))
 
 
@@ -407,7 +406,7 @@ def get_job_partials(job):
         session["arrived_from_preview_page"] = False
 
     arrived_from_preview_page_url = session.get("arrived_from_preview_page", False)
-    # partials here
+
     return {
         "counts": counts,
         "notifications": render_template(
diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html
index c39f64b378..41beb1cdee 100644
--- a/app/templates/partials/jobs/status.html
+++ b/app/templates/partials/jobs/status.html
@@ -11,7 +11,6 @@ <h2 class="recipient-list">Recipient list</h2>
     <ul class="usa-icon-list">
       <li class="usa-icon-list__item">
         <img src="{{asset_url('img/material-icons/description.svg')}}" alt="">
-        <!-- fix this image reload on ajax -->
         <div class="usa-icon-list__content">
           <h3>{{ job.original_file_name }}</h3>
         </div>
@@ -23,7 +22,6 @@ <h2>Delivery Status</h2>
 {% endset %}
 <div class="ajax-block-container">
   <p class='bottom-gutter'>
-    <!-- do we need not job.finished_processing or arrived_from_preview_page_url?  -->
     {% if not job.finished_processing or arrived_from_preview_page_url %}
       {% if job.scheduled_for %}
         <div class="usa-alert usa-alert--info">
diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html
index 7a61621109..4c8a7d1fcf 100644
--- a/app/templates/views/jobs/job.html
+++ b/app/templates/views/jobs/job.html
@@ -11,19 +11,6 @@
 {% block maincolumn_content %}
 
     {{ page_header("Message status") }}
-    <!-- do i need arrived_from_preview_page_url? -->
-    {% 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 %}
     {% if not finished %}
       <div
         data-module="update-content"

From 2ab7244beb622e682f2c364fafde487d3f21a1cd Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 21 Jan 2025 10:46:30 -0800
Subject: [PATCH 35/62] fix test and arrival session

---
 app/main/views/jobs.py                  |  2 +-
 app/templates/partials/jobs/status.html | 34 ++++++++++++++-----------
 app/templates/views/jobs/job.html       | 12 +++++++++
 tests/app/main/views/test_jobs.py       |  2 +-
 4 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index d7a1d9bf48..bb95f630e0 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -401,7 +401,7 @@ def get_job_partials(job):
     )
 
     if request.referrer is not None:
-        session["arrived_from_preview_page"] = "check" in request.referrer
+        session["arrived_from_preview_page"] = ("check" in request.referrer) or ("help=0" in request.referrer)
     else:
         session["arrived_from_preview_page"] = False
 
diff --git a/app/templates/partials/jobs/status.html b/app/templates/partials/jobs/status.html
index 41beb1cdee..0f32888136 100644
--- a/app/templates/partials/jobs/status.html
+++ b/app/templates/partials/jobs/status.html
@@ -1,5 +1,3 @@
-{% from "components/ajax-block.html" import ajax_block %}
-
 {% set display_message_status %}
 {% if job.template.content %}
   <h2 class="sms-message-header">Message</h2>
@@ -10,7 +8,7 @@ <h2 class="recipient-list">Recipient list</h2>
   <div>
     <ul class="usa-icon-list">
       <li class="usa-icon-list__item">
-        <img src="{{asset_url('img/material-icons/description.svg')}}" alt="">
+        <img src="{{ url_for('static', filename='img/material-icons/description.svg') }}" alt="">
         <div class="usa-icon-list__content">
           <h3>{{ job.original_file_name }}</h3>
         </div>
@@ -20,9 +18,10 @@ <h3>{{ job.original_file_name }}</h3>
 {% endif %}
 <h2>Delivery Status</h2>
 {% endset %}
+
 <div class="ajax-block-container">
   <p class='bottom-gutter'>
-    {% if not job.finished_processing or arrived_from_preview_page_url %}
+    {% if not job.finished_processing %}
       {% if job.scheduled_for %}
         <div class="usa-alert usa-alert--info">
           <div class="usa-alert__body">
@@ -34,23 +33,15 @@ <h2 class="usa-alert__heading">Your message has been scheduled</h2>
         </div>
         {{display_message_status}}
       {% else %}
-        {% if job.finished_processing or job.processing_started %}
+        {% if job.processing_started %}
           <div class="usa-alert usa-alert--success">
             <div class="usa-alert__body">
               <h2 class="usa-alert__heading">
-                {% if job.finished_processing %}
-                  Your message has been sent
-                {% else %}
-                  Your message is sending
-                {% endif %}
+                Your message is sending
               </h2>
               <p class="usa-alert__text">
                 {{ job.template_name }} - {{ current_service.name }}
-                {% if job.finished_processing %}
-                  was sent on {{job.processing_started|format_datetime_normal}}
-                {% else %}
-                  has been sending since {{job.processing_started| format_datetime_normal}}
-                {% endif %} by {{ job.created_by.name }}
+                has been sending since {{job.processing_started| format_datetime_normal}} by {{ job.created_by.name }}
               </p>
             </div>
           </div>
@@ -69,6 +60,19 @@ <h2 class="usa-alert__heading">
         {% endif %}
         {{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'%}
diff --git a/app/templates/views/jobs/job.html b/app/templates/views/jobs/job.html
index 4c8a7d1fcf..1643715f4f 100644
--- a/app/templates/views/jobs/job.html
+++ b/app/templates/views/jobs/job.html
@@ -11,6 +11,18 @@
 {% 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 %}
     {% if not finished %}
       <div
         data-module="update-content"
diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index ab09f7ecd8..a32480983a 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -269,7 +269,7 @@ def test_should_show_job_with_sending_limit_exceeded_status(
         pytest.param(
             datetime(2020, 1, 1, 0, 0, 0),
             datetime(2020, 1, 9, 6, 0, 1),
-            ("No messages to show yet…"),
+            ("These messages have been deleted because they were sent more than 7 days ago"),
         ),
         # Created a while ago, started exactly 24h ago
         # ---

From ac79edf6133447f27c86f4da5b2bc0988f265c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sheev=20Dav=C3=A9?= <sheev.dave@gsa.gov>
Date: Tue, 21 Jan 2025 12:03:35 -0800
Subject: [PATCH 36/62] Update pull_request_template.md

Added a11y checks to PR template
---
 .github/pull_request_template.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index a87db3fcd0..7ffbbc2907 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -20,3 +20,8 @@ Please enter a detailed description here.
 * Consideration 1
 * Consideration 2
 * Consideration ...
+
+## A11y Checks (if applicable)
+
+* Conduct automated tests through [AxeDevTools](https://www.deque.com/axe/devtools/) and [WAVE](https://wave.webaim.org/)
+* Review the [Manual Checklist](https://docs.google.com/document/d/192bBXStebdXWtYhZQ73qaWMJhGcuSB1W6c9YBXhWZvc/edit?usp=sharing)

From 5cde70a465a3a23b4452ef95e9e9013848bd8fd0 Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Tue, 21 Jan 2025 15:35:28 -0500
Subject: [PATCH 37/62] Removed redundant customize copy

---
 app/templates/views/about/about.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/about/about.html b/app/templates/views/about/about.html
index db7be207a4..56d8f54189 100644
--- a/app/templates/views/about/about.html
+++ b/app/templates/views/about/about.html
@@ -27,7 +27,7 @@ <h1>{{page_title}}</h1>
   {% set product_highlights = [
   {
   "svg_src": "#send",
-  "card_heading": "Send customized one-way customized messages",
+  "card_heading": "Send customized one-way messages",
   "p_text": "Upload a file with recipient phone numbers and Notify.gov sends customized messages",
   },
   {

From 561b2a345cb21761bf2d4684de4f4c785698d49e Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Tue, 21 Jan 2025 16:00:59 -0500
Subject: [PATCH 38/62] Reverted change that accidentally pushed to main

---
 app/templates/views/about/about.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/about/about.html b/app/templates/views/about/about.html
index 56d8f54189..db7be207a4 100644
--- a/app/templates/views/about/about.html
+++ b/app/templates/views/about/about.html
@@ -27,7 +27,7 @@ <h1>{{page_title}}</h1>
   {% set product_highlights = [
   {
   "svg_src": "#send",
-  "card_heading": "Send customized one-way messages",
+  "card_heading": "Send customized one-way customized messages",
   "p_text": "Upload a file with recipient phone numbers and Notify.gov sends customized messages",
   },
   {

From 564db4cd845f58d26230ce7c137e2a5a17e9b268 Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Tue, 21 Jan 2025 16:01:46 -0500
Subject: [PATCH 39/62] Removing redundant text

---
 app/templates/views/about/about.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/about/about.html b/app/templates/views/about/about.html
index db7be207a4..56d8f54189 100644
--- a/app/templates/views/about/about.html
+++ b/app/templates/views/about/about.html
@@ -27,7 +27,7 @@ <h1>{{page_title}}</h1>
   {% set product_highlights = [
   {
   "svg_src": "#send",
-  "card_heading": "Send customized one-way customized messages",
+  "card_heading": "Send customized one-way messages",
   "p_text": "Upload a file with recipient phone numbers and Notify.gov sends customized messages",
   },
   {

From 16b43fa5bc5abb5168fd9e2ecd58e39cfd61e490 Mon Sep 17 00:00:00 2001
From: alexjanousekGSA <alex.janousek@gsa.gov>
Date: Tue, 21 Jan 2025 16:03:50 -0500
Subject: [PATCH 40/62] Removed whitespace to trigger file change for PR

---
 app/templates/views/about/about.html | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/templates/views/about/about.html b/app/templates/views/about/about.html
index 56d8f54189..bc8fec04d1 100644
--- a/app/templates/views/about/about.html
+++ b/app/templates/views/about/about.html
@@ -1,7 +1,6 @@
 {% extends "base.html" %}
 
 {% set page_title = "About Notify" %}
-
 {% block per_page_title %}
 {{page_title}}
 {% endblock %}

From 24cad0f8a1028c72e85016c083846ac50d3fd90b Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 21 Jan 2025 14:49:26 -0800
Subject: [PATCH 41/62] fix test

---
 tests/app/main/views/test_jobs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/app/main/views/test_jobs.py b/tests/app/main/views/test_jobs.py
index a32480983a..ab09f7ecd8 100644
--- a/tests/app/main/views/test_jobs.py
+++ b/tests/app/main/views/test_jobs.py
@@ -269,7 +269,7 @@ def test_should_show_job_with_sending_limit_exceeded_status(
         pytest.param(
             datetime(2020, 1, 1, 0, 0, 0),
             datetime(2020, 1, 9, 6, 0, 1),
-            ("These messages have been deleted because they were sent more than 7 days ago"),
+            ("No messages to show yet…"),
         ),
         # Created a while ago, started exactly 24h ago
         # ---

From fb1609e71c1a6ec10468d3c3d2a9298e996adced Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 21 Jan 2025 16:12:21 -0800
Subject: [PATCH 42/62] merge main

---
 app/assets/javascripts/activityChart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index adb41d6d4b..6dfc73fbba 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -5,7 +5,7 @@
         const COLORS = {
             delivered: '#0076d6',
             failed: '#fa9441',
-            pending: '#808080',
+            pending: '#C7CACE',
             text: '#666'
         };
 

From 38675e88ddbf98506ea4e01766d7ab126bbabc42 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 21 Jan 2025 16:17:44 -0800
Subject: [PATCH 43/62] jest

---
 tests/javascripts/activityChart.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/javascripts/activityChart.test.js b/tests/javascripts/activityChart.test.js
index fbbb2394e8..37f0b47ff1 100644
--- a/tests/javascripts/activityChart.test.js
+++ b/tests/javascripts/activityChart.test.js
@@ -135,7 +135,7 @@ test('Check HTML content after chart creation', () => {
   expect(barGroups.length).toBe(3);
 
   const pendingBars = Array.from(bars).filter(bar =>
-    bar.parentNode.getAttribute('fill') === '#808080'
+    bar.parentNode.getAttribute('fill') === '#C7CACE'
   );
   expect(pendingBars.length).toBe(labels.length);
 });

From 084a5e37fc13f5a3e7390d1771c85e78548ca8be Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <53159604+heyitsmebev@users.noreply.github.com>
Date: Tue, 21 Jan 2025 22:20:44 -0800
Subject: [PATCH 44/62] Revert "Send Message A11Y Audit - Unique IDs and also
 refactor error message on templates page"

---
 .../uswds/_uswds-theme-custom-styles.scss     |  4 ----
 app/main/views/templates.py                   |  1 -
 .../components/components/input/template.njk  |  4 +---
 app/templates/components/form.html            |  1 +
 app/templates/components/textbox.html         | 23 ++++++++++---------
 app/templates/views/edit-sms-template.html    |  7 ++----
 app/templates/views/send-test.html            |  4 ++--
 app/templates/views/templates/template.html   |  4 ++++
 tests/app/main/views/test_send.py             |  2 +-
 tests/app/main/views/test_tour.py             |  2 +-
 10 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index 7fafb82760..0bb1aab7eb 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -1024,7 +1024,3 @@ nav.nav {
   font-size: units(3);
   font-weight: bold;
 }
-
-.form-control-error {
-   border: 4px solid #b10e1e
-}
diff --git a/app/main/views/templates.py b/app/main/views/templates.py
index 3a7315db7e..5c59e1e7cc 100644
--- a/app/main/views/templates.py
+++ b/app/main/views/templates.py
@@ -645,7 +645,6 @@ def edit_service_template(service_id, template_id):
         return render_template(
             "views/edit-{}-template.html".format(template["template_type"]),
             form=form,
-            errors=form.errors if form.errors else None,
             template=template,
             heading_action="Edit",
         )
diff --git a/app/templates/components/components/input/template.njk b/app/templates/components/components/input/template.njk
index 9e2cff08cb..7f56346517 100644
--- a/app/templates/components/components/input/template.njk
+++ b/app/templates/components/components/input/template.njk
@@ -42,7 +42,5 @@
   {%- if describedBy %} aria-describedby="{{ describedBy }}"{% endif %}
   {%- if params.autocomplete %} autocomplete="{{ params.autocomplete}}"{% endif %}
   {%- if params.pattern %} pattern="{{ params.pattern }}"{% endif %}
-  {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor -%}
-  {%- if params.required %} required{% endif %}
-/>
+  {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor -%}>
 </div>
diff --git a/app/templates/components/form.html b/app/templates/components/form.html
index 5875a19a9a..17cabc7f09 100644
--- a/app/templates/components/form.html
+++ b/app/templates/components/form.html
@@ -19,6 +19,7 @@
         data-{{ key }}="{{ val }}"
       {% endif %}
     {% endfor %}
+    novalidate
   >
     {{ caller() }}
   </form>
diff --git a/app/templates/components/textbox.html b/app/templates/components/textbox.html
index e8b6f813d2..3e479cbceb 100644
--- a/app/templates/components/textbox.html
+++ b/app/templates/components/textbox.html
@@ -13,13 +13,22 @@
   safe_error_message=False,
   rows=8,
   extra_form_group_classes='',
-  placeholder='',
-  required=None
+  placeholder=''
 ) %}
   <div
-    class="usa-form-group{% if field.errors %} usa-form-group--error{% endif %} {{ extra_form_group_classes }}"
+    class="form-group{% if field.errors %} form-group-error{% endif %} {{ extra_form_group_classes }}"
     data-module="{% if autofocus %}autofocus{% elif colour_preview %}colour-preview{% endif %}"
   >
+    {% if field.errors %}
+      <div class="usa-alert usa-alert--error edit-textbox-error-mt" role="alert">
+        <div class="usa-alert__body">
+          <h4 class="usa-alert__heading">Error message</h4>
+          <p class="usa-alert__text" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}">
+            {% if not safe_error_message %}{{ field.errors[0] }}{% else %}{{ field.errors[0]|safe }}{% endif %}
+          </p>
+        </div>
+      </div>
+    {% endif %}
     <label class="usa-label" for="{{ field.name }}">
       {% if label %}
         {{ label }}
@@ -32,12 +41,6 @@
         {{ hint }}
       </div>
     {% endif %}
-    {% if field.errors %}
-    <span id="{{ field.name}}-error" class="usa-error-message" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}">
-      <span class="usa-sr-only">Error:</span>
-      {% if not safe_error_message %}{{ field.errors[0] }}{% else %}{{ field.errors[0]|safe }}{% endif %}
-    </span>
-  {% endif %}
     {%
       if highlight_placeholders or autosize
     %}
@@ -56,8 +59,6 @@
       data_highlight_placeholders='true' if highlight_placeholders else 'false',
       rows=rows|string,
       placeholder=placeholder,
-      aria_describedby=field.name+"-error",
-      required='required' if required else None,
       **kwargs
     ) }}
     {% if suffix %}
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index 728b92cd62..97eac73dc9 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -29,11 +29,9 @@
 
     {% call form_wrapper() %}
       <div class="grid-row">
-        <div class="tablet:grid-col-9 mobile-lg:grid-col-12" aria-live="polite" role="alert">
+        <div class="tablet:grid-col-9 mobile-lg:grid-col-12">
           {{ form.name(param_extensions={
             "extra_form_group_classes": "margin-bottom-2",
-            "id": "name",
-            "required": True,
             "hint": {"text": "Your recipients will not see this"}
           }) }}
           {{ textbox(
@@ -43,8 +41,7 @@
             hint=content_hint,
             rows=5,
             extra_form_group_classes='margin-bottom-1',
-            placeholder='Edit me! Check out the Personalization section below for details on cool ((stuff)) you can do with your messages!',
-            required=True
+            placeholder='Edit me! Check out the Personalization section below for details on cool ((stuff)) you can do with your messages!'
           ) }}
           {% if current_user.platform_admin %}
             {{ form.process_type }}
diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html
index be3b32a9a1..720849ae6d 100644
--- a/app/templates/views/send-test.html
+++ b/app/templates/views/send-test.html
@@ -37,8 +37,8 @@
     data_kwargs={'force-focus': True}
   ) %}
     <div class="grid-row">
-      <div class="grid-col-12 {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
-        {{ form.placeholder_value(param_extensions={"id": "phone-number"}) }}
+      <div class="grid-col-12 {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}" aria-live="polite" role="alert">
+        {{ form.placeholder_value(param_extensions={"classes": ""}) }}
       </div>
       {% if skip_link or link_to_upload %}
         <div class="grid-col-12 margin-top-1">
diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html
index fd954a347a..5613f074df 100644
--- a/app/templates/views/templates/template.html
+++ b/app/templates/views/templates/template.html
@@ -90,4 +90,8 @@ <h2 class="margin-bottom-1 font-body-lg">More actions</h2>
     {% endif %}
   </div>
 
+  <!--<div class="">
+    {{ copy_to_clipboard(template.id, name="Template ID", thing='template ID') }}
+  </div>-->
+
 {% endblock %}
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index 0ab770c181..806474c491 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -1521,7 +1521,7 @@ def test_link_to_upload_not_offered_when_entering_personalisation(
 
     # We’re entering personalization
     assert page.select_one("input[type=text]")["name"] == "placeholder_value"
-    assert page.select_one("label[for=phone-number]").text.strip() == "name"
+    assert page.select_one("label[for=placeholder_value]").text.strip() == "name"
     # No ‘Upload’ link shown
     assert len(page.select("main a")) == 0
     assert "Upload" not in page.select_one("main").text
diff --git a/tests/app/main/views/test_tour.py b/tests/app/main/views/test_tour.py
index 9a2b8f053b..2916d08870 100644
--- a/tests/app/main/views/test_tour.py
+++ b/tests/app/main/views/test_tour.py
@@ -175,7 +175,7 @@ def test_should_show_empty_text_box(
     # shouldn’t also be set on the textbox itself
     assert "data-module" not in textbox
     assert (
-        normalize_spaces(page.select_one("label[for=phone-number]").text) == "one"
+        normalize_spaces(page.select_one("label[for=placeholder_value]").text) == "one"
     )
 
 

From 17c6cd6e0309ee1a5a20e70f561dabc811a1eb4e Mon Sep 17 00:00:00 2001
From: Carlo Costino <carlo.costino@gsa.gov>
Date: Wed, 22 Jan 2025 10:32:28 -0500
Subject: [PATCH 45/62] Update no-cost service details

This changeset updates the no-cost service details to show the correct amount of messages for the first year (100,000 instead of 250,000).

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
---
 app/templates/views/join-notify.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/join-notify.html b/app/templates/views/join-notify.html
index 78af499f2b..2e8cfee526 100644
--- a/app/templates/views/join-notify.html
+++ b/app/templates/views/join-notify.html
@@ -34,7 +34,7 @@ <h3>What partners receive</h3>
   {% set product_highlights = [
   {
   "svg_src": "#chat",
-  "card_heading": "Up to 250,000 messages to use over your first year*",
+  "card_heading": "Up to 100,000 messages to use over your first year*",
   },
   {
   "svg_src": "#phone",

From cb41d9e70655ed954e7c02b3d6b6735a22051d98 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Wed, 22 Jan 2025 10:41:29 -0800
Subject: [PATCH 46/62] changing guidance to how-do

---
 app/content/get-started.md                     |  2 +-
 app/main/views/index.py                        | 18 +++++++++---------
 app/main/views/sub_navigation_dictionaries.py  |  2 +-
 app/navigation.py                              |  2 +-
 app/templates/views/features.html              |  2 +-
 .../create-and-send-messages.html              |  0
 .../edit-and-format-messages.html              |  0
 .../views/{guidance => how-to}/index.html      |  4 ++--
 .../send-files-by-email.html                   |  0
 app/templates/views/support/index.html         |  2 +-
 tests/app/main/views/test_index.py             |  2 +-
 tests/app/test_navigation.py                   |  2 +-
 urls.js                                        |  2 +-
 13 files changed, 19 insertions(+), 19 deletions(-)
 rename app/templates/views/{guidance => how-to}/create-and-send-messages.html (100%)
 rename app/templates/views/{guidance => how-to}/edit-and-format-messages.html (100%)
 rename app/templates/views/{guidance => how-to}/index.html (98%)
 rename app/templates/views/{guidance => how-to}/send-files-by-email.html (100%)

diff --git a/app/content/get-started.md b/app/content/get-started.md
index 7d18aacbd7..c97b9efc60 100644
--- 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/guidance) to increase response.
+Learn how to [personalize messages](/using-notify/how-to) to increase response.
 
 3. ## Check delivery status
 [Analyze the delivery](/using-notify/delivery-status) of your messages and download reports
diff --git a/app/main/views/index.py b/app/main/views/index.py
index 8b63d2bd83..5c0312afc4 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -217,11 +217,11 @@ def benchmark_performance():
     )
 
 
-@main.route("/using-notify/guidance")
+@main.route("/using-notify/how-to")
 @user_is_logged_in
-def guidance_index():
+def how_to():
     return render_template(
-        "views/guidance/index.html",
+        "views/how-to/index.html",
         navigation_links=using_notify_nav(),
     )
 
@@ -266,29 +266,29 @@ def join_notify():
     )
 
 
-@main.route("/using-notify/guidance/create-and-send-messages")
+@main.route("/using-notify/how-to/create-and-send-messages")
 @user_is_logged_in
 def create_and_send_messages():
     return render_template(
-        "views/guidance/create-and-send-messages.html",
+        "views/how-to/create-and-send-messages.html",
         navigation_links=using_notify_nav(),
     )
 
 
-@main.route("/using-notify/guidance/edit-and-format-messages")
+@main.route("/using-notify/how-to/edit-and-format-messages")
 @user_is_logged_in
 def edit_and_format_messages():
     return render_template(
-        "views/guidance/edit-and-format-messages.html",
+        "views/how-to/edit-and-format-messages.html",
         navigation_links=using_notify_nav(),
     )
 
 
-@main.route("/using-notify/guidance/send-files-by-email")
+@main.route("/using-notify/how-to/send-files-by-email")
 @user_is_logged_in
 def send_files_by_email():
     return render_template(
-        "views/guidance/send-files-by-email.html",
+        "views/how-to/send-files-by-email.html",
         navigation_links=using_notify_nav(),
     )
 
diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py
index 3b2cf84c17..d6f437309d 100644
--- a/app/main/views/sub_navigation_dictionaries.py
+++ b/app/main/views/sub_navigation_dictionaries.py
@@ -34,7 +34,7 @@ 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": "Guidance", "link": "main.guidance_index"},
+        {"name": "How to", "link": "main.how_to"},
     ]
 
     return nav_items
diff --git a/app/navigation.py b/app/navigation.py
index 424d03ae3a..f20df4e5fe 100644
--- a/app/navigation.py
+++ b/app/navigation.py
@@ -54,7 +54,7 @@ class HeaderNavigation(Navigation):
             "pricing",
             "trial_mode_new",
             "message_status",
-            "guidance_index",
+            "how_to",
         },
         "accounts-or-dashboard": {
             "conversation",
diff --git a/app/templates/views/features.html b/app/templates/views/features.html
index 456f168159..0f7e7eb58c 100644
--- a/app/templates/views/features.html
+++ b/app/templates/views/features.html
@@ -28,7 +28,7 @@ <h2 class="heading-medium" id="organizing-content">Organizing your content</h2>
 
 <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('.guidance_index', _anchor='personalized-content') }}">how to personalize your content</a>.</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>
 
 <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>
diff --git a/app/templates/views/guidance/create-and-send-messages.html b/app/templates/views/how-to/create-and-send-messages.html
similarity index 100%
rename from app/templates/views/guidance/create-and-send-messages.html
rename to app/templates/views/how-to/create-and-send-messages.html
diff --git a/app/templates/views/guidance/edit-and-format-messages.html b/app/templates/views/how-to/edit-and-format-messages.html
similarity index 100%
rename from app/templates/views/guidance/edit-and-format-messages.html
rename to app/templates/views/how-to/edit-and-format-messages.html
diff --git a/app/templates/views/guidance/index.html b/app/templates/views/how-to/index.html
similarity index 98%
rename from app/templates/views/guidance/index.html
rename to app/templates/views/how-to/index.html
index 062bae555b..4b66f2d038 100644
--- a/app/templates/views/guidance/index.html
+++ b/app/templates/views/how-to/index.html
@@ -4,11 +4,11 @@
 {% from "components/service-link.html" import service_link %}
 
 {% block per_page_title %}
-  Guidance
+  How to
 {% endblock %}
 
 {% block content_column_content %}
-<h1 class="font-body-2xl margin-bottom-3">Guidance</h1>
+<h1 class="font-body-2xl margin-bottom-3">How to</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>
diff --git a/app/templates/views/guidance/send-files-by-email.html b/app/templates/views/how-to/send-files-by-email.html
similarity index 100%
rename from app/templates/views/guidance/send-files-by-email.html
rename to app/templates/views/how-to/send-files-by-email.html
diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html
index 7dc86adeb0..035575be10 100644
--- a/app/templates/views/support/index.html
+++ b/app/templates/views/support/index.html
@@ -13,7 +13,7 @@
   <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 and data preparation, see <a href={{ url_for("main.guidance_index") }}>Guidance</a>.</li>
+    <li>For information on personalization and data preparation, 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 details on pricing and what counts as a message part, see <a href={{ url_for("main.pricing") }}>Pricing</a>.</li>
   </ul>
diff --git a/tests/app/main/views/test_index.py b/tests/app/main/views/test_index.py
index eaa9134250..51f1a5c83e 100644
--- 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",
-        "guidance_index",
+        "how_to",
         "create_and_send_messages",
         "edit_and_format_messages",
         "send_files_by_email",
diff --git a/tests/app/test_navigation.py b/tests/app/test_navigation.py
index ed4d66182b..47f3f8ea20 100644
--- a/tests/app/test_navigation.py
+++ b/tests/app/test_navigation.py
@@ -111,7 +111,7 @@
             "get_started_old",
             "go_to_dashboard_after_tour",
             "guest_list",
-            "guidance_index",
+            "how_to",
             "history",
             "how_to_pay",
             "inbound_sms_admin",
diff --git a/urls.js b/urls.js
index 767c8f0fdf..a7221a5d98 100644
--- 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: 'Guidance', path: '/using-notify/guidance' },
+  { label: 'How To', path: '/using-notify/how-to' },
   { label: 'Support', path: '/support' },
   { label: 'Best Practices', path: '/using-notify/best-practices' },
   { label: 'Clear Goals', path: '/using-notify/best-practices/clear-goals' },

From aa03fc1cc02a09c94f215c8e6c1a84ab025cb3c0 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Wed, 22 Jan 2025 10:55:42 -0800
Subject: [PATCH 47/62] Sentence case

---
 app/main/views/sub_navigation_dictionaries.py         | 4 ++--
 app/templates/views/guides/benchmark-performance.html | 2 +-
 app/templates/views/guides/best-practices.html        | 4 ++--
 app/templates/views/guides/clear-goals.html           | 2 +-
 app/templates/views/guides/establish-trust.html       | 2 +-
 app/templates/views/guides/multiple-languages.html    | 2 +-
 app/templates/views/guides/rules-and-regulations.html | 2 +-
 app/templates/views/guides/write-for-action.html      | 2 +-
 app/templates/views/how-to/index.html                 | 4 ++--
 app/templates/views/support/index.html                | 4 ++--
 10 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/main/views/sub_navigation_dictionaries.py b/app/main/views/sub_navigation_dictionaries.py
index d6f437309d..db086e5112 100644
--- 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,7 +33,7 @@ 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": "Delivery status", "link": "main.message_status"},
         {"name": "How to", "link": "main.how_to"},
     ]
 
diff --git a/app/templates/views/guides/benchmark-performance.html b/app/templates/views/guides/benchmark-performance.html
index bd2662fbec..c302fc5b87 100644
--- 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>
diff --git a/app/templates/views/guides/best-practices.html b/app/templates/views/guides/best-practices.html
index 9826e6a33e..1f46d45440 100644
--- 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.
diff --git a/app/templates/views/guides/clear-goals.html b/app/templates/views/guides/clear-goals.html
index d1054e3a9f..a6e3a742b3 100644
--- 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>
diff --git a/app/templates/views/guides/establish-trust.html b/app/templates/views/guides/establish-trust.html
index 0ab95c73aa..026e9da81f 100644
--- 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>
diff --git a/app/templates/views/guides/multiple-languages.html b/app/templates/views/guides/multiple-languages.html
index f295df3087..b8bb7883cf 100644
--- 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>
diff --git a/app/templates/views/guides/rules-and-regulations.html b/app/templates/views/guides/rules-and-regulations.html
index 5943e462d7..8ad6d000bd 100644
--- 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>
diff --git a/app/templates/views/guides/write-for-action.html b/app/templates/views/guides/write-for-action.html
index ff382864a7..31ac2aa841 100644
--- 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>
diff --git a/app/templates/views/how-to/index.html b/app/templates/views/how-to/index.html
index 4b66f2d038..aa2361cb60 100644
--- a/app/templates/views/how-to/index.html
+++ b/app/templates/views/how-to/index.html
@@ -61,7 +61,7 @@ <h3>To personalize your content</h3>
 <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. See <a href="#prepare-data">data preparation</a>.</li>
+  work for you.</li>
 </ol>
 
 <h4>Example</h4>
@@ -80,7 +80,7 @@ <h3>To add conditional content</h3>
 <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. See <a href="#prepare-data">data preparation</a>.</li>
+  do the work for you.</li>
 </ol>
 
 <h4>Examples</h4>
diff --git a/app/templates/views/support/index.html b/app/templates/views/support/index.html
index 035575be10..393d6198e5 100644
--- 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 and data preparation, 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, 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 details on pricing and what counts as a message part, see <a href={{ url_for("main.pricing") }}>Pricing</a>.</li>
   </ul>
 

From c47033af7f81bdda5d64a08df0549fdc14b664ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sheev=20Dav=C3=A9?= <sheev.dave@gsa.gov>
Date: Wed, 22 Jan 2025 13:23:05 -0800
Subject: [PATCH 48/62] Update pull_request_template.md

added more a11y specific checks
---
 .github/pull_request_template.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 7ffbbc2907..a659829b26 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -23,5 +23,7 @@ Please enter a detailed description here.
 
 ## A11y Checks (if applicable)
 
-* Conduct automated tests through [AxeDevTools](https://www.deque.com/axe/devtools/) and [WAVE](https://wave.webaim.org/)
+* Double check work is getting picked up by the automated E2E tests 
+* Conduct browser-based tests through [AxeDevTools](https://www.deque.com/axe/devtools/) and [WAVE](https://wave.webaim.org/)
 * Review the [Manual Checklist](https://docs.google.com/document/d/192bBXStebdXWtYhZQ73qaWMJhGcuSB1W6c9YBXhWZvc/edit?usp=sharing)
+* Make sure there are no linting errors in VSCode or other IDE of choice

From cae2ec1a6df0ee64d70dce45640d39046c07f67f Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 23 Jan 2025 11:53:27 -0800
Subject: [PATCH 49/62] refactor naming

---
 app/assets/javascripts/activityChart.js           |  3 ++-
 app/main/views/dashboard.py                       | 13 +++++--------
 app/templates/views/dashboard/activity-table.html |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/assets/javascripts/activityChart.js b/app/assets/javascripts/activityChart.js
index f12774c681..efdda477fe 100644
--- a/app/assets/javascripts/activityChart.js
+++ b/app/assets/javascripts/activityChart.js
@@ -4,6 +4,7 @@
         let currentType = 'service';
         const tableContainer = document.getElementById('activityContainer');
         const currentUserName = tableContainer.getAttribute('data-currentUserName');
+        const currentServiceId = tableContainer.getAttribute('data-currentServiceId');
         const COLORS = {
             delivered: '#0076d6',
             failed: '#fa9441',
@@ -212,7 +213,7 @@
             return;
         }
 
-        var url = type === 'service' ? `/daily_stats.json` : `/daily_stats_by_user.json`;
+        var url = type === 'service' ? `/services/${currentServiceId}/daily-stats.json` : `/services/${currentServiceId}/daily-stats-by-user.json`;
         return fetch(url)
             .then(response => {
                 if (!response.ok) {
diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index 1f8cac5730..f20af83e83 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -76,25 +76,22 @@ def service_dashboard(service_id):
     )
 
 
-@main.route("/daily_stats.json")
-def get_daily_stats():
-    service_id = session.get("service_id")
+@main.route("/services/<uuid:service_id>/daily-stats.json")
+def get_daily_stats(service_id):
     date_range = get_stats_date_range()
-
     stats = service_api_client.get_service_notification_statistics_by_day(
         service_id, start_date=date_range["start_date"], days=date_range["days"]
     )
     return jsonify(stats)
 
 
-@main.route("/daily_stats_by_user.json")
-def get_daily_stats_by_user():
+@main.route("/services/<uuid:service_id>/daily-stats-by-user.json")
+def get_daily_stats_by_user(service_id):
     service_id = session.get("service_id")
     date_range = get_stats_date_range()
-    user_id = current_user.id
     stats = service_api_client.get_user_service_notification_statistics_by_day(
         service_id,
-        user_id,
+        user_id=current_user.id,
         start_date=date_range["start_date"],
         days=date_range["days"],
     )
diff --git a/app/templates/views/dashboard/activity-table.html b/app/templates/views/dashboard/activity-table.html
index a40840033d..7a8bd7736b 100644
--- a/app/templates/views/dashboard/activity-table.html
+++ b/app/templates/views/dashboard/activity-table.html
@@ -18,7 +18,7 @@ <h2 class="line-height-sans-2 margin-bottom-0 margin-top-4">Recent activity</h2>
     </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 class="table-container" id="activityContainer" data-currentUserName="{{ current_user.name }}" data-currentServiceId="{{current_service.id}}">
     <div id="tableActivity" class="table-overflow-x-auto">
         <h2 id="table-heading" class="margin-top-4 margin-bottom-1">Service activity</h2>
 

From 4e335561e338a98fd54e9028ba806e21d3babb46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sheev=20Dav=C3=A9?= <sheev.dave@gsa.gov>
Date: Thu, 23 Jan 2025 11:57:37 -0800
Subject: [PATCH 50/62] Update issue_template.yml

added "This includes items related to accessibility." to 3 sections
---
 .github/ISSUE_TEMPLATE/issue_template.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/issue_template.yml b/.github/ISSUE_TEMPLATE/issue_template.yml
index 576af00957..d5ca9c7684 100644
--- a/.github/ISSUE_TEMPLATE/issue_template.yml
+++ b/.github/ISSUE_TEMPLATE/issue_template.yml
@@ -37,7 +37,7 @@ body:
   - type: textarea
     id: acceptanceCriteria
     attributes:
-      label: "Detailed condition or criteria that must be met for the user story to be considered complete."
+      label: "Detailed condition or criteria that must be met for the user story to be considered complete. This includes items related to accessibility."
       description: "List the acceptance criteria for the user story."
     validations:
       required: true
@@ -59,7 +59,7 @@ body:
   - type: textarea
     id: dependencies
     attributes:
-      label: "List any dependencies that need to be resolved before starting or completing this user story."
+      label: "List any dependencies that need to be resolved before starting or completing this user story. This includes items related to accessibility."
       description: "Specify any dependencies related to the user story."
     validations:
       required: false
@@ -70,7 +70,7 @@ body:
   - type: textarea
     id: notes
     attributes:
-      label: "Any additional information or context that might be useful for the team."
+      label: "Any additional information or context that might be useful for the team. This includes items related to accessibility."
       description: "Provide any extra notes or context for the user story."
     validations:
       required: false

From 933348baa5d473ed1391b19978b520e1c52520a6 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 23 Jan 2025 13:24:11 -0800
Subject: [PATCH 51/62] Fix jest

---
 tests/javascripts/activityChart.test.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/javascripts/activityChart.test.js b/tests/javascripts/activityChart.test.js
index 3c6f20f3b5..168e69c623 100644
--- a/tests/javascripts/activityChart.test.js
+++ b/tests/javascripts/activityChart.test.js
@@ -40,7 +40,7 @@ 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="activityContainer" data-currentUserName="Test User" data-currentServiceId="12345"></div>
 
     <div id="aria-live-account" class="usa-sr-only" aria-live="polite"></div>
   `;
@@ -186,6 +186,9 @@ test('Fetches data and creates chart and table correctly', async () => {
     '2024-07-06': { sms: { delivered: 100, failed: 4, pending: 5 } },
     '2024-07-07': { sms: { delivered: 110, failed: 2, pending: 3 } },
   };
+  const tableContainer = document.getElementById('activityContainer');
+  const currentServiceId = tableContainer.getAttribute('data-currentServiceId');
+
 
   global.fetch = jest.fn(() =>
     Promise.resolve({
@@ -196,7 +199,7 @@ test('Fetches data and creates chart and table correctly', async () => {
 
   const data = await fetchData('service');
 
-  expect(global.fetch).toHaveBeenCalledWith('/daily_stats.json');
+  expect(global.fetch).toHaveBeenCalledWith(`/services/${currentServiceId}/daily-stats.json`);
   expect(data).toEqual(mockResponse);
 
   const labels = Object.keys(mockResponse).map(dateString => {
@@ -225,7 +228,7 @@ test('handleDropdownChange updates DOM for individual selection', () => {
       <div class="chart-subtitle"></div>
     </div>
     <div id="aria-live-account"></div>
-    <div id="activityContainer" data-currentUserName="Test User"></div>
+    <div id="activityContainer" data-currentUserName="Test User" data-currentServiceId="12345"></div>
     <div id="tableActivity">
       <h2 id="table-heading"></h2>
       <table id="activity-table">

From fc755c1b858b291d354f2a4c7dbe496ee11fab99 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Thu, 23 Jan 2025 14:03:59 -0800
Subject: [PATCH 52/62] test

---
 app/main/views/dashboard.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/main/views/dashboard.py b/app/main/views/dashboard.py
index f20af83e83..6b5edf6f40 100644
--- a/app/main/views/dashboard.py
+++ b/app/main/views/dashboard.py
@@ -77,6 +77,7 @@ def service_dashboard(service_id):
 
 
 @main.route("/services/<uuid:service_id>/daily-stats.json")
+@user_has_permissions()
 def get_daily_stats(service_id):
     date_range = get_stats_date_range()
     stats = service_api_client.get_service_notification_statistics_by_day(
@@ -86,6 +87,7 @@ def get_daily_stats(service_id):
 
 
 @main.route("/services/<uuid:service_id>/daily-stats-by-user.json")
+@user_has_permissions()
 def get_daily_stats_by_user(service_id):
     service_id = session.get("service_id")
     date_range = get_stats_date_range()

From 1566198343cde77fb77b3b5d081ff8a97716893c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Jan 2025 23:10:47 +0000
Subject: [PATCH 53/62] Bump playwright from 1.49.1 to 1.50.0

Bumps [playwright](https://github.com/microsoft/playwright) from 1.49.1 to 1.50.0.
- [Release notes](https://github.com/microsoft/playwright/releases)
- [Commits](https://github.com/microsoft/playwright/compare/v1.49.1...v1.50.0)

---
updated-dependencies:
- dependency-name: playwright
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 18 ++++++++++--------
 package.json      |  2 +-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e501b84474..40dddc0fed 100644
--- 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.49.1",
+        "playwright": "^1.50.0",
         "python": "^0.0.4",
         "query-command-supported": "1.0.0",
         "sass-embedded": "^1.83.4",
@@ -11802,11 +11802,12 @@
       }
     },
     "node_modules/playwright": {
-      "version": "1.49.1",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.49.1.tgz",
-      "integrity": "sha512-VYL8zLoNTBxVOrJBbDuRgDWa3i+mfQgDTrL8Ah9QXZ7ax4Dsj0MSq5bYgytRnDVVe+njoKnfsYkH3HzqVj5UZA==",
+      "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",
       "dependencies": {
-        "playwright-core": "1.49.1"
+        "playwright-core": "1.50.0"
       },
       "bin": {
         "playwright": "cli.js"
@@ -11819,9 +11820,10 @@
       }
     },
     "node_modules/playwright-core": {
-      "version": "1.49.1",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.49.1.tgz",
-      "integrity": "sha512-BzmpVcs4kE2CH15rWfzpjzVGhWERJfmnXmniSyKeRZUs9Ws65m+RGIi7mjJK/euCegfn3i7jvqWeWyHe9y3Vgg==",
+      "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",
       "bin": {
         "playwright-core": "cli.js"
       },
diff --git a/package.json b/package.json
index 0b13206bea..411bb735b0 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "hogan": "1.0.2",
     "jquery": "3.7.1",
     "morphdom": "^2.7.4",
-    "playwright": "^1.49.1",
+    "playwright": "^1.50.0",
     "python": "^0.0.4",
     "query-command-supported": "1.0.0",
     "sass-embedded": "^1.83.4",

From 296a964913b85c274012a328519436525e0f46b7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 23:06:49 +0000
Subject: [PATCH 54/62] Bump @babel/core from 7.26.0 to 7.26.7

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.26.0 to 7.26.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.26.7/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 97 ++++++++++++++++++++++++++---------------------
 package.json      |  2 +-
 2 files changed, 54 insertions(+), 45 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 40dddc0fed..a10363e558 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -31,7 +31,7 @@
         "vinyl-source-stream": "^2.0.0"
       },
       "devDependencies": {
-        "@babel/core": "^7.26.0",
+        "@babel/core": "^7.26.7",
         "@babel/preset-env": "^7.26.0",
         "@uswds/compile": "^1.2.1",
         "backstopjs": "^6.3.25",
@@ -72,10 +72,11 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.0.tgz",
-      "integrity": "sha512-INCKxTtbXtcNbUZ3YXutwMpEleqttcswhAdee7dhuoVrD2cnuc3PqtERBtxkX5nziX9vnBL8WXmSGwv8CuPV6g==",
+      "version": "7.26.2",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
+      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.25.9",
         "js-tokens": "^4.0.0",
@@ -86,30 +87,32 @@
       }
     },
     "node_modules/@babel/compat-data": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.2.tgz",
-      "integrity": "sha512-Z0WgzSEa+aUcdiJuCIqgujCshpMWgUpgOxXotrYPSA53hA3qopNaqcJpyr0hVb1FeWdnqFA35/fUtXgBK8srQg==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.5.tgz",
+      "integrity": "sha512-XvcZi1KWf88RVbF9wn8MN6tYFloU5qX8KjuF3E1PVBmJ9eypXfs4GRiJwLuTZL0iSnJUKn1BFPa5BPZZJyFzPg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/core": {
-      "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==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.7.tgz",
+      "integrity": "sha512-SRijHmF0PSPgLIBYlWnG0hyeJLwXE2CgpsXaMOrtt2yp9/86ALw6oUlj9KYuZ0JN07T4eBMVIW4li/9S1j2BGA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.2.0",
-        "@babel/code-frame": "^7.26.0",
-        "@babel/generator": "^7.26.0",
-        "@babel/helper-compilation-targets": "^7.25.9",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.5",
+        "@babel/helper-compilation-targets": "^7.26.5",
         "@babel/helper-module-transforms": "^7.26.0",
-        "@babel/helpers": "^7.26.0",
-        "@babel/parser": "^7.26.0",
+        "@babel/helpers": "^7.26.7",
+        "@babel/parser": "^7.26.7",
         "@babel/template": "^7.25.9",
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.26.0",
+        "@babel/traverse": "^7.26.7",
+        "@babel/types": "^7.26.7",
         "convert-source-map": "^2.0.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.2",
@@ -125,13 +128,14 @@
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.0.tgz",
-      "integrity": "sha512-/AIkAmInnWwgEAJGQr9vY0c66Mj6kjkE2ZPB1PurTRaRAh3U+J45sAQMjQDJdh4WbR3l0x5xkimXBKyBXXAu2w==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
+      "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.26.0",
-        "@babel/types": "^7.26.0",
+        "@babel/parser": "^7.26.5",
+        "@babel/types": "^7.26.5",
         "@jridgewell/gen-mapping": "^0.3.5",
         "@jridgewell/trace-mapping": "^0.3.25",
         "jsesc": "^3.0.2"
@@ -166,12 +170,13 @@
       }
     },
     "node_modules/@babel/helper-compilation-targets": {
-      "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==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz",
+      "integrity": "sha512-IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.25.9",
+        "@babel/compat-data": "^7.26.5",
         "@babel/helper-validator-option": "^7.25.9",
         "browserslist": "^4.24.0",
         "lru-cache": "^5.1.1",
@@ -401,25 +406,27 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.0.tgz",
-      "integrity": "sha512-tbhNuIxNcVb21pInl3ZSjksLCvgdZy9KwJ8brv993QtIVKJBBkYXz4q4ZbAv31GdnC+R90np23L5FbEBlthAEw==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.7.tgz",
+      "integrity": "sha512-8NHiL98vsi0mbPQmYAGWwfcFaOy4j2HY49fXJCfuDcdE7fMIsH9a7GdaeXpIBsbT7307WU8KCMp5pUVDNL4f9A==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/template": "^7.25.9",
-        "@babel/types": "^7.26.0"
+        "@babel/types": "^7.26.7"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.0.tgz",
-      "integrity": "sha512-aP8x5pIw3xvYr/sXT+SEUwyhrXT8rUJRZltK/qN3Db80dcKpTett8cJxHyjk+xYSVXvNnl2SfcJVjbwxpOSscA==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
+      "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.0"
+        "@babel/types": "^7.26.7"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -1655,16 +1662,17 @@
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.9.tgz",
-      "integrity": "sha512-ZCuvfwOwlz/bawvAuvcj8rrithP2/N55Tzz342AkTvq4qaWbGfmCk/tKhNaV2cthijKrPAA8SRJV5WWe7IBMJw==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz",
+      "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.25.9",
-        "@babel/generator": "^7.25.9",
-        "@babel/parser": "^7.25.9",
+        "@babel/code-frame": "^7.26.2",
+        "@babel/generator": "^7.26.5",
+        "@babel/parser": "^7.26.7",
         "@babel/template": "^7.25.9",
-        "@babel/types": "^7.25.9",
+        "@babel/types": "^7.26.7",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -1673,10 +1681,11 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.0.tgz",
-      "integrity": "sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
+      "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.25.9",
         "@babel/helper-validator-identifier": "^7.25.9"
diff --git a/package.json b/package.json
index 411bb735b0..880f2772ec 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "vinyl-source-stream": "^2.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.0",
+    "@babel/core": "^7.26.7",
     "@babel/preset-env": "^7.26.0",
     "@uswds/compile": "^1.2.1",
     "backstopjs": "^6.3.25",

From 53b1e12b564d0e77ffc23e23afe102df203e5dd4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 24 Jan 2025 23:06:57 +0000
Subject: [PATCH 55/62] Bump rollup from 4.31.0 to 4.32.0

Bumps [rollup](https://github.com/rollup/rollup) from 4.31.0 to 4.32.0.
- [Release notes](https://github.com/rollup/rollup/releases)
- [Changelog](https://github.com/rollup/rollup/blob/master/CHANGELOG.md)
- [Commits](https://github.com/rollup/rollup/compare/v4.31.0...v4.32.0)

---
updated-dependencies:
- dependency-name: rollup
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 160 +++++++++++++++++++++++-----------------------
 package.json      |   2 +-
 2 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 40dddc0fed..0d238eb2f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,7 +50,7 @@
         "jest-environment-jsdom": "^29.2.2",
         "jshint": "2.13.6",
         "jshint-stylish": "2.2.1",
-        "rollup": "^4.31.0",
+        "rollup": "^4.32.0",
         "rollup-plugin-commonjs": "10.1.0",
         "rollup-plugin-node-resolve": "5.2.0"
       },
@@ -2621,9 +2621,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "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==",
+      "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==",
       "cpu": [
         "arm"
       ],
@@ -2634,9 +2634,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "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==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -2647,9 +2647,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz",
-      "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -2660,9 +2660,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "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==",
+      "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==",
       "cpu": [
         "x64"
       ],
@@ -2673,9 +2673,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz",
-      "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.32.0.tgz",
+      "integrity": "sha512-JpsGxLBB2EFXBsTLHfkZDsXSpSmKD3VxXCgBQtlPcuAqB8TlqtLcbeMhxXQkCDv1avgwNjF8uEIbq5p+Cee0PA==",
       "cpu": [
         "arm64"
       ],
@@ -2686,9 +2686,9 @@
       ]
     },
     "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz",
-      "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==",
+      "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==",
       "cpu": [
         "x64"
       ],
@@ -2699,9 +2699,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "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==",
+      "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==",
       "cpu": [
         "arm"
       ],
@@ -2712,9 +2712,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "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==",
+      "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==",
       "cpu": [
         "arm"
       ],
@@ -2725,9 +2725,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "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==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -2738,9 +2738,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "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==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -2751,9 +2751,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "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==",
+      "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==",
       "cpu": [
         "loong64"
       ],
@@ -2764,9 +2764,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "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==",
+      "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==",
       "cpu": [
         "ppc64"
       ],
@@ -2777,9 +2777,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "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==",
+      "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==",
       "cpu": [
         "riscv64"
       ],
@@ -2790,9 +2790,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "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==",
+      "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==",
       "cpu": [
         "s390x"
       ],
@@ -2803,9 +2803,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "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==",
+      "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==",
       "cpu": [
         "x64"
       ],
@@ -2816,9 +2816,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "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==",
+      "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==",
       "cpu": [
         "x64"
       ],
@@ -2829,9 +2829,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "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==",
+      "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==",
       "cpu": [
         "arm64"
       ],
@@ -2842,9 +2842,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "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==",
+      "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==",
       "cpu": [
         "ia32"
       ],
@@ -2855,9 +2855,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "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==",
+      "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==",
       "cpu": [
         "x64"
       ],
@@ -12744,9 +12744,9 @@
       "license": "Unlicense"
     },
     "node_modules/rollup": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz",
-      "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==",
+      "version": "4.32.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.32.0.tgz",
+      "integrity": "sha512-JmrhfQR31Q4AuNBjjAX4s+a/Pu/Q8Q9iwjWBsjRH1q52SPFE2NqRMK6fUZKKnvKO6id+h7JIRf0oYsph53eATg==",
       "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.6"
@@ -12759,25 +12759,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@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",
+        "@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",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/package.json b/package.json
index 411bb735b0..1fe9b2238f 100644
--- a/package.json
+++ b/package.json
@@ -66,7 +66,7 @@
     "jest-environment-jsdom": "^29.2.2",
     "jshint": "2.13.6",
     "jshint-stylish": "2.2.1",
-    "rollup": "^4.31.0",
+    "rollup": "^4.32.0",
     "rollup-plugin-commonjs": "10.1.0",
     "rollup-plugin-node-resolve": "5.2.0"
   }

From 03984bc10ba30d265b78186036c41d083e680964 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:16:51 +0000
Subject: [PATCH 56/62] Bump @babel/preset-env from 7.26.0 to 7.26.7

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.26.0 to 7.26.7.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.26.7/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 105 +++++++++++++++++++---------------------------
 package.json      |   2 +-
 2 files changed, 43 insertions(+), 64 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9cee8c133c..6970133bcf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -32,7 +32,7 @@
       },
       "devDependencies": {
         "@babel/core": "^7.26.7",
-        "@babel/preset-env": "^7.26.0",
+        "@babel/preset-env": "^7.26.7",
         "@uswds/compile": "^1.2.1",
         "backstopjs": "^6.3.25",
         "better-npm-audit": "^3.11.0",
@@ -156,19 +156,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/helper-builder-binary-assignment-operator-visitor": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.25.9.tgz",
-      "integrity": "sha512-C47lC7LIDCnz0h4vai/tpNOI95tCd5ZT3iBt/DBH5lXKHZsyNQv18yf1wIIg2ntiQNgmAvA+DgZ82iW8Qdym8g==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "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",
@@ -296,10 +283,11 @@
       }
     },
     "node_modules/@babel/helper-plugin-utils": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.25.9.tgz",
-      "integrity": "sha512-kSMlyUVdWe25rEsRGviIgOWnoT/nfABVWlqt9N19/dIPWViAOW2s9wznP5tURbs/IDuNk4gPy3YdYRgH3uxhBw==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
+      "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -338,19 +326,6 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/helper-simple-access": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.25.9.tgz",
-      "integrity": "sha512-c6WHXuiaRsJTyHYLJV75t9IqsmTbItYfdj99PnzYGQZkYKvan5/2jKJ7gu31J3/BJ/A18grImSPModuyG/Eo0Q==",
-      "dev": true,
-      "dependencies": {
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.25.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-skip-transparent-expression-wrappers": {
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz",
@@ -799,12 +774,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoped-functions": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.25.9.tgz",
-      "integrity": "sha512-toHc9fzab0ZfenFpsyYinOX0J/5dgJVA2fm64xPewu7CoYHWEivIWKxkK2rMi4r3yQqLnVmheMXRdG+k239CgA==",
+      "version": "7.26.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.26.5.tgz",
+      "integrity": "sha512-chuTSY+hq09+/f5lMj8ZSYgCFpppV2CbYrhNFJ1BFoXpiWPnnAb7R0MqrafCpN8E1+YRrtM1MXZHJdIx8B6rMQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -974,12 +950,12 @@
       }
     },
     "node_modules/@babel/plugin-transform-exponentiation-operator": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.25.9.tgz",
-      "integrity": "sha512-KRhdhlVk2nObA5AYa7QMgTMTVJdfHprfpAk4DjZVtllqRg9qarilstTKEhpVjyt+Npi8ThRyiV8176Am3CodPA==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.26.3.tgz",
+      "integrity": "sha512-7CAHcQ58z2chuXPWblnn1K6rLDnDWieghSOEmqQsrBenH0P9InCUtOJYD89pvngljmZlJcz3fcmgYsXFNGa1ZQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-builder-binary-assignment-operator-visitor": "^7.25.9",
         "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
@@ -1114,14 +1090,14 @@
       }
     },
     "node_modules/@babel/plugin-transform-modules-commonjs": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.25.9.tgz",
-      "integrity": "sha512-dwh2Ol1jWwL2MgkCzUSOvfmKElqQcuswAZypBSUsScMXvgdT8Ekq5YA6TtqpTVWH+4903NmboMuH1o9i8Rxlyg==",
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz",
+      "integrity": "sha512-MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-module-transforms": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
-        "@babel/helper-simple-access": "^7.25.9"
+        "@babel/helper-module-transforms": "^7.26.0",
+        "@babel/helper-plugin-utils": "^7.25.9"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1196,12 +1172,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-nullish-coalescing-operator": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.25.9.tgz",
-      "integrity": "sha512-ENfftpLZw5EItALAD4WsY/KUWvhUlZndm5GC7G3evUsVeSJB6p0pBeLQUnRnBCBx7zV0RKQjR9kCuwrsIrjWog==",
+      "version": "7.26.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.26.6.tgz",
+      "integrity": "sha512-CKW8Vu+uUZneQCPtXmSBUC6NCAUdya26hWCElAWh5mVSlSRsmiCPUUDKb3Z0szng1hiAJa098Hkhg9o4SE35Qw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1461,12 +1438,13 @@
       }
     },
     "node_modules/@babel/plugin-transform-typeof-symbol": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.25.9.tgz",
-      "integrity": "sha512-v61XqUMiueJROUv66BVIOi0Fv/CUuZuZMl5NkRoCVxLAnMexZ0A3kMe7vvZ0nulxMuMp0Mk6S5hNh48yki08ZA==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.26.7.tgz",
+      "integrity": "sha512-jfoTXXZTgGg36BmhqT3cAYK5qkmqvJpvNrPhaK/52Vgjhw4Rq29s9UqpWWV0D6yuRmgiFH/BUVlkl96zJWqnaw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-plugin-utils": "^7.25.9"
+        "@babel/helper-plugin-utils": "^7.26.5"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -1539,14 +1517,15 @@
       }
     },
     "node_modules/@babel/preset-env": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.0.tgz",
-      "integrity": "sha512-H84Fxq0CQJNdPFT2DrfnylZ3cf5K43rGfWK4LJGPpjKHiZlk0/RzwEus3PDDZZg+/Er7lCA03MVacueUuXdzfw==",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.26.7.tgz",
+      "integrity": "sha512-Ycg2tnXwixaXOVb29rana8HNPgLVBof8qqtNQ9LE22IoyZboQbGSxI6ZySMdW3K5nAe6gu35IaJefUJflhUFTQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/compat-data": "^7.26.0",
-        "@babel/helper-compilation-targets": "^7.25.9",
-        "@babel/helper-plugin-utils": "^7.25.9",
+        "@babel/compat-data": "^7.26.5",
+        "@babel/helper-compilation-targets": "^7.26.5",
+        "@babel/helper-plugin-utils": "^7.26.5",
         "@babel/helper-validator-option": "^7.25.9",
         "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "^7.25.9",
         "@babel/plugin-bugfix-safari-class-field-initializer-scope": "^7.25.9",
@@ -1560,7 +1539,7 @@
         "@babel/plugin-transform-arrow-functions": "^7.25.9",
         "@babel/plugin-transform-async-generator-functions": "^7.25.9",
         "@babel/plugin-transform-async-to-generator": "^7.25.9",
-        "@babel/plugin-transform-block-scoped-functions": "^7.25.9",
+        "@babel/plugin-transform-block-scoped-functions": "^7.26.5",
         "@babel/plugin-transform-block-scoping": "^7.25.9",
         "@babel/plugin-transform-class-properties": "^7.25.9",
         "@babel/plugin-transform-class-static-block": "^7.26.0",
@@ -1571,7 +1550,7 @@
         "@babel/plugin-transform-duplicate-keys": "^7.25.9",
         "@babel/plugin-transform-duplicate-named-capturing-groups-regex": "^7.25.9",
         "@babel/plugin-transform-dynamic-import": "^7.25.9",
-        "@babel/plugin-transform-exponentiation-operator": "^7.25.9",
+        "@babel/plugin-transform-exponentiation-operator": "^7.26.3",
         "@babel/plugin-transform-export-namespace-from": "^7.25.9",
         "@babel/plugin-transform-for-of": "^7.25.9",
         "@babel/plugin-transform-function-name": "^7.25.9",
@@ -1580,12 +1559,12 @@
         "@babel/plugin-transform-logical-assignment-operators": "^7.25.9",
         "@babel/plugin-transform-member-expression-literals": "^7.25.9",
         "@babel/plugin-transform-modules-amd": "^7.25.9",
-        "@babel/plugin-transform-modules-commonjs": "^7.25.9",
+        "@babel/plugin-transform-modules-commonjs": "^7.26.3",
         "@babel/plugin-transform-modules-systemjs": "^7.25.9",
         "@babel/plugin-transform-modules-umd": "^7.25.9",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.25.9",
         "@babel/plugin-transform-new-target": "^7.25.9",
-        "@babel/plugin-transform-nullish-coalescing-operator": "^7.25.9",
+        "@babel/plugin-transform-nullish-coalescing-operator": "^7.26.6",
         "@babel/plugin-transform-numeric-separator": "^7.25.9",
         "@babel/plugin-transform-object-rest-spread": "^7.25.9",
         "@babel/plugin-transform-object-super": "^7.25.9",
@@ -1602,7 +1581,7 @@
         "@babel/plugin-transform-spread": "^7.25.9",
         "@babel/plugin-transform-sticky-regex": "^7.25.9",
         "@babel/plugin-transform-template-literals": "^7.25.9",
-        "@babel/plugin-transform-typeof-symbol": "^7.25.9",
+        "@babel/plugin-transform-typeof-symbol": "^7.26.7",
         "@babel/plugin-transform-unicode-escapes": "^7.25.9",
         "@babel/plugin-transform-unicode-property-regex": "^7.25.9",
         "@babel/plugin-transform-unicode-regex": "^7.25.9",
diff --git a/package.json b/package.json
index f1af4ad607..b3c43d4018 100644
--- a/package.json
+++ b/package.json
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.26.7",
-    "@babel/preset-env": "^7.26.0",
+    "@babel/preset-env": "^7.26.7",
     "@uswds/compile": "^1.2.1",
     "backstopjs": "^6.3.25",
     "better-npm-audit": "^3.11.0",

From 22fcc703f5f877cd0d918d2e901bffb78d9355ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sheev=20Dav=C3=A9?= <sheev.dave@gsa.gov>
Date: Mon, 27 Jan 2025 12:53:47 -0800
Subject: [PATCH 57/62] Update issue_template.yml

---
 .github/ISSUE_TEMPLATE/issue_template.yml | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/issue_template.yml b/.github/ISSUE_TEMPLATE/issue_template.yml
index d5ca9c7684..ca458b6a5b 100644
--- a/.github/ISSUE_TEMPLATE/issue_template.yml
+++ b/.github/ISSUE_TEMPLATE/issue_template.yml
@@ -37,7 +37,7 @@ body:
   - type: textarea
     id: acceptanceCriteria
     attributes:
-      label: "Detailed condition or criteria that must be met for the user story to be considered complete. This includes items related to accessibility."
+      label: "Detailed condition or criteria that must be met for the user story to be considered complete."
       description: "List the acceptance criteria for the user story."
     validations:
       required: true
@@ -59,18 +59,29 @@ body:
   - type: textarea
     id: dependencies
     attributes:
-      label: "List any dependencies that need to be resolved before starting or completing this user story. This includes items related to accessibility."
+      label: "List any dependencies that need to be resolved before starting or completing this user story."
       description: "Specify any dependencies related to the user story."
     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:**'
   - type: textarea
     id: notes
     attributes:
-      label: "Any additional information or context that might be useful for the team. This includes items related to accessibility."
+      label: "Any additional information or context that might be useful for the team."
       description: "Provide any extra notes or context for the user story."
     validations:
       required: false

From 7776f9900a70555ac0901593eeb95b2f1a784402 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 27 Jan 2025 19:15:37 -0800
Subject: [PATCH 58/62] added id and required field

---
 .../uswds/_uswds-theme-custom-styles.scss     |  4 ++++
 .../components/components/input/template.njk  |  6 ++++--
 app/templates/components/textbox.html         | 20 +++++++++----------
 app/templates/views/edit-sms-template.html    |  5 ++++-
 app/templates/views/send-test.html            |  4 ++--
 app/templates/views/templates/template.html   |  4 ----
 6 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
index 0bb1aab7eb..ebce950617 100644
--- a/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
+++ b/app/assets/sass/uswds/_uswds-theme-custom-styles.scss
@@ -1024,3 +1024,7 @@ nav.nav {
   font-size: units(3);
   font-weight: bold;
 }
+
+.form-control-error {
+  border: 4px solid #b10e1e
+}
diff --git a/app/templates/components/components/input/template.njk b/app/templates/components/components/input/template.njk
index 7f56346517..4ea649dce2 100644
--- a/app/templates/components/components/input/template.njk
+++ b/app/templates/components/components/input/template.njk
@@ -34,7 +34,7 @@
     attributes: params.errorMessage.attributes,
     html: params.errorMessage.html,
     text: params.errorMessage.text,
-    visuallyHiddenText: params.errorMessage.visuallyHiddenText
+    visuallyHiddenText: params.errorMessage.visuallyHiddenText,
   }) | indent(2) | trim }}
 {% endif %}
   <input class="usa-input {%- if params.classes %} {{ params.classes }}{% endif %} {%- if params.errorMessage %} usa-input--error{% endif %}" id="{{ params.id }}" name="{{ params.name }}" type="{{ params.type | default('text') }}"
@@ -42,5 +42,7 @@
   {%- if describedBy %} aria-describedby="{{ describedBy }}"{% endif %}
   {%- if params.autocomplete %} autocomplete="{{ params.autocomplete}}"{% endif %}
   {%- if params.pattern %} pattern="{{ params.pattern }}"{% endif %}
-  {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor -%}>
+  {%- for attribute, value in params.attributes %} {{ attribute }}="{{ value }}"{% endfor -%}
+  {%- if params.required %} required{% endif %}
+  />
 </div>
diff --git a/app/templates/components/textbox.html b/app/templates/components/textbox.html
index 3e479cbceb..fa92d0cf8a 100644
--- a/app/templates/components/textbox.html
+++ b/app/templates/components/textbox.html
@@ -16,19 +16,9 @@
   placeholder=''
 ) %}
   <div
-    class="form-group{% if field.errors %} form-group-error{% endif %} {{ extra_form_group_classes }}"
+    class="usa-form-group{% if field.errors %} usa-form-group--error{% endif %} {{ extra_form_group_classes }}"
     data-module="{% if autofocus %}autofocus{% elif colour_preview %}colour-preview{% endif %}"
   >
-    {% if field.errors %}
-      <div class="usa-alert usa-alert--error edit-textbox-error-mt" role="alert">
-        <div class="usa-alert__body">
-          <h4 class="usa-alert__heading">Error message</h4>
-          <p class="usa-alert__text" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}">
-            {% if not safe_error_message %}{{ field.errors[0] }}{% else %}{{ field.errors[0]|safe }}{% endif %}
-          </p>
-        </div>
-      </div>
-    {% endif %}
     <label class="usa-label" for="{{ field.name }}">
       {% if label %}
         {{ label }}
@@ -41,6 +31,12 @@ <h4 class="usa-alert__heading">Error message</h4>
         {{ hint }}
       </div>
     {% endif %}
+    {% if field.errors %}
+      <span id="{{ field.name}}-error" class="usa-error-message" data-module="track-error" data-error-type="{{ field.errors[0] }}" data-error-label="{{ field.name }}" tabindex="-1" aria-live="assertive" role="alert">
+        <span class="usa-sr-only">Error:</span>
+        {% if not safe_error_message %}{{ field.errors[0] }}{% else %}{{ field.errors[0]|safe }}{% endif %}
+      </span>
+    {% endif %}
     {%
       if highlight_placeholders or autosize
     %}
@@ -59,6 +55,8 @@ <h4 class="usa-alert__heading">Error message</h4>
       data_highlight_placeholders='true' if highlight_placeholders else 'false',
       rows=rows|string,
       placeholder=placeholder,
+      aria_describedby=field.name+"-error",
+      required='required' if required else None,
       **kwargs
     ) }}
     {% if suffix %}
diff --git a/app/templates/views/edit-sms-template.html b/app/templates/views/edit-sms-template.html
index 97eac73dc9..8ef41bdb24 100644
--- a/app/templates/views/edit-sms-template.html
+++ b/app/templates/views/edit-sms-template.html
@@ -32,6 +32,8 @@
         <div class="tablet:grid-col-9 mobile-lg:grid-col-12">
           {{ form.name(param_extensions={
             "extra_form_group_classes": "margin-bottom-2",
+            "id": "name",
+            "required": True,
             "hint": {"text": "Your recipients will not see this"}
           }) }}
           {{ textbox(
@@ -41,7 +43,8 @@
             hint=content_hint,
             rows=5,
             extra_form_group_classes='margin-bottom-1',
-            placeholder='Edit me! Check out the Personalization section below for details on cool ((stuff)) you can do with your messages!'
+            placeholder='Edit me! Check out the Personalization section below for details on cool ((stuff)) you can do with your messages!',
+            required=True
           ) }}
           {% if current_user.platform_admin %}
             {{ form.process_type }}
diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html
index 720849ae6d..be3b32a9a1 100644
--- a/app/templates/views/send-test.html
+++ b/app/templates/views/send-test.html
@@ -37,8 +37,8 @@
     data_kwargs={'force-focus': True}
   ) %}
     <div class="grid-row">
-      <div class="grid-col-12 {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}" aria-live="polite" role="alert">
-        {{ form.placeholder_value(param_extensions={"classes": ""}) }}
+      <div class="grid-col-12 {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
+        {{ form.placeholder_value(param_extensions={"id": "phone-number"}) }}
       </div>
       {% if skip_link or link_to_upload %}
         <div class="grid-col-12 margin-top-1">
diff --git a/app/templates/views/templates/template.html b/app/templates/views/templates/template.html
index 5613f074df..fd954a347a 100644
--- a/app/templates/views/templates/template.html
+++ b/app/templates/views/templates/template.html
@@ -90,8 +90,4 @@ <h2 class="margin-bottom-1 font-body-lg">More actions</h2>
     {% endif %}
   </div>
 
-  <!--<div class="">
-    {{ copy_to_clipboard(template.id, name="Template ID", thing='template ID') }}
-  </div>-->
-
 {% endblock %}

From 88b114f58b76941fb77c70a73757cd0dde5570b0 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Mon, 27 Jan 2025 19:19:41 -0800
Subject: [PATCH 59/62] test

---
 app/main/views/jobs.py            | 4 +++-
 tests/app/main/views/test_send.py | 2 +-
 tests/app/main/views/test_tour.py | 4 +---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index bb95f630e0..164ab737ff 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -401,7 +401,9 @@ 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) or (
+            "help=0" in request.referrer
+        )
     else:
         session["arrived_from_preview_page"] = False
 
diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py
index 806474c491..0ab770c181 100644
--- a/tests/app/main/views/test_send.py
+++ b/tests/app/main/views/test_send.py
@@ -1521,7 +1521,7 @@ def test_link_to_upload_not_offered_when_entering_personalisation(
 
     # We’re entering personalization
     assert page.select_one("input[type=text]")["name"] == "placeholder_value"
-    assert page.select_one("label[for=placeholder_value]").text.strip() == "name"
+    assert page.select_one("label[for=phone-number]").text.strip() == "name"
     # No ‘Upload’ link shown
     assert len(page.select("main a")) == 0
     assert "Upload" not in page.select_one("main").text
diff --git a/tests/app/main/views/test_tour.py b/tests/app/main/views/test_tour.py
index 2916d08870..3207123a90 100644
--- a/tests/app/main/views/test_tour.py
+++ b/tests/app/main/views/test_tour.py
@@ -174,9 +174,7 @@ def test_should_show_empty_text_box(
     # data-module=autofocus is set on a containing element so it
     # shouldn’t also be set on the textbox itself
     assert "data-module" not in textbox
-    assert (
-        normalize_spaces(page.select_one("label[for=placeholder_value]").text) == "one"
-    )
+    assert normalize_spaces(page.select_one("label[for=phone-number]").text) == "one"
 
 
 def test_should_prefill_answers_for_get_tour_step(

From 6ea4da26177de4e22e9f930f39537e6ffa86daa5 Mon Sep 17 00:00:00 2001
From: Beverly Nguyen <Beverly.Nguyen@gsa.gov>
Date: Tue, 28 Jan 2025 16:11:07 -0800
Subject: [PATCH 60/62] Adding back classes

---
 app/templates/views/send-test.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/views/send-test.html b/app/templates/views/send-test.html
index be3b32a9a1..fd5eb63db3 100644
--- a/app/templates/views/send-test.html
+++ b/app/templates/views/send-test.html
@@ -38,7 +38,7 @@
   ) %}
     <div class="grid-row">
       <div class="grid-col-12 {% if form.placeholder_value.label.text == 'phone number' %}extra-tracking{% endif %}">
-        {{ form.placeholder_value(param_extensions={"id": "phone-number"}) }}
+        {{ form.placeholder_value(param_extensions={"classes": "", "id": "phone-number"}) }}
       </div>
       {% if skip_link or link_to_upload %}
         <div class="grid-col-12 margin-top-1">

From adf9c610021182f1d8443dfbeb982a24b90bd3a6 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 29 Jan 2025 10:45:14 -0800
Subject: [PATCH 61/62] clean log messages

---
 app/main/views/jobs.py                        |  4 +-
 app/notify_client/billing_api_client.py       | 40 +++++++++++++++++--
 app/notify_client/notification_api_client.py  | 20 ++++++++--
 .../notify_client/test_notification_client.py |  9 ++++-
 4 files changed, 65 insertions(+), 8 deletions(-)

diff --git a/app/main/views/jobs.py b/app/main/views/jobs.py
index bb95f630e0..164ab737ff 100644
--- a/app/main/views/jobs.py
+++ b/app/main/views/jobs.py
@@ -401,7 +401,9 @@ 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) or (
+            "help=0" in request.referrer
+        )
     else:
         session["arrived_from_preview_page"] = False
 
diff --git a/app/notify_client/billing_api_client.py b/app/notify_client/billing_api_client.py
index b1ffc19f08..363764907a 100644
--- a/app/notify_client/billing_api_client.py
+++ b/app/notify_client/billing_api_client.py
@@ -6,17 +6,36 @@
 
 class BillingAPIClient(NotifyAdminAPIClient):
     def get_monthly_usage_for_service(self, service_id, year):
-        return self.get(
+        monthly_usage = redis_client.get(f"monthly-usage-summary-{service_id}-{year}")
+        if monthly_usage is not None:
+            return json.loads(monthly_usage.decode("utf-8"))
+        result = self.get(
             "/service/{0}/billing/monthly-usage".format(service_id),
             params=dict(year=year),
         )
+        redis_client.set(
+            f"monthly-usage-summary-{service_id}-{year}",
+            json.dumps(result),
+            ex=30,
+        )
+        return result
 
     def get_annual_usage_for_service(self, service_id, year=None):
-        return self.get(
+        annual_usage = redis_client.get(f"yearly-usage-summary-{service_id}-{year}")
+        if annual_usage is not None:
+            return json.loads(annual_usage.decode("utf-8"))
+        result = self.get(
             "/service/{0}/billing/yearly-usage-summary".format(service_id),
             params=dict(year=year),
         )
 
+        redis_client.set(
+            f"yearly-usage-summary-{service_id}-{year}",
+            json.dumps(result),
+            ex=30,
+        )
+        return result
+
     def get_free_sms_fragment_limit_for_year(self, service_id, year=None):
         frag_limit = redis_client.get(f"free-sms-fragment-limit-{service_id}-{year}")
         if frag_limit is not None:
@@ -48,13 +67,28 @@ def create_or_update_free_sms_fragment_limit(
         )
 
     def get_data_for_billing_report(self, start_date, end_date):
-        return self.get(
+        x_start_date = str(start_date)
+        x_start_date = x_start_date.replace(" ", "_")
+        x_end_date = str(end_date)
+        x_end_date = x_end_date.replace(" ", "_")
+        billing_data = redis_client.get(
+            f"get-data-for-billing-report-{x_start_date}-{x_end_date}"
+        )
+        if billing_data is not None:
+            return json.loads(billing_data.decode("utf-8"))
+        result = self.get(
             url="/platform-stats/data-for-billing-report",
             params={
                 "start_date": str(start_date),
                 "end_date": str(end_date),
             },
         )
+        redis_client.set(
+            f"get-data-for-billing-report-{x_start_date}-{x_end_date}",
+            json.dumps(result),
+            ex=30,
+        )
+        return result
 
     def get_data_for_volumes_by_service_report(self, start_date, end_date):
         return self.get(
diff --git a/app/notify_client/notification_api_client.py b/app/notify_client/notification_api_client.py
index 95ac96a044..89e7860790 100644
--- a/app/notify_client/notification_api_client.py
+++ b/app/notify_client/notification_api_client.py
@@ -1,3 +1,6 @@
+import json
+
+from app.extensions import redis_client
 from app.notify_client import NotifyAdminAPIClient, _attach_current_user
 
 
@@ -41,7 +44,7 @@ def get_notifications_for_service(
         if job_id:
             return method(
                 url="/service/{}/job/{}/notifications".format(service_id, job_id),
-                **kwargs
+                **kwargs,
             )
         else:
             if limit_days is not None:
@@ -96,9 +99,20 @@ def get_notification_status_by_service(self, start_date, end_date):
         )
 
     def get_notification_count_for_job_id(self, *, service_id, job_id):
-        return self.get(
+        counts = redis_client.get(
+            f"notification-count-for-job-id-{service_id}-{job_id}"
+        )
+        if counts is not None:
+            return json.loads(counts.decode("utf-8"))
+        result = self.get(
             url="/service/{}/job/{}/notification_count".format(service_id, job_id)
-        )["count"]
+        )
+        redis_client.set(
+            f"notification-count-for-job-id-{service_id}-{job_id}",
+            json.dumps(result["count"]),
+            ex=30,
+        )
+        return result["count"]
 
 
 notification_api_client = NotificationApiClient()
diff --git a/tests/app/notify_client/test_notification_client.py b/tests/app/notify_client/test_notification_client.py
index 6166334c70..805e31660f 100644
--- a/tests/app/notify_client/test_notification_client.py
+++ b/tests/app/notify_client/test_notification_client.py
@@ -141,8 +141,15 @@ def test_get_notification(mocker):
 
 def test_get_notification_count_for_job_id(mocker):
     mock_get = mocker.patch(
-        "app.notify_client.notification_api_client.NotificationApiClient.get"
+        "app.notify_client.notification_api_client.NotificationApiClient.get",
+        return_value={"count": 0},
+    )
+
+    mocker.patch(
+        "app.notify_client.notification_api_client.redis_client.get", return_value=None
     )
+
+    mocker.patch("app.notify_client.billing_api_client.redis_client.set")
     NotificationApiClient().get_notification_count_for_job_id(
         service_id="foo", job_id="bar"
     )

From 057ed6f88c57412152d48d8eb5be617bda074c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sheev=20Dav=C3=A9?= <sheev.dave@gsa.gov>
Date: Thu, 30 Jan 2025 09:34:56 -0800
Subject: [PATCH 62/62] Update .github/ISSUE_TEMPLATE/issue_template.yml

Co-authored-by: Carlo Costino <ccostino@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/issue_template.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/issue_template.yml b/.github/ISSUE_TEMPLATE/issue_template.yml
index ca458b6a5b..f9cabaa727 100644
--- a/.github/ISSUE_TEMPLATE/issue_template.yml
+++ b/.github/ISSUE_TEMPLATE/issue_template.yml
@@ -68,7 +68,7 @@ body:
     attributes:
       value: '**Accessibility:**'
   - type: textarea
-    id: notes
+    id: accessibility
     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."