Merge pull request #3579 from CityOfBoston/master

(production) Default contact link not reflected in department pages DIG-4868
CityOfBoston · Aug 22, 2024 · 6766276 · 6766276
2 parents 8e694e1 + 45819ce
commit 6766276
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 13 deletions.
diff --git a/.github/percy/snapshot_config.yml b/.github/percy/snapshot_config.yml
@@ -1,3 +1,5 @@
+
+
 - name: Article with ALL components
   url: https://d8-dev.boston.gov/departments/digital-team/test-page
   waitForTimeout: 5000
@@ -99,3 +101,6 @@
 
 - name: Map Verification - 30 Westville St (BH)
   url: https://d8-dev.boston.gov/buildinghousing/30-westville-st
+
+- name: Drawers Example - DRAWERS (INSPECTION SERVICES)
+  url: https://d8-dev.boston.gov/node/3921
diff --git a/config/default/core.entity_view_display.node.department_profile.article.yml b/config/default/core.entity_view_display.node.department_profile.article.yml
@@ -103,7 +103,7 @@ content:
       format_custom_false: ''
       format_custom_true: ''
     third_party_settings: {  }
-    weight: 14
+    weight: 15
     region: content
   field_icon:
     type: entity_reference_entity_view
@@ -137,14 +137,21 @@ content:
     region: content
   field_link_url:
     type: link
-    label: above
+    label: hidden
     settings:
       trim_length: 80
       url_only: false
       url_plain: false
-      rel: ''
-      target: ''
-    third_party_settings: {  }
+      rel: '0'
+      target: '0'
+    third_party_settings:
+      fences:
+        fences_field_tag: div
+        fences_field_classes: ''
+        fences_field_item_tag: div
+        fences_field_item_classes: ''
+        fences_label_tag: div
+        fences_label_classes: ''
     weight: 8
     region: content
   field_operation_hours:
@@ -187,6 +194,13 @@ content:
         fences_label_classes: ''
     weight: 12
     region: content
+  field_select_contact_type:
+    type: list_default
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    weight: 13
+    region: content
   field_sidebar_components:
     type: entity_reference_revisions_entity_view
     label: hidden
@@ -210,7 +224,7 @@ content:
         fences_field_item_classes: ''
         fences_label_tag: div
         fences_label_classes: ''
-    weight: 13
+    weight: 14
     region: content
   langcode:
     type: language
@@ -224,6 +238,5 @@ content:
 hidden:
   field_manual_date: true
   field_metatags: true
-  field_select_contact_type: true
   links: true
   published_at: true
diff --git a/config/default/core.entity_view_display.node.department_profile.default.yml b/config/default/core.entity_view_display.node.department_profile.default.yml
@@ -144,7 +144,7 @@ content:
     region: content
   field_link_url:
     type: link
-    label: above
+    label: hidden
     settings:
       trim_length: 80
       url_only: false

diff --git a/...om/bos_content/modules/node_article/templates/node--department-profile--article.html.twig b/...om/bos_content/modules/node_article/templates/node--department-profile--article.html.twig
@@ -85,9 +85,16 @@
         {{ elements.field_phone_number|raw }}
       </li>
     {% endif %}
-    {% if elements.field_email %}
-      <li class="sb-i">
-        {{ elements.field_email }}
+    {% if node.field_select_contact_type.0.value == "url_link" %}
+      <li class="sb-i evt-sb-i">
+        <img src="https://patterns.boston.gov/images/global/icons/icon-form.svg" class="icon icon-form sb-ic">
+        <span class="sb-d">
+          {{ content.field_link_url }}
+        </span>
+      </li>
+    {% else %}
+      <li class="sb-i evt-sb-i">
+        {{ content.field_email }}
       </li>
     {% endif %}
     {% if elements.field_address %}

diff --git a/...tom/bos_content/modules/node_how_to/templates/node--department-profile--article.html.twig b/...tom/bos_content/modules/node_how_to/templates/node--department-profile--article.html.twig
@@ -97,8 +97,15 @@
         {{ content.field_phone_number }}
       </li>
     {% endif %}
-    {% if not node.field_email.isEmpty %}
-      <li class="sb-i">
+    {% if node.field_select_contact_type.0.value == "url_link" %}
+      <li class="sb-i evt-sb-i">
+        <img src="https://patterns.boston.gov/images/global/icons/icon-form.svg" class="icon icon-form sb-ic">
+        <span class="sb-d">
+               {{ content.field_link_url }}
+              </span>
+      </li>
+    {% else %}
+      <li class="sb-i evt-sb-i">
         {{ content.field_email }}
       </li>
     {% endif %}