#14683 Service Locations branch: Resolving code conflicts in .github/workflows

.ddev/config.yaml

@@ -27,7 +27,7 @@ use_dns_when_possible: true
 composer_version: "2"
 disable_settings_management: true
 web_environment:
-    - PHP_IDE_CONFIG='serverName=appserver'
+    - PHP_IDE_CONFIG=serverName=appserver
     - TXT_RESET=tput sgr 0
     - TXT_RED=tput setaf 1
     - TXT_GREEN=tput setaf 2

.github/ISSUE_TEMPLATE/sitewide-crew-member-onboarding.md

@@ -353,7 +353,7 @@ Product Managers are often involved in launch day activity and change management
 
 ## Onboarding for UX members
 Your discipline lead will assist with onboarding tasks / calls.
-
+- [ ] Watch this Jan 2024 [Human Centered Design "How we work" presentation] (https://us06web.zoom.us/rec/share/_yL7CHedjvYzBT_T5Y5ApUAOiNb6zigFuRcHI_7IuogwD6xvBTB9e_pCipsnR_id.ub8yoJGJhI5rteH5?startTime=1714759743000), Passcode: rOKHJ9@4. AgileSix, our UX team, and our VA UX lead discuss our shared UX practice and how we think about the work we're doing.
 - [ ] Watch this Jan 2023 [UX team presentation](https://us06web.zoom.us/rec/share/4KOJ0HC3aRvggbXXXBNzVS83OEjqLfzdqwZuNhX-mpCg8ncrGwbJeqIIBaBIvWBx.rfe9-oe9zDmb4VcX)
 (Passcode: QPg1Pn9#) for context on our UX work.
 - [ ] Review the correlated [UX Workflow Presentation for Onsite (Mural)](https://app.mural.co/t/departmentofveteransaffairs9999/m/vagov6717/1672866433309/4685dabc03895968380c82a6138bf1cc3090384b?sender=u9c899abc4fe36c9a698b1647)

composer.json

@@ -79,6 +79,7 @@
         "drupal/entityqueue": "^1.2",
         "drupal/environment_indicator": "^4.0",
         "drupal/epp": "^1.1",
+        "drupal/expirable_content": "1.0.x-dev@dev",
         "drupal/fast_404": "^3.0",
         "drupal/feature_toggle": "^2.0",
         "drupal/field_group": "^3.4",
@@ -223,7 +224,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3494",
+        "va-gov/content-build": "^0.0.3497",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
@@ -457,6 +458,9 @@
             "drupal/jsonapi_menu_items": {
                 "3276561 - Add support for the Menu Item Extras module": "https://www.drupal.org/files/issues/2022-08-01/3276561-05-menu_item_extras_support.patch"
             },
+            "drupal/linkit": {
+                "3049946 - Linkit unpublished nodes not included": "https://www.drupal.org/files/issues/2023-11-09/linkit-unpublished-nodes-not-included-3049946-34.patch"
+            },
             "drupal/memcache": {
                 "3058121 - Use persistent connections": "https://www.drupal.org/files/issues/2020-09-10/3058121-16.patch"
             },
@@ -516,11 +520,14 @@
                 "3163841 - Fix Undefined index: caption notice": "https://www.drupal.org/files/issues/2020-08-10/tablefield-empty-caption-notice-2.patch",
                 "3176982 - Tablefield input elements have no title or label": "https://www.drupal.org/files/issues/2020-10-14/tablefield-add_title_to_input_elements-3176982-2.patch",
                 "3195203 - Copying caption to value breaks some data exports 3195203": "https://www.drupal.org/files/issues/2021-01-28/tablefield-caption-copied-to-value-3195203-2.patch",
-		"3341971 - Drag & drop addition adds meaningless numbers to table data, could break integrating code": "https://www.drupal.org/files/issues/2023-03-23/tablefield-disable-drag-drop-controls.patch"
+                "3341971 - Drag & drop addition adds meaningless numbers to table data, could break integrating code": "https://www.drupal.org/files/issues/2023-03-23/tablefield-disable-drag-drop-controls.patch"
             },
             "drupal/textfield_counter": {
                 "3380997 - Textarea with summary and counter doesn't respect count only setting": "patches/3380997-fix-textfield_counter-respect-count-only-mode.patch"
             },
+            "drupal/token": {
+                "3047568 - Consistent tokens support across all entities and fields": "https://www.drupal.org/files/issues/2022-08-04/token-consistent-entity-and-field-support-3047568-17.patch"
+            },
             "drupal/viewfield": {
                 "3252356 - Add option to display default view on node edit when always use default value selected": "https://www.drupal.org/files/issues/2023-02-07/viewfield-option-display-default-view-on-node-edit-3252356-5.patch"
             },

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": "423fb6954fb070944b51f510c990f56a",
+    "content-hash": "16e4803dc347d4eb83b1d3eb69bbf248",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -4745,10 +4745,6 @@
                 "GPL-2.0-or-later"
             ],
             "authors": [
-                {
-                    "name": "drupalspoons",
-                    "homepage": "https://www.drupal.org/user/3647684"
-                },
                 {
                     "name": "moshe weitzman",
                     "homepage": "https://www.drupal.org/user/23"
@@ -4882,6 +4878,10 @@
                     "homepage": "https://www.drupal.org/u/realityloop",
                     "role": "Maintainer"
                 },
+                {
+                    "name": "Junyor",
+                    "homepage": "https://www.drupal.org/user/7006"
+                },
                 {
                     "name": "lhangea",
                     "homepage": "https://www.drupal.org/user/2743803"
@@ -5597,17 +5597,17 @@
         },
         {
             "name": "drupal/entity_clone",
-            "version": "2.0.0-beta6",
+            "version": "2.0.0-beta4",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/entity_clone.git",
-                "reference": "2.0.0-beta6"
+                "reference": "2.0.0-beta4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/entity_clone-2.0.0-beta6.zip",
-                "reference": "2.0.0-beta6",
-                "shasum": "afd98c1aeffc1d28b8a0b29c8cfb09de95debc9b"
+                "url": "https://ftp.drupal.org/files/projects/entity_clone-2.0.0-beta4.zip",
+                "reference": "2.0.0-beta4",
+                "shasum": "21b6636cea194e1f71753a54b28d4a56b42a4b00"
             },
             "require": {
                 "drupal/core": "^8.8 || ^9 || ^10"
@@ -5621,8 +5621,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "2.0.0-beta6",
-                    "datestamp": "1712549899",
+                    "version": "2.0.0-beta4",
+                    "datestamp": "1687250852",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Beta releases are not covered by Drupal security advisories."
@@ -6310,6 +6310,47 @@
                 "source": "https://git.drupalcode.org/project/epp"
             }
         },
+        {
+            "name": "drupal/expirable_content",
+            "version": "dev-1.0.x",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/expirable_content.git",
+                "reference": "ecf4bd5662851f58c531fc1c71a03f7687905fad"
+            },
+            "require": {
+                "drupal/core": "^9 || ^10"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "branch-alias": {
+                    "dev-1.0.x": "1.0.x-dev"
+                },
+                "drupal": {
+                    "version": "1.0.0-alpha2+3-dev",
+                    "datestamp": "1714075716",
+                    "security-coverage": {
+                        "status": "not-covered",
+                        "message": "Project has not opted into security advisory coverage!"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0-or-later"
+            ],
+            "authors": [
+                {
+                    "name": "coderdan",
+                    "homepage": "https://www.drupal.org/user/490684"
+                }
+            ],
+            "description": "Configure any content entity type for expiration.",
+            "homepage": "https://www.drupal.org/project/expirable_content",
+            "support": {
+                "source": "https://git.drupalcode.org/project/expirable_content"
+            }
+        },
         {
             "name": "drupal/externalauth",
             "version": "2.0.3",
@@ -11033,6 +11074,14 @@
                     "name": "Deciphered",
                     "homepage": "https://www.drupal.org/user/103796"
                 },
+                {
+                    "name": "greggles",
+                    "homepage": "https://www.drupal.org/user/36762"
+                },
+                {
+                    "name": "kgatzby",
+                    "homepage": "https://www.drupal.org/user/3601554"
+                },
                 {
                     "name": "michaellander",
                     "homepage": "https://www.drupal.org/user/636494"
@@ -11397,7 +11446,7 @@
             "extra": {
                 "drupal": {
                     "version": "8.x-1.12",
-                    "datestamp": "1696776683",
+                    "datestamp": "1712319355",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -13509,17 +13558,17 @@
         },
         {
             "name": "drupal/upgrade_status",
-            "version": "4.3.0",
+            "version": "4.3.1",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/upgrade_status.git",
-                "reference": "4.3.0"
+                "reference": "4.3.1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/upgrade_status-4.3.0.zip",
-                "reference": "4.3.0",
-                "shasum": "d6eaf37d4d543b130595410be3d64a60ca280eab"
+                "url": "https://ftp.drupal.org/files/projects/upgrade_status-4.3.1.zip",
+                "reference": "4.3.1",
+                "shasum": "18390306878f8abe2c2c68d471217655e5b7b31c"
             },
             "require": {
                 "dekor/php-array-table": "^2.0",
@@ -13536,8 +13585,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "4.3.0",
-                    "datestamp": "1714308227",
+                    "version": "4.3.1",
+                    "datestamp": "1714463117",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -18895,16 +18944,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.28.0",
+            "version": "1.26.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb"
+                "reference": "231e3186624c03d7e7c890ec662b81e6b0405227"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
-                "reference": "cd06d6b1a1b3c75b0b83f97577869fd85a3cd4fb",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227",
+                "reference": "231e3186624c03d7e7c890ec662b81e6b0405227",
                 "shasum": ""
             },
             "require": {
@@ -18936,9 +18985,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.28.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0"
             },
-            "time": "2024-04-03T18:51:33+00:00"
+            "time": "2024-02-23T16:05:55+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -25888,16 +25937,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3494",
+            "version": "v0.0.3497",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "2d652e59e45ccbd3fd4f425c34b2099736faa728"
+                "reference": "dfddf6215dbe20434b29d223b89343a9b5c32441"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/2d652e59e45ccbd3fd4f425c34b2099736faa728",
-                "reference": "2d652e59e45ccbd3fd4f425c34b2099736faa728",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/dfddf6215dbe20434b29d223b89343a9b5c32441",
+                "reference": "dfddf6215dbe20434b29d223b89343a9b5c32441",
                 "shasum": ""
             },
             "type": "node-project",
@@ -25924,9 +25973,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.3494"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3497"
             },
-            "time": "2024-04-30T12:51:59+00:00"
+            "time": "2024-05-02T18:02:31+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -26910,6 +26959,7 @@
         "drupal/entity_reference_validators": 15,
         "drupal/entity_route_context": 5,
         "drupal/entity_usage": 10,
+        "drupal/expirable_content": 20,
         "drupal/fieldhelptext": 10,
         "drupal/flag": 10,
         "drupal/graphql_menu": 15,
@@ -26924,7 +26974,6 @@
         "drupal/no_table_drag": 15,
         "drupal/openapi": 5,
         "drupal/openapi_ui": 5,
-        "drupal/paragraphs_features": 10,
         "drupal/password_strength": 20,
         "drupal/pathologic": 15,
         "drupal/prometheus_exporter": 10,

config/sync/core.entity_form_display.message.aging_content_warn_fwb.default.yml

@@ -0,0 +1,47 @@
+uuid: 52b31e3b-c1bf-44ab-94bc-3a12f7bdce70
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.field.message.aging_content_warn_fwb.field_target_node_title
+    - field.field.message.aging_content_warn_fwb.field_warning_date
+    - message.template.aging_content_warn_fwb
+id: message.aging_content_warn_fwb.default
+targetEntityType: message
+bundle: aging_content_warn_fwb
+mode: default
+content:
+  created:
+    type: datetime_timestamp
+    weight: 10
+    region: content
+    settings: {  }
+    third_party_settings: {  }
+  field_target_node_title:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  field_warning_date:
+    type: string_textfield
+    weight: 11
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+  uid:
+    type: entity_reference_autocomplete
+    weight: 5
+    region: content
+    settings:
+      match_operator: CONTAINS
+      match_limit: 10
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
+    '#group': advanced
+hidden: {  }