From 640d7586b0e6031f0171ae5e9008383475960686 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Thu, 21 Dec 2023 06:49:34 +0000 Subject: [PATCH] Update configuration --- composer.lock | 55 +++++++++---------- ...form_display.tpr_unit.tpr_unit.default.yml | 17 +++++- ...view_display.tpr_unit.tpr_unit.default.yml | 9 ++- ...view_display.tpr_unit.tpr_unit.minimal.yml | 3 +- ..._view_display.tpr_unit.tpr_unit.teaser.yml | 3 +- ...ay.tpr_unit.tpr_unit.teaser_with_image.yml | 3 +- ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 3 +- conf/cmi/file_mdm.settings.yml | 1 + conf/cmi/metatag.metatag_defaults.node.yml | 3 +- conf/cmi/simple_sitemap.settings.yml | 1 + 10 files changed, 60 insertions(+), 38 deletions(-) diff --git a/composer.lock b/composer.lock index 0532a260..2fa41dca 100644 --- a/composer.lock +++ b/composer.lock @@ -1523,10 +1523,6 @@ "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" }, - { - "name": "mglaman", - "homepage": "https://www.drupal.org/user/2416470" - }, { "name": "rszrama", "homepage": "https://www.drupal.org/user/49344" @@ -3751,16 +3747,16 @@ }, { "name": "drupal/hdbt", - "version": "6.2.2", + "version": "6.2.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "8cfea20e3b7203f4ec48a1eaa8a708c2d679932a" + "reference": "42da48940898bba23b0099d48ecc312b7af753b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/8cfea20e3b7203f4ec48a1eaa8a708c2d679932a", - "reference": "8cfea20e3b7203f4ec48a1eaa8a708c2d679932a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/42da48940898bba23b0099d48ecc312b7af753b3", + "reference": "42da48940898bba23b0099d48ecc312b7af753b3", "shasum": "" }, "require": { @@ -3778,10 +3774,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.2.2", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.2.3", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-12-19T08:46:35+00:00" + "time": "2023-12-21T06:46:53+00:00" }, { "name": "drupal/hdbt_admin", @@ -4044,16 +4040,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.2.4", + "version": "4.2.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "c19b04e136d5a11c7e8a05b1b51140871e4ee936" + "reference": "81be73abb18930edd09c96d9631911392d0ce433" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c19b04e136d5a11c7e8a05b1b51140871e4ee936", - "reference": "c19b04e136d5a11c7e8a05b1b51140871e4ee936", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/81be73abb18930edd09c96d9631911392d0ce433", + "reference": "81be73abb18930edd09c96d9631911392d0ce433", "shasum": "" }, "require": { @@ -4167,10 +4163,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.2.4", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.2.6", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-12-19T11:41:04+00:00" + "time": "2023-12-21T06:47:01+00:00" }, { "name": "drupal/helfi_proxy", @@ -4435,7 +4431,7 @@ "extra": { "drupal": { "version": "8.x-3.6", - "datestamp": "1702632545", + "datestamp": "1703095475", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10383,25 +10379,25 @@ }, { "name": "psy/psysh", - "version": "v0.11.22", + "version": "v0.12.0", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b" + "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/128fa1b608be651999ed9789c95e6e2a31b5802b", - "reference": "128fa1b608be651999ed9789c95e6e2a31b5802b", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/750bf031a48fd07c673dbe3f11f72362ea306d0d", + "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d", "shasum": "" }, "require": { "ext-json": "*", "ext-tokenizer": "*", - "nikic/php-parser": "^4.0 || ^3.1", - "php": "^8.0 || ^7.0.8", - "symfony/console": "^6.0 || ^5.0 || ^4.0 || ^3.4", - "symfony/var-dumper": "^6.0 || ^5.0 || ^4.0 || ^3.4" + "nikic/php-parser": "^5.0 || ^4.0", + "php": "^8.0 || ^7.4", + "symfony/console": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4", + "symfony/var-dumper": "^7.0 || ^6.0 || ^5.0 || ^4.0 || ^3.4" }, "conflict": { "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4" @@ -10412,8 +10408,7 @@ "suggest": { "ext-pcntl": "Enabling the PCNTL extension makes PsySH a lot happier :)", "ext-pdo-sqlite": "The doc command requires SQLite to work.", - "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well.", - "ext-readline": "Enables support for arrow-key history navigation, and showing and manipulating command history." + "ext-posix": "If you have PCNTL, you'll want the POSIX extension as well." }, "bin": [ "bin/psysh" @@ -10421,7 +10416,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-0.11": "0.11.x-dev" + "dev-main": "0.12.x-dev" }, "bamarni-bin": { "bin-links": false, @@ -10457,9 +10452,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.11.22" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.0" }, - "time": "2023-10-14T21:56:36+00:00" + "time": "2023-12-20T15:28:09+00:00" }, { "name": "ralouphie/getallheaders", 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 5a36616b..3ef286d3 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 @@ -8,6 +8,7 @@ dependencies: - field.field.tpr_unit.tpr_unit.field_metatags - field.field.tpr_unit.tpr_unit.field_unit_type module: + - allowed_formats - hdbt_admin_tools - helfi_tpr - media_library @@ -15,8 +16,9 @@ dependencies: - paragraphs - path - readonly_field_widget + - text _core: - default_config_hash: iGJgv-B14-RUdc8dyC_MKfM3icDg5Cae4kFwC0MjyGQ + default_config_hash: ilRrdsHOQ6StmQoz8EXvQCOoYTo8L_o2ZG8gNzEbtZM id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -54,7 +56,7 @@ content: third_party_settings: { } address: type: readonly_field_widget - weight: 19 + weight: 20 region: content settings: label: above @@ -112,6 +114,17 @@ content: formatter_settings: { } show_description: false third_party_settings: { } + enrich_description: + type: text_textarea + weight: 19 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: + allowed_formats: + hide_help: '1' + hide_guidelines: '1' field_content: type: paragraphs weight: 28 diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index 4d3b6c22..6f053335 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -18,7 +18,7 @@ dependencies: - telephone - text _core: - default_config_hash: 7xcZTrrfS31z_AAdwrXSDrgd2PAqTWFPgY-XoAEjXQ0 + default_config_hash: SoKM8cPSwNeMsP8ZRG0b8B8n-e1Uy9yoMmPk018vmoY id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -103,6 +103,13 @@ content: third_party_settings: { } weight: 8 region: content + enrich_description: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 3 + region: content field_content: type: entity_reference_revisions_entity_view label: hidden diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml index 2fa119d1..15e433c7 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml @@ -12,7 +12,7 @@ dependencies: - address - helfi_tpr _core: - default_config_hash: wvPWnthIC7o8oa1gJ6jI0ex6xi12GVsZEN5zyrlCLoU + default_config_hash: f5AGkO_5_TgZ9InGKOLMyzbGFaCCTKeiPJYeGuTLnq0 id: tpr_unit.tpr_unit.minimal targetEntityType: tpr_unit bundle: tpr_unit @@ -52,6 +52,7 @@ hidden: created: true description: true email: true + enrich_description: true field_content: true field_lower_content: true field_metatags: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml index 5b0d924e..90000e5f 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml @@ -14,7 +14,7 @@ dependencies: - helfi_tpr - imagecache_external _core: - default_config_hash: 8hru5uh55ouZ9y4kV_EEJ6PEjb2rGY_tFUc_3Sn12M0 + default_config_hash: 6HvSNKVwbTTTZp-QqRhArKx-A-rx42QloU6l9LZG9rQ id: tpr_unit.tpr_unit.teaser targetEntityType: tpr_unit bundle: tpr_unit @@ -72,6 +72,7 @@ hidden: created: true description: true email: true + enrich_description: true field_content: true field_lower_content: true field_metatags: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml index c328d0d3..76b93b56 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml @@ -15,7 +15,7 @@ dependencies: - imagecache_external - telephone _core: - default_config_hash: gOlhIa1n9jTIJdBPN_Kjp-jn3YnsvZb7HELaoqa8KGQ + default_config_hash: 7gCaVLldtjbDLtOqHqBK6K1NqvNzluQEbJG5bn945k4 id: tpr_unit.tpr_unit.teaser_with_image targetEntityType: tpr_unit bundle: tpr_unit @@ -73,6 +73,7 @@ hidden: created: true description: true email: true + enrich_description: true field_content: true field_lower_content: true field_metatags: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml index 68c079a7..8ef4af68 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml @@ -15,7 +15,7 @@ dependencies: - imagecache_external - telephone _core: - default_config_hash: 25YiuMfsdqG-daKeTND6nbYvwDgt7kE7bw23g2GyteI + default_config_hash: 0wDMf9-yI6dKb0je5d0tNyKMNCX5FmuYbFxMRzGs1kc id: tpr_unit.tpr_unit.wide_teaser targetEntityType: tpr_unit bundle: tpr_unit @@ -88,6 +88,7 @@ hidden: created: true description: true email: true + enrich_description: true field_content: true field_lower_content: true field_metatags: true diff --git a/conf/cmi/file_mdm.settings.yml b/conf/cmi/file_mdm.settings.yml index 1721cdf2..4233862a 100644 --- a/conf/cmi/file_mdm.settings.yml +++ b/conf/cmi/file_mdm.settings.yml @@ -4,3 +4,4 @@ metadata_cache: enabled: true expiration: 172800 disallowed_paths: { } +missing_file_log_level: 3 diff --git a/conf/cmi/metatag.metatag_defaults.node.yml b/conf/cmi/metatag.metatag_defaults.node.yml index 28e51b90..66b39f74 100644 --- a/conf/cmi/metatag.metatag_defaults.node.yml +++ b/conf/cmi/metatag.metatag_defaults.node.yml @@ -6,7 +6,7 @@ id: node label: Content tags: title: '[node:title] | [site:page-title-suffix]' - description: '[node:field_lead_in]' + description: '[node:lead-in]' canonical_url: '[node:url]' article_modified_time: '[node:created:html_datetime]' article_published_time: '[node:created:html_datetime]' @@ -16,3 +16,4 @@ tags: og_url: '[current-page:url:absolute]' twitter_cards_image: '[node:shareable-image]' og_image: '[node:shareable-image]' + og_description: '[node:lead-in]' diff --git a/conf/cmi/simple_sitemap.settings.yml b/conf/cmi/simple_sitemap.settings.yml index 92e8ef45..eb6ff40b 100644 --- a/conf/cmi/simple_sitemap.settings.yml +++ b/conf/cmi/simple_sitemap.settings.yml @@ -15,3 +15,4 @@ enabled_entity_types: - node - tpr_service - tpr_unit + - menu_link_content