From b2165c013ee4d80a121c6aa18783ab620c08b6d1 Mon Sep 17 00:00:00 2001
From: "stella.ubaha@boston.gov" <stella.ubaha@boston.gov>
Date: Thu, 11 Apr 2024 09:21:11 -0400
Subject: [PATCH 01/14] DIG-4158 Make department contact field required in
 'article' and 'how-to' pages; display optional

---
 .../templates/node--article.html.twig         | 10 ++++---
 .../themes/custom/bos_admin/css/bos_admin.css | 30 +++++++++++++++++++
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig b/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
index a61733c0f4..198c0f19c2 100644
--- a/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
+++ b/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
@@ -60,10 +60,12 @@
         <div id="desktop-sidebar" class="column g--4">
           <ul class="sb">
             {% if content.field_contact["#items"] %}
-            <li class="sb-i">
-                <div>Still have questions? Contact:</div>
-                  {{ content.field_contact }}
-            </li>
+              {% if content.field_hide_contact_form[value] != 1 %}
+              <li class="sb-i">
+                  <div>Still have questions? Contact:</div>
+                    {{ content.field_contact }}
+              </li>
+              {%  endif %}
             {%  endif %}
             {% if (content.field_sidebar_components) %}
                 {{ content.field_sidebar_components }}
diff --git a/docroot/themes/custom/bos_admin/css/bos_admin.css b/docroot/themes/custom/bos_admin/css/bos_admin.css
index 6b0996463a..f9f6f29096 100644
--- a/docroot/themes/custom/bos_admin/css/bos_admin.css
+++ b/docroot/themes/custom/bos_admin/css/bos_admin.css
@@ -1547,3 +1547,33 @@ D9: Aligns drag handles to the top of the content region (mimic d8 behaviour)
 td.field-multiple-drag {
   vertical-align: top !important;
 }
+
+/*
+Stella
+Hide default contact info
+ */
+.field-group-html-element {
+  display: block;
+  width: 100%;
+  position: relative;
+}
+.field-group-html-element .field--name-field-contact {
+  display: inline-block;
+  width: 50%;
+}
+.field-group-html-element .field--name-field-hide-contact-form {
+  display: inline-block;
+  width: 48%;
+  vertical-align: sub;
+}
+@media screen and (max-width: 1300px) {
+  .field-group-html-element .field--name-field-contact {
+    display: block;
+    width: 100%;
+  }
+  .field-group-html-element .field--name-field-hide-contact-form {
+    display: block;
+    width:100%;
+    vertical-align: auto;
+  }
+}

From dddda4ff78baa563b48e059f7507652a3a9b7cbd Mon Sep 17 00:00:00 2001
From: "stella.ubaha@boston.gov" <stella.ubaha@boston.gov>
Date: Thu, 11 Apr 2024 09:57:54 -0400
Subject: [PATCH 02/14] DIG-4282 Review and confirm text for blue theming of
 components

---
 .../bos_components/css/component-theme.css    | 26 ++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/docroot/modules/custom/bos_components/css/component-theme.css b/docroot/modules/custom/bos_components/css/component-theme.css
index 8f2d328d0c..5ce4bf1d77 100644
--- a/docroot/modules/custom/bos_components/css/component-theme.css
+++ b/docroot/modules/custom/bos_components/css/component-theme.css
@@ -412,6 +412,12 @@
   border: 1px solid #ffffff;
 }
 
+.b--b .item-link.n--a .n--a-title {
+  color: #1871bd;
+}
+.b--b .item-link.n--a:hover .n--a-title {
+  color: #ffffff;
+}
 /* ##  News/Announcements styles - END ## */
 
 
@@ -576,7 +582,7 @@ article .paragraphs-item-3-column-w-image.b--w ul li {
 /* ## Drawer theme styles - START ## */
 /* ### Grey theme - Grey is the default, do not do anything ### */
 
-/* ### Blue theme ### */
+/* ### Blue theme ### .b--b h3 */
 .paragraphs-item-drawers.b--b .b--g {
   background-color: #091f2f;
 }
@@ -651,6 +657,24 @@ article .paragraphs-item-3-column-w-image.b--w ul li {
 /* ## Drawer then styles - END ## */
 /*# Styles for Component Themes (Blue, White, Grey) - END #*/
 
+/* ## Programs Initiatives theme styles - START ## */
+/* ### Grey theme - Grey is the default, do not do anything ### */
+
+/* ### Blue theme ### .b--b h3 */
+
+.b--b .cd-t {
+  color: #1871bd;
+}
+.b--b .cd-t:hover {
+  color: #ffffff;
+}
+
+/* ### White theme ### */
+
+
+/* ## Programs Initiatives then styles - END ## */
+/*# Styles for Component Themes (Blue, White, Grey) - END #*/
+
 
 /* ToDo global changes for theme component stella */
 

From bfc44bf952ae424181b468fe49e1bb957ef401d1 Mon Sep 17 00:00:00 2001
From: "stella.ubaha@boston.gov" <stella.ubaha@boston.gov>
Date: Thu, 11 Apr 2024 15:58:11 -0400
Subject: [PATCH 03/14] DIG-4282 Review and confirm text for blue theming of
 components

---
 ...tity_form_display.node.article.default.yml | 56 +++++++++++++-----
 ...ntity_form_display.node.how_to.default.yml | 57 ++++++++++++++-----
 ...tity_view_display.node.article.article.yml |  2 +
 ..._display.node.article.calendar_listing.yml |  2 +
 ...tity_view_display.node.article.contact.yml |  2 +
 ...tity_view_display.node.article.default.yml | 11 ++++
 ...isplay.node.article.department_listing.yml |  2 +
 ...iew_display.node.article.featured_item.yml |  2 +
 ...w_display.node.article.featured_topics.yml |  2 +
 ...view_display.node.article.listing_long.yml |  2 +
 ...ty_view_display.node.article.poll_stub.yml |  2 +
 ...y_view_display.node.article.popup_icon.yml |  2 +
 ...view_display.node.article.published_by.yml |  2 +
 ...e.entity_view_display.node.article.rss.yml |  2 +
 ...ntity_view_display.node.article.teaser.yml |  2 +
 ..._view_display.node.article.topics_list.yml |  2 +
 ...ntity_view_display.node.how_to.article.yml |  2 +
 ...w_display.node.how_to.calendar_listing.yml |  2 +
 ...ntity_view_display.node.how_to.contact.yml |  2 +
 ...ntity_view_display.node.how_to.default.yml | 11 ++++
 ...display.node.how_to.department_listing.yml |  2 +
 ...view_display.node.how_to.featured_item.yml |  2 +
 ...ew_display.node.how_to.featured_topics.yml |  2 +
 ...ntity_view_display.node.how_to.listing.yml |  2 +
 ..._view_display.node.how_to.listing_long.yml |  2 +
 ...ity_view_display.node.how_to.poll_stub.yml |  2 +
 ...ty_view_display.node.how_to.popup_icon.yml |  2 +
 ..._view_display.node.how_to.published_by.yml |  2 +
 ...entity_view_display.node.how_to.teaser.yml |  2 +
 ...field.field.node.article.field_contact.yml |  7 +--
 ...d.node.article.field_hide_contact_form.yml | 28 +++++++++
 .../field.field.node.how_to.field_contact.yml |  7 +--
 ...ld.node.how_to.field_hide_contact_form.yml | 23 ++++++++
 .../templates/node--article.html.twig         |  6 +-
 .../templates/node--how-to.html.twig          |  8 ++-
 35 files changed, 223 insertions(+), 41 deletions(-)
 create mode 100644 config/default/field.field.node.article.field_hide_contact_form.yml
 create mode 100644 config/default/field.field.node.how_to.field_hide_contact_form.yml

diff --git a/config/default/core.entity_form_display.node.article.default.yml b/config/default/core.entity_form_display.node.article.default.yml
index 4c8944031b..eff23d9ea1 100644
--- a/config/default/core.entity_form_display.node.article.default.yml
+++ b/config/default/core.entity_form_display.node.article.default.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -44,7 +45,7 @@ third_party_settings:
         direction: vertical
     group_basic_info:
       children:
-        - field_contact
+        - group_contact
         - title
         - field_intro_text
         - body
@@ -67,7 +68,7 @@ third_party_settings:
       label: 'Page Metadata'
       region: content
       parent_name: group_article
-      weight: 4
+      weight: 5
       format_type: tab
       format_settings:
         classes: 'group-page-metadata field-group-tab'
@@ -109,7 +110,7 @@ third_party_settings:
       label: Feeds
       region: content
       parent_name: group_article
-      weight: 5
+      weight: 6
       format_type: tab
       format_settings:
         classes: ''
@@ -117,6 +118,27 @@ third_party_settings:
         formatter: closed
         description: ''
         required_fields: true
+    group_contact:
+      children:
+        - field_contact
+        - field_hide_contact_form
+      label: 'Default Contact'
+      region: content
+      parent_name: group_basic_info
+      weight: 17
+      format_type: html_element
+      format_settings:
+        classes: ''
+        show_empty_fields: true
+        id: ''
+        element: div
+        show_label: false
+        label_element: h3
+        label_element_classes: ''
+        attributes: ''
+        effect: none
+        speed: fast
+        required_fields: true
 _core:
   default_config_hash: zo4zPPW7rLh-Mn2dazb-Y4GMa2nJ5_gkocuTPejLMtA
 id: node.article.default
@@ -126,7 +148,7 @@ mode: default
 content:
   body:
     type: text_textarea_with_summary
-    weight: 7
+    weight: 20
     region: content
     settings:
       rows: 9
@@ -142,7 +164,7 @@ content:
     third_party_settings: {  }
   field_components:
     type: paragraphs
-    weight: 13
+    weight: 7
     region: content
     settings:
       title: 'Article Component'
@@ -161,7 +183,7 @@ content:
     third_party_settings: {  }
   field_contact:
     type: entity_reference_autocomplete
-    weight: 4
+    weight: 10
     region: content
     settings:
       match_operator: CONTAINS
@@ -171,7 +193,7 @@ content:
     third_party_settings: {  }
   field_content_feeds:
     type: entity_reference_autocomplete_tags
-    weight: 1
+    weight: 7
     region: content
     settings:
       match_operator: CONTAINS
@@ -179,9 +201,16 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_hide_contact_form:
+    type: boolean_checkbox
+    weight: 11
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   field_intro_text:
     type: text_textarea
-    weight: 6
+    weight: 19
     region: content
     settings:
       rows: 5
@@ -189,7 +218,7 @@ content:
     third_party_settings: {  }
   field_manual_date:
     type: boolean_checkbox
-    weight: 2
+    weight: 7
     region: content
     settings:
       display_label: true
@@ -200,16 +229,17 @@ content:
     region: content
     settings:
       sidebar: true
+      use_details: true
     third_party_settings: {  }
   field_published_date:
     type: datetime_default
-    weight: 4
+    weight: 10
     region: content
     settings: {  }
     third_party_settings: {  }
   field_sidebar_components:
     type: paragraphs
-    weight: 9
+    weight: 2
     region: content
     settings:
       title: 'Sidebar Component'
@@ -228,7 +258,7 @@ content:
     third_party_settings: {  }
   field_updated_date:
     type: datetime_default
-    weight: 3
+    weight: 9
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -280,7 +310,7 @@ content:
     third_party_settings: {  }
   title:
     type: string_textfield
-    weight: 5
+    weight: 18
     region: content
     settings:
       size: 60
diff --git a/config/default/core.entity_form_display.node.how_to.default.yml b/config/default/core.entity_form_display.node.how_to.default.yml
index 081f496141..197511ea56 100644
--- a/config/default/core.entity_form_display.node.how_to.default.yml
+++ b/config/default/core.entity_form_display.node.how_to.default.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -83,7 +84,7 @@ third_party_settings:
         - field_need_to_know
         - field_payment_info
         - field_links
-        - field_contact
+        - group_group_contact
       label: 'Sidebar Info'
       region: content
       parent_name: group_how_to
@@ -131,7 +132,7 @@ third_party_settings:
       label: Components
       region: content
       parent_name: group_how_to
-      weight: 6
+      weight: 7
       format_type: tab
       format_settings:
         classes: ''
@@ -139,6 +140,27 @@ third_party_settings:
         formatter: closed
         description: ''
         required_fields: true
+    group_group_contact:
+      children:
+        - field_contact
+        - field_hide_contact_form
+      label: 'Group Contact'
+      region: content
+      parent_name: group_sidebar_info
+      weight: 3
+      format_type: html_element
+      format_settings:
+        classes: ''
+        show_empty_fields: false
+        id: ''
+        element: div
+        show_label: false
+        label_element: h3
+        label_element_classes: ''
+        attributes: ''
+        effect: none
+        speed: fast
+        required_fields: true
 _core:
   default_config_hash: a4N_emjrrSKpL9PeGPBK_yH_9kGK-qurKvlH6h0f0_o
 id: node.how_to.default
@@ -158,7 +180,7 @@ content:
     third_party_settings: {  }
   created:
     type: datetime_timestamp
-    weight: 3
+    weight: 4
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -183,7 +205,7 @@ content:
     third_party_settings: {  }
   field_contact:
     type: entity_reference_autocomplete
-    weight: 3
+    weight: 4
     region: content
     settings:
       match_operator: CONTAINS
@@ -191,6 +213,13 @@ content:
       size: 60
       placeholder: ''
     third_party_settings: {  }
+  field_hide_contact_form:
+    type: boolean_checkbox
+    weight: 5
+    region: content
+    settings:
+      display_label: true
+    third_party_settings: {  }
   field_how_to_tabs:
     type: paragraphs
     weight: 0
@@ -246,16 +275,18 @@ content:
     third_party_settings: {  }
   field_manual_date:
     type: boolean_checkbox
-    weight: 0
+    weight: 2
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   field_metatags:
     type: metatag_firehose
-    weight: 26
+    weight: 12
     region: content
-    settings: {  }
+    settings:
+      sidebar: true
+      use_details: true
     third_party_settings: {  }
   field_need_to_know:
     type: text_textarea
@@ -275,7 +306,7 @@ content:
     third_party_settings: {  }
   field_published_date:
     type: datetime_default
-    weight: 1
+    weight: 4
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -300,7 +331,7 @@ content:
     third_party_settings: {  }
   field_updated_date:
     type: datetime_default
-    weight: 2
+    weight: 5
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -325,14 +356,14 @@ content:
     third_party_settings: {  }
   promote:
     type: boolean_checkbox
-    weight: 5
+    weight: 6
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   published_at:
     type: publication_date_timestamp
-    weight: 4
+    weight: 5
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -345,7 +376,7 @@ content:
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
-    weight: 6
+    weight: 7
     region: content
     settings:
       display_label: true
@@ -360,7 +391,7 @@ content:
     third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
-    weight: 2
+    weight: 3
     region: content
     settings:
       match_operator: CONTAINS
diff --git a/config/default/core.entity_view_display.node.article.article.yml b/config/default/core.entity_view_display.node.article.article.yml
index 14673210a5..d52dd9ed10 100644
--- a/config/default/core.entity_view_display.node.article.article.yml
+++ b/config/default/core.entity_view_display.node.article.article.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.calendar_listing.yml b/config/default/core.entity_view_display.node.article.calendar_listing.yml
index 17c3c39c1c..b975857c44 100644
--- a/config/default/core.entity_view_display.node.article.calendar_listing.yml
+++ b/config/default/core.entity_view_display.node.article.calendar_listing.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.contact.yml b/config/default/core.entity_view_display.node.article.contact.yml
index 4d9c4a8f8f..c6c9569ae4 100644
--- a/config/default/core.entity_view_display.node.article.contact.yml
+++ b/config/default/core.entity_view_display.node.article.contact.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.default.yml b/config/default/core.entity_view_display.node.article.default.yml
index 8a29367228..9c6fa61728 100644
--- a/config/default/core.entity_view_display.node.article.default.yml
+++ b/config/default/core.entity_view_display.node.article.default.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -65,6 +66,16 @@ content:
         fences_label_classes: ''
     weight: 3
     region: content
+  field_hide_contact_form:
+    type: boolean
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 15
+    region: content
   field_intro_text:
     type: text_default
     label: above
diff --git a/config/default/core.entity_view_display.node.article.department_listing.yml b/config/default/core.entity_view_display.node.article.department_listing.yml
index 6a72dea9a5..5b2d530bec 100644
--- a/config/default/core.entity_view_display.node.article.department_listing.yml
+++ b/config/default/core.entity_view_display.node.article.department_listing.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.featured_item.yml b/config/default/core.entity_view_display.node.article.featured_item.yml
index 274d6b6375..fa489756ba 100644
--- a/config/default/core.entity_view_display.node.article.featured_item.yml
+++ b/config/default/core.entity_view_display.node.article.featured_item.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.featured_topics.yml b/config/default/core.entity_view_display.node.article.featured_topics.yml
index 4484602a61..98685aa9d1 100644
--- a/config/default/core.entity_view_display.node.article.featured_topics.yml
+++ b/config/default/core.entity_view_display.node.article.featured_topics.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.listing_long.yml b/config/default/core.entity_view_display.node.article.listing_long.yml
index 80e8709290..903003bd5e 100644
--- a/config/default/core.entity_view_display.node.article.listing_long.yml
+++ b/config/default/core.entity_view_display.node.article.listing_long.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.poll_stub.yml b/config/default/core.entity_view_display.node.article.poll_stub.yml
index cce17dc18a..3c0ce761cb 100644
--- a/config/default/core.entity_view_display.node.article.poll_stub.yml
+++ b/config/default/core.entity_view_display.node.article.poll_stub.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.popup_icon.yml b/config/default/core.entity_view_display.node.article.popup_icon.yml
index f36486dd6a..026036d945 100644
--- a/config/default/core.entity_view_display.node.article.popup_icon.yml
+++ b/config/default/core.entity_view_display.node.article.popup_icon.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.published_by.yml b/config/default/core.entity_view_display.node.article.published_by.yml
index 303797fbf6..b4e4964fe0 100644
--- a/config/default/core.entity_view_display.node.article.published_by.yml
+++ b/config/default/core.entity_view_display.node.article.published_by.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.rss.yml b/config/default/core.entity_view_display.node.article.rss.yml
index 89baf97c37..0503b6b258 100644
--- a/config/default/core.entity_view_display.node.article.rss.yml
+++ b/config/default/core.entity_view_display.node.article.rss.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.teaser.yml b/config/default/core.entity_view_display.node.article.teaser.yml
index 4a4c3c1f00..50580b7adb 100644
--- a/config/default/core.entity_view_display.node.article.teaser.yml
+++ b/config/default/core.entity_view_display.node.article.teaser.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -45,6 +46,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.article.topics_list.yml b/config/default/core.entity_view_display.node.article.topics_list.yml
index ef37f5e54c..8f2c438cfc 100644
--- a/config/default/core.entity_view_display.node.article.topics_list.yml
+++ b/config/default/core.entity_view_display.node.article.topics_list.yml
@@ -8,6 +8,7 @@ dependencies:
     - field.field.node.article.field_components
     - field.field.node.article.field_contact
     - field.field.node.article.field_content_feeds
+    - field.field.node.article.field_hide_contact_form
     - field.field.node.article.field_intro_text
     - field.field.node.article.field_manual_date
     - field.field.node.article.field_metatags
@@ -37,6 +38,7 @@ hidden:
   field_components: true
   field_contact: true
   field_content_feeds: true
+  field_hide_contact_form: true
   field_intro_text: true
   field_manual_date: true
   field_metatags: true
diff --git a/config/default/core.entity_view_display.node.how_to.article.yml b/config/default/core.entity_view_display.node.how_to.article.yml
index b3f50aee50..94430c011f 100644
--- a/config/default/core.entity_view_display.node.how_to.article.yml
+++ b/config/default/core.entity_view_display.node.how_to.article.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -39,6 +40,7 @@ hidden:
   body: true
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/core.entity_view_display.node.how_to.calendar_listing.yml b/config/default/core.entity_view_display.node.how_to.calendar_listing.yml
index c01f6ece5b..1a2f51f8e2 100644
--- a/config/default/core.entity_view_display.node.how_to.calendar_listing.yml
+++ b/config/default/core.entity_view_display.node.how_to.calendar_listing.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -40,6 +41,7 @@ hidden:
   comment_node_how_to: true
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/core.entity_view_display.node.how_to.contact.yml b/config/default/core.entity_view_display.node.how_to.contact.yml
index 0ea1c5511f..2d7a350223 100644
--- a/config/default/core.entity_view_display.node.how_to.contact.yml
+++ b/config/default/core.entity_view_display.node.how_to.contact.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -39,6 +40,7 @@ hidden:
   body: true
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/core.entity_view_display.node.how_to.default.yml b/config/default/core.entity_view_display.node.how_to.default.yml
index 66c6777f9b..9946bea9e3 100644
--- a/config/default/core.entity_view_display.node.how_to.default.yml
+++ b/config/default/core.entity_view_display.node.how_to.default.yml
@@ -6,6 +6,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -68,6 +69,16 @@ content:
         fences_label_classes: ''
     weight: 4
     region: content
+  field_hide_contact_form:
+    type: boolean
+    label: above
+    settings:
+      format: default
+      format_custom_false: ''
+      format_custom_true: ''
+    third_party_settings: {  }
+    weight: 15
+    region: content
   field_how_to_tabs:
     type: entity_reference_revisions_entity_view
     label: hidden
diff --git a/config/default/core.entity_view_display.node.how_to.department_listing.yml b/config/default/core.entity_view_display.node.how_to.department_listing.yml
index ce1ccb8338..20c9439527 100644
--- a/config/default/core.entity_view_display.node.how_to.department_listing.yml
+++ b/config/default/core.entity_view_display.node.how_to.department_listing.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -39,6 +40,7 @@ hidden:
   body: true
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/core.entity_view_display.node.how_to.featured_item.yml b/config/default/core.entity_view_display.node.how_to.featured_item.yml
index 017d2628b8..96a2024e2a 100644
--- a/config/default/core.entity_view_display.node.how_to.featured_item.yml
+++ b/config/default/core.entity_view_display.node.how_to.featured_item.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -39,6 +40,7 @@ hidden:
   body: true
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/core.entity_view_display.node.how_to.featured_topics.yml b/config/default/core.entity_view_display.node.how_to.featured_topics.yml
index a89d6ec45a..52d4b9a04d 100644
--- a/config/default/core.entity_view_display.node.how_to.featured_topics.yml
+++ b/config/default/core.entity_view_display.node.how_to.featured_topics.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -39,6 +40,7 @@ hidden:
   body: true
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/core.entity_view_display.node.how_to.listing.yml b/config/default/core.entity_view_display.node.how_to.listing.yml
index fe18247864..b56fb001c0 100644
--- a/config/default/core.entity_view_display.node.how_to.listing.yml
+++ b/config/default/core.entity_view_display.node.how_to.listing.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -39,6 +40,7 @@ hidden:
   body: true
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/core.entity_view_display.node.how_to.listing_long.yml b/config/default/core.entity_view_display.node.how_to.listing_long.yml
index e79575de23..95dc990bf3 100644
--- a/config/default/core.entity_view_display.node.how_to.listing_long.yml
+++ b/config/default/core.entity_view_display.node.how_to.listing_long.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -39,6 +40,7 @@ hidden:
   body: true
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/core.entity_view_display.node.how_to.poll_stub.yml b/config/default/core.entity_view_display.node.how_to.poll_stub.yml
index 0e1fbaa6f5..5d88423139 100644
--- a/config/default/core.entity_view_display.node.how_to.poll_stub.yml
+++ b/config/default/core.entity_view_display.node.how_to.poll_stub.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -39,6 +40,7 @@ hidden:
   body: true
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/core.entity_view_display.node.how_to.popup_icon.yml b/config/default/core.entity_view_display.node.how_to.popup_icon.yml
index ea7b226794..b3c7f09cba 100644
--- a/config/default/core.entity_view_display.node.how_to.popup_icon.yml
+++ b/config/default/core.entity_view_display.node.how_to.popup_icon.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -39,6 +40,7 @@ hidden:
   body: true
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/core.entity_view_display.node.how_to.published_by.yml b/config/default/core.entity_view_display.node.how_to.published_by.yml
index b463fca118..bb06acf5af 100644
--- a/config/default/core.entity_view_display.node.how_to.published_by.yml
+++ b/config/default/core.entity_view_display.node.how_to.published_by.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -39,6 +40,7 @@ hidden:
   body: true
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/core.entity_view_display.node.how_to.teaser.yml b/config/default/core.entity_view_display.node.how_to.teaser.yml
index 587724465f..9b98f4cac2 100644
--- a/config/default/core.entity_view_display.node.how_to.teaser.yml
+++ b/config/default/core.entity_view_display.node.how_to.teaser.yml
@@ -7,6 +7,7 @@ dependencies:
     - field.field.node.how_to.body
     - field.field.node.how_to.field_components
     - field.field.node.how_to.field_contact
+    - field.field.node.how_to.field_hide_contact_form
     - field.field.node.how_to.field_how_to_tabs
     - field.field.node.how_to.field_intro_image
     - field.field.node.how_to.field_links
@@ -47,6 +48,7 @@ content:
 hidden:
   field_components: true
   field_contact: true
+  field_hide_contact_form: true
   field_how_to_tabs: true
   field_intro_image: true
   field_links: true
diff --git a/config/default/field.field.node.article.field_contact.yml b/config/default/field.field.node.article.field_contact.yml
index b7d74c4c11..a702937771 100644
--- a/config/default/field.field.node.article.field_contact.yml
+++ b/config/default/field.field.node.article.field_contact.yml
@@ -14,7 +14,7 @@ entity_type: node
 bundle: article
 label: Contact
 description: 'Select department that should be displayed for this article.'
-required: false
+required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''
@@ -26,7 +26,6 @@ settings:
     sort:
       field: name
       direction: ASC
-    behaviors:
-      views-select-list:
-        status: 1
+    auto_create: false
+    auto_create_bundle: ''
 field_type: entity_reference
diff --git a/config/default/field.field.node.article.field_hide_contact_form.yml b/config/default/field.field.node.article.field_hide_contact_form.yml
new file mode 100644
index 0000000000..eebeb3560c
--- /dev/null
+++ b/config/default/field.field.node.article.field_hide_contact_form.yml
@@ -0,0 +1,28 @@
+uuid: bacb944f-bd63-444b-be9d-7efbde0b2d5a
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_hide_contact_form
+    - node.type.article
+  module:
+    - field_display_label
+third_party_settings:
+  field_display_label:
+    display_label: 'Hide default Contact Form'
+id: node.article.field_hide_contact_form
+field_name: field_hide_contact_form
+entity_type: node
+bundle: article
+label: 'Hide default Contact Form'
+description: 'Check the box if you want to hide default department contact information from appearing on the page.'
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
diff --git a/config/default/field.field.node.how_to.field_contact.yml b/config/default/field.field.node.how_to.field_contact.yml
index 9b486ef9de..fd6773a494 100644
--- a/config/default/field.field.node.how_to.field_contact.yml
+++ b/config/default/field.field.node.how_to.field_contact.yml
@@ -14,7 +14,7 @@ entity_type: node
 bundle: how_to
 label: Contact
 description: 'Add contact information for this how-to.'
-required: false
+required: true
 translatable: false
 default_value: {  }
 default_value_callback: ''
@@ -26,7 +26,6 @@ settings:
     sort:
       field: name
       direction: ASC
-    behaviors:
-      views-select-list:
-        status: 1
+    auto_create: false
+    auto_create_bundle: ''
 field_type: entity_reference
diff --git a/config/default/field.field.node.how_to.field_hide_contact_form.yml b/config/default/field.field.node.how_to.field_hide_contact_form.yml
new file mode 100644
index 0000000000..6f3474f45d
--- /dev/null
+++ b/config/default/field.field.node.how_to.field_hide_contact_form.yml
@@ -0,0 +1,23 @@
+uuid: 1ac9cd08-9d6d-4d75-8ed5-165858c938c0
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_hide_contact_form
+    - node.type.how_to
+id: node.how_to.field_hide_contact_form
+field_name: field_hide_contact_form
+entity_type: node
+bundle: how_to
+label: 'Hide Default Contact Information?'
+description: 'Check the box if you want to hide default department contact information from appearing on the page.'
+required: false
+translatable: false
+default_value:
+  -
+    value: 0
+default_value_callback: ''
+settings:
+  on_label: 'On'
+  off_label: 'Off'
+field_type: boolean
diff --git a/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig b/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
index 198c0f19c2..db744aa108 100644
--- a/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
+++ b/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
@@ -59,13 +59,11 @@
 
         <div id="desktop-sidebar" class="column g--4">
           <ul class="sb">
-            {% if content.field_contact["#items"] %}
-              {% if content.field_hide_contact_form[value] != 1 %}
+            {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 %}
               <li class="sb-i">
                   <div>Still have questions? Contact:</div>
                     {{ content.field_contact }}
               </li>
-              {%  endif %}
             {%  endif %}
             {% if (content.field_sidebar_components) %}
                 {{ content.field_sidebar_components }}
@@ -85,7 +83,7 @@
 
     <div id="mobile-sidebar" class="column g--12">
       <ul class="sb">
-        {% if content.field_contact["#items"] %}
+        {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 %}
           <li class="sb-i">
             <div>Still have questions? Contact:</div>
             {{ content.field_contact }}
diff --git a/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig b/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig
index 566aad54c7..7eb8c0f244 100644
--- a/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig
+++ b/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig
@@ -89,9 +89,11 @@
               </li>
               {% endif %}
               {% if not node.field_contact.isempty %}
-              <li class="sb-i contact-info">
-                {{ content.field_contact }}
-              </li>
+                {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 %}
+                  <li class="sb-i contact-info">
+                    {{ content.field_contact }}
+                  </li>
+                {% endif %}
               {% endif %}
               {% if not node.field_sidebar_components.isempty %}
               <li class="sb-i list-item-wrapper">

From bf59b512a5413cae153383f74fbb7eb922d9f0ab Mon Sep 17 00:00:00 2001
From: David Upton <davidrkupton@gmail.com>
Date: Thu, 11 Apr 2024 16:07:07 -0400
Subject: [PATCH 04/14] DIG-4305 ML: Reorder Listing Request page

---
 composer.lock                                               | 2 +-
 config/default/block.block.bos_theme_feedbackform.yml       | 2 +-
 config/default/block.block.ml_listing_entry.yml             | 3 ++-
 config/default/block.block.webform.yml                      | 3 ++-
 config/default/block.block.website_feedback_form.yml        | 2 +-
 .../webform.webform.metrolist_listing_entry_form.yml        | 6 +-----
 6 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/composer.lock b/composer.lock
index ed243fa3c0..42820dd28b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3139,7 +3139,7 @@
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
             "license": [
-                "GPL-2.0-or-later"
+                "GPL-2.0+"
             ],
             "authors": [
                 {
diff --git a/config/default/block.block.bos_theme_feedbackform.yml b/config/default/block.block.bos_theme_feedbackform.yml
index d4f6b9d01f..e445ef7895 100644
--- a/config/default/block.block.bos_theme_feedbackform.yml
+++ b/config/default/block.block.bos_theme_feedbackform.yml
@@ -10,7 +10,7 @@ dependencies:
 id: bos_theme_feedbackform
 theme: bos_theme
 region: content
-weight: 10
+weight: 8
 provider: null
 plugin: feedback_form
 settings:
diff --git a/config/default/block.block.ml_listing_entry.yml b/config/default/block.block.ml_listing_entry.yml
index c2103fda14..be9ecc608d 100644
--- a/config/default/block.block.ml_listing_entry.yml
+++ b/config/default/block.block.ml_listing_entry.yml
@@ -12,7 +12,7 @@ dependencies:
 id: ml_listing_entry
 theme: bos_theme
 region: content
-weight: -1
+weight: 1
 provider: null
 plugin: webform_block
 settings:
@@ -23,6 +23,7 @@ settings:
   webform_id: metrolist_listing_entry_form
   default_data: ''
   redirect: false
+  lazy: false
 visibility:
   request_path:
     id: request_path
diff --git a/config/default/block.block.webform.yml b/config/default/block.block.webform.yml
index ad8e7f4d7b..1b49bce403 100644
--- a/config/default/block.block.webform.yml
+++ b/config/default/block.block.webform.yml
@@ -12,7 +12,7 @@ dependencies:
 id: webform
 theme: bos_theme
 region: content
-weight: 0
+weight: 2
 provider: null
 plugin: webform_block
 settings:
@@ -23,6 +23,7 @@ settings:
   webform_id: metrolist_launch_feedback
   default_data: ''
   redirect: false
+  lazy: false
 visibility:
   request_path:
     id: request_path
diff --git a/config/default/block.block.website_feedback_form.yml b/config/default/block.block.website_feedback_form.yml
index 400a2f43cf..71b394b8bc 100644
--- a/config/default/block.block.website_feedback_form.yml
+++ b/config/default/block.block.website_feedback_form.yml
@@ -12,7 +12,7 @@ dependencies:
 id: website_feedback_form
 theme: bos_theme
 region: content
-weight: 1
+weight: 10
 provider: null
 plugin: webform_block
 settings:
diff --git a/config/default/webform.webform.metrolist_listing_entry_form.yml b/config/default/webform.webform.metrolist_listing_entry_form.yml
index 9cc904bd42..f98706fde2 100644
--- a/config/default/webform.webform.metrolist_listing_entry_form.yml
+++ b/config/default/webform.webform.metrolist_listing_entry_form.yml
@@ -17,11 +17,7 @@ elements: |-
   title:
     '#type': processed_text
     '#text': |
-      <h2>Metrolist listing request form</h2>
-
-      <p class="supporting-text">Metrolist has thousands of subscribers and receives dozens of new subscribers each week. By advertising with Metrolist, your listing will reach a large and varied pool of interested applicants.</p>
-
-      <p>To get started, enter your email below. You will be sent a unique link that will forward you to the listing form. Enter your listing information and submit. A member of our staff will review the information and will notify you once your listing has been approved. If you are a frequent submitter, you will be able to edit and update past listings as well as notify us of new availabilities.</p>
+      <p>Need help listing your available unit? Please contact us at 617-635-4200. We can walk you through the process, or we can intake the information for you.</p>
     '#format': filtered_html
   flexbox:
     '#type': webform_flexbox

From e49d25bf2e888271a343078e0c55307a1eb42820 Mon Sep 17 00:00:00 2001
From: David Upton <davidrkupton@gmail.com>
Date: Thu, 11 Apr 2024 16:08:58 -0400
Subject: [PATCH 05/14] DIG-4305 ML: Reorder Listing Request page

---
 composer.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 42820dd28b..1c3dda361c 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3440,7 +3440,7 @@
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
             "license": [
-                "GPL-2.0+"
+                "GPL-2.0-or-later"
             ],
             "authors": [
                 {

From 7c769d82f6ffbba4323015a1c462e1564667fb6a Mon Sep 17 00:00:00 2001
From: David Upton <davidrkupton@gmail.com>
Date: Thu, 11 Apr 2024 16:14:07 -0400
Subject: [PATCH 06/14] DIG-4305 ML: Reorder Listing Request page

---
 config/default/block.block.bos_theme_feedbackform.yml       | 2 +-
 config/default/block.block.ml_listing_entry.yml             | 3 ++-
 config/default/block.block.webform.yml                      | 3 ++-
 config/default/block.block.website_feedback_form.yml        | 2 +-
 .../webform.webform.metrolist_listing_entry_form.yml        | 6 +-----
 5 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/config/default/block.block.bos_theme_feedbackform.yml b/config/default/block.block.bos_theme_feedbackform.yml
index d4f6b9d01f..e445ef7895 100644
--- a/config/default/block.block.bos_theme_feedbackform.yml
+++ b/config/default/block.block.bos_theme_feedbackform.yml
@@ -10,7 +10,7 @@ dependencies:
 id: bos_theme_feedbackform
 theme: bos_theme
 region: content
-weight: 10
+weight: 8
 provider: null
 plugin: feedback_form
 settings:
diff --git a/config/default/block.block.ml_listing_entry.yml b/config/default/block.block.ml_listing_entry.yml
index c2103fda14..be9ecc608d 100644
--- a/config/default/block.block.ml_listing_entry.yml
+++ b/config/default/block.block.ml_listing_entry.yml
@@ -12,7 +12,7 @@ dependencies:
 id: ml_listing_entry
 theme: bos_theme
 region: content
-weight: -1
+weight: 1
 provider: null
 plugin: webform_block
 settings:
@@ -23,6 +23,7 @@ settings:
   webform_id: metrolist_listing_entry_form
   default_data: ''
   redirect: false
+  lazy: false
 visibility:
   request_path:
     id: request_path
diff --git a/config/default/block.block.webform.yml b/config/default/block.block.webform.yml
index ad8e7f4d7b..1b49bce403 100644
--- a/config/default/block.block.webform.yml
+++ b/config/default/block.block.webform.yml
@@ -12,7 +12,7 @@ dependencies:
 id: webform
 theme: bos_theme
 region: content
-weight: 0
+weight: 2
 provider: null
 plugin: webform_block
 settings:
@@ -23,6 +23,7 @@ settings:
   webform_id: metrolist_launch_feedback
   default_data: ''
   redirect: false
+  lazy: false
 visibility:
   request_path:
     id: request_path
diff --git a/config/default/block.block.website_feedback_form.yml b/config/default/block.block.website_feedback_form.yml
index 400a2f43cf..71b394b8bc 100644
--- a/config/default/block.block.website_feedback_form.yml
+++ b/config/default/block.block.website_feedback_form.yml
@@ -12,7 +12,7 @@ dependencies:
 id: website_feedback_form
 theme: bos_theme
 region: content
-weight: 1
+weight: 10
 provider: null
 plugin: webform_block
 settings:
diff --git a/config/default/webform.webform.metrolist_listing_entry_form.yml b/config/default/webform.webform.metrolist_listing_entry_form.yml
index 9cc904bd42..f98706fde2 100644
--- a/config/default/webform.webform.metrolist_listing_entry_form.yml
+++ b/config/default/webform.webform.metrolist_listing_entry_form.yml
@@ -17,11 +17,7 @@ elements: |-
   title:
     '#type': processed_text
     '#text': |
-      <h2>Metrolist listing request form</h2>
-
-      <p class="supporting-text">Metrolist has thousands of subscribers and receives dozens of new subscribers each week. By advertising with Metrolist, your listing will reach a large and varied pool of interested applicants.</p>
-
-      <p>To get started, enter your email below. You will be sent a unique link that will forward you to the listing form. Enter your listing information and submit. A member of our staff will review the information and will notify you once your listing has been approved. If you are a frequent submitter, you will be able to edit and update past listings as well as notify us of new availabilities.</p>
+      <p>Need help listing your available unit? Please contact us at 617-635-4200. We can walk you through the process, or we can intake the information for you.</p>
     '#format': filtered_html
   flexbox:
     '#type': webform_flexbox

From bd6c6b3ee19dbc34dcd5551cbb4ff937bde57c53 Mon Sep 17 00:00:00 2001
From: David Upton <davidrkupton@gmail.com>
Date: Thu, 11 Apr 2024 16:33:47 -0400
Subject: [PATCH 07/14] DIG-4306 Drupal Maintenance - config-ignore

---
 composer.json                                 | 13 +--
 composer.lock                                 | 91 ++++++++++---------
 config/default/bos_google_cloud.settings.yml  | 41 +++++++++
 config/default/core.extension.yml             |  1 -
 .../google_tag.container.default_gtm.yml      |  1 +
 config/default/rollbar.settings.yml           | 12 +++
 .../default/webform.webform_options.ease.yml  |  2 +-
 .../webform.webform_options.usefulness.yml    |  2 +-
 config/local/config_ignore.settings.yml       | 41 ++++++---
 ...agraphs.paragraphs_type.roll_call_vote.yml |  7 ++
 ...lit.patch.user.role.site_administrator.yml |  6 +-
 11 files changed, 149 insertions(+), 68 deletions(-)
 create mode 100644 config/default/rollbar.settings.yml
 create mode 100644 config/local/config_split.patch.paragraphs.paragraphs_type.roll_call_vote.yml

diff --git a/composer.json b/composer.json
index b20a9198c9..02225f015b 100644
--- a/composer.json
+++ b/composer.json
@@ -81,9 +81,10 @@
         "drupal/ckeditor": "1.0.2",
         "drupal/coder": "^8.0",
         "drupal/colorbox": "^2.0",
-        "drupal/config_ignore": "^2.1",
+        "drupal/config_ignore": "^3.2",
         "drupal/config_split": "^2.0@RC",
         "drupal/config_update": "^2.0@alpha",
+        "drupal/config_filter": "*",
         "drupal/conflict": "2.0.0-alpha3",
         "drupal/contact_storage": "1.3.0",
         "drupal/content_access": "^2.0@RC",
@@ -157,7 +158,7 @@
         "drupal/panels": "4.7.0",
         "drupal/paragraphs": "^1.15",
         "drupal/paragraphs_browser": "^1.1",
-        "drupal/paragraphs_edit": "^2.0",
+        "drupal/paragraphs_edit": "^3.0",
         "drupal/pathauto": "^1.2",
         "drupal/poll": "^1.2",
         "drupal/profile": "^1.0",
@@ -183,7 +184,7 @@
         "drupal/slick_entityreference": "2.1.0",
         "drupal/smart_trim": "^2.1",
         "drupal/social_media": "^2.0",
-        "drupal/sophron": "^1.2",
+        "drupal/sophron": "^2.0",
         "drupal/stage_file_proxy": "^2.1",
         "drupal/svg_image": "^3.0",
         "drupal/token": "^1.3",
@@ -317,9 +318,6 @@
             "drupal/media_entity_browser": {
                 "CoB patch - Skip confirmation step": "./patches/media_entity_browser__skip_confirmation.patch"
             },
-            "drupal/config_ignore": {
-                "CoB patch - Improve config_filter pattern recognition du 03/2022": "./patches/config_filter_match_node_implement_or_logic.patch"
-            },
             "drupal/date_recur": {
                 "CoB patch - Add helper for exdate retreival": "patches/exdate_helper.patch",
                 "CoB patch - Make filter work without exposed input": "patches/makeFilterWorkWithoutExposedInput.patch",
@@ -347,9 +345,6 @@
             "drupal/panels": {
                 "2878684 - Use String.match to correlate regions when switching Layouts in Panels IPE": "https://www.drupal.org/files/issues/panels-ipe-2878684-3.patch"
             },
-            "drupal/salesforce": {
-                "Fixes salesforce OAUTH error - DU April 2024 https://www.drupal.org/project/salesforce/issues/3427760": "https://www.drupal.org/files/issues/2024-03-14/3427760-2.patch"
-            },
             "drupal/lightning_workflow": {
                 "COB Patch: Deprecated drupal_get_path for seven theme - DIG-3336: DU Oct 2023": "patches/lightning_scheduler.patch"
             },
diff --git a/composer.lock b/composer.lock
index 44c65f126b..0b0c866a8e 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": "4f724e7fd9e0f3cd7a086dd3609da113",
+    "content-hash": "9ee1d951456e96fbda03f87870612718",
     "packages": [
         {
             "name": "ajgl/breakpoint-twig-extension",
@@ -3092,27 +3092,30 @@
         },
         {
             "name": "drupal/config_ignore",
-            "version": "2.4.0",
+            "version": "3.2.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/config_ignore.git",
-                "reference": "8.x-2.4"
+                "reference": "8.x-3.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-2.4.zip",
-                "reference": "8.x-2.4",
-                "shasum": "e0e45dde2d6927c5d26de59f352792fb6cf26554"
+                "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-3.2.zip",
+                "reference": "8.x-3.2",
+                "shasum": "00335fc1ddeb4ed93f245dd6963d99b3c084c052"
             },
             "require": {
-                "drupal/config_filter": "^1 || ^2",
-                "drupal/core": "^8 || ^9 || ^10"
+                "drupal/core": "^8.8 || ^9 || ^10"
+            },
+            "require-dev": {
+                "drupal/config_filter": "^1.8||^2.2",
+                "drush/drush": "^10 || ^11 || ^12"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-2.4",
-                    "datestamp": "1676045435",
+                    "version": "8.x-3.2",
+                    "datestamp": "1705226226",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -3121,7 +3124,7 @@
             },
             "notification-url": "https://packages.drupal.org/8/downloads",
             "license": [
-                "GPL-2.0-or-later"
+                "GPL-2.0+"
             ],
             "authors": [
                 {
@@ -3140,12 +3143,11 @@
                     "homepage": "https://www.drupal.org/user/413139"
                 }
             ],
-            "description": "Ignore certain configuration during import.",
+            "description": "Ignore certain configuration during import and export.",
             "homepage": "http://drupal.org/project/config_ignore",
             "support": {
                 "source": "https://git.drupalcode.org/project/config_ignore",
-                "issues": "https://drupal.org/project/config_ignore",
-                "irc": "irc://irc.freenode.org/drupal-contribute"
+                "issues": "http://drupal.org/project/config_ignore"
             }
         },
         {
@@ -9257,17 +9259,17 @@
         },
         {
             "name": "drupal/paragraphs_edit",
-            "version": "2.0.0",
+            "version": "3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/paragraphs_edit.git",
-                "reference": "8.x-2.0"
+                "reference": "3.0.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/paragraphs_edit-8.x-2.0.zip",
-                "reference": "8.x-2.0",
-                "shasum": "3b4a7634aecfc35bf45adf86b27d500660887df1"
+                "url": "https://ftp.drupal.org/files/projects/paragraphs_edit-3.0.0.zip",
+                "reference": "3.0.0",
+                "shasum": "b8a832b1f39c3e484c480e0b387f867cc9546bbd"
             },
             "require": {
                 "drupal/core": "^8 || ^9 || ^10",
@@ -9276,8 +9278,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-2.0",
-                    "datestamp": "1651758518",
+                    "version": "3.0.0",
+                    "datestamp": "1700662822",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -11040,27 +11042,27 @@
         },
         {
             "name": "drupal/sophron",
-            "version": "1.3.0",
+            "version": "2.0.2",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/sophron.git",
-                "reference": "8.x-1.3"
+                "reference": "2.0.2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/sophron-8.x-1.3.zip",
-                "reference": "8.x-1.3",
-                "shasum": "426dde53813e855317d6f7ef9fd6b104cc8a3e22"
+                "url": "https://ftp.drupal.org/files/projects/sophron-2.0.2.zip",
+                "reference": "2.0.2",
+                "shasum": "ed5d910d6612ea591950b67384cc5ff26c5c7cc9"
             },
             "require": {
-                "drupal/core": "^9.2 || ^10",
-                "fileeye/mimemap": "^2"
+                "drupal/core": "^10",
+                "fileeye/mimemap": "^2.0.1"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.3",
-                    "datestamp": "1663598448",
+                    "version": "2.0.2",
+                    "datestamp": "1699798487",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -22510,28 +22512,35 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "5.3.0",
+            "version": "5.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170"
+                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/622548b623e81ca6d78b721c5e029f4ce664f170",
-                "reference": "622548b623e81ca6d78b721c5e029f4ce664f170",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/298d2febfe79d03fe714eb871d5538da55205b1a",
+                "reference": "298d2febfe79d03fe714eb871d5538da55205b1a",
                 "shasum": ""
             },
             "require": {
+                "doctrine/deprecations": "^1.1",
                 "ext-filter": "*",
-                "php": "^7.2 || ^8.0",
+                "php": "^7.4 || ^8.0",
                 "phpdocumentor/reflection-common": "^2.2",
-                "phpdocumentor/type-resolver": "^1.3",
+                "phpdocumentor/type-resolver": "^1.7",
+                "phpstan/phpdoc-parser": "^1.7",
                 "webmozart/assert": "^1.9.1"
             },
             "require-dev": {
-                "mockery/mockery": "~1.3.2",
-                "psalm/phar": "^4.8"
+                "mockery/mockery": "~1.3.5",
+                "phpstan/extension-installer": "^1.1",
+                "phpstan/phpstan": "^1.8",
+                "phpstan/phpstan-mockery": "^1.1",
+                "phpstan/phpstan-webmozart-assert": "^1.2",
+                "phpunit/phpunit": "^9.5",
+                "vimeo/psalm": "^5.13"
             },
             "type": "library",
             "extra": {
@@ -22555,15 +22564,15 @@
                 },
                 {
                     "name": "Jaap van Otterdijk",
-                    "email": "account@ijaap.nl"
+                    "email": "opensource@ijaap.nl"
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
             "support": {
                 "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues",
-                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.3.0"
+                "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/5.4.0"
             },
-            "time": "2021-10-19T17:43:47+00:00"
+            "time": "2024-04-09T21:13:58+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
diff --git a/config/default/bos_google_cloud.settings.yml b/config/default/bos_google_cloud.settings.yml
index 9d9fc806ad..374a2bc690 100644
--- a/config/default/bos_google_cloud.settings.yml
+++ b/config/default/bos_google_cloud.settings.yml
@@ -1,3 +1,4 @@
+region: null
 auth:
   service_account_1:
     project_id: ''
@@ -7,7 +8,47 @@ auth:
     client_id: ''
     client_x509_cert_url: ''
 summarizer:
+  project_id: vertex-ai-poc-406419
+  model_id: gemini-pro
+  location_id: us-east4
+  endpoint: 'https://us-east4-aiplatform.googleapis.com'
+  service_account: service_account_1
+  cache: '+1 day'
 search:
+  project_id: '612042612588'
+  datastore_id: drupalwebsite_1702919119768
+  location_id: global
+  endpoint: 'https://discoveryengine.googleapis.com'
+  service_account: service_account_1
 conversation:
+  project_id: '612042612588'
+  datastore_id: drupalwebsite_1702919119768
+  location_id: global
+  endpoint: 'https://discoveryengine.googleapis.com'
+  service_account: service_account_1
+  allow_conversation: 0
 rewriter:
+  project_id: vertex-ai-poc-406419
+  model_id: gemini-pro
+  location_id: us-east4
+  endpoint: 'https://us-east4-aiplatform.googleapis.com'
+  service_account: service_account_1
+  cache: '+1 day'
 translate:
+  project_id: '612042612588'
+  datastore_id: drupalwebsite_1702919119768
+  location_id: global
+  endpoint: 'https://us-east4-aiplatform.googleapis.com'
+  model_id: gemini-pro
+  service_account: service_account_1
+vertex_ai:
+  quota: '10'
+discovery_engine:
+  quota: '300'
+translation:
+  project_id: '612042612588'
+  model_id: gemini-pro
+  service_account: service_account_1
+  location_id: us-east4
+  cache: '+1 day'
+  endpoint: 'https://us-east4-aiplatform.googleapis.com'
diff --git a/config/default/core.extension.yml b/config/default/core.extension.yml
index 0808aaa6a9..662557847a 100644
--- a/config/default/core.extension.yml
+++ b/config/default/core.extension.yml
@@ -20,7 +20,6 @@ module:
   ckeditor: 0
   colorbox: 0
   config: 0
-  config_filter: 0
   config_ignore: 0
   config_split: 0
   config_update: 0
diff --git a/config/default/google_tag.container.default_gtm.yml b/config/default/google_tag.container.default_gtm.yml
index 7706f29230..d097799815 100644
--- a/config/default/google_tag.container.default_gtm.yml
+++ b/config/default/google_tag.container.default_gtm.yml
@@ -6,6 +6,7 @@ id: default_gtm
 label: 'default Google Tag manager'
 weight: 0
 container_id: GTM-TKGRDS
+hostname: null
 data_layer: dataLayer
 include_classes: false
 whitelist_classes: ''
diff --git a/config/default/rollbar.settings.yml b/config/default/rollbar.settings.yml
new file mode 100644
index 0000000000..01c93aab1f
--- /dev/null
+++ b/config/default/rollbar.settings.yml
@@ -0,0 +1,12 @@
+ignored_messages: {  }
+person_tracking: 'off'
+ignored_headers: {  }
+rollbar_js_url: 'https://cdn.rollbar.com/rollbarjs/refs/tags/v2.26.3/rollbar.min.js'
+scrub_fields:
+  - passwd
+  - password
+  - secret
+  - confirm_password
+  - password_confirmation
+  - auth_token
+  - csrf_token
diff --git a/config/default/webform.webform_options.ease.yml b/config/default/webform.webform_options.ease.yml
index 562a3030bc..1373962786 100644
--- a/config/default/webform.webform_options.ease.yml
+++ b/config/default/webform.webform_options.ease.yml
@@ -7,7 +7,7 @@ dependencies:
       - webform
 id: ease
 label: 'Likert: Ease'
-category: Feedback Form
+category: 'Feedback Form'
 likert: true
 options: |-
   'very_easy': 'Very Easy'
diff --git a/config/default/webform.webform_options.usefulness.yml b/config/default/webform.webform_options.usefulness.yml
index 096e430893..cf578517d0 100644
--- a/config/default/webform.webform_options.usefulness.yml
+++ b/config/default/webform.webform_options.usefulness.yml
@@ -7,7 +7,7 @@ dependencies:
       - webform
 id: usefulness
 label: 'Likert: Usefulness'
-category: Feedback Form
+category: 'Feedback Form'
 likert: true
 options: |-
   'very_useful': 'Very Useful'
diff --git a/config/local/config_ignore.settings.yml b/config/local/config_ignore.settings.yml
index 3061f6bffa..e2b24d3ebf 100644
--- a/config/local/config_ignore.settings.yml
+++ b/config/local/config_ignore.settings.yml
@@ -1,15 +1,32 @@
 _core:
   default_config_hash: UVH1aJ4b44UM-VdPVN7hNNuuVqfReJxwfVeDQH1Hvsk
+mode: intermediate
 ignored_config_entities:
-  - bos_city_score.settings
-  - bos_core.settings
-  - bos_emergency_alerts.settings
-  - bos_mnl.settings
-  - bos_swiftype.settings
-  - 'core.entity_view_display.node.metrolist_development.*'
-  - geolocation_google_maps.settings
-  - 'paragraphs.paragraphs_type.*:dependencies.content|icon_uuid'
-  - purge.logger_channels
-  - rollbar.settings
-  - slackposter.settings
-  - node_elections.settings
+  import:
+    - bos_city_score.settings
+    - 'bos_commissions.settings:graphql_api_key'
+    - 'bos_core.settings:ga_settings.*'
+    - bos_emergency_alerts.settings
+    - 'bos_geocoder.settings:google.token'
+    - 'bos_google_cloud.settings:auth.service_account_*'
+    - bos_mnl.settings
+    - bos_theme.settings
+    - geolocation_google_maps.settings
+    - 'language.*|*'
+    - node_elections.settings
+    - node_rollcall.settings
+    - slackposter.settings
+  export:
+    - bos_city_score.settings
+    - 'bos_commissions.settings:graphql_api_key'
+    - 'bos_core.settings:ga_settings.*'
+    - bos_emergency_alerts.settings
+    - 'bos_geocoder.settings:google.token'
+    - 'bos_google_cloud.settings:auth.service_account_*'
+    - bos_mnl.settings
+    - bos_theme.settings
+    - geolocation_google_maps.settings
+    - 'language.*|*'
+    - node_elections.settings
+    - node_rollcall.settings
+    - slackposter.settings
diff --git a/config/local/config_split.patch.paragraphs.paragraphs_type.roll_call_vote.yml b/config/local/config_split.patch.paragraphs.paragraphs_type.roll_call_vote.yml
new file mode 100644
index 0000000000..2e475774c7
--- /dev/null
+++ b/config/local/config_split.patch.paragraphs.paragraphs_type.roll_call_vote.yml
@@ -0,0 +1,7 @@
+adding:
+  dependencies:
+    content:
+      - 'file:image:96cdb469-9999-4556-9bd8-13dc136c4d9f'
+  icon_uuid: 96cdb469-9999-4556-9bd8-13dc136c4d9f
+removing:
+  icon_uuid: null
diff --git a/config/local/config_split.patch.user.role.site_administrator.yml b/config/local/config_split.patch.user.role.site_administrator.yml
index e38abd4b04..111f416b85 100644
--- a/config/local/config_split.patch.user.role.site_administrator.yml
+++ b/config/local/config_split.patch.user.role.site_administrator.yml
@@ -3,7 +3,7 @@ adding:
     module:
       - masquerade
   permissions:
-    - 'masquerade as content_author'
-    - 'masquerade as content_editor'
-    - 'masquerade as content_reviewer'
+    config_split_sequence_svejsv3h3k0s1pst: 'masquerade as content_author'
+    config_split_sequence_nc9t64f1mcvl4661: 'masquerade as content_editor'
+    config_split_sequence_c46doo65l137f8rm: 'masquerade as content_reviewer'
 removing: {  }

From b9b70b6e12590c7972ef5998b220f8d8f799e9ea Mon Sep 17 00:00:00 2001
From: "stella.ubaha@boston.gov" <stella.ubaha@boston.gov>
Date: Fri, 12 Apr 2024 11:07:37 -0400
Subject: [PATCH 08/14] DIG-1777 Listing Page Filter Drawer updates for mobile

---
 .../modules/bos_web_app/apps/metrolist/package.json             | 2 +-
 .../modules/bos_web_app/bos_web_app.libraries.yml               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docroot/modules/custom/bos_components/modules/bos_web_app/apps/metrolist/package.json b/docroot/modules/custom/bos_components/modules/bos_web_app/apps/metrolist/package.json
index 110779bf61..b36a5ab7d7 100644
--- a/docroot/modules/custom/bos_components/modules/bos_web_app/apps/metrolist/package.json
+++ b/docroot/modules/custom/bos_components/modules/bos_web_app/apps/metrolist/package.json
@@ -1,6 +1,6 @@
 {
   "name": "metrolist",
-  "version": "2.4.448743700",
+  "version": "4.1.448743700",
   "private": true,
   "dependencies": {
     "@babel/cli": "^7.8.4",
diff --git a/docroot/modules/custom/bos_components/modules/bos_web_app/bos_web_app.libraries.yml b/docroot/modules/custom/bos_components/modules/bos_web_app/bos_web_app.libraries.yml
index 2a5d87466d..577dd2c7d7 100644
--- a/docroot/modules/custom/bos_components/modules/bos_web_app/bos_web_app.libraries.yml
+++ b/docroot/modules/custom/bos_components/modules/bos_web_app/bos_web_app.libraries.yml
@@ -4,7 +4,7 @@ bos_web_app:
     - core/drupalSettings
 
 metrolist:
-  version: 2.4.448743700
+  version: 4.1.448743700
   js:
     apps/metrolist/dist/index.bundle.js: {attributes: {type: text/javascript }}
     apps/metrolist/dist/1.index.bundle.js: {attributes: {type: text/javascript}}

From c5886d7ce3edb0cb76ce907d9a5ee31048356f63 Mon Sep 17 00:00:00 2001
From: David Upton <davidrkupton@gmail.com>
Date: Fri, 12 Apr 2024 13:57:35 -0400
Subject: [PATCH 09/14] DIG-4306 Adds google_cloud permissions to siteadmin and
 developer

---
 config/default/user.role.developer.yml                      | 2 ++
 config/default/user.role.site_administrator.yml             | 2 ++
 config/local/config_split.patch.user.role.developer.yml     | 6 ++++++
 .../config_split.patch.user.role.site_administrator.yml     | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/config/default/user.role.developer.yml b/config/default/user.role.developer.yml
index cb9c90a0bf..d745c2df8f 100644
--- a/config/default/user.role.developer.yml
+++ b/config/default/user.role.developer.yml
@@ -13,6 +13,7 @@ dependencies:
     - block
     - block_content
     - bos_core
+    - bos_google_cloud
     - config
     - config_update_ui
     - content_access
@@ -85,6 +86,7 @@ permissions:
   - 'administer file form display'
   - 'administer file types'
   - 'administer filters'
+  - 'administer google cloud platform'
   - 'administer media display'
   - 'administer media fields'
   - 'administer media form display'
diff --git a/config/default/user.role.site_administrator.yml b/config/default/user.role.site_administrator.yml
index 4a5aed2d9e..4848e65a69 100644
--- a/config/default/user.role.site_administrator.yml
+++ b/config/default/user.role.site_administrator.yml
@@ -63,6 +63,7 @@ dependencies:
   module:
     - ban
     - bos_core
+    - bos_google_cloud
     - content_moderation
     - content_moderation_notifications
     - contextual
@@ -133,6 +134,7 @@ permissions:
   - 'administer entity clone'
   - 'administer entity usage'
   - 'administer files'
+  - 'administer google cloud platform'
   - 'administer google tag manager'
   - 'administer honeypot'
   - 'administer image styles'
diff --git a/config/local/config_split.patch.user.role.developer.yml b/config/local/config_split.patch.user.role.developer.yml
index 0b6494c4e2..64de610f29 100644
--- a/config/local/config_split.patch.user.role.developer.yml
+++ b/config/local/config_split.patch.user.role.developer.yml
@@ -1,5 +1,11 @@
 adding:
   dependencies:
+    config:
+      - user.role.administrator
+      - user.role.content_author
+      - user.role.content_editor
+      - user.role.content_reviewer
+      - user.role.site_administrator
     module:
       - masquerade
   permissions:
diff --git a/config/local/config_split.patch.user.role.site_administrator.yml b/config/local/config_split.patch.user.role.site_administrator.yml
index 111f416b85..3e06ba95c9 100644
--- a/config/local/config_split.patch.user.role.site_administrator.yml
+++ b/config/local/config_split.patch.user.role.site_administrator.yml
@@ -1,5 +1,9 @@
 adding:
   dependencies:
+    config:
+      - user.role.content_author
+      - user.role.content_editor
+      - user.role.content_reviewer
     module:
       - masquerade
   permissions:

From 5079645d941668ff914f220f43a2560b2774e47c Mon Sep 17 00:00:00 2001
From: David Upton <davidrkupton@gmail.com>
Date: Fri, 12 Apr 2024 14:09:57 -0400
Subject: [PATCH 10/14] DIG-4306 Aggregates js and css on stage and prod.

---
 .../config_split.patch.system.performance.yml          | 10 ++++++++++
 .../config_split.patch.system.performance.yml          | 10 ++++++++++
 .../default/config_split.config_split.acquia_prod.yml  |  1 +
 .../default/config_split.config_split.acquia_stage.yml |  1 +
 4 files changed, 22 insertions(+)
 create mode 100644 config/acquia_prod/config_split.patch.system.performance.yml
 create mode 100644 config/acquia_stage/config_split.patch.system.performance.yml

diff --git a/config/acquia_prod/config_split.patch.system.performance.yml b/config/acquia_prod/config_split.patch.system.performance.yml
new file mode 100644
index 0000000000..9302f17868
--- /dev/null
+++ b/config/acquia_prod/config_split.patch.system.performance.yml
@@ -0,0 +1,10 @@
+adding:
+  css:
+    preprocess: true
+  js:
+    preprocess: true
+removing:
+  css:
+    preprocess: false
+  js:
+    preprocess: false
diff --git a/config/acquia_stage/config_split.patch.system.performance.yml b/config/acquia_stage/config_split.patch.system.performance.yml
new file mode 100644
index 0000000000..9302f17868
--- /dev/null
+++ b/config/acquia_stage/config_split.patch.system.performance.yml
@@ -0,0 +1,10 @@
+adding:
+  css:
+    preprocess: true
+  js:
+    preprocess: true
+removing:
+  css:
+    preprocess: false
+  js:
+    preprocess: false
diff --git a/config/default/config_split.config_split.acquia_prod.yml b/config/default/config_split.config_split.acquia_prod.yml
index 734e3c6fac..d347310e0c 100644
--- a/config/default/config_split.config_split.acquia_prod.yml
+++ b/config/default/config_split.config_split.acquia_prod.yml
@@ -52,4 +52,5 @@ partial_list:
   - environment_indicator.indicator
   - metatag.metatag_defaults.global
   - salesforce_settings
+  - system.performance
   - system.site
diff --git a/config/default/config_split.config_split.acquia_stage.yml b/config/default/config_split.config_split.acquia_stage.yml
index c4d5d3e13d..59083d0d9d 100644
--- a/config/default/config_split.config_split.acquia_stage.yml
+++ b/config/default/config_split.config_split.acquia_stage.yml
@@ -46,4 +46,5 @@ complete_list:
 partial_list:
   - environment_indicator.indicator
   - metatag.metatag_defaults.global
+  - system.performance
   - system.site

From f9f0cccf30329c6184a6ee87b14836a69363c411 Mon Sep 17 00:00:00 2001
From: David Upton <davidrkupton@gmail.com>
Date: Fri, 12 Apr 2024 19:33:39 -0400
Subject: [PATCH 11/14] DIG-4307 Fix Icon Manifest Importer

---
 .../custom/bos_core/bos_core.drush.inc        |   4 +-
 .../modules/custom/bos_core/bos_core.module   |  61 +----
 .../custom/bos_core/bos_core.services.yml     |   7 +
 .../bos_core/includes/icon_manifest.inc       |  20 ++
 .../src/BosCoreMediaEntityHelpers.php         |   5 +-
 ...ervice.php => BosCoreSyncIconManifest.php} | 222 ++++++++++++------
 .../bos_core/src/Commands/BosCoreCommands.php |  36 ++-
 .../QueueWorker/CronManifestProcessor.php     |  42 +++-
 .../QueueWorker/IconManifestProcessBase.php   |  80 -------
 .../src/Services/IconManifestCache.php        |  34 +++
 10 files changed, 286 insertions(+), 225 deletions(-)
 create mode 100644 docroot/modules/custom/bos_core/includes/icon_manifest.inc
 rename docroot/modules/custom/bos_core/src/{BosCoreSyncIconManifestService.php => BosCoreSyncIconManifest.php} (60%)
 delete mode 100644 docroot/modules/custom/bos_core/src/Plugin/QueueWorker/IconManifestProcessBase.php
 create mode 100644 docroot/modules/custom/bos_core/src/Services/IconManifestCache.php

diff --git a/docroot/modules/custom/bos_core/bos_core.drush.inc b/docroot/modules/custom/bos_core/bos_core.drush.inc
index 75d82f488f..7274dedf6d 100644
--- a/docroot/modules/custom/bos_core/bos_core.drush.inc
+++ b/docroot/modules/custom/bos_core/bos_core.drush.inc
@@ -6,7 +6,7 @@
  */
 
 use Drupal\bos_core\BosCoreCssSwitcherService;
-use Drupal\bos_core\BosCoreSyncIconManifestService;
+use Drupal\bos_core\BosCoreSyncIconManifest;
 
 /**
  * Implements hook_drush_command().
@@ -54,6 +54,6 @@ function drush_bos_core_bos_css_source($ord = NULL) {
  */
 function drush_bos_import_icon_manifest() {
 
-  BosCoreSyncIconManifestService::import();
+  BosCoreSyncIconManifest::import();
 
 }
diff --git a/docroot/modules/custom/bos_core/bos_core.module b/docroot/modules/custom/bos_core/bos_core.module
index 9b2b5558a6..89bcb47453 100644
--- a/docroot/modules/custom/bos_core/bos_core.module
+++ b/docroot/modules/custom/bos_core/bos_core.module
@@ -6,7 +6,6 @@
  */
 
 use Drupal\bos_core\BosCoreEntityEventType;
-use Drupal\bos_core\BosCoreSyncIconManifestService;
 use Drupal\bos_core\Event\BosCoreEntityEvent;
 use Drupal\Core\Datetime\DrupalDateTime;
 use Drupal\Core\Field\FieldDefinitionInterface;
@@ -31,11 +30,12 @@ use Drupal\Core\Cache\Cache;
 const BOS_CORE_SVG_ELEMENTS = 'a altGlyph altGlyphDef altGlyphItem animate animateColor animateMotion animateTransform circle clipPath colo cursor defs desc ellipse feBlend feColorMatrix feComponentTransfer feComposite feConvolveMatrix feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode feMorphology feOffset fePointLight feSpecularLighting feSpotLight feTile feTurbulence filter font fon fon fon fon fon foreignObject g glyph glyphRef hkern image line linearGradient marker mask metadata missin mpath path pattern polygon polyline radialGradient rect script set stop style svg switch symbol text textPath title tref tspan use view vkern';
 
 // Adds customizations to modules.
-require_once __DIR__ . '/includes/samlauth.extensions.inc';
-require_once __DIR__ . '/includes/realname.extensions.inc';
-require_once __DIR__ . '/includes/moderation_sidebar.extensions.inc';
-require_once __DIR__ . '/includes/token.extensions.inc';
-require_once __DIR__ . '/includes/entity_events.inc';
+require_once 'includes/samlauth.extensions.inc';
+require_once 'includes/realname.extensions.inc';
+require_once 'includes/moderation_sidebar.extensions.inc';
+require_once 'includes/token.extensions.inc';
+require_once 'includes/entity_events.inc';
+require_once 'includes/icon_manifest.inc';
 
 /**
  * Display the help page.
@@ -343,43 +343,7 @@ function bos_core_editor_load(array $entities) {
  * Implements hook_cron().
  */
 function bos_core_cron(): void {
-  if (Drupal::config("bos_core.settings")->get("icon.cron")) {
-
-    /** @var \Drupal\Core\Queue\QueueFactory $queue_factory */
-    $queue_factory = Drupal::service('queue');
-    $queue = $queue_factory->get('cron_manifest_processor');
-
-    // Load the manifest file.
-    try {
-      $manifest = BosCoreSyncIconManifestService::loadManifestFile();
-    }
-    catch (Exception $e) {
-      return;
-    }
-
-    // Initialize the manifest cache. See if we have a manifest cached.
-    $manifest_cache = Drupal::state()
-      ->get("bos_core.icon_library.manifest", []);
-    if (!empty(array_filter($manifest_cache))) {
-      // If using cache, then work out which rows in manifest need processing.
-      $manifest_cache = array_values($manifest_cache);
-      $manifest = array_diff($manifest, $manifest_cache);
-    }
-
-    // Load the queue with icon files from the manifest that need processing.
-    if (!empty(array_filter($manifest))) {
-      $num = count($manifest);
-      if ($num > 10) {
-        Drupal::logger("cron")->info("$num new icons will be added to site icon library.");
-      }
-      foreach ($manifest as $icon) {
-        $queue->createItem($icon);
-        if ($num <= 10) {
-          Drupal::logger("cron")->info("Icon '$icon' will be added to site icon library.");
-        }
-      }
-    }
-  }
+  icon_manifest_cron();
 }
 
 /**
@@ -929,17 +893,6 @@ function _bos_core_rename_multiple_button(array &$variables, string $type, array
   }
 }
 
-/**
- * Sync assets.boston.gov into database.
- *
- * @throws \Drupal\Component\Plugin\Exception\InvalidPluginDefinitionException
- * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
- * @throws \Drupal\Core\Entity\EntityStorageException .
- */
-function _bos_core_sync_assets() {
-  BosCoreSyncIconManifestService::import();
-}
-
 /**
  * Implements hook_entity_presave().
  */
diff --git a/docroot/modules/custom/bos_core/bos_core.services.yml b/docroot/modules/custom/bos_core/bos_core.services.yml
index 751bb681a7..c45a3c3d99 100644
--- a/docroot/modules/custom/bos_core/bos_core.services.yml
+++ b/docroot/modules/custom/bos_core/bos_core.services.yml
@@ -38,3 +38,10 @@ services:
     class: Drupal\bos_core\EventSubscriber\NodeSummarizerSubscriber
     tags:
       - { name: 'event_subscriber' }
+
+  cache.icon_manifest:
+    class: Drupal\Core\Cache\CacheBackendInterface
+    tags:
+      - { name: cache.bin }
+    factory: [ '@cache_factory', 'get' ]
+    arguments: [ 'icon_manifest' ]
diff --git a/docroot/modules/custom/bos_core/includes/icon_manifest.inc b/docroot/modules/custom/bos_core/includes/icon_manifest.inc
new file mode 100644
index 0000000000..f8eed3e5d9
--- /dev/null
+++ b/docroot/modules/custom/bos_core/includes/icon_manifest.inc
@@ -0,0 +1,20 @@
+<?php
+
+use Drupal\bos_core\BosCoreSyncIconManifest;
+
+/**
+ * Reads the latest icon manifest file and loads into a queue for later
+ * processing.
+ *
+ * @return void
+ */
+function icon_manifest_cron():void {
+
+  if (!Drupal::config("bos_core.settings")->get("icon.cron") ?? FALSE) {
+    // If manifest cron processing is off, then stop here.
+    return;
+  }
+
+  BosCoreSyncIconManifest::loadQueue();
+
+}
diff --git a/docroot/modules/custom/bos_core/src/BosCoreMediaEntityHelpers.php b/docroot/modules/custom/bos_core/src/BosCoreMediaEntityHelpers.php
index 31a6a19285..6384b7041c 100644
--- a/docroot/modules/custom/bos_core/src/BosCoreMediaEntityHelpers.php
+++ b/docroot/modules/custom/bos_core/src/BosCoreMediaEntityHelpers.php
@@ -4,6 +4,7 @@
 
 use Drupal\Core\Database\Database;
 use Drupal\file\Entity\File;
+use Drupal\file_entity\Entity\FileEntity;
 use Drupal\media\Entity\Media;
 
 /**
@@ -153,7 +154,7 @@ public static function cleanFilename($path) {
    * @return array|null
    *   Array of file entity objects (\Drupal\file\Entity\File).
    */
-  public static function getFileEntities($uri) {
+  public static function getFileEntities($uri): array|NULL {
     $query = \Drupal::entityQuery("file")
       ->accessCheck()
       ->condition("uri", $uri, "=");
@@ -181,7 +182,7 @@ public static function getFileEntities($uri) {
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    * @throws \Drupal\Core\Entity\EntityStorageException
    */
-  public static function createFileEntity(string $uri, int $fid = 0) {
+  public static function createFileEntity(string $uri, int $fid = 0): FileEntity {
     $filename = self::cleanFilename($uri);
     $fields = [
       'uri' => $uri,
diff --git a/docroot/modules/custom/bos_core/src/BosCoreSyncIconManifestService.php b/docroot/modules/custom/bos_core/src/BosCoreSyncIconManifest.php
similarity index 60%
rename from docroot/modules/custom/bos_core/src/BosCoreSyncIconManifestService.php
rename to docroot/modules/custom/bos_core/src/BosCoreSyncIconManifest.php
index a5b40f3a65..d5cbff400c 100644
--- a/docroot/modules/custom/bos_core/src/BosCoreSyncIconManifestService.php
+++ b/docroot/modules/custom/bos_core/src/BosCoreSyncIconManifest.php
@@ -2,7 +2,11 @@
 
 namespace Drupal\bos_core;
 
+use Drupal;
+use Drupal\Core\Cache\CacheBackendInterface;
 use Drupal\file\Entity\File;
+use Drupal\file_entity\Entity\FileEntity;
+use Exception;
 
 /**
  * Class BosCoreSyncIconManifestService.
@@ -14,7 +18,7 @@
  *
  * @package Drupal\bos_core
  */
-class BosCoreSyncIconManifestService {
+class BosCoreSyncIconManifest {
 
   /**
    * Read the manifest file and create media and file entities.
@@ -31,49 +35,26 @@ class BosCoreSyncIconManifestService {
    */
   public static function import($mode = BosCoreMediaEntityHelpers::SYNC_NORMAL) {
 
-    $moduleHandler = \Drupal::service('module_handler');
-    $migration_enabled = FALSE;
-    if ($mode == BosCoreMediaEntityHelpers::SYNC_IN_MIGRATION) {
-      $migration_enabled = TRUE;
-      if (!$moduleHandler->moduleExists('migrate')) {
-        printf("[error] Migration module is not enabled !.\n");
-        \Drupal::logger("drush")->error("Migration module is not enabled !");
-        return FALSE;
-      }
-    }
-
     // Load the manifest file.
     try {
       $manifest = self::loadManifestFile();
-      $manifest_file = \Drupal::config("bos_core.settings")
-        ->get("icon.manifest");
     }
     catch (\Exception $e) {
       printf("[warning] %s\n", $e->getMessage());
-      \Drupal::logger("drush")->warning($e->getMessage());
+      Drupal::logger("drush")->warning($e->getMessage());
       return FALSE;
     }
 
-    // Initialize the manifest cache.
-    $manifest_cache = [];
-    if (!$migration_enabled) {
-      // See if we have a manifest cached.
-      $manifest_cache = \Drupal::state()
-        ->get("bos_core.icon_library.manifest", []);
-    }
+    // Extract only icons not in the cache.
+    $numIcons = count($manifest);
+    $manifest = self::findNewManifestIcons($manifest);
 
-    if (!empty($manifest_cache)) {
-      // If using cache, then work out which rows in manifest need processing.
-      $manifest_cache = array_values($manifest_cache);
-      $numIcons = count($manifest);
-      $manifest = array_diff($manifest, $manifest_cache);
-      if (empty(array_filter($manifest))) {
-        printf("[notice] All icons in manifest are already in the media library !.\n");
-        return TRUE;
-      }
+    if (empty($manifest)) {
+      printf("[notice] All icons in manifest are already in the media library !.\n");
+      return TRUE;
     }
 
-    // Keep track of whats been done.
+    // Keep track of what's been done.
     $cnt = [
       "Total" => 0,
       "Imported" => 0,
@@ -82,12 +63,6 @@ public static function import($mode = BosCoreMediaEntityHelpers::SYNC_NORMAL) {
       "mFound" => 0,
     ];
 
-    // Create the migrate map and message tables if they are not already there.
-    if ($migration_enabled) {
-      BosCoreMediaEntityHelpers::createMigrateMap();
-      BosCoreMediaEntityHelpers::createMigrateMessage();
-    }
-
     // Find the max fid in the files table and the max vid from the media table.
     $last = ["fid" => 0, "vid" => 0];
     try {
@@ -95,20 +70,28 @@ public static function import($mode = BosCoreMediaEntityHelpers::SYNC_NORMAL) {
     }
     catch (\Exception $e) {
       printf("[error] %s\n", $e);
-      \Drupal::logger("drush")->error($e);
+      Drupal::logger("drush")->error($e);
       return FALSE;
     }
 
     // Process each row of the manifest file in turn.
+    $manifest_cache = Drupal::cache("icon_manifest");
     foreach ($manifest as $icon_uri) {
       if (!empty($icon_uri)) {
         self::processFileUri($icon_uri, $last, $cnt);
-        $manifest_cache[] = $icon_uri;
+        $manifest_cache->set($icon_uri, TRUE, CacheBackendInterface::CACHE_PERMANENT);
       }
     }
 
-    // Save this manifest for later use (e.g. migration).
-    \Drupal::state()->set("bos_core.icon_library.manifest", $manifest_cache);
+    // Save the new highwater mark (=file timestamp from when it was loaded).
+    $working_date = Drupal::config("bos_core.settings")->get("working_date") ?? 0;
+    Drupal::configFactory()->getEditable("bos_core.settings")
+      ->set("icon.manifest_date", $working_date)
+      ->save();
+
+    // Log some stats.
+    $manifest_file = Drupal::config("bos_core.settings")
+      ->get("icon.manifest");
 
     printf("\nImports icons from %s\n", $manifest_file);
     printf("Manifest defines %d icon files.\n", $numIcons);
@@ -122,6 +105,50 @@ public static function import($mode = BosCoreMediaEntityHelpers::SYNC_NORMAL) {
 
   }
 
+  public static function loadQueue() {
+    // Load the manifest file.
+    try {
+      $manifest = self::loadManifestFile();
+    }
+    catch (Exception $e) {
+      return;
+    }
+
+    if (!empty($manifest)) {
+
+      // Find only icons not already in the cache.
+      $manifest = self::findNewManifestIcons($manifest);
+
+      // Get the manifest cache and queue
+      $queue = Drupal::service('queue')->get('cron_manifest_processor');
+
+      $count = 0;
+      $log = [];
+
+      // Load up the queue with new icons found in file.
+      foreach ($manifest as $icon) {
+        $queue->createItem($icon);
+        if ($count++ <= 10) {
+          $log[] = "Icon '$icon' found in manifest and queued,";
+        }
+      }
+
+      // Save the new highwater mark (=file timestamp from when it was loaded).
+      $working_date = Drupal::config("bos_core.settings")->get("working_date") ?? 0;
+      Drupal::configFactory()->getEditable("bos_core.settings")
+        ->set("icon.manifest_date", $working_date)
+        ->save();
+
+      // Do some logging.
+      $log[] = "... total of $count icons found in manifest and queued.";
+      $log = implode("<br>", $log);
+      Drupal::logger("cron")->info($log);
+
+    }
+
+  }
+
+
   /**
    * Create or Update File and Media entities.
    *
@@ -138,7 +165,7 @@ public static function import($mode = BosCoreMediaEntityHelpers::SYNC_NORMAL) {
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    * @throws \Drupal\Core\Entity\EntityStorageException
    */
-  public static function processFileUri(string $icon_uri, array $last = [], array &$cnt = [], $migration_enabled = BosCoreMediaEntityHelpers::SYNC_NORMAL) {
+  public static function processFileUri(string $icon_uri, array &$last = [], array &$cnt = []) {
     $icon_uri = trim($icon_uri);
     if (empty($icon_uri)) {
       return;
@@ -149,7 +176,7 @@ public static function processFileUri(string $icon_uri, array $last = [], array
 
     // Try to get (or create) the file from/in the file_managed table.
     $file = NULL;
-    $file_ids = self::retrieveFileEntities($icon_uri, $icon_filename, $file, $last, $cnt, $migration_enabled);
+    $file_ids = self::retrieveFileEntities($icon_uri, $icon_filename, $file, $last, $cnt);
 
     // We should now have files in file_managed for all $file_ids.
     // Try to find a media entity attached to each file_id.
@@ -161,14 +188,9 @@ public static function processFileUri(string $icon_uri, array $last = [], array
           $file = File::load($file_id);
         }
 
-        $last["fid"] = 0;
+        $last["mid"] = 0;
         $last["vid"] = 0;
-        if ($migration_enabled == BosCoreMediaEntityHelpers::SYNC_IN_MIGRATION) {
-          // When migrating, try to use the same file entity id as the id for
-          // any new media entity created.
-          $last["fid"] = $file->id();
-        }
-        $media = BosCoreMediaEntityHelpers::createMediaEntity($file->id(), $file->getOwnerId(), $icon_filename, "icon", $last["fid"], $last["vid"]);
+        $media = BosCoreMediaEntityHelpers::createMediaEntity($file->id(), $file->getOwnerId(), $icon_filename, "icon", $last["mid"], $last["vid"]);
         empty($cnt) ?: $cnt["Media"]++;
         // Only put the first media item into the library.
         BosCoreMediaEntityHelpers::updateMediaLibrary($media->id(), ($key == 0));
@@ -183,7 +205,7 @@ public static function processFileUri(string $icon_uri, array $last = [], array
           }
         }
       }
-      if ($key == 0 && !$migration_enabled) {
+      if ($key == 0) {
         break;
       }
     }
@@ -218,10 +240,14 @@ private static function cleanFilenameFolder($path) {
    */
   public static function loadManifestFile() {
     // Get the manifest file name as set in the settings form.
-    $manifest_file = \Drupal::config("bos_core.settings")->get("icon.manifest");
+    $manifest_file = Drupal::config("bos_core.settings")->get("icon.manifest");
+
     if (empty($manifest_file)) {
       $manifest_file = "https://assets.boston.gov/manifest/icons_manifest.txt";
-      \Drupal::configFactory()->getEditable('bos_core.settings')->set('icon.manifest', $manifest_file)->save();
+      Drupal::configFactory()->getEditable('bos_core.settings')
+        ->set('icon.manifest', $manifest_file)
+        ->set('icon.manifest_date', 0)
+        ->save();
     }
 
     // Fetch the contents of the manifest file.
@@ -230,8 +256,63 @@ public static function loadManifestFile() {
       throw new \Exception("Icon manifest file not found!");
     }
 
-    // Explode each line in the file into a row in an array and return.
-    return explode("\n", $manifest);
+    // Check timestamp.
+    $highwater = (Drupal::config("bos_core.settings")->get("icon.manifest_date") ?? 0);
+    foreach($http_response_header as $header) {
+      $parts = explode(":", $header, 2);
+      if (strtolower(trim($parts[0])) == "last-modified") {
+        $timestamp = strtotime($parts[1]);
+        if ($timestamp > $highwater) {
+          // Set a flag using the current file timestamp.
+          Drupal::configFactory()->getEditable("bos_core.settings")
+            ->set("working_date", $timestamp)
+            ->save();
+          // Explode each line in the file into a row in an array and return.
+          return explode("\n", $manifest);
+        }
+        else {
+          // This file is older than or equal to the highwater mark. Remove the
+          // working date timestamp/flag and return an empty set.
+          Drupal::configFactory()->getEditable("bos_core.settings")
+            ->set("working_date", "0")
+            ->save();
+          return [];
+        }
+      }
+    }
+
+    // No Last-Modified date found in headers. Have to check the file again.
+    Drupal::configFactory()->getEditable("bos_core.settings")
+      ->set("working_date", $highwater)
+      ->save();
+    return [];
+
+  }
+
+  /**
+   * Scans the manifest array and checks to see which elements are not in
+   * the cache.
+   *
+   * @param array $manifest
+   *
+   * @return array
+   */
+  public static function findNewManifestIcons(array $manifest): array {
+
+    $output = [];
+
+    if (!empty($manifest)) {
+      // Get the manifest cache.
+      $manifest_cache = Drupal::cache("icon_manifest");
+      foreach ($manifest as $icon) {
+        if (!$manifest_cache->get($icon)) {
+          $output[] = trim($icon);
+        }
+      }
+    }
+
+    return $output;
+
   }
 
   /**
@@ -259,7 +340,7 @@ public static function loadManifestFile() {
    * @throws \Drupal\Component\Plugin\Exception\PluginNotFoundException
    * @throws \Drupal\Core\Entity\EntityStorageException
    */
-  public static function retrieveFileEntities(string $icon_uri, string $icon_filename, &$file, array $last = [], array $cnt = [], int $migration_enabled = BosCoreMediaEntityHelpers::SYNC_NORMAL) {
+  public static function retrieveFileEntities(string $icon_uri, string $icon_filename, ?FileEntity &$file, array &$last = [], array $cnt = []):array|NULL {
     // Fetch all file entities which reference this uri.
     $file_ids = BosCoreMediaEntityHelpers::getFileEntities($icon_uri);
 
@@ -273,31 +354,20 @@ public static function retrieveFileEntities(string $icon_uri, string $icon_filen
       $file = BosCoreMediaEntityHelpers::createFileEntity($icon_uri, $last["fid"]);
       // Now add the file to the list of files.
       $file_ids[] = $file->id();
+      $last["fid"] = $file->id() + 1;
       empty($cnt) ?: $cnt["Imported"]++;
-      if ($migration_enabled) {
-        // Need to create a migration id_map for this new file entity.
-        try {
-          BosCoreMediaEntityHelpers::createSimpleMappingEntry($file->id(), $file->id(), "d7_file");
-        }
-        catch (\Exception $e) {
-          \Drupal::logger("drush")->warning($e->getMessage());
-          \Drupal::messenger()->addWarning($e->getMessage());
-        }
-      }
     }
     else {
       // Icon does already exist (at least once) in the file_managed table.
       $file_ids = array_values($file_ids);
       empty($cnt) ?: ($cnt["Found"] = $cnt["Found"] + count($file_ids));
-      if ($migration_enabled) {
-        // The file already exists - check and update filename if needed.
-        if (!$multiple) {
-          BosCoreMediaEntityHelpers::updateFilename($file_ids[0], $icon_filename);
-        }
-        else {
-          foreach ($file_ids as $file_id) {
-            BosCoreMediaEntityHelpers::updateFilename($file_id, $icon_filename);
-          }
+      // The file already exists - check and update filename if needed.
+      if (!$multiple) {
+        BosCoreMediaEntityHelpers::updateFilename($file_ids[0], $icon_filename);
+      }
+      else {
+        foreach ($file_ids as $file_id) {
+          BosCoreMediaEntityHelpers::updateFilename($file_id, $icon_filename);
         }
       }
     }
diff --git a/docroot/modules/custom/bos_core/src/Commands/BosCoreCommands.php b/docroot/modules/custom/bos_core/src/Commands/BosCoreCommands.php
index ac0f60550b..2287199e78 100644
--- a/docroot/modules/custom/bos_core/src/Commands/BosCoreCommands.php
+++ b/docroot/modules/custom/bos_core/src/Commands/BosCoreCommands.php
@@ -2,9 +2,10 @@
 
 namespace Drupal\bos_core\Commands;
 
+use Drupal;
 use Drush\Commands\DrushCommands;
 use Drupal\bos_core\BosCoreCssSwitcherService;
-use Drupal\bos_core\BosCoreSyncIconManifestService;
+use Drupal\bos_core\BosCoreSyncIconManifest;
 use Symfony\Component\Yaml\Yaml;
 
 /**
@@ -34,7 +35,7 @@ class BosCoreCommands extends DrushCommands {
   public function cssSource($ord = NULL) {
     // See bottom of https://weitzman.github.io/blog/port-to-drush9 for details
     // on what to change when porting a legacy command.
-    $libs = \Drupal::service('library.discovery')->getLibrariesByExtension('bos_theme');
+    $libs = Drupal::service('library.discovery')->getLibrariesByExtension('bos_theme');
 
     if (!isset($libs) || $libs == []) {
       $this->output()->writeln("Error: It appears that the theme \<bos_theme\> is not installed, or has no libraries - Please install bos_theme and retry.");
@@ -66,9 +67,9 @@ public function cssSource($ord = NULL) {
       $this->output()->writeln("Cancelled.");
     }
     elseif (BosCoreCssSwitcherService::switchSource($ord)) {
-      \Drupal::service('asset.css.collection_optimizer')
+      Drupal::service('asset.css.collection_optimizer')
         ->deleteAll();
-      $res = \Drupal::translation()->translate("Success: Changed source to '@source' (@sourcePath).", [
+      $res = Drupal::translation()->translate("Success: Changed source to '@source' (@sourcePath).", [
         '@source' => $libArray[$ord-1][0],
         '@sourcePath' => $libArray[$ord-1][1],
       ])->render();
@@ -101,7 +102,7 @@ public function cssSource($ord = NULL) {
    */
   public function componetize($module_name = NULL, array $options = ['components' => NULL]) {
 
-    $module_path = \Drupal::service('file_system')->realpath(\Drupal::service('extension.path.resolver')->getPath('module', 'bos_components')) . '/modules/' . $module_name;
+    $module_path = Drupal::service('file_system')->realpath(Drupal::service('extension.path.resolver')->getPath('module', 'bos_components')) . '/modules/' . $module_name;
     if (file_exists($module_path)) {
       return 'This module directory already exists.';
     }
@@ -109,7 +110,7 @@ public function componetize($module_name = NULL, array $options = ['components'
       mkdir($module_path);
     }
 
-    $template_path = \Drupal::service('file_system')->realpath(\Drupal::service('extension.path.resolver')->getPath('module', 'bos_core')) . '/src/componentizer_templates';
+    $template_path = Drupal::service('file_system')->realpath(Drupal::service('extension.path.resolver')->getPath('module', 'bos_core')) . '/src/componentizer_templates';
     $template_files = array_diff(scandir($template_path), ['..', '.']);
 
     foreach ($template_files as $file) {
@@ -180,7 +181,7 @@ public function gaEndpoint($endpoint = NULL) {
     if ($endpoint == NULL) {
       return "PROBLEM: Please supply a new endpoint.";
     }
-    $config = \Drupal::configFactory()
+    $config = Drupal::configFactory()
       ->getEditable("bos_core.settings");
     $settings = $config->get("ga_settings");
     $settings["ga_endpoint"] = $endpoint;
@@ -207,7 +208,7 @@ public function gaEnable(string $enabled = NULL) {
     if ($enabled == NULL) {
       return "PROBLEM: Please supply the enabled/disabled state.";
     }
-    $config = \Drupal::configFactory()
+    $config = Drupal::configFactory()
       ->getEditable("bos_core.settings");
     $settings = $config->get("ga_settings");
     $settings["ga_enabled"] = ($enabled == TRUE);
@@ -217,7 +218,8 @@ public function gaEnable(string $enabled = NULL) {
   }
 
   /**
-   * Process manifest.txt file and update/create file/media entities.
+   * Icon Manifest Manager: Process the manifest file and update/create
+   * file/media entities for icons.
    *
    * @validate-module-enabled bos_core
    *
@@ -225,7 +227,21 @@ public function gaEnable(string $enabled = NULL) {
    * @aliases biim,bos-import-icon-manifest
    */
   public function importIconManifest() {
-    return BosCoreSyncIconManifestService::import();
+    return BosCoreSyncIconManifest::import();
+  }
+
+  /**
+   * Icon Manifest Manager: Invalidate the cache used to speed file processing.
+   *
+   * @validate-module-enabled bos_core
+   *
+   * @command bos:icon-manifest-clear-cache
+   * @aliases bimcc
+   */
+  public function clearCacheIconManifest() {
+    Drupal::cache("icon_manifest")->invalidateAll();
+    Drupal::state()->delete("bos_core.icon_library.manifest");
+    Drupal::config("bos_core.settings")->set("icon.manifest_date", 0);
   }
 
 }
diff --git a/docroot/modules/custom/bos_core/src/Plugin/QueueWorker/CronManifestProcessor.php b/docroot/modules/custom/bos_core/src/Plugin/QueueWorker/CronManifestProcessor.php
index 69b0e79004..2565bd6647 100644
--- a/docroot/modules/custom/bos_core/src/Plugin/QueueWorker/CronManifestProcessor.php
+++ b/docroot/modules/custom/bos_core/src/Plugin/QueueWorker/CronManifestProcessor.php
@@ -2,6 +2,13 @@
 
 namespace Drupal\bos_core\Plugin\QueueWorker;
 
+use Drupal;
+use Drupal\bos_core\BosCoreSyncIconManifest;
+use Drupal\Core\Annotation\QueueWorker;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Queue\QueueWorkerBase;
+use Exception;
+
 /**
  * A Node Publisher that publishes nodes on CRON run.
  *
@@ -11,4 +18,37 @@
  *   cron = {"time" = 20}
  * )
  */
-class CronManifestProcessor extends IconManifestProcessBase {}
+
+class CronManifestProcessor extends QueueWorkerBase {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function processItem($data) {
+
+    // Load the manifest cache.
+    $manifest_cache = Drupal::cache("icon_manifest");
+
+    // Just use the next available fid/vid for any file entities created.
+    $last = ["fid" => 0, "vid" => 0];
+
+    $data = trim($data);
+
+    if ($manifest_cache->get($data)) {
+      // Item has already been processed (b/c it's in the cache).
+      return TRUE;
+    }
+
+    try {
+      BosCoreSyncIconManifest::processFileUri($data, $last);
+      // Save cache for next time. (don't set expiry).
+      $manifest_cache->set($data, TRUE, CacheBackendInterface::CACHE_PERMANENT);
+    }
+    catch (Exception $e) {
+      throw new Exception($e->getMessage());
+    }
+
+    return TRUE;
+  }
+
+}
diff --git a/docroot/modules/custom/bos_core/src/Plugin/QueueWorker/IconManifestProcessBase.php b/docroot/modules/custom/bos_core/src/Plugin/QueueWorker/IconManifestProcessBase.php
deleted file mode 100644
index 1039e8138f..0000000000
--- a/docroot/modules/custom/bos_core/src/Plugin/QueueWorker/IconManifestProcessBase.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-
-namespace Drupal\bos_core\Plugin\QueueWorker;
-
-use Drupal\bos_core\BosCoreSyncIconManifestService;
-use Drupal\Core\Entity\EntityStorageInterface;
-use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
-use Drupal\Core\Queue\QueueWorkerBase;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-
-/**
- * Provides base functionality for the Manifest Queue Workers.
- */
-abstract class IconManifestProcessBase extends QueueWorkerBase implements ContainerFactoryPluginInterface {
-  /**
-   * The file storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $fileStorage;
-  /**
-   * The file storage.
-   *
-   * @var \Drupal\Core\Entity\EntityStorageInterface
-   */
-  protected $mediaStorage;
-
-  /**
-   * Creates a new NodePublishBase object.
-   *
-   * @param \Drupal\Core\Entity\EntityStorageInterface $file_storage
-   *   File entity object for injection.
-   * @param \Drupal\Core\Entity\EntityStorageInterface $media_storage
-   *   Media entity object for injection.
-   */
-  public function __construct(EntityStorageInterface $file_storage, EntityStorageInterface $media_storage) {
-    $this->fileStorage = $file_storage;
-    $this->mediaStorage = $media_storage;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public static function create(ContainerInterface $container, array $configuration, $plugin_id, $plugin_definition) {
-    return new static(
-      $container->get('entity_type.manager')->getStorage('file'),
-      $container->get('entity_type.manager')->getStorage('media')
-    );
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function processItem($data) {
-
-    // Load the manifest cache.
-    $manifest_cache = \Drupal::state()->get("bos_core.icon_library.manifest", []);
-
-    // Just use the next available fid/vid for any file entities created.
-    $last = ["fid" => 0, "vid" => 0];
-
-    if (!empty($manifest_cache) && in_array($data, $manifest_cache)) {
-      // Item has already been processed (b/c it's in the cache).
-      return TRUE;
-    }
-    try {
-      BosCoreSyncIconManifestService::processFileUri($data, $last);
-      $manifest_cache[] = $data;
-    }
-    catch (\Exception $e) {
-      return FALSE;
-    }
-
-    // Save cache for next time.
-    \Drupal::state()->set("bos_core.icon_library.manifest", $manifest_cache);
-
-    return TRUE;
-  }
-
-}
diff --git a/docroot/modules/custom/bos_core/src/Services/IconManifestCache.php b/docroot/modules/custom/bos_core/src/Services/IconManifestCache.php
new file mode 100644
index 0000000000..bbc6b9935e
--- /dev/null
+++ b/docroot/modules/custom/bos_core/src/Services/IconManifestCache.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Drupal\bos_core\Services;
+
+use Drupal;
+use Drupal\Core\Cache\Cache;
+use Drupal\Core\Cache\CacheBackendInterface;
+use Drupal\Core\Config\ConfigFactory;
+use Drupal\Core\Config\ImmutableConfig;
+use Drupal\Core\Logger\LoggerChannelFactory;
+use Drupal\Core\Logger\LoggerChannelInterface;
+
+/**
+class GcCacheAI
+Creates service to manage caching of AI requests
+
+david 02 2024
+@file docroot/modules/custom/bos_components/modules/bos_google_cloud/src/Services/GcCacheAI.php
+ */
+
+class IconManifestCache {
+
+  public function __construct(LoggerChannelFactory $logger, ConfigFactory $config, CacheBackendInterface $cache) {
+    $this->log = $logger->get('bos_google_cloud');
+    $this->config = $config->get("bos_google_cloud.settings");
+    $this->cache = $cache;
+    $this->info = [
+      "enabled" => TRUE,
+      "expiry" => NULL,
+      "bin" => "gen_ai"
+    ];
+  }
+
+}

From a3f44be8082ff8096646af69e64d07fcd79a4a76 Mon Sep 17 00:00:00 2001
From: "stella.ubaha@boston.gov" <stella.ubaha@boston.gov>
Date: Tue, 16 Apr 2024 15:02:02 -0400
Subject: [PATCH 12/14] DIG-4158 Make department contact field required in
 'article' and 'how-to' pages; display optional

---
 .../modules/node_article/templates/node--article.html.twig    | 4 ++--
 .../modules/node_how_to/templates/node--how-to.html.twig      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig b/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
index db744aa108..51e7c4e857 100644
--- a/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
+++ b/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
@@ -59,7 +59,7 @@
 
         <div id="desktop-sidebar" class="column g--4">
           <ul class="sb">
-            {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 %}
+            {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 and content.field_contact["#items"] is not null %}
               <li class="sb-i">
                   <div>Still have questions? Contact:</div>
                     {{ content.field_contact }}
@@ -83,7 +83,7 @@
 
     <div id="mobile-sidebar" class="column g--12">
       <ul class="sb">
-        {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 %}
+        {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 and content.field_contact["#items"] is not null %}
           <li class="sb-i">
             <div>Still have questions? Contact:</div>
             {{ content.field_contact }}
diff --git a/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig b/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig
index 7eb8c0f244..e8c2f213ba 100644
--- a/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig
+++ b/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig
@@ -89,7 +89,7 @@
               </li>
               {% endif %}
               {% if not node.field_contact.isempty %}
-                {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 %}
+                {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 and content.field_contact["#items"] is not null %}
                   <li class="sb-i contact-info">
                     {{ content.field_contact }}
                   </li>

From ce01fa2ea7f7126194f100d3879c9aa4dc09f20c Mon Sep 17 00:00:00 2001
From: David Upton <davidrkupton@gmail.com>
Date: Tue, 16 Apr 2024 22:55:09 -0400
Subject: [PATCH 13/14] DIG-4307 Fix Icon Manifest Importer

---
 .../custom/bos_core/src/Commands/BosCoreCommands.php      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docroot/modules/custom/bos_core/src/Commands/BosCoreCommands.php b/docroot/modules/custom/bos_core/src/Commands/BosCoreCommands.php
index 2287199e78..f8391d354d 100644
--- a/docroot/modules/custom/bos_core/src/Commands/BosCoreCommands.php
+++ b/docroot/modules/custom/bos_core/src/Commands/BosCoreCommands.php
@@ -239,9 +239,15 @@ public function importIconManifest() {
    * @aliases bimcc
    */
   public function clearCacheIconManifest() {
+    // Invalidate the current manifest cache.
     Drupal::cache("icon_manifest")->invalidateAll();
+    // Remove the legacy manifest cache.
     Drupal::state()->delete("bos_core.icon_library.manifest");
-    Drupal::config("bos_core.settings")->set("icon.manifest_date", 0);
+    // Reset the highwater mark.
+    Drupal::configFactory()
+      ->getEditable("bos_core.settings")
+      ->set("icon.manifest_date", 0)
+      ->save();
   }
 
 }

From 59b4b30eef78fc33df125cb9354bf6528cc827c5 Mon Sep 17 00:00:00 2001
From: "stella.ubaha@boston.gov" <stella.ubaha@boston.gov>
Date: Wed, 17 Apr 2024 09:58:13 -0400
Subject: [PATCH 14/14] DIG-4158 Make department contact field required in
 'article' and 'how-to' pages; display optional

---
 .../modules/node_article/templates/node--article.html.twig    | 4 ++--
 .../modules/node_how_to/templates/node--how-to.html.twig      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig b/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
index 51e7c4e857..0e62070a22 100644
--- a/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
+++ b/docroot/modules/custom/bos_content/modules/node_article/templates/node--article.html.twig
@@ -59,7 +59,7 @@
 
         <div id="desktop-sidebar" class="column g--4">
           <ul class="sb">
-            {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 and content.field_contact["#items"] is not null %}
+            {% if content.field_contact["#items"] and (content.field_hide_contact_form['#items'].value == 0 or content.field_contact["#items"] is null) %}
               <li class="sb-i">
                   <div>Still have questions? Contact:</div>
                     {{ content.field_contact }}
@@ -83,7 +83,7 @@
 
     <div id="mobile-sidebar" class="column g--12">
       <ul class="sb">
-        {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 and content.field_contact["#items"] is not null %}
+        {% if content.field_contact["#items"] and (content.field_hide_contact_form['#items'].value == 0 or content.field_contact["#items"] is null) %}
           <li class="sb-i">
             <div>Still have questions? Contact:</div>
             {{ content.field_contact }}
diff --git a/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig b/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig
index e8c2f213ba..f09b17186f 100644
--- a/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig
+++ b/docroot/modules/custom/bos_content/modules/node_how_to/templates/node--how-to.html.twig
@@ -89,7 +89,7 @@
               </li>
               {% endif %}
               {% if not node.field_contact.isempty %}
-                {% if content.field_contact["#items"] and content.field_hide_contact_form['#items'].value == 0 and content.field_contact["#items"] is not null %}
+                {% if content.field_contact["#items"] and (content.field_hide_contact_form['#items'].value == 0 or content.field_contact["#items"] is null) %}
                   <li class="sb-i contact-info">
                     {{ content.field_contact }}
                   </li>