Merge branch 'main' into VACMS-16853-next-build-branches-ftw

READMES/devops/tugboat.md

@@ -53,3 +53,7 @@ Can only update CPU and memory at a project level, not repository level.
 1. Close unused previews in the CMS/Pull Requests project. Target older previews and those corresponding to closed/merged PRs; these should be closed automatically, but there may be issues somewhere in the system that impair communication and cause these to remain open.
 2. Suspend older previews. This normally happens automatically (for Pull Request-based previews that haven't been touched in some period of time), but a flurry of previews might have been created inadvertently.
 3. Consider upscaling the Tugboat server or migrating to an alternative architecture.
+
+## 🚨 Warning 🚨
+
+Note that the "training" environment (https://training.cms.va.gov/) is the source of truth for who has and who has not completed the editorial training; it should not be rebuilt or otherwise tampered with without previously discussing with Helpdesk.

READMES/tugboat.md

@@ -147,4 +147,8 @@ For example, when creating the 'Wilmington health care' demo environment, these
 1. You cannot scroll the logs while they are outputting, you can only scroll once they are done. If you want to see previous output then use the Tugboat CLI tool with `tugboat log <service id>` and scroll that way. You can get the service ID from the URL bar in the UI. 
 1. Email won't be sent to existing users as their email addresses are blanked during the database sanitization process for the developer database snapshot (see [#6100](https://github.com/department-of-veterans-affairs/va.gov-cms/issues/6100)).  Email to new users, or users whose email addresses have been updated, can be sent and will be captured in the Tugboat interface. If you need to test email in Tugboat then edit a user and add an @example.com email address.
 1. Base preview images are **refreshed** automatically, not **rebuilt**.  This means that certain changes to Tugboat config, e.g. in the `init` phase, must be followed by a manual rebuild operation.  The nightly refresh will not incorporate the new changes.
-1. Pull requests with code in the body may cause a false alarm on the TIC and be rejected silently, and thus the Tugboat environment will not build automatically.  This is not an issue we or Tugboat can solve.  The only workaround is to build the PR branch manually. See this example of the string `filter_var()` in the webhook POST body causing a firewall block > https://dsva.slack.com/archives/C01A35JDH88/p1675984628181769?thread_ts=1675868445.789729&cid=C01A35JDH88. 
+1. Pull requests with code in the body may cause a false alarm on the TIC and be rejected silently, and thus the Tugboat environment will not build automatically.  This is not an issue we or Tugboat can solve.  The only workaround is to build the PR branch manually. See this example of the string `filter_var()` in the webhook POST body causing a firewall block > https://dsva.slack.com/archives/C01A35JDH88/p1675984628181769?thread_ts=1675868445.789729&cid=C01A35JDH88.
+
+## 🚨 Warning 🚨
+
+Note that the "training" environment (https://training.cms.va.gov/) is the source of truth for who has and who has not completed the editorial training; it should not be rebuilt or otherwise tampered with without previously discussing with Helpdesk.

composer.json

@@ -221,7 +221,7 @@
         "symfony/phpunit-bridge": "^5.1",
         "symfony/process": "^6.3",
         "symfony/routing": "^6.3",
-        "va-gov/content-build": "^0.0.3434",
+        "va-gov/content-build": "^0.0.3436",
         "vlucas/phpdotenv": "^5.3",
         "webflo/drupal-finder": "^1.0.0",
         "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": "c70bc978d86bfec8d1fd562b3edc3a46",
+    "content-hash": "95c4c7cc2bce561c6d11a295eccc567b",
     "packages": [
         {
             "name": "asm89/stack-cors",
@@ -25816,16 +25816,16 @@
         },
         {
             "name": "va-gov/content-build",
-            "version": "v0.0.3434",
+            "version": "v0.0.3436",
             "source": {
                 "type": "git",
                 "url": "https://github.com/department-of-veterans-affairs/content-build.git",
-                "reference": "056111999a6e5edd9da8369c301aef557fea7d6f"
+                "reference": "cd8386ca3214ee3bdc04f635605db34421c96058"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/056111999a6e5edd9da8369c301aef557fea7d6f",
-                "reference": "056111999a6e5edd9da8369c301aef557fea7d6f",
+                "url": "https://api.github.com/repos/department-of-veterans-affairs/content-build/zipball/cd8386ca3214ee3bdc04f635605db34421c96058",
+                "reference": "cd8386ca3214ee3bdc04f635605db34421c96058",
                 "shasum": ""
             },
             "type": "node-project",
@@ -25852,9 +25852,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.3434"
+                "source": "https://github.com/department-of-veterans-affairs/content-build/tree/v0.0.3436"
             },
-            "time": "2024-02-02T14:00:40+00:00"
+            "time": "2024-02-06T17:04:05+00:00"
         },
         {
             "name": "vlucas/phpdotenv",

docroot/themes/custom/vagovclaro/templates/node/node--landing-page--support-services-listing.html.twig

@@ -86,13 +86,18 @@
   {{ title_prefix }}
   {% if label and not page %}
     <h3{{ title_attributes }}>
-      <ul>{{ label }}</ul>
+      {{ label }}
     </h3>
   {% endif %}
   {{ title_suffix }}
 
   <div{{ content_attributes.addClass('node__content') }}>
-    <ul>{{ content }}</ul>
+    <ul>
+      {% for i in content.field_support_services['#items']|keys %}
+        <li>{{ content.field_support_services[i]['#node'].label }} {{ content.field_support_services[i]['#node'].field_phone_number.value }}</li>
+      {% endfor %}
+    </ul>
+    {{ content|without('field_support_services') }}
   </div>
 
 </article>