Merge branch 'main' into VACMS-19227-manila-ph-added-to-us

composer.json

@@ -231,7 +231,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3646",
+        "va-gov/content-build": "^0.0.3647",
         "vlucas/phpdotenv": "^5.6",
         "webflo/drupal-finder": "1.3.1",
         "webmozart/path-util": "^2.3",

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": "d5b0f39aa7528180a3fde783b09b7abc",
+    "content-hash": "59a359856a3769277b95581c8b557719",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -26851,7 +26851,7 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3646",
+            "version": "v0.0.3647",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
@@ -26887,7 +26887,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.3646"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3647"
             },
             "time": "2024-12-06T22:01:37+00:00"
         },

config/sync/core.entity_form_display.node.health_care_local_facility.default.yml

@@ -159,7 +159,6 @@ third_party_settings:
     group_locations_and_contact_info:
       children:
         - group_facility_data_from_vast
-        - field_mental_health_phone
       label: 'Locations and contact information'
       region: content
       parent_name: ''
@@ -219,6 +218,23 @@ third_party_settings:
         effect: none
         speed: fast
         required_fields: false
+    group_mental_health_phone_number:
+      children:
+        - field_mental_health_phone
+        - field_telephone
+      label: 'Mental health phone number'
+      region: content
+      parent_name: ''
+      weight: 2
+      format_type: fieldset
+      format_settings:
+        classes: ''
+        show_empty_fields: true
+        id: ''
+        label_as_html: false
+        description: 'Enter the number Veterans should call to access mental health services at your facility. If your facility doesn''t offer these services, enter the most appropriate system number. This number will be displayed everywhere your facility appears across VA.gov. <a href="/help/va-medical-centers-vamcs/about-locations-content-for-vamcs/how-to-edit-a-vamc-facility"  target="_blank">View guidelines for editing VAMC facilities (opens in a new tab)</a>'
+        required_fields: true
+        description_display: after
 id: node.health_care_local_facility.default
 targetEntityType: node
 bundle: health_care_local_facility
@@ -307,7 +323,7 @@ content:
     third_party_settings: {  }
   field_main_location:
     type: boolean_checkbox
-    weight: 22
+    weight: 21
     region: content
     settings:
       display_label: true
@@ -374,31 +390,17 @@ content:
     settings: {  }
     third_party_settings: {  }
   field_telephone:
-    type: paragraphs
-    weight: 1
+    type: entity_reference_paragraphs
+    weight: 22
     region: content
     settings:
-      title: Paragraph
-      title_plural: Paragraphs
+      title: 'phone number'
+      title_plural: 'phone number'
       edit_mode: open
-      closed_mode: summary
-      autocollapse: none
-      closed_mode_threshold: 0
-      add_mode: dropdown
+      add_mode: button
       form_display_mode: default
       default_paragraph_type: phone_number
-      features:
-        add_above: '0'
-        collapse_edit_all: collapse_edit_all
-        convert: '0'
-        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
-        show_collapse_all: true
+    third_party_settings: {  }
   field_timezone:
     type: tzfield_default
     weight: 30

config/sync/core.entity_form_display.node.person_profile.default.yml

@@ -40,7 +40,7 @@ third_party_settings:
       label: 'Section settings'
       region: content
       parent_name: ''
-      weight: 8
+      weight: 9
       format_type: details_sidebar
       format_settings:
         classes: ''
@@ -71,7 +71,7 @@ third_party_settings:
       label: Name
       region: content
       parent_name: ''
-      weight: 2
+      weight: 3
       format_type: fieldset
       format_settings:
         classes: ''
@@ -81,12 +81,11 @@ third_party_settings:
     group_contact_info:
       children:
         - field_email_address
-        - field_phone_number
-        - field_telephone
+        - group_phone_number
       label: 'Contact info'
       region: content
       parent_name: ''
-      weight: 3
+      weight: 4
       format_type: fieldset
       format_settings:
         classes: ''
@@ -100,7 +99,7 @@ third_party_settings:
       label: Photo
       region: content
       parent_name: ''
-      weight: 4
+      weight: 5
       format_type: fieldset
       format_settings:
         classes: ''
@@ -117,7 +116,7 @@ third_party_settings:
       label: Bio
       region: content
       parent_name: ''
-      weight: 5
+      weight: 6
       format_type: fieldset
       format_settings:
         classes: ''
@@ -137,6 +136,23 @@ third_party_settings:
         id: ''
         description: ''
         required_fields: true
+    group_phone_number:
+      children:
+        - field_phone_number
+        - field_telephone
+      label: 'Phone number'
+      region: content
+      parent_name: group_contact_info
+      weight: 6
+      format_type: fieldset
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        label_as_html: false
+        description: ''
+        required_fields: true
+        description_display: after
 id: node.person_profile.default
 targetEntityType: node
 bundle: person_profile
@@ -150,29 +166,29 @@ content:
     third_party_settings: {  }
   field_body:
     type: text_textarea
-    weight: 13
+    weight: 17
     region: content
     settings:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
   field_complete_biography:
     type: file_generic
-    weight: 14
+    weight: 18
     region: content
     settings:
       progress_indicator: throbber
     third_party_settings: {  }
   field_complete_biography_create:
     type: boolean_checkbox
-    weight: 11
+    weight: 15
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_description:
     type: string_textfield
-    weight: 6
+    weight: 7
     region: content
     settings:
       size: 60
@@ -188,7 +204,7 @@ content:
     third_party_settings: {  }
   field_intro_text:
     type: string_textarea_with_counter
-    weight: 12
+    weight: 16
     region: content
     settings:
       rows: 5
@@ -231,13 +247,13 @@ content:
     third_party_settings: {  }
   field_office:
     type: options_select
-    weight: 1
+    weight: 2
     region: content
     settings: {  }
     third_party_settings: {  }
   field_phone_number:
     type: telephone_default
-    weight: 6
+    weight: 7
     region: content
     settings:
       placeholder: ''
@@ -251,39 +267,33 @@ content:
     third_party_settings: {  }
   field_suffix:
     type: string_textfield
-    weight: 5
+    weight: 6
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
   field_telephone:
-    type: paragraphs
-    weight: 7
+    type: entity_reference_paragraphs
+    weight: 8
     region: content
     settings:
-      title: Paragraph
-      title_plural: Paragraphs
+      title: 'phone number'
+      title_plural: 'phone numbers'
       edit_mode: open
-      closed_mode: summary
-      autocollapse: none
-      closed_mode_threshold: 0
-      add_mode: dropdown
+      add_mode: button
       form_display_mode: default
-      default_paragraph_type: ''
-      features:
-        collapse_edit_all: collapse_edit_all
-        duplicate: duplicate
+      default_paragraph_type: _none
     third_party_settings: {  }
   moderation_state:
     type: moderation_state_default
-    weight: 13
+    weight: 12
     region: content
     settings: {  }
     third_party_settings: {  }
   path:
     type: path
-    weight: 6
+    weight: 7
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -296,7 +306,7 @@ content:
       placeholder: ''
     third_party_settings: {  }
   url_redirects:
-    weight: 7
+    weight: 8
     region: content
     settings: {  }
     third_party_settings: {  }