Merge pull request #2770 from GSA/main

7/22/2025 Production Deploy

Author: ccostino

.ds.baseline

@@ -449,7 +449,7 @@
         "filename": "tests/__init__.py",
         "hashed_secret": "f8377c90fcfd699f0ddbdcb30c2c9183d2d933ea",
         "is_verified": false,
-        "line_number": 388,
+        "line_number": 389,
         "is_secret": false
       }
     ],
@@ -507,7 +507,7 @@
         "filename": "tests/app/main/views/test_accept_invite.py",
         "hashed_secret": "07f0a6c13923fc3b5f0c57ffa2d29b715eb80d71",
         "is_verified": false,
-        "line_number": 631,
+        "line_number": 632,
         "is_secret": false
       }
     ],
@@ -527,23 +527,23 @@
         "filename": "tests/app/main/views/test_register.py",
         "hashed_secret": "bdbb156d25d02fd7792865824201dda1c60f4473",
         "is_verified": false,
-        "line_number": 114,
+        "line_number": 115,
         "is_secret": false
       },
       {
         "type": "Secret Keyword",
         "filename": "tests/app/main/views/test_register.py",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 184,
+        "line_number": 185,
         "is_secret": false
       },
       {
         "type": "Secret Keyword",
         "filename": "tests/app/main/views/test_register.py",
         "hashed_secret": "bb5b7caa27d005d38039e3797c3ddb9bcd22c3c8",
         "is_verified": false,
-        "line_number": 255,
+        "line_number": 256,
         "is_secret": false
       }
     ],
@@ -601,7 +601,7 @@
         "filename": "tests/app/notify_client/test_user_client.py",
         "hashed_secret": "f2c57870308dc87f432e5912d4de6f8e322721ba",
         "is_verified": false,
-        "line_number": 55,
+        "line_number": 56,
         "is_secret": false
       }
     ],
@@ -629,10 +629,10 @@
         "filename": "tests/conftest.py",
         "hashed_secret": "f8377c90fcfd699f0ddbdcb30c2c9183d2d933ea",
         "is_verified": false,
-        "line_number": 3266,
+        "line_number": 3267,
         "is_secret": false
       }
     ]
   },
-  "generated_at": "2025-06-18T17:05:12Z"
+  "generated_at": "2025-07-22T17:07:31Z"
 }

.github/dependabot.yml

@@ -5,20 +5,16 @@
 
 version: 2
 updates:
-  - package-ecosystem: "pip" # See documentation for possible values
-    directory: "/" # Location of package manifests
+  - package-ecosystem: 'pip' # See documentation for possible values
+    directory: '/' # Location of package manifests
     schedule:
-      interval: "daily"
+      interval: 'daily'
     assignees:
-      - "alexjanousekGSA"
-    reviewers:
-      - "alexjanousekGSA"
-  - package-ecosystem: "npm"
-    directory: "/"
+      - 'alexjanousekGSA'
+  - package-ecosystem: 'npm'
+    directory: '/'
     schedule:
-      interval: "daily"
+      interval: 'daily'
     versioning-strategy: increase
     assignees:
-      - "alexjanousekGSA"
-    reviewers:
-      - "alexjanousekGSA"
+      - 'alexjanousekGSA'

Makefile

@@ -159,22 +159,6 @@ clean:
 upload-static:
 	aws s3 cp --region us-west-2 --recursive --cache-control max-age=315360000,immutable ./app/static s3://${DNS_NAME}-static
 
-# .PHONY: cf-failwhale-deployed
-# cf-failwhale-deployed:
-# 	@cf app notify-admin-failwhale --guid || (echo "notify-admin-failwhale is not deployed on ${CF_SPACE}" && exit 1)
-
-# .PHONY: enable-failwhale
-# enable-failwhale: cf-target cf-failwhale-deployed ## Enable the failwhale app and disable admin
-# 	@cf map-route notify-admin-failwhale ${DNS_NAME} --hostname www
-# 	@cf unmap-route notify-admin ${DNS_NAME} --hostname www
-# 	@echo "Failwhale is enabled"
-
-# .PHONY: disable-failwhale
-# disable-failwhale: cf-target cf-failwhale-deployed ## Disable the failwhale app and enable admin
-# 	@cf map-route notify-admin ${DNS_NAME} --hostname www
-# 	@cf unmap-route notify-admin-failwhale ${DNS_NAME} --hostname www
-# 	@echo "Failwhale is disabled"
-
 .PHONY: test-single
 test-single: export NEW_RELIC_ENVIRONMENT=test
 test-single: ## Run a single test file

app/__init__.py

@@ -359,6 +359,12 @@ def _attach_current_organization():
     def _attach_current_user():
         return {"current_user": current_user}
 
+    @application.context_processor
+    def _attach_enums():
+        from app.enums import ServicePermission
+
+        return {"ServicePermission": ServicePermission}
+
     @application.context_processor
     def _nav_selected():
         return navigation

app/assets/images/security-key.svg

@@ -65,7 +65,7 @@
 
     return $(`<div class="selection-footer${stickyClass} margin-top-2">
               <button
-                class="govuk-button govuk-button--secondary selection-footer__button usa-button usa-button--outline"
+                class="usa-button usa-button--outline selection-footer__button"
                 aria-expanded="${expanded ? 'true' : 'false'}"
                 aria-controls="${this.fieldsetId}">
               ${buttonContent}
@@ -214,7 +214,7 @@
   CollapsibleCheckboxes.prototype.bindEvents = function() {
     const self = this;
 
-    this.$formGroup.on('click', '.govuk-button', this.handleClick.bind(this));
+    this.$formGroup.on('click', '.usa-button', this.handleClick.bind(this));
     this.$checkboxes.on('click', this.handleSelection.bind(this));
 
     this.summary.bindEvents(this);

app/assets/javascripts/collapsibleCheckboxes.js

@@ -80,14 +80,14 @@
               $('.copy-to-clipboard__value', component)[0], () =>
                 $component
                   .html(states.valueCopied(stateOptions))
-                  .find('.govuk-button').focus()
+                  .find('.usa-button').focus()
             )
         )
         .on(
           'click', '.copy-to-clipboard__button--show', () =>
             $component
               .html(states.valueVisible(stateOptions))
-              .find('.govuk-button').focus()
+              .find('.usa-button').focus()
         );
 
       if ('stickAtBottomWhenScrolling' in GOVUK) {

app/assets/javascripts/copyToClipboard.js

@@ -37,14 +37,14 @@
         ' {{{sharedAttributes}}}' +
       '/>' +
       '{{#button}}' +
-        '<button type="button" class="govuk-button govuk-button--secondary input-list__button--remove">' +
+        '<button type="button" class="usa-button input-list__button--remove">' +
           'Remove<span class="usa-sr-only"> {{listItemName}} number {{number}}</span>' +
         '</button>' +
       '{{/button}}' +
     '</div>'
   );
   ListEntry.prototype.addButtonTemplate = Hogan.compile(
-    '<button type="button" class="govuk-button govuk-button--secondary input-list__button--add">Add another {{listItemName}} ({{entriesLeft}} remaining)</button>'
+    '<button type="button" class="usa-button input-list__button--add">Add another {{listItemName}} ({{entriesLeft}} remaining)</button>'
   );
   ListEntry.prototype.getSharedAttributes = function () {
     var $inputs = this.$wrapper.find('input'),

app/assets/javascripts/listEntry.js

@@ -108,9 +108,6 @@ p,
   box-shadow: none !important;
 }
 
-.multiple-choice [type='radio']:focus + label::before {
-  box-shadow: 0 0 0 3px color('blue-40v');
-}
 
 .usa-dark-background .pill-item__container {
   color: #fff;

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

@@ -34,12 +34,6 @@ $path: '/static/images/';
 // Dependencies from GOV.UK Frontend, packaged to be specific to this application
 @import './govuk-frontend/all';
 
-// Custom overrides
-.govuk-link {
-    font-weight: bold;
-    color: #005ea5;
-}
-
 // Specific to this application
 @import 'local/typography';
 @import 'grids';