Skip to content

Commit

Permalink
Merge branch 'main' into VACMS-16853-next-build-branches
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexfinnarn
alexfinnarn authored Jan 25, 2024
2 parents aa141fe + 376659b commit d67212c
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 62 deletions.
7 changes: 3 additions & 4 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
"drupal/hierarchy_manager": "^3.0",
"drupal/hms_field": "^2.0",
"drupal/hook_event_dispatcher": "^4.0@beta",
"drupal/ief_table_view_mode": "^2.1",
"drupal/ief_table_view_mode": "^3.0",
"drupal/image_style_warmer": "^1.2@RC",
"drupal/image_widget_crop": "^2.2",
"drupal/jsonapi_extras": "^3.19",
Expand Down Expand Up @@ -222,7 +222,7 @@
"symfony/phpunit-bridge": "^5.1",
"symfony/process": "^6.3",
"symfony/routing": "^6.3",
"va-gov/content-build": "^0.0.3424",
"va-gov/content-build": "^0.0.3427",
"vlucas/phpdotenv": "^5.3",
"webflo/drupal-finder": "^1.0.0",
"webmozart/path-util": "^2.3",
Expand Down Expand Up @@ -447,8 +447,7 @@
},
"drupal/inline_entity_form": {
"3226473 - Opt-in system delete.": "https://www.drupal.org/files/issues/2023-03-28/3226473-opt-in-system-delete-2.patch",
"3061620 - Cancel closes all forms": "https://www.drupal.org/files/issues/2022-07-21/inline_entity_form-close-only-forms-where-close-clicked-3061620-13.patch",
"3311501 - Add label to weight select field for accessibility": "https://www.drupal.org/files/issues/2022-09-23/Adding_labels_to_weight_selects_for_accessibility.patch"
"3061620 - Cancel closes all forms": "https://www.drupal.org/files/issues/2022-07-21/inline_entity_form-close-only-forms-where-close-clicked-3061620-13.patch"
},
"drupal/jsonapi_menu_items": {
"3276561 - Add support for the Menu Item Extras module": "https://www.drupal.org/files/issues/2022-08-01/3276561-05-menu_item_extras_support.patch"
Expand Down
112 changes: 56 additions & 56 deletions composer.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
"content-hash": "fd6aedc5fcaf7b1b85a3a3ba52650962",
"content-hash": "26320bc610a7b624865efbbf2f06c0b2",
"packages": [
{
"name": "asm89/stack-cors",
Expand Down Expand Up @@ -122,7 +122,7 @@
"version": "v4.1.0",
"source": {
"type": "git",
"url": "https://github.com/fengyuanchen/cropper.git",
"url": "git@github.com:fengyuanchen/cropper.git",
"reference": "617d9bdb8688cc4edb3b03bc49a04b83c7facbe7"
},
"dist": {
Expand Down Expand Up @@ -6572,17 +6572,17 @@
},
{
"name": "drupal/geocoder",
"version": "4.18.0",
"version": "4.20.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/geocoder.git",
"reference": "8.x-4.18"
"reference": "8.x-4.20"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.18.zip",
"reference": "8.x-4.18",
"shasum": "5ad95a5e6eceecdd32ebb42b3dc5b35487dfda7b"
"url": "https://ftp.drupal.org/files/projects/geocoder-8.x-4.20.zip",
"reference": "8.x-4.20",
"shasum": "1bf5ff7082e64f55128032b61c7333fd611c5347"
},
"require": {
"davedevelopment/stiphle": "^0.9.2",
Expand Down Expand Up @@ -6627,8 +6627,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-4.18",
"datestamp": "1703166690",
"version": "8.x-4.20",
"datestamp": "1706097387",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -7356,27 +7356,27 @@
},
{
"name": "drupal/ief_table_view_mode",
"version": "2.3.0",
"version": "3.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/ief_table_view_mode.git",
"reference": "8.x-2.3"
"reference": "3.0.0"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/ief_table_view_mode-8.x-2.3.zip",
"reference": "8.x-2.3",
"shasum": "8f5f2d38745a7654ce72b311f0333478fa7f2aeb"
"url": "https://ftp.drupal.org/files/projects/ief_table_view_mode-3.0.0.zip",
"reference": "3.0.0",
"shasum": "4a434bbe8ccebffa6dd3efcd818bfd5667b6f571"
},
"require": {
"drupal/core": "^8.7.7 || ^9 || ^10",
"drupal/inline_entity_form": "^1.0"
"drupal/core": "^9 || ^10",
"drupal/inline_entity_form": "^1.0 || ^2.0 || ^3.0"
},
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-2.3",
"datestamp": "1671410068",
"version": "3.0.0",
"datestamp": "1705614692",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
Expand Down Expand Up @@ -7531,17 +7531,17 @@
},
{
"name": "drupal/inline_entity_form",
"version": "1.0.0-rc17",
"version": "3.0.0-rc19",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/inline_entity_form.git",
"reference": "8.x-1.0-rc17"
"reference": "3.0.0-rc19"
},
"dist": {
"type": "zip",
"url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc17.zip",
"reference": "8.x-1.0-rc17",
"shasum": "626622e01cf7a2d2977fdc06ae09afd5a814e09b"
"url": "https://ftp.drupal.org/files/projects/inline_entity_form-3.0.0-rc19.zip",
"reference": "3.0.0-rc19",
"shasum": "d8976940dd3f85412ba5e274af15fbcdd22ee27a"
},
"require": {
"drupal/core": "^8.8 || ^9 || ^10",
Expand All @@ -7553,8 +7553,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
"version": "8.x-1.0-rc17",
"datestamp": "1703020130",
"version": "3.0.0-rc19",
"datestamp": "1704729077",
"security-coverage": {
"status": "not-covered",
"message": "RC releases are not covered by Drupal security advisories."
Expand Down Expand Up @@ -15687,16 +15687,16 @@
},
{
"name": "laminas/laminas-stdlib",
"version": "3.18.0",
"version": "3.19.0",
"source": {
"type": "git",
"url": "https://github.com/laminas/laminas-stdlib.git",
"reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf"
"reference": "6a192dd0882b514e45506f533b833b623b78fff3"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf",
"reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf",
"url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/6a192dd0882b514e45506f533b833b623b78fff3",
"reference": "6a192dd0882b514e45506f533b833b623b78fff3",
"shasum": ""
},
"require": {
Expand All @@ -15707,10 +15707,10 @@
},
"require-dev": {
"laminas/laminas-coding-standard": "^2.5",
"phpbench/phpbench": "^1.2.14",
"phpunit/phpunit": "^10.3.3",
"phpbench/phpbench": "^1.2.15",
"phpunit/phpunit": "^10.5.8",
"psalm/plugin-phpunit": "^0.18.4",
"vimeo/psalm": "^5.15.0"
"vimeo/psalm": "^5.20.0"
},
"type": "library",
"autoload": {
Expand Down Expand Up @@ -15742,7 +15742,7 @@
"type": "community_bridge"
}
],
"time": "2023-09-19T10:15:21+00:00"
"time": "2024-01-19T12:39:49+00:00"
},
{
"name": "laminas/laminas-text",
Expand Down Expand Up @@ -18312,16 +18312,16 @@
},
{
"name": "php-http/promise",
"version": "1.2.1",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/promise.git",
"reference": "44a67cb59f708f826f3bec35f22030b3edb90119"
"reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/promise/zipball/44a67cb59f708f826f3bec35f22030b3edb90119",
"reference": "44a67cb59f708f826f3bec35f22030b3edb90119",
"url": "https://api.github.com/repos/php-http/promise/zipball/2916a606d3b390f4e9e8e2b8dd68581508be0f07",
"reference": "2916a606d3b390f4e9e8e2b8dd68581508be0f07",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -18358,9 +18358,9 @@
],
"support": {
"issues": "https://github.com/php-http/promise/issues",
"source": "https://github.com/php-http/promise/tree/1.2.1"
"source": "https://github.com/php-http/promise/tree/1.3.0"
},
"time": "2023-11-08T12:57:08+00:00"
"time": "2024-01-04T18:49:48+00:00"
},
{
"name": "phpdocumentor/reflection-common",
Expand Down Expand Up @@ -18908,16 +18908,16 @@
},
{
"name": "phpstan/phpstan",
"version": "1.10.56",
"version": "1.10.57",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
"reference": "27816a01aea996191ee14d010f325434c0ee76fa"
"reference": "1627b1d03446904aaa77593f370c5201d2ecc34e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/27816a01aea996191ee14d010f325434c0ee76fa",
"reference": "27816a01aea996191ee14d010f325434c0ee76fa",
"url": "https://api.github.com/repos/phpstan/phpstan/zipball/1627b1d03446904aaa77593f370c5201d2ecc34e",
"reference": "1627b1d03446904aaa77593f370c5201d2ecc34e",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -18966,7 +18966,7 @@
"type": "tidelift"
}
],
"time": "2024-01-15T10:43:00+00:00"
"time": "2024-01-24T11:51:34+00:00"
},
{
"name": "phpstan/phpstan-deprecation-rules",
Expand Down Expand Up @@ -19337,16 +19337,16 @@
},
{
"name": "phpunit/phpunit",
"version": "9.6.15",
"version": "9.6.16",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "05017b80304e0eb3f31d90194a563fd53a6021f1"
"reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/05017b80304e0eb3f31d90194a563fd53a6021f1",
"reference": "05017b80304e0eb3f31d90194a563fd53a6021f1",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3767b2c56ce02d01e3491046f33466a1ae60a37f",
"reference": "3767b2c56ce02d01e3491046f33466a1ae60a37f",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -19420,7 +19420,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.15"
"source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.16"
},
"funding": [
{
Expand All @@ -19436,7 +19436,7 @@
"type": "tidelift"
}
],
"time": "2023-12-01T16:55:19+00:00"
"time": "2024-01-19T07:03:14+00:00"
},
{
"name": "politsin/jquery-ui-touch-punch",
Expand Down Expand Up @@ -25862,16 +25862,16 @@
},
{
"name": "va-gov/content-build",
"version": "v0.0.3424",
"version": "v0.0.3427",
"source": {
"type": "git",
"url": "https://github.com/department-of-veterans-affairs/content-build.git",
"reference": "6c82218da1661c090d2883b26f40cf18e173ff98"
"reference": "d98e082265882b311383cb6a0b83ef6cf6d72f42"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/6c82218da1661c090d2883b26f40cf18e173ff98",
"reference": "6c82218da1661c090d2883b26f40cf18e173ff98",
"url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/d98e082265882b311383cb6a0b83ef6cf6d72f42",
"reference": "d98e082265882b311383cb6a0b83ef6cf6d72f42",
"shasum": ""
},
"type": "node-project",
Expand All @@ -25898,9 +25898,9 @@
"description": "Front-end for VA.gov. This repository contains the code that generates the www.va.gov website. It contains a Metalsmith static site builder that uses a Drupal CMS for content. This file is here to publish releases to https://packagist.org/packages/va-gov/content-build, so that the CMS CI system can install it and update it using standard composer processes, and so that we can run tests across both systems. See https://github.com/department-of-veterans-affairs/va.gov-cms for the CMS repo, and stand by for more documentation.",
"support": {
"issues": "https://github.com/department-of-veterans-affairs/content-build/issues",
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3424"
"source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3427"
},
"time": "2024-01-17T18:59:30+00:00"
"time": "2024-01-24T17:14:58+00:00"
},
{
"name": "vlucas/phpdotenv",
Expand Down
2 changes: 1 addition & 1 deletion config/sync/next.settings.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ site_previewer_configuration:
sync_route_skip_routes: ''
preview_url_generator: simple_oauth
preview_url_generator_configuration:
secret_expiration: 300
secret_expiration: 86400
debug: false
6 changes: 5 additions & 1 deletion docroot/modules/custom/va_gov_menu_access/src/Service/MenuReductionService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,11 @@ protected function applyVamcMenuRulesForDetailPage(array &$form) {

$menu_element_type = $this->getMenuItemType($alias);
$menu_element_type = $menu_element_type ?? $this->checkForSeparator($allowed_separators, $menu_item);

if (str_contains($subject_uuid['option'], 'Work with us')) {
// This is a special case where we want to allow the menu item
// to be enabled.
$menu_element_type = self::ENABLED;
}
$this->addAllowedParent($allowed_parents, $enabled_count, $menu_element_type, $subject_uuid);
}
}
Expand Down

0 comments on commit d67212c

Please sign in to comment.