Merge branch 'main' into 2589-may-19-zap-scan-fixes

Resolved conflicts by:
- Taking all backstop images from main branch
- Taking .ds.baseline from main (with updated line numbers)
- Keeping template literal security fixes in listEntry.js while incorporating main's styling changes
- Taking main's config.py updates (LOGO_CDN_DOMAIN and formatting)

app/templates/views/api/keys/create.html

@@ -4,6 +4,7 @@
 {% from "components/banner.html" import banner_wrapper %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% block service_page_title %}
   Create an API key
@@ -19,7 +20,17 @@
 
   {% call form_wrapper() %}
     {{ form.key_name }}
-    {{ form.key_type }}
+    <div class="margin-top-5">
+      {% if current_service.trial_mode %}
+        {{ radios(
+          form.key_type,
+          disable=['normal'],
+          option_hints={'normal': 'Not available because your service is in <a class="usa-link" href="/features/trial-mode">trial mode</a>'|safe}
+        ) }}
+      {% else %}
+        {{ radios(form.key_type) }}
+      {% endif %}
+    </div>
     {{ page_footer('Continue') }}
   {% endcall %}
 

app/templates/views/find-users/auth_type.html

@@ -3,6 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% block per_page_title %}
   Set auth type for {{ user.name }}
@@ -19,7 +20,9 @@
       {{ page_header('Set auth type for ' + user.name) }}
 
       {% call form_wrapper() %}
-        {{ form.auth_type }}
+        <div class="auth-type-radios">
+          {{ radios(form.auth_type) }}
+        </div>
         {{ page_footer('Save') }}
       {% endcall %}
     </div>

app/templates/views/manage-users/permissions.html

@@ -11,13 +11,15 @@
 {% endif %}
 
 {% if service_has_email_auth %}
-  {% if not mobile_number %}
-    {{ radios(
-      form.login_authentication,
-      disable=['sms_auth'],
-      option_hints={'sms_auth': 'Not available because this team member has not added a phone number to their profile'|safe}
-    ) }}
-  {% else %}
-    {{ radios(form.login_authentication) }}
-  {% endif %}
+  <div class="login-auth-radios">
+    {% if not mobile_number %}
+      {{ radios(
+        form.login_authentication,
+        disable=['sms_auth'],
+        option_hints={'sms_auth': 'Not available because this team member has not added a phone&nbsp;number to their profile'|safe}
+      ) }}
+    {% else %}
+      {{ radios(form.login_authentication) }}
+    {% endif %}
+  </div>
 {% endif %}

app/templates/views/register-from-invite.html

@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/radios.html" import radios %}
 
 {% block per_page_title %}
 Create an account
@@ -40,7 +41,7 @@ Create an account
       {{ page_footer("Continue") }}
       {{form.service}}
       {{form.email_address}}
-      {{form.auth_type}}
+      {{ radios(form.auth_type) }}
     {% endcall %}
   </div>
 </div>

app/templates/views/register.html

@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
+{% from "components/radios.html" import radios %}
 
 {% block per_page_title %}
 Create an account
@@ -26,7 +27,7 @@ Create an account
         }) }}
       </div>
       {{ form.password(param_extensions={"hint": {"text": "At least 8 characters"}, "autocomplete": "new-password"}) }}
-      {{form.auth_type}}
+      {{ radios(form.auth_type) }}
       {{ page_footer("Continue") }}
     {% endcall %}
   </div>

app/templates/views/service-settings/data-retention/add.html

@@ -3,6 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% block service_page_title %}
   Set data retention
@@ -16,7 +17,9 @@
     {{ page_header('Set data retention') }}
 
     {% call form_wrapper() %}
-      {{ form.notification_type }}
+      <div class="notification-type-radios">
+        {{ radios(form.notification_type) }}
+      </div>
       {{ form.days_of_retention }}
       {{ page_footer('Add') }}
     {% endcall %}

app/templates/views/service-settings/link-service-to-organization.html

@@ -4,6 +4,7 @@
 {% from "components/live-search.html" import live_search %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% set page_title = "Link service to organization" %}
 
@@ -26,7 +27,9 @@
   ) }}
   {% call form_wrapper(data_force_focus=True) %}
     {% if has_organizations %}
-      {{ form.organizations }}
+      <div class="organizations-radios">
+        {{ radios(form.organizations) }}
+      </div>
       {{ sticky_page_footer('Save') }}
     {% else %}
       <p class="hint"> No organizations </p>

app/templates/views/set-up-your-profile.html

@@ -2,6 +2,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/select/macro.njk" import usaSelect -%}
+{% from "components/radios.html" import radios %}
 
 {% block per_page_title %}
 Set up your profile
@@ -68,7 +69,7 @@ Set up your profile
       ]
       })
       }}-->
-      {{form.auth_type}}
+      {{ radios(form.auth_type) }}
       {{ page_footer("Save") }}
     {% endcall %}
   </div>

app/templates/views/templates/_template_list.html

@@ -1,3 +1,5 @@
+{% from "components/checkboxes.html" import checkboxes %}
+
 {% macro format_item_name(name, separators=True) -%}
   {%- if name is string -%}
     {{- name -}}

app/templates/views/templates/set-sender.html

@@ -2,6 +2,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% block service_page_title %}
   {{ sender_context.title }}
@@ -15,20 +16,11 @@
 
   <div class="grid-row">
     {% call form_wrapper() %}
-      {{ form.sender(param_extensions={
-        'fieldset': {
-          'legend': {
-            'isPageHeading': True,
-            'text': sender_context.title
-          }
-        },
-        'classes': 'grid-col-9'
-      }) }}
+      {{ radios(form.sender, legend_style='usa-legend--large', option_hints=option_hints) }}
       <div class="grid-col-9">
         {{ page_footer('Continue') }}
       </div>
     {% endcall %}
-    </div>
   </div>
 
 {% endblock %}

app/templates/views/templates/set-template-sender.html

@@ -2,6 +2,7 @@
 {% from "components/page-footer.html" import page_footer %}
 {% from "components/form.html" import form_wrapper %}
 {% from "components/components/back-link/macro.njk" import usaBackLink %}
+{% from "components/radios.html" import radios %}
 
 {% set page_title = 'Set letter contact block' %}
 
@@ -17,19 +18,10 @@
 
   <div class="grid-row">
     {% call form_wrapper() %}
-      {{ form.sender(param_extensions={
-        'fieldset': {
-          'legend': {
-            'isPageHeading': True,
-            'text': page_title
-          }
-        },
-        'classes': 'grid-col-9'
-      }) }}
+      {{ radios(form.sender) }}
       <div class="grid-col-9">
         {{ page_footer('Continue') }}
-        <a class="usa-link" href="{{ url_for('.service_add_letter_contact', service_id=current_service.id, from_template=template_id) }}">Add new sender</a>
-    </div>
+      </div>
     {% endcall %}
   </div>