From 3d10390b6906292b8e34b7e8bceba2fb15dc12a7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 12:30:53 -0500 Subject: [PATCH 01/35] Bump browserify-sign from 4.2.1 to 4.2.2 (#15878) Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2. - [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md) - [Commits](https://github.com/crypto-browserify/browserify-sign/compare/v4.2.1...v4.2.2) --- updated-dependencies: - dependency-name: browserify-sign dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 96c5b3b11f..985df32fe2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5885,22 +5885,25 @@ } }, "node_modules/browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "dev": true, "optional": true, "peer": true, "dependencies": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.4", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.6", + "readable-stream": "^3.6.2", + "safe-buffer": "^5.2.1" + }, + "engines": { + "node": ">= 4" } }, "node_modules/browserify-sign/node_modules/readable-stream": { @@ -20678,22 +20681,22 @@ } }, "browserify-sign": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz", - "integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==", + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz", + "integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==", "dev": true, "optional": true, "peer": true, "requires": { - "bn.js": "^5.1.1", - "browserify-rsa": "^4.0.1", + "bn.js": "^5.2.1", + "browserify-rsa": "^4.1.0", "create-hash": "^1.2.0", "create-hmac": "^1.1.7", - "elliptic": "^6.5.3", + "elliptic": "^6.5.4", "inherits": "^2.0.4", - "parse-asn1": "^5.1.5", - "readable-stream": "^3.6.0", - "safe-buffer": "^5.2.0" + "parse-asn1": "^5.1.6", + "readable-stream": "^3.6.2", + "safe-buffer": "^5.2.1" }, "dependencies": { "readable-stream": { From 8154f13f153f1f7aa3be965024c30322fea0ce51 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 14 Nov 2023 19:50:18 -0600 Subject: [PATCH 02/35] Bump va-gov/content-build from 0.0.3385 to 0.0.3386 (#16130) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3385 to 0.0.3386. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3385...v0.0.3386) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.json b/composer.json index e69d5e0978..22d68ec611 100644 --- a/composer.json +++ b/composer.json @@ -208,7 +208,7 @@ "symfony/phpunit-bridge": "^5.1", "symfony/process": "^4.0", "symfony/routing": "^4.0", - "va-gov/content-build": "^0.0.3385", + "va-gov/content-build": "^0.0.3386", "vlucas/phpdotenv": "^5.3", "webflo/drupal-finder": "^1.0.0", "webmozart/path-util": "^2.3", diff --git a/composer.lock b/composer.lock index 1784d55bd2..3d86baa401 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "782d00549944f970d02bb65812fd711b", + "content-hash": "14ed15fca84bc7b982c7a4cf82296065", "packages": [ { "name": "alchemy/zippy", @@ -26911,16 +26911,16 @@ }, { "name": "va-gov/content-build", - "version": "v0.0.3385", + "version": "v0.0.3386", "source": { "type": "git", "url": "https://github.com/department-of-veterans-affairs/content-build.git", - "reference": "4c4c807a26acf3d0c565b79bc35a63c0751736f0" + "reference": "9008b5b142da3ff733e9c7aae18643621cbd8967" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/4c4c807a26acf3d0c565b79bc35a63c0751736f0", - "reference": "4c4c807a26acf3d0c565b79bc35a63c0751736f0", + "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/9008b5b142da3ff733e9c7aae18643621cbd8967", + "reference": "9008b5b142da3ff733e9c7aae18643621cbd8967", "shasum": "" }, "type": "node-project", @@ -26947,9 +26947,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.3385" + "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3386" }, - "time": "2023-11-10T00:12:18+00:00" + "time": "2023-11-14T19:23:29+00:00" }, { "name": "vlucas/phpdotenv", From d070e870e3859c3037397e95437ae28b97eab024 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 08:16:47 -0500 Subject: [PATCH 03/35] Bump mglaman/phpstan-drupal from 1.2.3 to 1.2.4 (#16131) Bumps [mglaman/phpstan-drupal](https://github.com/mglaman/phpstan-drupal) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/mglaman/phpstan-drupal/releases) - [Commits](https://github.com/mglaman/phpstan-drupal/compare/1.2.3...1.2.4) --- updated-dependencies: - dependency-name: mglaman/phpstan-drupal dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.lock b/composer.lock index 3d86baa401..c1ecdb498a 100644 --- a/composer.lock +++ b/composer.lock @@ -16275,24 +16275,24 @@ }, { "name": "mglaman/phpstan-drupal", - "version": "1.2.3", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/mglaman/phpstan-drupal.git", - "reference": "e21d53427b13d91561ce66f2cef60825e1efa1f5" + "reference": "57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/e21d53427b13d91561ce66f2cef60825e1efa1f5", - "reference": "e21d53427b13d91561ce66f2cef60825e1efa1f5", + "url": "https://api.github.com/repos/mglaman/phpstan-drupal/zipball/57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6", + "reference": "57b2cc67fb4416e8484db37a3d8502ac8fb3c0d6", "shasum": "" }, "require": { "php": "^7.4 || ^8.0", "phpstan/phpstan": "^1.10.1", "phpstan/phpstan-deprecation-rules": "^1.1.4", - "symfony/finder": "^4.2 || ^5.0 || ^6.0", - "symfony/yaml": "^4.2|| ^5.0 || ^6.0", + "symfony/finder": "^4.2 || ^5.0 || ^6.0 || ^7.0", + "symfony/yaml": "^4.2|| ^5.0 || ^6.0 || ^7.0", "webflo/drupal-finder": "^1.2" }, "require-dev": { @@ -16305,7 +16305,7 @@ "phpunit/phpunit": "^8.5 || ^9", "slevomat/coding-standard": "^7.1", "squizlabs/php_codesniffer": "^3.3", - "symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.0" + "symfony/phpunit-bridge": "^4.4 || ^5.4 || ^6.0 || ^7.0" }, "suggest": { "jangregor/phpstan-prophecy": "Provides a prophecy/prophecy extension for phpstan/phpstan.", @@ -16359,7 +16359,7 @@ "description": "Drupal extension and rules for PHPStan", "support": { "issues": "https://github.com/mglaman/phpstan-drupal/issues", - "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.3" + "source": "https://github.com/mglaman/phpstan-drupal/tree/1.2.4" }, "funding": [ { @@ -16375,7 +16375,7 @@ "type": "tidelift" } ], - "time": "2023-11-13T14:35:32+00:00" + "time": "2023-11-14T22:47:32+00:00" }, { "name": "michelf/php-markdown", From 40a5a08d8b70e9452051d9035e4ab05fe6304eb9 Mon Sep 17 00:00:00 2001 From: Edmund Dunn <109987005+edmund-dunn@users.noreply.github.com> Date: Wed, 15 Nov 2023 06:31:08 -0800 Subject: [PATCH 04/35] VACMS16061: updated graphql to v3.4 (#16070) Co-authored-by: Nathan Douglas --- composer.json | 6 +----- composer.lock | 56 +++++++++++++++++++++++++++++++++------------------ 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/composer.json b/composer.json index 22d68ec611..3621128efa 100644 --- a/composer.json +++ b/composer.json @@ -83,7 +83,7 @@ "drupal/geofield_map": "^3.0", "drupal/google_analytics": "^4.0", "drupal/govdelivery_bulletins": "^1.2", - "drupal/graphql": "3.1.0", + "drupal/graphql": "^3.4", "drupal/graphql_core": "^3.1.0", "drupal/graphql_menu": "^1.0@alpha", "drupal/graphql_metatag": "^1.0", @@ -428,10 +428,6 @@ "drupal/flysystem_s3": { "3297257 - Automated Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-04-27/3297257-drupal-10-compatibility-fixes_0.patch" }, - "drupal/graphql": { - "Fix Explorer with Layout Builder enabled - https://github.com/drupal-graphql/graphql/pull/1144": "patches/graphql_8x3x_layout_builder_incompat.patch", - "Remove outdated RouteQueryEnhancer controller reference - https://github.com/drupal-graphql/graphql/pull/1230": "patches/graphql_8x3x_query_route_enhancer_update.patch" - }, "drupal/hms_field": { "3351452 - Argument #1 ($seconds) must be of type string|int, null given": "https://www.drupal.org/files/issues/2023-03-31/hms_field-field_null_value-3351452-1.patch" }, diff --git a/composer.lock b/composer.lock index c1ecdb498a..3dbf580cf5 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "14ed15fca84bc7b982c7a4cf82296065", + "content-hash": "b75d7fc5fc1fcbb7c55c0ce0ecec6d7f", "packages": [ { "name": "alchemy/zippy", @@ -6757,27 +6757,27 @@ }, { "name": "drupal/graphql", - "version": "3.1.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/graphql.git", - "reference": "8.x-3.1" + "reference": "8.x-3.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/graphql-8.x-3.1.zip", - "reference": "8.x-3.1", - "shasum": "088430befbf13f2c8dadf1d9d14d01487e6f52bc" + "url": "https://ftp.drupal.org/files/projects/graphql-8.x-3.4.zip", + "reference": "8.x-3.4", + "shasum": "a00e8349a4e60083aa1bacbd8d7c782fca5f5738" }, "require": { - "drupal/core": "^8.8 || ^9", - "webonyx/graphql-php": "^0.12.5" + "drupal/core": "^9 || ^10", + "webonyx/graphql-php": "^14.11.8" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.1", - "datestamp": "1603962169", + "version": "8.x-3.4", + "datestamp": "1699463394", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -27190,26 +27190,36 @@ }, { "name": "webonyx/graphql-php", - "version": "v0.12.6", + "version": "v14.11.10", "source": { "type": "git", "url": "https://github.com/webonyx/graphql-php.git", - "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95" + "reference": "d9c2fdebc6aa01d831bc2969da00e8588cffef19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95", - "reference": "4c545e5ec4fc37f6eb36c19f5a0e7feaf5979c95", + "url": "https://api.github.com/repos/webonyx/graphql-php/zipball/d9c2fdebc6aa01d831bc2969da00e8588cffef19", + "reference": "d9c2fdebc6aa01d831bc2969da00e8588cffef19", "shasum": "" }, "require": { + "ext-json": "*", "ext-mbstring": "*", - "php": ">=5.6" + "php": "^7.1 || ^8" }, "require-dev": { - "phpunit/phpunit": "^4.8", + "amphp/amp": "^2.3", + "doctrine/coding-standard": "^6.0", + "nyholm/psr7": "^1.2", + "phpbench/phpbench": "^1.2", + "phpstan/extension-installer": "^1.0", + "phpstan/phpstan": "0.12.82", + "phpstan/phpstan-phpunit": "0.12.18", + "phpstan/phpstan-strict-rules": "0.12.9", + "phpunit/phpunit": "^7.2 || ^8.5", "psr/http-message": "^1.0", - "react/promise": "2.*" + "react/promise": "2.*", + "simpod/php-coveralls-mirror": "^3.0" }, "suggest": { "psr/http-message": "To use standard GraphQL server", @@ -27233,9 +27243,15 @@ ], "support": { "issues": "https://github.com/webonyx/graphql-php/issues", - "source": "https://github.com/webonyx/graphql-php/tree/0.12.x" + "source": "https://github.com/webonyx/graphql-php/tree/v14.11.10" }, - "time": "2018-09-02T14:59:54+00:00" + "funding": [ + { + "url": "https://opencollective.com/webonyx-graphql-php", + "type": "open_collective" + } + ], + "time": "2023-07-05T14:23:37+00:00" }, { "name": "weitzman/drupal-test-traits", @@ -27856,5 +27872,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.6.0" + "plugin-api-version": "2.3.0" } From 5effa82ee5ba655604246385f1df369e6df250e9 Mon Sep 17 00:00:00 2001 From: Nate Douglas Date: Wed, 15 Nov 2023 11:36:51 -0500 Subject: [PATCH 05/35] VACMS-16132: Fix content release on D10. (#16133) --- .../src/Controller/FrontendVersionAutocompleteController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docroot/modules/custom/va_gov_content_release/src/Controller/FrontendVersionAutocompleteController.php b/docroot/modules/custom/va_gov_content_release/src/Controller/FrontendVersionAutocompleteController.php index dee748c71c..a0398b8f13 100644 --- a/docroot/modules/custom/va_gov_content_release/src/Controller/FrontendVersionAutocompleteController.php +++ b/docroot/modules/custom/va_gov_content_release/src/Controller/FrontendVersionAutocompleteController.php @@ -69,12 +69,12 @@ public function handleAutocomplete(Request $request, string $frontend, int $coun $frontend = Frontend::from($frontend); } catch (\InvalidArgumentException $e) { - return JsonResponse::create(['error' => 'Invalid frontend type provided.']); + return new JsonResponse(['error' => 'Invalid frontend type provided.']); } $input = $request->query->get('q') ?? 'main'; $query = mb_strtolower($input); $results = $this->frontendVersionSearch->getMatchingReferences($frontend, $query, $count); - return JsonResponse::create($results); + return new JsonResponse($results); } } From 97689a27c9458cbc921c4a872420a4568d057f1a Mon Sep 17 00:00:00 2001 From: Nate Douglas Date: Wed, 15 Nov 2023 15:29:59 -0500 Subject: [PATCH 06/35] VACMS-16134: Accepts branch names starting with just an issue number. (#16135) --- hooks/git/pre-commit | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hooks/git/pre-commit b/hooks/git/pre-commit index f4b6a97cba..eae146b86e 100755 --- a/hooks/git/pre-commit +++ b/hooks/git/pre-commit @@ -3,7 +3,7 @@ # Check a specified branch name against a list of allowed patterns. function check_branch_name() { case $1 in - VAGOV-TEAM-[1-9][0-9]* | VACMS-[1-9][0-9]* | dependabot/* | revert-* | "") return 0;; + VAGOV-TEAM-[1-9][0-9]* | VACMS-[1-9][0-9]* | dependabot/* | revert-* | [1-9][0-9]* | "") return 0;; *) return 1;; esac } @@ -22,7 +22,8 @@ function branch_name_error() { cat <<-EOF >&2 Aborting commit. Your branch name must be prefixed with one of the following: - a VAGOV-TEAM-* or VACMS-* Github issue number format, - e.g. VAGOV-TEAM-123-issue-name or VACMS-123-issue-name. + e.g. VAGOV-TEAM-123-issue-name or VACMS-123-issue-name + - a new GitHub issue number format, e.g. 123-issue-name - dependabot/* (for work on Dependabot PRs) - revert-* (for work on GitHub-initiated revert PRs) From 334e9eb090767354691c50cf9e025fbfd5df1356 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Wed, 15 Nov 2023 15:26:06 -0600 Subject: [PATCH 07/35] VACMS-15939: Updates Help Desk email to correct Atlassian domain (#16141) --- .../en/message.template.vet_center_outdated_content.yml | 2 +- config/sync/message.template.vet_center_outdated_content.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/sync/language/en/message.template.vet_center_outdated_content.yml b/config/sync/language/en/message.template.vet_center_outdated_content.yml index 38542fadd7..5648c9745d 100644 --- a/config/sync/language/en/message.template.vet_center_outdated_content.yml +++ b/config/sync/language/en/message.template.vet_center_outdated_content.yml @@ -1,4 +1,4 @@ text: - - value: "

VA Directive 6102 requires that VA content is reviewed yearly to ensure information is still relevant. RCS recommends a minimum quarterly review as a best practice. All content will need to be reviewed, and outdated content will need to be edited to remain compliant with VA Directive 6102. Learn more about VA Directive 6102.

\r\n\r\n
\r\n

To assist with getting your content compliant, we are sending you this monthly reminder to log into Drupal, review and update your website content, and attest that your content is up-to-date.

\r\n\r\n

Reviewing your website top to bottom at least quarterly will help you to maintain updated and accurate location and service information and keep the website compliant with VA Directive 6102. For more information, you can read this Knowledge Base article for tips and best practices to manage compliance.

\r\n\r\n

Need help?

\r\n\r\n
    \r\n\t
  • If you are a Vet Center Director or Outreach Specialist who needs assistance accessing Drupal CMS, please email the CMS Support Team at support@va.gov.atlassian.net.
    • \r\n\t
  • If you want to refresh your skills, need ideas, or have questions about creating content for your webpages, you can find How to Guides and Training videos in the Drupal CMS Knowledge Base or drop in during office hours.
    • \r\n\t
  • If you received this email and no longer have a role at a Vet Center, please inform us by emailing the CMS Support Team at support@va.gov.atlassian.net.
    • \r\n
\r\n\r\n

Please note that before the end of the calendar year a formal suspense will be sent to ensure 100 percent compliance. We encourage you to make use of the resources and tools available before then to ensure your success and the success of information delivery on your page!

\r\n" + value: "

VA Directive 6102 requires that VA content is reviewed yearly to ensure information is still relevant. RCS recommends a minimum quarterly review as a best practice. All content will need to be reviewed, and outdated content will need to be edited to remain compliant with VA Directive 6102. Learn more about VA Directive 6102.

\r\n\r\n
\r\n

To assist with getting your content compliant, we are sending you this monthly reminder to log into Drupal, review and update your website content, and attest that your content is up-to-date.

\r\n\r\n

Reviewing your website top to bottom at least quarterly will help you to maintain updated and accurate location and service information and keep the website compliant with VA Directive 6102. For more information, you can read this Knowledge Base article for tips and best practices to manage compliance.

\r\n\r\n

Need help?

\r\n\r\n
    \r\n\t
  • If you are a Vet Center Director or Outreach Specialist who needs assistance accessing Drupal CMS, please email the CMS Support Team at support@va-gov.atlassian.net.
    • \r\n\t
  • If you want to refresh your skills, need ideas, or have questions about creating content for your webpages, you can find How to Guides and Training videos in the Drupal CMS Knowledge Base or drop in during office hours.
    • \r\n\t
  • If you received this email and no longer have a role at a Vet Center, please inform us by emailing the CMS Support Team at support@va-gov.atlassian.net.
    • \r\n
\r\n\r\n

Please note that before the end of the calendar year a formal suspense will be sent to ensure 100 percent compliance. We encourage you to make use of the resources and tools available before then to ensure your success and the success of information delivery on your page!

\r\n" format: rich_text diff --git a/config/sync/message.template.vet_center_outdated_content.yml b/config/sync/message.template.vet_center_outdated_content.yml index ee68b85160..da6115c964 100644 --- a/config/sync/message.template.vet_center_outdated_content.yml +++ b/config/sync/message.template.vet_center_outdated_content.yml @@ -9,7 +9,7 @@ label: 'Vet Center Outdated Content' description: 'Email for Vet Center section members, notifying them of outdated content. ' text: - - value: "

VA Directive 6102 requires that VA content is reviewed yearly to ensure information is still relevant. RCS recommends a minimum quarterly review as a best practice. All content will need to be reviewed, and outdated content will need to be edited to remain compliant with VA Directive 6102. Learn more about VA Directive 6102.

\r\n\r\n
\r\n

To assist with getting your content compliant, we are sending you this monthly reminder to log into Drupal, review and update your website content, and attest that your content is up-to-date.

\r\n\r\n

Reviewing your website top to bottom at least quarterly will help you to maintain updated and accurate location and service information and keep the website compliant with VA Directive 6102. For more information, you can read this Knowledge Base article for tips and best practices to manage compliance.

\r\n\r\n

Need help?

\r\n\r\n
    \r\n\t
  • If you are a Vet Center Director or Outreach Specialist who needs assistance accessing Drupal CMS, please email the CMS Support Team at support@va.gov.atlassian.net.
    • \r\n\t
  • If you want to refresh your skills, need ideas, or have questions about creating content for your webpages, you can find How to Guides and Training videos in the Drupal CMS Knowledge Base or drop in during office hours.
    • \r\n\t
  • If you received this email and no longer have a role at a Vet Center, please inform us by emailing the CMS Support Team at support@va.gov.atlassian.net.
    • \r\n
\r\n\r\n

Please note that before the end of the calendar year a formal suspense will be sent to ensure 100 percent compliance. We encourage you to make use of the resources and tools available before then to ensure your success and the success of information delivery on your page!

\r\n" + value: "

VA Directive 6102 requires that VA content is reviewed yearly to ensure information is still relevant. RCS recommends a minimum quarterly review as a best practice. All content will need to be reviewed, and outdated content will need to be edited to remain compliant with VA Directive 6102. Learn more about VA Directive 6102.

\r\n\r\n
\r\n

To assist with getting your content compliant, we are sending you this monthly reminder to log into Drupal, review and update your website content, and attest that your content is up-to-date.

\r\n\r\n

Reviewing your website top to bottom at least quarterly will help you to maintain updated and accurate location and service information and keep the website compliant with VA Directive 6102. For more information, you can read this Knowledge Base article for tips and best practices to manage compliance.

\r\n\r\n

Need help?

\r\n\r\n
    \r\n\t
  • If you are a Vet Center Director or Outreach Specialist who needs assistance accessing Drupal CMS, please email the CMS Support Team at support@va-gov.atlassian.net.
    • \r\n\t
  • If you want to refresh your skills, need ideas, or have questions about creating content for your webpages, you can find How to Guides and Training videos in the Drupal CMS Knowledge Base or drop in during office hours.
    • \r\n\t
  • If you received this email and no longer have a role at a Vet Center, please inform us by emailing the CMS Support Team at support@va-gov.atlassian.net.
    • \r\n
\r\n\r\n

Please note that before the end of the calendar year a formal suspense will be sent to ensure 100 percent compliance. We encourage you to make use of the resources and tools available before then to ensure your success and the success of information delivery on your page!

\r\n" format: rich_text settings: 'token options': From 90b7cb6a0a83986927bbfa192175ec4d531b1bd8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 20:12:00 -0600 Subject: [PATCH 08/35] Bump va-gov/content-build from 0.0.3386 to 0.0.3387 (#16147) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3386 to 0.0.3387. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3386...v0.0.3387) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index 3621128efa..583235bf50 100644 --- a/composer.json +++ b/composer.json @@ -208,7 +208,7 @@ "symfony/phpunit-bridge": "^5.1", "symfony/process": "^4.0", "symfony/routing": "^4.0", - "va-gov/content-build": "^0.0.3386", + "va-gov/content-build": "^0.0.3387", "vlucas/phpdotenv": "^5.3", "webflo/drupal-finder": "^1.0.0", "webmozart/path-util": "^2.3", diff --git a/composer.lock b/composer.lock index 3dbf580cf5..4b8f41135b 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "b75d7fc5fc1fcbb7c55c0ce0ecec6d7f", + "content-hash": "dc1ef17bd85e532906f75d7386c5a291", "packages": [ { "name": "alchemy/zippy", @@ -26911,16 +26911,16 @@ }, { "name": "va-gov/content-build", - "version": "v0.0.3386", + "version": "v0.0.3387", "source": { "type": "git", "url": "https://github.com/department-of-veterans-affairs/content-build.git", - "reference": "9008b5b142da3ff733e9c7aae18643621cbd8967" + "reference": "917fa5884dd7db0d7f39ca56b21d758d4b3f417d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/9008b5b142da3ff733e9c7aae18643621cbd8967", - "reference": "9008b5b142da3ff733e9c7aae18643621cbd8967", + "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/917fa5884dd7db0d7f39ca56b21d758d4b3f417d", + "reference": "917fa5884dd7db0d7f39ca56b21d758d4b3f417d", "shasum": "" }, "type": "node-project", @@ -26947,9 +26947,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.3386" + "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3387" }, - "time": "2023-11-14T19:23:29+00:00" + "time": "2023-11-15T16:10:47+00:00" }, { "name": "vlucas/phpdotenv", @@ -27872,5 +27872,5 @@ "platform-overrides": { "php": "8.1" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 9241527fca58d2d3cfa269b0d0edb68774bacc14 Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 15:08:29 -0600 Subject: [PATCH 09/35] Update cms-collaboration-cycle-request.yml --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 900a0c4abe..613d1ade3d 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -11,7 +11,7 @@ body: - type: markdown attributes: value: | - Before engaging with the CMS Collaboration Cycle, please fill out the form below to help the CMS Team determine what level of support and which touchpoints are needed for your work. Have questions about this form? Reach out to the CMS Team in the cms-support Slack channel. + Before engaging with the CMS Collaboration Cycle, please fill out the form below to help the CMS Team determine what level of support and which touchpoints are needed for your work. Have questions about this form? Read our [Kickoff Request documentation](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/cms/collaboration-cycle/kickoff.md) in Github or reach out to the CMS Team in the cms-support Slack channel. - type: input id: product-outline attributes: From e33e343a57caf4f20cf4e6badf6209b20409c624 Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 15:28:36 -0600 Subject: [PATCH 10/35] Update cms-collaboration-cycle-request.yml --- .../cms-collaboration-cycle-request.yml | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 613d1ade3d..46699bc0b9 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -64,7 +64,7 @@ body: - type: dropdown id: research attributes: - label: Are you doing user research with CMS editors? + label: Will you be doing user research with CMS editors? multiple: false options: - "Yes" @@ -83,6 +83,17 @@ body: - "Maybe (Leave notes in the Additional Information section of this form)" validations: required: true + - type: dropdown + id: DS + attributes: + label: Will your work require introducing a new CMS Design System component or changes to an existing component? + multiple: false + options: + - "Yes" + - "No" + - "Maybe (Leave notes in the Additional Information section of this form)" + validations: + required: true - type: dropdown id: modules attributes: @@ -94,10 +105,21 @@ body: - "Maybe (Leave notes in the Additional Information section of this form)" validations: required: true + - type: dropdown + id: fields + attributes: + label: Will your work require introducing new input fields or making changes to existing input fields? + multiple: false + options: + - "Yes" + - "No" + - "Maybe (Leave notes in the Additional Information section of this form)" + validations: + required: true - type: dropdown id: analytics attributes: - label: Do you need to capture any analytics or metrics? + label: Will this work require you to capture any analytics or metrics? multiple: false options: - "Yes" From 53cdb8f805729aec0ef6102e37eaf1c018fabb4c Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 15:29:37 -0600 Subject: [PATCH 11/35] Update cms-collaboration-cycle-request.yml --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 46699bc0b9..8846252580 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -1,4 +1,3 @@ - name: CMS Collaboration Cycle Request description: Use this template to begin engaging with the CMS Collaboration Cycle. title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]" From 3192d592883f096bf7d64dedb7c941c9dc48aad7 Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 15:35:40 -0600 Subject: [PATCH 12/35] Update cms-collaboration-cycle-request.yml --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 8846252580..6fd64a5ba3 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -1,4 +1,4 @@ -name: CMS Collaboration Cycle Request +name: "CMS Collaboration Cycle Request" description: Use this template to begin engaging with the CMS Collaboration Cycle. title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]" labels: CMS Team, Needs Analysis, CMS-Collab-Cycle, Epic From 2c7478b2ff1eaa0c57b6aafe2934a76038c0f8b4 Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 15:35:58 -0600 Subject: [PATCH 13/35] Update cms-collaboration-cycle-request.yml --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 6fd64a5ba3..8846252580 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -1,4 +1,4 @@ -name: "CMS Collaboration Cycle Request" +name: CMS Collaboration Cycle Request description: Use this template to begin engaging with the CMS Collaboration Cycle. title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]" labels: CMS Team, Needs Analysis, CMS-Collab-Cycle, Epic From 508a2e98808735c9af99b017b07e3f1ec6d59d03 Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:05:32 -0600 Subject: [PATCH 14/35] Update cms-collaboration-cycle-request.yml --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 8846252580..46699bc0b9 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -1,3 +1,4 @@ + name: CMS Collaboration Cycle Request description: Use this template to begin engaging with the CMS Collaboration Cycle. title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]" From 2943a45324cbd4ff296bda756a6b321b045171ae Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:05:49 -0600 Subject: [PATCH 15/35] Update cms-collaboration-cycle-request.yml --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 46699bc0b9..8846252580 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -1,4 +1,3 @@ - name: CMS Collaboration Cycle Request description: Use this template to begin engaging with the CMS Collaboration Cycle. title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]" From 5ffdf8b6de250ee4c43806de88d39ff0c423453a Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:16:09 -0600 Subject: [PATCH 16/35] Update cms-collaboration-cycle-request.yml --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 8846252580..46699bc0b9 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -1,3 +1,4 @@ + name: CMS Collaboration Cycle Request description: Use this template to begin engaging with the CMS Collaboration Cycle. title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]" From 5056c7f619bbae4e70f9704fa707eb0c2398766c Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:17:40 -0600 Subject: [PATCH 17/35] Update cms-collaboration-cycle-request.yml --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 46699bc0b9..7e68b11269 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -1,5 +1,5 @@ -name: CMS Collaboration Cycle Request +name: "CMS Collaboration Cycle Request" description: Use this template to begin engaging with the CMS Collaboration Cycle. title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]" labels: CMS Team, Needs Analysis, CMS-Collab-Cycle, Epic From 0ecfee55d3cf919ca612a56c0fc3fd1975bf93a5 Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:20:09 -0600 Subject: [PATCH 18/35] Update cms-collaboration-cycle-request.yml From f6ef578175661ef709fae4daa1f3fef8de26a5d1 Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:26:19 -0600 Subject: [PATCH 19/35] Update cms-collaboration-cycle-request.yml --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 7e68b11269..6fd64a5ba3 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -1,4 +1,3 @@ - name: "CMS Collaboration Cycle Request" description: Use this template to begin engaging with the CMS Collaboration Cycle. title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]" From 493f2e8c24b9bc2dbca5f789a3eca3623256fd8b Mon Sep 17 00:00:00 2001 From: Blake Organ <113871419+BlakeOrgan@users.noreply.github.com> Date: Thu, 16 Nov 2023 16:26:37 -0600 Subject: [PATCH 20/35] Update cms-collaboration-cycle-request.yml --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 6fd64a5ba3..7e68b11269 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -1,3 +1,4 @@ + name: "CMS Collaboration Cycle Request" description: Use this template to begin engaging with the CMS Collaboration Cycle. title: "CMS Collaboration Cycle for [Team Name, Product Name, Feature Name]" From 2d8aa3124d81fe692e6e1849975b32014fd7f494 Mon Sep 17 00:00:00 2001 From: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:32:32 -0600 Subject: [PATCH 21/35] [docs] trying to fix syntax --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 7e68b11269..9c97cd1895 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -148,7 +148,8 @@ body: attributes: label: I acknowledge that I must submit this form as an Epic and notify the cms-team user group in the cms-support Slack channel with a link to the Epic that is created. options: - - label: I agree. - required: true + - I agree. + validations: + required: true From de6a48ca2cfa66678795beb2be50986443b39bb5 Mon Sep 17 00:00:00 2001 From: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:34:46 -0600 Subject: [PATCH 22/35] [docs] was it a missing validation? --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 9c97cd1895..bf04cccc04 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -143,6 +143,8 @@ body: attributes: label: Additional Information description: Please include any additional information or context that may be relevant to your request. + validations: + required: false - type: checkboxes id: terms-agreement attributes: From e3011d935feb82105f455d507e46dfcbbd33e026 Mon Sep 17 00:00:00 2001 From: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:35:43 -0600 Subject: [PATCH 23/35] [docs] or literally one thing being too indented? --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index bf04cccc04..8479b52b1c 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -152,6 +152,6 @@ body: options: - I agree. validations: - required: true + required: true From 6dda9bf1799022f0422d23738f89a97fb078328e Mon Sep 17 00:00:00 2001 From: Eric Oliver Date: Thu, 16 Nov 2023 15:40:12 -0800 Subject: [PATCH 24/35] Update cms-collaboration-cycle-request.yml --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 8479b52b1c..37d88d39ce 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -83,7 +83,7 @@ body: - "Maybe (Leave notes in the Additional Information section of this form)" validations: required: true - - type: dropdown + - type: dropdown id: DS attributes: label: Will your work require introducing a new CMS Design System component or changes to an existing component? From e98afb7f7ec9d820e713e56079e05c0bf2cf8ca9 Mon Sep 17 00:00:00 2001 From: Dave Pickett <51967950+davidmpickett@users.noreply.github.com> Date: Thu, 16 Nov 2023 17:41:58 -0600 Subject: [PATCH 25/35] [docs] reverting my incoreect changes and implementing Eric's correct fix --- .github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml index 37d88d39ce..1350df3544 100644 --- a/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml +++ b/.github/ISSUE_TEMPLATE/cms-collaboration-cycle-request.yml @@ -143,15 +143,12 @@ body: attributes: label: Additional Information description: Please include any additional information or context that may be relevant to your request. - validations: - required: false - type: checkboxes id: terms-agreement attributes: label: I acknowledge that I must submit this form as an Epic and notify the cms-team user group in the cms-support Slack channel with a link to the Epic that is created. options: - - I agree. - validations: - required: true + - label: I agree. + required: true From c0c5fc9d61972b938c4c69e54b7e2229ba88fb39 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 18:59:26 -0600 Subject: [PATCH 26/35] Bump drupal/tzfield from 1.8.0 to 1.9.0 (#16092) Bumps drupal/tzfield from 1.8.0 to 1.9.0. --- updated-dependencies: - dependency-name: drupal/tzfield dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 4b8f41135b..14fe3d0604 100644 --- a/composer.lock +++ b/composer.lock @@ -12764,17 +12764,17 @@ }, { "name": "drupal/tzfield", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/tzfield.git", - "reference": "8.x-1.8" + "reference": "8.x-1.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/tzfield-8.x-1.8.zip", - "reference": "8.x-1.8", - "shasum": "5793920c1d56dde77652f6b4b1e3ba3ae4625f1f" + "url": "https://ftp.drupal.org/files/projects/tzfield-8.x-1.9.zip", + "reference": "8.x-1.9", + "shasum": "c27c0015ba266b16136b3f6fd4fd1fa188ef9a0b" }, "require": { "drupal/core": "^8 || ^9 || ^10" @@ -12782,8 +12782,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.8", - "datestamp": "1698896138", + "version": "8.x-1.9", + "datestamp": "1699555172", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" From 9ea1b935b0c2a200e7fe3d0656c7bd8c22c619c8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Nov 2023 19:44:02 -0600 Subject: [PATCH 27/35] Bump va-gov/content-build from 0.0.3387 to 0.0.3388 (#16155) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3387 to 0.0.3388. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3387...v0.0.3388) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index 583235bf50..abbd94ed91 100644 --- a/composer.json +++ b/composer.json @@ -208,7 +208,7 @@ "symfony/phpunit-bridge": "^5.1", "symfony/process": "^4.0", "symfony/routing": "^4.0", - "va-gov/content-build": "^0.0.3387", + "va-gov/content-build": "^0.0.3388", "vlucas/phpdotenv": "^5.3", "webflo/drupal-finder": "^1.0.0", "webmozart/path-util": "^2.3", diff --git a/composer.lock b/composer.lock index 14fe3d0604..a64336463e 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "dc1ef17bd85e532906f75d7386c5a291", + "content-hash": "4ddf9e7cf223e4bcb5678a58ff8d0758", "packages": [ { "name": "alchemy/zippy", @@ -26911,7 +26911,7 @@ }, { "name": "va-gov/content-build", - "version": "v0.0.3387", + "version": "v0.0.3388", "source": { "type": "git", "url": "https://github.com/department-of-veterans-affairs/content-build.git", @@ -26947,7 +26947,7 @@ "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.3387" + "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3388" }, "time": "2023-11-15T16:10:47+00:00" }, From 24c79bd6cc66739f717b788de91472d2af8fc4db Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Nov 2023 20:14:03 -0600 Subject: [PATCH 28/35] Bump va-gov/content-build from 0.0.3388 to 0.0.3389 (#16165) Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3388 to 0.0.3389. - [Release notes](https://github.com/department-of-veterans-affairs/content-build/releases) - [Commits](https://github.com/department-of-veterans-affairs/content-build/compare/v0.0.3388...v0.0.3389) --- updated-dependencies: - dependency-name: va-gov/content-build dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.json | 2 +- composer.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index abbd94ed91..8b90c376bc 100644 --- a/composer.json +++ b/composer.json @@ -208,7 +208,7 @@ "symfony/phpunit-bridge": "^5.1", "symfony/process": "^4.0", "symfony/routing": "^4.0", - "va-gov/content-build": "^0.0.3388", + "va-gov/content-build": "^0.0.3389", "vlucas/phpdotenv": "^5.3", "webflo/drupal-finder": "^1.0.0", "webmozart/path-util": "^2.3", diff --git a/composer.lock b/composer.lock index a64336463e..b80a778ec4 100644 --- a/composer.lock +++ b/composer.lock @@ -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": "4ddf9e7cf223e4bcb5678a58ff8d0758", + "content-hash": "a6a09fa634b5002bd996615a7ce5be50", "packages": [ { "name": "alchemy/zippy", @@ -26911,7 +26911,7 @@ }, { "name": "va-gov/content-build", - "version": "v0.0.3388", + "version": "v0.0.3389", "source": { "type": "git", "url": "https://github.com/department-of-veterans-affairs/content-build.git", @@ -26947,7 +26947,7 @@ "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.3388" + "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3389" }, "time": "2023-11-15T16:10:47+00:00" }, From c9d4c09ec21413cbb4f3dc79e2532be037852e12 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Sat, 18 Nov 2023 20:42:19 -0600 Subject: [PATCH 29/35] VACMS-15977: Adds accordion to VBA Facility Prepare for your visit (#16161) * VACMS-15977: Makes prepare for visit config changes * VACMS-15977: Makes node:view better match node:edit --------- Co-authored-by: Steve Wirt --- ...form_display.node.vba_facility.default.yml | 54 ++++++++++++------- ...view_display.node.vba_facility.default.yml | 34 ++++++++---- ...lay.node.vba_facility.external_content.yml | 4 +- ...ew_display.node.vba_facility.ief_table.yml | 4 +- ..._view_display.node.vba_facility.teaser.yml | 4 +- ....vba_facility.field_prepare_for_visit.yml} | 18 +++---- 6 files changed, 73 insertions(+), 45 deletions(-) rename config/sync/{field.field.node.vba_facility.field_location_services.yml => field.field.node.vba_facility.field_prepare_for_visit.yml} (90%) diff --git a/config/sync/core.entity_form_display.node.vba_facility.default.yml b/config/sync/core.entity_form_display.node.vba_facility.default.yml index c82062ac1a..a489fb8d56 100644 --- a/config/sync/core.entity_form_display.node.vba_facility.default.yml +++ b/config/sync/core.entity_form_display.node.vba_facility.default.yml @@ -18,7 +18,6 @@ dependencies: - field.field.node.vba_facility.field_geolocation - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor - - field.field.node.vba_facility.field_location_services - field.field.node.vba_facility.field_media - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name @@ -27,6 +26,7 @@ dependencies: - field.field.node.vba_facility.field_operating_status_facility - field.field.node.vba_facility.field_operating_status_more_info - field.field.node.vba_facility.field_phone_number + - field.field.node.vba_facility.field_prepare_for_visit - field.field.node.vba_facility.field_shared_vha_location - field.field.node.vba_facility.field_table_of_contents - field.field.node.vba_facility.field_timezone @@ -45,6 +45,7 @@ dependencies: - media_library - office_hours - paragraphs + - paragraphs_features - telephone - textfield_counter - tzfield @@ -159,19 +160,20 @@ third_party_settings: description_display: after group_prepare_for_your_visit: children: - - field_location_services + - field_prepare_for_visit label: 'Prepare for your visit' region: content parent_name: '' weight: 7 - format_type: details + format_type: fieldset format_settings: classes: '' show_empty_fields: true id: prepare-for-your-visit - open: true description: 'Add location services available at this facility such as transportation, parking, visiting hours, lodging options, food options, etc. Do not use this for benefit services.' required_fields: true + open: true + description_display: after group_benefit_office_overview: children: - field_cc_vba_facility_overview @@ -417,22 +419,6 @@ content: region: content settings: { } third_party_settings: { } - field_location_services: - type: entity_reference_paragraphs - weight: 5 - region: content - settings: - title: Paragraph - title_plural: Paragraphs - edit_mode: closed - add_mode: button - form_display_mode: default - default_paragraph_type: _none - third_party_settings: - limited_field_widgets: - limit_values: '0' - change_labels: - add_another: '' field_media: type: media_library_widget weight: 4 @@ -496,6 +482,34 @@ content: settings: placeholder: '' third_party_settings: { } + field_prepare_for_visit: + type: paragraphs + weight: 27 + region: content + settings: + title: accordion + title_plural: accordions + edit_mode: closed + closed_mode: summary + autocollapse: none + closed_mode_threshold: 0 + add_mode: button + form_display_mode: default + default_paragraph_type: _none + features: + add_above: '0' + collapse_edit_all: collapse_edit_all + duplicate: '0' + third_party_settings: + paragraphs_features: + add_in_between: false + add_in_between_link_count: 3 + delete_confirmation: false + show_drag_and_drop: true + limited_field_widgets: + limit_values: '0' + change_labels: + add_another: '' field_shared_vha_location: type: entity_reference_autocomplete weight: 17 diff --git a/config/sync/core.entity_view_display.node.vba_facility.default.yml b/config/sync/core.entity_view_display.node.vba_facility.default.yml index f32bd0ad05..e8636a83fd 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.default.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.default.yml @@ -18,7 +18,6 @@ dependencies: - field.field.node.vba_facility.field_geolocation - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor - - field.field.node.vba_facility.field_location_services - field.field.node.vba_facility.field_media - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name @@ -27,6 +26,7 @@ dependencies: - field.field.node.vba_facility.field_operating_status_facility - field.field.node.vba_facility.field_operating_status_more_info - field.field.node.vba_facility.field_phone_number + - field.field.node.vba_facility.field_prepare_for_visit - field.field.node.vba_facility.field_shared_vha_location - field.field.node.vba_facility.field_table_of_contents - field.field.node.vba_facility.field_timezone @@ -247,6 +247,20 @@ third_party_settings: tooltip_description: "Why can’t I edit this? \r\nNational editors keep this content standardized to provide consistent messaging for facilities nationwide." open: false required_fields: false + group_prepare_for_your_visit: + children: + - field_prepare_for_visit + label: 'Prepare for your visit' + parent_name: '' + region: content + weight: 6 + format_type: fieldset + format_settings: + classes: '' + show_empty_fields: false + id: '' + description: '' + description_display: after id: node.vba_facility.default targetEntityType: node bundle: vba_facility @@ -330,15 +344,6 @@ content: third_party_settings: { } weight: 14 region: content - field_location_services: - type: entity_reference_revisions_entity_view - label: above - settings: - view_mode: default - link: '' - third_party_settings: { } - weight: 6 - region: content field_media: type: entity_reference_entity_view label: above @@ -431,6 +436,15 @@ content: third_party_settings: { } weight: 5 region: content + field_prepare_for_visit: + type: entity_reference_revisions_entity_view + label: above + settings: + view_mode: default + link: '' + third_party_settings: { } + weight: 17 + region: content field_shared_vha_location: type: entity_reference_label label: above diff --git a/config/sync/core.entity_view_display.node.vba_facility.external_content.yml b/config/sync/core.entity_view_display.node.vba_facility.external_content.yml index e4b362aee6..5d0693987c 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.external_content.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.external_content.yml @@ -19,7 +19,6 @@ dependencies: - field.field.node.vba_facility.field_geolocation - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor - - field.field.node.vba_facility.field_location_services - field.field.node.vba_facility.field_media - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name @@ -28,6 +27,7 @@ dependencies: - field.field.node.vba_facility.field_operating_status_facility - field.field.node.vba_facility.field_operating_status_more_info - field.field.node.vba_facility.field_phone_number + - field.field.node.vba_facility.field_prepare_for_visit - field.field.node.vba_facility.field_shared_vha_location - field.field.node.vba_facility.field_table_of_contents - field.field.node.vba_facility.field_timezone @@ -253,10 +253,10 @@ hidden: field_cc_vba_facility_overview: true field_intro_text: true field_last_saved_by_an_editor: true - field_location_services: true field_media: true field_operating_status_facility: true field_operating_status_more_info: true + field_prepare_for_visit: true field_table_of_contents: true flag_awaiting_csv: true flag_awaiting_editor: true diff --git a/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml b/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml index 097da27929..3bcb081bd2 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml @@ -19,7 +19,6 @@ dependencies: - field.field.node.vba_facility.field_geolocation - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor - - field.field.node.vba_facility.field_location_services - field.field.node.vba_facility.field_media - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name @@ -28,6 +27,7 @@ dependencies: - field.field.node.vba_facility.field_operating_status_facility - field.field.node.vba_facility.field_operating_status_more_info - field.field.node.vba_facility.field_phone_number + - field.field.node.vba_facility.field_prepare_for_visit - field.field.node.vba_facility.field_shared_vha_location - field.field.node.vba_facility.field_table_of_contents - field.field.node.vba_facility.field_timezone @@ -188,11 +188,11 @@ hidden: field_geolocation: true field_intro_text: true field_last_saved_by_an_editor: true - field_location_services: true field_media: true field_non_va_location_url: true field_non_va_official_name: true field_office: true + field_prepare_for_visit: true field_shared_vha_location: true field_table_of_contents: true field_timezone: true diff --git a/config/sync/core.entity_view_display.node.vba_facility.teaser.yml b/config/sync/core.entity_view_display.node.vba_facility.teaser.yml index bab18a82b5..ff8e2ad03e 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.teaser.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.teaser.yml @@ -19,7 +19,6 @@ dependencies: - field.field.node.vba_facility.field_geolocation - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor - - field.field.node.vba_facility.field_location_services - field.field.node.vba_facility.field_media - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name @@ -28,6 +27,7 @@ dependencies: - field.field.node.vba_facility.field_operating_status_facility - field.field.node.vba_facility.field_operating_status_more_info - field.field.node.vba_facility.field_phone_number + - field.field.node.vba_facility.field_prepare_for_visit - field.field.node.vba_facility.field_shared_vha_location - field.field.node.vba_facility.field_table_of_contents - field.field.node.vba_facility.field_timezone @@ -66,7 +66,6 @@ hidden: field_geolocation: true field_intro_text: true field_last_saved_by_an_editor: true - field_location_services: true field_media: true field_non_va_location_url: true field_non_va_official_name: true @@ -75,6 +74,7 @@ hidden: field_operating_status_facility: true field_operating_status_more_info: true field_phone_number: true + field_prepare_for_visit: true field_shared_vha_location: true field_table_of_contents: true field_timezone: true diff --git a/config/sync/field.field.node.vba_facility.field_location_services.yml b/config/sync/field.field.node.vba_facility.field_prepare_for_visit.yml similarity index 90% rename from config/sync/field.field.node.vba_facility.field_location_services.yml rename to config/sync/field.field.node.vba_facility.field_prepare_for_visit.yml index ad4bf16910..1dcd633699 100644 --- a/config/sync/field.field.node.vba_facility.field_location_services.yml +++ b/config/sync/field.field.node.vba_facility.field_prepare_for_visit.yml @@ -1,22 +1,22 @@ -uuid: 03737c7e-c4fb-4fd1-b2c8-c6d825f17780 +uuid: 2a9fff3f-dea4-411f-8daa-cc8ad1d5cd4c langcode: en status: true dependencies: config: - - field.storage.node.field_location_services + - field.storage.node.field_prepare_for_visit - node.type.vba_facility - - paragraphs.paragraphs_type.health_care_local_facility_servi + - paragraphs.paragraphs_type.basic_accordion module: - entity_reference_revisions - tmgmt_content third_party_settings: tmgmt_content: excluded: false -id: node.vba_facility.field_location_services -field_name: field_location_services +id: node.vba_facility.field_prepare_for_visit +field_name: field_prepare_for_visit entity_type: node bundle: vba_facility -label: 'Location services' +label: 'Prepare for your visit accordions' description: '' required: false translatable: true @@ -26,7 +26,7 @@ settings: handler: 'default:paragraph' handler_settings: target_bundles: - health_care_local_facility_servi: health_care_local_facility_servi + basic_accordion: basic_accordion negate: 0 target_bundles_drag_drop: address: @@ -43,7 +43,7 @@ settings: enabled: false basic_accordion: weight: 50 - enabled: false + enabled: true button: weight: 51 enabled: false @@ -82,7 +82,7 @@ settings: enabled: false health_care_local_facility_servi: weight: 63 - enabled: true + enabled: false link_teaser: weight: 64 enabled: false From 1c8f7f6e2deaf0f000706b2ffbc80eb8ce12dbdd Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Sun, 19 Nov 2023 18:11:41 -0600 Subject: [PATCH 30/35] VACMS-14700: Adds banner to VBA Facility (#16076) * VACMS-14700: Adds config for banner fields * VACMS-14700: Adds config for persistence * VACMS-14700: Adds hiding and a little resetting on presave * VACMS-14700: Hides and reveals fields. Adds constraint. Clears fields. * VACMS-14700: Expands banner fieldset when checkbox is checked. * VACMS-14700: Hides banner fields on node:view when not checked * VACMS-14700: Adds config changes. * VACMS-14700: Changes config and select list option * VACMS-14700: Code cleanup * VACMS-14700: Fixes a couple typos. * VACMS-14700: Updates language after review. Updates code to remove errors in UI and testing. * VACMS-14700: Removes isset() as it always exists and is not nullable, per PHPStan. * VACMS-14700: Adds full content validation. * VACMS-14700: Removes N/A from dismissible, makes it show as required. * VACMS-14700: Orders methods * VACMS-14700: Makes dismissible not required. * VACMS-14700: Updates name, per PR review * VACMS-14700: Updates UI per Figma --- ...form_display.node.vba_facility.default.yml | 103 ++++++++++-- ...view_display.node.vba_facility.default.yml | 92 +++++++++- ...lay.node.vba_facility.external_content.yml | 12 ++ ...ew_display.node.vba_facility.ief_table.yml | 12 ++ ..._view_display.node.vba_facility.teaser.yml | 12 ++ ...eld.node.vba_facility.field_alert_type.yml | 25 +++ ...node.vba_facility.field_banner_content.yml | 29 ++++ ...d.node.vba_facility.field_banner_title.yml | 24 +++ ...acility.field_banner_types_description.yml | 29 ++++ ....vba_facility.field_dismissible_option.yml | 27 +++ ...ld.node.vba_facility.field_show_banner.yml | 28 ++++ ...ield.storage.node.field_banner_content.yml | 19 +++ .../field.storage.node.field_banner_title.yml | 21 +++ ...ge.node.field_banner_types_description.yml | 19 +++ ....storage.node.field_dismissible_option.yml | 6 +- .../field.storage.node.field_show_banner.yml | 18 ++ .../js/set_banner_fields_to_required.es6.js | 33 ++++ .../js/set_banner_fields_to_required.js | 20 +++ .../EventSubscriber/VbaFacilitySubscriber.php | 157 +++++++++++++++++- .../VbaFacilityRequiredFieldsConstraint.php | 25 +++ ...ilityRequiredFieldsConstraintValidator.php | 77 +++++++++ .../va_gov_vba_facility.libraries.yml | 5 +- .../va_gov_vba_facility.module | 1 + 23 files changed, 767 insertions(+), 27 deletions(-) create mode 100644 config/sync/field.field.node.vba_facility.field_alert_type.yml create mode 100644 config/sync/field.field.node.vba_facility.field_banner_content.yml create mode 100644 config/sync/field.field.node.vba_facility.field_banner_title.yml create mode 100644 config/sync/field.field.node.vba_facility.field_banner_types_description.yml create mode 100644 config/sync/field.field.node.vba_facility.field_dismissible_option.yml create mode 100644 config/sync/field.field.node.vba_facility.field_show_banner.yml create mode 100644 config/sync/field.storage.node.field_banner_content.yml create mode 100644 config/sync/field.storage.node.field_banner_title.yml create mode 100644 config/sync/field.storage.node.field_banner_types_description.yml create mode 100644 config/sync/field.storage.node.field_show_banner.yml create mode 100644 docroot/modules/custom/va_gov_vba_facility/js/set_banner_fields_to_required.es6.js create mode 100644 docroot/modules/custom/va_gov_vba_facility/js/set_banner_fields_to_required.js create mode 100644 docroot/modules/custom/va_gov_vba_facility/src/Plugin/Validation/Constraint/VbaFacilityRequiredFieldsConstraint.php create mode 100644 docroot/modules/custom/va_gov_vba_facility/src/Plugin/Validation/Constraint/VbaFacilityRequiredFieldsConstraintValidator.php diff --git a/config/sync/core.entity_form_display.node.vba_facility.default.yml b/config/sync/core.entity_form_display.node.vba_facility.default.yml index a489fb8d56..efaef94d87 100644 --- a/config/sync/core.entity_form_display.node.vba_facility.default.yml +++ b/config/sync/core.entity_form_display.node.vba_facility.default.yml @@ -5,6 +5,10 @@ dependencies: config: - field.field.node.vba_facility.field_address - field.field.node.vba_facility.field_administration + - field.field.node.vba_facility.field_alert_type + - field.field.node.vba_facility.field_banner_content + - field.field.node.vba_facility.field_banner_title + - field.field.node.vba_facility.field_banner_types_description - field.field.node.vba_facility.field_cc_benefit_office_hours_va - field.field.node.vba_facility.field_cc_benefits_hotline - field.field.node.vba_facility.field_cc_cant_find_benefits @@ -13,6 +17,7 @@ dependencies: - field.field.node.vba_facility.field_cc_national_spotlight_2 - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview + - field.field.node.vba_facility.field_dismissible_option - field.field.node.vba_facility.field_facility_locator_api_id - field.field.node.vba_facility.field_facility_vba_classificatio - field.field.node.vba_facility.field_geolocation @@ -28,12 +33,14 @@ dependencies: - field.field.node.vba_facility.field_phone_number - field.field.node.vba_facility.field_prepare_for_visit - field.field.node.vba_facility.field_shared_vha_location + - field.field.node.vba_facility.field_show_banner - field.field.node.vba_facility.field_table_of_contents - field.field.node.vba_facility.field_timezone - node.type.vba_facility - workflows.workflow.editorial module: - address + - allowed_formats - change_labels - content_moderation - entity_field_fetch @@ -73,7 +80,7 @@ third_party_settings: label: 'Section settings' region: content parent_name: '' - weight: 10 + weight: 11 format_type: details_sidebar format_settings: classes: '' @@ -90,7 +97,7 @@ third_party_settings: label: 'Editorial Workflow' region: content parent_name: '' - weight: 12 + weight: 13 format_type: fieldset format_settings: classes: '' @@ -103,7 +110,7 @@ third_party_settings: label: 'Locations and contact information' region: content parent_name: '' - weight: 4 + weight: 5 format_type: fieldset format_settings: classes: '' @@ -149,7 +156,7 @@ third_party_settings: label: 'Top of page information' region: content parent_name: '' - weight: 3 + weight: 4 format_type: fieldset format_settings: classes: '' @@ -164,7 +171,7 @@ third_party_settings: label: 'Prepare for your visit' region: content parent_name: '' - weight: 7 + weight: 8 format_type: fieldset format_settings: classes: '' @@ -180,7 +187,7 @@ third_party_settings: label: 'Benefit office overview' region: content parent_name: '' - weight: 2 + weight: 3 format_type: tooltip format_settings: show_empty_fields: '1' @@ -199,7 +206,7 @@ third_party_settings: label: 'Benefits hotline' region: content parent_name: '' - weight: 6 + weight: 7 format_type: tooltip format_settings: show_empty_fields: 0 @@ -219,7 +226,7 @@ third_party_settings: label: 'Benefit office hours may vary' region: content parent_name: '' - weight: 5 + weight: 6 format_type: tooltip format_settings: show_empty_fields: 0 @@ -241,7 +248,7 @@ third_party_settings: label: 'National spotlight' region: content parent_name: '' - weight: 8 + weight: 9 format_type: tooltip format_settings: show_empty_fields: 0 @@ -261,7 +268,7 @@ third_party_settings: label: 'Can''t find benefits' region: content parent_name: '' - weight: 9 + weight: 10 format_type: tooltip format_settings: show_empty_fields: 0 @@ -281,7 +288,7 @@ third_party_settings: label: 'Get updates from VBA' region: content parent_name: '' - weight: 11 + weight: 12 format_type: tooltip format_settings: show_empty_fields: 0 @@ -295,6 +302,28 @@ third_party_settings: description: '' tooltip_description: "Why can’t I edit this? \r\nNational editors keep this content standardized to provide consistent messaging for facilities nationwide." open: false + group_banner: + children: + - field_show_banner + - field_banner_types_description + - field_alert_type + - field_dismissible_option + - field_banner_title + - field_banner_content + label: 'Banner alert' + region: content + parent_name: '' + weight: 2 + format_type: detailswithimage + format_settings: + description: 'This optional segment allows you to add a banner alert to the VBA facility.' + open: '1' + visual_guide_file_name: '' + visual_guide_alt_text: '' + required_fields: '1' + id: '' + classes: '' + show_empty_fields: 0 id: node.vba_facility.default targetEntityType: node bundle: vba_facility @@ -312,6 +341,43 @@ content: region: content settings: { } third_party_settings: { } + field_alert_type: + type: options_select + weight: 29 + region: content + settings: { } + third_party_settings: { } + field_banner_content: + type: text_textarea_with_counter + weight: 32 + region: content + settings: + rows: 5 + placeholder: '' + maxlength: 300 + counter_position: after + js_prevent_submit: true + count_only_mode: false + count_html_characters: false + textcount_status_message: '@remaining_count characters remaining' + third_party_settings: + allowed_formats: + hide_help: '1' + hide_guidelines: '1' + field_banner_title: + type: string_textfield + weight: 31 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + field_banner_types_description: + type: markup + weight: 28 + region: content + settings: { } + third_party_settings: { } field_cc_benefit_office_hours_va: type: entity_field_fetch_widget weight: 13 @@ -384,6 +450,12 @@ content: show_link_to_source: '1' show_source_updated_date: '1' third_party_settings: { } + field_dismissible_option: + type: options_buttons + weight: 30 + region: content + settings: { } + third_party_settings: { } field_facility_locator_api_id: type: string_textfield weight: 5 @@ -415,7 +487,7 @@ content: third_party_settings: { } field_last_saved_by_an_editor: type: datetime_timestamp - weight: 13 + weight: 14 region: content settings: { } third_party_settings: { } @@ -520,6 +592,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_show_banner: + type: boolean_checkbox + weight: 27 + region: content + settings: + display_label: true + third_party_settings: { } field_table_of_contents: type: markup weight: 0 diff --git a/config/sync/core.entity_view_display.node.vba_facility.default.yml b/config/sync/core.entity_view_display.node.vba_facility.default.yml index e8636a83fd..9e6c21811e 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.default.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.default.yml @@ -5,6 +5,10 @@ dependencies: config: - field.field.node.vba_facility.field_address - field.field.node.vba_facility.field_administration + - field.field.node.vba_facility.field_alert_type + - field.field.node.vba_facility.field_banner_content + - field.field.node.vba_facility.field_banner_title + - field.field.node.vba_facility.field_banner_types_description - field.field.node.vba_facility.field_cc_benefit_office_hours_va - field.field.node.vba_facility.field_cc_benefits_hotline - field.field.node.vba_facility.field_cc_cant_find_benefits @@ -13,6 +17,7 @@ dependencies: - field.field.node.vba_facility.field_cc_national_spotlight_2 - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview + - field.field.node.vba_facility.field_dismissible_option - field.field.node.vba_facility.field_facility_locator_api_id - field.field.node.vba_facility.field_facility_vba_classificatio - field.field.node.vba_facility.field_geolocation @@ -28,6 +33,7 @@ dependencies: - field.field.node.vba_facility.field_phone_number - field.field.node.vba_facility.field_prepare_for_visit - field.field.node.vba_facility.field_shared_vha_location + - field.field.node.vba_facility.field_show_banner - field.field.node.vba_facility.field_table_of_contents - field.field.node.vba_facility.field_timezone - node.type.vba_facility @@ -40,6 +46,7 @@ dependencies: - office_hours - options - telephone + - text - user third_party_settings: field_group: @@ -64,7 +71,7 @@ third_party_settings: label: 'Locations and contact information' parent_name: '' region: content - weight: 3 + weight: 4 format_type: fieldset format_settings: classes: '' @@ -102,7 +109,7 @@ third_party_settings: label: 'Facility Intro and Photo' parent_name: '' region: content - weight: 2 + weight: 3 format_type: fieldset format_settings: classes: '' @@ -133,7 +140,7 @@ third_party_settings: label: 'Benefit office overview' parent_name: '' region: content - weight: 1 + weight: 2 format_type: tooltip format_settings: show_empty_fields: '1' @@ -151,7 +158,7 @@ third_party_settings: label: 'Benefits hotline' parent_name: '' region: content - weight: 5 + weight: 6 format_type: tooltip format_settings: show_empty_fields: 0 @@ -171,7 +178,7 @@ third_party_settings: label: 'Benefit office hours may vary' parent_name: '' region: content - weight: 4 + weight: 5 format_type: tooltip format_settings: show_empty_fields: 0 @@ -193,7 +200,7 @@ third_party_settings: label: 'National spotlight' parent_name: '' region: content - weight: 7 + weight: 8 format_type: tooltip format_settings: show_empty_fields: 0 @@ -213,7 +220,7 @@ third_party_settings: label: 'Can''t find benefits' parent_name: '' region: content - weight: 8 + weight: 9 format_type: tooltip format_settings: show_empty_fields: 0 @@ -233,7 +240,7 @@ third_party_settings: label: 'Get updates from VBA' parent_name: '' region: content - weight: 9 + weight: 10 format_type: tooltip format_settings: show_empty_fields: 0 @@ -261,6 +268,24 @@ third_party_settings: id: '' description: '' description_display: after + group_banner: + children: + - field_show_banner + - field_alert_type + - field_dismissible_option + - field_banner_title + - field_banner_content + label: Banner + parent_name: '' + region: content + weight: 1 + format_type: fieldset + format_settings: + classes: '' + show_empty_fields: false + id: '' + description: '' + description_display: after id: node.vba_facility.default targetEntityType: node bundle: vba_facility @@ -273,6 +298,28 @@ content: third_party_settings: { } weight: 4 region: content + field_alert_type: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 15 + region: content + field_banner_content: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 18 + region: content + field_banner_title: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 17 + region: content field_cc_benefit_office_hours_va: type: entity_field_fetch label: above @@ -329,6 +376,13 @@ content: third_party_settings: { } weight: 1 region: content + field_dismissible_option: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 16 + region: content field_facility_locator_api_id: type: string label: inline @@ -344,6 +398,15 @@ content: third_party_settings: { } weight: 14 region: content + field_location_services: + type: entity_reference_revisions_entity_view + label: above + settings: + view_mode: default + link: '' + third_party_settings: { } + weight: 6 + region: content field_media: type: entity_reference_entity_view label: above @@ -351,7 +414,7 @@ content: view_mode: default link: true third_party_settings: { } - weight: 15 + weight: 16 region: content field_non_va_location_url: type: link @@ -453,6 +516,16 @@ content: third_party_settings: { } weight: 12 region: content + field_show_banner: + type: boolean + label: above + settings: + format: default + format_custom_false: '' + format_custom_true: '' + third_party_settings: { } + weight: 14 + region: content field_timezone: type: basic_string label: above @@ -464,6 +537,7 @@ hidden: breadcrumbs: true content_moderation_control: true field_administration: true + field_banner_types_description: true field_facility_vba_classificatio: true field_geolocation: true field_last_saved_by_an_editor: true diff --git a/config/sync/core.entity_view_display.node.vba_facility.external_content.yml b/config/sync/core.entity_view_display.node.vba_facility.external_content.yml index 5d0693987c..d91b2a857f 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.external_content.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.external_content.yml @@ -6,6 +6,10 @@ dependencies: - core.entity_view_mode.node.external_content - field.field.node.vba_facility.field_address - field.field.node.vba_facility.field_administration + - field.field.node.vba_facility.field_alert_type + - field.field.node.vba_facility.field_banner_content + - field.field.node.vba_facility.field_banner_title + - field.field.node.vba_facility.field_banner_types_description - field.field.node.vba_facility.field_cc_benefit_office_hours_va - field.field.node.vba_facility.field_cc_benefits_hotline - field.field.node.vba_facility.field_cc_cant_find_benefits @@ -14,6 +18,7 @@ dependencies: - field.field.node.vba_facility.field_cc_national_spotlight_2 - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview + - field.field.node.vba_facility.field_dismissible_option - field.field.node.vba_facility.field_facility_locator_api_id - field.field.node.vba_facility.field_facility_vba_classificatio - field.field.node.vba_facility.field_geolocation @@ -29,6 +34,7 @@ dependencies: - field.field.node.vba_facility.field_phone_number - field.field.node.vba_facility.field_prepare_for_visit - field.field.node.vba_facility.field_shared_vha_location + - field.field.node.vba_facility.field_show_banner - field.field.node.vba_facility.field_table_of_contents - field.field.node.vba_facility.field_timezone - node.type.vba_facility @@ -243,6 +249,10 @@ hidden: breadcrumbs: true content_moderation_control: true field_administration: true + field_alert_type: true + field_banner_content: true + field_banner_title: true + field_banner_types_description: true field_cc_benefit_office_hours_va: true field_cc_benefits_hotline: true field_cc_cant_find_benefits: true @@ -251,12 +261,14 @@ hidden: field_cc_national_spotlight_2: true field_cc_national_spotlight_3: true field_cc_vba_facility_overview: true + field_dismissible_option: true field_intro_text: true field_last_saved_by_an_editor: true field_media: true field_operating_status_facility: true field_operating_status_more_info: true field_prepare_for_visit: true + field_show_banner: true field_table_of_contents: true flag_awaiting_csv: true flag_awaiting_editor: true diff --git a/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml b/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml index 3bcb081bd2..e1a4a8feda 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml @@ -6,6 +6,10 @@ dependencies: - core.entity_view_mode.node.ief_table - field.field.node.vba_facility.field_address - field.field.node.vba_facility.field_administration + - field.field.node.vba_facility.field_alert_type + - field.field.node.vba_facility.field_banner_content + - field.field.node.vba_facility.field_banner_title + - field.field.node.vba_facility.field_banner_types_description - field.field.node.vba_facility.field_cc_benefit_office_hours_va - field.field.node.vba_facility.field_cc_benefits_hotline - field.field.node.vba_facility.field_cc_cant_find_benefits @@ -14,6 +18,7 @@ dependencies: - field.field.node.vba_facility.field_cc_national_spotlight_2 - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview + - field.field.node.vba_facility.field_dismissible_option - field.field.node.vba_facility.field_facility_locator_api_id - field.field.node.vba_facility.field_facility_vba_classificatio - field.field.node.vba_facility.field_geolocation @@ -29,6 +34,7 @@ dependencies: - field.field.node.vba_facility.field_phone_number - field.field.node.vba_facility.field_prepare_for_visit - field.field.node.vba_facility.field_shared_vha_location + - field.field.node.vba_facility.field_show_banner - field.field.node.vba_facility.field_table_of_contents - field.field.node.vba_facility.field_timezone - node.type.vba_facility @@ -176,6 +182,10 @@ hidden: breadcrumbs: true content_moderation_control: true field_administration: true + field_alert_type: true + field_banner_content: true + field_banner_title: true + field_banner_types_description: true field_cc_benefit_office_hours_va: true field_cc_benefits_hotline: true field_cc_cant_find_benefits: true @@ -184,6 +194,7 @@ hidden: field_cc_national_spotlight_2: true field_cc_national_spotlight_3: true field_cc_vba_facility_overview: true + field_dismissible_option: true field_facility_vba_classificatio: true field_geolocation: true field_intro_text: true @@ -194,6 +205,7 @@ hidden: field_office: true field_prepare_for_visit: true field_shared_vha_location: true + field_show_banner: true field_table_of_contents: true field_timezone: true flag_awaiting_csv: true diff --git a/config/sync/core.entity_view_display.node.vba_facility.teaser.yml b/config/sync/core.entity_view_display.node.vba_facility.teaser.yml index ff8e2ad03e..8748f635ee 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.teaser.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.teaser.yml @@ -6,6 +6,10 @@ dependencies: - core.entity_view_mode.node.teaser - field.field.node.vba_facility.field_address - field.field.node.vba_facility.field_administration + - field.field.node.vba_facility.field_alert_type + - field.field.node.vba_facility.field_banner_content + - field.field.node.vba_facility.field_banner_title + - field.field.node.vba_facility.field_banner_types_description - field.field.node.vba_facility.field_cc_benefit_office_hours_va - field.field.node.vba_facility.field_cc_benefits_hotline - field.field.node.vba_facility.field_cc_cant_find_benefits @@ -14,6 +18,7 @@ dependencies: - field.field.node.vba_facility.field_cc_national_spotlight_2 - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview + - field.field.node.vba_facility.field_dismissible_option - field.field.node.vba_facility.field_facility_locator_api_id - field.field.node.vba_facility.field_facility_vba_classificatio - field.field.node.vba_facility.field_geolocation @@ -29,6 +34,7 @@ dependencies: - field.field.node.vba_facility.field_phone_number - field.field.node.vba_facility.field_prepare_for_visit - field.field.node.vba_facility.field_shared_vha_location + - field.field.node.vba_facility.field_show_banner - field.field.node.vba_facility.field_table_of_contents - field.field.node.vba_facility.field_timezone - node.type.vba_facility @@ -53,6 +59,10 @@ hidden: breadcrumbs: true field_address: true field_administration: true + field_alert_type: true + field_banner_content: true + field_banner_title: true + field_banner_types_description: true field_cc_benefit_office_hours_va: true field_cc_benefits_hotline: true field_cc_cant_find_benefits: true @@ -61,6 +71,7 @@ hidden: field_cc_national_spotlight_2: true field_cc_national_spotlight_3: true field_cc_vba_facility_overview: true + field_dismissible_option: true field_facility_locator_api_id: true field_facility_vba_classificatio: true field_geolocation: true @@ -76,6 +87,7 @@ hidden: field_phone_number: true field_prepare_for_visit: true field_shared_vha_location: true + field_show_banner: true field_table_of_contents: true field_timezone: true flag_awaiting_csv: true diff --git a/config/sync/field.field.node.vba_facility.field_alert_type.yml b/config/sync/field.field.node.vba_facility.field_alert_type.yml new file mode 100644 index 0000000000..e948e81aaa --- /dev/null +++ b/config/sync/field.field.node.vba_facility.field_alert_type.yml @@ -0,0 +1,25 @@ +uuid: a49cc07c-b351-49df-bf8e-abb5292f90af +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_alert_type + - node.type.vba_facility + module: + - options + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: node.vba_facility.field_alert_type +field_name: field_alert_type +entity_type: node +bundle: vba_facility +label: 'Banner alert type' +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/sync/field.field.node.vba_facility.field_banner_content.yml b/config/sync/field.field.node.vba_facility.field_banner_content.yml new file mode 100644 index 0000000000..a1140348cc --- /dev/null +++ b/config/sync/field.field.node.vba_facility.field_banner_content.yml @@ -0,0 +1,29 @@ +uuid: d53ef76f-4797-4b80-bc8e-aeb360056af0 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_banner_content + - node.type.vba_facility + module: + - allowed_formats + - text + - tmgmt_content +third_party_settings: + allowed_formats: + allowed_formats: + - rich_text_limited + tmgmt_content: + excluded: false +id: node.vba_facility.field_banner_content +field_name: field_banner_content +entity_type: node +bundle: vba_facility +label: 'Banner alert message' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/config/sync/field.field.node.vba_facility.field_banner_title.yml b/config/sync/field.field.node.vba_facility.field_banner_title.yml new file mode 100644 index 0000000000..1cfc5d62d5 --- /dev/null +++ b/config/sync/field.field.node.vba_facility.field_banner_title.yml @@ -0,0 +1,24 @@ +uuid: 22c6b201-9778-469d-a380-339a3134f31d +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_banner_title + - node.type.vba_facility + module: + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: node.vba_facility.field_banner_title +field_name: field_banner_title +entity_type: node +bundle: vba_facility +label: 'Banner alert headline' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/config/sync/field.field.node.vba_facility.field_banner_types_description.yml b/config/sync/field.field.node.vba_facility.field_banner_types_description.yml new file mode 100644 index 0000000000..f111a20eb3 --- /dev/null +++ b/config/sync/field.field.node.vba_facility.field_banner_types_description.yml @@ -0,0 +1,29 @@ +uuid: 917a8c24-9096-4700-b88b-6f70c92712b6 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_banner_types_description + - node.type.vba_facility + module: + - markup + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: node.vba_facility.field_banner_types_description +field_name: field_banner_types_description +entity_type: node +bundle: vba_facility +label: 'Banner types description' +description: '' +required: false +translatable: false +default_value: + - { } +default_value_callback: '' +settings: + markup: + value: "

Two types of Banner alerts are supported:

\r\n\r\n
    \r\n\t
  1. Informational alerts: These are used to provide helpful information or call attention to an announcement.
    2. \r\n\t
  2. Warning alertsP These are used to warn a user and call out negative consequences. Warning alerts are necessary when something has gone wrong.
    3. \r\n
\r\n

You can read more about these banner types on the site in the VA Design System (opens in a new window), or learn how to create them in the CMS in the Knowledge Base (opens in a new window).

" + format: rich_text +field_type: markup diff --git a/config/sync/field.field.node.vba_facility.field_dismissible_option.yml b/config/sync/field.field.node.vba_facility.field_dismissible_option.yml new file mode 100644 index 0000000000..1cef77a44a --- /dev/null +++ b/config/sync/field.field.node.vba_facility.field_dismissible_option.yml @@ -0,0 +1,27 @@ +uuid: 0f329c6a-9a65-4644-b3c7-b15038e88731 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_dismissible_option + - node.type.vba_facility + module: + - options + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: node.vba_facility.field_dismissible_option +field_name: field_dismissible_option +entity_type: node +bundle: vba_facility +label: 'Dismissible by user?' +description: '' +required: false +translatable: true +default_value: + - + value: dismiss +default_value_callback: '' +settings: { } +field_type: list_string diff --git a/config/sync/field.field.node.vba_facility.field_show_banner.yml b/config/sync/field.field.node.vba_facility.field_show_banner.yml new file mode 100644 index 0000000000..6779d9a174 --- /dev/null +++ b/config/sync/field.field.node.vba_facility.field_show_banner.yml @@ -0,0 +1,28 @@ +uuid: 61128356-6678-46bc-8a04-475887f4b785 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_show_banner + - node.type.vba_facility + module: + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: node.vba_facility.field_show_banner +field_name: field_show_banner +entity_type: node +bundle: vba_facility +label: 'Display a banner alert on this facility' +description: '' +required: false +translatable: false +default_value: + - + value: 0 +default_value_callback: '' +settings: + on_label: 'On' + off_label: 'Off' +field_type: boolean diff --git a/config/sync/field.storage.node.field_banner_content.yml b/config/sync/field.storage.node.field_banner_content.yml new file mode 100644 index 0000000000..ec815138e3 --- /dev/null +++ b/config/sync/field.storage.node.field_banner_content.yml @@ -0,0 +1,19 @@ +uuid: aa37353f-ba44-4bf4-9f4e-98e6d4d85be0 +langcode: en +status: true +dependencies: + module: + - node + - text +id: node.field_banner_content +field_name: field_banner_content +entity_type: node +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.node.field_banner_title.yml b/config/sync/field.storage.node.field_banner_title.yml new file mode 100644 index 0000000000..b98472299a --- /dev/null +++ b/config/sync/field.storage.node.field_banner_title.yml @@ -0,0 +1,21 @@ +uuid: 28c7d674-68a0-424e-b5f1-053c9edbec60 +langcode: en +status: true +dependencies: + module: + - node +id: node.field_banner_title +field_name: field_banner_title +entity_type: node +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.node.field_banner_types_description.yml b/config/sync/field.storage.node.field_banner_types_description.yml new file mode 100644 index 0000000000..6b5da49eb0 --- /dev/null +++ b/config/sync/field.storage.node.field_banner_types_description.yml @@ -0,0 +1,19 @@ +uuid: dcc7ce28-6582-4a59-97dd-39400f0cdf68 +langcode: en +status: true +dependencies: + module: + - markup + - node +id: node.field_banner_types_description +field_name: field_banner_types_description +entity_type: node +type: markup +settings: { } +module: markup +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.node.field_dismissible_option.yml b/config/sync/field.storage.node.field_dismissible_option.yml index ebcc9690d3..11ec6451f1 100644 --- a/config/sync/field.storage.node.field_dismissible_option.yml +++ b/config/sync/field.storage.node.field_dismissible_option.yml @@ -11,12 +11,12 @@ entity_type: node type: list_string settings: allowed_values: + - + value: dismiss + label: 'Allow site visitors to dismiss banner' - value: perm label: 'Don''t allow site visitors to dismiss banner' - - - value: dismiss - label: 'Allow site visitors to dismiss banner permanently' allowed_values_function: '' module: options locked: false diff --git a/config/sync/field.storage.node.field_show_banner.yml b/config/sync/field.storage.node.field_show_banner.yml new file mode 100644 index 0000000000..30e191e160 --- /dev/null +++ b/config/sync/field.storage.node.field_show_banner.yml @@ -0,0 +1,18 @@ +uuid: aeeb5ff6-54f7-4d7c-9f03-7f903c0d351d +langcode: en +status: true +dependencies: + module: + - node +id: node.field_show_banner +field_name: field_show_banner +entity_type: node +type: boolean +settings: { } +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/docroot/modules/custom/va_gov_vba_facility/js/set_banner_fields_to_required.es6.js b/docroot/modules/custom/va_gov_vba_facility/js/set_banner_fields_to_required.es6.js new file mode 100644 index 0000000000..a429dd9e6c --- /dev/null +++ b/docroot/modules/custom/va_gov_vba_facility/js/set_banner_fields_to_required.es6.js @@ -0,0 +1,33 @@ +((Drupal) => { + Drupal.behaviors.vaGovVbaBannerFieldsConditional = { + attach() { + // Make the Banner type required-looking. + if ( + document.querySelector( + 'fieldset[data-drupal-selector="edit-field-dismissible-option"] legend span' + ) + ) { + const dismissibleOption = document.querySelector( + 'fieldset[data-drupal-selector="edit-field-dismissible-option"] legend span' + ); + // Sometimes these classes get dropped, causing the red asterisk to + // not appear. This is a failsafe. + dismissibleOption.classList.add("js-form-required", "form-required"); + } + // Make the Banner content required-looking. + if ( + document.querySelector('label[for="edit-field-banner-content-0-value"]') + ) { + const bannerContentWysiwygLabel = document.querySelector( + 'label[for="edit-field-banner-content-0-value"]' + ); + // Sometimes these classes get dropped, causing the red asterisk to + // not appear. This is a failsafe. + bannerContentWysiwygLabel.classList.add( + "js-form-required", + "form-required" + ); + } + }, + }; +})(Drupal); diff --git a/docroot/modules/custom/va_gov_vba_facility/js/set_banner_fields_to_required.js b/docroot/modules/custom/va_gov_vba_facility/js/set_banner_fields_to_required.js new file mode 100644 index 0000000000..9bedc05518 --- /dev/null +++ b/docroot/modules/custom/va_gov_vba_facility/js/set_banner_fields_to_required.js @@ -0,0 +1,20 @@ +/** +* DO NOT EDIT THIS FILE. +* See the following change record for more information, +* https://www.drupal.org/node/2815083 +* @preserve +**/ +(function (Drupal) { + Drupal.behaviors.vaGovVbaBannerFieldsConditional = { + attach: function attach() { + if (document.querySelector('fieldset[data-drupal-selector="edit-field-dismissible-option"] legend span')) { + var dismissibleOption = document.querySelector('fieldset[data-drupal-selector="edit-field-dismissible-option"] legend span'); + dismissibleOption.classList.add("js-form-required", "form-required"); + } + if (document.querySelector('label[for="edit-field-banner-content-0-value"]')) { + var bannerContentWysiwygLabel = document.querySelector('label[for="edit-field-banner-content-0-value"]'); + bannerContentWysiwygLabel.classList.add("js-form-required", "form-required"); + } + } + }; +})(Drupal); \ No newline at end of file diff --git a/docroot/modules/custom/va_gov_vba_facility/src/EventSubscriber/VbaFacilitySubscriber.php b/docroot/modules/custom/va_gov_vba_facility/src/EventSubscriber/VbaFacilitySubscriber.php index 4f75c32cf8..ace35421b7 100644 --- a/docroot/modules/custom/va_gov_vba_facility/src/EventSubscriber/VbaFacilitySubscriber.php +++ b/docroot/modules/custom/va_gov_vba_facility/src/EventSubscriber/VbaFacilitySubscriber.php @@ -3,12 +3,17 @@ namespace Drupal\va_gov_vba_facility\EventSubscriber; use Drupal\Component\Render\FormattableMarkup; +use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Entity\EntityTypeManagerInterface; use Drupal\Core\Render\RendererInterface; use Drupal\Core\StringTranslation\StringTranslationTrait; use Drupal\Core\StringTranslation\TranslationInterface; use Drupal\core_event_dispatcher\EntityHookEvents; +use Drupal\core_event_dispatcher\Event\Entity\EntityPresaveEvent; +use Drupal\core_event_dispatcher\Event\Entity\EntityTypeAlterEvent; use Drupal\core_event_dispatcher\Event\Entity\EntityViewAlterEvent; +use Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent; +use Drupal\node\NodeInterface; use Drupal\va_gov_user\Service\UserPermsService; use Symfony\Component\EventDispatcher\EventSubscriberInterface; @@ -72,6 +77,10 @@ public function __construct( public static function getSubscribedEvents(): array { return [ EntityHookEvents::ENTITY_VIEW_ALTER => 'entityViewAlter', + 'hook_event_dispatcher.form_node_vba_facility_edit_form.alter' => 'alterVbaFacilityNodeForm', + 'hook_event_dispatcher.form_node_vba_facility_form.alter' => 'alterVbaFacilityNodeForm', + EntityHookEvents::ENTITY_TYPE_ALTER => 'entityTypeAlter', + EntityHookEvents::ENTITY_PRE_SAVE => 'entityPresave', ]; } @@ -86,7 +95,7 @@ public function entityViewAlter(EntityViewAlterEvent $event):void { } /** - * Appends VBA facility service description to title on facility node:view. + * Appends VBA facility service description to title on service node:view. * * @param \Drupal\core_event_dispatcher\Event\Entity\EntityViewAlterEvent $event * The entity view alter service. @@ -117,4 +126,150 @@ public function appendServiceTermDescriptionToVbaFacilityService(EntityViewAlter } } + /** + * Form alterations for VBA facility content type. + * + * @param \Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent $event + * The event. + */ + public function alterVbaFacilityNodeForm(FormIdAlterEvent $event): void { + $this->addStateManagementToBannerFields($event); + $this->changeBannerType($event); + $this->changeDismissibleOption($event); + } + + /** + * Add states management to banner fields, based on bool. + * + * @param \Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent $event + * The event. + */ + public function addStateManagementToBannerFields(FormIdAlterEvent $event) { + $form = &$event->getForm(); + $form['#attached']['library'][] = 'va_gov_vba_facility/set_banner_fields_to_required'; + $selector = ':input[name="field_show_banner[value]"]'; + + // Show and require the banner fields when show banner is checked. + $form['field_banner_types_description']['#states'] = [ + 'visible' => [ + [$selector => ['checked' => TRUE]], + ], + ]; + + $form['field_alert_type']['widget']['#states'] = [ + 'required' => [ + [$selector => ['checked' => TRUE]], + ], + 'visible' => [ + [$selector => ['checked' => TRUE]], + ], + ]; + + $form['field_dismissible_option']['#states'] = [ + 'visible' => [ + [$selector => ['checked' => TRUE]], + ], + ]; + + $form['field_banner_title']['widget'][0]['value']['#states'] = [ + 'required' => [ + [$selector => ['checked' => TRUE]], + ], + 'visible' => [ + [$selector => ['checked' => TRUE]], + ], + ]; + + // Unfortunately we can not set ckeditor field as required using + // states. So we end up adding this with JS to bypass HTML5 validation + // and let the validation constraint handle it. + $form['field_banner_content']['#states'] = [ + 'visible' => [ + [$selector => ['checked' => TRUE]], + ], + ]; + } + + /** + * Changes the select list for Banner Type. + * + * @param \Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent $event + * The event. + */ + protected function changeBannerType(FormIdAlterEvent $event) { + // Add the '- Select a value -' option to replace '- None -'. + $form = &$event->getForm(); + if (isset($form['field_alert_type']['widget']['#options']) && array_key_exists('_none', $form['field_alert_type']['widget']['#options'])) { + $form['field_alert_type']['widget']['#options']['_none'] = '- Select a value -'; + } + } + + /** + * Changes the radio buttons for Dismissible option. + * + * @param \Drupal\core_event_dispatcher\Event\Form\FormIdAlterEvent $event + * The event. + */ + protected function changeDismissibleOption(FormIdAlterEvent $event) { + // Remove N/A option, which is the result of not being a "required" field. + $form = &$event->getForm(); + if (isset($form['field_dismissible_option']['widget']['#options']) && array_key_exists('_none', $form['field_dismissible_option']['widget']['#options'])) { + unset($form['field_dismissible_option']['widget']['#options']['_none']); + } + } + + /** + * Equivalent of hook_entity_type_alter(). + * + * @param \Drupal\core_event_dispatcher\Event\Entity\EntityTypeAlterEvent $event + * The event for entityTypeAlter. + */ + public function entityTypeAlter(EntityTypeAlterEvent $event): void { + $entity_types = $event->getEntityTypes(); + if (!empty($entity_types['node'])) { + $entity = $entity_types['node']; + $entity->addConstraint('VbaFacilityRequiredFieldsConstraint'); + } + } + + /** + * Entity presave Event call. + * + * @param \Drupal\core_event_dispatcher\Event\Entity\EntityPresaveEvent $event + * The event. + */ + public function entityPresave(EntityPresaveEvent $event): void { + $entity = $event->getEntity(); + if ($entity instanceof NodeInterface) { + $this->clearBannerFields($entity); + } + } + + /** + * Clear details when banner is not enabled. + * + * @param \Drupal\Core\Entity\EntityInterface $entity + * Entity. + */ + protected function clearBannerFields(EntityInterface $entity): void { + /** @var \Drupal\node\NodeInterface $entity */ + if ($entity->bundle() === "vba_facility") { + if ($entity->hasField('field_show_banner') + && $entity->field_show_banner->value == FALSE) { + if ($entity->field_alert_type) { + $entity->field_alert_type->value = NULL; + } + if ($entity->field_dismissible_option) { + $entity->field_dismissible_option->value = NULL; + } + if ($entity->field_banner_title->value) { + $entity->field_banner_title->value = ''; + } + if ($entity->field_banner_content->value) { + $entity->field_banner_content->value = ''; + } + } + } + } + } diff --git a/docroot/modules/custom/va_gov_vba_facility/src/Plugin/Validation/Constraint/VbaFacilityRequiredFieldsConstraint.php b/docroot/modules/custom/va_gov_vba_facility/src/Plugin/Validation/Constraint/VbaFacilityRequiredFieldsConstraint.php new file mode 100644 index 0000000000..52cdc3c5e2 --- /dev/null +++ b/docroot/modules/custom/va_gov_vba_facility/src/Plugin/Validation/Constraint/VbaFacilityRequiredFieldsConstraint.php @@ -0,0 +1,25 @@ +bundle() === 'vba_facility') { + if ($entity->get('field_show_banner')->value == TRUE) { + // To have VBA Facility banner created, + // it must have a title and content. + $empty_fields = []; + $field_error_path = []; + // Check Banner type. + if ($entity->get('field_alert_type') && !isset($entity->get('field_alert_type')->value)) { + // HTML5 is preventing this. + $empty_fields[] = $entity->get('field_alert_type')->getFieldDefinition()->getLabel(); + $field_error_path[] = 'field_alert_type'; + } + // Check Dismissible by user. + if ($entity->get('field_dismissible_option') && !isset($entity->get('field_dismissible_option')->value)) { + // HTML5 is preventing this. + $empty_fields[] = $entity->get('field_dismissible_option')->getFieldDefinition()->getLabel(); + $field_error_path[] = 'field_dismissible_option'; + } + if (empty(trim($entity->get('field_banner_title')->value))) { + // HTML5 is preventing this. + $empty_fields[] = $entity->get('field_banner_title')->getFieldDefinition()->getLabel(); + $field_error_path[] = 'field_banner_title'; + } + if (empty(trim($entity->get('field_banner_content')->value))) { + // HTML5 is not preventing this. + $empty_fields[] = $entity->get('field_banner_content')->getFieldDefinition()->getLabel(); + // This anchor link created for the path does not work as it points to + // a field id the ckeditor replaced with something else. + // @see https://www.drupal.org/project/drupal/issues/3229493 + $field_error_path[] = 'field_banner_content'; + } + + if (!empty($empty_fields)) { + if (count($field_error_path) > 1) { + // Multiple errors should go on the checkbox. + $field_error_path = 'field_show_banner'; + } + else { + // An individual error should go on the field. + $field_error_path = $field_error_path[0]; + } + $vars['@empty_fields'] = implode(', ', $empty_fields); + $vars['@checkbox'] = $entity->get('field_show_banner')->getFieldDefinition()->getLabel(); + $this->context->buildViolation($constraint->message, $vars) + // This anchor link created for the path does not work as it points to + // #edit-field-complete-biography-create which does not exist in DOM. + // It should point to #edit-field-complete-biography-create-value. + ->atPath($field_error_path) + ->addViolation(); + } + } + } + } + +} diff --git a/docroot/modules/custom/va_gov_vba_facility/va_gov_vba_facility.libraries.yml b/docroot/modules/custom/va_gov_vba_facility/va_gov_vba_facility.libraries.yml index 0802876648..c0144e6181 100644 --- a/docroot/modules/custom/va_gov_vba_facility/va_gov_vba_facility.libraries.yml +++ b/docroot/modules/custom/va_gov_vba_facility/va_gov_vba_facility.libraries.yml @@ -2,5 +2,6 @@ display_service_descriptions: css: component: css/vba_facility_service.css: {} - - +set_banner_fields_to_required: + js: + js/set_banner_fields_to_required.js: {} diff --git a/docroot/modules/custom/va_gov_vba_facility/va_gov_vba_facility.module b/docroot/modules/custom/va_gov_vba_facility/va_gov_vba_facility.module index b7be78b872..1c718ca380 100644 --- a/docroot/modules/custom/va_gov_vba_facility/va_gov_vba_facility.module +++ b/docroot/modules/custom/va_gov_vba_facility/va_gov_vba_facility.module @@ -10,4 +10,5 @@ */ function va_gov_vba_facility_page_attachments(array &$attachments) { $attachments['#attached']['library'][] = 'va_gov_vba_facility/display_service_descriptions'; + $attachments['#attached']['library'][] = 'va_gov_vba_facility/set_banner_fields_to_required'; } From 5c9eef8a2b63902e22bb6e964a9e3a926353a234 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 08:59:49 -0500 Subject: [PATCH 31/35] Bump int128/datadog-actions-metrics from 1.63.0 to 1.64.0 (#16168) Bumps [int128/datadog-actions-metrics](https://github.com/int128/datadog-actions-metrics) from 1.63.0 to 1.64.0. - [Release notes](https://github.com/int128/datadog-actions-metrics/releases) - [Commits](https://github.com/int128/datadog-actions-metrics/compare/df9152b8d6c105a0a6bebb9f8878235abce2c4e0...6c6a657047c0452b33ec3c254009c331e47c1370) --- updated-dependencies: - dependency-name: int128/datadog-actions-metrics dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/actions-metrics.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/actions-metrics.yml b/.github/workflows/actions-metrics.yml index f680db86c5..6054149c83 100644 --- a/.github/workflows/actions-metrics.yml +++ b/.github/workflows/actions-metrics.yml @@ -11,7 +11,7 @@ jobs: timeout-minutes: 10 steps: - name: Send GitHub Actions metrics to DataDog - uses: int128/datadog-actions-metrics@df9152b8d6c105a0a6bebb9f8878235abce2c4e0 # v1.63.0 + uses: int128/datadog-actions-metrics@6c6a657047c0452b33ec3c254009c331e47c1370 # v1.64.0 with: datadog-api-key: ${{ secrets.DATADOG_API_KEY }} collect-job-metrics: true From d6183e82f6263943a503bdfa7a115d31b936d24a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 09:00:52 -0500 Subject: [PATCH 32/35] Bump phpstan/phpstan from 1.10.41 to 1.10.42 (#16164) Bumps [phpstan/phpstan](https://github.com/phpstan/phpstan) from 1.10.41 to 1.10.42. - [Release notes](https://github.com/phpstan/phpstan/releases) - [Changelog](https://github.com/phpstan/phpstan/blob/1.11.x/CHANGELOG.md) - [Commits](https://github.com/phpstan/phpstan/compare/1.10.41...1.10.42) --- updated-dependencies: - dependency-name: phpstan/phpstan dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index b80a778ec4..a5a30ee695 100644 --- a/composer.lock +++ b/composer.lock @@ -18395,16 +18395,16 @@ }, { "name": "phpstan/phpstan", - "version": "1.10.41", + "version": "1.10.42", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "c6174523c2a69231df55bdc65b61655e72876d76" + "reference": "fc2316508de5453140b5cb3d3f8683a33e92f26a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/c6174523c2a69231df55bdc65b61655e72876d76", - "reference": "c6174523c2a69231df55bdc65b61655e72876d76", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/fc2316508de5453140b5cb3d3f8683a33e92f26a", + "reference": "fc2316508de5453140b5cb3d3f8683a33e92f26a", "shasum": "" }, "require": { @@ -18453,7 +18453,7 @@ "type": "tidelift" } ], - "time": "2023-11-05T12:57:57+00:00" + "time": "2023-11-17T15:26:57+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", From 73d10d8a45a91c7db4e5476605f9620ec25265f2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 09:23:58 -0500 Subject: [PATCH 33/35] Bump actions/github-script from 6.4.1 to 7.0.1 (#16167) Bumps [actions/github-script](https://github.com/actions/github-script) from 6.4.1 to 7.0.1. - [Release notes](https://github.com/actions/github-script/releases) - [Commits](https://github.com/actions/github-script/compare/d7906e4ad0b1822421a7e6a35d5ca353c962f410...60a0d83039c74a4aee543508d2ffcb1c3799cdea) --- updated-dependencies: - dependency-name: actions/github-script dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cypress.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 2192c96193..a6a582f085 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -56,7 +56,7 @@ jobs: CY_BUILD_ID: "${{ github.repository }}-${{ github.run_id }}-${{ github.run_attempt}}" - name: Update status on commit. - uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6.4.1 + uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1 with: script: | await octokit.rest.repos.createCommitStatus({ From fe33e58ceaa15ab3272f09a896a5b59e6d9324c3 Mon Sep 17 00:00:00 2001 From: Christian Burk Date: Mon, 20 Nov 2023 12:34:26 -0600 Subject: [PATCH 34/35] VACMS-15911: Updates config and code for spotlight content (#16145) * VACMS-15911: Updates config and code for spotlight content * VACMS-15911: Updates the labeling of spotlight in VBA form * VACMS-15911: Updates VBA node:view * VACMS-15911: Update config after PR * VACMS-15911 Move local spotlight out of external content. --------- Co-authored-by: Steve Wirt Co-authored-by: Steve Wirt --- ...form_display.node.vba_facility.default.yml | 83 ++++++--- ...y_form_display.node.vet_center.default.yml | 16 +- ...view_display.node.vba_facility.default.yml | 34 ++-- ...lay.node.vba_facility.external_content.yml | 7 +- ...ew_display.node.vba_facility.ief_table.yml | 7 +- ..._view_display.node.vba_facility.teaser.yml | 7 +- ...facility.field_cc_national_spotlight_1.yml | 2 +- ...facility.field_cc_national_spotlight_2.yml | 31 ---- ...facility.field_cc_national_spotlight_3.yml | 31 ---- ...ode.vba_facility.field_local_spotlight.yml | 167 ++++++++++++++++++ ...enter.field_cc_vet_center_featured_con.yml | 2 +- ...enter.field_vet_center_feature_content.yml | 4 +- ....featured_content.field_section_header.yml | 2 +- ...age.node.field_cc_national_spotlight_2.yml | 19 -- ...age.node.field_cc_national_spotlight_3.yml | 19 -- ...eld.storage.node.field_local_spotlight.yml | 21 +++ ...raphs.paragraphs_type.featured_content.yml | 2 +- .../Plugin/Derivative/VcDashboardsBlock.php | 4 +- 18 files changed, 287 insertions(+), 171 deletions(-) delete mode 100644 config/sync/field.field.node.vba_facility.field_cc_national_spotlight_2.yml delete mode 100644 config/sync/field.field.node.vba_facility.field_cc_national_spotlight_3.yml create mode 100644 config/sync/field.field.node.vba_facility.field_local_spotlight.yml delete mode 100644 config/sync/field.storage.node.field_cc_national_spotlight_2.yml delete mode 100644 config/sync/field.storage.node.field_cc_national_spotlight_3.yml create mode 100644 config/sync/field.storage.node.field_local_spotlight.yml diff --git a/config/sync/core.entity_form_display.node.vba_facility.default.yml b/config/sync/core.entity_form_display.node.vba_facility.default.yml index efaef94d87..54a05efe30 100644 --- a/config/sync/core.entity_form_display.node.vba_facility.default.yml +++ b/config/sync/core.entity_form_display.node.vba_facility.default.yml @@ -14,8 +14,6 @@ dependencies: - field.field.node.vba_facility.field_cc_cant_find_benefits - field.field.node.vba_facility.field_cc_get_updates_from_vba - field.field.node.vba_facility.field_cc_national_spotlight_1 - - field.field.node.vba_facility.field_cc_national_spotlight_2 - - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview - field.field.node.vba_facility.field_dismissible_option - field.field.node.vba_facility.field_facility_locator_api_id @@ -23,6 +21,7 @@ dependencies: - field.field.node.vba_facility.field_geolocation - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor + - field.field.node.vba_facility.field_local_spotlight - field.field.node.vba_facility.field_media - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name @@ -243,11 +242,9 @@ third_party_settings: group_national_spotlight: children: - field_cc_national_spotlight_1 - - field_cc_national_spotlight_2 - - field_cc_national_spotlight_3 label: 'National spotlight' region: content - parent_name: '' + parent_name: group_spotlight_content weight: 9 format_type: tooltip format_settings: @@ -324,6 +321,22 @@ third_party_settings: id: '' classes: '' show_empty_fields: 0 + group_spotlight_content: + children: + - group_national_spotlight + - field_local_spotlight + label: 'Spotlight content' + region: content + parent_name: '' + weight: 8 + format_type: fieldset + format_settings: + classes: '' + show_empty_fields: false + id: '' + description: '' + required_fields: true + description_display: after id: node.vba_facility.default targetEntityType: node bundle: vba_facility @@ -423,24 +436,6 @@ content: show_link_to_source: '1' show_source_updated_date: '1' third_party_settings: { } - field_cc_national_spotlight_2: - type: entity_field_fetch_widget - weight: 11 - region: content - settings: - show_field_label: '1' - show_link_to_source: '1' - show_source_updated_date: '1' - third_party_settings: { } - field_cc_national_spotlight_3: - type: entity_field_fetch_widget - weight: 12 - region: content - settings: - show_field_label: '1' - show_link_to_source: '1' - show_source_updated_date: '1' - third_party_settings: { } field_cc_vba_facility_overview: type: entity_field_fetch_widget weight: 2 @@ -491,6 +486,48 @@ content: region: content settings: { } third_party_settings: { } + field_local_spotlight: + type: paragraphs + weight: 10 + region: content + settings: + title: spotlight + title_plural: spotlights + edit_mode: open + closed_mode: summary + autocollapse: none + closed_mode_threshold: 0 + add_mode: dropdown + form_display_mode: default + default_paragraph_type: featured_content + features: + add_above: '0' + collapse_edit_all: collapse_edit_all + duplicate: duplicate + third_party_settings: + paragraphs_features: + add_in_between: false + add_in_between_link_count: 3 + delete_confirmation: false + show_drag_and_drop: true + change_labels: + add_another: '' + field_location_services: + type: entity_reference_paragraphs + weight: 5 + region: content + settings: + title: Paragraph + title_plural: Paragraphs + edit_mode: closed + add_mode: button + form_display_mode: default + default_paragraph_type: _none + third_party_settings: + limited_field_widgets: + limit_values: '0' + change_labels: + add_another: '' field_media: type: media_library_widget weight: 4 diff --git a/config/sync/core.entity_form_display.node.vet_center.default.yml b/config/sync/core.entity_form_display.node.vet_center.default.yml index 03fe11ef06..61b13cc311 100644 --- a/config/sync/core.entity_form_display.node.vet_center.default.yml +++ b/config/sync/core.entity_form_display.node.vet_center.default.yml @@ -29,6 +29,7 @@ dependencies: - workflows.workflow.editorial module: - address + - change_labels - content_moderation - entity_browser_entity_form - entity_field_fetch @@ -40,6 +41,7 @@ dependencies: - media_library - office_hours - paragraphs + - paragraphs_features - telephone - textfield_counter - tzfield @@ -171,7 +173,7 @@ third_party_settings: children: - group_national_featured_content - field_vet_center_feature_content - label: 'Featured content' + label: 'Spotlight content' region: content parent_name: '' weight: 6 @@ -179,7 +181,7 @@ third_party_settings: format_settings: classes: '' id: featured-content - description: 'Highlight up to two Vet Center activities, such as events or programs.' + description: '' required_fields: true group_faqs: children: @@ -227,14 +229,14 @@ third_party_settings: group_national_featured_content: children: - field_cc_vet_center_featured_con - label: 'National featured content' + label: 'National spotlight content' region: content parent_name: group_featured_content weight: 1 format_type: tooltip format_settings: show_label: '0' - tooltip_description: "Why can’t I edit this?\r\nThis national feature managed by VHA will display alongside locally-relevant content.\r\n" + tooltip_description: "Why can’t I edit this?\r\nThis national spotlight managed by VHA will display alongside locally-relevant content.\r\n" description: '' required_fields: '1' id: '' @@ -293,9 +295,9 @@ content: weight: 4 region: content settings: + show_field_label: '1' show_link_to_source: '1' show_source_updated_date: '1' - show_field_label: 0 third_party_settings: { } field_facility_locator_api_id: type: string_textfield @@ -436,8 +438,8 @@ content: weight: 2 region: content settings: - title: 'featured content block' - title_plural: 'featured content blocks' + title: 'spotlight contents' + title_plural: spotlights edit_mode: closed closed_mode: summary autocollapse: none diff --git a/config/sync/core.entity_view_display.node.vba_facility.default.yml b/config/sync/core.entity_view_display.node.vba_facility.default.yml index 9e6c21811e..fdf439cc46 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.default.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.default.yml @@ -14,8 +14,6 @@ dependencies: - field.field.node.vba_facility.field_cc_cant_find_benefits - field.field.node.vba_facility.field_cc_get_updates_from_vba - field.field.node.vba_facility.field_cc_national_spotlight_1 - - field.field.node.vba_facility.field_cc_national_spotlight_2 - - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview - field.field.node.vba_facility.field_dismissible_option - field.field.node.vba_facility.field_facility_locator_api_id @@ -23,6 +21,7 @@ dependencies: - field.field.node.vba_facility.field_geolocation - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor + - field.field.node.vba_facility.field_local_spotlight - field.field.node.vba_facility.field_media - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name @@ -195,8 +194,6 @@ third_party_settings: group_national_spotlight: children: - field_cc_national_spotlight_1 - - field_cc_national_spotlight_2 - - field_cc_national_spotlight_3 label: 'National spotlight' parent_name: '' region: content @@ -220,7 +217,7 @@ third_party_settings: label: 'Can''t find benefits' parent_name: '' region: content - weight: 9 + weight: 10 format_type: tooltip format_settings: show_empty_fields: 0 @@ -240,7 +237,7 @@ third_party_settings: label: 'Get updates from VBA' parent_name: '' region: content - weight: 10 + weight: 11 format_type: tooltip format_settings: show_empty_fields: 0 @@ -260,7 +257,7 @@ third_party_settings: label: 'Prepare for your visit' parent_name: '' region: content - weight: 6 + weight: 7 format_type: fieldset format_settings: classes: '' @@ -355,20 +352,6 @@ content: third_party_settings: { } weight: 6 region: content - field_cc_national_spotlight_2: - type: entity_field_fetch - label: above - settings: { } - third_party_settings: { } - weight: 7 - region: content - field_cc_national_spotlight_3: - type: entity_field_fetch - label: above - settings: { } - third_party_settings: { } - weight: 8 - region: content field_cc_vba_facility_overview: type: entity_field_fetch label: above @@ -398,6 +381,15 @@ content: third_party_settings: { } weight: 14 region: content + field_local_spotlight: + type: entity_reference_revisions_entity_view + label: above + settings: + view_mode: default + link: '' + third_party_settings: { } + weight: 9 + region: content field_location_services: type: entity_reference_revisions_entity_view label: above diff --git a/config/sync/core.entity_view_display.node.vba_facility.external_content.yml b/config/sync/core.entity_view_display.node.vba_facility.external_content.yml index d91b2a857f..271c7ac7a6 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.external_content.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.external_content.yml @@ -15,8 +15,6 @@ dependencies: - field.field.node.vba_facility.field_cc_cant_find_benefits - field.field.node.vba_facility.field_cc_get_updates_from_vba - field.field.node.vba_facility.field_cc_national_spotlight_1 - - field.field.node.vba_facility.field_cc_national_spotlight_2 - - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview - field.field.node.vba_facility.field_dismissible_option - field.field.node.vba_facility.field_facility_locator_api_id @@ -24,6 +22,7 @@ dependencies: - field.field.node.vba_facility.field_geolocation - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor + - field.field.node.vba_facility.field_local_spotlight - field.field.node.vba_facility.field_media - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name @@ -258,12 +257,12 @@ hidden: field_cc_cant_find_benefits: true field_cc_get_updates_from_vba: true field_cc_national_spotlight_1: true - field_cc_national_spotlight_2: true - field_cc_national_spotlight_3: true field_cc_vba_facility_overview: true field_dismissible_option: true field_intro_text: true field_last_saved_by_an_editor: true + field_local_spotlight: true + field_location_services: true field_media: true field_operating_status_facility: true field_operating_status_more_info: true diff --git a/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml b/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml index e1a4a8feda..e496b8050c 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.ief_table.yml @@ -15,8 +15,6 @@ dependencies: - field.field.node.vba_facility.field_cc_cant_find_benefits - field.field.node.vba_facility.field_cc_get_updates_from_vba - field.field.node.vba_facility.field_cc_national_spotlight_1 - - field.field.node.vba_facility.field_cc_national_spotlight_2 - - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview - field.field.node.vba_facility.field_dismissible_option - field.field.node.vba_facility.field_facility_locator_api_id @@ -24,6 +22,7 @@ dependencies: - field.field.node.vba_facility.field_geolocation - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor + - field.field.node.vba_facility.field_local_spotlight - field.field.node.vba_facility.field_media - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name @@ -191,14 +190,14 @@ hidden: field_cc_cant_find_benefits: true field_cc_get_updates_from_vba: true field_cc_national_spotlight_1: true - field_cc_national_spotlight_2: true - field_cc_national_spotlight_3: true field_cc_vba_facility_overview: true field_dismissible_option: true field_facility_vba_classificatio: true field_geolocation: true field_intro_text: true field_last_saved_by_an_editor: true + field_local_spotlight: true + field_location_services: true field_media: true field_non_va_location_url: true field_non_va_official_name: true diff --git a/config/sync/core.entity_view_display.node.vba_facility.teaser.yml b/config/sync/core.entity_view_display.node.vba_facility.teaser.yml index 8748f635ee..01846c6387 100644 --- a/config/sync/core.entity_view_display.node.vba_facility.teaser.yml +++ b/config/sync/core.entity_view_display.node.vba_facility.teaser.yml @@ -15,8 +15,6 @@ dependencies: - field.field.node.vba_facility.field_cc_cant_find_benefits - field.field.node.vba_facility.field_cc_get_updates_from_vba - field.field.node.vba_facility.field_cc_national_spotlight_1 - - field.field.node.vba_facility.field_cc_national_spotlight_2 - - field.field.node.vba_facility.field_cc_national_spotlight_3 - field.field.node.vba_facility.field_cc_vba_facility_overview - field.field.node.vba_facility.field_dismissible_option - field.field.node.vba_facility.field_facility_locator_api_id @@ -24,6 +22,7 @@ dependencies: - field.field.node.vba_facility.field_geolocation - field.field.node.vba_facility.field_intro_text - field.field.node.vba_facility.field_last_saved_by_an_editor + - field.field.node.vba_facility.field_local_spotlight - field.field.node.vba_facility.field_media - field.field.node.vba_facility.field_non_va_location_url - field.field.node.vba_facility.field_non_va_official_name @@ -68,8 +67,6 @@ hidden: field_cc_cant_find_benefits: true field_cc_get_updates_from_vba: true field_cc_national_spotlight_1: true - field_cc_national_spotlight_2: true - field_cc_national_spotlight_3: true field_cc_vba_facility_overview: true field_dismissible_option: true field_facility_locator_api_id: true @@ -77,6 +74,8 @@ hidden: field_geolocation: true field_intro_text: true field_last_saved_by_an_editor: true + field_local_spotlight: true + field_location_services: true field_media: true field_non_va_location_url: true field_non_va_official_name: true diff --git a/config/sync/field.field.node.vba_facility.field_cc_national_spotlight_1.yml b/config/sync/field.field.node.vba_facility.field_cc_national_spotlight_1.yml index 6ad92d3722..a877be7b2d 100644 --- a/config/sync/field.field.node.vba_facility.field_cc_national_spotlight_1.yml +++ b/config/sync/field.field.node.vba_facility.field_cc_national_spotlight_1.yml @@ -15,7 +15,7 @@ id: node.vba_facility.field_cc_national_spotlight_1 field_name: field_cc_national_spotlight_1 entity_type: node bundle: vba_facility -label: 'National spotlight 1' +label: 'National spotlight' description: '' required: false translatable: false diff --git a/config/sync/field.field.node.vba_facility.field_cc_national_spotlight_2.yml b/config/sync/field.field.node.vba_facility.field_cc_national_spotlight_2.yml deleted file mode 100644 index c15a6c70b8..0000000000 --- a/config/sync/field.field.node.vba_facility.field_cc_national_spotlight_2.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: 9d4f24aa-96b0-45ea-8988-82d41cd9209e -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_cc_national_spotlight_2 - - node.type.vba_facility - module: - - entity_field_fetch - - tmgmt_content -third_party_settings: - tmgmt_content: - excluded: false -id: node.vba_facility.field_cc_national_spotlight_2 -field_name: field_cc_national_spotlight_2 -entity_type: node -bundle: vba_facility -label: 'National spotlight 2' -description: '' -required: false -translatable: false -default_value: - - - value: null -default_value_callback: '' -settings: - target_entity_type: node - target_entity_id: '61744' - field_to_fetch: field_content_block - target_paragraph_uuid: d517fb97-0f14-4641-bac4-4df87dbb3db7 -field_type: entity_field_fetch diff --git a/config/sync/field.field.node.vba_facility.field_cc_national_spotlight_3.yml b/config/sync/field.field.node.vba_facility.field_cc_national_spotlight_3.yml deleted file mode 100644 index fd4dae2835..0000000000 --- a/config/sync/field.field.node.vba_facility.field_cc_national_spotlight_3.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: 0ecb8937-f1bf-486f-8480-2739260cba81 -langcode: en -status: true -dependencies: - config: - - field.storage.node.field_cc_national_spotlight_3 - - node.type.vba_facility - module: - - entity_field_fetch - - tmgmt_content -third_party_settings: - tmgmt_content: - excluded: false -id: node.vba_facility.field_cc_national_spotlight_3 -field_name: field_cc_national_spotlight_3 -entity_type: node -bundle: vba_facility -label: 'National spotlight 3' -description: '' -required: false -translatable: false -default_value: - - - value: null -default_value_callback: '' -settings: - target_entity_type: node - target_entity_id: '61744' - field_to_fetch: field_content_block - target_paragraph_uuid: feba896f-21e5-4714-abca-886333cd396b -field_type: entity_field_fetch diff --git a/config/sync/field.field.node.vba_facility.field_local_spotlight.yml b/config/sync/field.field.node.vba_facility.field_local_spotlight.yml new file mode 100644 index 0000000000..0105c9da4f --- /dev/null +++ b/config/sync/field.field.node.vba_facility.field_local_spotlight.yml @@ -0,0 +1,167 @@ +uuid: ddfced12-67a7-4d03-8f90-c716095c97bd +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_local_spotlight + - node.type.vba_facility + - paragraphs.paragraphs_type.featured_content + module: + - entity_reference_revisions + - tmgmt_content +third_party_settings: + tmgmt_content: + excluded: false +id: node.vba_facility.field_local_spotlight +field_name: field_local_spotlight +entity_type: node +bundle: vba_facility +label: 'Local spotlight(s)' +description: 'Highlight up to two office activities, such as events or programs.' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:paragraph' + handler_settings: + target_bundles: + featured_content: featured_content + negate: 0 + target_bundles_drag_drop: + address: + weight: 46 + enabled: false + alert: + weight: 47 + enabled: false + alert_single: + weight: 48 + enabled: false + audience_topics: + weight: 49 + enabled: false + basic_accordion: + weight: 50 + enabled: false + button: + weight: 51 + enabled: false + centralized_content_descriptor: + weight: 52 + enabled: false + checklist: + weight: 53 + enabled: false + checklist_item: + weight: 54 + enabled: false + collapsible_panel: + weight: 55 + enabled: false + collapsible_panel_item: + weight: 56 + enabled: false + contact_information: + weight: 57 + enabled: false + downloadable_file: + weight: 58 + enabled: false + email_contact: + weight: 59 + enabled: false + embedded_video: + weight: 60 + enabled: false + expandable_text: + weight: 61 + enabled: false + featured_content: + weight: 62 + enabled: true + health_care_local_facility_servi: + weight: 63 + enabled: false + link_teaser: + weight: 64 + enabled: false + link_teaser_with_image: + weight: 65 + enabled: false + list_of_link_teasers: + weight: 68 + enabled: false + list_of_links: + weight: 67 + enabled: false + lists_of_links: + weight: 66 + enabled: false + magichead_group: + weight: 69 + enabled: false + media: + weight: 70 + enabled: false + media_list_images: + weight: 71 + enabled: false + media_list_videos: + weight: 72 + enabled: false + non_reusable_alert: + weight: 73 + enabled: false + number_callout: + weight: 74 + enabled: false + phone_number: + weight: 75 + enabled: false + process: + weight: 76 + enabled: false + q_a: + weight: 77 + enabled: false + q_a_group: + weight: 78 + enabled: false + q_a_section: + weight: 79 + enabled: false + react_widget: + weight: 80 + enabled: false + rich_text_char_limit_1000: + weight: 81 + enabled: false + service_location: + weight: 82 + enabled: false + service_location_address: + weight: 83 + enabled: false + situation_update: + weight: 84 + enabled: false + spanish_translation_summary: + weight: 85 + enabled: false + staff_profile: + weight: 86 + enabled: false + step: + weight: 87 + enabled: false + step_by_step: + weight: 88 + enabled: false + table: + weight: 89 + enabled: false + wysiwyg: + weight: 90 + enabled: false +field_type: entity_reference_revisions diff --git a/config/sync/field.field.node.vet_center.field_cc_vet_center_featured_con.yml b/config/sync/field.field.node.vet_center.field_cc_vet_center_featured_con.yml index a791f99a94..ca1b674079 100644 --- a/config/sync/field.field.node.vet_center.field_cc_vet_center_featured_con.yml +++ b/config/sync/field.field.node.vet_center.field_cc_vet_center_featured_con.yml @@ -11,7 +11,7 @@ id: node.vet_center.field_cc_vet_center_featured_con field_name: field_cc_vet_center_featured_con entity_type: node bundle: vet_center -label: 'Nationally featured Vet Center content' +label: 'National spotlight' description: '' required: false translatable: false diff --git a/config/sync/field.field.node.vet_center.field_vet_center_feature_content.yml b/config/sync/field.field.node.vet_center.field_vet_center_feature_content.yml index 43b811abac..ed46c33a1b 100644 --- a/config/sync/field.field.node.vet_center.field_vet_center_feature_content.yml +++ b/config/sync/field.field.node.vet_center.field_vet_center_feature_content.yml @@ -12,8 +12,8 @@ id: node.vet_center.field_vet_center_feature_content field_name: field_vet_center_feature_content entity_type: node bundle: vet_center -label: 'Featured content' -description: '' +label: 'Local spotlight(s)' +description: 'Highlight up to two Vet Center activities, such as events or programs.' required: false translatable: false default_value: { } diff --git a/config/sync/field.field.paragraph.featured_content.field_section_header.yml b/config/sync/field.field.paragraph.featured_content.field_section_header.yml index 1995151c20..725140e910 100644 --- a/config/sync/field.field.paragraph.featured_content.field_section_header.yml +++ b/config/sync/field.field.paragraph.featured_content.field_section_header.yml @@ -9,7 +9,7 @@ id: paragraph.featured_content.field_section_header field_name: field_section_header entity_type: paragraph bundle: featured_content -label: 'Section Header' +label: Title description: '' required: true translatable: false diff --git a/config/sync/field.storage.node.field_cc_national_spotlight_2.yml b/config/sync/field.storage.node.field_cc_national_spotlight_2.yml deleted file mode 100644 index 0ab79c74f0..0000000000 --- a/config/sync/field.storage.node.field_cc_national_spotlight_2.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 96dd47c1-1bb8-4d2f-8024-6cee5d27da3c -langcode: en -status: true -dependencies: - module: - - entity_field_fetch - - node -id: node.field_cc_national_spotlight_2 -field_name: field_cc_national_spotlight_2 -entity_type: node -type: entity_field_fetch -settings: { } -module: entity_field_fetch -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/field.storage.node.field_cc_national_spotlight_3.yml b/config/sync/field.storage.node.field_cc_national_spotlight_3.yml deleted file mode 100644 index e8ce890bc3..0000000000 --- a/config/sync/field.storage.node.field_cc_national_spotlight_3.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 772a9863-0a3d-4d1a-9717-9e7f99eac4f4 -langcode: en -status: true -dependencies: - module: - - entity_field_fetch - - node -id: node.field_cc_national_spotlight_3 -field_name: field_cc_national_spotlight_3 -entity_type: node -type: entity_field_fetch -settings: { } -module: entity_field_fetch -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/sync/field.storage.node.field_local_spotlight.yml b/config/sync/field.storage.node.field_local_spotlight.yml new file mode 100644 index 0000000000..585d827438 --- /dev/null +++ b/config/sync/field.storage.node.field_local_spotlight.yml @@ -0,0 +1,21 @@ +uuid: 0e84a385-0856-46cc-a443-a30bb9d98add +langcode: en +status: true +dependencies: + module: + - entity_reference_revisions + - node + - paragraphs +id: node.field_local_spotlight +field_name: field_local_spotlight +entity_type: node +type: entity_reference_revisions +settings: + target_type: paragraph +module: entity_reference_revisions +locked: false +cardinality: 2 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/paragraphs.paragraphs_type.featured_content.yml b/config/sync/paragraphs.paragraphs_type.featured_content.yml index 6dd0713a4f..6301b6e523 100644 --- a/config/sync/paragraphs.paragraphs_type.featured_content.yml +++ b/config/sync/paragraphs.paragraphs_type.featured_content.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: { } id: featured_content -label: 'Featured content' +label: 'Spotlight content' icon_uuid: null icon_default: null description: '' diff --git a/docroot/modules/custom/va_gov_dashboards/src/Plugin/Derivative/VcDashboardsBlock.php b/docroot/modules/custom/va_gov_dashboards/src/Plugin/Derivative/VcDashboardsBlock.php index 33d44354d5..ab7d8512c3 100644 --- a/docroot/modules/custom/va_gov_dashboards/src/Plugin/Derivative/VcDashboardsBlock.php +++ b/docroot/modules/custom/va_gov_dashboards/src/Plugin/Derivative/VcDashboardsBlock.php @@ -67,9 +67,9 @@ private function getBlocks() { 'image' => 'services.svg', ], 'featured_content' => [ - 'title' => 'Featured content', + 'title' => 'Spotlight content', 'description' => 'Highlight up to two Vet center activities, such as events or programs', - 'action' => 'Go to featured content', + 'action' => 'Go to spotlight content', 'nid' => NULL, 'anchor' => '#featured-content', 'image' => 'featured_content.svg', From 1358b205497b9f9965288dd5d4378e3a4dc104ab Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Nov 2023 15:03:58 -0500 Subject: [PATCH 35/35] Bump drupal/message_ui from 1.0.0 to 1.1.0 (#16166) Bumps drupal/message_ui from 1.0.0 to 1.1.0. --- updated-dependencies: - dependency-name: drupal/message_ui dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- composer.lock | 87 +++++++++++++++++++++++++-------------------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/composer.lock b/composer.lock index a5a30ee695..db4bc5f3d9 100644 --- a/composer.lock +++ b/composer.lock @@ -9351,17 +9351,17 @@ }, { "name": "drupal/message_ui", - "version": "1.0.0", + "version": "1.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/message_ui.git", - "reference": "8.x-1.0" + "reference": "8.x-1.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/message_ui-8.x-1.0.zip", - "reference": "8.x-1.0", - "shasum": "c81e184bde08152d639fb09a5329c85b8a4b60f0" + "url": "https://ftp.drupal.org/files/projects/message_ui-8.x-1.1.zip", + "reference": "8.x-1.1", + "shasum": "59f8260d0fea9120215977c73f3a863934be4ddf" }, "require": { "drupal/core": "^9 || ^10", @@ -9374,8 +9374,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.0", - "datestamp": "1688399905", + "version": "8.x-1.1", + "datestamp": "1700260926", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -18348,16 +18348,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.2", + "version": "1.24.3", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bcad8d995980440892759db0c32acae7c8e79442" + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bcad8d995980440892759db0c32acae7c8e79442", - "reference": "bcad8d995980440892759db0c32acae7c8e79442", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/12f01d214f1c73b9c91fdb3b1c415e4c70652083", + "reference": "12f01d214f1c73b9c91fdb3b1c415e4c70652083", "shasum": "" }, "require": { @@ -18389,9 +18389,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.2" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.3" }, - "time": "2023-09-26T12:28:12+00:00" + "time": "2023-11-18T20:15:32+00:00" }, { "name": "phpstan/phpstan", @@ -22894,16 +22894,16 @@ }, { "name": "symfony/browser-kit", - "version": "v6.3.2", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", - "reference": "ca4a988488f61ac18f8f845445eabdd36f89aa8d" + "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/ca4a988488f61ac18f8f845445eabdd36f89aa8d", - "reference": "ca4a988488f61ac18f8f845445eabdd36f89aa8d", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e270297dbee59168274c2b535ab1bccd593e6ffe", + "reference": "e270297dbee59168274c2b535ab1bccd593e6ffe", "shasum": "" }, "require": { @@ -22942,7 +22942,7 @@ "description": "Simulates the behavior of a web browser, allowing you to make requests, click on links and submit forms programmatically", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/browser-kit/tree/v6.3.2" + "source": "https://github.com/symfony/browser-kit/tree/v6.3.8" }, "funding": [ { @@ -22958,7 +22958,7 @@ "type": "tidelift" } ], - "time": "2023-07-06T06:56:43+00:00" + "time": "2023-10-31T08:07:48+00:00" }, { "name": "symfony/cache", @@ -24099,16 +24099,16 @@ }, { "name": "symfony/http-client", - "version": "v5.4.29", + "version": "v5.4.31", "source": { "type": "git", "url": "https://github.com/symfony/http-client.git", - "reference": "04784c66cbee613a827363ee1e65db65392893c1" + "reference": "6cdf6cdf48101454f014a9ab4e0905f0b902389d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-client/zipball/04784c66cbee613a827363ee1e65db65392893c1", - "reference": "04784c66cbee613a827363ee1e65db65392893c1", + "url": "https://api.github.com/repos/symfony/http-client/zipball/6cdf6cdf48101454f014a9ab4e0905f0b902389d", + "reference": "6cdf6cdf48101454f014a9ab4e0905f0b902389d", "shasum": "" }, "require": { @@ -24170,7 +24170,7 @@ "http" ], "support": { - "source": "https://github.com/symfony/http-client/tree/v5.4.29" + "source": "https://github.com/symfony/http-client/tree/v5.4.31" }, "funding": [ { @@ -24186,7 +24186,7 @@ "type": "tidelift" } ], - "time": "2023-09-14T20:49:15+00:00" + "time": "2023-10-29T12:33:05+00:00" }, { "name": "symfony/http-client-contracts", @@ -24336,16 +24336,16 @@ }, { "name": "symfony/http-kernel", - "version": "v4.4.50", + "version": "v4.4.51", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef" + "reference": "ad8ab192cb619ff7285c95d28c69b36d718416c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aa6df6c045f034aa13ac752fc234bb300b9488ef", - "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/ad8ab192cb619ff7285c95d28c69b36d718416c7", + "reference": "ad8ab192cb619ff7285c95d28c69b36d718416c7", "shasum": "" }, "require": { @@ -24420,7 +24420,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.50" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.51" }, "funding": [ { @@ -24436,7 +24436,7 @@ "type": "tidelift" } ], - "time": "2023-02-01T08:01:31+00:00" + "time": "2023-11-10T13:31:29+00:00" }, { "name": "symfony/mime", @@ -26074,16 +26074,16 @@ }, { "name": "symfony/string", - "version": "v6.3.5", + "version": "v6.3.8", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" + "reference": "13880a87790c76ef994c91e87efb96134522577a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", - "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", + "url": "https://api.github.com/repos/symfony/string/zipball/13880a87790c76ef994c91e87efb96134522577a", + "reference": "13880a87790c76ef994c91e87efb96134522577a", "shasum": "" }, "require": { @@ -26140,7 +26140,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.5" + "source": "https://github.com/symfony/string/tree/v6.3.8" }, "funding": [ { @@ -26156,7 +26156,7 @@ "type": "tidelift" } ], - "time": "2023-09-18T10:38:32+00:00" + "time": "2023-11-09T08:28:21+00:00" }, { "name": "symfony/translation", @@ -26666,16 +26666,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.2.1", + "version": "1.2.2", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e" + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/34a41e998c2183e22995f158c581e7b5e755ab9e", - "reference": "34a41e998c2183e22995f158c581e7b5e755ab9e", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/b2ad5003ca10d4ee50a12da31de12a5774ba6b96", + "reference": "b2ad5003ca10d4ee50a12da31de12a5774ba6b96", "shasum": "" }, "require": { @@ -26704,7 +26704,7 @@ "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", "support": { "issues": "https://github.com/theseer/tokenizer/issues", - "source": "https://github.com/theseer/tokenizer/tree/1.2.1" + "source": "https://github.com/theseer/tokenizer/tree/1.2.2" }, "funding": [ { @@ -26712,7 +26712,7 @@ "type": "github" } ], - "time": "2021-07-28T10:34:58+00:00" + "time": "2023-11-20T00:12:19+00:00" }, { "name": "twig/extensions", @@ -27849,7 +27849,6 @@ "drupal/linky": 10, "drupal/linkychecker": 10, "drupal/menu_breadcrumb": 15, - "drupal/message_ui": 10, "drupal/mimemail": 15, "drupal/openapi": 5, "drupal/paragraphs_browser": 15,