Merge branch 'main' into VACMS-20371-remove-non-numerical-characters-…

…from-extensions

.github/ISSUE_TEMPLATE/runbook-vba-facility-launch.md

@@ -25,7 +25,7 @@ Facility CMS link: <insert_facility_link>
 ### Publishing
 - [ ] Set the VBA Facility to Published, and note approvals in the revision log
 - [ ] Ask Michelle Middaugh to update the facility URL in Sandy's Database to the modernized URL. This eliminates the need for a URL change request ([LH confirmed](https://dsva.slack.com/archives/C02BTJTDFTN/p1730395863667449?thread_ts=1730395217.135779&cid=C02BTJTDFTN)).
-- [ ] Create a [redirect request](https://github.com/department-of-veterans-affairs/va.gov-team/issues/new?assignees=kristinoletmuskat%2C+strelich%2C+Agile6MSkinner&labels=sitewide+CAIA%2C+Sitewide+IA%2C+Facilities%2C+Regional+Office%2C+sitewide%2C+VA.gov+frontend%2C+Redirect+request&projects=&template=redirect-request.md&title=Redirect+Request) to redirect the previous TeamSite page to the modernized page.
+- [ ] Create a [redirect request](https://github.com/department-of-veterans-affairs/va.gov-team/issues/new?assignees=mnorthuis%2C+Agile6MSkinner&labels=sitewide+CAIA%2C+Sitewide+IA%2C+Facilities%2C+Regional+Office%2C+sitewide%2C+VA.gov+frontend%2C+Redirect+request&projects=&template=redirect-request.md&title=Redirect+Request) to redirect the previous TeamSite page to the modernized page.
   - [ ] **Indicate in ticket** that this is a [page level redirect for a Teamsite using the injected header](https://github.com/department-of-veterans-affairs/va.gov-team/blob/master/platform/engineering/redirect-implementation-strategy.md#3-subdomain--vagov-page-level-cross-domain-redirect-for-a-subdomain-that-loads-proxy-rewrite-js) -- it can be done within proxy rewrite as a client-side redirect
 
 ## Facilities PM / DM tasks

.github/ISSUE_TEMPLATE/taxonomy-add-term.yml

@@ -99,6 +99,7 @@ body:
       **Technical Coordination**
       - [ ] Work with Lighthouse to update the Facilities API to accept new value
         - This step can begin as soon as the API ID has been finalized and saved as Draft in Drupal 
+      - [ ] Drupal contributor must update the [vamc-facility-health-services view](https://main-8ry6zt2asg946vdfuiryyamuc9gkuyzc.demo.cms.va.gov/admin/structure/views/view/facility_services/edit/vamc_facility_health_services_page?destination=/admin/content/facilities/vamc-facility-health-services) to add the new Service to the Services filter list  
       
       **Launch & Change Management**
       - [ ] Once Content Review and Technical Coordination are complete, term can be published in Drupal

.github/workflows/cypress.yml

@@ -47,7 +47,7 @@ jobs:
           NODE_TLS_REJECT_UNAUTHORIZED: 0
 
       - name: Cypress run
-        uses: cypress-io/github-action@7271bed2a170d73c0b08939cd192db51a1c46c50 # v6.7.10
+        uses: cypress-io/github-action@18a6541367f4580a515371905f499a27a44e8dbe # v6.7.12
         with:
           wait-on: "${{ inputs.preview_url }}"
           command: 'npm run test:cypress:parallel'

.github/workflows/dependabot-auto-merge.yml

@@ -31,15 +31,15 @@ jobs:
 
       # Get the initial AWS IAM User credentials. Only has basic permissions for sts:assumeRole
       - name: Configure AWS credentials (1)
-        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
+        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-gov-west-1
 
       # Get credentials from our SSM role. Least privilege method for AWS IAM.
       - name: Configure AWS Credentials (2)
-        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
+        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/s3-backup-retention.yml

@@ -21,7 +21,7 @@ jobs:
 
       # Get the initial AWS IAM User credentials. Only has basic permissions for sts:assumeRole
       - name: Configure AWS credentials (1)
-        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
+        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -36,7 +36,7 @@ jobs:
 
       # Get credentials from our s3 role. Least privilege method for AWS IAM.
       - name: Configure AWS credentials (1)
-        uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
+        uses: aws-actions/configure-aws-credentials@ececac1a45f3b08a01d2dd070d28d111c5fe6722 # v4.1.0
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

docroot/modules/custom/va_gov_form_builder/css/va_gov_form_builder.css → docroot/modules/custom/va_gov_form_builder/css/form_builder.css

@@ -311,6 +311,8 @@ a.form-builder-button--secondary:hover {
 
 /* button group */
 .form-builder-button-group {
+  display: flex;
+  gap: var(--units-1p5);
   margin-top: var(--units-4);
 }
 

docroot/modules/custom/va_gov_form_builder/css/page_content__layout__non_editable_pattern.css

@@ -0,0 +1,16 @@
+.form-builder-non-editable-pattern__main-content {
+  width: 600px;
+}
+
+#heading-with-label-step-label {
+  margin-bottom: var(--units-5);
+  margin-top: var(--units-4);
+}
+
+.form-builder-non-editable-pattern__step_description > p {
+  margin-bottom: var(--units-4);
+}
+
+.form-builder-non-editable-pattern__default-appearance > img {
+  margin-top: var(--units-2);
+}

docroot/modules/custom/va_gov_form_builder/src/Controller/VaGovFormBuilderController.php

@@ -332,11 +332,11 @@ public function layout($nid) {
       ],
       '#your_personal_info' => [
         'status' => $this->digitalForm->getStepStatus('your_personal_info'),
-        'url' => '',
+        'url' => $this->getPageUrl('name_and_dob'),
       ],
       '#address_info' => [
         'status' => $this->digitalForm->getStepStatus('address_info'),
-        'url' => '',
+        'url' => $this->getPageUrl('address_info'),
       ],
       '#contact_info' => [
         'status' => $this->digitalForm->getStepStatus('contact_info'),
@@ -382,15 +382,95 @@ public function layout($nid) {
    *   The node id of the Digital Form.
    */
   public function nameAndDob($nid) {
-    $formName = 'NameAndDob';
-    $subtitle = 'Subtitle Placeholder';
+    $nodeFound = $this->loadDigitalForm($nid);
+    if (!$nodeFound) {
+      throw new NotFoundHttpException();
+    }
+
+    $pageContent = [
+      '#theme' => self::PAGE_CONTENT_THEME_PREFIX . 'name_and_dob',
+      '#preview' => [
+        'alt_text' => 'Name-and-date-of-birth preview',
+        'url' => '/modules/custom/va_gov_form_builder/images/name-and-dob.png',
+      ],
+      '#primary_button' => [
+        'label' => 'Save and continue',
+        'url' => $this->getPageUrl('layout'),
+      ],
+      '#secondary_button' => [
+        'label' => 'Next page',
+        'url' => $this->getPageUrl('identification_info'),
+      ],
+    ];
+    $subtitle = $this->digitalForm->getTitle();
+    $breadcrumbs = $this->generateBreadcrumbs('layout', 'Personal information');
+    $libraries = ['page_content__layout__non_editable_pattern'];
+
+    return $this->getPage($pageContent, $subtitle, $breadcrumbs, $libraries);
+  }
+
+  /**
+   * Identification-info page.
+   *
+   * @param string $nid
+   *   The node id of the Digital Form.
+   */
+  public function identificationInfo($nid) {
+    $nodeFound = $this->loadDigitalForm($nid);
+    if (!$nodeFound) {
+      throw new NotFoundHttpException();
+    }
 
+    $pageContent = [
+      '#theme' => self::PAGE_CONTENT_THEME_PREFIX . 'identification_info',
+      '#preview' => [
+        'alt_text' => 'Identification-information preview',
+        'url' => '/modules/custom/va_gov_form_builder/images/identification-info.png',
+      ],
+      '#primary_button' => [
+        'label' => 'Save and continue',
+        'url' => $this->getPageUrl('layout'),
+      ],
+      '#secondary_button' => [
+        'label' => 'Previous page',
+        'url' => $this->getPageUrl('name_and_dob'),
+      ],
+    ];
+    $subtitle = $this->digitalForm->getTitle();
+    $breadcrumbs = $this->generateBreadcrumbs('layout', 'Personal information');
+    $libraries = ['page_content__layout__non_editable_pattern'];
+
+    return $this->getPage($pageContent, $subtitle, $breadcrumbs, $libraries);
+  }
+
+  /**
+   * Address-info page.
+   *
+   * @param string $nid
+   *   The node id of the Digital Form.
+   */
+  public function addressInfo($nid) {
     $nodeFound = $this->loadDigitalForm($nid);
     if (!$nodeFound) {
       throw new NotFoundHttpException();
     }
 
-    return $this->getFormPage($formName, $subtitle);
+    $pageContent = [
+      '#theme' => self::PAGE_CONTENT_THEME_PREFIX . 'address_info',
+      '#preview' => [
+        'alt_text' => 'Address-information preview',
+        'url' => '/modules/custom/va_gov_form_builder/images/address-info.png',
+      ],
+      '#primary_button' => [
+        'label' => 'Save and continue',
+        'url' => $this->getPageUrl('layout'),
+      ],
+    ];
+    $subtitle = $this->digitalForm->getTitle();
+    $breadcrumbs = $this->generateBreadcrumbs('layout', 'Address information');
+    $libraries = ['page_content__layout__non_editable_pattern'];
+
+    return $this->getPage($pageContent, $subtitle, $breadcrumbs, $libraries);
   }
 
   /**
@@ -407,12 +487,18 @@ public function reviewAndSign($nid) {
 
     $pageContent = [
       '#theme' => self::PAGE_CONTENT_THEME_PREFIX . 'review_and_sign',
-      '#statement_of_truth_preview_url' => '/modules/custom/va_gov_form_builder/images/statement-of-truth.png',
-      '#return_to_layout_url' => $this->getPageUrl('layout'),
+      '#preview' => [
+        'alt_text' => 'Statement-of-truth preview',
+        'url' => '/modules/custom/va_gov_form_builder/images/statement-of-truth.png',
+      ],
+      '#primary_button' => [
+        'label' => 'Save and continue',
+        'url' => $this->getPageUrl('layout'),
+      ],
     ];
     $subtitle = $this->digitalForm->getTitle();
     $breadcrumbs = $this->generateBreadcrumbs('layout', 'Review page');
-    $libraries = ['review_and_sign'];
+    $libraries = ['page_content__layout__non_editable_pattern'];
 
     return $this->getPage($pageContent, $subtitle, $breadcrumbs, $libraries);
   }