Skip to content

Commit

Permalink
Merge pull request #764 from USEPA/main
Browse files Browse the repository at this point in the history
Prepare for new tag
  • Loading branch information
azinck authored Sep 1, 2022
2 parents 2869695 + 20c5596 commit 6d5b091
Show file tree
Hide file tree
Showing 80 changed files with 2,754 additions and 921 deletions.
1 change: 1 addition & 0 deletions services/drupal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@
"drupal/smart_trim": "^1.3",
"drupal/smtp": "1.x-dev",
"drupal/structure_sync": "^2.0.2",
"drupal/svg_image": "^1.16",
"drupal/token": "^1.9",
"drupal/token_filter": "^1.3",
"drupal/transliterate_filenames": "^1.5",
Expand Down
563 changes: 351 additions & 212 deletions services/drupal/composer.lock

Large diffs are not rendered by default.

12 changes: 9 additions & 3 deletions services/drupal/composer.patches.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@
"Use EPA-preferred terminology for revision reversion operation. This patch needs to be applied on top of the patches for 3252521, 2899719, and 3252540": "patches/rename-revision-revert-operation-button-9.3.x.patch",
"Improve layout builder performance by reducing number of calls to checkRequirements": "patches/drupal-layout-builder-performance-3186116-11.patch",
"JQuery UI order incorrect": "https://www.drupal.org/files/issues/2021-07-19/3222107-jquery_ui_weight_fix-11.diff",
"Avoid OOM errors on update hooks using weakreference cache implementation": "https://www.drupal.org/files/issues/2021-10-05/3190992-39.patch"
"Avoid OOM errors on update hooks using weakreference cache implementation": "https://www.drupal.org/files/issues/2021-10-05/3190992-39.patch",
"Add support for svgs in image fields": "https://www.drupal.org/files/issues/2022-06-23/drupal-responsive_image_svg_support-2957924-11.patch"
},
"drupal/group": {
"Get a token of a node's parent group to create a pathauto pattern": "https://www.drupal.org/files/issues/2020-02-21/group-gnode_tokens-2774827-62.patch",
Expand Down Expand Up @@ -147,7 +148,8 @@
},
"drupal/views_data_export": {
"Allow other modules to alter query in batch mode (needed for Groups support and batch export)": "https://www.drupal.org/files/issues/2021-02-12/3173296-9-batch-query-alter.patch",
"Allow custom redirect to use contextual filter tokens (https://www.drupal.org/project/views_data_export/issues/3122641)": "https://www.drupal.org/files/issues/2020-05-21/batch_redirect_fails_for_views_with_path_parameters-3122641-4.patch"
"Allow custom redirect to use contextual filter tokens (https://www.drupal.org/project/views_data_export/issues/3122641)": "https://www.drupal.org/files/issues/2020-05-21/batch_redirect_fails_for_views_with_path_parameters-3122641-4.patch",
"Add log message when data export happens": "patches/epa-log-export.patch"
},
"drupal/address": {
"Stop performing subdivision-level postal code validation": "https://www.drupal.org/files/issues/2020-11-29/2828128-38-disable-subdivision-postal-code-validation.patch"
Expand Down Expand Up @@ -193,7 +195,8 @@
"Create new revisions of embedded paragraphs": "https://www.drupal.org/files/issues/2021-07-26/paragraphs_entity_embed-revisioning-3004077-7.patch",
"Prevent the reuse of embedded paragraphs": "https://www.drupal.org/files/issues/2020-04-30/paragraphs_entity_embed-single_use-3132549-2.patch",
"Allow modal to be larger": "https://www.drupal.org/files/issues/2021-10-22/paragraphs_entity_embed-dialog_too_small-3117524-5.patch",
"Allow use of buttons for selecting paragraph type": "https://www.drupal.org/files/issues/2020-04-30/paragraphs_entity_embed-add_mode-3089674-3.patch"
"Allow use of buttons for selecting paragraph type": "https://www.drupal.org/files/issues/2020-04-30/paragraphs_entity_embed-add_mode-3089674-3.patch",
"Make compatible with new security in embed module": "https://www.drupal.org/files/issues/2022-05-27/paragraphs_entity_embed_csrf_token.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"
Expand Down Expand Up @@ -226,6 +229,9 @@
},
"nodespark/des-connector": {
"Make magic __wakeup method public for PHP 8 compatibility": "patches/des-connector-php-8-fixes.patch"
},
"drupal/focal_point": {
"Allow SVG uploads in widget": "https://www.drupal.org/files/issues/2021-10-27/svg_support-3122722-13.patch"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,14 @@ content:
weight: 49
region: content
settings:
rows: 5
rows: 20
placeholder: ''
third_party_settings: { }
third_party_settings:
maxlength:
maxlength_js: null
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
maxlength_js_enforce: false
maxlength_js_truncate_html: false
field_paragraphs:
type: paragraphs
weight: 7
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,9 +224,14 @@ content:
weight: 49
region: content
settings:
rows: 5
rows: 20
placeholder: ''
third_party_settings: { }
third_party_settings:
maxlength:
maxlength_js: null
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
maxlength_js_enforce: false
maxlength_js_truncate_html: false
field_publish_date:
type: datetime_default
weight: 46
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,14 @@ content:
weight: 49
region: content
settings:
rows: 5
rows: 20
placeholder: ''
third_party_settings: { }
third_party_settings:
maxlength:
maxlength_js: null
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
maxlength_js_enforce: false
maxlength_js_truncate_html: false
field_paragraphs:
type: paragraphs
weight: 3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,14 @@ content:
weight: 26
region: content
settings:
rows: 5
rows: 20
placeholder: ''
third_party_settings: { }
third_party_settings:
maxlength:
maxlength_js: null
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
maxlength_js_enforce: false
maxlength_js_truncate_html: false
field_paragraphs:
type: paragraphs
weight: 4
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,9 +323,14 @@ content:
weight: 49
region: content
settings:
rows: 5
rows: 20
placeholder: ''
third_party_settings: { }
third_party_settings:
maxlength:
maxlength_js: null
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
maxlength_js_enforce: false
maxlength_js_truncate_html: false
field_permit_number:
type: string_textfield
weight: 11
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,14 @@ content:
weight: 49
region: content
settings:
rows: 5
rows: 20
placeholder: ''
third_party_settings: { }
third_party_settings:
maxlength:
maxlength_js: null
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
maxlength_js_enforce: false
maxlength_js_truncate_html: false
field_publish_date:
type: datetime_default
weight: 46
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ dependencies:
- field_group
- paragraphs
- shs
- text
third_party_settings:
field_group:
group_metadata:
Expand Down Expand Up @@ -90,7 +89,7 @@ third_party_settings:
label: 'Additional Fields'
region: content
parent_name: ''
weight: 6
weight: 5
format_type: tabs
format_settings:
classes: ''
Expand All @@ -103,7 +102,7 @@ mode: default
content:
created:
type: datetime_timestamp
weight: 8
weight: 7
region: content
settings: { }
third_party_settings: { }
Expand All @@ -117,14 +116,6 @@ content:
multiple: false
required: true
third_party_settings: { }
field_aside_block:
type: text_textarea
weight: 5
region: content
settings:
rows: 5
placeholder: ''
third_party_settings: { }
field_banner:
type: entity_reference_paragraphs
weight: 2
Expand Down Expand Up @@ -203,9 +194,14 @@ content:
weight: 49
region: content
settings:
rows: 5
rows: 20
placeholder: ''
third_party_settings: { }
third_party_settings:
maxlength:
maxlength_js: null
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
maxlength_js_enforce: false
maxlength_js_truncate_html: false
field_paragraphs:
type: paragraphs
weight: 4
Expand Down Expand Up @@ -245,27 +241,27 @@ content:
third_party_settings: { }
moderation_state:
type: moderation_state_default
weight: 12
weight: 11
region: content
settings: { }
third_party_settings: { }
promote:
type: boolean_checkbox
weight: 9
weight: 8
region: content
settings:
display_label: true
third_party_settings: { }
status:
type: boolean_checkbox
weight: 11
weight: 10
region: content
settings:
display_label: true
third_party_settings: { }
sticky:
type: boolean_checkbox
weight: 10
weight: 9
region: content
settings:
display_label: true
Expand All @@ -280,7 +276,7 @@ content:
third_party_settings: { }
uid:
type: entity_reference_autocomplete
weight: 7
weight: 6
region: content
settings:
match_operator: CONTAINS
Expand All @@ -289,11 +285,12 @@ content:
placeholder: ''
third_party_settings: { }
url_redirects:
weight: 13
weight: 12
region: content
settings: { }
third_party_settings: { }
hidden:
field_aside_block: true
field_last_published: true
field_review_deadline: true
field_scheduled_transition: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,9 +171,14 @@ content:
weight: 49
region: content
settings:
rows: 5
rows: 20
placeholder: ''
third_party_settings: { }
third_party_settings:
maxlength:
maxlength_js: null
maxlength_js_label: 'Content limited to @limit characters, remaining: <strong>@remaining</strong>'
maxlength_js_enforce: false
maxlength_js_truncate_html: false
field_paragraphs:
type: paragraphs
weight: 2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,32 +14,62 @@ targetEntityType: user
bundle: user
mode: default
content:
access:
type: timestamp_ago
label: inline
settings:
future_format: '@interval hence'
past_format: '@interval ago'
granularity: 5
third_party_settings: { }
weight: 2
region: content
entitygroupfield:
type: epa_parent_group_with_roles_formatter
label: above
settings: { }
third_party_settings: { }
weight: 2
weight: 5
region: content
field_full_name:
type: string
label: inline
settings:
link_to_entity: false
third_party_settings: { }
weight: -3
weight: 0
region: content
login:
type: timestamp_ago
label: inline
settings:
future_format: '@interval hence'
past_format: '@interval ago'
granularity: 3
third_party_settings: { }
weight: 3
region: content
mail:
type: email_mailto
label: inline
settings: { }
third_party_settings: { }
weight: -2
weight: 4
region: content
masquerade:
settings: { }
third_party_settings: { }
weight: 3
weight: 6
region: content
status:
type: boolean
label: inline
settings:
format: custom
format_custom_false: Blocked
format_custom_true: Active
third_party_settings: { }
weight: 1
region: content
hidden:
field_email_opt_in: true
Expand Down
1 change: 1 addition & 0 deletions services/drupal/config/sync/core.extension.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ module:
smart_date: 0
smart_trim: 0
smtp: 0
svg_image: 0
syslog: 0
system: 0
taxonomy: 0
Expand Down
1 change: 1 addition & 0 deletions services/drupal/config/sync/epa_core.settings.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
default_description: 'This page shows all of the pages at www.epa.gov that are tagged with [term:name].'
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
uuid: 21a98a1d-ac10-433a-a5c4-5a7c6f36422e
langcode: en
status: true
dependencies: { }
id: search_api__views_feed__search_perspectives__feed_1
name: 'search_api:views_feed__search_perspectives__feed_1'
filter_key: ''
url_processor: facets_pretty_paths
breadcrumb:
active: false
before: true
group: false
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ settings:
handler: 'default:file'
handler_settings: { }
file_directory: 'images/[current-date:custom:Y-m]'
file_extensions: 'png gif jpg jpeg'
file_extensions: 'png gif jpg jpeg svg'
max_filesize: '10 MB'
max_resolution: ''
min_resolution: ''
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ settings:
handler: 'default:file'
handler_settings: { }
file_directory: 'other-files/[current-date:custom:Y-m]'
file_extensions: 'accdb ai csv dmg dtd eps exe ico json kml kmz msi psd r rar rtf smi svg txt xls xlsb xlsm xlsx xltm xml xsd zip doc docm docx ppt pptx ppsx tif'
file_extensions: 'accdb ai csv dmg dtd eps exe ico json kml kmz msi psd r rar rtf smi svg txt xls xlsb xlsm xlsx xltm xml xsd zip doc docm docx ppt pptx ppsx tif tgz'
max_filesize: ''
description_field: false
field_type: file
Loading

0 comments on commit 6d5b091

Please sign in to comment.