From 8a3434f44667a7b8bae514a5082f5a8f77ee1d54 Mon Sep 17 00:00:00 2001
From: Dave Pickett <51967950+davidmpickett@users.noreply.github.com>
Date: Tue, 10 Dec 2024 15:12:57 -0600
Subject: [PATCH 1/4] VACMS-19512: Drupal UX for phone numbers (#19607)

* Update staff profile & vamc b&i

* VAMC facility mental health

* fix truncated confirmation message

* reverting previous change & removing empty fieldset

* finish reverting SCSS change

* SCSS updates to phone number paragraph

* adding ids for specificity

* what about twig

* Rolling back CSS and Twig. Adding fieldset wrapping

* VACMS-19512: Updates SCSS for clarity and DS alignment

* VACMS-19512: Updates test for phone widget

---------

Co-authored-by: Christian Burk <766573+omahane@users.noreply.github.com>
---
 ...ode.health_care_local_facility.default.yml | 46 ++++++------
 ...rm_display.node.person_profile.default.yml | 70 +++++++++++--------
 ....vamc_system_billing_insurance.default.yml | 62 ++++++++--------
 ...cal_facility.field_mental_health_phone.yml |  2 +-
 ...th_care_local_facility.field_telephone.yml |  2 +-
 .../assets/scss/components/_fields.scss       | 10 +++
 .../content_type/person_profile.feature       |  4 +-
 7 files changed, 108 insertions(+), 88 deletions(-)

diff --git a/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml b/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml
index db9fb178fa..b09a71535b 100644
--- a/config/sync/core.entity_form_display.node.health_care_local_facility.default.yml
+++ b/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
diff --git a/config/sync/core.entity_form_display.node.person_profile.default.yml b/config/sync/core.entity_form_display.node.person_profile.default.yml
index a7215a2a60..1bc01b2277 100644
--- a/config/sync/core.entity_form_display.node.person_profile.default.yml
+++ b/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,7 +166,7 @@ content:
     third_party_settings: {  }
   field_body:
     type: text_textarea
-    weight: 13
+    weight: 17
     region: content
     settings:
       rows: 5
@@ -158,21 +174,21 @@ content:
     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: {  }
diff --git a/config/sync/core.entity_form_display.node.vamc_system_billing_insurance.default.yml b/config/sync/core.entity_form_display.node.vamc_system_billing_insurance.default.yml
index 36c3a150ea..0d2243732e 100644
--- a/config/sync/core.entity_form_display.node.vamc_system_billing_insurance.default.yml
+++ b/config/sync/core.entity_form_display.node.vamc_system_billing_insurance.default.yml
@@ -90,7 +90,7 @@ third_party_settings:
       label: 'National top of page content'
       region: content
       parent_name: ''
-      weight: 6
+      weight: 7
       format_type: tooltip
       format_settings:
         show_label: '0'
@@ -105,13 +105,12 @@ third_party_settings:
         attributes: ''
     group_inquiries_about_copay:
       children:
-        - field_phone_number
-        - field_telephone
+        - group_phone_number
         - field_office_hours
       label: 'For inquiries by phone about copay balance'
       region: content
       parent_name: ''
-      weight: 5
+      weight: 6
       format_type: details
       format_settings:
         classes: ''
@@ -121,20 +120,6 @@ third_party_settings:
         description: ''
         required_fields: false
         formatter: closed
-    group_cashier_s_office:
-      children: {  }
-      label: "Cashier's office"
-      region: content
-      parent_name: ''
-      weight: 7
-      format_type: details
-      format_settings:
-        classes: ''
-        show_empty_fields: true
-        id: ''
-        open: true
-        description: ''
-        required_fields: false
     group_national_above_top_of_page:
       children:
         - field_cc_above_top_of_page
@@ -154,6 +139,23 @@ third_party_settings:
         element: div
         label_element: h3
         attributes: ''
+    group_phone_number:
+      children:
+        - field_phone_number
+        - field_telephone
+      label: 'Phone number'
+      region: content
+      parent_name: group_inquiries_about_copay
+      weight: 5
+      format_type: fieldset
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        label_as_html: false
+        description: ''
+        required_fields: true
+        description_display: after
 id: node.vamc_system_billing_insurance.default
 targetEntityType: node
 bundle: vamc_system_billing_insurance
@@ -235,39 +237,33 @@ content:
     third_party_settings: {  }
   field_office_hours:
     type: office_hours_default
-    weight: 10
+    weight: 6
     region: content
     settings:
       collapsed: false
     third_party_settings: {  }
   field_phone_number:
     type: telephone_default
-    weight: 8
+    weight: 10
     region: content
     settings:
       placeholder: ''
     third_party_settings: {  }
   field_telephone:
-    type: paragraphs
-    weight: 9
+    type: entity_reference_paragraphs
+    weight: 11
     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: phone_number
     third_party_settings: {  }
   moderation_state:
     type: moderation_state_default
-    weight: 7
+    weight: 12
     region: content
     settings: {  }
     third_party_settings: {  }
diff --git a/config/sync/field.field.node.health_care_local_facility.field_mental_health_phone.yml b/config/sync/field.field.node.health_care_local_facility.field_mental_health_phone.yml
index 4643e7ea8e..ff107baf8e 100644
--- a/config/sync/field.field.node.health_care_local_facility.field_mental_health_phone.yml
+++ b/config/sync/field.field.node.health_care_local_facility.field_mental_health_phone.yml
@@ -16,7 +16,7 @@ field_name: field_mental_health_phone
 entity_type: node
 bundle: health_care_local_facility
 label: 'Mental health phone number'
-description: 'Enter the number Veterans should call to access mental health services at your facility, for example 202-555-1234, ext. 23. 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>'
+description: ''
 required: false
 translatable: false
 default_value: {  }
diff --git a/config/sync/field.field.node.health_care_local_facility.field_telephone.yml b/config/sync/field.field.node.health_care_local_facility.field_telephone.yml
index b2853d4970..4d7d6a0a67 100644
--- a/config/sync/field.field.node.health_care_local_facility.field_telephone.yml
+++ b/config/sync/field.field.node.health_care_local_facility.field_telephone.yml
@@ -17,7 +17,7 @@ field_name: field_telephone
 entity_type: node
 bundle: health_care_local_facility
 label: 'Mental health phone number'
-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>'
+description: ''
 required: false
 translatable: false
 default_value: {  }
diff --git a/docroot/themes/custom/vagovclaro/assets/scss/components/_fields.scss b/docroot/themes/custom/vagovclaro/assets/scss/components/_fields.scss
index 11dd8e5f66..882b306f24 100644
--- a/docroot/themes/custom/vagovclaro/assets/scss/components/_fields.scss
+++ b/docroot/themes/custom/vagovclaro/assets/scss/components/_fields.scss
@@ -1,3 +1,13 @@
+#edit-field-telephone-wrapper {
+  .paragraph-type-title {
+    font-weight: bold;
+  }
+
+  em {
+    font-style: normal;
+  }
+}
+
 .field--name-field-phone-number {
   .form-type-textfield {
     float: left;
diff --git a/tests/cypress/integration/features/content_type/person_profile.feature b/tests/cypress/integration/features/content_type/person_profile.feature
index 3f06d39c31..fbab9a7b29 100644
--- a/tests/cypress/integration/features/content_type/person_profile.feature
+++ b/tests/cypress/integration/features/content_type/person_profile.feature
@@ -12,7 +12,9 @@ Scenario: Log in and create a Person Profile with attention to conditional field
 
   And I fill in "First name" with "James"
   And I fill in "Last name" with "Smith"
-  And I fill in field with selector "#edit-field-telephone-0-subform-field-phone-number-0-value" with value "402-867-5309"
+  And I click the "Add Phone number" button
+  And I wait "5" seconds
+  And I fill in field with selector "[data-drupal-selector='edit-field-telephone-0-subform-field-phone-number-0-value']" with value "402-867-5309"
   And I fill in field with selector "#edit-revision-log-0-value" with value "[Test Data] Revision log message."
   And I click the "Save" button
   Then I should see "Staff Profile James Smith has been created."

From ed635cc9bc23c8cd2eb1ec5c4dbb3af45eb4e2a9 Mon Sep 17 00:00:00 2001
From: Ryan Koch <6863534+ryguyk@users.noreply.github.com>
Date: Tue, 10 Dec 2024 17:31:39 -0600
Subject: [PATCH 2/4] VAGOV-TEAM-97904: Adds Form Builder Page Template
 (#20052)

* VAGOV-TEAM-97904:
- Adds Twig template for Form Builder pages.
- Applies template to all Form Builder routes.

* Adds unit test for va_gov_form_builder_theme_suggestions_page().
---
 .../page--va-gov-form-builder.html.twig       |  40 +++++++
 .../va_gov_form_builder.module                |  27 +++++
 .../templates/FormBuilderPageTemplateTest.php |  66 ++++++++++++
 .../va_gov_form_builder/unit/ModuleTest.php   | 102 ++++++++++++++++++
 4 files changed, 235 insertions(+)
 create mode 100644 docroot/modules/custom/va_gov_form_builder/templates/page--va-gov-form-builder.html.twig
 create mode 100644 tests/phpunit/va_gov_form_builder/functional/templates/FormBuilderPageTemplateTest.php
 create mode 100644 tests/phpunit/va_gov_form_builder/unit/ModuleTest.php

diff --git a/docroot/modules/custom/va_gov_form_builder/templates/page--va-gov-form-builder.html.twig b/docroot/modules/custom/va_gov_form_builder/templates/page--va-gov-form-builder.html.twig
new file mode 100644
index 0000000000..86efcd7ae3
--- /dev/null
+++ b/docroot/modules/custom/va_gov_form_builder/templates/page--va-gov-form-builder.html.twig
@@ -0,0 +1,40 @@
+{#
+/**
+ * @file
+ * VA.gov Form Builder's implementation of a single page.
+ *
+ * Nearly identical to VAgovClaro's implementation, except:
+ * - An outermost page container has been added.
+ * - The header includes additional content (navbar, eventually)
+ * - Breadcrumbs have been removed
+ *
+ * For more information:
+ * @see docroot/themes/custom/vagovclaro/templates/page/page.html.twig
+ */
+#}
+<div class="va-gov-form-builder-page-container">
+  <header class="content-header clearfix">
+    <div class="layout-container">
+      {{ page.header }}
+
+      <div class="va-gov-form-builder-navbar">
+        <!-- This is a placeholder for our navigation bar -->
+      </div>
+    </div>
+  </header>
+
+  <div class="layout-container">
+    {{ page.pre_content }}
+
+    <main class="page-content clearfix" role="main">
+      <div class="visually-hidden"><a id="main-content" tabindex="-1"></a></div>
+      {{ page.highlighted }}
+      {% if page.help %}
+      <div class="help">
+        {{ page.help }}
+      </div>
+      {% endif %}
+      {{ page.content }}
+    </main>
+  </div>
+</div>
diff --git a/docroot/modules/custom/va_gov_form_builder/va_gov_form_builder.module b/docroot/modules/custom/va_gov_form_builder/va_gov_form_builder.module
index 015231d072..e3f9b98dca 100644
--- a/docroot/modules/custom/va_gov_form_builder/va_gov_form_builder.module
+++ b/docroot/modules/custom/va_gov_form_builder/va_gov_form_builder.module
@@ -17,3 +17,30 @@ function va_gov_form_builder_entity_bundle_field_info_alter(&$fields, EntityType
 
   return $fields;
 }
+
+/**
+ * Implements hook_theme().
+ */
+function va_gov_form_builder_theme() {
+  return [
+    'va_gov_form_builder_page' => [
+      'template' => 'page--va-gov-form-builder',
+      'path' => \Drupal::service('extension.list.module')->getPath('va_gov_form_builder') . '/templates',
+    ],
+  ];
+}
+
+/**
+ * Implements hook_theme_suggestions_HOOK().
+ */
+function va_gov_form_builder_theme_suggestions_page(array &$variables) {
+  $route_name = \Drupal::routeMatch()->getRouteName();
+  $suggestions = [];
+
+  // Apply custom page template for all Form Builder routes.
+  if (strpos($route_name, 'va_gov_form_builder.') === 0) {
+    $suggestions[] = 'va_gov_form_builder_page';
+  }
+
+  return $suggestions;
+}
diff --git a/tests/phpunit/va_gov_form_builder/functional/templates/FormBuilderPageTemplateTest.php b/tests/phpunit/va_gov_form_builder/functional/templates/FormBuilderPageTemplateTest.php
new file mode 100644
index 0000000000..ab468cc5de
--- /dev/null
+++ b/tests/phpunit/va_gov_form_builder/functional/templates/FormBuilderPageTemplateTest.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace tests\phpunit\va_gov_form_builder\functional\templates;
+
+use Tests\Support\Classes\VaGovExistingSiteBase;
+
+/**
+ * Functional test of page--va-gov-form-builder.html Twig template.
+ *
+ * This test suite takes the approach of testing a single route
+ * that should result in rendering a page that utilizes the
+ * page template under test. In this way, we can test the expected
+ * behavior of the template file in a consistent manner, assuming
+ * the route properly utilizes the theme (which is tested elswhere).
+ *
+ * The route that makes the most sense here
+ * is the `entry` route, as that should always be present, regardless
+ * of potential future changes to Form Builder pages. The entry route
+ * will redirect to the first content page.
+ *
+ * @group functional
+ * @group all
+ */
+class FormBuilderPageTemplateTest extends VaGovExistingSiteBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  private static $modules = ['va_gov_form_builder'];
+
+  /**
+   * Setup the environment for each test.
+   */
+  public function setUp(): void {
+    parent::setUp();
+
+    $this->drupalLogin($this->createUser(['edit any digital_form content']));
+
+    // Form Builder entry.
+    $this->drupalGet('/form-builder');
+  }
+
+  /**
+   * Test that expected elements are present.
+   */
+  public function testExpectedElementsExist() {
+    $this->assertSession()->statusCodeEquals(200);
+
+    $containerElement = $this->cssSelect('.va-gov-form-builder-page-container');
+    $this->assertCount(1, $containerElement);
+
+    $navbarElement = $this->cssSelect('.va-gov-form-builder-navbar');
+    $this->assertCount(1, $navbarElement);
+  }
+
+  /**
+   * Test that unexpected elements are not present.
+   */
+  public function testUnexpectedElementsDoNotExist() {
+    $this->assertSession()->statusCodeEquals(200);
+
+    $breadcrumbsElement = $this->cssSelect('#block-vagovclaro-breadcrumbs');
+    $this->assertCount(0, $breadcrumbsElement);
+  }
+
+}
diff --git a/tests/phpunit/va_gov_form_builder/unit/ModuleTest.php b/tests/phpunit/va_gov_form_builder/unit/ModuleTest.php
new file mode 100644
index 0000000000..6e41d85f00
--- /dev/null
+++ b/tests/phpunit/va_gov_form_builder/unit/ModuleTest.php
@@ -0,0 +1,102 @@
+<?php
+
+namespace tests\phpunit\va_gov_form_builder\unit;
+
+use Drupal\Core\DependencyInjection\ContainerBuilder;
+use Drupal\Core\Extension\ModuleExtensionList;
+use Drupal\Core\Routing\RouteMatchInterface;
+use DrupalFinder\DrupalFinder;
+use Tests\Support\Classes\VaGovUnitTestBase;
+
+/**
+ * Unit tests for va_gov_form_builder.module.
+ *
+ * @group unit
+ * @group all
+ */
+class ModuleTest extends VaGovUnitTestBase {
+
+  /**
+   * The path to the module being tested.
+   *
+   * @var string
+   */
+  private $modulePath = 'modules/custom/va_gov_form_builder';
+
+  /**
+   * A mock service container.
+   *
+   * @var \Drupal\Core\DependencyInjection\ContainerBuilder
+   */
+  private $container;
+
+  /**
+   * Setup the environment for each test.
+   */
+  protected function setUp(): void {
+    parent::setUp();
+
+    // Find Drupal root.
+    $drupalFinder = new DrupalFinder();
+    $drupalFinder->locateRoot(__DIR__);
+    $drupalRoot = $drupalFinder->getDrupalRoot();
+
+    // Require the module file so we can test it.
+    require_once $drupalRoot . '/' . $this->modulePath . '/va_gov_form_builder.module';
+
+    // Create the mock service container.
+    $this->container = new ContainerBuilder();
+
+    // Set the mocked container as the global Drupal container.
+    \Drupal::setContainer($this->container);
+  }
+
+  /**
+   * Tests va_gov_form_builder_theme().
+   *
+   * @covers ::va_gov_form_builder_theme
+   */
+  public function testVaGovFormBuilderHookTheme() {
+    // Mock the extension.list.module service and add to the container.
+    $extensionListMock = $this->createMock(ModuleExtensionList::class);
+    $extensionListMock->expects($this->once())
+      ->method('getPath')
+      ->with('va_gov_form_builder')
+      ->willReturn($this->modulePath);
+    $this->container->set('extension.list.module', $extensionListMock);
+
+    // Call the function to test.
+    $result = va_gov_form_builder_theme();
+
+    // Assert the expected theme definition exists.
+    $this->assertArrayHasKey('va_gov_form_builder_page', $result);
+    $this->assertEquals('page--va-gov-form-builder', $result['va_gov_form_builder_page']['template']);
+    $this->assertEquals($this->modulePath . '/templates', $result['va_gov_form_builder_page']['path']);
+  }
+
+  /**
+   * Tests va_gov_form_builder_theme_suggestions_page().
+   *
+   * @covers va_gov_form_builder_theme_suggestions_page
+   */
+  public function testVaGovFormBuilderThemeSuggestionsPage() {
+    // Ensure *any* route starting with `va_gov_form_builder.` returns the
+    // expected theme suggestions.
+    $exampleRoute = 'va_gov_form_builder.example_route';
+
+    // Mock the current_route_match service and add to the container.
+    $currentRouteMatchMock = $this->createMock(RouteMatchInterface::class);
+    $currentRouteMatchMock->expects($this->once())
+      ->method('getRouteName')
+      ->willReturn($exampleRoute);
+    $this->container->set('current_route_match', $currentRouteMatchMock);
+
+    // Call the function to test.
+    $variables = [];
+    $suggestions = va_gov_form_builder_theme_suggestions_page($variables);
+
+    // Assert the expected theme suggestion is returned.
+    $this->assertContains('va_gov_form_builder_page', $suggestions);
+  }
+
+}

From fe68c287e3826d27c62b8bc340b66f22669fc850 Mon Sep 17 00:00:00 2001
From: Ryan Koch <6863534+ryguyk@users.noreply.github.com>
Date: Tue, 10 Dec 2024 18:10:29 -0600
Subject: [PATCH 3/4] VAGOV-TEAM-97909: Adds start of a theme to Form Builder.
 (#20072)

- Declares a Form Builder library tied to a new css file.
- Imports external VADS token css from UNPKG.
---
 .../css/va_gov_form_builder.css               |  4 ++++
 .../src/Form/Base/FormBuilderBase.php         | 14 +++++++++++
 .../va_gov_form_builder.libraries.yml         |  5 ++++
 .../unit/Form/Base/FormBuilderBaseTest.php    | 24 +++++++++++++++++++
 4 files changed, 47 insertions(+)
 create mode 100644 docroot/modules/custom/va_gov_form_builder/css/va_gov_form_builder.css
 create mode 100644 docroot/modules/custom/va_gov_form_builder/va_gov_form_builder.libraries.yml

diff --git a/docroot/modules/custom/va_gov_form_builder/css/va_gov_form_builder.css b/docroot/modules/custom/va_gov_form_builder/css/va_gov_form_builder.css
new file mode 100644
index 0000000000..e5f1ffc8dc
--- /dev/null
+++ b/docroot/modules/custom/va_gov_form_builder/css/va_gov_form_builder.css
@@ -0,0 +1,4 @@
+/* page container */
+.va-gov-form-builder-page-container {
+  font-family: var(--font-family-serif);
+}
diff --git a/docroot/modules/custom/va_gov_form_builder/src/Form/Base/FormBuilderBase.php b/docroot/modules/custom/va_gov_form_builder/src/Form/Base/FormBuilderBase.php
index e02b6f9287..fdf2f6c7c2 100644
--- a/docroot/modules/custom/va_gov_form_builder/src/Form/Base/FormBuilderBase.php
+++ b/docroot/modules/custom/va_gov_form_builder/src/Form/Base/FormBuilderBase.php
@@ -14,8 +14,22 @@ abstract class FormBuilderBase extends FormBase {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
+    $form['#theme'] = 'va_gov_form_builder';
     $form['#title'] = $this->t('Form Builder');
 
+    // Add styles.
+    $form['#attached']['html_head'][] = [
+      [
+        '#tag' => 'link',
+        '#attributes' => [
+          'rel' => 'stylesheet',
+          'href' => 'https://unpkg.com/@department-of-veterans-affairs/css-library@0.16.0/dist/tokens/css/variables.css',
+        ],
+      ],
+      'external_stylesheet',
+    ];
+    $form['#attached']['library'][] = 'va_gov_form_builder/va_gov_form_builder_styles';
+
     return $form;
   }
 
diff --git a/docroot/modules/custom/va_gov_form_builder/va_gov_form_builder.libraries.yml b/docroot/modules/custom/va_gov_form_builder/va_gov_form_builder.libraries.yml
new file mode 100644
index 0000000000..8d4fd5bf12
--- /dev/null
+++ b/docroot/modules/custom/va_gov_form_builder/va_gov_form_builder.libraries.yml
@@ -0,0 +1,5 @@
+va_gov_form_builder_styles:
+  version: 1.x
+  css:
+    theme:
+      css/va_gov_form_builder.css: {}
diff --git a/tests/phpunit/va_gov_form_builder/unit/Form/Base/FormBuilderBaseTest.php b/tests/phpunit/va_gov_form_builder/unit/Form/Base/FormBuilderBaseTest.php
index 16eab4e013..1013072297 100644
--- a/tests/phpunit/va_gov_form_builder/unit/Form/Base/FormBuilderBaseTest.php
+++ b/tests/phpunit/va_gov_form_builder/unit/Form/Base/FormBuilderBaseTest.php
@@ -45,8 +45,32 @@ public function testBuildForm() {
 
     $form = $this->classInstance->buildForm($form, $formStateMock);
 
+    // Title.
     $this->assertArrayHasKey('#title', $form);
     $this->assertEquals($form['#title'], 'Form Builder');
+
+    // CSS.
+    $this->assertArrayHasKey('#attached', $form);
+
+    // 1. Form Builder Library.
+    $this->assertArrayHasKey('html_head', $form['#attached']);
+    $this->assertNotEmpty($form['#attached']['html_head']);
+
+    $found = FALSE;
+    foreach ($form['#attached']['html_head'] as $html_head_item) {
+      if (
+        isset($html_head_item[0]['#attributes']['href']) &&
+        $html_head_item[0]['#attributes']['href'] === 'https://unpkg.com/@department-of-veterans-affairs/css-library@0.16.0/dist/tokens/css/variables.css'
+      ) {
+        $found = TRUE;
+        break;
+      }
+    }
+    $this->assertTrue($found, 'The html_head array contains a link with the unpkg token url.');
+
+    // 2. External CSS.
+    $this->assertArrayHasKey('library', $form['#attached']);
+    $this->assertContains('va_gov_form_builder/va_gov_form_builder_styles', $form['#attached']['library']);
   }
 
 }

From e0a002700d58cf3f52612e882719b5dd73d34420 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 10 Dec 2024 17:58:52 -0800
Subject: [PATCH 4/4] Bump va-gov/content-build from 0.0.3646 to 0.0.3647
 (#20077)

Bumps [va-gov/content-build](https://github.com/department-of-veterans-affairs/content-build) from 0.0.3646 to 0.0.3647.
- [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.3646...v0.0.3647)

---
updated-dependencies:
- dependency-name: va-gov/content-build
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
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 c7b0f1eca2..5e965fb65a 100644
--- a/composer.json
+++ b/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",
diff --git a/composer.lock b/composer.lock
index 0b391ad06d..7ac7d00a23 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": "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"
         },