Merge branch 'main' into 2410-bug-radio-buttons-cannot-be-selected

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():

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/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);
 }
@@ -605,8 +602,6 @@ td.table-empty-message {
   }
 }
 
-// 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/views/index.py

@@ -23,10 +23,11 @@ from app.utils.user import user_is_logged_in
 # Hook to check for feature flags
 @main.before_request
 def check_feature_flags():
-    if request.path.startswith("/about") and not current_app.config.get(
-        "FEATURE_ABOUT_PAGE_ENABLED", False
-    ):
-        abort(404)
+    # Placeholder for future feature flag checks
+    # Example:
+    # if request.path.startswith("/some-feature") and not current_app.config.get("FEATURE_SOME_FEATURE_ENABLED", False):
+    #     abort(404)
+    pass
 
 
 @main.route("/test/feature-flags")

app/main/views/send.py

@@ -924,6 +924,10 @@ def get_template_error_dict(exception):
 def preview_notification(service_id, template_id):
     recipient = get_recipient()
     if not recipient:
+        current_app.logger.warning(
+            f"No recipient found for service {service_id}, template {template_id}. Redirecting..."
+        )
+
         return redirect(
             url_for(
                 ".send_one_off",

app/templates/components/components/button/template.njk

@@ -16,7 +16,7 @@
 
 {#- Define common attributes we can use for both button and input types #}
 
-{%- set buttonAttributes %}{% if params.name %} name="{{ params.name }}"{% endif %} type="{{ params.type if params.type else 'submit' }}"{% if params.disabled %} disabled="disabled" aria-disabled="true"{% endif %}{% if params.preventDoubleClick %} data-prevent-double-click="true"{% endif %}{% endset %}
+{%- set buttonAttributes %}{% if params.name %} name="{{ params.name | trim }}"{% endif %} type="{{ params.type if params.type else 'submit' }}"{% if params.disabled %} disabled="disabled" aria-disabled="true"{% endif %}{% if params.preventDoubleClick %} data-prevent-double-click="true"{% endif %}{% endset %}
 
 {#- Actually create a button... or a link! #}
 

app/templates/views/check/preview.html

@@ -101,6 +101,9 @@
     {% set button_text %}
       {{ "Schedule" if scheduled_for else 'Send'}}
     {% endset %}
-    {{ usaButton({ "text": button_text }) }}
+    {{ usaButton({
+      "text": button_text,
+      "name": button_text
+    }) }}
   </form>
 {% endblock %}

app/templates/views/notifications/preview.html

@@ -43,7 +43,6 @@
       {% endcall %}
     </div>
   {% elif error == 'message-too-long' %}
-    {# the only row_errors we can get when sending one off messages is that the message is too long #}
     <div class="bottom-gutter">
       {% call banner_wrapper(type='dangerous') %}
         {% include "partials/check/message-too-long.html" %}
@@ -77,13 +76,15 @@
         help='3' if help else 0
       )}}" class='page-footer'>
       <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-      <!-- <p>Placeholder: This message will be delivered to <b>400 phone numbers</b> and will use a total of <b>800 message parts</b>, leaving Washington DSHS with <b>249,200 message parts remaining</b>.</p> -->
       <h3>Does everything look good?</h3>
       {% if not error %}
         {% set button_text %}
           {{ "Schedule" if scheduled_for else 'Send'}}
         {% endset %}
-        {{ usaButton({ "text": button_text }) }}
+        {{ usaButton({
+          "text": button_text,
+          "name": button_text
+         }) }}
       {% endif %}
     </form>
   </div>

app/templates/views/send.html

@@ -29,13 +29,6 @@
   </div>
 
   <h2 class="font-body-lg">Your file needs to look like this example</h2>
-  <p class="hint">
-    Save your file as a
-    <abbr title="Comma Separated Values">CSV</abbr><span aria-hidden="true">, </span>
-    <abbr title="Tab Separated Values">TSV</abbr><span aria-hidden="true">, </span>
-    <abbr title="Open Document Spreadsheet">ODS</abbr>
-    or Microsoft Excel spreadsheet.
-  </p>
 
   <div class="spreadsheet" data-module="fullscreen-table">
     {% call(item, row_number) list_table(
@@ -50,10 +43,14 @@
       {% endfor %}
     {% endcall %}
   </div>
-  <p class="table-show-more-link">
-    <a class="usa-link" href="{{ url_for('.get_example_csv', service_id=current_service.id, template_id=template.id) }}" download>Download this example (<abbr title="Comma separated values">CSV</abbr>)</a>
+  <p class="hint">
+    Save your spreadsheet as a <abbr title="Comma Separated Values">CSV</abbr> file for bulk messaging. It is the most reliable when uploading your contact list. Start by downloading this example for your message template.
+  </p>
+  <p class="table-show-more-link">
+    <a class="usa-link display-flex margin-top-1" href="{{ url_for('.get_example_csv', service_id=current_service.id, template_id=template.id) }}" download>Download this example (<abbr title="Comma separated values">CSV</abbr>)
+      <img class="margin-left-05" src="{{ asset_url('img/material-icons/download.svg') }}" alt="" />
+    </a>
   </p>
-
   <h2 class="font-body-lg margin-bottom-1">Your file will populate this template:<br><span class="font-body-lg">({{ template.name }})</span></h2>
   {{ template|string }}