From 462a8478d4486c8e32410476123183150ef39dcc Mon Sep 17 00:00:00 2001
From: GovCIOLiz <ewendlinggovcio@gmail.com>
Date: Tue, 20 Aug 2024 17:31:15 -0700
Subject: [PATCH 1/9] Update SCO registry.json route

---
 src/applications/registry.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/registry.json b/src/applications/registry.json
index 138215595b..87faa54439 100644
--- a/src/applications/registry.json
+++ b/src/applications/registry.json
@@ -1869,10 +1869,10 @@
   {
     "appName": "Resources for schools",
     "entryName": "sco",
-    "rootUrl": "/education/school-administrators",
+    "rootUrl": "/school-administrators/",
     "productId": "40938a35-1cfa-4808-917b-37e0baec6a7c",
     "template": {
-      "vagovprod": false,
+      "vagovprod": true,
       "layout": "page-react.html"
     }
   },

From ae6c9fc4f28ef6519535b644c8c992de31c180f1 Mon Sep 17 00:00:00 2001
From: GovCIOLiz <elizabeth.wendling@va.gov>
Date: Thu, 29 Aug 2024 13:51:10 -0700
Subject: [PATCH 2/9] Update registry.json for sco url

---
 src/applications/registry.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/registry.json b/src/applications/registry.json
index 87faa54439..d8cdbcf516 100644
--- a/src/applications/registry.json
+++ b/src/applications/registry.json
@@ -1869,7 +1869,7 @@
   {
     "appName": "Resources for schools",
     "entryName": "sco",
-    "rootUrl": "/school-administrators/",
+    "rootUrl": "/school-administrators",
     "productId": "40938a35-1cfa-4808-917b-37e0baec6a7c",
     "template": {
       "vagovprod": true,

From ff45001799de019d34a677eae9e93ad903e16586 Mon Sep 17 00:00:00 2001
From: GovCIOLiz <elizabeth.wendling@va.gov>
Date: Fri, 30 Aug 2024 07:12:45 -0700
Subject: [PATCH 3/9] Making separate PR

---
 src/applications/registry.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/registry.json b/src/applications/registry.json
index d8cdbcf516..067d23bc5d 100644
--- a/src/applications/registry.json
+++ b/src/applications/registry.json
@@ -1872,7 +1872,7 @@
     "rootUrl": "/school-administrators",
     "productId": "40938a35-1cfa-4808-917b-37e0baec6a7c",
     "template": {
-      "vagovprod": true,
+      "vagovprod": false,
       "layout": "page-react.html"
     }
   },

From 2a5be803781622e34e13ffee986491e06509a6bc Mon Sep 17 00:00:00 2001
From: Andrew Steele <andrew.steele@adhocteam.us>
Date: Wed, 21 Aug 2024 11:56:53 -0400
Subject: [PATCH 4/9] Fix to breadcrumb padding on certain drupal pages.
 (#2241)

* Fix to breadcrumb padding on certain drupal pages.

* Adding row back

* Removing another un-needed class

* Adding padding to containing div
---
 src/site/includes/breadcrumbs.drupal.liquid | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/site/includes/breadcrumbs.drupal.liquid b/src/site/includes/breadcrumbs.drupal.liquid
index 22133e66e1..56c7d429d0 100644
--- a/src/site/includes/breadcrumbs.drupal.liquid
+++ b/src/site/includes/breadcrumbs.drupal.liquid
@@ -1,4 +1,4 @@
-<div class="va-nav-breadcrumbs" data-template="includes/breadcrumbs">
+<div class="vads-u-padding-x--1p5" data-template="includes/breadcrumbs">
   {% assign crumbs = entityUrl.breadcrumb %}
 
   {% if deriveBreadcrumbsFromUrl == true %}
@@ -11,7 +11,7 @@
 
   {% assign crumbs = crumbs | formatForBreadcrumbs: title, entityUrl.path, hideHomeBreadcrumb, customHomeCrumbText  %}
 
-  <va-breadcrumbs class="row va-nav-breadcrumbs-list columns" wrapping />
+  <va-breadcrumbs class="row" wrapping />
 
   <script>
     const bcComponent = document.querySelector('va-breadcrumbs');

From 60b39e38beaba4b6ecac5bb1deb9d6df1d7d29d7 Mon Sep 17 00:00:00 2001
From: Kevin Duensing <kjduensing@gmail.com>
Date: Fri, 23 Aug 2024 09:59:47 -0400
Subject: [PATCH 5/9] Turn on production flag for rollout (#2246)

---
 src/applications/registry.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/applications/registry.json b/src/applications/registry.json
index 067d23bc5d..7205d47f07 100644
--- a/src/applications/registry.json
+++ b/src/applications/registry.json
@@ -1724,7 +1724,7 @@
     "rootUrl": "/my-health/travel-claim-status",
     "productId": "1e585463-5625-4868-b5f5-58ee0490ea28",
     "template": {
-      "vagovprod": false,
+      "vagovprod": true,
       "layout": "page-react.html"
     }
   },

From a2f8ebb52bac4fc5d0da7f1a059ea1ca9e2ea1aa Mon Sep 17 00:00:00 2001
From: Micah Chiang <micahkchiang@gmail.com>
Date: Tue, 27 Aug 2024 12:04:04 -0700
Subject: [PATCH 6/9] update web-components (#2249)

* update web-components

Signed-off-by: Micah Chiang <micahkchiang@gmail.com>

* bump version

Signed-off-by: Micah Chiang <micahkchiang@gmail.com>

---------

Signed-off-by: Micah Chiang <micahkchiang@gmail.com>
---
 package.json |  2 +-
 yarn.lock    | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 1bdfff7728..0c9a0eb268 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@babel/preset-react": "^7.23.3",
     "@babel/register": "^7.23.7",
     "@department-of-veterans-affairs/eslint-plugin": "^1.1.0",
-    "@department-of-veterans-affairs/web-components": "^11.2.5",
+    "@department-of-veterans-affairs/web-components": "^14.0.1",
     "@octokit/rest": "^18.10.0",
     "@sentry/browser": "^6.13.1",
     "@testing-library/cypress": "^8.0.3",
diff --git a/yarn.lock b/yarn.lock
index b31f66e649..9a1bec8bd4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1339,13 +1339,13 @@
   dependencies:
     minimist "^1.2.6"
 
-"@department-of-veterans-affairs/web-components@^11.2.5":
-  version "11.2.9"
-  resolved "https://registry.yarnpkg.com/@department-of-veterans-affairs/web-components/-/web-components-11.2.9.tgz#10f4ec73f5d177c1864a116386334748c2e39bcb"
-  integrity sha512-Kl7zCoxuheC/EYdM0D3N2X4cC7Kjd1eq6ZaX525BAiRJlxKhIpqhZzJfbXkQw0SrX8voLrA0Ab74KFcZjgRV3A==
+"@department-of-veterans-affairs/web-components@^14.0.1":
+  version "14.0.1"
+  resolved "https://registry.npmjs.org/@department-of-veterans-affairs/web-components/-/web-components-14.0.1.tgz#5f44c9f2ebf972588c340a41ec5d32cb20ea8dde"
+  integrity sha512-tNMjI9e36dfEt6PwDXss5NbIG2jhdFq4TqnMDUFC3eM9P53TKzAXPqftYV6R4S4YMebDWBqNgM5Y5f1AsmIFaw==
   dependencies:
     "@department-of-veterans-affairs/css-library" "^0.8.1"
-    "@stencil/core" "^2.19.2"
+    "@stencil/core" "^3.2.1"
     aria-hidden "^1.1.3"
     body-scroll-lock "^4.0.0-beta.0"
     chromatic "^11.0.4"
@@ -1773,10 +1773,10 @@
   resolved "https://registry.yarnpkg.com/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz#8da5c6530915653f3a1f38fd5f101d8c3f8079c5"
   integrity sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==
 
-"@stencil/core@^2.19.2":
-  version "2.22.3"
-  resolved "https://registry.npmjs.org/@stencil/core/-/core-2.22.3.tgz#83987e20bba855c450f6d6780e3a20192603f13f"
-  integrity sha512-kmVA0M/HojwsfkeHsifvHVIYe4l5tin7J5+DLgtl8h6WWfiMClND5K3ifCXXI2ETDNKiEk21p6jql3Fx9o2rng==
+"@stencil/core@^3.2.1":
+  version "3.4.2"
+  resolved "https://registry.npmjs.org/@stencil/core/-/core-3.4.2.tgz#57ce7f71fe18c2ec0967821bec667fc453cca962"
+  integrity sha512-FAUhUVaakCy29nU2GwO/HQBRV1ihPRvncz3PUc8oR+UJLAxGabTmP8PLY7wvHfbw+Cvi4VXfJFTBvdfDu6iKPQ==
 
 "@testing-library/cypress@^8.0.3":
   version "8.0.3"

From df637543047f16bf383be32bfc0f4c14c3546bcf Mon Sep 17 00:00:00 2001
From: Aubrey Arcangel <aubreyarcangel@users.noreply.github.com>
Date: Wed, 28 Aug 2024 09:55:01 -0400
Subject: [PATCH 7/9] Medallia - Add feedback button to checklist page layout
 (#2247)

* added feedback button to checklist drupal template

* moved element to under back-to-top element
---
 src/site/layouts/checklist.drupal.liquid | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/site/layouts/checklist.drupal.liquid b/src/site/layouts/checklist.drupal.liquid
index aa43c827ac..ed11c8d57c 100644
--- a/src/site/layouts/checklist.drupal.liquid
+++ b/src/site/layouts/checklist.drupal.liquid
@@ -96,12 +96,11 @@
       <div class="usa-width-three-fourths">
         <div class="usa-content">
           <va-back-to-top></va-back-to-top>
+      <!-- Last updated & feedback button-->
+          {% include "src/site/includes/above-footer-elements.drupal.liquid" %}
         </div>
       </div>
     </div>
-
-    <!-- Last updated -->
-    {% include "src/site/includes/last-updated.drupal.liquid" %}
   </main>
 </div>
 

From fa603abf6f26edb141fbb187a18ee99a5ec04b72 Mon Sep 17 00:00:00 2001
From: Eli Selkin <eli.selkin@agile6.com>
Date: Wed, 28 Aug 2024 08:28:33 -0700
Subject: [PATCH 8/9] VACMS 18909 KISS autosuggest data for services from
 taxonomies (#2248)

* creates va-healthcare-services.json
* remove spaces from JSONs
* process the processed HTML to text
* simplify
---
 .../build/drupal/static-data-files/config.js  |  12 ++
 .../drupal/static-data-files/generate.js      |   4 +-
 .../vaHealthcareServices/index.js             | 106 ++++++++++++++++++
 .../static-files-exist.cypress.spec.js        |  17 +++
 4 files changed, 136 insertions(+), 3 deletions(-)
 create mode 100644 src/site/stages/build/drupal/static-data-files/vaHealthcareServices/index.js

diff --git a/src/site/stages/build/drupal/static-data-files/config.js b/src/site/stages/build/drupal/static-data-files/config.js
index 113f927a54..07dfec0733 100644
--- a/src/site/stages/build/drupal/static-data-files/config.js
+++ b/src/site/stages/build/drupal/static-data-files/config.js
@@ -3,6 +3,11 @@ const {
   postProcess: postProcessVamcEhrSystem,
 } = require('./vamcEhrSystem');
 
+const {
+  query: queryVaHealthcareServices,
+  postProcess: postProcessVaHealthcareServices,
+} = require('./vaHealthcareServices');
+
 const {
   query: queryVamcFacilitySupplementalStatus,
   postProcess: postProcessVamcFacilitySupplementalStatus,
@@ -37,6 +42,13 @@ const DATA_FILES = [
     queryType: 'graphql',
     postProcess: postProcessVamcEhrSystem,
   },
+  {
+    description: 'VA Healthcare Services',
+    filename: 'va-healthcare-services.json',
+    query: queryVaHealthcareServices,
+    queryType: 'graphql',
+    postProcess: postProcessVaHealthcareServices,
+  },
   {
     description: 'VAMC Facility Supplemental Status',
     filename: 'vamc-facility-supplemental-status.json',
diff --git a/src/site/stages/build/drupal/static-data-files/generate.js b/src/site/stages/build/drupal/static-data-files/generate.js
index e0d651e59d..e23821d250 100644
--- a/src/site/stages/build/drupal/static-data-files/generate.js
+++ b/src/site/stages/build/drupal/static-data-files/generate.js
@@ -68,9 +68,7 @@ const writeProcessedDataFilesToBuild = (
 
 const writeProcessedDataFileToCache = async (path, filename, data) => {
   const filenameWithPath = `${path}/${filename}`;
-  fs.outputJSON(filenameWithPath, data, {
-    spaces: 2,
-  });
+  fs.outputJSON(filenameWithPath, data);
 };
 
 const writeProcessedDataFilesToCache = (
diff --git a/src/site/stages/build/drupal/static-data-files/vaHealthcareServices/index.js b/src/site/stages/build/drupal/static-data-files/vaHealthcareServices/index.js
new file mode 100644
index 0000000000..5e046b3561
--- /dev/null
+++ b/src/site/stages/build/drupal/static-data-files/vaHealthcareServices/index.js
@@ -0,0 +1,106 @@
+const { JSDOM } = require('jsdom');
+
+const query = `
+query {
+  taxonomyTermQuery(
+    offset: 0
+    filter: {conditions: [{field: "vid", value: ["health_care_service_taxonomy"]}, {field: "status", value: ["1"]}]}
+    limit: 1000
+  ) {
+    count
+    entities {
+      ... on TaxonomyTermHealthCareServiceTaxonomy {
+        name
+        fieldAlsoKnownAs
+        fieldCommonlyTreatedCondition
+        fieldHealthServiceApiId
+        fieldServiceTypeOfCare
+        fieldShowForVetCenters
+        fieldShowForVbaFacilities
+        fieldShowForVamcFacilities
+        fieldTricareSpecificService
+        description {
+          processed
+        }
+        fieldTricareDescription
+        reverseFieldServiceNameAndDescriptiNode {
+          count
+        }
+      }
+    }
+  }
+}
+`;
+
+function decodeEntities(str) {
+  // this prevents any overhead from creating the object each time
+  const dom = new JSDOM(`<!DOCTYPE html><body>${str}</body>`);
+  return dom.window.document.body.textContent || '';
+}
+
+const postProcess = queryResult => {
+  // [{
+  //   name: 'name',
+  //   fieldAlsoKnownAs: 'aka',
+  //   fieldCommonlyTreatedCondition: 'commonconditions',
+  //   fieldHealthServiceApiId: 'fieldHealthServiceApiId',
+  //   fieldServiceTypeOfCare: 'typeOfCare',
+  //   fieldShowForVetCenters: true,
+  //   fieldShowForVbaFacilities: true,
+  //   fieldShowForVamcFacilities: false,
+  //   fieldTricareSpecificService: false,
+  //   reverseFieldServiceNameAndDescriptiNode: { count: 0 },
+  //   description: 'description',
+  //   fieldTricareDescription: 'fieldTricareDescription'
+  // }]
+  // GraphQL query filter is pretty bad, so we'll do the filtering here (can't do a successful nested OR on the show for VetCenter,VAMC,VBA fields - it returns 3 elements)
+  // 1. Filter out services that are false for fieldShowForVetCenters, fieldShowForVbaFacilities, and fieldShowForVamcFacilities
+  // 2. Sort by frequency of use (revereFieldServiceNameAndDescriptiNode.count)
+  // 3. Convert to an array of arrays of ["name", "aka", "commonconditions", "fieldHealthServiceApiId", "typeOfCare", true, false, true, false, count]
+  const taxonomies = queryResult.data.taxonomyTermQuery.entities
+    .filter(
+      service =>
+        (service.fieldShowForVetCenters ||
+          service.fieldShowForVbaFacilities ||
+          service.fieldShowForVamcFacilities) &&
+        service.reverseFieldServiceNameAndDescriptiNode?.count,
+    )
+    .map(service => {
+      const {
+        name,
+        fieldAlsoKnownAs,
+        fieldCommonlyTreatedCondition,
+        fieldHealthServiceApiId,
+        fieldServiceTypeOfCare,
+        fieldShowForVetCenters,
+        fieldShowForVbaFacilities,
+        fieldShowForVamcFacilities,
+        fieldTricareSpecificService,
+        reverseFieldServiceNameAndDescriptiNode,
+        description,
+        fieldTricareDescription,
+      } = service;
+      return [
+        name,
+        fieldAlsoKnownAs,
+        fieldCommonlyTreatedCondition,
+        fieldHealthServiceApiId,
+        fieldServiceTypeOfCare,
+        fieldShowForVetCenters,
+        fieldShowForVbaFacilities,
+        fieldShowForVamcFacilities,
+        fieldTricareSpecificService,
+        reverseFieldServiceNameAndDescriptiNode.count, // i=9
+        decodeEntities(description?.processed || ''),
+        decodeEntities(fieldTricareDescription || ''),
+      ];
+    });
+  // descending sort by frequency of use
+  taxonomies.sort((a, b) => b[9] - a[9]);
+  return taxonomies;
+};
+
+module.exports = {
+  query,
+  postProcess,
+};
diff --git a/src/site/tests/static-files/static-files-exist.cypress.spec.js b/src/site/tests/static-files/static-files-exist.cypress.spec.js
index f1696ae535..6f0e0ace2d 100644
--- a/src/site/tests/static-files/static-files-exist.cypress.spec.js
+++ b/src/site/tests/static-files/static-files-exist.cypress.spec.js
@@ -35,7 +35,9 @@ describe('Static Data Files Test', () => {
     cy.readFile('cypress/downloads/vamc-system.json').should('exist');
   });
   it('has the VAMC Police JSON static file', () => {
+    // relative to current working directory
     cy.deleteFileOrDir('../cypress/downloads/vamc-police.json');
+    // relative to the cy task
     cy.fileOrDirExists('cypress/downloads/vamc-police.json').should(
       'eq',
       false,
@@ -47,4 +49,19 @@ describe('Static Data Files Test', () => {
     );
     cy.readFile('cypress/downloads/vamc-police.json').should('exist');
   });
+  it('has the VA Healthcare Services JSON static file', () => {
+    cy.deleteFileOrDir('../cypress/downloads/va-healthcare-services.json');
+    cy.fileOrDirExists('cypress/downloads/va-healthcare-services.json').should(
+      'eq',
+      false,
+    );
+    cy.downloadFile(
+      'http://localhost:3002/data/cms/va-healthcare-services.json',
+      '../cypress/downloads',
+      'va-healthcare-services.json',
+    );
+    cy.readFile('cypress/downloads/va-healthcare-services.json').should(
+      'exist',
+    );
+  });
 });

From ca18be1ade235ca9c4aa5f89c19a016077901c9c Mon Sep 17 00:00:00 2001
From: Micah Chiang <micahkchiang@gmail.com>
Date: Thu, 29 Aug 2024 10:20:15 -0700
Subject: [PATCH 9/9] bump web components (#2250)

Signed-off-by: Micah Chiang <micahkchiang@gmail.com>
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 0c9a0eb268..ed9c5ec8c7 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
     "@babel/preset-react": "^7.23.3",
     "@babel/register": "^7.23.7",
     "@department-of-veterans-affairs/eslint-plugin": "^1.1.0",
-    "@department-of-veterans-affairs/web-components": "^14.0.1",
+    "@department-of-veterans-affairs/web-components": "^14.0.2",
     "@octokit/rest": "^18.10.0",
     "@sentry/browser": "^6.13.1",
     "@testing-library/cypress": "^8.0.3",
diff --git a/yarn.lock b/yarn.lock
index 9a1bec8bd4..3ada8b0c15 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1339,10 +1339,10 @@
   dependencies:
     minimist "^1.2.6"
 
-"@department-of-veterans-affairs/web-components@^14.0.1":
-  version "14.0.1"
-  resolved "https://registry.npmjs.org/@department-of-veterans-affairs/web-components/-/web-components-14.0.1.tgz#5f44c9f2ebf972588c340a41ec5d32cb20ea8dde"
-  integrity sha512-tNMjI9e36dfEt6PwDXss5NbIG2jhdFq4TqnMDUFC3eM9P53TKzAXPqftYV6R4S4YMebDWBqNgM5Y5f1AsmIFaw==
+"@department-of-veterans-affairs/web-components@^14.0.2":
+  version "14.0.2"
+  resolved "https://registry.npmjs.org/@department-of-veterans-affairs/web-components/-/web-components-14.0.2.tgz#c999204c8b51042529146871eb6b3d3e75a2f279"
+  integrity sha512-Ik3/4Zlh2d6e58d6BCuSETvci+ksWJpNuIo3/9UreRd8otJi27j8Rx9YQPw7SM9tWrI2WeIHkNWDu/caCANQOw==
   dependencies:
     "@department-of-veterans-affairs/css-library" "^0.8.1"
     "@stencil/core" "^3.2.1"