VACMS-20126: update composer based dependencies (#20131)

* VACMS-20126: update drupal core to 10.3.10 * VACMS-20126: update default_content_deploy and search_api * VACMS-20126: update easy_breadcrumb * VACMS-20126: update eca, removed patch tha was fixed * VACMS-20126: update datadog/dd-trace * VACMS-20126: update consolidation/site-process * VACMS-20126: update drupal/entity_reference_unpublished * VACMS-20126: update drupal/entity_usage * VACMS-20126: update drupal/entityqueue * VACMS-20126: update drupal/environment_indicator remove patch that was fixed * VACMS-20126: update drupal/epp * VACMS-20126: update drupal/fast_404 * VACMS-20126: update drupal/geocoder and drupal/geofield_map * VACMS-20126: update drupal/google_analytics * VACMS-20126: update drupal/markup * VACMS-20126: update drupal/migrate_plus * VACMS-20126: update drupal/override_node_options * VACMS-20126: update drupal/pathologic * VACMS-20126: update drupal/raven * VACMS-20126: update drupal/viewfield * VACMS-20126: update drupal/tzfield * VACMS-20126: update drupal/views_data_export * VACMS-20126: update drupal/simplesamlphp_auth * VACMS-20126: update php-http/guzzle7-adapter * VACMS-20126: update mglaman/phpstan-drupal * VACMS-20126: update phpspec/prophecy-phpunit * VACMS-20126: update squizlabs/php_codesniffer * VACMS-20126: update phpstan/phpstan * VACMS-20126: update symfony/phpunit-bridge * Revert "VACMS-20126: update drupal/environment_indicator remove patch that was fixed" This reverts commit 16c276b. * VACMS-20126: updates for environmental_indicator regressions * VACMS-20126: updates for environmental_indicator regressions * VACMS-20126: updates for environmental_indicator regressions * VACMS-20126: updated composer.lock and robots.txt * VACMS-20126: stylelint fx
department-of-veterans-affairs · Dec 19, 2024 · 0a34fa1 · 0a34fa1
1 parent 18174d6
commit 0a34fa1
Show file tree

Hide file tree

Showing 9 changed files with 662 additions and 420 deletions.
diff --git a/composer.json b/composer.json
@@ -400,19 +400,13 @@
                 "VACMS-19177 remove username form logging in user module": "patches/VACMS-19177-patch-for-user-module-to-log-uid.patch",
                 "3082011 - Fix for orphaned label tags": "patches/3082011-19-do-not-use-label-HTML-tag-in-item-form-element.patch"
             },
-            "drupal/danse": {
-                "3364925 - added explicit access check": "patches/3364925-added-explicit-access-check.patch"
-            },
             "drupal/decoupled_router": {
                 "3111456 - Unable to resolve path on node in other language than default": "patches/3111456-resolve-language-issue.patch"
             },
             "drupal/diff": {
                 "3228798 - Make revisions overview page accessible": "patches/3228798-make-revisions-overview-page-accessible.patch",
                 "2834253 - Missing column headings in Revisions list": "patches/2834253-missing-column-headers.patch"
             },
-            "drupal/eca": {
-                "3472437 - Drupal\\eca\\Service\\ExportRecipe::__construct(): Argument #2 ($fileSystem) must be of type Drupal\\Core\\File\\FileSystem": "patches/3472437-instatiate-against-file-system-interface.patch"
-            },
             "drupal/entity_browser": {
                 "2856138 - Entity browser cardinality validation": "patches/2856138-entity-browser-cardinality-validation.patch",
                 "3191302 - Make modal iframe tab accessible": "patches/3191302-make-modal-iframe-tab-accessible.patch",
@@ -439,7 +433,7 @@
                 "3443270 - Check Access entity usage statistics perms in linkedUsage() method": "patches/3443270-check-access-entity-usage-statistics-perms-in-linked-usage-method.patch"
             },
             "drupal/environment_indicator": {
-                "3463388 - fgColor not being picked up.": "patches/3463201-fix-for-change-in-class-for-toolbar.patch"
+                "Local to our setup - fgColor not being picked up.": "patches/VACMS-20126-fix-for-change-in-class-for-toolbar.patch"
             },
             "drupal/externalauth": {
                 "VACMS-19177 remove usernmae from logging": "patches/VACMS-19177-removing-username-from-logging-for-externalauth.patch"

diff --git a/composer.lock b/composer.lock
diff --git a/docroot/modules/custom/va_gov_backend/css/toolbar.css b/docroot/modules/custom/va_gov_backend/css/toolbar.css
@@ -3,6 +3,7 @@
 .toolbar-oriented .toolbar-bar .toolbar-tab.branch-toolbar-tab {
   float: right;
   height: 39px;
+  z-index: 300;
 }
 
 .toolbar-oriented .toolbar-bar .toolbar-tab.branch-toolbar-tab .toolbar-icon-branch {
@@ -13,16 +14,22 @@
   font-size: 0;
 }
 
-.content-release-toolbar-tab-prod {
+#content-release-status-icon-prod {
   background-image: url('../images/content-release-tooltip.svg');
   background-position: center;
   background-repeat: no-repeat;
+  margin: 0;
+  padding-bottom: 10px;
+  z-index: 300;
 }
 
-.content-release-toolbar-tab {
+#content-release-status-icon {
   background-image: url('../images/content-release-tooltip-gray.svg');
   background-position: center;
   background-repeat: no-repeat;
+  margin: 0;
+  padding-bottom: 10px;
+  z-index: 300;
 }
 
 .toolbar .toolbar-icon-content-release.toolbar-item:hover,

diff --git a/docroot/modules/custom/va_gov_backend/va_gov_backend.module b/docroot/modules/custom/va_gov_backend/va_gov_backend.module
@@ -1609,7 +1609,7 @@ function va_gov_backend_toolbar() {
       ],
     ],
     '#wrapper_attributes' => [
-      'class' => ['toolbar-tab', 'content-release-toolbar-tab'],
+      'class' => ['toolbar-tab'],
     ],
     '#weight' => 102,
   ];
@@ -1631,7 +1631,7 @@ function va_gov_backend_toolbar() {
         '#attributes' => [
           'class' => ['toolbar-icon', 'toolbar-icon-content-release'],
           'title' => 'Mouse over to see last content release time',
-          'id' => 'content-release-status-icon',
+          'id' => 'content-release-status-icon-prod',
         ],
       ],
       '#wrapper_attributes' => [

diff --git a/docroot/robots.txt b/docroot/robots.txt
@@ -57,6 +57,7 @@ Disallow: /user/register
 Disallow: /user/password
 Disallow: /user/login
 Disallow: /user/logout
+Disallow: /user/verify-cookies
 Disallow: /media/oembed
 Disallow: /*/media/oembed
 # Paths (no clean URLs)
@@ -69,5 +70,6 @@ Disallow: /index.php/user/password
 Disallow: /index.php/user/register
 Disallow: /index.php/user/login
 Disallow: /index.php/user/logout
+Disallow: /index.php/user/verify-cookies
 Disallow: /index.php/media/oembed
 Disallow: /index.php/*/media/oembed
diff --git a/docroot/themes/custom/vagovclaro/assets/scss/components/_toolbar.scss b/docroot/themes/custom/vagovclaro/assets/scss/components/_toolbar.scss
@@ -35,6 +35,7 @@ body.toolbar-fixed {
     &:hover:active,
     &:hover,
     &:focus {
+      background-color: var(--va-blue-lightest) !important;
       color: var(--va-blue-dark) !important;
     }
 
@@ -103,7 +104,7 @@ body.toolbar-fixed {
     // Special treatment for the tab showing the indicator.
     .toolbar-tab {
       &.branch-toolbar-tab {
-        margin-left: -26px;
+        margin-left: -10px;
       }
 
       &.environment-toolbar-tab {
@@ -113,6 +114,7 @@ body.toolbar-fixed {
       .toolbar-icon-environment-label {
         cursor: auto; // Remove the pointer cursor.
         padding-left: 1.333em; // No icon.
+        padding-right: 0;
 
         // Remove hover behaviors.
         &:hover {
@@ -131,6 +133,7 @@ body.toolbar-fixed {
     &:hover:active,
     &:hover,
     &:focus {
+      background-color: var(--va-blue-lightest) !important;
       color: var(--va-blue-dark) !important;
     }
 
@@ -199,16 +202,18 @@ body.toolbar-fixed {
     // Special treatment for the tab showing the indicator.
     .toolbar-tab {
       &.branch-toolbar-tab {
-        margin-left: -26px;
+        margin-left: -10px;
       }
 
       &.environment-toolbar-tab {
         margin-left: auto;
       }
 
       .toolbar-icon-environment-label {
+        color: var(--va-gray-darkest);
         cursor: auto; // Remove the pointer cursor.
         padding-left: 1.333em; // No icon.
+        padding-right: 0;
 
         // Remove hover behaviors.
         &:hover {

diff --git a/package-lock.json b/package-lock.json
diff --git a/patches/3463201-fix-for-change-in-class-for-toolbar.patch b/patches/3463201-fix-for-change-in-class-for-toolbar.patch
diff --git a/patches/VACMS-20126-fix-for-change-in-class-for-toolbar.patch b/patches/VACMS-20126-fix-for-change-in-class-for-toolbar.patch
@@ -0,0 +1,17 @@
+diff --git a/js/environment_indicator.js b/js/environment_indicator.js
+--- a/js/environment_indicator.js	(revision 520137b406f6428b0e6e605750fe75c1caf2c5c2)
++++ b/js/environment_indicator.js	(date 1734556460416)
+@@ -19,10 +19,10 @@
+         // Only apply text and background color if not using gin_toolbar
+         if (!$body.hasClass('gin--vertical-toolbar') && !$body.hasClass('gin--horizontal-toolbar')) {
+           $('.toolbar .toolbar-bar .toolbar-tab > .toolbar-item').css('background-color', settings.environmentIndicator.bgColor);
+-          $('#toolbar-bar .toolbar-tab a.toolbar-item', context).css('border-bottom', '0px');
+-          $('#toolbar-bar .toolbar-tab a.toolbar-item', context).css('color', settings.environmentIndicator.fgColor);
++          $('#toolbar-bar .toolbar-item', context).css('border-bottom', '0px');
++          $('#toolbar-bar .toolbar-item', context).css('color', settings.environmentIndicator.fgColor);
+           $('#toolbar-bar', context).css('background-color', settings.environmentIndicator.bgColor);
+-          $('#toolbar-bar .toolbar-tab a.toolbar-item', context).not('.is-active').css('color', settings.environmentIndicator.fgColor);
++          $('#toolbar-bar .toolbar-item', context).not('.is-active').css('color', settings.environmentIndicator.fgColor);
+         }
+
+         // Set environment color for gin_toolbar vertical toolbar.