From 157c70b885ec24d18dfe99a3429b96cff4e37b57 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Fri, 12 Jan 2024 06:23:41 +0000 Subject: [PATCH 1/3] Update configuration --- composer.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/composer.lock b/composer.lock index 3a24df80..ab31a246 100644 --- a/composer.lock +++ b/composer.lock @@ -3747,16 +3747,16 @@ }, { "name": "drupal/hdbt", - "version": "6.3.2", + "version": "6.3.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "1469093f6b8d887db142b8d8d5dc575d6c5cf3dc" + "reference": "deb860b55ce9fcd97256b5875e62fedf46082487" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/1469093f6b8d887db142b8d8d5dc575d6c5cf3dc", - "reference": "1469093f6b8d887db142b8d8d5dc575d6c5cf3dc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/deb860b55ce9fcd97256b5875e62fedf46082487", + "reference": "deb860b55ce9fcd97256b5875e62fedf46082487", "shasum": "" }, "require": { @@ -3774,10 +3774,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.3.2", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.3.4", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-12-28T12:38:31+00:00" + "time": "2024-01-09T15:40:24+00:00" }, { "name": "drupal/hdbt_admin", @@ -8733,16 +8733,16 @@ }, { "name": "mck89/peast", - "version": "v1.15.4", + "version": "v1.16.0", "source": { "type": "git", "url": "https://github.com/mck89/peast.git", - "reference": "1df4dc28a6b5bb7ab117ab073c1712256e954e18" + "reference": "63dee902bd281c792f1dd760b6df268682032ed0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mck89/peast/zipball/1df4dc28a6b5bb7ab117ab073c1712256e954e18", - "reference": "1df4dc28a6b5bb7ab117ab073c1712256e954e18", + "url": "https://api.github.com/repos/mck89/peast/zipball/63dee902bd281c792f1dd760b6df268682032ed0", + "reference": "63dee902bd281c792f1dd760b6df268682032ed0", "shasum": "" }, "require": { @@ -8755,7 +8755,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.15.4-dev" + "dev-master": "1.16.0-dev" } }, "autoload": { @@ -8776,9 +8776,9 @@ "description": "Peast is PHP library that generates AST for JavaScript code", "support": { "issues": "https://github.com/mck89/peast/issues", - "source": "https://github.com/mck89/peast/tree/v1.15.4" + "source": "https://github.com/mck89/peast/tree/v1.16.0" }, - "time": "2023-08-12T08:29:29+00:00" + "time": "2024-01-11T14:36:12+00:00" }, { "name": "microsoft/azure-storage-blob", @@ -15998,16 +15998,16 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.7.3", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419" + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", - "reference": "3219c6ee25c9ea71e3d9bbaf39c67c9ebd499419", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/fad452781b3d774e3337b0c0b245dd8e5a4455fc", + "reference": "fad452781b3d774e3337b0c0b245dd8e5a4455fc", "shasum": "" }, "require": { @@ -16050,9 +16050,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.7.3" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.0" }, - "time": "2023-08-12T11:01:26+00:00" + "time": "2024-01-11T11:49:22+00:00" }, { "name": "phpspec/prophecy", From 076650bede1a19bd49cb5c0e7c185ae62275137a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Fri, 12 Jan 2024 08:59:36 +0200 Subject: [PATCH 2/3] Updated D10.2.1 --- composer.json | 3 - composer.lock | 207 ++++++++++++++++++++++++++++++++++---------------- 2 files changed, 142 insertions(+), 68 deletions(-) diff --git a/composer.json b/composer.json index a4c1ea22..bcf63efb 100644 --- a/composer.json +++ b/composer.json @@ -40,9 +40,6 @@ "weitzman/drupal-test-traits": "^2.0" }, "conflict": { - "drupal/core": ">=10.2", - "drupal/core-composer-scaffold": ">=10.2", - "drupal/core-dev": ">=10.2", "drupal/drupal": "*" }, "config": { diff --git a/composer.lock b/composer.lock index ab31a246..7d669ecf 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "415646da6f0f10bd32ab9bd5b92a47fc", + "content-hash": "636bad6e8d75efc2671a98e26964c734", "packages": [ { "name": "asm89/stack-cors", @@ -2017,16 +2017,16 @@ }, { "name": "drupal/core", - "version": "10.1.7", + "version": "10.2.1", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "54415049a721ede65318e3980b402af59bc35913" + "reference": "0050280087b8ed1fb145fcf22e01ad53c85931db" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/54415049a721ede65318e3980b402af59bc35913", - "reference": "54415049a721ede65318e3980b402af59bc35913", + "url": "https://api.github.com/repos/drupal/core/zipball/0050280087b8ed1fb145fcf22e01ad53c85931db", + "reference": "0050280087b8ed1fb145fcf22e01ad53c85931db", "shasum": "" }, "require": { @@ -2056,23 +2056,26 @@ "php": ">=8.1.0", "psr/log": "^3.0", "sebastian/diff": "^4", - "symfony/console": "^6.3", - "symfony/dependency-injection": "^6.3", - "symfony/event-dispatcher": "^6.3", - "symfony/http-foundation": "^6.3", - "symfony/http-kernel": "^6.3", - "symfony/mime": "^6.3", + "symfony/console": "^6.4", + "symfony/dependency-injection": "^6.4", + "symfony/event-dispatcher": "^6.4", + "symfony/filesystem": "^6.4", + "symfony/finder": "^6.4", + "symfony/http-foundation": "^6.4", + "symfony/http-kernel": "^6.4", + "symfony/mailer": "^6.4", + "symfony/mime": "^6.4", "symfony/polyfill-iconv": "^1.26", - "symfony/process": "^6.3", - "symfony/psr-http-message-bridge": "^2.1", - "symfony/routing": "^6.3", - "symfony/serializer": "^6.3", - "symfony/validator": "^6.3", - "symfony/yaml": "^6.3", + "symfony/process": "^6.4", + "symfony/psr-http-message-bridge": "^2.1|^6.4", + "symfony/routing": "^6.4", + "symfony/serializer": "^6.4", + "symfony/validator": "^6.4", + "symfony/yaml": "^6.4", "twig/twig": "^3.5.0" }, "conflict": { - "drush/drush": "<8.1.10" + "drush/drush": "<12.4.3" }, "replace": { "drupal/core-annotation": "self.version", @@ -2171,9 +2174,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.1.7" + "source": "https://github.com/drupal/core/tree/10.2.1" }, - "time": "2023-12-06T09:22:56+00:00" + "time": "2024-01-05T09:27:16+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -3781,16 +3784,16 @@ }, { "name": "drupal/hdbt_admin", - "version": "3.0.1", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "d880acda97cea962575475489134852ce5e1f6c9" + "reference": "eb62ff26a070ef7ba880a6194cce5d805ef9303f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/d880acda97cea962575475489134852ce5e1f6c9", - "reference": "d880acda97cea962575475489134852ce5e1f6c9", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/eb62ff26a070ef7ba880a6194cce5d805ef9303f", + "reference": "eb62ff26a070ef7ba880a6194cce5d805ef9303f", "shasum": "" }, "require": { @@ -3798,7 +3801,7 @@ "drupal/gin": "^3.0@rc" }, "conflict": { - "drupal/helfi_platform_config": "<4.0" + "drupal/helfi_platform_config": "<4.3" }, "type": "drupal-theme", "license": [ @@ -3809,10 +3812,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.0.1", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.1.0", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2023-11-16T09:10:11+00:00" + "time": "2024-01-12T06:07:26+00:00" }, { "name": "drupal/health_check", @@ -4040,16 +4043,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.2.7", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "eb0336758589fe27c79d0f2da389b37a3827872d" + "reference": "8a5b45f5f235496a263723581060c2a6aff7b71d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/eb0336758589fe27c79d0f2da389b37a3827872d", - "reference": "eb0336758589fe27c79d0f2da389b37a3827872d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/8a5b45f5f235496a263723581060c2a6aff7b71d", + "reference": "8a5b45f5f235496a263723581060c2a6aff7b71d", "shasum": "" }, "require": { @@ -4096,7 +4099,7 @@ "drupal/scheduler": "^1.3", "drupal/search_api": "^1.0", "drupal/select2": "^1.12", - "drupal/simple_sitemap": "^4.1", + "drupal/simple_sitemap": "4.1.7", "drupal/siteimprove": "^2.0", "drupal/social_media": "^2.0", "drupal/stomp": "^2.0", @@ -4110,7 +4113,7 @@ "php": "^8.1" }, "conflict": { - "drupal/core": "<10.1 || >=10.2", + "drupal/core": "<10.2", "drupal/ctools": "<3.11 || ^4.0.1", "drupal/helfi_media_map": "*", "drupal/simple_sitemap": ">4.1.7", @@ -4124,12 +4127,12 @@ "https://www.drupal.org/project/content_lock/issues/3343964": "https://www.drupal.org/files/issues/2023-05-22/3343964-5.patch" }, "drupal/core": { - "[#UHF-181] Hide untranslated menu links (https://www.drupal.org/project/drupal/issues/3091246)": "https://www.drupal.org/files/issues/2023-10-02/3091246--allow-menu-tree-manipulators-alter--23.patch", + "[#UHF-181] Hide untranslated menu links (https://www.drupal.org/project/drupal/issues/3091246)": "https://www.drupal.org/files/issues/2023-12-18/3091246--allow-menu-tree-manipulators-alter--24.patch", "[#UHF-3812] Ajax exposed filters not working for multiple instances of the same Views block placed on one page (https://www.drupal.org/project/drupal/issues/3163299)": "https://www.drupal.org/files/issues/2023-05-07/3163299-104-D10.patch", "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/b628bc051d82a1883768364050aa833824bd48c8/patches/drupal_core_strip_debug_mode_whitespaces_10.1.x.patch", "[#UHF-7008] Core localization file download URL is wrong (https://www.drupal.org/project/drupal/issues/3022876)": "https://git.drupalcode.org/project/drupal/-/commit/40a96136b2dfe4322338508dffa636f6cb407900.patch", "[#UHF-7008] Add multilingual support for caching basefield definitions (https://www.drupal.org/project/drupal/issues/3114824)": "https://www.drupal.org/files/issues/2020-02-20/3114824_2.patch", - "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/a42c905a162c8510348b17cdf60000a0a7f82037/patches/drupal-2313309-render-admin-toolbar-with-admin-language.patch", + "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2023-12-19/2313309-179.patch", "[#UHF-9388] Process translation config files for custom modules (https://www.drupal.org/i/2845437)": "https://www.drupal.org/files/issues/2023-10-16/2845437-61.patch" }, "drupal/default_content": { @@ -4163,10 +4166,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.2.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.0", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-12-22T13:09:21+00:00" + "time": "2024-01-12T06:03:47+00:00" }, { "name": "drupal/helfi_proxy", @@ -11898,6 +11901,86 @@ ], "time": "2023-12-30T15:31:44+00:00" }, + { + "name": "symfony/mailer", + "version": "v6.4.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/mailer.git", + "reference": "6da89e5c9202f129717a770a03183fb140720168" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/mailer/zipball/6da89e5c9202f129717a770a03183fb140720168", + "reference": "6da89e5c9202f129717a770a03183fb140720168", + "shasum": "" + }, + "require": { + "egulias/email-validator": "^2.1.10|^3|^4", + "php": ">=8.1", + "psr/event-dispatcher": "^1", + "psr/log": "^1|^2|^3", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/mime": "^6.2|^7.0", + "symfony/service-contracts": "^2.5|^3" + }, + "conflict": { + "symfony/http-client-contracts": "<2.5", + "symfony/http-kernel": "<5.4", + "symfony/messenger": "<6.2", + "symfony/mime": "<6.2", + "symfony/twig-bridge": "<6.2.1" + }, + "require-dev": { + "symfony/console": "^5.4|^6.0|^7.0", + "symfony/http-client": "^5.4|^6.0|^7.0", + "symfony/messenger": "^6.2|^7.0", + "symfony/twig-bridge": "^6.2|^7.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Mailer\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Helps sending emails", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/mailer/tree/v6.4.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-12-19T09:12:31+00:00" + }, { "name": "symfony/mime", "version": "v6.4.0", @@ -13009,43 +13092,38 @@ }, { "name": "symfony/psr-http-message-bridge", - "version": "v2.3.1", + "version": "v6.4.2", "source": { "type": "git", "url": "https://github.com/symfony/psr-http-message-bridge.git", - "reference": "581ca6067eb62640de5ff08ee1ba6850a0ee472e" + "reference": "d32f5898f163266230182432b877ab7623ff252d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/581ca6067eb62640de5ff08ee1ba6850a0ee472e", - "reference": "581ca6067eb62640de5ff08ee1ba6850a0ee472e", + "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/d32f5898f163266230182432b877ab7623ff252d", + "reference": "d32f5898f163266230182432b877ab7623ff252d", "shasum": "" }, "require": { - "php": ">=7.2.5", - "psr/http-message": "^1.0 || ^2.0", - "symfony/deprecation-contracts": "^2.5 || ^3.0", - "symfony/http-foundation": "^5.4 || ^6.0" + "php": ">=8.1", + "psr/http-message": "^1.0|^2.0", + "symfony/http-foundation": "^5.4|^6.0|^7.0" + }, + "conflict": { + "php-http/discovery": "<1.15", + "symfony/http-kernel": "<6.2" }, "require-dev": { "nyholm/psr7": "^1.1", - "psr/log": "^1.1 || ^2 || ^3", - "symfony/browser-kit": "^5.4 || ^6.0", - "symfony/config": "^5.4 || ^6.0", - "symfony/event-dispatcher": "^5.4 || ^6.0", - "symfony/framework-bundle": "^5.4 || ^6.0", - "symfony/http-kernel": "^5.4 || ^6.0", - "symfony/phpunit-bridge": "^6.2" - }, - "suggest": { - "nyholm/psr7": "For a super lightweight PSR-7/17 implementation" + "php-http/discovery": "^1.15", + "psr/log": "^1.1.4|^2|^3", + "symfony/browser-kit": "^5.4|^6.0|^7.0", + "symfony/config": "^5.4|^6.0|^7.0", + "symfony/event-dispatcher": "^5.4|^6.0|^7.0", + "symfony/framework-bundle": "^6.2|^7.0", + "symfony/http-kernel": "^6.2|^7.0" }, "type": "symfony-bridge", - "extra": { - "branch-alias": { - "dev-main": "2.3-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Bridge\\PsrHttpMessage\\": "" @@ -13065,11 +13143,11 @@ }, { "name": "Symfony Community", - "homepage": "http://symfony.com/contributors" + "homepage": "https://symfony.com/contributors" } ], "description": "PSR HTTP message bridge", - "homepage": "http://symfony.com", + "homepage": "https://symfony.com", "keywords": [ "http", "http-message", @@ -13077,8 +13155,7 @@ "psr-7" ], "support": { - "issues": "https://github.com/symfony/psr-http-message-bridge/issues", - "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.3.1" + "source": "https://github.com/symfony/psr-http-message-bridge/tree/v6.4.2" }, "funding": [ { @@ -13094,7 +13171,7 @@ "type": "tidelift" } ], - "time": "2023-07-26T11:53:26+00:00" + "time": "2023-12-28T07:55:26+00:00" }, { "name": "symfony/routing", From da724da47fcca371a169db1dccfa1df2e8e4832d Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 16 Jan 2024 08:26:03 +0000 Subject: [PATCH 3/3] Update configuration --- composer.lock | 96 +++++++++---------- ..._display.paragraph.unit_search.default.yml | 22 ++++- ...e.entity_form_mode.media.media_library.yml | 1 + .../core.entity_form_mode.user.register.yml | 1 + ..._display.paragraph.unit_search.default.yml | 20 +++- .../cmi/core.entity_view_mode.block.token.yml | 1 + conf/cmi/core.entity_view_mode.file.token.yml | 1 + ...ity_view_mode.helfi_news.medium_teaser.yml | 1 + ...re.entity_view_mode.media.content_card.yml | 1 + conf/cmi/core.entity_view_mode.media.full.yml | 1 + conf/cmi/core.entity_view_mode.media.hero.yml | 1 + .../cmi/core.entity_view_mode.media.image.yml | 1 + ...e.entity_view_mode.media.list_of_links.yml | 1 + ...e.entity_view_mode.media.media_library.yml | 1 + .../cmi/core.entity_view_mode.media.token.yml | 1 + ...tity_view_mode.menu_link_content.token.yml | 1 + conf/cmi/core.entity_view_mode.node.diff.yml | 1 + conf/cmi/core.entity_view_mode.node.full.yml | 1 + conf/cmi/core.entity_view_mode.node.rss.yml | 1 + ...ore.entity_view_mode.node.search_index.yml | 1 + ...re.entity_view_mode.node.search_result.yml | 1 + .../cmi/core.entity_view_mode.node.teaser.yml | 1 + conf/cmi/core.entity_view_mode.node.token.yml | 1 + ...ore.entity_view_mode.paragraph.preview.yml | 1 + ...w_mode.paragraphs_library_item.summary.yml | 1 + ...core.entity_view_mode.path_alias.token.yml | 1 + ...re.entity_view_mode.taxonomy_term.full.yml | 1 + ...e.entity_view_mode.taxonomy_term.token.yml | 1 + ...re.entity_view_mode.tpr_service.teaser.yml | 3 +- ..._mode.tpr_service.teaser_search_result.yml | 3 +- ...core.entity_view_mode.tpr_unit.minimal.yml | 3 +- .../core.entity_view_mode.tpr_unit.teaser.yml | 3 +- ...y_view_mode.tpr_unit.teaser_with_image.yml | 3 +- .../core.entity_view_mode.tpr_unit.token.yml | 3 +- ....entity_view_mode.tpr_unit.wide_teaser.yml | 3 +- .../core.entity_view_mode.user.compact.yml | 1 + conf/cmi/core.entity_view_mode.user.full.yml | 1 + conf/cmi/core.entity_view_mode.user.token.yml | 1 + conf/cmi/editor.editor.full_html.yml | 6 +- conf/cmi/editor.editor.minimal.yml | 6 +- ....unit_search.field_search_results_term.yml | 21 ++++ ...unit_search.field_search_results_terms.yml | 21 ++++ ...ge.paragraph.field_search_results_term.yml | 23 +++++ ...e.paragraph.field_search_results_terms.yml | 23 +++++ conf/cmi/filter.format.full_html.yml | 78 +++++++-------- conf/cmi/filter.format.minimal.yml | 36 +++---- conf/cmi/filter.format.plain_text.yml | 12 +-- ....unit_search.field_search_results_term.yml | 2 + ...unit_search.field_search_results_terms.yml | 2 + .../language/fi/views.view.er_tpr_unit.yml | 7 -- .../language/fi/views.view.service_list.yml | 13 --- .../language/fi/views.view.service_units.yml | 3 - .../language/fi/views.view.unit_search.yml | 11 --- .../language/fi/views.view.unit_services.yml | 1 - .../language/sv/views.view.er_tpr_unit.yml | 8 -- .../language/sv/views.view.service_list.yml | 13 --- .../language/sv/views.view.service_units.yml | 3 - .../language/sv/views.view.unit_search.yml | 12 --- .../language/sv/views.view.unit_services.yml | 1 - conf/cmi/views.view.authmap.yml | 1 - conf/cmi/views.view.editoria11y_results.yml | 2 - conf/cmi/views.view.er_tpr_unit.yml | 3 +- conf/cmi/views.view.files.yml | 1 - conf/cmi/views.view.glossary.yml | 2 - conf/cmi/views.view.media_library.yml | 2 - ...views.view.scheduler_scheduled_content.yml | 1 - conf/cmi/views.view.service_list.yml | 4 +- conf/cmi/views.view.service_units.yml | 3 +- conf/cmi/views.view.taxonomy_term.yml | 1 - conf/cmi/views.view.unit_search.yml | 3 +- conf/cmi/views.view.unit_services.yml | 3 +- 71 files changed, 298 insertions(+), 217 deletions(-) create mode 100644 conf/cmi/field.field.paragraph.unit_search.field_search_results_term.yml create mode 100644 conf/cmi/field.field.paragraph.unit_search.field_search_results_terms.yml create mode 100644 conf/cmi/field.storage.paragraph.field_search_results_term.yml create mode 100644 conf/cmi/field.storage.paragraph.field_search_results_terms.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_search.field_search_results_term.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_search.field_search_results_terms.yml diff --git a/composer.lock b/composer.lock index 7d669ecf..a9d15fb9 100644 --- a/composer.lock +++ b/composer.lock @@ -1838,17 +1838,17 @@ }, { "name": "drupal/config_ignore", - "version": "3.1.0", + "version": "3.2.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/config_ignore.git", - "reference": "8.x-3.1" + "reference": "8.x-3.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-3.1.zip", - "reference": "8.x-3.1", - "shasum": "5e60f312e02735060d5e5b1724330bb243face4c" + "url": "https://ftp.drupal.org/files/projects/config_ignore-8.x-3.2.zip", + "reference": "8.x-3.2", + "shasum": "00335fc1ddeb4ed93f245dd6963d99b3c084c052" }, "require": { "drupal/core": "^8.8 || ^9 || ^10" @@ -1860,8 +1860,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.1", - "datestamp": "1699302168", + "version": "8.x-3.2", + "datestamp": "1705226226", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -2927,17 +2927,17 @@ }, { "name": "drupal/entity_reference_revisions", - "version": "1.10.0", + "version": "1.11.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_reference_revisions.git", - "reference": "8.x-1.10" + "reference": "8.x-1.11" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_reference_revisions-8.x-1.10.zip", - "reference": "8.x-1.10", - "shasum": "edd23b91c4a34db65ea22c4db54b7458edc7513b" + "url": "https://ftp.drupal.org/files/projects/entity_reference_revisions-8.x-1.11.zip", + "reference": "8.x-1.11", + "shasum": "de21cbb0d8a0344dc3496addcad4ed536747cec5" }, "require": { "drupal/core": "^9 || ^10" @@ -2948,8 +2948,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.10", - "datestamp": "1660664712", + "version": "8.x-1.11", + "datestamp": "1705140721", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3750,16 +3750,16 @@ }, { "name": "drupal/hdbt", - "version": "6.3.4", + "version": "6.3.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "deb860b55ce9fcd97256b5875e62fedf46082487" + "reference": "a9512428a025e6675a46fe2bf06ff28b1257b2ee" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/deb860b55ce9fcd97256b5875e62fedf46082487", - "reference": "deb860b55ce9fcd97256b5875e62fedf46082487", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/a9512428a025e6675a46fe2bf06ff28b1257b2ee", + "reference": "a9512428a025e6675a46fe2bf06ff28b1257b2ee", "shasum": "" }, "require": { @@ -3777,10 +3777,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.3.4", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.3.6", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-01-09T15:40:24+00:00" + "time": "2024-01-16T08:07:42+00:00" }, { "name": "drupal/hdbt_admin", @@ -3869,22 +3869,23 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.5.12", + "version": "2.6.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "0e993700f6611def239ec225a3ada1d123b30623" + "reference": "ab8b3d941e6de77d242abe0c64ce5ee8f1448d73" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/0e993700f6611def239ec225a3ada1d123b30623", - "reference": "0e993700f6611def239ec225a3ada1d123b30623", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/ab8b3d941e6de77d242abe0c64ce5ee8f1448d73", + "reference": "ab8b3d941e6de77d242abe0c64ce5ee8f1448d73", "shasum": "" }, "require": { "drupal/entity": "^1.0", "drupal/filelog": "^2.1", "drupal/health_check": "^3.0", + "ext-curl": "*", "firebase/php-jwt": "^6.5", "php": "^8.1", "t4web/composer-lock-parser": "^1.0", @@ -3906,10 +3907,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.12", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.6.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-11-15T13:15:43+00:00" + "time": "2024-01-16T07:41:28+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4008,22 +4009,21 @@ }, { "name": "drupal/helfi_navigation", - "version": "2.1.4", + "version": "2.2.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "a10ae58499ac50c2d4b34773c85653c0256a2e61" + "reference": "0da4087a191d7fef371fd72924eaff2e33223f91" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/a10ae58499ac50c2d4b34773c85653c0256a2e61", - "reference": "a10ae58499ac50c2d4b34773c85653c0256a2e61", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/0da4087a191d7fef371fd72924eaff2e33223f91", + "reference": "0da4087a191d7fef371fd72924eaff2e33223f91", "shasum": "" }, "require": { "drupal/helfi_api_base": "*", - "ext-curl": "*", - "php": "^8.0" + "php": "^8.1" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", @@ -4036,23 +4036,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.1.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.2.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2023-10-24T07:08:39+00:00" + "time": "2024-01-16T08:17:38+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "4.3.0", + "version": "4.3.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "8a5b45f5f235496a263723581060c2a6aff7b71d" + "reference": "9ac506631980648a339d9658e02f2ab00e307ef3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/8a5b45f5f235496a263723581060c2a6aff7b71d", - "reference": "8a5b45f5f235496a263723581060c2a6aff7b71d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9ac506631980648a339d9658e02f2ab00e307ef3", + "reference": "9ac506631980648a339d9658e02f2ab00e307ef3", "shasum": "" }, "require": { @@ -4166,10 +4166,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.2", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-01-12T06:03:47+00:00" + "time": "2024-01-16T08:07:32+00:00" }, { "name": "drupal/helfi_proxy", @@ -5045,17 +5045,17 @@ }, { "name": "drupal/paragraphs", - "version": "1.16.0", + "version": "1.17.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/paragraphs.git", - "reference": "8.x-1.16" + "reference": "8.x-1.17" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.16.zip", - "reference": "8.x-1.16", - "shasum": "48f60810fd8086a52d56e84af8b212cce7a270e8" + "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.17.zip", + "reference": "8.x-1.17", + "shasum": "81c05f6a1eb59ab957c9ac97b2e79d6c9837bd72" }, "require": { "drupal/core": "^9.3 || ^10", @@ -5070,7 +5070,7 @@ "drupal/inline_entity_form": "1.x-dev", "drupal/paragraphs-paragraphs_library": "*", "drupal/replicate": "1.x-dev", - "drupal/search_api": "1.x-dev", + "drupal/search_api": "^1", "drupal/search_api_db": "*" }, "suggest": { @@ -5079,8 +5079,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.16", - "datestamp": "1694007797", + "version": "8.x-1.17", + "datestamp": "1705234146", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml index 297796ee..2586ae9e 100644 --- a/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.unit_search.default.yml @@ -3,6 +3,8 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.unit_search.field_search_results_term + - field.field.paragraph.unit_search.field_search_results_terms - field.field.paragraph.unit_search.field_unit_search_description - field.field.paragraph.unit_search.field_unit_search_meta_button - field.field.paragraph.unit_search.field_unit_search_meta_label @@ -21,6 +23,8 @@ third_party_settings: - field_unit_search_meta_label - field_unit_search_meta_placehold - field_unit_search_meta_button + - field_search_results_term + - field_search_results_terms label: 'Meta information' region: content parent_name: '' @@ -33,12 +37,28 @@ third_party_settings: description: '' required_fields: true _core: - default_config_hash: z42RJh-JCLjD7_9W4B9_irn3nWHvqfSJ9foobt51Wg4 + default_config_hash: fTziigwM99wtfwA2JFLTaxuwlbPXXLDZHA0WRTm14wU id: paragraph.unit_search.default targetEntityType: paragraph bundle: unit_search mode: default content: + field_search_results_term: + type: string_textfield + weight: 7 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + field_search_results_terms: + type: string_textfield + weight: 8 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } field_unit_search_description: type: text_textarea weight: 2 diff --git a/conf/cmi/core.entity_form_mode.media.media_library.yml b/conf/cmi/core.entity_form_mode.media.media_library.yml index 20d7b78b..11b185a7 100644 --- a/conf/cmi/core.entity_form_mode.media.media_library.yml +++ b/conf/cmi/core.entity_form_mode.media.media_library.yml @@ -11,5 +11,6 @@ _core: default_config_hash: Tdhz-aDHfDoV1Ul9umtItxGTrjkFzoNAkDw8FWXjYA0 id: media.media_library label: 'Media library' +description: '' targetEntityType: media cache: true diff --git a/conf/cmi/core.entity_form_mode.user.register.yml b/conf/cmi/core.entity_form_mode.user.register.yml index 6a7c3ecf..eb5cd09d 100644 --- a/conf/cmi/core.entity_form_mode.user.register.yml +++ b/conf/cmi/core.entity_form_mode.user.register.yml @@ -8,5 +8,6 @@ _core: default_config_hash: flXhTcp55yLcyy7ZLOhPGKGZobZQJdkAFVWV3LseiuI id: user.register label: Register +description: '' targetEntityType: user cache: true diff --git a/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml b/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml index 72dfecd4..052009d9 100644 --- a/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.unit_search.default.yml @@ -3,6 +3,8 @@ langcode: en status: true dependencies: config: + - field.field.paragraph.unit_search.field_search_results_term + - field.field.paragraph.unit_search.field_search_results_terms - field.field.paragraph.unit_search.field_unit_search_description - field.field.paragraph.unit_search.field_unit_search_meta_button - field.field.paragraph.unit_search.field_unit_search_meta_label @@ -13,12 +15,28 @@ dependencies: module: - text _core: - default_config_hash: eO2_M7ETTzd3irRYYwjAo3rKU54wDMxFzvHS3v6hKuQ + default_config_hash: S6K1S-j1nrFrLcfBOlDE6kLryR5LWMJb6vY4eDaS_G8 id: paragraph.unit_search.default targetEntityType: paragraph bundle: unit_search mode: default content: + field_search_results_term: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 6 + region: content + field_search_results_terms: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 7 + region: content field_unit_search_description: type: text_default label: hidden diff --git a/conf/cmi/core.entity_view_mode.block.token.yml b/conf/cmi/core.entity_view_mode.block.token.yml index 69112373..08124d6d 100644 --- a/conf/cmi/core.entity_view_mode.block.token.yml +++ b/conf/cmi/core.entity_view_mode.block.token.yml @@ -6,5 +6,6 @@ dependencies: - block id: block.token label: Token +description: '' targetEntityType: block cache: true diff --git a/conf/cmi/core.entity_view_mode.file.token.yml b/conf/cmi/core.entity_view_mode.file.token.yml index 0c3094f0..6e679764 100644 --- a/conf/cmi/core.entity_view_mode.file.token.yml +++ b/conf/cmi/core.entity_view_mode.file.token.yml @@ -6,5 +6,6 @@ dependencies: - file id: file.token label: Token +description: '' targetEntityType: file cache: true diff --git a/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml index 9087971a..d1cd5548 100644 --- a/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml +++ b/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml @@ -8,5 +8,6 @@ _core: default_config_hash: q8QZDYrGHAdl67dw9Z1DdTCTIhOo3lpW0dGN70STnCk id: helfi_news.medium_teaser label: 'Medium Teaser' +description: '' targetEntityType: helfi_news cache: true diff --git a/conf/cmi/core.entity_view_mode.media.content_card.yml b/conf/cmi/core.entity_view_mode.media.content_card.yml index 65c0f72d..4206923b 100644 --- a/conf/cmi/core.entity_view_mode.media.content_card.yml +++ b/conf/cmi/core.entity_view_mode.media.content_card.yml @@ -8,5 +8,6 @@ _core: default_config_hash: ZkAUzH7gBMP0I7VgZKkEsPYaKWHNjny_nb49e8n1HAE id: media.content_card label: 'Content card' +description: '' targetEntityType: media cache: true diff --git a/conf/cmi/core.entity_view_mode.media.full.yml b/conf/cmi/core.entity_view_mode.media.full.yml index 54d6bf99..a3b54194 100644 --- a/conf/cmi/core.entity_view_mode.media.full.yml +++ b/conf/cmi/core.entity_view_mode.media.full.yml @@ -8,5 +8,6 @@ _core: default_config_hash: 6NBUEuGmlkClK8Fb76tSMMpO2eZ4LWCBdbUk4z7CuP0 id: media.full label: 'Full content' +description: '' targetEntityType: media cache: true diff --git a/conf/cmi/core.entity_view_mode.media.hero.yml b/conf/cmi/core.entity_view_mode.media.hero.yml index ec2f766b..35dc5f33 100644 --- a/conf/cmi/core.entity_view_mode.media.hero.yml +++ b/conf/cmi/core.entity_view_mode.media.hero.yml @@ -8,5 +8,6 @@ _core: default_config_hash: XHi0bUTi0UQU5CFI90xrtRS1tLLlwUSrMhNft4fY_XA id: media.hero label: Hero +description: '' targetEntityType: media cache: true diff --git a/conf/cmi/core.entity_view_mode.media.image.yml b/conf/cmi/core.entity_view_mode.media.image.yml index cc53d196..3a6b6561 100644 --- a/conf/cmi/core.entity_view_mode.media.image.yml +++ b/conf/cmi/core.entity_view_mode.media.image.yml @@ -8,5 +8,6 @@ _core: default_config_hash: _B3q0O_xZZoTEPGo67JMyvbBEstnyqiAJjk8to3c1QM id: media.image label: Image +description: '' targetEntityType: media cache: true diff --git a/conf/cmi/core.entity_view_mode.media.list_of_links.yml b/conf/cmi/core.entity_view_mode.media.list_of_links.yml index 9a69bbde..ee4a0736 100644 --- a/conf/cmi/core.entity_view_mode.media.list_of_links.yml +++ b/conf/cmi/core.entity_view_mode.media.list_of_links.yml @@ -8,5 +8,6 @@ _core: default_config_hash: PHC5-ZAHrmao9xAd6ZMuFwwm9kIEBb4E31qjN0JkovE id: media.list_of_links label: 'List of Links' +description: '' targetEntityType: media cache: true diff --git a/conf/cmi/core.entity_view_mode.media.media_library.yml b/conf/cmi/core.entity_view_mode.media.media_library.yml index 7135ef0d..5474b1df 100644 --- a/conf/cmi/core.entity_view_mode.media.media_library.yml +++ b/conf/cmi/core.entity_view_mode.media.media_library.yml @@ -11,5 +11,6 @@ _core: default_config_hash: Tdhz-aDHfDoV1Ul9umtItxGTrjkFzoNAkDw8FWXjYA0 id: media.media_library label: 'Media library' +description: '' targetEntityType: media cache: true diff --git a/conf/cmi/core.entity_view_mode.media.token.yml b/conf/cmi/core.entity_view_mode.media.token.yml index 05de4ba7..c394327e 100644 --- a/conf/cmi/core.entity_view_mode.media.token.yml +++ b/conf/cmi/core.entity_view_mode.media.token.yml @@ -6,5 +6,6 @@ dependencies: - media id: media.token label: Token +description: '' targetEntityType: media cache: true diff --git a/conf/cmi/core.entity_view_mode.menu_link_content.token.yml b/conf/cmi/core.entity_view_mode.menu_link_content.token.yml index 02fc6226..7a1b6a49 100644 --- a/conf/cmi/core.entity_view_mode.menu_link_content.token.yml +++ b/conf/cmi/core.entity_view_mode.menu_link_content.token.yml @@ -6,5 +6,6 @@ dependencies: - menu_link_content id: menu_link_content.token label: Token +description: '' targetEntityType: menu_link_content cache: true diff --git a/conf/cmi/core.entity_view_mode.node.diff.yml b/conf/cmi/core.entity_view_mode.node.diff.yml index 66c6b0ec..e8ffe503 100644 --- a/conf/cmi/core.entity_view_mode.node.diff.yml +++ b/conf/cmi/core.entity_view_mode.node.diff.yml @@ -12,5 +12,6 @@ _core: default_config_hash: pqZNtad5J9THcdbYjwPD4qINqvrTxnOd8KCWn6tUBRs id: node.diff label: 'Revision comparison' +description: '' targetEntityType: node cache: true diff --git a/conf/cmi/core.entity_view_mode.node.full.yml b/conf/cmi/core.entity_view_mode.node.full.yml index 58c44554..f8a0e829 100644 --- a/conf/cmi/core.entity_view_mode.node.full.yml +++ b/conf/cmi/core.entity_view_mode.node.full.yml @@ -8,5 +8,6 @@ _core: default_config_hash: ElrtInxGjZd7GaapJ5O9n-ugi2hG2IxFivtgn0tHOsk id: node.full label: 'Full content' +description: '' targetEntityType: node cache: true diff --git a/conf/cmi/core.entity_view_mode.node.rss.yml b/conf/cmi/core.entity_view_mode.node.rss.yml index d5e5f060..4438080c 100644 --- a/conf/cmi/core.entity_view_mode.node.rss.yml +++ b/conf/cmi/core.entity_view_mode.node.rss.yml @@ -8,5 +8,6 @@ _core: default_config_hash: vlYzr-rp2f9NMp-Qlr4sFjlqRq-90mco5-afLNGwCrU id: node.rss label: RSS +description: '' targetEntityType: node cache: true diff --git a/conf/cmi/core.entity_view_mode.node.search_index.yml b/conf/cmi/core.entity_view_mode.node.search_index.yml index 60f8572a..e9e17b5a 100644 --- a/conf/cmi/core.entity_view_mode.node.search_index.yml +++ b/conf/cmi/core.entity_view_mode.node.search_index.yml @@ -8,5 +8,6 @@ _core: default_config_hash: fVFfJv_GzBRE-wpRHbfD5a3VjnhbEOXG6lvRd3uaccY id: node.search_index label: 'Search index' +description: '' targetEntityType: node cache: true diff --git a/conf/cmi/core.entity_view_mode.node.search_result.yml b/conf/cmi/core.entity_view_mode.node.search_result.yml index 51d8cde6..12e2d6d1 100644 --- a/conf/cmi/core.entity_view_mode.node.search_result.yml +++ b/conf/cmi/core.entity_view_mode.node.search_result.yml @@ -8,5 +8,6 @@ _core: default_config_hash: 6GCOQ-jP2RbdbHA5YWQ6bT8CfGbqrBYKOSC_XY4E3ZM id: node.search_result label: 'Search result highlighting input' +description: '' targetEntityType: node cache: true diff --git a/conf/cmi/core.entity_view_mode.node.teaser.yml b/conf/cmi/core.entity_view_mode.node.teaser.yml index aea50962..14c28ced 100644 --- a/conf/cmi/core.entity_view_mode.node.teaser.yml +++ b/conf/cmi/core.entity_view_mode.node.teaser.yml @@ -8,5 +8,6 @@ _core: default_config_hash: Mz9qWr1kUYK0mjRAGDsr5XS6PvtZ24en_7ndt-pyWe4 id: node.teaser label: Teaser +description: '' targetEntityType: node cache: true diff --git a/conf/cmi/core.entity_view_mode.node.token.yml b/conf/cmi/core.entity_view_mode.node.token.yml index 186f2c70..6e4d938c 100644 --- a/conf/cmi/core.entity_view_mode.node.token.yml +++ b/conf/cmi/core.entity_view_mode.node.token.yml @@ -6,5 +6,6 @@ dependencies: - node id: node.token label: Token +description: '' targetEntityType: node cache: true diff --git a/conf/cmi/core.entity_view_mode.paragraph.preview.yml b/conf/cmi/core.entity_view_mode.paragraph.preview.yml index 50eae640..9cce1bac 100644 --- a/conf/cmi/core.entity_view_mode.paragraph.preview.yml +++ b/conf/cmi/core.entity_view_mode.paragraph.preview.yml @@ -8,5 +8,6 @@ _core: default_config_hash: h3BeHVei4Lnyqbkao3YiF4KqoY-DhRvUNfEgKG8Rgjg id: paragraph.preview label: Preview +description: '' targetEntityType: paragraph cache: true diff --git a/conf/cmi/core.entity_view_mode.paragraphs_library_item.summary.yml b/conf/cmi/core.entity_view_mode.paragraphs_library_item.summary.yml index 59e43136..358ab632 100644 --- a/conf/cmi/core.entity_view_mode.paragraphs_library_item.summary.yml +++ b/conf/cmi/core.entity_view_mode.paragraphs_library_item.summary.yml @@ -8,5 +8,6 @@ _core: default_config_hash: _YqHTUZ5t7SWq5sE0bJwbSNH9CaL_KIbwu-rURJ6sXo id: paragraphs_library_item.summary label: Summary +description: '' targetEntityType: paragraphs_library_item cache: true diff --git a/conf/cmi/core.entity_view_mode.path_alias.token.yml b/conf/cmi/core.entity_view_mode.path_alias.token.yml index 4ace3d22..eaf013fd 100644 --- a/conf/cmi/core.entity_view_mode.path_alias.token.yml +++ b/conf/cmi/core.entity_view_mode.path_alias.token.yml @@ -6,5 +6,6 @@ dependencies: - path_alias id: path_alias.token label: Token +description: '' targetEntityType: path_alias cache: true diff --git a/conf/cmi/core.entity_view_mode.taxonomy_term.full.yml b/conf/cmi/core.entity_view_mode.taxonomy_term.full.yml index a3597c49..dd5b1ae9 100644 --- a/conf/cmi/core.entity_view_mode.taxonomy_term.full.yml +++ b/conf/cmi/core.entity_view_mode.taxonomy_term.full.yml @@ -8,5 +8,6 @@ _core: default_config_hash: '-PPKjsNQPvoIDjOuUAvlLocYD976MNjb9Zpgyz5_BWE' id: taxonomy_term.full label: 'Taxonomy term page' +description: '' targetEntityType: taxonomy_term cache: true diff --git a/conf/cmi/core.entity_view_mode.taxonomy_term.token.yml b/conf/cmi/core.entity_view_mode.taxonomy_term.token.yml index 155ed71f..3389da8d 100644 --- a/conf/cmi/core.entity_view_mode.taxonomy_term.token.yml +++ b/conf/cmi/core.entity_view_mode.taxonomy_term.token.yml @@ -6,5 +6,6 @@ dependencies: - taxonomy id: taxonomy_term.token label: Token +description: '' targetEntityType: taxonomy_term cache: true diff --git a/conf/cmi/core.entity_view_mode.tpr_service.teaser.yml b/conf/cmi/core.entity_view_mode.tpr_service.teaser.yml index 0f439942..3b0420eb 100644 --- a/conf/cmi/core.entity_view_mode.tpr_service.teaser.yml +++ b/conf/cmi/core.entity_view_mode.tpr_service.teaser.yml @@ -5,8 +5,9 @@ dependencies: module: - helfi_tpr _core: - default_config_hash: YOa_sO3NMdi35S6ah4CvX5AoLnX4zj2bxvL4-b6xv-8 + default_config_hash: i_wjmDIqaBVX_NtJINMsSeUkcCwfmH8OsoB93VymSzU id: tpr_service.teaser label: Teaser +description: '' targetEntityType: tpr_service cache: true diff --git a/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml b/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml index 0376076f..7d077f84 100644 --- a/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml +++ b/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml @@ -5,8 +5,9 @@ dependencies: module: - helfi_tpr _core: - default_config_hash: YJXddqfHzgzWlN_oVmr77-vQmOPw1kMx9ZaqJQntc08 + default_config_hash: Bck2wHrov_usRbEmhg9RWaK8Z0oIunYGSPSiqrtdsn8 id: tpr_service.teaser_search_result label: 'Teaser search result' +description: '' targetEntityType: tpr_service cache: true diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_mode.tpr_unit.minimal.yml index acb99d89..72b7df2c 100644 --- a/conf/cmi/core.entity_view_mode.tpr_unit.minimal.yml +++ b/conf/cmi/core.entity_view_mode.tpr_unit.minimal.yml @@ -5,8 +5,9 @@ dependencies: module: - helfi_tpr _core: - default_config_hash: QxDZ3nNixknhXrBxU6rSC1M5rvm5PeKB1Pj9ildFp-Q + default_config_hash: oC631SbwdCatNJWszkWAMTv-HhBr0SNctVNIuglNmRk id: tpr_unit.minimal label: Minimal +description: '' targetEntityType: tpr_unit cache: true diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_mode.tpr_unit.teaser.yml index 43195b6b..1d271c4f 100644 --- a/conf/cmi/core.entity_view_mode.tpr_unit.teaser.yml +++ b/conf/cmi/core.entity_view_mode.tpr_unit.teaser.yml @@ -5,8 +5,9 @@ dependencies: module: - helfi_tpr _core: - default_config_hash: LAmS3Xr8vByI6fypZQ0FRSMklP5vCrEDqIj7XnQ7sRE + default_config_hash: TSNBB3UUcZstVdW5hFlz-fFEJYyVvdhfrmVqSA1yH-c id: tpr_unit.teaser label: Teaser +description: '' targetEntityType: tpr_unit cache: true diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_mode.tpr_unit.teaser_with_image.yml index 89b09e96..13f3e951 100644 --- a/conf/cmi/core.entity_view_mode.tpr_unit.teaser_with_image.yml +++ b/conf/cmi/core.entity_view_mode.tpr_unit.teaser_with_image.yml @@ -5,8 +5,9 @@ dependencies: module: - helfi_tpr _core: - default_config_hash: 5Z1tcWB9-xWDc1NdGMqEdBEztTkXqp-cX1daPPNuNaY + default_config_hash: AT-6ewVmv-w7sldP6bao9gCSTFtvUZOBaxEw8CUz0qc id: tpr_unit.teaser_with_image label: 'Teaser with image' +description: '' targetEntityType: tpr_unit cache: true diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.token.yml b/conf/cmi/core.entity_view_mode.tpr_unit.token.yml index 1a5e8331..7a809e56 100644 --- a/conf/cmi/core.entity_view_mode.tpr_unit.token.yml +++ b/conf/cmi/core.entity_view_mode.tpr_unit.token.yml @@ -5,8 +5,9 @@ dependencies: module: - helfi_tpr _core: - default_config_hash: kzVXngjEGNpJsdD08ZS2eH18frDmMTMm5-s03cB3SMU + default_config_hash: e-6Lzi05F7EOEjvoo3YbLY-ig8Ha3dPyz8_FV5rl5fU id: tpr_unit.token label: Token +description: '' targetEntityType: tpr_unit cache: true diff --git a/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml index f57d6c81..114a1204 100644 --- a/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_mode.tpr_unit.wide_teaser.yml @@ -5,8 +5,9 @@ dependencies: module: - helfi_tpr _core: - default_config_hash: VOBfmZpf5VqHhiew2jSr2DSTritFtZ3ubPh9FaU9UIE + default_config_hash: pCrUWHaeZex0d_WTGOeIQJaFAmfPt_TqErzFsTn3xFE id: tpr_unit.wide_teaser label: 'Wide Teaser' +description: '' targetEntityType: tpr_unit cache: true diff --git a/conf/cmi/core.entity_view_mode.user.compact.yml b/conf/cmi/core.entity_view_mode.user.compact.yml index c9b6c1bc..b7f90a98 100644 --- a/conf/cmi/core.entity_view_mode.user.compact.yml +++ b/conf/cmi/core.entity_view_mode.user.compact.yml @@ -8,5 +8,6 @@ _core: default_config_hash: 71CSAr_LNPcgu6D6jI4INl1KATkahmeyUFBETAWya8g id: user.compact label: Compact +description: '' targetEntityType: user cache: true diff --git a/conf/cmi/core.entity_view_mode.user.full.yml b/conf/cmi/core.entity_view_mode.user.full.yml index 7496028f..432b0926 100644 --- a/conf/cmi/core.entity_view_mode.user.full.yml +++ b/conf/cmi/core.entity_view_mode.user.full.yml @@ -8,5 +8,6 @@ _core: default_config_hash: mQIF_foYjmnVSr9MpcD4CTaJE_FpO1AyDd_DskztGhM id: user.full label: 'User account' +description: '' targetEntityType: user cache: true diff --git a/conf/cmi/core.entity_view_mode.user.token.yml b/conf/cmi/core.entity_view_mode.user.token.yml index aced9323..24a3a5f4 100644 --- a/conf/cmi/core.entity_view_mode.user.token.yml +++ b/conf/cmi/core.entity_view_mode.user.token.yml @@ -6,5 +6,6 @@ dependencies: - user id: user.token label: Token +description: '' targetEntityType: user cache: true diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml index e641f404..20429243 100644 --- a/conf/cmi/editor.editor.full_html.yml +++ b/conf/cmi/editor.editor.full_html.yml @@ -43,8 +43,10 @@ settings: - heading5 - heading6 ckeditor5_list: - reversed: false - startIndex: true + properties: + reversed: false + startIndex: true + multiBlock: true ckeditor5_sourceEditing: allowed_tags: - '
' diff --git a/conf/cmi/editor.editor.minimal.yml b/conf/cmi/editor.editor.minimal.yml index 2f06a560..61760a2a 100644 --- a/conf/cmi/editor.editor.minimal.yml +++ b/conf/cmi/editor.editor.minimal.yml @@ -25,8 +25,10 @@ settings: - sourceEditing plugins: ckeditor5_list: - reversed: false - startIndex: true + properties: + reversed: false + startIndex: true + multiBlock: true ckeditor5_sourceEditing: allowed_tags: - '' diff --git a/conf/cmi/field.field.paragraph.unit_search.field_search_results_term.yml b/conf/cmi/field.field.paragraph.unit_search.field_search_results_term.yml new file mode 100644 index 00000000..b09ee3d6 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_search.field_search_results_term.yml @@ -0,0 +1,21 @@ +uuid: cfd94a60-bab9-4f02-aaf2-6f119816554d +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_search_results_term + - paragraphs.paragraphs_type.unit_search +_core: + default_config_hash: LYIln-ihFC2Yh8kr21WqReMUtCvxBgGM-sWWecgu-ek +id: paragraph.unit_search.field_search_results_term +field_name: field_search_results_term +entity_type: paragraph +bundle: unit_search +label: 'Search results singular term' +description: 'Term used on the search results title when there is exactly one result from the search.' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.field.paragraph.unit_search.field_search_results_terms.yml b/conf/cmi/field.field.paragraph.unit_search.field_search_results_terms.yml new file mode 100644 index 00000000..a3cb3b33 --- /dev/null +++ b/conf/cmi/field.field.paragraph.unit_search.field_search_results_terms.yml @@ -0,0 +1,21 @@ +uuid: 51ef8893-4e65-4f9e-b660-bbf078d00d91 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_search_results_terms + - paragraphs.paragraphs_type.unit_search +_core: + default_config_hash: lGI7gkF8hsMzbBivCchwiOTEsZ_zse_lLJSeqpleA2c +id: paragraph.unit_search.field_search_results_terms +field_name: field_search_results_terms +entity_type: paragraph +bundle: unit_search +label: 'Search results plural term' +description: 'Term used on the search results title when there is zero or more than one result from the search.' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.storage.paragraph.field_search_results_term.yml b/conf/cmi/field.storage.paragraph.field_search_results_term.yml new file mode 100644 index 00000000..e671ab73 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_search_results_term.yml @@ -0,0 +1,23 @@ +uuid: 162cded9-7206-4199-9511-b6078968169f +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: FjCwfl7T-gXkO6dwhE9RYF7fq7IosyyEQfg681BMMy4 +id: paragraph.field_search_results_term +field_name: field_search_results_term +entity_type: paragraph +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_search_results_terms.yml b/conf/cmi/field.storage.paragraph.field_search_results_terms.yml new file mode 100644 index 00000000..9545d40e --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_search_results_terms.yml @@ -0,0 +1,23 @@ +uuid: 2863d064-b9c5-46dd-b7b4-4bed4198158d +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: VVZTJ9paBb_ryw8jCR3DkccocI3XQubanMAr3GgT4Qc +id: paragraph.field_search_results_terms +field_name: field_search_results_terms +entity_type: paragraph +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml index 969d0da4..69f057d2 100644 --- a/conf/cmi/filter.format.full_html.yml +++ b/conf/cmi/filter.format.full_html.yml @@ -12,41 +12,6 @@ name: HTML format: full_html weight: 0 filters: - filter_autop: - id: filter_autop - provider: filter - status: true - weight: -46 - settings: { } - filter_html: - id: filter_html - provider: filter - status: true - weight: -50 - settings: - allowed_html: '