Merge pull request #863 from USEPA/main

Preparing for new tag

services/drupal/composer.json

@@ -301,7 +301,7 @@
         "drupal/s3fs": "^3.0@beta",
         "drupal/samlauth": "^3.0",
         "drupal/scheduled_publish": "^3.9",
-        "drupal/search_api": "^1.19",
+        "drupal/search_api": "^1.27",
         "drupal/seckit": "^2.0",
         "drupal/shield": "1.x-dev",
         "drupal/show_email": "^1.1",

services/drupal/composer.patches.json

@@ -104,7 +104,8 @@
     "drupal/elasticsearch_connector": {
       "Parse data facets from epoch milliseconds format to seconds": "https://www.drupal.org/files/issues/2020-11-27/3096887-elasticsearch_connector_-7.x-parse_date_facets-7.patch",
       "Facet OR: global aggregation does not take views filter into account": "https://www.drupal.org/files/issues/2021-02-02/elasticsearch_connector-facet_OR_global_aggregation_does_not_take_views_filter_into_account-3014805-24.patch",
-      "Accurately count total number of results": "https://www.drupal.org/files/issues/2021-11-18/3250145-1-track-total-hits.patch"
+      "Accurately count total number of results": "https://www.drupal.org/files/issues/2021-11-18/3250145-1-track-total-hits.patch",
+      "Implement luceneFlattenKeys": "https://www.drupal.org/files/issues/2021-09-28/elasticsearch_connector-flattenkeys-2952301-15.patch"
     },
     "drupal/redis": {
       "Enable cluster mode support": "https://www.drupal.org/files/issues/2020-02-06/2900947-17.patch"
@@ -213,7 +214,9 @@
       "Allow specifying links to specific paths on the other environments": "https://www.drupal.org/files/issues/2022-06-23/environment_indicator-configure_switcher_path-3274102-5.patch"
     },
     "drupal/addtocal":{
-      "patch for smart date": "https://www.drupal.org/files/issues/2022-02-10/3224310-4-smartdate-integration.patch"
+      "patch for smart date": "https://www.drupal.org/files/issues/2022-02-10/3224310-4-smartdate-integration.patch",
+      "patch for newline handling": "https://www.drupal.org/files/issues/2022-09-26/addtocal-fix-newlines-3311870-2.patch",
+      "patch for escaping commas in location field": "patches/addtocal-escape_location_commas-3319571-3-rolled-to-apply-on-3311870-2.patch"
     },
     "drupal/show_email": {
       "Fix config schema": "https://www.drupal.org/files/issues/2020-10-15/show_email-config_schema_issues-3177062-2.patch"

services/drupal/config/sync/core.entity_form_display.node.event.default.yml

@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.node.event.field_add_to_cal_description
     - field.field.node.event.field_channel
     - field.field.node.event.field_date
     - field.field.node.event.field_daterange
@@ -102,7 +103,7 @@ third_party_settings:
       label: 'Additional Fields'
       region: content
       parent_name: ''
-      weight: 12
+      weight: 13
       format_type: tabs
       format_settings:
         classes: ''
@@ -115,7 +116,7 @@ mode: default
 content:
   created:
     type: datetime_timestamp
-    weight: 14
+    weight: 15
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -129,6 +130,19 @@ content:
       multiple: false
       required: true
     third_party_settings: {  }
+  field_add_to_cal_description:
+    type: string_textarea
+    weight: 7
+    region: content
+    settings:
+      rows: 5
+      placeholder: ''
+    third_party_settings:
+      maxlength:
+        maxlength_js: 1024
+        maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
+        maxlength_js_enforce: false
+        maxlength_js_truncate_html: false
   field_channel:
     type: options_buttons
     weight: 13
@@ -203,15 +217,15 @@ content:
     third_party_settings: {  }
   field_event_host:
     type: string_textfield
-    weight: 10
+    weight: 11
     region: content
     settings:
       size: 60
       placeholder: ''
     third_party_settings: {  }
   field_event_type:
     type: options_select
-    weight: 9
+    weight: 10
     region: content
     settings: {  }
     third_party_settings: {  }
@@ -233,7 +247,7 @@ content:
     third_party_settings: {  }
   field_hublinks:
     type: entity_reference_autocomplete
-    weight: 11
+    weight: 12
     region: content
     settings:
       match_operator: CONTAINS
@@ -259,7 +273,7 @@ content:
     third_party_settings: {  }
   field_links:
     type: link_default
-    weight: 8
+    weight: 9
     region: content
     settings:
       placeholder_url: ''
@@ -294,7 +308,7 @@ content:
         maxlength_js_truncate_html: false
   field_paragraphs:
     type: paragraphs
-    weight: 7
+    weight: 8
     region: content
     settings:
       title: Paragraph
@@ -331,27 +345,27 @@ content:
     third_party_settings: {  }
   moderation_state:
     type: moderation_state_default
-    weight: 18
+    weight: 19
     region: content
     settings: {  }
     third_party_settings: {  }
   promote:
     type: boolean_checkbox
-    weight: 15
+    weight: 16
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   status:
     type: boolean_checkbox
-    weight: 17
+    weight: 18
     region: content
     settings:
       display_label: true
     third_party_settings: {  }
   sticky:
     type: boolean_checkbox
-    weight: 16
+    weight: 17
     region: content
     settings:
       display_label: true
@@ -366,7 +380,7 @@ content:
     third_party_settings: {  }
   uid:
     type: entity_reference_autocomplete
-    weight: 13
+    weight: 14
     region: content
     settings:
       match_operator: CONTAINS
@@ -375,7 +389,7 @@ content:
       placeholder: ''
     third_party_settings: {  }
   url_redirects:
-    weight: 19
+    weight: 20
     region: content
     settings: {  }
     third_party_settings: {  }

services/drupal/config/sync/core.entity_view_display.node.event.default.yml

@@ -3,6 +3,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - field.field.node.event.field_add_to_cal_description
     - field.field.node.event.field_channel
     - field.field.node.event.field_date
     - field.field.node.event.field_daterange
@@ -59,7 +60,7 @@ content:
         tokenized: ''
       description:
         value: field_description
-        tokenized: ''
+        tokenized: 'This value is dynamically generated in epa_core_addtocal_alter().'
       past_events: false
       separator: '-'
       date_format: 'Y-m-d\TH:i:s'
@@ -132,6 +133,7 @@ content:
 hidden:
   content_moderation_control: true
   entitygroupfield: true
+  field_add_to_cal_description: true
   field_channel: true
   field_date: true
   field_description: true