Merge dev-container updates/hot-fixes into stage-container-1

USEPA · Sep 5, 2024 · 46975c1 · 46975c1
1 parent a913e31
commit 46975c1
Show file tree

Hide file tree

Showing 8 changed files with 54 additions and 11 deletions.
diff --git a/composer.json b/composer.json
@@ -195,6 +195,9 @@
                 "Fix ICS HTML formatting": "patches/rerolled_spatie_timezone_format2.patch",
                 "PHP compatibility": "patches/spatie_php.patch"
             },
+            "drupal/conditional_fields": {
+                "Required Field Error with Dependent Visibility": "https://www.drupal.org/files/issues/2023-05-05/3344587-required_fields_not_visible-15.patch"
+            },             
             "drupal/draggableviews": {
                 "Remove view_name and view_display join since it will never be correct as is.": "patches/draggableviews_remove_join.patch"
             },
@@ -215,7 +218,8 @@
             },            
             "drupal/webform": {
                 "Cast variable to int for postgreSQL DBs": "patches/webform_group_variable_cast.patch",
-                "Allowing all users to download submission files": "patches/submission_file_access.patch"
+                "Allowing all users to download submission files": "patches/submission_file_access.patch",
+                "Files cannot be attached to the form": "https://www.drupal.org/files/issues/2023-01-09/3328986-19.patch"               
             },
             "drupal/viewsreference": {
                 "3166490: Fixes missing display upon first adding a list": "https://www.drupal.org/files/issues/2021-01-15/viewsreference-ajax_after_display_selection-3166490-6.patch"

diff --git a/config/sync/block.block.views_block__forms_block_1.yml b/config/sync/block.block.views_block__forms_block_1.yml
@@ -0,0 +1,34 @@
+uuid: 249ce4e6-8fcb-480f-b0c0-d25cd17eb9eb
+langcode: en
+status: true
+dependencies:
+  config:
+    - views.view.forms
+  module:
+    - block_in_page_not_found
+    - system
+    - views
+  theme:
+    - epa_intranet_2
+id: views_block__forms_block_1
+theme: epa_intranet_2
+region: content
+weight: 0
+provider: null
+plugin: 'views_block:forms-block_1'
+settings:
+  id: 'views_block:forms-block_1'
+  label: ''
+  label_display: visible
+  provider: views
+  views_label: ''
+  items_per_page: none
+visibility:
+  page_not_found_request:
+    id: page_not_found_request
+    negate: false
+    page_not_found: false
+  request_path:
+    id: request_path
+    negate: false
+    pages: /forms/internal-forms-inventory
diff --git a/config/sync/core.entity_form_display.node.event.default.yml b/config/sync/core.entity_form_display.node.event.default.yml
@@ -77,6 +77,9 @@ content:
         custom
       show_extra: true
       hide_date: false
+      allday: true
+      remove_seconds: false
+      separator: to
       add_abbreviations: ''
     third_party_settings:
       smart_date_recur:
@@ -121,12 +124,13 @@ content:
       placeholder_title: ''
     third_party_settings:
       conditional_fields:
-        ae9afd15-a22d-4983-b80f-30a1c22ec121:
+        c7655269-6e51-4254-b9de-f5bcaed6aea8:
           entity_type: node
           bundle: event
           dependee: field_event_location_logistics
           settings:
-            state: visible
+            state: required
+            reset: false
             condition: value
             grouping: AND
             values_set: 1
@@ -147,12 +151,13 @@ content:
       placeholder: ''
     third_party_settings:
       conditional_fields:
-        d8c267ce-104d-4c96-9abc-f7b496c7b58e:
+        653edad1-822c-4fca-a9c2-44c343bbd17a:
           entity_type: node
           bundle: event
           dependee: field_event_location_logistics
           settings:
-            state: visible
+            state: required
+            reset: false
             condition: value
             grouping: AND
             values_set: 1
@@ -247,4 +252,4 @@ content:
     third_party_settings: {  }
 hidden:
   promote: true
-  sticky: true
+  sticky: true
diff --git a/config/sync/field.field.node.event.field_event_link.yml b/config/sync/field.field.node.event.field_event_link.yml
@@ -13,7 +13,7 @@ entity_type: node
 bundle: event
 label: 'Event Link'
 description: 'If the event will be held remotely (MS Teams, Zoom, etc), please enter the link to the online event. '
-required: true
+required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/config/sync/field.field.node.event.field_event_location.yml b/config/sync/field.field.node.event.field_event_location.yml
@@ -11,7 +11,7 @@ entity_type: node
 bundle: event
 label: 'Event Location'
 description: 'Enter the physical location of the event.'
-required: true
+required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/config/sync/field.field.paragraph.title_and_text.field_box_style.yml b/config/sync/field.field.paragraph.title_and_text.field_box_style.yml
@@ -13,7 +13,7 @@ entity_type: paragraph
 bundle: title_and_text
 label: Style
 description: 'Boxes are used to highlight specific web content. Each box style has <a href="/web-guide/web-standard-boxes">specific content requirements</a> and should be used appropriately.'
-required: true
+required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/config/sync/field.field.paragraph.title_and_text.field_paragraph_text.yml b/config/sync/field.field.paragraph.title_and_text.field_paragraph_text.yml
@@ -13,7 +13,7 @@ entity_type: paragraph
 bundle: title_and_text
 label: Text
 description: ''
-required: true
+required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''

diff --git a/config/sync/field.field.paragraph.title_and_text.field_paragraph_title.yml b/config/sync/field.field.paragraph.title_and_text.field_paragraph_title.yml
@@ -11,7 +11,7 @@ entity_type: paragraph
 bundle: title_and_text
 label: Title
 description: ''
-required: true
+required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''