From 54652b3cd0d3542efa47174482d00b43806838ed Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 12 Sep 2023 07:00:24 +0000 Subject: [PATCH] Update configuration --- composer.lock | 47 ++++++++----------- ...form_display.tpr_unit.tpr_unit.default.yml | 12 ++--- ...iew_display.paragraph.hearings.default.yml | 2 +- ...es.external_entity_type.helfi_hearings.yml | 2 +- conf/cmi/filter.format.full_html.yml | 4 +- conf/cmi/filter.format.minimal.yml | 4 +- tools/make/docker.mk | 2 +- tools/make/symfony.mk | 2 +- 8 files changed, 34 insertions(+), 41 deletions(-) diff --git a/composer.lock b/composer.lock index 0221ad48..c6a9b931 100644 --- a/composer.lock +++ b/composer.lock @@ -2639,10 +2639,6 @@ { "name": "tatarbj", "homepage": "https://www.drupal.org/user/649590" - }, - { - "name": "volkswagenchick", - "homepage": "https://www.drupal.org/user/3332522" } ], "description": "Adds configuration to the system breadcrumbs.", @@ -3751,16 +3747,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.0", + "version": "5.6.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "b2b03fa78cb21beb4f74e3a2db1ad6fe083c6956" + "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/b2b03fa78cb21beb4f74e3a2db1ad6fe083c6956", - "reference": "b2b03fa78cb21beb4f74e3a2db1ad6fe083c6956", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d4eeff38bc61f431613c8fa9a4d92a8755f66b09", + "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09", "shasum": "" }, "require": { @@ -3778,10 +3774,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.0", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.1", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-09-06T13:06:13+00:00" + "time": "2023-09-11T12:42:43+00:00" }, { "name": "drupal/hdbt_admin", @@ -4011,16 +4007,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.4.0", + "version": "3.4.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "88784de7e0df5fe2e051ee352bace872d819e951" + "reference": "09c19828ae17b7780efae2f38c5554849deaa6fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/88784de7e0df5fe2e051ee352bace872d819e951", - "reference": "88784de7e0df5fe2e051ee352bace872d819e951", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/09c19828ae17b7780efae2f38c5554849deaa6fe", + "reference": "09c19828ae17b7780efae2f38c5554849deaa6fe", "shasum": "" }, "require": { @@ -4113,9 +4109,6 @@ "drupal/social_media": { "Add missing schema to social media. (https://www.drupal.org/project/social_media/issues/2986819)": "https://git.drupalcode.org/project/social_media/-/commit/1964f42e5a6fb5d7a97fdf8ec5ca259bc6c5b19a.patch" }, - "drupal/translatable_menu_link_uri": { - "[#UHF-8616] D10 compatibility patch for translatable menu link uri": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/c03c575cdd293b7933248cfb4d0fb7b47be5422b/patches/translatable_menu_link_uri_d10.patch" - }, "drupal/simple_sitemap": { "[#UHF-8514] Fix frontpage URLs in sitemap. (https://www.drupal.org/project/simple_sitemap/issues/3264573)": "https://www.drupal.org/files/issues/2022-02-15/3264573-2.patch" } @@ -4126,10 +4119,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.4", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-09-06T13:06:18+00:00" + "time": "2023-09-12T06:53:57+00:00" }, { "name": "drupal/helfi_proxy", @@ -6209,26 +6202,26 @@ }, { "name": "drupal/translatable_menu_link_uri", - "version": "2.0.0", + "version": "2.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/translatable_menu_link_uri.git", - "reference": "2.0.0" + "reference": "2.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/translatable_menu_link_uri-2.0.0.zip", - "reference": "2.0.0", - "shasum": "6960a485565d886cf35ee6dd56310de47e04e430" + "url": "https://ftp.drupal.org/files/projects/translatable_menu_link_uri-2.1.0.zip", + "reference": "2.1.0", + "shasum": "3bafa0a19761524560a2d232c945f10643e91053" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8 || ^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0", - "datestamp": "1597491393", + "version": "2.1.0", + "datestamp": "1694361965", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml index 5eab4a8c..f5f1e1ce 100644 --- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml @@ -84,8 +84,8 @@ content: third_party_settings: { } contacts: type: readonly_field_widget - region: content weight: 36 + region: content settings: label: above formatter_type: null @@ -176,8 +176,8 @@ content: third_party_settings: { } highlights: type: readonly_field_widget - region: content weight: 33 + region: content settings: label: above formatter_type: null @@ -203,8 +203,8 @@ content: third_party_settings: { } links: type: readonly_field_widget - region: content weight: 31 + region: content settings: label: above formatter_type: null @@ -241,8 +241,8 @@ content: third_party_settings: { } opening_hours: type: readonly_field_widget - region: content weight: 32 + region: content settings: label: above formatter_type: null @@ -251,8 +251,8 @@ content: third_party_settings: { } other_info: type: readonly_field_widget - region: content weight: 34 + region: content settings: label: above formatter_type: null @@ -294,8 +294,8 @@ content: third_party_settings: { } price_info: type: readonly_field_widget - region: content weight: 35 + region: content settings: label: above formatter_type: null diff --git a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml index a6c329c0..faa8944d 100644 --- a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml @@ -31,9 +31,9 @@ content: weight: 0 region: content list: - weight: 100 settings: { } third_party_settings: { } + weight: 100 region: content hidden: search_api_excerpt: true diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml index 4e6be4d3..e0093008 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml @@ -8,8 +8,8 @@ id: helfi_hearings label: 'Helfi: Hearing' label_plural: 'Helfi: Hearing' description: 'Helfi hearings from hearing api.' -generate_aliases: false read_only: true +generate_aliases: false field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml index c91e9971..b624d004 100644 --- a/conf/cmi/filter.format.full_html.yml +++ b/conf/cmi/filter.format.full_html.yml @@ -7,7 +7,7 @@ dependencies: - helfi_api_base - linkit _core: - default_config_hash: r40X436d0Agm1ErbO2TcpT46WfZZpxxplT_X72ju3d4 + default_config_hash: scZe8VBZbfUiJt0xnoGrHbXgRhTOLA-d3g7Byy1lZ4c name: HTML format: full_html weight: 0 @@ -24,7 +24,7 @@ filters: status: true weight: -50 settings: - allowed_html: '