Merge pull request #2676 from GSA/main

06/12/25 Production Deploy

Author: ccostino

.ds.baseline

@@ -127,16 +127,6 @@
     }
   ],
   "results": {
-    ".github/actions/deploy-proxy/action.yml": [
-      {
-        "type": "Hex High Entropy String",
-        "filename": ".github/actions/deploy-proxy/action.yml",
-        "hashed_secret": "a6c13f5da3788e8d654cd24001dc79a238723248",
-        "is_verified": false,
-        "line_number": 18,
-        "is_secret": false
-      }
-    ],
     ".github/workflows/checks.yml": [
       {
         "type": "Secret Keyword",
@@ -563,7 +553,7 @@
         "filename": "tests/app/main/views/test_sign_in.py",
         "hashed_secret": "8b8b69116ee882b5e987e330f55db81aba0636f9",
         "is_verified": false,
-        "line_number": 97,
+        "line_number": 95,
         "is_secret": false
       }
     ],
@@ -644,5 +634,5 @@
       }
     ]
   },
-  "generated_at": "2025-05-22T19:03:11Z"
+  "generated_at": "2025-06-04T16:12:20Z"
 }

.github/actions/deploy-proxy/action.yml

@@ -15,7 +15,7 @@ inputs:
     default: https://github.com/GSA-TTS/cg-egress-proxy.git
   proxy_version:
     description: git ref to be deployed
-    default: 1500c67157c1a7a6fbbda7a2de172b3d0a67e703
+    default: main
 runs:
   using: composite
   steps:

.github/actions/setup-project/action.yml

@@ -9,10 +9,10 @@ runs:
         sudo apt-get update \
         && sudo apt-get install -y --no-install-recommends \
         libcurl4-openssl-dev
-    - name: Set up Python 3.12.3
+    - name: Set up Python 3.12.2
       uses: actions/setup-python@v4
       with:
-        python-version: "3.12.3"
+        python-version: "3.12.2"
     - name: Install poetry
       shell: bash
       run: pip install poetry==2.1.3

app/assets/images/messaging-devices.svg

@@ -20,7 +20,6 @@
     $targets.each(function() {
 
       let content = $('.live-search-relevant', this).text() || $(this).text();
-      let isMatch = normalize(content).indexOf(normalize(query)) > -1;
 
       if ($(this).has(':checked').length) {
         $(this).show();
@@ -29,21 +28,25 @@
       }
 
       if (query == '') {
-        $(this).css('display', '');
+        $(this).removeClass('js-hidden');
         results++;
         return;
       }
 
-      $(this).toggle(isMatch);
-
-      if (isMatch) { results++; }
+      let isMatch = normalize(content).includes(normalize(query));
 
+      if (isMatch) {
+        $(this).removeClass('js-hidden');
+        results++;
+      } else {
+        $(this).addClass('js-hidden');
+      }
     });
 
     if (query !== '' && results === 0) {
-      $noResultsMessage.show();
+      $noResultsMessage.removeClass('js-hidden');
     } else {
-      $noResultsMessage.hide();
+      $noResultsMessage.addClass('js-hidden');
     }
 
     if (state === 'loaded') {

app/assets/javascripts/liveSearch.js

@@ -197,6 +197,11 @@
       if (event.currentTarget.value === 'add-new-template' && this.$singleNotificationChannel) {
         window.location = "/services/" + this.$singleChannelService + "/templates/add-" + this.$singleNotificationChannel;
       } else {
+        if (this.currentState === 'add-new-template') {
+          this.$form.find('input[type=checkbox]').prop('checked', false);
+          this.selectionStatus.update({ total: 0, templates: 0, folders: 0 });
+        }
+
         if (this.stateChanged()) {
           this.render();
         }
@@ -286,7 +291,29 @@
         mode = 'dialog';
       }
 
-      if (currentStateObj && ('setFocus' in currentStateObj)) {
+      if (this.currentState === 'add-new-template') {
+        this.$form.find('.template-list-item').addClass('js-hidden');
+        $('.live-search').addClass('js-hidden');
+        $('#breadcrumb-template-folders').addClass('js-hidden');
+        $('#template-list').addClass('js-hidden');
+        this.$form.find('input[type=checkbox]').prop('checked', false);
+        this.selectionStatus.update({ total: 0, templates: 0, folders: 0 });
+
+        $('#page-title').text('New Template');
+        $('#page-description').text('Every message starts with a template. Choose to start with a blank template or copy an existing template.');
+        document.title = 'New Templates';
+      } else {
+        this.$form.find('.template-list-item').removeClass('js-hidden');
+        $('.live-search').removeClass('js-hidden');
+        $('#breadcrumb-template-folders').removeClass('js-hidden');
+        $('#template-list').removeClass('js-hidden');
+
+        $('#page-title').text('Select or create a template');
+        $('#page-description').text('Every message starts with a template. To send, choose or create a template.');
+        document.title = 'Select or create a template';
+      }
+
+      if (currentStateObj && 'setFocus' in currentStateObj) {
         scrollTop = $(window).scrollTop();
         currentStateObj.setFocus();
         $(window).scrollTop(scrollTop);

app/assets/javascripts/templateFolderForm.js

@@ -229,6 +229,10 @@ td.table-empty-message {
   display: none;
 }
 
+.js-hidden {
+  display: none !important;
+}
+
 .folder-heading a.folder-heading-folder,
 .template-list-folder {
   background: url(../img/material-icons/folder.svg) no-repeat;
@@ -871,6 +875,10 @@ $do-dont-top-bar-width: 1;
   border-radius: 2px;
 }
 
+.bg-gray-cool {
+  background-color: #dfe1e2;
+}
+
 .svg-circle-icon {
   display: inline-block;
   margin: 0;

app/assets/pdf/Studio Research & Development.pdf

@@ -1,6 +1,8 @@
 import json
 from datetime import datetime, timezone
 
+from flask import current_app
+
 from app.extensions import redis_client
 from app.notify_client import NotifyAdminAPIClient, _attach_current_user, cache
 
@@ -81,7 +83,13 @@ def get_live_services_data(self, params_dict=None):
         """
         Retrieve a list of live services data with contact names and notification counts.
         """
-        return self.get("/service/live-services-data", params=params_dict)
+        try:
+            return self.get("/service/live-services-data", params=params_dict)
+        except Exception as e:
+            current_app.logger.error(
+                f"Error getting live services data {str(e)}", exc_info=True
+            )
+            raise e
 
     def get_active_services(self, params_dict=None):
         """
@@ -136,19 +144,29 @@ def update_service(self, service_id, **kwargs):
 
     @cache.delete("live-service-and-organization-counts")
     def update_status(self, service_id, live):
-        return self.update_service(
-            service_id,
-            message_limit=250000 if live else 50,
-            restricted=(not live),
-            go_live_at=str(datetime.utcnow()) if live else None,
-        )
+        try:
+            return self.update_service(
+                service_id,
+                message_limit=250000 if live else 50,
+                restricted=(not live),
+                go_live_at=str(datetime.utcnow()) if live else None,
+            )
+        except Exception as e:
+            current_app.logger.error(f"Error updating status {str(e)}", exc_info=True)
+            raise e
 
     @cache.delete("live-service-and-organization-counts")
     def update_count_as_live(self, service_id, count_as_live):
-        return self.update_service(
-            service_id,
-            count_as_live=count_as_live,
-        )
+        try:
+            return self.update_service(
+                service_id,
+                count_as_live=count_as_live,
+            )
+        except Exception as e:
+            current_app.logger.error(
+                f"Error updating count as live {str(e)}", exc_info=True
+            )
+            raise e
 
     # This method is not cached because it calls through to one which is
     def update_service_with_properties(self, service_id, properties):