From 2094dc3ff1ffc38c3863e132c9e71a01b60143f2 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 7 Mar 2023 09:02:19 +0000 Subject: [PATCH 1/4] Update configuration --- composer.lock | 83 ++++++++++--------- ...ag.metatag_defaults.node__landing_page.yml | 3 +- conf/cmi/user.role.anonymous.yml | 4 +- conf/cmi/user.role.authenticated.yml | 4 +- conf/cmi/user.role.read_only.yml | 2 +- tools/make/project/install.mk | 2 +- 6 files changed, 52 insertions(+), 46 deletions(-) diff --git a/composer.lock b/composer.lock index ccd77edf..67493223 100644 --- a/composer.lock +++ b/composer.lock @@ -2212,16 +2212,16 @@ }, { "name": "drupal/core", - "version": "9.5.3", + "version": "9.5.4", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "67e34a5e8f48cafdd5c26e778a9570860e2d44a5" + "reference": "d48ad3173a39d6792e617f884fefe86c4bf41630" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/67e34a5e8f48cafdd5c26e778a9570860e2d44a5", - "reference": "67e34a5e8f48cafdd5c26e778a9570860e2d44a5", + "url": "https://api.github.com/repos/drupal/core/zipball/d48ad3173a39d6792e617f884fefe86c4bf41630", + "reference": "d48ad3173a39d6792e617f884fefe86c4bf41630", "shasum": "" }, "require": { @@ -2373,9 +2373,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.5.3" + "source": "https://github.com/drupal/core/tree/9.5.4" }, - "time": "2023-02-01T19:47:31+00:00" + "time": "2023-03-01T14:08:11+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -4060,16 +4060,16 @@ }, { "name": "drupal/hdbt", - "version": "4.4.17", + "version": "4.5.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "6065c40f968f5b3dfcb42b8fb295ad8b41867c15" + "reference": "623aea237dfcfb68ddbbc4190fb0baef31529e7b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/6065c40f968f5b3dfcb42b8fb295ad8b41867c15", - "reference": "6065c40f968f5b3dfcb42b8fb295ad8b41867c15", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/623aea237dfcfb68ddbbc4190fb0baef31529e7b", + "reference": "623aea237dfcfb68ddbbc4190fb0baef31529e7b", "shasum": "" }, "require": { @@ -4084,10 +4084,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.4.17", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.5.1", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-02-28T07:38:40+00:00" + "time": "2023-03-07T07:22:49+00:00" }, { "name": "drupal/hdbt_admin", @@ -4372,16 +4372,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.17.13", + "version": "2.18.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "566600bd99c9a238e247fda97a07253414799ffd" + "reference": "b9be8db9c3a6fb09a5f6254e0b448572642266b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/566600bd99c9a238e247fda97a07253414799ffd", - "reference": "566600bd99c9a238e247fda97a07253414799ffd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/b9be8db9c3a6fb09a5f6254e0b448572642266b8", + "reference": "b9be8db9c3a6fb09a5f6254e0b448572642266b8", "shasum": "" }, "require": { @@ -4413,7 +4413,7 @@ "drupal/image_style_quality": "^1.4", "drupal/imagecache_external": "^3.0", "drupal/imagemagick": "^3.4", - "drupal/linkit": "^6.0@beta", + "drupal/linkit": "6.0.0-beta3", "drupal/matomo": "^1.11", "drupal/matomo_reports": "^1.1", "drupal/media_entity_file_replace": "^1.0", @@ -4444,6 +4444,7 @@ "ext-curl": "*" }, "conflict": { + "drupal/core": "<9.5.4", "drupal/core-recommended": "<9.5", "drupal/ctools": "<3.11 || ^4.0.1" }, @@ -4461,7 +4462,7 @@ "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/f7c0e380e2deb9a1b46bdf779fb27a945b466575/patches/drupal_core_strip_debug_mode_whitespaces_9.3.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://www.drupal.org/files/issues/2022-11-04/2313309-152.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" }, "drupal/default_content": { "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" @@ -4477,7 +4478,7 @@ "[#UHF-2059] Enhancements for the Admin UI": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fdccb32397cc6fa19b4d0077b21a2b18aa6be297/patches/helfi_customizations_for_paragraphs_widget_8.x-1.12.patch" }, "drupal/linkit": { - "[#UHF-1872] Linkit support for link field": "https://www.drupal.org/files/issues/2021-08-20/avoid-linkit-CI-issue.patch" + "[#UHF-1872] Linkit support for link field (https://www.drupal.org/i/2712951)": "https://www.drupal.org/files/issues/2021-08-20/avoid-linkit-CI-issue.patch" }, "drupal/field_group": { "[#UHF-3268] Support for field group translations": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/736077493b73d83b63081820790dc68e226a6460/patches/field_group_fix-translations_label_description-3111107-31-rerolled.patch" @@ -4492,10 +4493,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.17.13", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.18.0", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-02-28T08:15:25+00:00" + "time": "2023-03-07T08:58:12+00:00" }, { "name": "drupal/helfi_proxy", @@ -4541,16 +4542,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.1.9", + "version": "2.1.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "922bdb0ed7fb34858a007b04624e89fa07c7d55a" + "reference": "378724923a506a8f340542283242bf5f22d6c6a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/922bdb0ed7fb34858a007b04624e89fa07c7d55a", - "reference": "922bdb0ed7fb34858a007b04624e89fa07c7d55a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/378724923a506a8f340542283242bf5f22d6c6a4", + "reference": "378724923a506a8f340542283242bf5f22d6c6a4", "shasum": "" }, "require": { @@ -4576,10 +4577,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.9", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.10", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-02-09T13:53:30+00:00" + "time": "2023-03-02T07:17:52+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -4848,6 +4849,10 @@ { "name": "johnwebdev", "homepage": "https://www.drupal.org/user/3331569" + }, + { + "name": "mark_fullmer", + "homepage": "https://www.drupal.org/user/2612816" } ], "description": "Linkit - Enriched linking experience", @@ -11413,16 +11418,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.2.0", + "version": "v3.2.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3" + "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3", - "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", + "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", "shasum": "" }, "require": { @@ -11460,7 +11465,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1" }, "funding": [ { @@ -11476,7 +11481,7 @@ "type": "tidelift" } ], - "time": "2022-11-25T10:21:52+00:00" + "time": "2023-03-01T10:25:55+00:00" }, { "name": "symfony/error-handler", @@ -13669,16 +13674,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.19", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b" + "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", - "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6c5ac3a1be8b849d59a1a77877ee110e1b55eb74", + "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74", "shasum": "" }, "require": { @@ -13738,7 +13743,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.19" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.21" }, "funding": [ { @@ -13754,7 +13759,7 @@ "type": "tidelift" } ], - "time": "2023-01-16T10:52:33+00:00" + "time": "2023-02-23T10:00:28+00:00" }, { "name": "symfony/yaml", diff --git a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml index 221ca9fb..a9a710f0 100644 --- a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml +++ b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml @@ -6,4 +6,5 @@ _core: default_config_hash: 4LnWqTxx8bp4ew1DS7XZOmhHzO_B-us0REW1efp3xRk id: node__landing_page label: 'Content: Landing page' -tags: { } +tags: + description: '[node:field_hero:entity:field_hero_desc]' diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml index 74835290..30ca739e 100644 --- a/conf/cmi/user.role.anonymous.yml +++ b/conf/cmi/user.role.anonymous.yml @@ -8,12 +8,12 @@ dependencies: - eu_cookie_compliance - helfi_api_base - media - - system - rest + - system _core: default_config_hash: j5zLMOdJBqC0bMvSdth5UebkprJB8g_2FXHqhfpJzow id: anonymous -label: 'Anonymous user' +label: 'Anonyymi käyttäjä' weight: 0 is_admin: false permissions: diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml index 4e92c25b..bbeb8231 100644 --- a/conf/cmi/user.role.authenticated.yml +++ b/conf/cmi/user.role.authenticated.yml @@ -8,13 +8,13 @@ dependencies: - eu_cookie_compliance - helfi_api_base - media + - rest - system - toolbar - - rest _core: default_config_hash: dJ0L2DNSj5q6XVZAGsuVDpJTh5UeYkIPwKrUOOpr8YI id: authenticated -label: 'Authenticated user' +label: 'Sisäänkirjautunut käyttäjä' weight: 1 is_admin: false permissions: diff --git a/conf/cmi/user.role.read_only.yml b/conf/cmi/user.role.read_only.yml index 536d0d0f..b4a2f90f 100644 --- a/conf/cmi/user.role.read_only.yml +++ b/conf/cmi/user.role.read_only.yml @@ -9,7 +9,7 @@ dependencies: _core: default_config_hash: syTv0h1MUcZ35TjmApRsR9znnDRN-fk-wxfZjABkkbw id: read_only -label: 'Read only' +label: Lukija weight: 2 is_admin: null permissions: diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index 84ae5d1a..c38be143 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -25,7 +25,7 @@ PHONY += helfi-drush-enable-modules helfi-drush-enable-modules: ## Enable modules and base configurations. $(call step,Install base configurations...) $(call drush,cr) - $(call drush,en -y helfi_platform_config helfi_base_config) + $(call drush,en -y helfi_platform_config helfi_platform_config_base) PHONY += drush-locale-update drush-locale-update: ## Update translations. From 7f52ade8a98e8556ce1d338fbb339a421382cd13 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Wed, 8 Mar 2023 09:33:39 +0200 Subject: [PATCH 2/4] Update user.role.read_only.yml --- conf/cmi/user.role.read_only.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cmi/user.role.read_only.yml b/conf/cmi/user.role.read_only.yml index b4a2f90f..536d0d0f 100644 --- a/conf/cmi/user.role.read_only.yml +++ b/conf/cmi/user.role.read_only.yml @@ -9,7 +9,7 @@ dependencies: _core: default_config_hash: syTv0h1MUcZ35TjmApRsR9znnDRN-fk-wxfZjABkkbw id: read_only -label: Lukija +label: 'Read only' weight: 2 is_admin: null permissions: From a5f94a116202519b00576ecb10b045beb5b45d98 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Wed, 8 Mar 2023 09:34:01 +0200 Subject: [PATCH 3/4] Update user.role.authenticated.yml --- conf/cmi/user.role.authenticated.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml index bbeb8231..22c278df 100644 --- a/conf/cmi/user.role.authenticated.yml +++ b/conf/cmi/user.role.authenticated.yml @@ -14,7 +14,7 @@ dependencies: _core: default_config_hash: dJ0L2DNSj5q6XVZAGsuVDpJTh5UeYkIPwKrUOOpr8YI id: authenticated -label: 'Sisäänkirjautunut käyttäjä' +label: 'Authenticated user' weight: 1 is_admin: false permissions: From 15409ecd203f19f9735790a00d918a9f4dc62f14 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Wed, 8 Mar 2023 09:34:21 +0200 Subject: [PATCH 4/4] Update user.role.anonymous.yml --- conf/cmi/user.role.anonymous.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml index 30ca739e..6851d15b 100644 --- a/conf/cmi/user.role.anonymous.yml +++ b/conf/cmi/user.role.anonymous.yml @@ -13,7 +13,7 @@ dependencies: _core: default_config_hash: j5zLMOdJBqC0bMvSdth5UebkprJB8g_2FXHqhfpJzow id: anonymous -label: 'Anonyymi käyttäjä' +label: 'Anonymous user' weight: 0 is_admin: false permissions: