Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

VACMS-20126: update composer based dependencies #20131

Merged
merged 36 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
d22d8d5
VACMS-20126: update drupal core to 10.3.10
edmund-dunn Dec 18, 2024
6bb7853
VACMS-20126: update default_content_deploy and search_api
edmund-dunn Dec 18, 2024
afdb365
VACMS-20126: update easy_breadcrumb
edmund-dunn Dec 18, 2024
535f248
VACMS-20126: update eca, removed patch tha was fixed
edmund-dunn Dec 18, 2024
3bd6879
VACMS-20126: update datadog/dd-trace
edmund-dunn Dec 18, 2024
5427064
VACMS-20126: update consolidation/site-process
edmund-dunn Dec 18, 2024
d6a02a4
VACMS-20126: update drupal/entity_reference_unpublished
edmund-dunn Dec 18, 2024
de3996e
VACMS-20126: update drupal/entity_usage
edmund-dunn Dec 18, 2024
b24a586
VACMS-20126: update drupal/entityqueue
edmund-dunn Dec 18, 2024
16c276b
VACMS-20126: update drupal/environment_indicator remove patch that wa…
edmund-dunn Dec 18, 2024
5faac14
VACMS-20126: update drupal/epp
edmund-dunn Dec 18, 2024
766cdbe
VACMS-20126: update drupal/fast_404
edmund-dunn Dec 18, 2024
f3b44de
VACMS-20126: update drupal/geocoder and drupal/geofield_map
edmund-dunn Dec 18, 2024
08cfccf
VACMS-20126: update drupal/google_analytics
edmund-dunn Dec 18, 2024
c702527
VACMS-20126: update drupal/markup
edmund-dunn Dec 18, 2024
1fe3644
VACMS-20126: update drupal/migrate_plus
edmund-dunn Dec 18, 2024
5c9b2f8
VACMS-20126: update drupal/override_node_options
edmund-dunn Dec 18, 2024
bfef5d0
VACMS-20126: update drupal/pathologic
edmund-dunn Dec 18, 2024
f9594ca
VACMS-20126: update drupal/raven
edmund-dunn Dec 18, 2024
7f1c475
VACMS-20126: update drupal/viewfield
edmund-dunn Dec 18, 2024
9eef8f5
VACMS-20126: update drupal/tzfield
edmund-dunn Dec 18, 2024
54cebf3
VACMS-20126: update drupal/views_data_export
edmund-dunn Dec 18, 2024
5a4dc4c
VACMS-20126: update drupal/simplesamlphp_auth
edmund-dunn Dec 18, 2024
7f9af41
VACMS-20126: update php-http/guzzle7-adapter
edmund-dunn Dec 18, 2024
f791071
VACMS-20126: update mglaman/phpstan-drupal
edmund-dunn Dec 18, 2024
54b876f
VACMS-20126: update phpspec/prophecy-phpunit
edmund-dunn Dec 18, 2024
0da5aac
VACMS-20126: update squizlabs/php_codesniffer
edmund-dunn Dec 18, 2024
2782d89
VACMS-20126: update phpstan/phpstan
edmund-dunn Dec 18, 2024
e6f2b67
VACMS-20126: update symfony/phpunit-bridge
edmund-dunn Dec 18, 2024
25495a3
Revert "VACMS-20126: update drupal/environment_indicator remove patch…
edmund-dunn Dec 18, 2024
b95088a
VACMS-20126: updates for environmental_indicator regressions
edmund-dunn Dec 18, 2024
4ebac91
VACMS-20126: updates for environmental_indicator regressions
edmund-dunn Dec 18, 2024
ea8a6a4
VACMS-20126: updates for environmental_indicator regressions
edmund-dunn Dec 18, 2024
89b7d9e
Merge branch 'main' into 20126-update-composer-based-dependencies
edmund-dunn Dec 19, 2024
25e0360
VACMS-20126: updated composer.lock and robots.txt
edmund-dunn Dec 19, 2024
ce06976
VACMS-20126: stylelint fx
edmund-dunn Dec 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
Expand Down
1,000 changes: 618 additions & 382 deletions composer.lock

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions docroot/modules/custom/va_gov_backend/css/toolbar.css
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions docroot/modules/custom/va_gov_backend/va_gov_backend.module
Original file line number Diff line number Diff line change
Expand Up @@ -1609,7 +1609,7 @@ function va_gov_backend_toolbar() {
],
],
'#wrapper_attributes' => [
'class' => ['toolbar-tab', 'content-release-toolbar-tab'],
'class' => ['toolbar-tab'],
],
'#weight' => 102,
];
Expand All @@ -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' => [
Expand Down
2 changes: 2 additions & 0 deletions docroot/robots.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ body.toolbar-fixed {
&:hover:active,
&:hover,
&:focus {
background-color: var(--va-blue-lightest) !important;
color: var(--va-blue-dark) !important;
}

Expand Down Expand Up @@ -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 {
Expand All @@ -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 {
Expand All @@ -131,6 +133,7 @@ body.toolbar-fixed {
&:hover:active,
&:hover,
&:focus {
background-color: var(--va-blue-lightest) !important;
color: var(--va-blue-dark) !important;
}

Expand Down Expand Up @@ -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 {
Expand Down
12 changes: 6 additions & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 0 additions & 19 deletions patches/3463201-fix-for-change-in-class-for-toolbar.patch

This file was deleted.

17 changes: 17 additions & 0 deletions patches/VACMS-20126-fix-for-change-in-class-for-toolbar.patch
Original file line number Diff line number Diff line change
@@ -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.
Loading