Merge pull request #2447 from GSA/main

3/28/2025 Production Deploy

Author: heyitsmebev

.ds.baseline

@@ -151,7 +151,7 @@
         "filename": "app/config.py",
         "hashed_secret": "577a4c667e4af8682ca431857214b3a920883efc",
         "is_verified": false,
-        "line_number": 120,
+        "line_number": 118,
         "is_secret": false
       }
     ],
@@ -674,5 +674,5 @@
       }
     ]
   },
-  "generated_at": "2025-03-17T23:26:44Z"
+  "generated_at": "2025-03-20T18:22:36Z"
 }

.github/workflows/checks.yml

@@ -167,7 +167,6 @@ jobs:
         run: make run-flask &
         env:
           NOTIFY_ENVIRONMENT: scanning
-          FEATURE_ABOUT_PAGE_ENABLED: true
       - name: Run OWASP Baseline Scan
         uses: zaproxy/action-baseline@v0.14.0
         with:

app/__init__.py

@@ -169,14 +169,15 @@ def _csp(config):
 
 
 def create_app(application):
-    @application.context_processor
-    def inject_feature_flags():
-        feature_about_page_enabled = application.config.get(
-            "FEATURE_ABOUT_PAGE_ENABLED", False
-        )
-        return dict(
-            FEATURE_ABOUT_PAGE_ENABLED=feature_about_page_enabled,
-        )
+    # @application.context_processor
+    # def inject_feature_flags():
+    # this is where feature flags can be easily added as a dictionary within context
+    # feature_about_page_enabled = application.config.get(
+    # "FEATURE_ABOUT_PAGE_ENABLED", False
+    # )
+    # return dict(
+    #     FEATURE_ABOUT_PAGE_ENABLED=feature_about_page_enabled,
+    # )
 
     @application.context_processor
     def inject_initial_signin_url():
@@ -682,4 +683,4 @@ def slugify(text):
     """
     Converts text to lowercase, replaces spaces with hyphens, and removes invalid characters.
     """
-    return re.sub(r'[^a-z0-9-]', '', re.sub(r'\s+', '-', text.lower()))
+    return re.sub(r"[^a-z0-9-]", "", re.sub(r"\s+", "-", text.lower()))

app/assets/javascripts/activityChart.js

@@ -220,7 +220,7 @@
 
         var url = type === 'service'
             ? `/services/${currentServiceId}/daily-stats.json?timezone=${encodeURIComponent(userTimezone)}`
-            : `/services/${currentServiceId}/daily-stats-by-user.json`;
+            : `/services/${currentServiceId}/daily-stats-by-user.json?timezone=${encodeURIComponent(userTimezone)}`;
 
 
         return fetch(url)

app/assets/javascripts/preventDuplicateFormSubmissions.js

@@ -13,16 +13,23 @@
     } else {
 
       $submitButton.data('clicked', 'true');
-      setTimeout(renableSubmitButton($submitButton), 1500);
 
-    }
+      if ($submitButton.is('[name="Send"], [name="Schedule"]')) {
+        $submitButton.prop('disabled', true);
 
+        setTimeout(() => {
+          renableSubmitButton($submitButton);
+        }, 10000);
+      } else {
+        setTimeout(renableSubmitButton($submitButton), 1500);
+      }
+    }
   };
 
   let renableSubmitButton = $submitButton => () => {
 
     $submitButton.data('clicked', '');
-
+    $submitButton.prop('disabled', false);
   };
 
   $('form').on('submit', disableSubmitButtons);

app/assets/javascripts/validation.js

@@ -7,13 +7,17 @@ function showError(input, errorElement, message) {
         errorElement.textContent = message;
     }, 10);
 
-    input.classList.add("usa-input--error");
+    if (input.type !== "radio" && input.type !== "checkbox") {
+        input.classList.add("usa-input--error");
+    }
     input.setAttribute("aria-describedby", errorElement.id);
 }
 
 function hideError(input, errorElement) {
     errorElement.style.display = "none";
-    input.classList.remove("usa-input--error");
+    if (input.type !== "radio" && input.type !== "checkbox") {
+        input.classList.remove("usa-input--error");
+    }
     input.removeAttribute("aria-describedby");
 }
 
@@ -24,33 +28,42 @@ function getFieldLabel(input) {
 
 // Attach validation logic to forms
 function attachValidation() {
-    const forms = document.querySelectorAll("form.send-one-off-form");
+    const forms = document.querySelectorAll('form[data-force-focus="True"]');
     forms.forEach((form) => {
         const inputs = form.querySelectorAll("input, textarea, select");
 
         form.addEventListener("submit", function (event) {
             let isValid = true;
             let firstInvalidInput = null;
+            const validatedRadioNames = new Set();
 
             inputs.forEach((input) => {
-                const errorId = input.id ? `${input.id}-error` : `${input.name}-error`;
+                const errorId = input.type === "radio" ? `${input.name}-error` : `${input.id}-error`;
                 let errorElement = document.getElementById(errorId);
 
                 if (!errorElement) {
                     errorElement = document.createElement("span");
                     errorElement.id = errorId;
                     errorElement.classList.add("usa-error-message");
                     errorElement.setAttribute("aria-live", "polite");
-                    input.insertAdjacentElement("afterend", errorElement);
+                    errorElement.style.display = "none";
+                    if (input.type === "radio") {
+                        const group = form.querySelectorAll(`input[name="${input.name}"]`);
+                        const lastRadio = group[group.length - 1];
+                        lastRadio.parentElement.insertAdjacentElement("afterend", errorElement);
+                    } else {
+                        input.insertAdjacentElement("afterend", errorElement);
+                    }
                 }
 
                 if (input.type === "radio") {
-                    // Find all radio buttons with the same name
-                    const radioGroup = document.querySelectorAll(`input[name="${input.name}"]`);
+                    if (validatedRadioNames.has(input.name)) return;
+                    validatedRadioNames.add(input.name);
+                    const radioGroup = form.querySelectorAll(`input[name="${input.name}"]`);
                     const isChecked = Array.from(radioGroup).some(radio => radio.checked);
 
                     if (!isChecked) {
-                        showError(input, errorElement, `Error: ${getFieldLabel(input)} must be selected.`);
+                        showError(input, errorElement, `Error: A selection must be made.`);
                         isValid = false;
                         if (!firstInvalidInput) {
                             firstInvalidInput = input;
@@ -73,11 +86,20 @@ function attachValidation() {
 
         inputs.forEach((input) => {
             input.addEventListener("input", function () {
-                const errorElement = document.getElementById(`${input.id}-error`);
-                if (input.value.trim() !== "" && errorElement) {
+                const errorId = input.type === "radio" ? `${input.name}-error` : `${input.id}-error`;
+                const errorElement = document.getElementById(errorId);
+                if (errorElement && input.value.trim() !== "") {
                     hideError(input, errorElement);
                 }
             });
+            if (input.type === "radio") {
+                input.addEventListener("change", function () {
+                    const errorElement = document.getElementById(`${input.name}-error`);
+                    if (errorElement) {
+                        hideError(input, errorElement);
+                    }
+                });
+            }
         });
     });
 }

app/assets/sass/uswds/_uswds-theme-custom-styles.scss

@@ -139,11 +139,6 @@ td.table-empty-message {
   font-family: family('sans');
 }
 
-.usa-dark-background .pill-item__label {
-  color: white;
-  text-decoration: none !important;
-}
-
 .pill-item.usa-link {
   text-decoration: none !important;
 }
@@ -198,9 +193,6 @@ td.table-empty-message {
     word-wrap: break-word;
   }
 
-  // border: 1px solid color('gray-cool-10');
-  // padding: units(2);
-
   .tick-cross-list-permissions {
     margin: units(1) 0;
     padding-left: units(2);
@@ -257,6 +249,11 @@ td.table-empty-message {
   }
 }
 
+.usa-checkbox.template-list-item.template-list-item-with-checkbox.template-list-item-without-ancestors {
+  display: flex;
+  flex-direction: column;
+}
+
 .usa-checkbox__label-description {
   margin: units(2px) 0 units(1) units(4);
 }
@@ -594,19 +591,31 @@ td.table-empty-message {
         .big-number-smallest {
           font-size: units(3);
         }
+        .pill-item__label {
+          color: white;
+        }
         &:not(.pill-item--selected):hover {
           background: color('blue-warm-70v');
+
+          .pill-item__label {
+            color: white;
+          }
         }
-        &.pill-item--selected:hover {
-          color: color('blue-60v');
+        &.pill-item--selected {
+          .pill-item__label {
+            color: color('blue-60v');
+          }
+          &:hover {
+            .pill-item__label {
+              color: color('blue-60v');
+            }
+          }
         }
       }
     }
   }
 }
 
-// Etc
-
 .email-brand,
 .browse-list {
   padding: 0;

app/config.py

@@ -88,8 +88,6 @@ class Config(object):
         ],
     }
 
-    FEATURE_ABOUT_PAGE_ENABLED = getenv("FEATURE_ABOUT_PAGE_ENABLED", "false") == "true"
-
 
 def _s3_credentials_from_env(bucket_prefix):
     return {

app/main/validators.py

@@ -61,7 +61,7 @@ def __call__(self, form, field):
 
 
 class NoCommasInPlaceHolders:
-    def __init__(self, message="You cannot put commas between double brackets"):
+    def __init__(self, message="You cannot put commas between double parenthesis"):
         self.message = message
 
     def __call__(self, form, field):
@@ -108,33 +108,17 @@ def __call__(self, form, field):
         )
         if non_sms_characters:
             raise ValidationError(
-                "You cannot use {} in {}. {} will not show up properly on everyone’s phones.".format(
+                "Please remove the unaccepted character {} in your message, then save again".format(
                     formatted_list(
                         non_sms_characters,
-                        conjunction="or",
+                        conjunction="and",
                         before_each="",
                         after_each="",
                     ),
-                    {
-                        "sms": "text messages",
-                    }.get(self._template_type),
-                    ("It" if len(non_sms_characters) == 1 else "They"),
                 )
             )
 
 
-# class NoPlaceholders:
-
-#     def __init__(self, message=None):
-#         self.message = message or (
-#             'You can’t use ((double brackets)) to personalize this message'
-#         )
-
-#     def __call__(self, form, field):
-#         if Field(field.data).placeholders:
-#             raise ValidationError(self.message)
-
-
 class LettersNumbersSingleQuotesFullStopsAndUnderscoresOnly:
     regex = re.compile(r"^[a-zA-Z0-9\s\._']+$")
 

app/main/views/dashboard.py

@@ -132,13 +132,18 @@ def get_local_daily_stats_for_last_x_days(stats_utc, user_timezone, days):
 @user_has_permissions()
 def get_daily_stats_by_user(service_id):
     date_range = get_stats_date_range()
-    stats = service_api_client.get_user_service_notification_statistics_by_day(
+    days = date_range["days"]
+    user_timezone = request.args.get("timezone", "UTC")
+
+    stats_utc = service_api_client.get_user_service_notification_statistics_by_day(
         service_id,
         user_id=current_user.id,
         start_date=date_range["start_date"],
-        days=date_range["days"],
+        days=days,
     )
-    return jsonify(stats)
+
+    local_stats = get_local_daily_stats_for_last_x_days(stats_utc, user_timezone, days)
+    return jsonify(local_stats)
 
 
 @main.route("/services/<uuid:service_id>/template-usage")