Merge pull request #201 from USEPA/IN-547

fix dependency for logistics fields
USEPA · Aug 13, 2021 · 6b50355 · 6b50355
2 parents cc6d9ab + 404bf14
commit 6b50355
Show file tree

Hide file tree

Showing 8 changed files with 125 additions and 33 deletions.
diff --git a/config/sync/core.entity_form_display.node.event.default.yml b/config/sync/core.entity_form_display.node.event.default.yml
@@ -6,7 +6,9 @@ dependencies:
     - field.field.node.event.field_event_date
     - field.field.node.event.field_event_description
     - field.field.node.event.field_event_host
+    - field.field.node.event.field_event_link
     - field.field.node.event.field_event_location
+    - field.field.node.event.field_event_location_logistics
     - field.field.node.event.field_event_recording
     - field.field.node.event.field_event_tags
     - field.field.node.event.field_show_on_agency_calendar
@@ -25,7 +27,7 @@ third_party_settings:
       children:
         - field_event_recording
       parent_name: ''
-      weight: 14
+      weight: 16
       format_type: details
       region: content
       format_settings:
@@ -58,7 +60,7 @@ content:
     type: smartdate_default
     region: content
   field_event_description:
-    weight: 12
+    weight: 14
     settings:
       rows: 5
       placeholder: ''
@@ -77,17 +79,68 @@ content:
       match_limit: 10
       size: 60
       placeholder: ''
+      dialog_title: ''
     third_party_settings: {  }
     type: entity_reference_tree
     region: content
+  field_event_link:
+    type: link_default
+    weight: 12
+    region: content
+    settings:
+      placeholder_url: ''
+      placeholder_title: ''
+    third_party_settings:
+      conditional_fields:
+        ae9afd15-a22d-4983-b80f-30a1c22ec121:
+          dependee: field_event_location_logistics
+          settings:
+            state: visible
+            condition: value
+            grouping: AND
+            values_set: 1
+            value: ''
+            values: {  }
+            value_form:
+              -
+                value: online
+            effect: show
+            effect_options: {  }
+            selector: ''
+          entity_type: node
+          bundle: event
   field_event_location:
-    weight: 11
+    weight: 13
     settings:
       size: 60
       placeholder: ''
-    third_party_settings: {  }
+    third_party_settings:
+      conditional_fields:
+        d8c267ce-104d-4c96-9abc-f7b496c7b58e:
+          dependee: field_event_location_logistics
+          settings:
+            state: visible
+            condition: value
+            grouping: AND
+            values_set: 1
+            value: ''
+            values: {  }
+            value_form:
+              -
+                value: in-person
+            effect: show
+            effect_options: {  }
+            selector: ''
+          entity_type: node
+          bundle: event
     type: string_textfield
     region: content
+  field_event_location_logistics:
+    weight: 11
+    settings: {  }
+    third_party_settings: {  }
+    type: options_buttons
+    region: content
   field_event_recording:
     weight: 15
     settings:
@@ -97,7 +150,7 @@ content:
     type: link_default
     region: content
   field_event_tags:
-    weight: 13
+    weight: 15
     settings:
       match_operator: CONTAINS
       size: 60
@@ -165,7 +218,7 @@ content:
     region: content
     third_party_settings: {  }
   url_redirects:
-    weight: 15
+    weight: 17
     region: content
     settings: {  }
     third_party_settings: {  }

diff --git a/config/sync/core.entity_view_display.node.event.default.yml b/config/sync/core.entity_view_display.node.event.default.yml
@@ -6,7 +6,9 @@ dependencies:
     - field.field.node.event.field_event_date
     - field.field.node.event.field_event_description
     - field.field.node.event.field_event_host
+    - field.field.node.event.field_event_link
     - field.field.node.event.field_event_location
+    - field.field.node.event.field_event_location_logistics
     - field.field.node.event.field_event_recording
     - field.field.node.event.field_event_tags
     - field.field.node.event.field_show_on_agency_calendar
@@ -17,6 +19,7 @@ dependencies:
     - layout_discovery
     - layout_library
     - link
+    - options
     - smart_date
     - text
     - user
@@ -29,7 +32,22 @@ third_party_settings:
         layout_id: layout_onecol
         layout_settings:
           label: ''
-        components: {  }
+        components:
+          321dae54-4782-46db-9b8b-d7d8b2260430:
+            uuid: 321dae54-4782-46db-9b8b-d7d8b2260430
+            region: content
+            configuration:
+              label_display: '0'
+              context_mapping:
+                entity: layout_builder.entity
+              id: 'field_block:node:event:field_event_location_logistics'
+              formatter:
+                label: above
+                settings: {  }
+                third_party_settings: {  }
+                type: list_default
+            additional: {  }
+            weight: 0
         third_party_settings: {  }
       -
         layout_id: layout_twocol_section
@@ -52,9 +70,9 @@ third_party_settings:
                   timezone_override: ''
                   format: default
                   force_chronological: false
-                  add_classes: 0
-                  past_display: '2'
-                  upcoming_display: '2'
+                  add_classes: false
+                  past_display: 2
+                  upcoming_display: 2
                   show_next: false
                 third_party_settings: {  }
               context_mapping:
@@ -203,6 +221,13 @@ content:
     third_party_settings: {  }
     type: string
     region: content
+  field_event_location_logistics:
+    weight: 115
+    label: above
+    settings: {  }
+    third_party_settings: {  }
+    type: list_default
+    region: content
   field_event_recording:
     weight: 109
     label: above
@@ -240,4 +265,5 @@ content:
     region: content
 hidden:
   content_moderation_control: true
+  field_event_link: true
   search_api_excerpt: true
diff --git a/config/sync/core.entity_view_display.node.event.list.yml b/config/sync/core.entity_view_display.node.event.list.yml
@@ -7,7 +7,9 @@ dependencies:
     - field.field.node.event.field_event_date
     - field.field.node.event.field_event_description
     - field.field.node.event.field_event_host
+    - field.field.node.event.field_event_link
     - field.field.node.event.field_event_location
+    - field.field.node.event.field_event_location_logistics
     - field.field.node.event.field_event_recording
     - field.field.node.event.field_event_tags
     - field.field.node.event.field_show_on_agency_calendar
@@ -34,9 +36,9 @@ content:
     settings:
       timezone_override: ''
       format: compact
-      past_display: '0'
-      upcoming_display: '4'
-      force_chronological: 0
+      past_display: 0
+      upcoming_display: 4
+      force_chronological: false
       format_type: medium
     third_party_settings: {  }
     type: smartdate_recurring
@@ -45,9 +47,11 @@ hidden:
   content_moderation_control: true
   field_event_description: true
   field_event_host: true
+  field_event_link: true
   field_event_location: true
+  field_event_location_logistics: true
   field_event_recording: true
   field_event_tags: true
   field_show_on_agency_calendar: true
   links: true
-  search_api_excerpt: true
+  search_api_excerpt: true
diff --git a/config/sync/core.entity_view_display.node.event.reference_list.yml b/config/sync/core.entity_view_display.node.event.reference_list.yml
@@ -7,7 +7,9 @@ dependencies:
     - field.field.node.event.field_event_date
     - field.field.node.event.field_event_description
     - field.field.node.event.field_event_host
+    - field.field.node.event.field_event_link
     - field.field.node.event.field_event_location
+    - field.field.node.event.field_event_location_logistics
     - field.field.node.event.field_event_recording
     - field.field.node.event.field_event_tags
     - field.field.node.event.field_show_on_agency_calendar
@@ -42,10 +44,10 @@ content:
     settings:
       timezone_override: ''
       format: compact
-      past_display: '0'
-      upcoming_display: '4'
+      past_display: 0
+      upcoming_display: 4
       force_chronological: false
-      add_classes: 0
+      add_classes: false
       show_next: false
       format_type: medium
     third_party_settings: {  }
@@ -58,9 +60,11 @@ hidden:
   entity_print_view_word_docx: true
   field_event_description: true
   field_event_host: true
+  field_event_link: true
   field_event_location: true
+  field_event_location_logistics: true
   field_event_recording: true
   field_event_tags: true
   field_show_on_agency_calendar: true
   links: true
-  search_api_excerpt: true
+  search_api_excerpt: true
diff --git a/config/sync/core.entity_view_display.node.event.sidebar_teaser.yml b/config/sync/core.entity_view_display.node.event.sidebar_teaser.yml
@@ -7,7 +7,9 @@ dependencies:
     - field.field.node.event.field_event_date
     - field.field.node.event.field_event_description
     - field.field.node.event.field_event_host
+    - field.field.node.event.field_event_link
     - field.field.node.event.field_event_location
+    - field.field.node.event.field_event_location_logistics
     - field.field.node.event.field_event_recording
     - field.field.node.event.field_event_tags
     - field.field.node.event.field_show_on_agency_calendar
@@ -43,10 +45,10 @@ content:
     settings:
       timezone_override: ''
       format: time_only
-      past_display: '0'
-      upcoming_display: '0'
+      past_display: 0
+      upcoming_display: 0
       force_chronological: false
-      add_classes: 0
+      add_classes: false
       show_next: false
       format_type: medium
     third_party_settings: {  }
@@ -73,9 +75,11 @@ hidden:
   entity_print_view_epub: true
   entity_print_view_pdf: true
   entity_print_view_word_docx: true
+  field_event_link: true
   field_event_location: true
+  field_event_location_logistics: true
   field_event_recording: true
   field_event_tags: true
   field_show_on_agency_calendar: true
   links: true
-  search_api_excerpt: true
+  search_api_excerpt: true
diff --git a/config/sync/core.entity_view_display.node.event.teaser.yml b/config/sync/core.entity_view_display.node.event.teaser.yml
@@ -7,7 +7,9 @@ dependencies:
     - field.field.node.event.field_event_date
     - field.field.node.event.field_event_description
     - field.field.node.event.field_event_host
+    - field.field.node.event.field_event_link
     - field.field.node.event.field_event_location
+    - field.field.node.event.field_event_location_logistics
     - field.field.node.event.field_event_recording
     - field.field.node.event.field_event_tags
     - field.field.node.event.field_show_on_agency_calendar
@@ -29,10 +31,10 @@ content:
     settings:
       timezone_override: ''
       format: time_only
-      past_display: '0'
-      upcoming_display: '0'
+      past_display: 0
+      upcoming_display: 0
       force_chronological: false
-      add_classes: 0
+      add_classes: false
       show_next: false
       format_type: medium
     third_party_settings: {  }
@@ -57,9 +59,11 @@ hidden:
   entity_print_view_epub: true
   entity_print_view_pdf: true
   entity_print_view_word_docx: true
+  field_event_link: true
   field_event_location: true
+  field_event_location_logistics: true
   field_event_recording: true
   field_event_tags: true
   field_show_on_agency_calendar: true
   links: true
-  search_api_excerpt: true
+  search_api_excerpt: true
diff --git a/config/sync/field.field.node.event.field_event_location_logistics.yml b/config/sync/field.field.node.event.field_event_location_logistics.yml
@@ -1,4 +1,4 @@
-uuid: 309486c2-3bbb-4558-b746-b28a6d0fd438
+uuid: 3c440d08-36de-45b2-8743-121a312e8140
 langcode: en
 status: true
 dependencies:
@@ -12,7 +12,7 @@ field_name: field_event_location_logistics
 entity_type: node
 bundle: event
 label: 'Event Location Logistics'
-description: 'Select the appropriate location for the event.'
+description: 'Will the event be online, in-person, or both?'
 required: true
 translatable: false
 default_value: {  }

diff --git a/config/sync/field.storage.node.field_event_location_logistics.yml b/config/sync/field.storage.node.field_event_location_logistics.yml
@@ -1,4 +1,4 @@
-uuid: 223d9229-6f7a-4508-ad5b-6138d12c8179
+uuid: 67525242-b8ca-4b56-933c-9e1ed631097e
 langcode: en
 status: true
 dependencies:
@@ -21,13 +21,10 @@ settings:
     -
       value: in-person
       label: 'In Person'
-    -
-      value: both
-      label: Both
   allowed_values_function: ''
 module: options
 locked: false
-cardinality: 1
+cardinality: -1
 translatable: true
 indexes: {  }
 persist_with_no_fields: false