From 8f54f170508c3d7b403ddb22ab7b339ebf4efc08 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Fri, 14 Jul 2023 05:56:02 +0000 Subject: [PATCH 1/3] Update configuration --- composer.lock | 36 +++++++++---------- ...splay.paragraph.accordion_item.default.yml | 4 +-- ..._form_display.paragraph.banner.default.yml | 6 ++-- ...ay.paragraph.social_media_link.default.yml | 4 +-- ...ragraph.target_group_link_item.default.yml | 4 +-- ...splay.paragraph.accordion_item.default.yml | 4 +-- ..._view_display.paragraph.banner.default.yml | 4 +-- ...ay.paragraph.social_media_link.default.yml | 4 +-- ...ragraph.target_group_link_item.default.yml | 4 +-- 9 files changed, 35 insertions(+), 35 deletions(-) diff --git a/composer.lock b/composer.lock index b07531d9..3fa9f782 100644 --- a/composer.lock +++ b/composer.lock @@ -3785,16 +3785,16 @@ }, { "name": "drupal/hdbt_admin", - "version": "2.0.11", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "e7c3e4a71a4a3cc15302979feca014b4ef3d0155" + "reference": "bc96b8ea4b1dc0e0539de9ce59de916489598736" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/e7c3e4a71a4a3cc15302979feca014b4ef3d0155", - "reference": "e7c3e4a71a4a3cc15302979feca014b4ef3d0155", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/bc96b8ea4b1dc0e0539de9ce59de916489598736", + "reference": "bc96b8ea4b1dc0e0539de9ce59de916489598736", "shasum": "" }, "require": { @@ -3813,10 +3813,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/2.0.11", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/2.1.0", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2023-07-07T14:29:20+00:00" + "time": "2023-07-13T06:46:58+00:00" }, { "name": "drupal/health_check", @@ -3977,16 +3977,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "2.0.11", + "version": "2.0.12", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "b65a55cc62312814c60b648cbca51e202dee5233" + "reference": "f81ea1673ed056852e4afd92e1b9628bfb00d6f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/b65a55cc62312814c60b648cbca51e202dee5233", - "reference": "b65a55cc62312814c60b648cbca51e202dee5233", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/f81ea1673ed056852e4afd92e1b9628bfb00d6f0", + "reference": "f81ea1673ed056852e4afd92e1b9628bfb00d6f0", "shasum": "" }, "require": { @@ -4004,23 +4004,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.11", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.12", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2023-06-08T07:12:01+00:00" + "time": "2023-07-05T11:47:03+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "3.1.12", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "eba9800c0b87d8662b649136ed98b8d2b83c2469" + "reference": "70ef115992e90846fe41e2cc8f3e87153fbc5443" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/eba9800c0b87d8662b649136ed98b8d2b83c2469", - "reference": "eba9800c0b87d8662b649136ed98b8d2b83c2469", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/70ef115992e90846fe41e2cc8f3e87153fbc5443", + "reference": "70ef115992e90846fe41e2cc8f3e87153fbc5443", "shasum": "" }, "require": { @@ -4123,10 +4123,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.1.12", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.2.0", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-07-07T14:20:32+00:00" + "time": "2023-07-13T06:51:20+00:00" }, { "name": "drupal/helfi_proxy", diff --git a/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml index b97a972a..b98c078f 100644 --- a/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml @@ -14,7 +14,7 @@ dependencies: config: - paragraphs.paragraphs_type.accordion_item _core: - default_config_hash: yh7XBH-ll-xlWjrJde_b840dNBvzoVrP75rXJtZTYnI + default_config_hash: 7N37krPnWHQwmRjb9_0yq6TseyB-RZ-qkVpklV7rR98 id: paragraph.accordion_item.default targetEntityType: paragraph bundle: accordion_item @@ -48,7 +48,7 @@ content: placeholder: '' third_party_settings: { } field_icon: - type: select2_icon_widget + type: select_icon_widget weight: 1 region: content settings: { } diff --git a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml index 55f136b8..9cd68762 100644 --- a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml @@ -17,7 +17,7 @@ dependencies: module: - hdbt_admin_tools _core: - default_config_hash: Vtp2PgsgVx3XvL6wqcXbKUn8j0EMUkSmwv55K092n0M + default_config_hash: dW34Ba__f5zlIB6OaYxFRW0itQBA98RdooSTUnqW2RE id: paragraph.banner.default targetEntityType: paragraph bundle: banner @@ -42,8 +42,8 @@ content: weight: 4 region: content settings: - linkit_profile: helfi linkit_auto_link_text: false + linkit_profile: helfi third_party_settings: { } field_banner_link_design: type: design_field_widget @@ -60,7 +60,7 @@ content: placeholder: '' third_party_settings: { } field_icon: - type: select2_icon_widget + type: select_icon_widget weight: 2 region: content settings: { } diff --git a/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml b/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml index e7506fff..d2bb9a0e 100644 --- a/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.social_media_link.default.yml @@ -10,14 +10,14 @@ dependencies: - hdbt_admin_tools - link _core: - default_config_hash: aWojfz5AeLM97eeoyKxUlJpYkuG2X8qLl2KOaczBukY + default_config_hash: BzfvGsHIC_c0aNhpt5fjgtz76eqpJy7Q8UpK7Rdebso id: paragraph.social_media_link.default targetEntityType: paragraph bundle: social_media_link mode: default content: field_icon: - type: select2_icon_widget + type: select_icon_widget weight: 0 region: content settings: { } diff --git a/conf/cmi/core.entity_form_display.paragraph.target_group_link_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.target_group_link_item.default.yml index ced6f2e3..f553baa2 100644 --- a/conf/cmi/core.entity_form_display.paragraph.target_group_link_item.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.target_group_link_item.default.yml @@ -11,14 +11,14 @@ dependencies: - hdbt_admin_tools - link _core: - default_config_hash: cpCXVwI1APCEyCe60tVNc9f4sPZwzq21qnKbSvJrAlw + default_config_hash: KD89aqMiKmJcWgPj05TsKprgmY9BzDTWPZG6_b5-V9g id: paragraph.target_group_link_item.default targetEntityType: paragraph bundle: target_group_link_item mode: default content: field_icon: - type: select2_icon_widget + type: select_icon_widget weight: 0 region: content settings: { } diff --git a/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml b/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml index 0b73845d..44dc1207 100644 --- a/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.accordion_item.default.yml @@ -11,7 +11,7 @@ dependencies: - entity_reference_revisions - hdbt_admin_tools _core: - default_config_hash: 1lhqYKB1uMovDeTbUM2yc6qoZDYVsY8Rb9cWZMPqO0k + default_config_hash: WvxeLovAeRn181zqTY9mqQlEUH2qKUDh3w1g2KROZoA id: paragraph.accordion_item.default targetEntityType: paragraph bundle: accordion_item @@ -35,7 +35,7 @@ content: weight: 0 region: content field_icon: - type: select2_icon_formatter + type: select_icon_formatter label: hidden settings: { } third_party_settings: { } diff --git a/conf/cmi/core.entity_view_display.paragraph.banner.default.yml b/conf/cmi/core.entity_view_display.paragraph.banner.default.yml index 46427900..5e12fcbe 100644 --- a/conf/cmi/core.entity_view_display.paragraph.banner.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.banner.default.yml @@ -16,7 +16,7 @@ dependencies: - options - text _core: - default_config_hash: P09yzz4rYAbV5vNALDXDbgpMXPO7jOGMbmig6Q3VgLA + default_config_hash: 81G-zzBxYIt-u9L4g2zVuH0NP_i72wAOboZ0Fy7mA70 id: paragraph.banner.default targetEntityType: paragraph bundle: banner @@ -64,7 +64,7 @@ content: weight: 0 region: content field_icon: - type: select2_icon_formatter + type: select_icon_formatter label: hidden settings: { } third_party_settings: { } diff --git a/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml b/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml index 7427a83f..20dc1d5d 100644 --- a/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.social_media_link.default.yml @@ -10,14 +10,14 @@ dependencies: - hdbt_admin_tools - link _core: - default_config_hash: WtJ8D0kqvYryjBD0kBTGg0SOQkCyGq7qF-uD4W_3z9g + default_config_hash: 3cRI5TbNqV68nkWG4yIl_I6iqqYeWmdA_XtlHEkRIgE id: paragraph.social_media_link.default targetEntityType: paragraph bundle: social_media_link mode: default content: field_icon: - type: select2_icon_formatter + type: select_icon_formatter label: hidden settings: { } third_party_settings: { } diff --git a/conf/cmi/core.entity_view_display.paragraph.target_group_link_item.default.yml b/conf/cmi/core.entity_view_display.paragraph.target_group_link_item.default.yml index 575bd3f4..b14365f3 100644 --- a/conf/cmi/core.entity_view_display.paragraph.target_group_link_item.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.target_group_link_item.default.yml @@ -11,14 +11,14 @@ dependencies: - hdbt_admin_tools - link _core: - default_config_hash: i80ANNBaRvZWikQ1vNa_Ib_ogd25z6iAxzCrXayVsTA + default_config_hash: 1745o_IHwMytcBjIpfcCeHE1USxqMqdc7HwSLQTjKjs id: paragraph.target_group_link_item.default targetEntityType: paragraph bundle: target_group_link_item mode: default content: field_icon: - type: select2_icon_formatter + type: select_icon_formatter label: hidden settings: { } third_party_settings: { } From 1dece6d1f3deb60aff99b0eba94b8bc5bf167522 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Thu, 3 Aug 2023 11:34:18 +0000 Subject: [PATCH 2/3] Update configuration --- composer.lock | 322 +++++++----------- conf/cmi/block.block.brandingnavigation.yml | 31 -- ...block.hdbt_subtheme_brandingnavigation.yml | 31 -- ..._form_display.paragraph.banner.default.yml | 2 +- conf/cmi/system.menu.branding-navigation.yml | 10 - docker/openshift/crons/migrate-hearings.sh | 9 + tools/make/drupal.mk | 20 +- tools/make/lagoon.mk | 1 + tools/make/utils.mk | 4 - 9 files changed, 137 insertions(+), 293 deletions(-) delete mode 100644 conf/cmi/block.block.brandingnavigation.yml delete mode 100644 conf/cmi/block.block.hdbt_subtheme_brandingnavigation.yml delete mode 100644 conf/cmi/system.menu.branding-navigation.yml create mode 100644 docker/openshift/crons/migrate-hearings.sh diff --git a/composer.lock b/composer.lock index 3fa9f782..fc96e943 100644 --- a/composer.lock +++ b/composer.lock @@ -1285,16 +1285,16 @@ }, { "name": "doctrine/collections", - "version": "2.1.2", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "db8cda536a034337f7dd63febecc713d4957f9ee" + "reference": "3023e150f90a38843856147b58190aa8b46cc155" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/db8cda536a034337f7dd63febecc713d4957f9ee", - "reference": "db8cda536a034337f7dd63febecc713d4957f9ee", + "url": "https://api.github.com/repos/doctrine/collections/zipball/3023e150f90a38843856147b58190aa8b46cc155", + "reference": "3023e150f90a38843856147b58190aa8b46cc155", "shasum": "" }, "require": { @@ -1307,7 +1307,7 @@ "phpstan/phpstan": "^1.8", "phpstan/phpstan-phpunit": "^1.0", "phpunit/phpunit": "^9.5", - "vimeo/psalm": "^4.22" + "vimeo/psalm": "^5.11" }, "type": "library", "autoload": { @@ -1351,7 +1351,7 @@ ], "support": { "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/2.1.2" + "source": "https://github.com/doctrine/collections/tree/2.1.3" }, "funding": [ { @@ -1367,7 +1367,7 @@ "type": "tidelift" } ], - "time": "2022-12-27T23:41:38+00:00" + "time": "2023-07-06T15:15:36+00:00" }, { "name": "doctrine/deprecations", @@ -1496,20 +1496,20 @@ }, { "name": "doctrine/reflection", - "version": "1.2.3", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/doctrine/reflection.git", - "reference": "1034e5e71f89978b80f9c1570e7226f6c3b9b6fb" + "reference": "6bcea3e81ab8b3d0abe5fde5300bbc8a968960c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/reflection/zipball/1034e5e71f89978b80f9c1570e7226f6c3b9b6fb", - "reference": "1034e5e71f89978b80f9c1570e7226f6c3b9b6fb", + "url": "https://api.github.com/repos/doctrine/reflection/zipball/6bcea3e81ab8b3d0abe5fde5300bbc8a968960c7", + "reference": "6bcea3e81ab8b3d0abe5fde5300bbc8a968960c7", "shasum": "" }, "require": { - "doctrine/annotations": "^1.0", + "doctrine/annotations": "^1.0 || ^2.0", "ext-tokenizer": "*", "php": "^7.1 || ^8.0" }, @@ -1567,10 +1567,10 @@ ], "support": { "issues": "https://github.com/doctrine/reflection/issues", - "source": "https://github.com/doctrine/reflection/tree/1.2.3" + "source": "https://github.com/doctrine/reflection/tree/1.2.4" }, "abandoned": "roave/better-reflection", - "time": "2022-05-31T18:46:25+00:00" + "time": "2023-07-27T18:11:59+00:00" }, { "name": "drupal/address", @@ -2654,17 +2654,17 @@ }, { "name": "drupal/editoria11y", - "version": "2.0.12", + "version": "2.0.13", "source": { "type": "git", "url": "https://git.drupalcode.org/project/editoria11y.git", - "reference": "2.0.12" + "reference": "2.0.13" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.12.zip", - "reference": "2.0.12", - "shasum": "e0e584a2f409709f4547dfe9cc7376a80f8fa317" + "url": "https://ftp.drupal.org/files/projects/editoria11y-2.0.13.zip", + "reference": "2.0.13", + "shasum": "2c1683f0c075918c74f7ccd526f7bc787f260a7f" }, "require": { "drupal/core": "^9 || ^10" @@ -2672,8 +2672,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.12", - "datestamp": "1680556093", + "version": "2.0.13", + "datestamp": "1690052595", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3449,17 +3449,17 @@ }, { "name": "drupal/flysystem", - "version": "2.1.0-rc4", + "version": "2.1.0-rc5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/flysystem.git", - "reference": "2.1.0-rc4" + "reference": "2.1.0-rc5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/flysystem-2.1.0-rc4.zip", - "reference": "2.1.0-rc4", - "shasum": "bb1c7bcfee8a303188df7ce7baac6b7ca5a2cc73" + "url": "https://ftp.drupal.org/files/projects/flysystem-2.1.0-rc5.zip", + "reference": "2.1.0-rc5", + "shasum": "4589e8b18f4de487d04a17a91e173ed78272ec4f" }, "require": { "drupal/core": "^9.5 || ^10.0", @@ -3474,8 +3474,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.0-rc4", - "datestamp": "1685062002", + "version": "2.1.0-rc5", + "datestamp": "1690746561", "security-coverage": { "status": "not-covered", "message": "RC releases are not covered by Drupal security advisories." @@ -3573,17 +3573,17 @@ }, { "name": "drupal/focal_point", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/focal_point.git", - "reference": "2.0.1" + "reference": "2.0.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/focal_point-2.0.1.zip", - "reference": "2.0.1", - "shasum": "2af4bb7f305735adbc216de742f0fa02bba6457b" + "url": "https://ftp.drupal.org/files/projects/focal_point-2.0.2.zip", + "reference": "2.0.2", + "shasum": "8e809795ec6a68a0bc3740b0b0a41bfa53d4d6d5" }, "require": { "drupal/core": "^9.3 || ^10", @@ -3597,8 +3597,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.1", - "datestamp": "1689093654", + "version": "2.0.2", + "datestamp": "1690451892", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3751,16 +3751,16 @@ }, { "name": "drupal/hdbt", - "version": "5.4.11", + "version": "5.5.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "e01ee76d87f8d93759f34de45716c72f89282852" + "reference": "bea997016c5b4156677e97ac8162f694ff9f7f30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/e01ee76d87f8d93759f34de45716c72f89282852", - "reference": "e01ee76d87f8d93759f34de45716c72f89282852", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/bea997016c5b4156677e97ac8162f694ff9f7f30", + "reference": "bea997016c5b4156677e97ac8162f694ff9f7f30", "shasum": "" }, "require": { @@ -3778,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.4.11", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.1", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-07-12T05:31:39+00:00" + "time": "2023-08-03T11:31:25+00:00" }, { "name": "drupal/hdbt_admin", @@ -3955,12 +3955,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "071a7a7a0f77d42b0a18cbafdd6f6d809bc65920" + "reference": "5445ad9e47c0231243068982ef6eeb64fa1363b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/071a7a7a0f77d42b0a18cbafdd6f6d809bc65920", - "reference": "071a7a7a0f77d42b0a18cbafdd6f6d809bc65920", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/5445ad9e47c0231243068982ef6eeb64fa1363b0", + "reference": "5445ad9e47c0231243068982ef6eeb64fa1363b0", "shasum": "" }, "default-branch": true, @@ -3973,7 +3973,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-06-21T15:02:39+00:00" + "time": "2023-07-25T08:32:03+00:00" }, { "name": "drupal/helfi_navigation", @@ -4011,16 +4011,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.2.0", + "version": "3.3.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "70ef115992e90846fe41e2cc8f3e87153fbc5443" + "reference": "7e25a554d05444ff5e8031d7b19d5d240a402d88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/70ef115992e90846fe41e2cc8f3e87153fbc5443", - "reference": "70ef115992e90846fe41e2cc8f3e87153fbc5443", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/7e25a554d05444ff5e8031d7b19d5d240a402d88", + "reference": "7e25a554d05444ff5e8031d7b19d5d240a402d88", "shasum": "" }, "require": { @@ -4123,10 +4123,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.2.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.0", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-07-13T06:51:20+00:00" + "time": "2023-08-03T07:23:36+00:00" }, { "name": "drupal/helfi_proxy", @@ -6434,23 +6434,23 @@ }, { "name": "drupal/views_bulk_edit", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_edit.git", - "reference": "8.x-2.8" + "reference": "8.x-2.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_edit-8.x-2.8.zip", - "reference": "8.x-2.8", - "shasum": "8600f5688d21d5d98e56b5f8c154997f6cb190c1" + "url": "https://ftp.drupal.org/files/projects/views_bulk_edit-8.x-2.9.zip", + "reference": "8.x-2.9", + "shasum": "db45a8cc9ac629859374b24974eafcef257e4387" }, "require": { - "drupal/core": "^9.1 || ^10" + "drupal/core": "^9.4 || ^10" }, "require-dev": { - "drupal/views_bulk_operations": "~3.0" + "drupal/views_bulk_operations": "~4.2.4" }, "suggest": { "drupal/views_bulk_operations": "Get VBO for all the views benefits like batching, ability to select all view results or persistent selection across pages" @@ -6458,8 +6458,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.8", - "datestamp": "1666257164", + "version": "8.x-2.9", + "datestamp": "1690222256", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6478,6 +6478,10 @@ { "name": "Graber", "homepage": "https://www.drupal.org/user/1599440" + }, + { + "name": "joseph.olstad", + "homepage": "https://www.drupal.org/user/1321830" } ], "description": "Allows bulk edition of entity field values.", @@ -7258,16 +7262,16 @@ }, { "name": "firebase/php-jwt", - "version": "v6.8.0", + "version": "v6.8.1", "source": { "type": "git", "url": "https://github.com/firebase/php-jwt.git", - "reference": "48b0210c51718d682e53210c24d25c5a10a2299b" + "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/firebase/php-jwt/zipball/48b0210c51718d682e53210c24d25c5a10a2299b", - "reference": "48b0210c51718d682e53210c24d25c5a10a2299b", + "url": "https://api.github.com/repos/firebase/php-jwt/zipball/5dbc8959427416b8ee09a100d7a8588c00fb2e26", + "reference": "5dbc8959427416b8ee09a100d7a8588c00fb2e26", "shasum": "" }, "require": { @@ -7315,9 +7319,9 @@ ], "support": { "issues": "https://github.com/firebase/php-jwt/issues", - "source": "https://github.com/firebase/php-jwt/tree/v6.8.0" + "source": "https://github.com/firebase/php-jwt/tree/v6.8.1" }, - "time": "2023-06-20T16:45:35+00:00" + "time": "2023-07-14T18:33:00+00:00" }, { "name": "galbar/jsonpath", @@ -7916,41 +7920,41 @@ }, { "name": "laminas/laminas-feed", - "version": "2.20.0", + "version": "2.21.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-feed.git", - "reference": "508ebef6e622f2f2ce3dd0559739ffd0dfa3b938" + "reference": "52918789a417bc292ccd6fbb4b91bd78a65d50ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/508ebef6e622f2f2ce3dd0559739ffd0dfa3b938", - "reference": "508ebef6e622f2f2ce3dd0559739ffd0dfa3b938", + "url": "https://api.github.com/repos/laminas/laminas-feed/zipball/52918789a417bc292ccd6fbb4b91bd78a65d50ab", + "reference": "52918789a417bc292ccd6fbb4b91bd78a65d50ab", "shasum": "" }, "require": { "ext-dom": "*", "ext-libxml": "*", "laminas/laminas-escaper": "^2.9", - "laminas/laminas-servicemanager": "^3.14.0", "laminas/laminas-stdlib": "^3.6", - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0" }, "conflict": { "laminas/laminas-servicemanager": "<3.3", "zendframework/zend-feed": "*" }, "require-dev": { - "laminas/laminas-cache": "^2.13.2 || ^3.6", - "laminas/laminas-cache-storage-adapter-memory": "^1.1.0 || ^2.1", - "laminas/laminas-coding-standard": "~2.4.0", - "laminas/laminas-db": "^2.15", - "laminas/laminas-http": "^2.17.0", - "laminas/laminas-validator": "^2.26", - "phpunit/phpunit": "^9.5.25", - "psalm/plugin-phpunit": "^0.18.0", - "psr/http-message": "^1.0.1", - "vimeo/psalm": "^5.1.0" + "laminas/laminas-cache": "^2.13.2 || ^3.10.1", + "laminas/laminas-cache-storage-adapter-memory": "^1.1.0 || ^2.2", + "laminas/laminas-coding-standard": "~2.5.0", + "laminas/laminas-db": "^2.18", + "laminas/laminas-http": "^2.18", + "laminas/laminas-servicemanager": "^3.21.0", + "laminas/laminas-validator": "^2.30.1", + "phpunit/phpunit": "^10.2.6", + "psalm/plugin-phpunit": "^0.18.4", + "psr/http-message": "^2.0", + "vimeo/psalm": "^5.13.1" }, "suggest": { "laminas/laminas-cache": "Laminas\\Cache component, for optionally caching feeds between requests", @@ -7992,98 +7996,7 @@ "type": "community_bridge" } ], - "time": "2022-12-03T19:40:30+00:00" - }, - { - "name": "laminas/laminas-servicemanager", - "version": "3.21.0", - "source": { - "type": "git", - "url": "https://github.com/laminas/laminas-servicemanager.git", - "reference": "625f2aa3bc6dd02688b2da5155b3a69870812bda" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-servicemanager/zipball/625f2aa3bc6dd02688b2da5155b3a69870812bda", - "reference": "625f2aa3bc6dd02688b2da5155b3a69870812bda", - "shasum": "" - }, - "require": { - "laminas/laminas-stdlib": "^3.17", - "php": "~8.1.0 || ~8.2.0", - "psr/container": "^1.0" - }, - "conflict": { - "ext-psr": "*", - "laminas/laminas-code": "<4.10.0", - "zendframework/zend-code": "<3.3.1", - "zendframework/zend-servicemanager": "*" - }, - "provide": { - "psr/container-implementation": "^1.0" - }, - "replace": { - "container-interop/container-interop": "^1.2.0" - }, - "require-dev": { - "composer/package-versions-deprecated": "^1.11.99.5", - "friendsofphp/proxy-manager-lts": "^1.0.14", - "laminas/laminas-code": "^4.10.0", - "laminas/laminas-coding-standard": "~2.5.0", - "laminas/laminas-container-config-test": "^0.8", - "laminas/laminas-dependency-plugin": "^2.2", - "mikey179/vfsstream": "^1.6.11", - "phpbench/phpbench": "^1.2.9", - "phpunit/phpunit": "^10.0.17", - "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.8.0" - }, - "suggest": { - "friendsofphp/proxy-manager-lts": "ProxyManager ^2.1.1 to handle lazy initialization of services" - }, - "bin": [ - "bin/generate-deps-for-config-factory", - "bin/generate-factory-for-class" - ], - "type": "library", - "autoload": { - "files": [ - "src/autoload.php" - ], - "psr-4": { - "Laminas\\ServiceManager\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "description": "Factory-Driven Dependency Injection Container", - "homepage": "https://laminas.dev", - "keywords": [ - "PSR-11", - "dependency-injection", - "di", - "dic", - "laminas", - "service-manager", - "servicemanager" - ], - "support": { - "chat": "https://laminas.dev/chat", - "docs": "https://docs.laminas.dev/laminas-servicemanager/", - "forum": "https://discourse.laminas.dev", - "issues": "https://github.com/laminas/laminas-servicemanager/issues", - "rss": "https://github.com/laminas/laminas-servicemanager/releases.atom", - "source": "https://github.com/laminas/laminas-servicemanager" - }, - "funding": [ - { - "url": "https://funding.communitybridge.org/projects/laminas-project", - "type": "community_bridge" - } - ], - "time": "2023-05-14T12:24:54+00:00" + "time": "2023-07-24T09:21:16+00:00" }, { "name": "laminas/laminas-stdlib", @@ -8417,16 +8330,16 @@ }, { "name": "league/mime-type-detection", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" + "reference": "c7f2872fb273bf493811473dafc88d60ae829f48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/c7f2872fb273bf493811473dafc88d60ae829f48", + "reference": "c7f2872fb273bf493811473dafc88d60ae829f48", "shasum": "" }, "require": { @@ -8457,7 +8370,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.12.0" }, "funding": [ { @@ -8469,7 +8382,7 @@ "type": "tidelift" } ], - "time": "2022-04-17T13:12:02+00:00" + "time": "2023-08-03T07:14:11+00:00" }, { "name": "league/uri", @@ -8793,16 +8706,16 @@ }, { "name": "masterminds/html5", - "version": "2.8.0", + "version": "2.8.1", "source": { "type": "git", "url": "https://github.com/Masterminds/html5-php.git", - "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3" + "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", - "reference": "3c5d5a56d56f48a1ca08a0670f0f80c1dad368f3", + "url": "https://api.github.com/repos/Masterminds/html5-php/zipball/f47dcf3c70c584de14f21143c55d9939631bc6cf", + "reference": "f47dcf3c70c584de14f21143c55d9939631bc6cf", "shasum": "" }, "require": { @@ -8854,9 +8767,9 @@ ], "support": { "issues": "https://github.com/Masterminds/html5-php/issues", - "source": "https://github.com/Masterminds/html5-php/tree/2.8.0" + "source": "https://github.com/Masterminds/html5-php/tree/2.8.1" }, - "time": "2023-04-26T07:27:39+00:00" + "time": "2023-05-10T11:58:31+00:00" }, { "name": "microsoft/azure-storage-blob", @@ -13103,16 +13016,16 @@ }, { "name": "symfony/string", - "version": "v6.3.0", + "version": "v6.3.2", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f" + "reference": "53d1a83225002635bca3482fcbf963001313fb68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/f2e190ee75ff0f5eced645ec0be5c66fac81f51f", - "reference": "f2e190ee75ff0f5eced645ec0be5c66fac81f51f", + "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68", + "reference": "53d1a83225002635bca3482fcbf963001313fb68", "shasum": "" }, "require": { @@ -13169,7 +13082,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.0" + "source": "https://github.com/symfony/string/tree/v6.3.2" }, "funding": [ { @@ -13185,7 +13098,7 @@ "type": "tidelift" } ], - "time": "2023-03-21T21:06:29+00:00" + "time": "2023-07-05T08:41:27+00:00" }, { "name": "symfony/translation", @@ -13462,16 +13375,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.25", + "version": "v5.4.26", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede" + "reference": "e706c99b4a6f4d9383b52b80dd8c74880501e314" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/82269f73c0f0f9859ab9b6900eebacbe54954ede", - "reference": "82269f73c0f0f9859ab9b6900eebacbe54954ede", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/e706c99b4a6f4d9383b52b80dd8c74880501e314", + "reference": "e706c99b4a6f4d9383b52b80dd8c74880501e314", "shasum": "" }, "require": { @@ -13485,6 +13398,7 @@ "require-dev": { "ext-iconv": "*", "symfony/console": "^4.4|^5.0|^6.0", + "symfony/http-kernel": "^4.4|^5.0|^6.0", "symfony/process": "^4.4|^5.0|^6.0", "symfony/uid": "^5.1|^6.0", "twig/twig": "^2.13|^3.0.4" @@ -13530,7 +13444,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.25" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.26" }, "funding": [ { @@ -13546,7 +13460,7 @@ "type": "tidelift" } ], - "time": "2023-06-20T20:56:26+00:00" + "time": "2023-07-13T07:32:46+00:00" }, { "name": "symfony/yaml", @@ -15715,16 +15629,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.22.1", + "version": "1.23.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0" + "reference": "a2b24135c35852b348894320d47b3902a94bc494" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/65c39594fbd8c67abfc68bb323f86447bab79cc0", - "reference": "65c39594fbd8c67abfc68bb323f86447bab79cc0", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a2b24135c35852b348894320d47b3902a94bc494", + "reference": "a2b24135c35852b348894320d47b3902a94bc494", "shasum": "" }, "require": { @@ -15756,9 +15670,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.22.1" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.0" }, - "time": "2023-06-29T20:46:06+00:00" + "time": "2023-07-23T22:17:56+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/conf/cmi/block.block.brandingnavigation.yml b/conf/cmi/block.block.brandingnavigation.yml deleted file mode 100644 index f1414ca8..00000000 --- a/conf/cmi/block.block.brandingnavigation.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: aa6dc1b6-c42d-4b6f-99b5-19ad224cc76f -langcode: en -status: true -dependencies: - config: - - system.menu.branding-navigation - module: - - menu_block_current_language - theme: - - hdbt -_core: - default_config_hash: vQ4mUU3haOTfe32xjXYEKN1kU9SHBIBCeM15nmCzwqI -id: brandingnavigation -theme: hdbt -region: header_branding -weight: 3 -provider: null -plugin: 'menu_block_current_language:branding-navigation' -settings: - id: 'menu_block_current_language:branding-navigation' - label: 'Branding - Navigation' - label_display: '0' - provider: menu_block_current_language - level: 1 - expand_all_items: false - depth: 0 - translation_providers: - views: views - menu_link_content: menu_link_content - default: '0' -visibility: { } diff --git a/conf/cmi/block.block.hdbt_subtheme_brandingnavigation.yml b/conf/cmi/block.block.hdbt_subtheme_brandingnavigation.yml deleted file mode 100644 index a4d88503..00000000 --- a/conf/cmi/block.block.hdbt_subtheme_brandingnavigation.yml +++ /dev/null @@ -1,31 +0,0 @@ -uuid: 8838f054-f41b-43ce-b194-dec06d841b12 -langcode: en -status: true -dependencies: - config: - - system.menu.branding-navigation - module: - - menu_block_current_language - theme: - - hdbt_subtheme -_core: - default_config_hash: vQ4mUU3haOTfe32xjXYEKN1kU9SHBIBCeM15nmCzwqI -id: hdbt_subtheme_brandingnavigation -theme: hdbt_subtheme -region: header_branding -weight: 3 -provider: null -plugin: 'menu_block_current_language:branding-navigation' -settings: - id: 'menu_block_current_language:branding-navigation' - label: 'Branding - Navigation' - label_display: '0' - provider: menu_block_current_language - level: 1 - expand_all_items: false - depth: 0 - translation_providers: - views: views - menu_link_content: menu_link_content - default: '0' -visibility: { } diff --git a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml index 9cd68762..933777f1 100644 --- a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml @@ -42,8 +42,8 @@ content: weight: 4 region: content settings: - linkit_auto_link_text: false linkit_profile: helfi + linkit_auto_link_text: false third_party_settings: { } field_banner_link_design: type: design_field_widget diff --git a/conf/cmi/system.menu.branding-navigation.yml b/conf/cmi/system.menu.branding-navigation.yml deleted file mode 100644 index 07dba96f..00000000 --- a/conf/cmi/system.menu.branding-navigation.yml +++ /dev/null @@ -1,10 +0,0 @@ -uuid: c6b9c912-c97a-4dc0-b3cd-287080b10e48 -langcode: und -status: true -dependencies: { } -_core: - default_config_hash: XF03x7sTGKHXr9snkobFVOuxt8Wz1WbCCnnZGarmARU -id: branding-navigation -label: 'Branding - Navigation' -description: 'Navigation for branding bar' -locked: false diff --git a/docker/openshift/crons/migrate-hearings.sh b/docker/openshift/crons/migrate-hearings.sh new file mode 100644 index 00000000..9cbea085 --- /dev/null +++ b/docker/openshift/crons/migrate-hearings.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +echo "Starting hearings migration: $(date)" + +while true +do + drush mim helfi_hearings --reset-threshold 43200 --interval 1800 + sleep 900 +done diff --git a/tools/make/drupal.mk b/tools/make/drupal.mk index 079e38e5..c79e951b 100644 --- a/tools/make/drupal.mk +++ b/tools/make/drupal.mk @@ -40,7 +40,8 @@ endif PHONY += drupal-create-folders drupal-create-folders: - @mkdir -p $(DRUPAL_CREATE_FOLDERS) + $(call step,Create folders for Drupal...\n) + $(call docker_compose_exec,mkdir -v -p $(DRUPAL_CREATE_FOLDERS)) PHONY += drupal-update drupal-update: ## Update Drupal core with Composer @@ -162,11 +163,12 @@ drush-download-dump: ## Download database dump to dump.sql $(call drush,@$(DRUPAL_SYNC_SOURCE) sql-dump --structure-tables-key=common > ${DOCKER_PROJECT_ROOT}/$(DUMP_SQL_FILENAME)) PHONY += open-db-gui -open-db-gui: DB_CONTAINER := $(COMPOSE_PROJECT_NAME)-db -open-db-gui: DB_NAME := drupal -open-db-gui: DB_USER := drupal -open-db-gui: DB_PASS := drupal -open-db-gui: --open-db-gui ## Open database with GUI tool +open-db-gui: ## Open database with GUI tool + $(eval DB_SERVICE ?= db) + $(eval DB_NAME ?= drupal) + $(eval DB_USER ?= drupal) + $(eval DB_PASS ?= drupal) + @open mysql://$(DB_USER):$(DB_PASS)@$(shell docker compose port $(DB_SERVICE) 3306 | grep -v ::)/$(DB_NAME) PHONY += fix-drupal fix-drupal: PATHS := $(subst $(space),,$(LINT_PATHS_PHP)) @@ -174,12 +176,6 @@ fix-drupal: ## Fix Drupal code style $(call step,Fix Drupal code style with phpcbf...\n) $(call cs,phpcbf,$(PATHS)) -PHONY += fix-drupal-coder -fix-drupal-coder: VERSION := 8.3.16 -fix-drupal-coder: ## Fix Drupal Coder loading - composer config repositories.drupal '{"type": "composer", "url": "https://packages.drupal.org/8"}' - composer config repositories.drupal/coder '{"type": "package", "package": {"name": "drupal/coder", "type": "phpcodesniffer-standard", "version": "$(VERSION)", "dist": {"type": "zip", "url": "https://ftp.drupal.org/files/projects/coder-$(VERSION).zip"}}}' - PHONY += lint-drupal lint-drupal: PATHS := $(subst $(space),,$(LINT_PATHS_PHP)) lint-drupal: ## Lint Drupal code style diff --git a/tools/make/lagoon.mk b/tools/make/lagoon.mk index c17258d8..e6baebad 100644 --- a/tools/make/lagoon.mk +++ b/tools/make/lagoon.mk @@ -1,5 +1,6 @@ CLI_SERVICE := cli CLI_SHELL := bash +DB_SERVICE := mariadb INSTANCE_prod_USER ?= project-name-branch INSTANCE_prod_HOST ?= ssh.lagoon.amazeeio.cloud diff --git a/tools/make/utils.mk b/tools/make/utils.mk index 9ac8b12d..5411160c 100644 --- a/tools/make/utils.mk +++ b/tools/make/utils.mk @@ -19,10 +19,6 @@ else @lt --port 443 --subdomain $(COMPOSE_PROJECT_NAME) --local-https --allow-invalid-cert endif -PHONY += --open-db-gui ---open-db-gui: - @open mysql://$(DB_USER):$(DB_PASS)@$(shell docker port $(DB_CONTAINER) 3306 | grep -v ::)/$(DB_NAME) - define dbg @printf "${GREEN}${1}:${NO_COLOR} ${2}\n" endef From 83e5b6556154d3b4a5face97a03bb7717ccc64c3 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 9 Aug 2023 09:16:11 +0000 Subject: [PATCH 3/3] Update configuration --- composer.lock | 94 ++++++++++--------- ...graph.contact_card_listing.field_title.yml | 4 +- ....tpr_service.tpr_service.field_content.yml | 15 +++ ...ervice.tpr_service.field_lower_content.yml | 15 +++ conf/cmi/views.view.tpr_unit_list.yml | 3 +- 5 files changed, 82 insertions(+), 49 deletions(-) diff --git a/composer.lock b/composer.lock index fc96e943..b71d1e63 100644 --- a/composer.lock +++ b/composer.lock @@ -3751,16 +3751,16 @@ }, { "name": "drupal/hdbt", - "version": "5.5.1", + "version": "5.5.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "bea997016c5b4156677e97ac8162f694ff9f7f30" + "reference": "cfe43a7f2fe301594299a3b8fd4651d9dbaa3cb4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/bea997016c5b4156677e97ac8162f694ff9f7f30", - "reference": "bea997016c5b4156677e97ac8162f694ff9f7f30", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/cfe43a7f2fe301594299a3b8fd4651d9dbaa3cb4", + "reference": "cfe43a7f2fe301594299a3b8fd4651d9dbaa3cb4", "shasum": "" }, "require": { @@ -3778,10 +3778,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.1", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.5.2", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-08-03T11:31:25+00:00" + "time": "2023-08-09T07:34:44+00:00" }, { "name": "drupal/hdbt_admin", @@ -3870,16 +3870,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.4.16", + "version": "2.4.17", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "82ee1db1d99eb46a8c3e2ce5b88a0f6df204e383" + "reference": "4c3d285d0399b949db2ec6443fdd04937ee22532" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/82ee1db1d99eb46a8c3e2ce5b88a0f6df204e383", - "reference": "82ee1db1d99eb46a8c3e2ce5b88a0f6df204e383", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/4c3d285d0399b949db2ec6443fdd04937ee22532", + "reference": "4c3d285d0399b949db2ec6443fdd04937ee22532", "shasum": "" }, "require": { @@ -3905,10 +3905,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.16", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.4.17", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-07-10T06:57:27+00:00" + "time": "2023-08-04T05:28:12+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4011,16 +4011,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "7e25a554d05444ff5e8031d7b19d5d240a402d88" + "reference": "856ba5ec598cd55684f8e7e2b43a5dd17fcd9924" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/7e25a554d05444ff5e8031d7b19d5d240a402d88", - "reference": "7e25a554d05444ff5e8031d7b19d5d240a402d88", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/856ba5ec598cd55684f8e7e2b43a5dd17fcd9924", + "reference": "856ba5ec598cd55684f8e7e2b43a5dd17fcd9924", "shasum": "" }, "require": { @@ -4123,10 +4123,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.3.1", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-08-03T07:23:36+00:00" + "time": "2023-08-09T07:34:38+00:00" }, { "name": "drupal/helfi_proxy", @@ -5483,6 +5483,10 @@ "name": "Dave Reid", "homepage": "https://www.drupal.org/user/53892" }, + { + "name": "Kristen Pol", + "homepage": "https://www.drupal.org/user/8389" + }, { "name": "pifagor", "homepage": "https://www.drupal.org/user/2375692" @@ -6493,17 +6497,17 @@ }, { "name": "drupal/views_bulk_operations", - "version": "4.2.4", + "version": "4.2.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "4.2.4" + "reference": "4.2.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.4.zip", - "reference": "4.2.4", - "shasum": "26f1dea73780fab2e338380ae803feca989172e1" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.5.zip", + "reference": "4.2.5", + "shasum": "220479c5187b1619d5703f64c6f8c272afecf897" }, "require": { "drupal/core": "^9.4 || ^10", @@ -6518,8 +6522,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.2.4", - "datestamp": "1685368786", + "version": "4.2.5", + "datestamp": "1691066184", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7553,16 +7557,16 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6" + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/3a494dc7dc1d7d12e511890177ae2d0e6c107da6", - "reference": "3a494dc7dc1d7d12e511890177ae2d0e6c107da6", + "url": "https://api.github.com/repos/guzzle/promises/zipball/111166291a0f8130081195ac4556a5587d7f1b5d", + "reference": "111166291a0f8130081195ac4556a5587d7f1b5d", "shasum": "" }, "require": { @@ -7616,7 +7620,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.0" + "source": "https://github.com/guzzle/promises/tree/2.0.1" }, "funding": [ { @@ -7632,7 +7636,7 @@ "type": "tidelift" } ], - "time": "2023-05-21T13:50:22+00:00" + "time": "2023-08-03T15:11:55+00:00" }, { "name": "guzzlehttp/psr7", @@ -8330,26 +8334,26 @@ }, { "name": "league/mime-type-detection", - "version": "1.12.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "c7f2872fb273bf493811473dafc88d60ae829f48" + "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/c7f2872fb273bf493811473dafc88d60ae829f48", - "reference": "c7f2872fb273bf493811473dafc88d60ae829f48", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/a6dfb1194a2946fcdc1f38219445234f65b35c96", + "reference": "a6dfb1194a2946fcdc1f38219445234f65b35c96", "shasum": "" }, "require": { "ext-fileinfo": "*", - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "phpstan/phpstan": "^0.12.68", - "phpunit/phpunit": "^8.5.8 || ^9.3" + "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0" }, "type": "library", "autoload": { @@ -8370,7 +8374,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.12.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.13.0" }, "funding": [ { @@ -8382,7 +8386,7 @@ "type": "tidelift" } ], - "time": "2023-08-03T07:14:11+00:00" + "time": "2023-08-05T12:09:49+00:00" }, { "name": "league/uri", @@ -15629,16 +15633,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.23.0", + "version": "1.23.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "a2b24135c35852b348894320d47b3902a94bc494" + "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a2b24135c35852b348894320d47b3902a94bc494", - "reference": "a2b24135c35852b348894320d47b3902a94bc494", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/846ae76eef31c6d7790fac9bc399ecee45160b26", + "reference": "846ae76eef31c6d7790fac9bc399ecee45160b26", "shasum": "" }, "require": { @@ -15670,9 +15674,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.23.1" }, - "time": "2023-07-23T22:17:56+00:00" + "time": "2023-08-03T16:32:59+00:00" }, { "name": "phpunit/php-code-coverage", diff --git a/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml b/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml index 6ede96dd..539777b7 100644 --- a/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml +++ b/conf/cmi/field.field.paragraph.contact_card_listing.field_title.yml @@ -6,12 +6,12 @@ dependencies: - field.storage.paragraph.field_title - paragraphs.paragraphs_type.contact_card_listing _core: - default_config_hash: kdKc_1jRpFFpVgiylfofxe6JZyl5xOjMYEAlvcwPdCU + default_config_hash: wVwE7xrXuQ3BymCdqpyrTEoV_pKubFHD709zQ7JDZW4 id: paragraph.contact_card_listing.field_title field_name: field_title entity_type: paragraph bundle: contact_card_listing -label: 'Job title' +label: Title description: '' required: false translatable: false diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml index 7071fe8f..2660cf0f 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_content.yml @@ -7,10 +7,13 @@ dependencies: - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner - paragraphs.paragraphs_type.columns + - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards + - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.map - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video - paragraphs.paragraphs_type.text @@ -43,6 +46,9 @@ settings: from_library: from_library remote_video: remote_video phasing: phasing + contact_card_listing: contact_card_listing + map: map + event_list: event_list negate: 0 target_bundles_drag_drop: accordion: @@ -54,9 +60,15 @@ settings: columns: weight: 0 enabled: true + contact_card_listing: + weight: 0 + enabled: true content_cards: weight: 0 enabled: true + event_list: + weight: 0 + enabled: true from_library: weight: 0 enabled: true @@ -66,6 +78,9 @@ settings: list_of_links: weight: 0 enabled: true + map: + weight: 0 + enabled: true phasing: weight: 0 enabled: true diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml index 55ce397e..d88f424a 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml @@ -7,15 +7,18 @@ dependencies: - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner - paragraphs.paragraphs_type.columns + - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.map - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.text module: - entity_reference_revisions - helfi_tpr @@ -47,6 +50,9 @@ settings: news_list: news_list event_list: event_list phasing: phasing + text: text + contact_card_listing: contact_card_listing + map: map negate: 0 target_bundles_drag_drop: accordion: @@ -58,6 +64,9 @@ settings: columns: weight: 0 enabled: true + contact_card_listing: + weight: 0 + enabled: true content_cards: weight: 0 enabled: true @@ -76,6 +85,9 @@ settings: list_of_links: weight: 0 enabled: true + map: + weight: 0 + enabled: true news_list: weight: 0 enabled: true @@ -85,4 +97,7 @@ settings: remote_video: weight: 0 enabled: true + text: + weight: 0 + enabled: true field_type: entity_reference_revisions diff --git a/conf/cmi/views.view.tpr_unit_list.yml b/conf/cmi/views.view.tpr_unit_list.yml index 28eb6224..e623ee00 100644 --- a/conf/cmi/views.view.tpr_unit_list.yml +++ b/conf/cmi/views.view.tpr_unit_list.yml @@ -6,8 +6,6 @@ dependencies: - helfi_tpr - user - views_bulk_operations - - views_bulk_edit - - content_lock id: tpr_unit_list label: 'TPR unit list' module: views @@ -76,6 +74,7 @@ display: batch: true batch_size: 50 form_step: true + ajax_loader: false buttons: false action_title: Action clear_on_exposed: true