Merge pull request #3415 from CityOfBoston/DIG-4158

(develop) Make department contact field required in 'article' and 'how-to' pages; display optional DIG-4158
CityOfBoston · Apr 11, 2024 · 276a33f · 276a33f
2 parents fe57411 + bfc44bf
commit 276a33f
Show file tree

Hide file tree

Showing 36 changed files with 257 additions and 43 deletions.
diff --git 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,14 +110,35 @@ third_party_settings:
       label: Feeds
       region: content
       parent_name: group_article
-      weight: 5
+      weight: 6
       format_type: tab
       format_settings:
         classes: ''
         id: ''
         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,25 +193,32 @@ content:
     third_party_settings: {  }
   field_content_feeds:
     type: entity_reference_autocomplete_tags
-    weight: 1
+    weight: 7
     region: content
     settings:
       match_operator: CONTAINS
       match_limit: 10
       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
       placeholder: ''
     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
@@ -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,14 +132,35 @@ third_party_settings:
       label: Components
       region: content
       parent_name: group_how_to
-      weight: 6
+      weight: 7
       format_type: tab
       format_settings:
         classes: ''
         id: ''
         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,14 +205,21 @@ content:
     third_party_settings: {  }
   field_contact:
     type: entity_reference_autocomplete
-    weight: 3
+    weight: 4
     region: content
     settings:
       match_operator: CONTAINS
       match_limit: 10
       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
@@ -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
@@ -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
@@ -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
@@ -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