Skip to content

Commit

Permalink
Merge pull request #1244 from USEPA/Version-20231211
Browse files Browse the repository at this point in the history
Version-20231211
  • Loading branch information
carsoncho authored Dec 12, 2023
2 parents 6603887 + 7d54d6d commit 1dca17e
Show file tree
Hide file tree
Showing 71 changed files with 735 additions and 1,159 deletions.
4 changes: 0 additions & 4 deletions .buildkite/infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,6 @@ steps:
# Copy images from the Docker Hub into the AWS perimeter
- label: ":docker: Mirror Images"
command:
# Traefik (customized for failover)
- docker build services/traefik -t ${WEBCMS_REPO_URL}/webcms-${WEBCMS_ENVIRONMENT}-traefik:latest
- docker push ${WEBCMS_REPO_URL}/webcms-${WEBCMS_ENVIRONMENT}-traefik:latest

# AWS CloudWatch agent (used to send statsd metrics)
- docker pull amazon/cloudwatch-agent
- docker tag amazon/cloudwatch-agent ${WEBCMS_REPO_URL}/webcms-${WEBCMS_ENVIRONMENT}-aws-cloudwatch
Expand Down
2 changes: 2 additions & 0 deletions services/drupal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@
"composer/installers": "^1.2",
"cweagans/composer-patches": "^1.6.5",
"d3/d3": "^3.5",
"drupal/access_unpublished": "^1.5",
"drupal/address": "^1.7",
"drupal/address_formatter": "^2.0@alpha",
"drupal/addtocal": "^2.0",
"drupal/admin_toolbar": "^3.3",
"drupal/allowed_formats": "^2.0",
Expand Down
96 changes: 96 additions & 0 deletions services/drupal/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 13 additions & 3 deletions services/drupal/composer.patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"Don't run trimmed text through Xss::filter()": "https://www.drupal.org/files/issues/2019-12-10/drupal-core-2922569-9.patch",
"#3047022 - Properly handle block_content access control for revisions": "https://www.drupal.org/files/issues/2021-02-11/3047022-56.patch",
"Don't strip view mode from embedded media just because selected view mode matches default": "https://www.drupal.org/files/issues/2023-03-23/3109289-68.patch",
"Fixes inability to edit block in Layout Builder on a revision that has been reverted": "https://www.drupal.org/files/issues/2021-01-27/3053881-42.patch",
"Views RSS feeds have validation issues": "https://www.drupal.org/files/issues/2022-11-28/1337894-37.patch",
"Do not crash when an entity is missing from a views relationship (this may need to be just papering over an underlying problem)": "https://www.drupal.org/files/issues/2020-09-08/get_cache_tags_null-3169694-2.patch",
"Validation for views datetime filter": "patches/views-exposed-datetime-validation-2.patch",
Expand Down Expand Up @@ -43,7 +42,9 @@
"Add support for svgs in image fields": "https://www.drupal.org/files/issues/2022-06-23/drupal-responsive_image_svg_support-2957924-11.patch",
"Reset media library pagination when interacting with exposed filters": "https://www.drupal.org/files/issues/2022-09-08/drupal-media_library_reset_pagination-3308719-3.patch",
"Revision tokens for content entities": "https://www.drupal.org/files/issues/2920310-04.patch",
"Improve format_size to support a precision parameter" : "https://www.drupal.org/files/issues/2019-01-08/2837979-format_size_precision-09.patch"
"Improve format_size to support a precision parameter" : "https://www.drupal.org/files/issues/2019-01-08/2837979-format_size_precision-09.patch",
"Display Bug when using #states (Forms API) with Ajax Request": "https://www.drupal.org/files/issues/2023-01-30/1091852-172.patch",
"PHP message: Error: Call to a member function getEntityTypeId() on null (Layout Builder)": "https://www.drupal.org/files/issues/2023-06-12/3049332-82.diff"
},
"drupal/autologout": {
"Logout Message not rendering markup" : "patches/logout-message-not-rendering-markup.patch"
Expand All @@ -65,6 +66,9 @@
"drupal/groupmedia": {
"Display media bundles in alpha order": "https://www.drupal.org/files/issues/2020-10-20/groupmedia-order_bundles-3178034-3.patch"
},
"drupal/layout_builder_iframe_modal": {
"Uncaught exception 'TypeError' with message 'Drupal\\layout_builder_iframe_modal\\IframeModalHelper::isModalRoute(): Argument #1 ($route_name) must be of type string, null given.": "https://git.drupalcode.org/project/layout_builder_iframe_modal/-/merge_requests/6.diff"
},
"drupal/addtocal": {
"Drupal 10 compatibility fixes": "https://www.drupal.org/files/issues/2023-04-21/drupal-10-compatibility-v2.patch"
},
Expand Down Expand Up @@ -203,7 +207,8 @@
"Fix paragraphs embed modal styles": "patches/adjusted-css-for-modal.patch"
},
"drupal/linked_field": {
"Generate relative links rather than absolute": "https://www.drupal.org/files/issues/2020-05-22/linked_field-relative-destination-url-3139179-1-D8.patch"
"Generate relative links rather than absolute": "https://www.drupal.org/files/issues/2020-05-22/linked_field-relative-destination-url-3139179-1-D8.patch",
"Fixes issue with misconfigured layout_builder block": "patches/add-logic-to-resolve-broken-value.patch"
},
"drupal/diff": {
"Patch diff interface to get language to match core patches in these issues: 3252521, 2899719, and 3252540": "patches/diff-patch-revision-language-to-match-3252521-2899719-3252540-2.patch",
Expand Down Expand Up @@ -261,6 +266,11 @@
},
"spatie/calendar-links": {
"Resolving issue with ICS not working with Outlook": "patches/ics-microsoft-outlook-fix-from-dogawaf-73.patch"
},
"drupal/access_unpublished": {
"Support Group content": "https://git.drupalcode.org/project/access_unpublished/-/merge_requests/6.patch",
"Set custom duration options": "patches/set-custom-duration-options.patch",
"Permission by role for generating a AU token" : "https://git.drupalcode.org/project/access_unpublished/-/merge_requests/14.diff"
}
}
}
7 changes: 7 additions & 0 deletions services/drupal/config/sync/access_unpublished.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
_core:
default_config_hash: y5Xg-FUIU8W1dPEQKblOm3AsAJ7PCh-MFBJ-4Dv9TCE
hash_key: auHash
duration: 172800
cleanup_expired_tokens: false
cleanup_expired_tokens_period: '-2 weeks'
modify_http_headers: { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
uuid: b70cb0b2-1262-418c-a557-4534d2dfedc5
langcode: en
status: true
dependencies: { }
id: city_state
label: 'City, State'
options:
US-all:
country: US
language: all
template:
value: '%locality% %administrative_area%'
format: unprocessed
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
uuid: 538244a7-f7e8-4ee6-8887-003377fc44c0
langcode: en
status: true
dependencies: { }
_core:
default_config_hash: NrFYIcjbPuJPFeYD09xerLJYgQLtTRP_BMtzD-xab-s
id: default
label: Default
options: { }
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
uuid: 184c57f5-8e48-4fc7-97dd-850ec30698e1
langcode: en
status: true
dependencies:
config:
- address_formatter.options.city_state
- core.entity_view_mode.node.list
- 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
- field.field.node.event.field_deadline
- field.field.node.event.field_description
- field.field.node.event.field_display_arcgis_map
- field.field.node.event.field_env_laws_regs_and_treaties
- field.field.node.event.field_event_cancellation
- field.field.node.event.field_event_host
- field.field.node.event.field_event_type
- field.field.node.event.field_expiration_date
- field.field.node.event.field_geographic_locations
- field.field.node.event.field_hublinks
- field.field.node.event.field_is_searchable_collection
- field.field.node.event.field_keywords
- field.field.node.event.field_language
- field.field.node.event.field_last_published
- field.field.node.event.field_links
- field.field.node.event.field_location
- field.field.node.event.field_machine_name
- field.field.node.event.field_meta_tags
- field.field.node.event.field_owning_office
- field.field.node.event.field_page_head
- field.field.node.event.field_paragraphs
- field.field.node.event.field_publish_date
- field.field.node.event.field_review_deadline
- field.field.node.event.field_scheduled_transition
- field.field.node.event.field_search_text
- field.field.node.event.field_type
- node.type.event
module:
- address_formatter
- epa_core
- layout_builder
- user
third_party_settings:
layout_builder:
enabled: false
allow_custom: false
id: node.event.list
targetEntityType: node
bundle: event
mode: list
content:
field_daterange:
type: date_range_without_time_smartdate
label: hidden
settings:
timezone_override: ''
single: 'F j, Y'
single_all_day: 'F j, Y'
one_day: 'F j, Y'
one_month: 'F j - {j}, {Y}'
several_months: 'F j, Y - {F} {j}, {Y}'
several_years: 'F j, Y - {F} {j}, {Y}'
event_title: ''
location: '[node:field_location:address_line1] [node:field_location:address_line2], [node:field_location:locality], [node:field_location:administrative_area] [node:field_location:postal_code], [node:field_location:country_code]'
description: '[node:epa-addtocal-description]'
hide_add_to_cal: '1'
past_events: 0
separator: '-'
date_format: 'Y-m-d\TH:i:s'
third_party_settings: { }
weight: 0
region: content
field_location:
type: address_html
label: hidden
settings:
options: city_state
third_party_settings: { }
weight: 1
region: content
hidden:
content_moderation_control: true
entitygroupfield: true
field_add_to_cal_description: true
field_channel: true
field_date: true
field_deadline: true
field_description: true
field_display_arcgis_map: true
field_env_laws_regs_and_treaties: true
field_event_cancellation: true
field_event_host: true
field_event_type: true
field_expiration_date: true
field_geographic_locations: true
field_hublinks: true
field_is_searchable_collection: true
field_keywords: true
field_language: true
field_last_published: true
field_links: true
field_machine_name: true
field_meta_tags: true
field_owning_office: true
field_page_head: true
field_paragraphs: true
field_publish_date: true
field_review_deadline: true
field_scheduled_transition: true
field_search_text: true
field_type: true
langcode: true
links: true
search_api_excerpt: true
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,16 @@ content:
label: inline
settings:
timezone_override: ''
single: 'F j, Y g:i a T'
single: 'F j, Y'
single_all_day: 'F j, Y'
one_day: 'F j, Y g:i a - {g}:{i} {a} T'
one_month: 'F j, Y g:i a - {F} {j}, {Y} {g}:{i} {a} T'
several_months: 'F j, Y g:i a - {F} {j}, {Y} {g}:{i} {a} T'
several_years: 'F j, Y g:i a - {F} {j}, {Y} {g}:{i} {a} T'
one_day: 'F j, Y'
one_month: 'F j - {j}, {Y}'
several_months: 'F j, Y - {F} {j}, {Y}'
several_years: 'F j, Y - {F} {j}, {Y}'
event_title: ''
location: '[node:field_location:address_line1] [node:field_location:address_line2], [node:field_location:locality], [node:field_location:administrative_area] [node:field_location:postal_code], [node:field_location:country_code]'
description: '[node:epa-addtocal-description]'
hide_add_to_cal: '1'
past_events: 0
separator: '-'
date_format: 'Y-m-d\TH:i:s'
Expand Down
3 changes: 3 additions & 0 deletions services/drupal/config/sync/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ _core:
default_config_hash: R4IF-ClDHXxblLcG0L7MgsLvfBIMAvi_skumNFQwkDc
module:
epa_core: -10
access_unpublished: 0
access_unpublished_group: 0
action: 0
actions_permissions: 0
address: 0
address_formatter: 0
addtocal: 0
admin_toolbar: 0
admin_toolbar_links_access_filter: 0
Expand Down
Loading

0 comments on commit 1dca17e

Please sign in to comment.