Merge branch 'main' into dependabot/github_actions/reviewdog/action-s…

…tylelint-1.26.0

.github/ISSUE_TEMPLATE/change-management-epic.md

@@ -3,7 +3,7 @@ name: Change management
 about: Use this template for planning, coordinating and monitoring activities related
   to VFS-CMS updates that have a medium to high impact on VA employees.
 title: Change management for <insert issue name>
-labels: Needs refining
+labels: Needs refining, sitewide
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/cms-team-member-onboarding.md

@@ -96,10 +96,8 @@ Github + Zenhub are the tools required for sprint boards, epics, estimates, and
 You can view team sprint boards using either the Github view with Zenhub browser extension enabled, or the Zenhub webapp view.
 * CMS team: [Github view](https://github.com/department-of-veterans-affairs/va.gov-cms/#workspaces/vagov-cms-team-5c0e7b864b5806bc2bfc2087/board), [Zenhub webapp view](https://app.zenhub.com/workspaces/vagov-cms-team-5c0e7b864b5806bc2bfc2087/board)
 )
-* Sitewide Facilities and Public Websites teams also run their sprints from the same repository, and any repo / workspace changes should be mindful of not impacting their workspaces / boards: 
-  * Facilities: [Github view](https://github.com/department-of-veterans-affairs/va.gov-cms/#workspaces/sitewide-facilities-639f5253e4b702a32376339e/board), [Zenhub webapp view](https://app.zenhub.com/workspaces/sitewide-facilities-639f5253e4b702a32376339e/board
-)
-  * Public Websites: [Github view](https://github.com/department-of-veterans-affairs/va.gov-cms/#workspaces/public-websites-6171bf4bf43742001af18cc5/board), [Zenhub webapp view](https://app.zenhub.com/workspaces/public-websites-6171bf4bf43742001af18cc5/board)
+* Sitewide team also runs their sprints from the same repository, and any repo / workspace changes should be mindful of not impacting their workspace / board: 
+  * VA.gov Sitewide Product team: [Github view](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new/choose#workspaces/vagov-sitewide-product-team-6645154188a81a1f7a0a9464/board, [Zenhub webapp view](https://app.zenhub.com/workspaces/vagov-sitewide-product-team-6645154188a81a1f7a0a9464/board)
 
 ### Process & Principles
 - [ ] Read about our teams' [Agile / sprint best practices](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/cms/onboarding/library/sprint-best-practices.md)

.github/ISSUE_TEMPLATE/octode-project-board-epic.md

@@ -2,7 +2,7 @@
 name: Sitewide Epic - Web Governance Board
 about: Epic template for Sitewide projects that need to be publicized in the Web Governance Board project view, for Public Websites and Facilities teams.
 title: ""
-labels: Epic
+labels: Epic, sitewide
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/pw-clp-request.md

@@ -3,7 +3,7 @@ name: "(PW) Campaign Landing Page request"
 about: Request a new Campaign Landing Page, owned by Public
   Websites team
 title: 'Campaign Landing Page request: <content info>'
-labels: Needs refining, Public Websites, VA.gov frontend, User support, CLP
+labels: Needs refining, Public Websites, VA.gov frontend, User support, CLP, sitewide
 assignees: jilladams, FranECross
 
 ---

.github/ISSUE_TEMPLATE/pw-forms-bad-pdf-link-pw.md

@@ -2,7 +2,7 @@
 name: "(PW) Forms/Bad PDF link defect"
 about: Forms outages / Bad PDF links, owned by Public Websites team
 title: 'Forms defect: <form name>'
-labels: Defect, Find a form, Needs refining, Public Websites
+labels: Defect, Find a form, Needs refining, Public Websites, sitewide
 assignees: jilladams, FranECross
 
 ---

.github/ISSUE_TEMPLATE/pw-injected-header-publish.md

@@ -2,7 +2,7 @@
 name: "(PW) Injected Header/Footer - publish to prod"
 about: Submit a request to publish the injected header/footer to prod.
 title: 'Injected header/footer: Publish to prod: <domain(s)>'
-labels: Injected header, Needs refining, Public Websites, VA.gov frontend
+labels: Injected header, Needs refining, Public Websites, VA.gov frontend, sitewide
 assignees: jilladams
 
 ---

.github/ISSUE_TEMPLATE/pw-injected-header.md

@@ -2,7 +2,7 @@
 name: "(PW) Injected Header/Footer - prep for testing"
 about: Submit a request to add the injected header/footer an existing site.
 title: 'Injected header/footer: <domain(s)>'
-labels: Injected header, Needs refining, Public Websites, VA.gov frontend
+labels: Injected header, Needs refining, Public Websites, VA.gov frontend, sitewide
 assignees: jilladams
 
 ---

.github/ISSUE_TEMPLATE/pw-issue.md

@@ -2,7 +2,7 @@
 name: "(PW) Issue template"
 about: Issue template for Public Websites team
 title: ''
-labels: Needs refining, Public Websites
+labels: Needs refining, Public Websites, sitewide
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/runbook-vamc-facility-new.md

@@ -31,10 +31,11 @@ Please refer to the Knowledge Base article titled "How do I add a facility to my
 
 #### CMS help desk steps
 **Note: If the help desk is waiting on information from the facility staff or editor, add the "Awaiting editor" flag to the facility with a log message that includes a link to this ticket. Remove the flag when the ticket is ready to be worked by the Facilities team. Be sure to preserve the current moderation state of the node when adding or removing the flag.**
-- [ ] 1. Become aware that the new facility is now on the Facility API (typically, via a Flag, but this may come in as a helpdesk ticket).
-- [ ] 2. If the editor has followed the steps from the above Knowledge Base article and included which section and VAMC the facility belongs to (i.e. VA Pittsburgh), great! **Proceed to step 3.** If not, please check with the editor or VHA digital media regarding what section and VAMC it belongs to.
-- [ ] 3. Updates the Section (default is "VAMC facilities", but it should be a VAMC system in a VISN) and VAMC system field accordingly.
-- [ ] 4. Communicate with editor (cc VHA Digital Media) to give them go-ahead to complete the content, with this [KB article](https://prod.cms.va.gov/help/vamc/about-locations-content-for-vamcs/how-do-i-add-a-facility-to-my-health-care-system). (See sample notification email below)
+- [ ] Become aware that the new facility is now on the Facility API (typically, via a Flag, but this may come in as a helpdesk ticket).
+- [ ] If the editor has followed the steps from the above Knowledge Base article and included which section and VAMC the facility belongs to (i.e. VA Pittsburgh), great!
+  - If not, please check with the editor or VHA digital media regarding what section and VAMC it belongs to.
+    - [ ] Update the Section (default is "VAMC facilities", but it should be a VAMC system in a VISN) and VAMC system field accordingly.
+- [ ] Communicate with editor (cc VHA Digital Media) to give them go-ahead to complete the content, with this [KB article](https://prod.cms.va.gov/help/vamc/about-locations-content-for-vamcs/how-do-i-add-a-facility-to-my-health-care-system). (See sample notification email below)
 
 <details><summary>Email template </summary>
 
@@ -52,21 +53,23 @@ Please let us know when your draft content is complete, so that we can wrap up t
 
 </details>
 
-- [ ] 5. Create a [URL change request](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/new?assignees=&template=runbook-facility-url-change.md&title=URL+Change+for%3A+%3Cinsert+facility+name%3E), changing the entry from the old facility URL to the new facility URL. (**Note: The URL change request ticket blocks the completion of this ticket.**)
+- [ ] When editor has prepared content and let help desk know, proceed to the remaining steps.
 
-<insert_url_change_request_link>
 
-- [ ] 6. When editor has prepared content and let help desk know, reassign this issue to appropriate CMS engineer on Product Support team, for bulk publishing.
-
-#### CMS engineer steps
-- [ ] 7. CMS engineer executes the steps of the URL change request ticket from step 5 above.
-
-#### Drupal Admin steps (CMS Engineer or Help desk)
-_Help desk will complete these steps or escalate to request help from CMS engineering._
-- [ ] 8. Drupal Admin bulk publishes nodes and facility.
-- [ ] 9. Drupal Admin edit facility node and remove `New facility` flag and save node.
-- [ ] 10. Let Help desk know this has been done, if not done by Help desk.
+#### Drupal Admin steps (CMS Engineer or Help desk) _Help desk will complete these steps or escalate to request help from CMS engineering._
+- [ ] Update the facility **Meta description** field, using the following format: "Get address and hours, parking and transportation information, and health services offered at [facility name]."
+- [ ] Move the facility link in the health care system menu to its place in the alphabetized list (medical centers first, then clinics).
+- [ ] Drupal Admin bulk publishes nodes and facility.
+- [ ] Drupal Admin edit facility node and remove `New facility` flag and save node.
+- [ ] Contact Lighthouse via Slack at #cms-lighthouse channel that this facility requires a canonical link in the following format (replacing the placeholder data with the actual API Id and VA.gov URL):
+  - `vha_691GM,https://www.va.gov/greater-los-angeles-health-care/locations/oxnard-va-clinic/`
+- [ ] Add the "Awaiting CSV" flag to the facility node with a revision log message that includes a link to this ticket.
+- [ ] Let Help desk know this has been done, if not done by Help desk.
 
+#### Wait (days or weeks, potentially)
+- [ ] After the canonical link has been added to the websites.csv and you have confirmation from Lighthouse that the CSV has been deployed, validate that the change has deployed by checking that the Facility Locator has been updated with the new url.
+- [ ] Update this ticket with a comment that the CSV change has been deployed.
+- [ ] Remove the "Awaiting CSV" flag to the facility node with a revision log message that includes a link to this ticket.
 
 #### CMS Help desk (wrap up)
-- [ ] 11. Notify editor and any other stakeholders.
+- [ ] Notify editor and any other stakeholders.

READMES/migrations-facility.md

@@ -102,7 +102,11 @@ For these migrations to function, you'll need to obtain a Facility API Key from
 $settings['post_api_endpoint_host'] = 'https://sandbox-api.va.gov';
 $settings['post_api_apikey'] = 'PASTE_KEY_HERE';
 
-$facility_api_urls = ['https://sandbox-api.va.gov/services/va_facilities/v0/facilities/all'];
+$facility_api_urls = [
+  'https://sandbox-api.va.gov/services/va_facilities/v1/facilities?per_page=1000',
+  'https://sandbox-api.va.gov/services/va_facilities/v1/facilities?per_page=1000&page=2',
+  'https://sandbox-api.va.gov/services/va_facilities/v1/facilities?per_page=1000&page=3',
+];
 $facility_api_key = $settings['post_api_apikey'];
 $facility_migrations = [
   'va_node_health_care_local_facility',

composer.json

@@ -80,7 +80,7 @@
         "drupal/entityqueue": "^1.2",
         "drupal/environment_indicator": "^4.0",
         "drupal/epp": "^1.1",
-        "drupal/expirable_content": "1.0.x-dev@dev",
+        "drupal/expirable_content": "^1.0@alpha",
         "drupal/fast_404": "^3.0",
         "drupal/feature_toggle": "^2.0",
         "drupal/field_group": "^3.4",
@@ -225,7 +225,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3497",
+        "va-gov/content-build": "^0.0.3536",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3",
@@ -555,7 +555,6 @@
         "va:npm": "Run NPM transparently (all arguments will be passed).",
         "va:nuke": "Remove all Composer package and cache directories.",
         "va:phpcbf": "Run PHP Code Beautifier and Fixer transparently (all arguments will be passed).",
-        "va:remove-git-dirs": "Remove .git directories within this directory, e.g. those created by Composer.",
         "va:set-path": "Display a command for updating the path to include `./bin`.",
         "va:ds:drupal": "Build the Drupal theme.",
         "va:ds:storybook": "Build the Storybook.",
@@ -657,11 +656,6 @@
             "# Test the SOCKS proxy.",
             "curl -v --proxy socks5h://127.0.0.1:2001 sentry.vetsgov-internal"
         ],
-        "va:remove-git-dirs": [
-            "# Remove .git directories within this directory, e.g. those created by Composer.",
-            "! ./scripts/should-run-directly.sh || ./scripts/remove-git-dirs.sh",
-            "./scripts/should-run-directly.sh || ddev composer va:remove-git-dirs --"
-        ],
         "va:set-path": [
             "# Run the command output below to set your current terminal PATH variable.",
             "# This will allow you to run any command in the ./bin directory without a path.",

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": "0604d3291e5dbfae69f055e29a876e91",
+    "content-hash": "d4a8e6fee6064073a5f736e456c263c9",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -6361,23 +6361,26 @@
         },
         {
             "name": "drupal/expirable_content",
-            "version": "dev-1.0.x",
+            "version": "1.0.0-alpha4",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/expirable_content.git",
-                "reference": "ecf4bd5662851f58c531fc1c71a03f7687905fad"
+                "reference": "1.0.0-alpha4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/expirable_content-1.0.0-alpha4.zip",
+                "reference": "1.0.0-alpha4",
+                "shasum": "49483d13aca9c5fedfb1961483ba02b9759d846a"
             },
             "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",
+                    "version": "1.0.0-alpha4",
+                    "datestamp": "1718733572",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "Project has not opted into security advisory coverage!"
@@ -25977,16 +25980,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3497",
+            "version": "v0.0.3536",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "dfddf6215dbe20434b29d223b89343a9b5c32441"
+                "reference": "423a174042b5787c2b4bf3fb2b7d9c5920e0b6d3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/dfddf6215dbe20434b29d223b89343a9b5c32441",
-                "reference": "dfddf6215dbe20434b29d223b89343a9b5c32441",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/423a174042b5787c2b4bf3fb2b7d9c5920e0b6d3",
+                "reference": "423a174042b5787c2b4bf3fb2b7d9c5920e0b6d3",
                 "shasum": ""
             },
             "type": "node-project",
@@ -26013,9 +26016,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.3497"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3536"
             },
-            "time": "2024-05-02T18:02:31+00:00"
+            "time": "2024-06-26T14:28:17+00:00"
         },
         {
             "name": "vlucas/phpdotenv",
@@ -26999,7 +27002,7 @@
         "drupal/entity_reference_validators": 15,
         "drupal/entity_route_context": 5,
         "drupal/entity_usage": 10,
-        "drupal/expirable_content": 20,
+        "drupal/expirable_content": 15,
         "drupal/fieldhelptext": 10,
         "drupal/flag": 10,
         "drupal/graphql_menu": 15,

config/sync/core.entity_form_display.paragraph.list_of_links.default.yml

@@ -16,7 +16,7 @@ mode: default
 content:
   field_link:
     type: linkit
-    weight: 2
+    weight: 3
     region: content
     settings:
       placeholder_url: ''
@@ -26,7 +26,7 @@ content:
     third_party_settings: {  }
   field_links:
     type: linkit
-    weight: 1
+    weight: 2
     region: content
     settings:
       placeholder_url: ''
@@ -42,6 +42,11 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  translation:
+    weight: 4
+    region: content
+    settings: {  }
+    third_party_settings: {  }
 hidden:
   created: true
   status: true

config/sync/core.entity_form_display.paragraph.lists_of_links.default.yml

@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.paragraph.lists_of_links.field_list_of_links_description
     - field.field.paragraph.lists_of_links.field_section_header
     - field.field.paragraph.lists_of_links.field_va_paragraphs
     - paragraphs.paragraphs_type.lists_of_links
@@ -13,6 +14,14 @@ targetEntityType: paragraph
 bundle: lists_of_links
 mode: default
 content:
+  field_list_of_links_description:
+    type: string_textarea
+    weight: 1
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings: {  }
   field_section_header:
     type: string_textfield
     weight: 0
@@ -23,7 +32,7 @@ content:
     third_party_settings: {  }
   field_va_paragraphs:
     type: paragraphs
-    weight: 1
+    weight: 2
     region: content
     settings:
       title: 'List of links'

config/sync/core.entity_view_display.paragraph.lists_of_links.default.yml

@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.paragraph.lists_of_links.field_list_of_links_description
     - field.field.paragraph.lists_of_links.field_section_header
     - field.field.paragraph.lists_of_links.field_va_paragraphs
     - paragraphs.paragraphs_type.lists_of_links
@@ -13,6 +14,13 @@ targetEntityType: paragraph
 bundle: lists_of_links
 mode: default
 content:
+  field_list_of_links_description:
+    type: basic_string
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
   field_section_header:
     type: string
     label: hidden
@@ -28,7 +36,7 @@ content:
       view_mode: default
       link: ''
     third_party_settings: {  }
-    weight: 1
+    weight: 2
     region: content
 hidden:
   search_api_excerpt: true

config/sync/core.entity_view_display.paragraph.lists_of_links.user_guides.yml

@@ -4,6 +4,7 @@ status: true
 dependencies:
   config:
     - core.entity_view_mode.paragraph.user_guides
+    - field.field.paragraph.lists_of_links.field_list_of_links_description
     - field.field.paragraph.lists_of_links.field_section_header
     - field.field.paragraph.lists_of_links.field_va_paragraphs
     - paragraphs.paragraphs_type.lists_of_links
@@ -14,6 +15,13 @@ targetEntityType: paragraph
 bundle: lists_of_links
 mode: user_guides
 content:
+  field_list_of_links_description:
+    type: basic_string
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
+    weight: 1
+    region: content
   field_section_header:
     type: string
     label: hidden
@@ -29,7 +37,7 @@ content:
       view_mode: user_guides
       link: ''
     third_party_settings: {  }
-    weight: 1
+    weight: 2
     region: content
 hidden:
   search_api_excerpt: true