From fe097fa1df6937f421ee01724ab083f6f81d8dea Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Fri, 11 Oct 2024 08:58:54 +0000 Subject: [PATCH 01/20] Update configuration --- composer.lock | 53 ++++++++++--------- ...eld_override.node.landing_page.promote.yml | 2 +- ...ield_override.node.landing_page.status.yml | 2 +- ....base_field_override.node.page.promote.yml | 2 +- ...e.base_field_override.node.page.status.yml | 2 +- ...form_display.node.landing_page.default.yml | 4 +- ....entity_form_display.node.page.default.yml | 2 +- ...view_display.node.landing_page.default.yml | 2 +- ..._view_display.node.landing_page.teaser.yml | 2 +- ....entity_view_display.node.page.default.yml | 2 +- ...e.entity_view_display.node.page.teaser.yml | 2 +- ....field.node.landing_page.field_content.yml | 4 +- ...field.node.landing_page.field_has_hero.yml | 2 +- ...eld.field.node.landing_page.field_hero.yml | 2 +- ...d.node.landing_page.field_liftup_image.yml | 2 +- ...field.node.landing_page.field_metatags.yml | 2 +- .../field.field.node.page.field_content.yml | 2 +- .../field.field.node.page.field_has_hero.yml | 2 +- conf/cmi/field.field.node.page.field_hero.yml | 2 +- .../field.field.node.page.field_lead_in.yml | 2 +- ...eld.field.node.page.field_liftup_image.yml | 2 +- ...ld.field.node.page.field_lower_content.yml | 2 +- .../field.field.node.page.field_metatags.yml | 2 +- ....field.node.page.field_sidebar_content.yml | 2 +- ...age.content_settings.node.landing_page.yml | 2 +- .../language.content_settings.node.page.yml | 2 +- ...ty_form_display.node.news_item.default.yml | 8 --- conf/cmi/menu_link_attributes.config.yml | 6 +-- conf/cmi/metatag.metatag_defaults.global.yml | 1 + ...ag.metatag_defaults.node__landing_page.yml | 2 +- .../metatag.metatag_defaults.node__page.yml | 2 +- conf/cmi/node.type.landing_page.yml | 2 +- conf/cmi/node.type.page.yml | 2 +- ...o.pattern.landing_page_content_pattern.yml | 2 +- .../pathauto.pattern.page_content_pattern.yml | 2 +- public/sites/default/settings.php | 4 ++ tools/make/project/install.mk | 18 +++---- 37 files changed, 76 insertions(+), 80 deletions(-) diff --git a/composer.lock b/composer.lock index b5a0e8a1b..f83d6b3e2 100644 --- a/composer.lock +++ b/composer.lock @@ -4253,16 +4253,16 @@ }, { "name": "drupal/hdbt", - "version": "6.7.9", + "version": "6.7.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "09da3d83c2c01a36420329b87592eb701ae8ccb7" + "reference": "5f9902895d8690e0167af2b8df37e84798c1ab8b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/09da3d83c2c01a36420329b87592eb701ae8ccb7", - "reference": "09da3d83c2c01a36420329b87592eb701ae8ccb7", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/5f9902895d8690e0167af2b8df37e84798c1ab8b", + "reference": "5f9902895d8690e0167af2b8df37e84798c1ab8b", "shasum": "" }, "require": { @@ -4281,23 +4281,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.9", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.11", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-10-09T08:00:11+00:00" + "time": "2024-10-11T08:54:21+00:00" }, { "name": "drupal/hdbt_admin", - "version": "3.2.3", + "version": "3.2.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "2d5454a08e66621f0e7ef5116066c1eb450cea33" + "reference": "f3284d00c7cb52126c727b744ccac5108195544c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/2d5454a08e66621f0e7ef5116066c1eb450cea33", - "reference": "2d5454a08e66621f0e7ef5116066c1eb450cea33", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/f3284d00c7cb52126c727b744ccac5108195544c", + "reference": "f3284d00c7cb52126c727b744ccac5108195544c", "shasum": "" }, "require": { @@ -4318,10 +4318,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.3", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/3.2.5", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2024-10-02T11:54:42+00:00" + "time": "2024-10-11T08:52:57+00:00" }, { "name": "drupal/health_check", @@ -4421,16 +4421,16 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "2.0.5", + "version": "2.0.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "955f8b742147cab0cf82370b6cc93a6901624261" + "reference": "f35b0a703e2da09374c4ca137dd6519274db552a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/955f8b742147cab0cf82370b6cc93a6901624261", - "reference": "955f8b742147cab0cf82370b6cc93a6901624261", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/f35b0a703e2da09374c4ca137dd6519274db552a", + "reference": "f35b0a703e2da09374c4ca137dd6519274db552a", "shasum": "" }, "require": { @@ -4452,6 +4452,9 @@ }, "twistor/flysystem-stream-wrapper": { "PHP 8.2 support (https://www.drupal.org/project/flysystem/issues/3387094)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/ddb222622b92d1c2b7db975a84167a00579a1ad0/patches/3387094-add-context-property-to-stream-wrapper.patch" + }, + "drupal/flysystem": { + "UHF-10544 D10.3 support (https://drupal.org/i/3457193)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-module-helfi-azure-fs/82f0dc93d14357011d12d219f5d1641da7ae6960/patches/3457193.patch" } } }, @@ -4460,10 +4463,10 @@ ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.7", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2024-10-03T06:32:56+00:00" + "time": "2024-10-11T07:42:06+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -4586,16 +4589,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.6.11", + "version": "4.6.14", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "46f83e38d3e63714779f3b040e040c9b4be406bb" + "reference": "a5706c1fff0690115510224dcdccf61ce2b6dadd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/46f83e38d3e63714779f3b040e040c9b4be406bb", - "reference": "46f83e38d3e63714779f3b040e040c9b4be406bb", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a5706c1fff0690115510224dcdccf61ce2b6dadd", + "reference": "a5706c1fff0690115510224dcdccf61ce2b6dadd", "shasum": "" }, "require": { @@ -4616,7 +4619,7 @@ "drupal/elasticsearch_connector": "^7.0@alpha", "drupal/entity_browser": "^2.5", "drupal/entity_usage": "^2.0@beta", - "drupal/eu_cookie_compliance": "^1.24", + "drupal/eu_cookie_compliance": "1.24", "drupal/external_entities": "^2.0@beta", "drupal/field_group": "^3.1", "drupal/focal_point": "^2.0", @@ -4714,10 +4717,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.11", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.14", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-10-08T06:10:45+00:00" + "time": "2024-10-11T08:52:39+00:00" }, { "name": "drupal/helfi_proxy", diff --git a/conf/cmi/core.base_field_override.node.landing_page.promote.yml b/conf/cmi/core.base_field_override.node.landing_page.promote.yml index 83d26dca9..d35851693 100644 --- a/conf/cmi/core.base_field_override.node.landing_page.promote.yml +++ b/conf/cmi/core.base_field_override.node.landing_page.promote.yml @@ -5,7 +5,7 @@ dependencies: config: - node.type.landing_page _core: - default_config_hash: KZ4pDrGhkRiIo7Ee-E4HGZp7YPXKS_FLR0nLeUQ3P2U + default_config_hash: 0RFWx8vtIwLeQrOoawTp8idfhPTj_7aPejhw4Pp3xqc id: node.landing_page.promote field_name: promote entity_type: node diff --git a/conf/cmi/core.base_field_override.node.landing_page.status.yml b/conf/cmi/core.base_field_override.node.landing_page.status.yml index eaa27a5c4..f7d54bad0 100644 --- a/conf/cmi/core.base_field_override.node.landing_page.status.yml +++ b/conf/cmi/core.base_field_override.node.landing_page.status.yml @@ -5,7 +5,7 @@ dependencies: config: - node.type.landing_page _core: - default_config_hash: ewmZbuO4KgD36Ka7QA-8tJ9jktJH-jQbTNMrkHfuQRc + default_config_hash: LhhVx2le9fx915rM-xf5RApryzfsAY8X_odQehIJq9U id: node.landing_page.status field_name: status entity_type: node diff --git a/conf/cmi/core.base_field_override.node.page.promote.yml b/conf/cmi/core.base_field_override.node.page.promote.yml index 2e358fda9..4693ade16 100644 --- a/conf/cmi/core.base_field_override.node.page.promote.yml +++ b/conf/cmi/core.base_field_override.node.page.promote.yml @@ -5,7 +5,7 @@ dependencies: config: - node.type.page _core: - default_config_hash: vdYkuvvyzCU3dFiOu7LULd-uZyENb_byNYidQVIZtXk + default_config_hash: Awr4_4hZMOAsXNK5ZxL4I1U5BCzGywFswcc9pteegIk id: node.page.promote field_name: promote entity_type: node diff --git a/conf/cmi/core.base_field_override.node.page.status.yml b/conf/cmi/core.base_field_override.node.page.status.yml index 91342738a..ecfdd15c3 100644 --- a/conf/cmi/core.base_field_override.node.page.status.yml +++ b/conf/cmi/core.base_field_override.node.page.status.yml @@ -5,7 +5,7 @@ dependencies: config: - node.type.page _core: - default_config_hash: 0m4p2SiQag8S_hCuiUZt-3xis3qrOuBXCwKH51hF5lo + default_config_hash: sq-TgFSE-Ft53bktUufBtJVHiqZboy0IFAc5JH0iLJ4 id: node.page.status field_name: status entity_type: node diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml index 8f1bbbc46..027379657 100644 --- a/conf/cmi/core.entity_form_display.node.landing_page.default.yml +++ b/conf/cmi/core.entity_form_display.node.landing_page.default.yml @@ -18,7 +18,7 @@ dependencies: - publication_date - scheduler _core: - default_config_hash: hhHaoVWPiqGGQ2qDbN-7sawAmvK_BCGWA2vwgIevwq4 + default_config_hash: nz2kuZQ53sXaRjzi5GT0LPTskHJFGOgRZuY2XwpDYls id: node.landing_page.default targetEntityType: node bundle: landing_page @@ -128,9 +128,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 - region: content settings: { } third_party_settings: { } + region: content status: type: boolean_checkbox weight: 12 diff --git a/conf/cmi/core.entity_form_display.node.page.default.yml b/conf/cmi/core.entity_form_display.node.page.default.yml index 0743c914b..6168dded7 100644 --- a/conf/cmi/core.entity_form_display.node.page.default.yml +++ b/conf/cmi/core.entity_form_display.node.page.default.yml @@ -21,7 +21,7 @@ dependencies: - publication_date - scheduler _core: - default_config_hash: IrTthHmbnCZxuMpndzRlr9-t2RT3szU18RcM_bpnrz0 + default_config_hash: 1c66UJvkqgUlwTKKPGactcR0FjaLLXJZq9ZHP_M24ao id: node.page.default targetEntityType: node bundle: page diff --git a/conf/cmi/core.entity_view_display.node.landing_page.default.yml b/conf/cmi/core.entity_view_display.node.landing_page.default.yml index 21fca0924..518e42667 100644 --- a/conf/cmi/core.entity_view_display.node.landing_page.default.yml +++ b/conf/cmi/core.entity_view_display.node.landing_page.default.yml @@ -14,7 +14,7 @@ dependencies: - metatag - user _core: - default_config_hash: k0yB8d9jdIQ1SPK3C2TVyKEfwT05muqbE9tTkdV9fdQ + default_config_hash: '-3nrGpFj2UjEtxeOaUkHAayjdX0IK1zP1joIg9Da5lg' id: node.landing_page.default targetEntityType: node bundle: landing_page diff --git a/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml b/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml index 2e9459176..d00d9b4b2 100644 --- a/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml +++ b/conf/cmi/core.entity_view_display.node.landing_page.teaser.yml @@ -13,7 +13,7 @@ dependencies: module: - user _core: - default_config_hash: '-w2hz1ajYKPav1NspjgUWRkxu9iE-8eHNZ1Ix1LKx_M' + default_config_hash: r_BQI2tPEU16do-YUzrDByQnVy_8d8bJr91mdehPlwE id: node.landing_page.teaser targetEntityType: node bundle: landing_page diff --git a/conf/cmi/core.entity_view_display.node.page.default.yml b/conf/cmi/core.entity_view_display.node.page.default.yml index 60ef7f776..3dcf07bf4 100644 --- a/conf/cmi/core.entity_view_display.node.page.default.yml +++ b/conf/cmi/core.entity_view_display.node.page.default.yml @@ -18,7 +18,7 @@ dependencies: - metatag - user _core: - default_config_hash: piTzY36HSFy5WyKCdZ6BvAOj3JzxAy5Jt6J1KyU4h64 + default_config_hash: F-u8s9R9tXTY7ZzyOpQcQ6abxM8QlR2Asv_-C3fo3Mc id: node.page.default targetEntityType: node bundle: page diff --git a/conf/cmi/core.entity_view_display.node.page.teaser.yml b/conf/cmi/core.entity_view_display.node.page.teaser.yml index 2e8dece08..a9f4c85b9 100644 --- a/conf/cmi/core.entity_view_display.node.page.teaser.yml +++ b/conf/cmi/core.entity_view_display.node.page.teaser.yml @@ -16,7 +16,7 @@ dependencies: module: - user _core: - default_config_hash: cNX3bx6qnz2khBmsfeNeR-4bUFPswL2Eb0w6tRAUzvc + default_config_hash: IHO2JHvcAGkOIDr7TbzmCXV80ajFCCbKs05r35GcfVc id: node.page.teaser targetEntityType: node bundle: page diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index a89c9dbd6..8d0566d9d 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -26,7 +26,7 @@ dependencies: module: - entity_reference_revisions _core: - default_config_hash: zEXoDFJnyArUOiL2ZrtDuq4YDWKyn6ung9JndPk_Ntg + default_config_hash: hTXPpiRGSAr_S4UXdMrZbYum_JkD4y-qlfTvBS_M-X4 id: node.landing_page.field_content field_name: field_content entity_type: node @@ -45,6 +45,7 @@ settings: front_page_top_news: front_page_top_news front_page_latest_news: front_page_latest_news event_list: event_list + news_archive: news_archive list_of_links: list_of_links content_cards: content_cards banner: banner @@ -58,7 +59,6 @@ settings: chart: chart target_group_links: target_group_links hearings: hearings - news_archive: news_archive negate: 0 target_bundles_drag_drop: banner: diff --git a/conf/cmi/field.field.node.landing_page.field_has_hero.yml b/conf/cmi/field.field.node.landing_page.field_has_hero.yml index fbff01a7c..4b1cbce58 100644 --- a/conf/cmi/field.field.node.landing_page.field_has_hero.yml +++ b/conf/cmi/field.field.node.landing_page.field_has_hero.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.node.field_has_hero - node.type.landing_page _core: - default_config_hash: 9YN8dmUhU-XhgxPRCb4x-ghOzqatFuntD6iIFhL9G3k + default_config_hash: D-QxXFQAE5RYftqDw7rRXhAGQ8Zi6KVyhqr7wDO9K4g id: node.landing_page.field_has_hero field_name: field_has_hero entity_type: node diff --git a/conf/cmi/field.field.node.landing_page.field_hero.yml b/conf/cmi/field.field.node.landing_page.field_hero.yml index 43c6fd243..880b14064 100644 --- a/conf/cmi/field.field.node.landing_page.field_hero.yml +++ b/conf/cmi/field.field.node.landing_page.field_hero.yml @@ -9,7 +9,7 @@ dependencies: module: - entity_reference_revisions _core: - default_config_hash: wqQr5ULFXtP_T3sIZky7GLndZznJR6XMIzyIO-0lmiY + default_config_hash: KaTQhVTD7zi12oPJmsx4YCvrqYI4VKs6UzsUSHZMW_0 id: node.landing_page.field_hero field_name: field_hero entity_type: node diff --git a/conf/cmi/field.field.node.landing_page.field_liftup_image.yml b/conf/cmi/field.field.node.landing_page.field_liftup_image.yml index 3d8bd3240..44c5ddb6f 100644 --- a/conf/cmi/field.field.node.landing_page.field_liftup_image.yml +++ b/conf/cmi/field.field.node.landing_page.field_liftup_image.yml @@ -7,7 +7,7 @@ dependencies: - media.type.image - node.type.landing_page _core: - default_config_hash: tjssmYxe5qbWn7P7--dg9YMnck83F4dImAQiwIz4eJs + default_config_hash: LmNZ-_b0A7CEHJsvBCOu0Bm5rL8wYMrWwy5BA_9LutI id: node.landing_page.field_liftup_image field_name: field_liftup_image entity_type: node diff --git a/conf/cmi/field.field.node.landing_page.field_metatags.yml b/conf/cmi/field.field.node.landing_page.field_metatags.yml index 0d0543eb0..e2d46f77d 100644 --- a/conf/cmi/field.field.node.landing_page.field_metatags.yml +++ b/conf/cmi/field.field.node.landing_page.field_metatags.yml @@ -8,7 +8,7 @@ dependencies: module: - metatag _core: - default_config_hash: i5JpOyh9B9vJHXsqh-XHmZBoSaWMT3XTnBGCFLtDntw + default_config_hash: hekcnEJjTt7ESst-zfAY8MrteMhOFYz540rJOo4l0LI id: node.landing_page.field_metatags field_name: field_metatags entity_type: node diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml index 511303497..e369541e9 100644 --- a/conf/cmi/field.field.node.page.field_content.yml +++ b/conf/cmi/field.field.node.page.field_content.yml @@ -22,7 +22,7 @@ dependencies: module: - entity_reference_revisions _core: - default_config_hash: G8uqVofIIeSPJSEW4FPnQrwefO2xMZGnwlbcHrbpZ48 + default_config_hash: 6ObVx71DtZm2Bwbo4phVPA-nauJ8lld2GdbvT9iFIcw id: node.page.field_content field_name: field_content entity_type: node diff --git a/conf/cmi/field.field.node.page.field_has_hero.yml b/conf/cmi/field.field.node.page.field_has_hero.yml index 9ae460d46..d65e6309f 100644 --- a/conf/cmi/field.field.node.page.field_has_hero.yml +++ b/conf/cmi/field.field.node.page.field_has_hero.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.node.field_has_hero - node.type.page _core: - default_config_hash: ZaUX6z_hdafBR97yocI3uxs6NHlntDM1GTvyOzaqLec + default_config_hash: OQINdpOOSCX5l_5PfJelmtFDiHVESETGrWj7_LoTmk0 id: node.page.field_has_hero field_name: field_has_hero entity_type: node diff --git a/conf/cmi/field.field.node.page.field_hero.yml b/conf/cmi/field.field.node.page.field_hero.yml index a074b9144..637028b70 100644 --- a/conf/cmi/field.field.node.page.field_hero.yml +++ b/conf/cmi/field.field.node.page.field_hero.yml @@ -9,7 +9,7 @@ dependencies: module: - entity_reference_revisions _core: - default_config_hash: _JO0VBpDGRU-ye4MgCyh72SJmF6G9ndACtwAfuQJZI8 + default_config_hash: ABVg78DS3Nw5IjpLToJyHIKKneImCCeV37bGTSYQCPw id: node.page.field_hero field_name: field_hero entity_type: node diff --git a/conf/cmi/field.field.node.page.field_lead_in.yml b/conf/cmi/field.field.node.page.field_lead_in.yml index d6d266e76..57503724b 100644 --- a/conf/cmi/field.field.node.page.field_lead_in.yml +++ b/conf/cmi/field.field.node.page.field_lead_in.yml @@ -6,7 +6,7 @@ dependencies: - field.storage.node.field_lead_in - node.type.page _core: - default_config_hash: tPwfvL9sS2_dI0nhmfCMypX6JXVe5rARuztaSQ5h6Z8 + default_config_hash: WJ-GI4hxHLj-LOOeftyY2oUueL_Vf7aCagTbT3RTlkU id: node.page.field_lead_in field_name: field_lead_in entity_type: node diff --git a/conf/cmi/field.field.node.page.field_liftup_image.yml b/conf/cmi/field.field.node.page.field_liftup_image.yml index aad6a19f9..78b70e0b6 100644 --- a/conf/cmi/field.field.node.page.field_liftup_image.yml +++ b/conf/cmi/field.field.node.page.field_liftup_image.yml @@ -7,7 +7,7 @@ dependencies: - media.type.image - node.type.page _core: - default_config_hash: HnNX7GzhZeJlJrJoD5s1zgpCSG-TT5PEgL9tSbc97Qg + default_config_hash: YVZuPe0HyzTmFUyhL571saa_4HZD7-iDMePASIRhqcs id: node.page.field_liftup_image field_name: field_liftup_image entity_type: node diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml index 0f08044c8..1e2a44f11 100644 --- a/conf/cmi/field.field.node.page.field_lower_content.yml +++ b/conf/cmi/field.field.node.page.field_lower_content.yml @@ -23,7 +23,7 @@ dependencies: module: - entity_reference_revisions _core: - default_config_hash: AejXN443GE3b159k_6fsqDyZ_BHs68SU9wBMY24Ueog + default_config_hash: v3n3ZeAjQ22N3kPPeDCIlFFcOuTiJ9F1CB0Gf4HQ6ZI id: node.page.field_lower_content field_name: field_lower_content entity_type: node diff --git a/conf/cmi/field.field.node.page.field_metatags.yml b/conf/cmi/field.field.node.page.field_metatags.yml index 6da16e6c5..6b473e658 100644 --- a/conf/cmi/field.field.node.page.field_metatags.yml +++ b/conf/cmi/field.field.node.page.field_metatags.yml @@ -8,7 +8,7 @@ dependencies: module: - metatag _core: - default_config_hash: 66fePtAJZ1t0RO2WvkpN-gBiDaq55M4LM1FFDEQ6rvY + default_config_hash: umfCmBUM3Qvbgnbf2Mms9ptk9QqXkx-P2bw7BHUvc8g id: node.page.field_metatags field_name: field_metatags entity_type: node diff --git a/conf/cmi/field.field.node.page.field_sidebar_content.yml b/conf/cmi/field.field.node.page.field_sidebar_content.yml index 25a63c669..51cbd935c 100644 --- a/conf/cmi/field.field.node.page.field_sidebar_content.yml +++ b/conf/cmi/field.field.node.page.field_sidebar_content.yml @@ -10,7 +10,7 @@ dependencies: module: - entity_reference_revisions _core: - default_config_hash: 056k2o_OzWbDmv_9zA5BNb30RqLImUGCYN6nnYWjqoQ + default_config_hash: SQUCcarKdIUnT8p_fKf_Dca17YujYpyfd8H1m91BTK0 id: node.page.field_sidebar_content field_name: field_sidebar_content entity_type: node diff --git a/conf/cmi/language.content_settings.node.landing_page.yml b/conf/cmi/language.content_settings.node.landing_page.yml index 6f648d101..46a5ffb81 100644 --- a/conf/cmi/language.content_settings.node.landing_page.yml +++ b/conf/cmi/language.content_settings.node.landing_page.yml @@ -10,7 +10,7 @@ third_party_settings: content_translation: enabled: true _core: - default_config_hash: UrEWFwFHhJNNrHsT2CbI-8FK7KIgmDq0xV6ahjaavBM + default_config_hash: Jkn_hpGZxUb8bwd-7N-7pq9YU3Ttt4tLVGrEAPhxrRg id: node.landing_page target_entity_type_id: node target_bundle: landing_page diff --git a/conf/cmi/language.content_settings.node.page.yml b/conf/cmi/language.content_settings.node.page.yml index 976a838ff..5c22d3421 100644 --- a/conf/cmi/language.content_settings.node.page.yml +++ b/conf/cmi/language.content_settings.node.page.yml @@ -10,7 +10,7 @@ third_party_settings: content_translation: enabled: true _core: - default_config_hash: gmtmgLpPQOcKE9BA_eKfrCXtoWVO63kmcfythbJiz5Q + default_config_hash: NuKCYRhchzV5oFaVmTQHc64apY1USi-6PazrucpcR34 id: node.page target_entity_type_id: node target_bundle: page diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index 2a0d8abec..ddec27707 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,14 +6,6 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva - group_updating_news: - label: 'Päivittyvä uutinen' - format_settings: - description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' - group_automatically_recommended: - label: 'Automaattisesti suositellut sisällöt' - format_settings: - description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: diff --git a/conf/cmi/menu_link_attributes.config.yml b/conf/cmi/menu_link_attributes.config.yml index d2fe542f6..3bebeb208 100644 --- a/conf/cmi/menu_link_attributes.config.yml +++ b/conf/cmi/menu_link_attributes.config.yml @@ -4,10 +4,10 @@ attributes: icon: label: '' class: - label: 'Link class(es)' - description: 'CSS class for the link (<a href>). Separate multiple classes by space.' + label: '' + description: '' target: - label: 'Link target' + label: '' description: '' options: _blank: 'New window (_blank)' diff --git a/conf/cmi/metatag.metatag_defaults.global.yml b/conf/cmi/metatag.metatag_defaults.global.yml index 5e6485f01..4dd573ba8 100644 --- a/conf/cmi/metatag.metatag_defaults.global.yml +++ b/conf/cmi/metatag.metatag_defaults.global.yml @@ -14,3 +14,4 @@ tags: og_image: '[site:shareable-image]' twitter_cards_image: '[site:shareable-image]' og_site_name: '[site:page-title-suffix]' + twitter_cards_page_url: '[current-page:url]' diff --git a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml index 008896e54..cc2df49c1 100644 --- a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml +++ b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: KFDRmGwu9d-ua_6WM0B6f7Qz85hnDdZ0VulBDnvmg5Q + default_config_hash: IxbBxQpwTHAosiqZXzMlXTSiLA2-mZs2g4lZ48xwpkA id: node__landing_page label: 'Content: Landing page' tags: diff --git a/conf/cmi/metatag.metatag_defaults.node__page.yml b/conf/cmi/metatag.metatag_defaults.node__page.yml index 2598c180a..cc93b0380 100644 --- a/conf/cmi/metatag.metatag_defaults.node__page.yml +++ b/conf/cmi/metatag.metatag_defaults.node__page.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: Mqgf6_xfg7HLsBnW3BSP9e9EuHWJXsEMbt240DMt_5E + default_config_hash: FCzY3DYgTVYC6q7fgjEKTt3jTHOgRUhj1XmD2SE9O5I id: node__page label: 'Content: Page' tags: { } diff --git a/conf/cmi/node.type.landing_page.yml b/conf/cmi/node.type.landing_page.yml index c834a6de1..92c75f710 100644 --- a/conf/cmi/node.type.landing_page.yml +++ b/conf/cmi/node.type.landing_page.yml @@ -24,7 +24,7 @@ third_party_settings: unpublish_required: false unpublish_revision: false _core: - default_config_hash: PfTlYxtl_LoeL3LJeT4Qwnzu5MZq6Rc7R5o3NLTInHU + default_config_hash: R1Ihw3WH8wwYHlx0C6VCEMhTDZHQ6NbZl56Dz0zMOAo name: 'Landing page' type: landing_page description: 'Content type for the front page of a section or theme. A landing page consists of highlight areas, content listings and links.' diff --git a/conf/cmi/node.type.page.yml b/conf/cmi/node.type.page.yml index 9029ad46f..fd0eee439 100644 --- a/conf/cmi/node.type.page.yml +++ b/conf/cmi/node.type.page.yml @@ -24,7 +24,7 @@ third_party_settings: unpublish_required: false unpublish_revision: false _core: - default_config_hash: A1XVcWETFW22MWUdDTxkOE331kBoYUWPQILECfHoBfk + default_config_hash: TxNxs_Yq3TzOPE9lwS4hArqiWBve9F-de3Lm12Hbm9U name: 'Standard page' type: page description: 'Content type for standard web content.' diff --git a/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml b/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml index 66c732789..74bf62c9c 100644 --- a/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml +++ b/conf/cmi/pathauto.pattern.landing_page_content_pattern.yml @@ -5,7 +5,7 @@ dependencies: module: - node _core: - default_config_hash: JC4p2qHXUeY-wiNBTGDl6RCdOEYxfeMrvQe7tVcJHZY + default_config_hash: OkUmSgW0vSciD4ZUN-lXM_UuXElx5msmlPZToa-3yss id: landing_page_content_pattern label: 'Landing page content pattern' type: 'canonical_entities:node' diff --git a/conf/cmi/pathauto.pattern.page_content_pattern.yml b/conf/cmi/pathauto.pattern.page_content_pattern.yml index 76f361d75..78b79d76a 100644 --- a/conf/cmi/pathauto.pattern.page_content_pattern.yml +++ b/conf/cmi/pathauto.pattern.page_content_pattern.yml @@ -5,7 +5,7 @@ dependencies: module: - node _core: - default_config_hash: YrMS_tpZzY4kqrmIPkRckaFUN3aKZEyHpgADFLI6rBg + default_config_hash: FbJxc16K3DO9eOHODpQQ-oQAmC98JJc0Lw__17AP-fY id: page_content_pattern label: 'Page content pattern' type: 'canonical_entities:node' diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 9813b60af..872d57aab 100644 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -385,6 +385,10 @@ function drupal_get_env(string|array $variables) : mixed { } } +// Supported values: https://github.com/Seldaek/monolog/blob/main/doc/01-usage.md#log-levels. +$default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug'; +$settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level; + /** * Deployment identifier. * diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index 9e3d7a59e..fade4de0d 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -1,9 +1,9 @@ ifeq ($(DRUPAL_CONF_EXISTS),yes) - DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-unblock-uli + DRUPAL_NEW_TARGETS := up build drush-si drush-cr drush-locale-update drush-helfi-locale-import drush-unblock drush-uli else - DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-unblock-uli + DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-unblock drush-uli endif -DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-unblock-uli +DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-unblock OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token') @@ -47,11 +47,7 @@ drush-helfi-locale-import: ## Update translations from helfi platform config. $(call drush,helfi:locale-import helfi_platform_config) $(call drush,cr) -PHONY += drush-unblock-uli -drush-unblock-uli: DRUPAL_UID ?= 1 -drush-unblock-uli: DRUPAL_DESTINATION ?= admin/reports/status -drush-unblock-uli: ## Get login link - $(call step,Unblocking user...\n) - $(call drush,user:unblock$(if $(DRUPAL_UID), --uid=$(DRUPAL_UID), --uid=1)) - $(call step,Login to your site with:\n) - $(call drush,uli$(if $(DRUPAL_UID), --uid=$(DRUPAL_UID),) $(DRUPAL_DESTINATION)) +PHONY += drush-unblock +drush-unblock: ## Get login link + $(call step,Unblocking helfi-admin...\n) + $(call drush,user:unblock --uid=1) From 616c1960e33afbfd1dc5c32aaafdd300f821037b Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Fri, 11 Oct 2024 11:59:21 +0300 Subject: [PATCH 02/20] UHF-10354: Remove base.sh --- docker/openshift/crons/base.sh | 37 ---------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 docker/openshift/crons/base.sh diff --git a/docker/openshift/crons/base.sh b/docker/openshift/crons/base.sh deleted file mode 100644 index 375487fb7..000000000 --- a/docker/openshift/crons/base.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -source /init.sh - -echo "Starting cron: $(date)" - -# You can add any additional cron "daemons" here: -# -# exec "/crons/some-command.sh" & -# -# Example cron (docker/openshift/crons/some-command.sh): -# @code -# #!/bin/bash -# while true -# do -# drush some-command -# sleep 600 -# done -# @endcode - -# Uncomment this to enable TPR migration cron -#exec "/crons/migrate-tpr.sh" & -exec "/crons/purge-queue.sh" & -# Uncomment this to enable automatic translation updates. -exec "/crons/update-translations.sh" & -# Uncomment this to enable content scheduler -exec "/crons/content-scheduler.sh" & -exec "/crons/pubsub.sh" & -exec "/crons/linked-events.sh" & - -while true -do - echo "Running cron: $(date)\n" - drush cron - # Sleep for 10 minutes. - sleep 600 -done From dcd4a56fb68ad16858b0c253d89f478b047c2572 Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Fri, 11 Oct 2024 11:59:52 +0300 Subject: [PATCH 03/20] UHF-10354: Remove migrate-hearings.sh --- docker/openshift/crons/migrate-hearings.sh | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 docker/openshift/crons/migrate-hearings.sh diff --git a/docker/openshift/crons/migrate-hearings.sh b/docker/openshift/crons/migrate-hearings.sh deleted file mode 100644 index 9cbea0854..000000000 --- a/docker/openshift/crons/migrate-hearings.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -echo "Starting hearings migration: $(date)" - -while true -do - drush mim helfi_hearings --reset-threshold 43200 --interval 1800 - sleep 900 -done From 009e49e93a9c2f245d5a6f775416bd37d755a880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Fri, 11 Oct 2024 12:30:47 +0300 Subject: [PATCH 04/20] Fixed the translations of news item entity form display. --- ...core.entity_form_display.node.news_item.default.yml | 8 ++++++++ ...core.entity_form_display.node.news_item.default.yml | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml index ddec27707..2a0d8abec 100644 --- a/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/language/fi/core.entity_form_display.node.news_item.default.yml @@ -6,6 +6,14 @@ third_party_settings: label: Linkit group_main_image: label: Pääkuva + group_updating_news: + label: 'Päivittyvä uutinen' + format_settings: + description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' + group_automatically_recommended: + label: 'Automaattisesti suositellut sisällöt' + format_settings: + description: 'Suositellut sisällöt voivat olla uutisia tai artikkeleita. Suositukset perustuvat automaattisesti valittuihin uutisluokkiin. Uutisluokat valitaan sivun sisällön perusteella, kun sivu tallennetaan.' content: field_content: settings: diff --git a/public/modules/custom/helfi_etusivu_config/config/rewrite/language/fi/core.entity_form_display.node.news_item.default.yml b/public/modules/custom/helfi_etusivu_config/config/rewrite/language/fi/core.entity_form_display.node.news_item.default.yml index 6c67b2d31..435be274e 100644 --- a/public/modules/custom/helfi_etusivu_config/config/rewrite/language/fi/core.entity_form_display.node.news_item.default.yml +++ b/public/modules/custom/helfi_etusivu_config/config/rewrite/language/fi/core.entity_form_display.node.news_item.default.yml @@ -1,9 +1,17 @@ +config_rewrite: + replace: ['third_party_settings'] third_party_settings: field_group: + group_news_item_links: + label: Linkit + group_news_item_links_wrapper: + label: Linkit + group_main_image: + label: Pääkuva group_updating_news: label: 'Päivittyvä uutinen' format_settings: - description: "Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan." + description: 'Jätä sisältöalue tyhjäksi päivittyvän uutisen yläpuolelta, jos luot päivittyvän uutisen.
Lisää uusin uutispäivitys viimeiseksi. Verkkosivulla uutispäivitykset näytetään lukijalle uusimmasta vanhimpaan.' group_automatically_recommended: label: 'Automaattisesti suositellut sisällöt' format_settings: From 4383c74793b590539d29099ecf06426af7a449ab Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Thu, 17 Oct 2024 08:02:58 +0000 Subject: [PATCH 05/20] Update configuration --- composer.lock | 82 +++++++++---------- ...form_display.node.landing_page.default.yml | 2 +- ...ponsive_image.styles.unit_contact_card.yml | 44 +++++----- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/composer.lock b/composer.lock index f83d6b3e2..2286d85f1 100644 --- a/composer.lock +++ b/composer.lock @@ -4253,16 +4253,16 @@ }, { "name": "drupal/hdbt", - "version": "6.7.11", + "version": "6.7.12", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "5f9902895d8690e0167af2b8df37e84798c1ab8b" + "reference": "84550be36284d8f8e12620710c942dd8d59d13ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/5f9902895d8690e0167af2b8df37e84798c1ab8b", - "reference": "5f9902895d8690e0167af2b8df37e84798c1ab8b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/84550be36284d8f8e12620710c942dd8d59d13ba", + "reference": "84550be36284d8f8e12620710c942dd8d59d13ba", "shasum": "" }, "require": { @@ -4281,10 +4281,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.11", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.12", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-10-11T08:54:21+00:00" + "time": "2024-10-17T07:58:13+00:00" }, { "name": "drupal/hdbt_admin", @@ -4375,16 +4375,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.8", + "version": "2.7.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "7a37870d06234179c50f9f5c5d190d49af7c2e62" + "reference": "189161e8d674072f0a345c45b93dd4c42896b52b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/7a37870d06234179c50f9f5c5d190d49af7c2e62", - "reference": "7a37870d06234179c50f9f5c5d190d49af7c2e62", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/189161e8d674072f0a345c45b93dd4c42896b52b", + "reference": "189161e8d674072f0a345c45b93dd4c42896b52b", "shasum": "" }, "require": { @@ -4414,10 +4414,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.8", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.9", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-10-03T06:20:46+00:00" + "time": "2024-10-10T08:24:13+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4589,16 +4589,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.6.14", + "version": "4.6.16", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "a5706c1fff0690115510224dcdccf61ce2b6dadd" + "reference": "a34c636496d5795683b71867b847a8c33beded5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a5706c1fff0690115510224dcdccf61ce2b6dadd", - "reference": "a5706c1fff0690115510224dcdccf61ce2b6dadd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a34c636496d5795683b71867b847a8c33beded5f", + "reference": "a34c636496d5795683b71867b847a8c33beded5f", "shasum": "" }, "require": { @@ -4717,10 +4717,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.14", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.16", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-10-11T08:52:39+00:00" + "time": "2024-10-17T07:58:19+00:00" }, { "name": "drupal/helfi_proxy", @@ -5506,17 +5506,17 @@ }, { "name": "drupal/linkit", - "version": "6.1.4", + "version": "6.1.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.1.4" + "reference": "6.1.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.1.4.zip", - "reference": "6.1.4", - "shasum": "f5544a39d691af5efd1532bd5403862a7153f60b" + "url": "https://ftp.drupal.org/files/projects/linkit-6.1.5.zip", + "reference": "6.1.5", + "shasum": "ce2e0f545e5213874e658a44ed3ef606b80b760d" }, "require": { "drupal/core": "^10.1" @@ -5528,8 +5528,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.1.4", - "datestamp": "1715203830", + "version": "6.1.5", + "datestamp": "1728680387", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -7869,30 +7869,30 @@ }, { "name": "drupal/tfa", - "version": "1.8.0", + "version": "1.9.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/tfa.git", - "reference": "8.x-1.8" + "reference": "8.x-1.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/tfa-8.x-1.8.zip", - "reference": "8.x-1.8", - "shasum": "fda56a048fc15d2d24601981785d3974cd29acd9" + "url": "https://ftp.drupal.org/files/projects/tfa-8.x-1.9.zip", + "reference": "8.x-1.9", + "shasum": "1d42020673e8c29259dd9b6b2a7c1f974e66a415" }, "require": { "chillerlan/php-qrcode": "^1.0.9 || ^2.0 || ^3.2 || ^4.0", "christian-riesen/otp": "^2.1", - "drupal/core": "^8 || ^9 || ^10", + "drupal/core": "^8 || ^9 || ^10 || ^11", "drupal/encrypt": "~3.0", "php": ">=7.0" }, "require-dev": { "drupal/encrypt": "*", "drupal/key": "*", - "drupal/services": "^4 || ^5", - "drush/drush": "^10 || ^11 || ^12", + "drupal/services": "*", + "drush/drush": "^10 || ^11 || ^12 || ^13", "mglaman/phpstan-drupal": "^1.1", "phpstan/extension-installer": "^1.2", "phpstan/phpstan": "^1.9", @@ -7902,8 +7902,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.8", - "datestamp": "1727892298", + "version": "8.x-1.9", + "datestamp": "1729138391", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -18219,16 +18219,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.32.0", + "version": "1.33.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4" + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/6ca22b154efdd9e3c68c56f5d94670920a1c19a4", - "reference": "6ca22b154efdd9e3c68c56f5d94670920a1c19a4", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/82a311fd3690fb2bf7b64d5c98f912b3dd746140", + "reference": "82a311fd3690fb2bf7b64d5c98f912b3dd746140", "shasum": "" }, "require": { @@ -18260,9 +18260,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.32.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.33.0" }, - "time": "2024-09-26T07:23:32+00:00" + "time": "2024-10-13T11:25:22+00:00" }, { "name": "phpstan/phpstan", diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml index 027379657..cff76fd10 100644 --- a/conf/cmi/core.entity_form_display.node.landing_page.default.yml +++ b/conf/cmi/core.entity_form_display.node.landing_page.default.yml @@ -128,9 +128,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 + region: content settings: { } third_party_settings: { } - region: content status: type: boolean_checkbox weight: 12 diff --git a/conf/cmi/responsive_image.styles.unit_contact_card.yml b/conf/cmi/responsive_image.styles.unit_contact_card.yml index 3893c27fa..3b41081f1 100644 --- a/conf/cmi/responsive_image.styles.unit_contact_card.yml +++ b/conf/cmi/responsive_image.styles.unit_contact_card.yml @@ -3,72 +3,72 @@ langcode: en status: true dependencies: config: - - image.style.1.5_1120w_746h_LQ - - image.style.1.5_1200w_800h_LQ - - image.style.1.5_1298w_866h_LQ - - image.style.1.5_1470w_980h_LQ - - image.style.1.5_1854w_1236h_LQ - - image.style.1.5_560w_373h - - image.style.1.5_600w_400h - - image.style.1.5_649w_433h - - image.style.1.5_735w_490h - - image.style.1.5_927w_618h + - image.style.1.5_1022w_682h_LQ + - image.style.1.5_217w_145h + - image.style.1.5_264w_176h + - image.style.1.5_341w_227h + - image.style.1.5_378w_252h + - image.style.1.5_434w_290h_LQ + - image.style.1.5_511w_341h + - image.style.1.5_528w_352h_LQ + - image.style.1.5_682w_454h_LQ + - image.style.1.5_756w_504h_LQ module: - helfi_image_styles _core: - default_config_hash: j4r0g0EtcwDoFwxEuB3RGVktSuN6LWThnZBfw2SpG6g + default_config_hash: VnnwBYRxRNKSPg5iTbuRmMLcv0ZtU6Tjd4crcbDTeCs id: unit_contact_card label: 'Unit Contact Card' image_style_mappings: - image_mapping_type: image_style - image_mapping: 1.5_649w_433h + image_mapping: 1.5_378w_252h breakpoint_id: helfi_image_styles.xl multiplier: 1x - image_mapping_type: image_style - image_mapping: 1.5_1298w_866h_LQ + image_mapping: 1.5_756w_504h_LQ breakpoint_id: helfi_image_styles.xl multiplier: 2x - image_mapping_type: image_style - image_mapping: 1.5_600w_400h + image_mapping: 1.5_341w_227h breakpoint_id: helfi_image_styles.l multiplier: 1x - image_mapping_type: image_style - image_mapping: 1.5_1200w_800h_LQ + image_mapping: 1.5_682w_454h_LQ breakpoint_id: helfi_image_styles.l multiplier: 2x - image_mapping_type: image_style - image_mapping: 1.5_927w_618h + image_mapping: 1.5_264w_176h breakpoint_id: helfi_image_styles.m multiplier: 1x - image_mapping_type: image_style - image_mapping: 1.5_1854w_1236h_LQ + image_mapping: 1.5_528w_352h_LQ breakpoint_id: helfi_image_styles.m multiplier: 2x - image_mapping_type: image_style - image_mapping: 1.5_735w_490h + image_mapping: 1.5_217w_145h breakpoint_id: helfi_image_styles.s multiplier: 1x - image_mapping_type: image_style - image_mapping: 1.5_1470w_980h_LQ + image_mapping: 1.5_434w_290h_LQ breakpoint_id: helfi_image_styles.s multiplier: 2x - image_mapping_type: image_style - image_mapping: 1.5_560w_373h + image_mapping: 1.5_511w_341h breakpoint_id: helfi_image_styles.xs multiplier: 1x - image_mapping_type: image_style - image_mapping: 1.5_1120w_746h_LQ + image_mapping: 1.5_1022w_682h_LQ breakpoint_id: helfi_image_styles.xs multiplier: 2x breakpoint_group: helfi_image_styles -fallback_image_style: 1.5_735w_490h +fallback_image_style: 1.5_378w_252h From 84e53a8557362d7d666903e9903a51c40604f726 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 21 Oct 2024 08:38:21 +0300 Subject: [PATCH 06/20] set the baseurl to fix the sitemap paging --- public/sites/default/production.settings.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/sites/default/production.settings.php b/public/sites/default/production.settings.php index 6ecc941d9..1c08cedf4 100644 --- a/public/sites/default/production.settings.php +++ b/public/sites/default/production.settings.php @@ -2,3 +2,5 @@ $config['helfi_proxy.settings']['tunnistamo_return_url'] = '/fi/openid-connect/tunnistamo'; +// Sitemap paging leads back to the sitemap index without this. +$config['simple_sitemap.settings']['base_url'] = 'https://hel.fi/fi'; From e9cebb6064ce803c3a0666a2835702f58ca696e2 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 21 Oct 2024 08:57:22 +0300 Subject: [PATCH 07/20] UHF-10812: added for test and stage envs as well --- public/sites/default/production.settings.php | 2 +- public/sites/default/staging.settings.php | 2 ++ public/sites/default/testing.settings.php | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/public/sites/default/production.settings.php b/public/sites/default/production.settings.php index 1c08cedf4..185dffb80 100644 --- a/public/sites/default/production.settings.php +++ b/public/sites/default/production.settings.php @@ -3,4 +3,4 @@ $config['helfi_proxy.settings']['tunnistamo_return_url'] = '/fi/openid-connect/tunnistamo'; // Sitemap paging leads back to the sitemap index without this. -$config['simple_sitemap.settings']['base_url'] = 'https://hel.fi/fi'; +$config['simple_sitemap.settings']['base_url'] = 'https://www.hel.fi/fi'; diff --git a/public/sites/default/staging.settings.php b/public/sites/default/staging.settings.php index b1ade0001..c43c46fbf 100644 --- a/public/sites/default/staging.settings.php +++ b/public/sites/default/staging.settings.php @@ -1,3 +1,5 @@ Date: Mon, 21 Oct 2024 09:00:43 +0300 Subject: [PATCH 08/20] UHF-10812: better comment --- public/sites/default/production.settings.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/sites/default/production.settings.php b/public/sites/default/production.settings.php index 185dffb80..bdbc2539c 100644 --- a/public/sites/default/production.settings.php +++ b/public/sites/default/production.settings.php @@ -2,5 +2,5 @@ $config['helfi_proxy.settings']['tunnistamo_return_url'] = '/fi/openid-connect/tunnistamo'; -// Sitemap paging leads back to the sitemap index without this. +// #UHF-10812 Sitemap paging leads back to the sitemap index. $config['simple_sitemap.settings']['base_url'] = 'https://www.hel.fi/fi'; From 4030bf7caeb5d051c50bc4498661a69b1607b006 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 21 Oct 2024 09:03:24 +0300 Subject: [PATCH 09/20] UHF-10812: remove the excess from the url --- public/sites/default/staging.settings.php | 2 +- public/sites/default/testing.settings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/sites/default/staging.settings.php b/public/sites/default/staging.settings.php index c43c46fbf..bb98f5e7b 100644 --- a/public/sites/default/staging.settings.php +++ b/public/sites/default/staging.settings.php @@ -2,4 +2,4 @@ $config['helfi_proxy.settings']['tunnistamo_return_url'] = '/fi/openid-connect/tunnistamo'; -$config['simple_sitemap.settings']['base_url'] = 'https://www.stage.hel.ninja/fi/sitemap.xml'; +$config['simple_sitemap.settings']['base_url'] = 'https://www.stage.hel.ninja/fi'; diff --git a/public/sites/default/testing.settings.php b/public/sites/default/testing.settings.php index 3ced4f0c4..8c0de23b2 100644 --- a/public/sites/default/testing.settings.php +++ b/public/sites/default/testing.settings.php @@ -2,4 +2,4 @@ $config['helfi_proxy.settings']['tunnistamo_return_url'] = '/fi/openid-connect/tunnistamo'; -$config['simple_sitemap.settings']['base_url'] = 'https://www.test.hel.ninja/fi/sitemap.xml'; +$config['simple_sitemap.settings']['base_url'] = 'https://www.test.hel.ninja/fi'; From 1d360a2989e40b267934c64ad51722c06cdb30a0 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Mon, 21 Oct 2024 07:52:29 +0000 Subject: [PATCH 10/20] Update configuration --- composer.lock | 74 +++++++++---------- .../image.style.linkit_result_thumbnail.yml | 2 +- .../image.style.linkit_result_thumbnail.yml | 2 +- conf/cmi/raven.settings.yml | 2 +- conf/cmi/user.role.anonymous.yml | 2 + conf/cmi/user.role.authenticated.yml | 2 + public/sites/default/settings.php | 5 ++ 7 files changed, 49 insertions(+), 40 deletions(-) diff --git a/composer.lock b/composer.lock index 2286d85f1..92c991ad7 100644 --- a/composer.lock +++ b/composer.lock @@ -908,16 +908,16 @@ }, { "name": "consolidation/output-formatters", - "version": "4.5.0", + "version": "4.6.0", "source": { "type": "git", "url": "https://github.com/consolidation/output-formatters.git", - "reference": "7a611b01eb48eb19cd54672339fc08c0985bf540" + "reference": "5fd5656718d7068a02d046f418a7ba873d5abbfe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/7a611b01eb48eb19cd54672339fc08c0985bf540", - "reference": "7a611b01eb48eb19cd54672339fc08c0985bf540", + "url": "https://api.github.com/repos/consolidation/output-formatters/zipball/5fd5656718d7068a02d046f418a7ba873d5abbfe", + "reference": "5fd5656718d7068a02d046f418a7ba873d5abbfe", "shasum": "" }, "require": { @@ -956,9 +956,9 @@ "description": "Format text by applying transformations provided by plug-in formatters.", "support": { "issues": "https://github.com/consolidation/output-formatters/issues", - "source": "https://github.com/consolidation/output-formatters/tree/4.5.0" + "source": "https://github.com/consolidation/output-formatters/tree/4.6.0" }, - "time": "2024-04-02T15:18:52+00:00" + "time": "2024-10-18T14:02:48+00:00" }, { "name": "consolidation/robo", @@ -4253,16 +4253,16 @@ }, { "name": "drupal/hdbt", - "version": "6.7.12", + "version": "6.7.15", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "84550be36284d8f8e12620710c942dd8d59d13ba" + "reference": "d8fbc3f44f2607fc484642596fcf42c45923b56a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/84550be36284d8f8e12620710c942dd8d59d13ba", - "reference": "84550be36284d8f8e12620710c942dd8d59d13ba", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d8fbc3f44f2607fc484642596fcf42c45923b56a", + "reference": "d8fbc3f44f2607fc484642596fcf42c45923b56a", "shasum": "" }, "require": { @@ -4281,10 +4281,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.12", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.15", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-10-17T07:58:13+00:00" + "time": "2024-10-21T07:47:28+00:00" }, { "name": "drupal/hdbt_admin", @@ -4375,16 +4375,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.7.9", + "version": "2.7.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "189161e8d674072f0a345c45b93dd4c42896b52b" + "reference": "2327b07739cbead0d2e7d3482c074d717b786ba6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/189161e8d674072f0a345c45b93dd4c42896b52b", - "reference": "189161e8d674072f0a345c45b93dd4c42896b52b", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/2327b07739cbead0d2e7d3482c074d717b786ba6", + "reference": "2327b07739cbead0d2e7d3482c074d717b786ba6", "shasum": "" }, "require": { @@ -4414,10 +4414,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.9", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.7.10", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-10-10T08:24:13+00:00" + "time": "2024-10-18T12:57:18+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4589,16 +4589,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.6.16", + "version": "4.6.17", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "a34c636496d5795683b71867b847a8c33beded5f" + "reference": "83d83591264ec0da5d54b5da0db39764392c63ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a34c636496d5795683b71867b847a8c33beded5f", - "reference": "a34c636496d5795683b71867b847a8c33beded5f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/83d83591264ec0da5d54b5da0db39764392c63ba", + "reference": "83d83591264ec0da5d54b5da0db39764392c63ba", "shasum": "" }, "require": { @@ -4717,10 +4717,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.16", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.17", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-10-17T07:58:19+00:00" + "time": "2024-10-18T13:04:39+00:00" }, { "name": "drupal/helfi_proxy", @@ -5506,17 +5506,17 @@ }, { "name": "drupal/linkit", - "version": "6.1.5", + "version": "6.1.6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.1.5" + "reference": "6.1.6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.1.5.zip", - "reference": "6.1.5", - "shasum": "ce2e0f545e5213874e658a44ed3ef606b80b760d" + "url": "https://ftp.drupal.org/files/projects/linkit-6.1.6.zip", + "reference": "6.1.6", + "shasum": "113d8e569cfb92f8d7feb0a2f7713953c0715e92" }, "require": { "drupal/core": "^10.1" @@ -5528,8 +5528,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.1.5", - "datestamp": "1728680387", + "version": "6.1.6", + "datestamp": "1729189029", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -9638,16 +9638,16 @@ }, { "name": "guzzlehttp/promises", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8" + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", - "reference": "6ea8dd08867a2a42619d65c3deb2c0fcbf81c8f8", + "url": "https://api.github.com/repos/guzzle/promises/zipball/f9c436286ab2892c7db7be8c8da4ef61ccf7b455", + "reference": "f9c436286ab2892c7db7be8c8da4ef61ccf7b455", "shasum": "" }, "require": { @@ -9701,7 +9701,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/2.0.3" + "source": "https://github.com/guzzle/promises/tree/2.0.4" }, "funding": [ { @@ -9717,7 +9717,7 @@ "type": "tidelift" } ], - "time": "2024-07-18T10:29:17+00:00" + "time": "2024-10-17T10:06:22+00:00" }, { "name": "guzzlehttp/psr7", diff --git a/conf/cmi/language/de/image.style.linkit_result_thumbnail.yml b/conf/cmi/language/de/image.style.linkit_result_thumbnail.yml index d1cbb89f0..4abf215cd 100644 --- a/conf/cmi/language/de/image.style.linkit_result_thumbnail.yml +++ b/conf/cmi/language/de/image.style.linkit_result_thumbnail.yml @@ -1 +1 @@ -label: 'Linkit result thumbnail' +label: Linkit-Ergebnisminiaturbild diff --git a/conf/cmi/language/fr/image.style.linkit_result_thumbnail.yml b/conf/cmi/language/fr/image.style.linkit_result_thumbnail.yml index d1cbb89f0..6ada7c709 100644 --- a/conf/cmi/language/fr/image.style.linkit_result_thumbnail.yml +++ b/conf/cmi/language/fr/image.style.linkit_result_thumbnail.yml @@ -1 +1 @@ -label: 'Linkit result thumbnail' +label: 'Vignette de résultat Linkit' diff --git a/conf/cmi/raven.settings.yml b/conf/cmi/raven.settings.yml index 01a5b61e7..5d2ac27f3 100644 --- a/conf/cmi/raven.settings.yml +++ b/conf/cmi/raven.settings.yml @@ -29,7 +29,7 @@ rate_limit: 0 send_request_body: false request_tracing: true traces_sample_rate: 0.2 -browser_traces_sample_rate: null +browser_traces_sample_rate: 0.2 database_tracing: true twig_tracing: true auto_session_tracking: false diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml index 6296a0045..62c5fa80b 100644 --- a/conf/cmi/user.role.anonymous.yml +++ b/conf/cmi/user.role.anonymous.yml @@ -13,6 +13,7 @@ dependencies: - helfi_global_navigation - media - openapi + - raven - rest - system _core: @@ -28,6 +29,7 @@ permissions: - 'restful get helfi_global_menu_collection' - 'restful get helfi_global_mobile_menu' - 'restful get helfi_menu_link_collection' + - 'send javascript errors to sentry' - 'view global_menu' - 'view helfi_announcements external entity' - 'view helfi_surveys external entity' diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml index b083ab844..8ffa68545 100644 --- a/conf/cmi/user.role.authenticated.yml +++ b/conf/cmi/user.role.authenticated.yml @@ -16,6 +16,7 @@ dependencies: - media - openapi - paragraphs + - raven - rest - system - tfa @@ -37,6 +38,7 @@ permissions: - 'restful get helfi_global_menu_collection' - 'restful get helfi_global_mobile_menu' - 'restful get helfi_menu_link_collection' + - 'send javascript errors to sentry' - 'setup own tfa' - 'view global_menu' - 'view helfi_announcements external entity' diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 872d57aab..2f8d1e8e8 100644 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -389,6 +389,11 @@ function drupal_get_env(string|array $variables) : mixed { $default_log_level = getenv('APP_ENV') === 'production' ? 'info' : 'debug'; $settings['helfi_api_base.log_level'] = getenv('LOG_LEVEL') ?: $default_log_level; +// Turn sentry JS error tracking on if SENTRY_DSN_PUBLIC is defined. +if (getenv('SENTRY_DSN_PUBLIC')) { + $config['raven.settings']['javascript_error_handler'] = TRUE; +} + /** * Deployment identifier. * From 53c0b6d4519fb5dc00b3a5858d5b4e77650a1aaf Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 21 Oct 2024 15:37:52 +0300 Subject: [PATCH 11/20] UHF-10812: remove the bad solution, override the original simplesitemap class and pass current language to toUrl function to get the pagination working --- .../helfi_etusivu/helfi_etusivu.info.yml | 1 + .../custom/helfi_etusivu/helfi_etusivu.module | 22 ++++++++------ .../helfi_etusivu/src/HelfiSimpleSitemap.php | 29 +++++++++++++++++++ public/sites/default/production.settings.php | 3 -- public/sites/default/staging.settings.php | 2 -- public/sites/default/testing.settings.php | 2 -- 6 files changed, 43 insertions(+), 16 deletions(-) create mode 100644 public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.info.yml b/public/modules/custom/helfi_etusivu/helfi_etusivu.info.yml index ca06425fb..40cb743c1 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.info.yml +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.info.yml @@ -10,5 +10,6 @@ dependencies: - elasticsearch_connector:elasticsearch_connector - helfi_api_base:helfi_api_base - helfi_annif:helfi_annif + - simple_sitemap:simple_sitemap 'interface translation project': helfi_etusivu 'interface translation server pattern': modules/custom/helfi_etusivu/translations/%language.po diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index 470e2e6b1..e164ff699 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -14,6 +14,7 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\helfi_annif\TextConverter\Document; +use Drupal\helfi_etusivu\HelfiSimpleSitemap; use Drupal\helfi_etusivu\Entity\Node\NewsItem; use Drupal\helfi_etusivu_entities\Plugin\ExternalEntities\StorageClient\Announcements; use Drupal\helfi_etusivu_entities\Plugin\ExternalEntities\StorageClient\Surveys; @@ -24,6 +25,18 @@ use Drupal\views\Plugin\views\query\QueryPluginBase; use Drupal\views\Plugin\views\query\Sql; use Drupal\views\ViewExecutable; +/** + * Implements hook_entity_bundle_info_alter(). + */ +function helfi_etusivu_entity_bundle_info_alter(array &$bundles): void { + if (isset($bundles['node']['news_item'])) { + $bundles['node']['news_item']['class'] = NewsItem::class; + } + if (isset($bundles['simple_sitemap']['simple_sitemap'])) { + $bundles['simple_sitemap']['simple_sitemap']['class'] = HelfiSimpleSitemap::class; + } +} + /** * Implements hook_form_BASE_FORM_ID_alter(). * @@ -260,15 +273,6 @@ function helfi_etusivu_node_text_conversion_alter(Document &$document, EntityInt } } -/** - * Implements hook_entity_bundle_info_alter(). - */ -function helfi_etusivu_entity_bundle_info_alter(array &$bundles): void { - if (isset($bundles['node']['news_item'])) { - $bundles['node']['news_item']['class'] = NewsItem::class; - } -} - /** * Implements hook_first_paragraph_grey_alter(). */ diff --git a/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php b/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php new file mode 100644 index 000000000..6bd571229 --- /dev/null +++ b/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php @@ -0,0 +1,29 @@ + $options['delta']] : []; + + if ($parameters['page']) { + //$langcode = \Drupal::languageManager()->getCurrentLanguage(); + $language = $this->languageManager->getCurrentLanguage(); + $options['language'] = $language; + } + + return parent::toUrl($rel, $options); + } + +} diff --git a/public/sites/default/production.settings.php b/public/sites/default/production.settings.php index bdbc2539c..b1ade0001 100644 --- a/public/sites/default/production.settings.php +++ b/public/sites/default/production.settings.php @@ -1,6 +1,3 @@ Date: Mon, 21 Oct 2024 15:38:35 +0300 Subject: [PATCH 12/20] UHF-10812: remove useless comments --- public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php | 1 - 1 file changed, 1 deletion(-) diff --git a/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php b/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php index 6bd571229..d23ecbacd 100644 --- a/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php +++ b/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php @@ -18,7 +18,6 @@ public function toUrl($rel = 'canonical', array $options = []) { $parameters = isset($options['delta']) ? ['page' => $options['delta']] : []; if ($parameters['page']) { - //$langcode = \Drupal::languageManager()->getCurrentLanguage(); $language = $this->languageManager->getCurrentLanguage(); $options['language'] = $language; } From 1491d398f7a2abd74610d6f5e519bd8863d34e96 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Mon, 21 Oct 2024 15:40:27 +0300 Subject: [PATCH 13/20] UHF-10812: useless variable --- public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php b/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php index d23ecbacd..fd5b8374a 100644 --- a/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php +++ b/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php @@ -18,8 +18,7 @@ public function toUrl($rel = 'canonical', array $options = []) { $parameters = isset($options['delta']) ? ['page' => $options['delta']] : []; if ($parameters['page']) { - $language = $this->languageManager->getCurrentLanguage(); - $options['language'] = $language; + $options['language'] = $this->languageManager->getCurrentLanguage(); } return parent::toUrl($rel, $options); From 3caee794b2da55e6c83779f45707580fede5f6bb Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:11:42 +0000 Subject: [PATCH 14/20] Update configuration --- composer.lock | 53 +++++++++++++++----------------- docker/openshift/crons/pubsub.sh | 5 +++ 2 files changed, 30 insertions(+), 28 deletions(-) diff --git a/composer.lock b/composer.lock index 92c991ad7..a6754b4fb 100644 --- a/composer.lock +++ b/composer.lock @@ -4253,16 +4253,16 @@ }, { "name": "drupal/hdbt", - "version": "6.7.15", + "version": "6.7.16", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "d8fbc3f44f2607fc484642596fcf42c45923b56a" + "reference": "52d0f272cff444e5cdd2db2ccf7a660dce401849" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d8fbc3f44f2607fc484642596fcf42c45923b56a", - "reference": "d8fbc3f44f2607fc484642596fcf42c45923b56a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/52d0f272cff444e5cdd2db2ccf7a660dce401849", + "reference": "52d0f272cff444e5cdd2db2ccf7a660dce401849", "shasum": "" }, "require": { @@ -4281,10 +4281,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.15", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.16", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-10-21T07:47:28+00:00" + "time": "2024-10-21T15:06:33+00:00" }, { "name": "drupal/hdbt_admin", @@ -4589,16 +4589,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.6.17", + "version": "4.6.18", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "83d83591264ec0da5d54b5da0db39764392c63ba" + "reference": "55434c5d123a8381c366ad2df1bcff6f3140d92d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/83d83591264ec0da5d54b5da0db39764392c63ba", - "reference": "83d83591264ec0da5d54b5da0db39764392c63ba", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/55434c5d123a8381c366ad2df1bcff6f3140d92d", + "reference": "55434c5d123a8381c366ad2df1bcff6f3140d92d", "shasum": "" }, "require": { @@ -4717,10 +4717,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.17", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.18", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-10-18T13:04:39+00:00" + "time": "2024-10-21T09:00:36+00:00" }, { "name": "drupal/helfi_proxy", @@ -8390,42 +8390,39 @@ }, { "name": "drupal/views_bulk_operations", - "version": "4.2.7", + "version": "4.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "4.2.7" + "reference": "4.3.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.7.zip", - "reference": "4.2.7", - "shasum": "25c9fa531ac49664a361fdd2202eec0a6e53bc61" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.3.0.zip", + "reference": "4.3.0", + "shasum": "887e784e3e41b05d6f8915c223d42f4273ada604" }, "require": { - "drupal/core": "^9.4 || ^10 || ^11", - "php": ">=7.4.0" + "drupal/core": "^10.3 || ^11" + }, + "conflict": { + "drush/drush": "<12.5.1" }, "require-dev": { - "drush/drush": "^12" + "drush/drush": "^12 || ^13" }, "suggest": { - "drush/drush": "^11 || ^12" + "drush/drush": "^12 || ^13" }, "type": "drupal-module", "extra": { "drupal": { - "version": "4.2.7", - "datestamp": "1717665214", + "version": "4.3.0", + "datestamp": "1729513620", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" } - }, - "drush": { - "services": { - "drush.services.yml": "^10 || ^11" - } } }, "notification-url": "https://packages.drupal.org/8/downloads", diff --git a/docker/openshift/crons/pubsub.sh b/docker/openshift/crons/pubsub.sh index be359b9f0..7589ed46f 100644 --- a/docker/openshift/crons/pubsub.sh +++ b/docker/openshift/crons/pubsub.sh @@ -1,5 +1,10 @@ #!/bin/bash +if [ -z "$DRUPAL_PUBSUB_VAULT" ]; then + echo "PubSub is not configured, exiting." + exit 0 +fi + echo "Running PubSub daemon: $(date +'%Y-%m-%dT%H:%M:%S%:z')" while true From 8c0769c814a1625fb98f3410c4216ca560dfd8d3 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Tue, 22 Oct 2024 07:57:14 +0300 Subject: [PATCH 15/20] UHF-10812: just enabling path processing seems to work --- .../custom/helfi_etusivu/helfi_etusivu.module | 12 ++++-- .../SimpleSitemap/HelfiSimpleSitemap.php | 37 +++++++++++++++++++ .../helfi_etusivu/src/HelfiSimpleSitemap.php | 27 -------------- 3 files changed, 46 insertions(+), 30 deletions(-) create mode 100644 public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php delete mode 100644 public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php diff --git a/public/modules/custom/helfi_etusivu/helfi_etusivu.module b/public/modules/custom/helfi_etusivu/helfi_etusivu.module index e164ff699..b159a3a74 100644 --- a/public/modules/custom/helfi_etusivu/helfi_etusivu.module +++ b/public/modules/custom/helfi_etusivu/helfi_etusivu.module @@ -14,8 +14,8 @@ use Drupal\Core\Field\FieldStorageDefinitionInterface; use Drupal\Core\Form\FormStateInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\helfi_annif\TextConverter\Document; -use Drupal\helfi_etusivu\HelfiSimpleSitemap; use Drupal\helfi_etusivu\Entity\Node\NewsItem; +use Drupal\helfi_etusivu\Entity\SimpleSitemap\HelfiSimpleSitemap; use Drupal\helfi_etusivu_entities\Plugin\ExternalEntities\StorageClient\Announcements; use Drupal\helfi_etusivu_entities\Plugin\ExternalEntities\StorageClient\Surveys; use Drupal\helfi_platform_config\DTO\ParagraphTypeCollection; @@ -32,8 +32,14 @@ function helfi_etusivu_entity_bundle_info_alter(array &$bundles): void { if (isset($bundles['node']['news_item'])) { $bundles['node']['news_item']['class'] = NewsItem::class; } - if (isset($bundles['simple_sitemap']['simple_sitemap'])) { - $bundles['simple_sitemap']['simple_sitemap']['class'] = HelfiSimpleSitemap::class; +} + +/** + * Implements hook_entity_type_alter(). + */ +function helfi_etusivu_entity_type_alter(array &$entity_types): void { + if (isset($entity_types['simple_sitemap'])) { + $entity_types['simple_sitemap']->setClass(HelfiSimpleSitemap::class); } } diff --git a/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php b/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php new file mode 100644 index 000000000..b0653f2d5 --- /dev/null +++ b/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php @@ -0,0 +1,37 @@ + $options['delta']] : []; + unset($options['delta']); + + if (empty($options['base_url'])) { + /** @var \Drupal\simple_sitemap\Settings $settings */ + $settings = \Drupal::service('simple_sitemap.settings'); + $options['base_url'] = $settings->get('base_url') ?: $GLOBALS['base_url']; + } + + // #UHF-10812 paged sitemap had wrong url due to how helfi works, + // enabling path processing fixes this. + // $options['path_processing'] = FALSE; + + return $this->isDefault() + ? Url::fromRoute( + 'simple_sitemap.sitemap_default', + $parameters, + $options) + : Url::fromRoute( + 'simple_sitemap.sitemap_variant', + $parameters + ['variant' => $this->id()], + $options); + } +} diff --git a/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php b/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php deleted file mode 100644 index fd5b8374a..000000000 --- a/public/modules/custom/helfi_etusivu/src/HelfiSimpleSitemap.php +++ /dev/null @@ -1,27 +0,0 @@ - $options['delta']] : []; - - if ($parameters['page']) { - $options['language'] = $this->languageManager->getCurrentLanguage(); - } - - return parent::toUrl($rel, $options); - } - -} From cbf7478a6a301d68edc9da1c16312db9f221f8d4 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Tue, 22 Oct 2024 08:41:22 +0300 Subject: [PATCH 16/20] UHF-10812: code fixes --- .../src/Entity/SimpleSitemap/HelfiSimpleSitemap.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php b/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php index b0653f2d5..9d5bd1f7a 100644 --- a/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php +++ b/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php @@ -5,7 +5,14 @@ use Drupal\Core\Url; use Drupal\simple_sitemap\Entity\SimpleSitemap; +/** + * Overrides the simple_sitemap entity. + */ class HelfiSimpleSitemap extends SimpleSitemap { + + /** + * {@inheritDoc} + */ public function toUrl($rel = 'canonical', array $options = []) { if ($rel !== 'canonical') { return parent::toUrl($rel, $options); @@ -23,7 +30,6 @@ public function toUrl($rel = 'canonical', array $options = []) { // #UHF-10812 paged sitemap had wrong url due to how helfi works, // enabling path processing fixes this. // $options['path_processing'] = FALSE; - return $this->isDefault() ? Url::fromRoute( 'simple_sitemap.sitemap_default', @@ -34,4 +40,5 @@ public function toUrl($rel = 'canonical', array $options = []) { $parameters + ['variant' => $this->id()], $options); } + } From 02dcc5b49a91a2a940667bbbe7bdb19ad21558dd Mon Sep 17 00:00:00 2001 From: tuutti Date: Tue, 22 Oct 2024 09:23:25 +0300 Subject: [PATCH 17/20] UHF-10248: Run tests against automatic updates --- .github/workflows/test.yml | 4 ++-- .github/workflows/update-config.yml | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f4a302d7b..f7eb84b92 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -51,8 +51,8 @@ jobs: - name: Run PHPCS run: | - vendor/bin/phpcs public/modules/custom/ --ignore="*.js,*.css" --extensions=php,module,install --standard=Drupal,DrupalPractice - vendor/bin/phpcs public/themes/custom/ --ignore="*.js,*.css" --extensions=php,theme --standard=Drupal,DrupalPractice + vendor/bin/phpcs public/modules/custom/ + vendor/bin/phpcs public/themes/custom/ - name: Run phpstan run: vendor/bin/phpstan analyze diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml index 1a7d61f70..d36258dd6 100644 --- a/.github/workflows/update-config.yml +++ b/.github/workflows/update-config.yml @@ -24,6 +24,12 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Check if required secrets are set + env: + AUTOMATIC_UPDATE_TOKEN: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }} + if: env.AUTOMATIC_UPDATE_TOKEN == '' + run: exit 1 + - name: Download latest dump env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -77,6 +83,7 @@ jobs: uses: peter-evans/create-pull-request@v6 with: commit-message: Update configuration + token: ${{ secrets.AUTOMATIC_UPDATE_TOKEN }} title: Automatic update labels: auto-update body: | From 29b3b8e9896117f5478fe4ad75f297b60ffecf66 Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Tue, 22 Oct 2024 09:53:39 +0300 Subject: [PATCH 18/20] UHF-10812: better comment --- .../src/Entity/SimpleSitemap/HelfiSimpleSitemap.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php b/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php index 9d5bd1f7a..1bc0cb31d 100644 --- a/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php +++ b/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php @@ -27,8 +27,9 @@ public function toUrl($rel = 'canonical', array $options = []) { $options['base_url'] = $settings->get('base_url') ?: $GLOBALS['base_url']; } - // #UHF-10812 paged sitemap had wrong url due to how helfi works, - // enabling path processing fixes this. + // #UHF-10812 paged sitemap had wrong url due to how helfi works. + // Path_processing=false removes the langcode from the sitemap pagination + // which conflicts with the sitemap.xml served from the public folder. // $options['path_processing'] = FALSE; return $this->isDefault() ? Url::fromRoute( From 8675a0b256f2bce20c6225c38b897fb80ab034ab Mon Sep 17 00:00:00 2001 From: rpnykanen Date: Tue, 22 Oct 2024 14:44:44 +0300 Subject: [PATCH 19/20] added missing strict_types --- .../src/Entity/SimpleSitemap/HelfiSimpleSitemap.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php b/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php index 1bc0cb31d..975e064a3 100644 --- a/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php +++ b/public/modules/custom/helfi_etusivu/src/Entity/SimpleSitemap/HelfiSimpleSitemap.php @@ -1,5 +1,7 @@ Date: Tue, 22 Oct 2024 13:03:35 +0000 Subject: [PATCH 20/20] Update configuration --- composer.lock | 26 +++---- ...y.paragraph.curated_event_list.default.yml | 38 ++++++++++ ...vents_event.linkedevents_event.default.yml | 75 +++++++++++++++++++ ...y.paragraph.curated_event_list.default.yml | 40 ++++++++++ conf/cmi/core.extension.yml | 1 + ...xternal_entity_type.linkedevents_event.yml | 38 ++++++++++ ....field.node.landing_page.field_content.yml | 5 ++ ...rated_event_list.field_all_events_link.yml | 30 ++++++++ ...agraph.curated_event_list.field_events.yml | 28 +++++++ ...torage.paragraph.field_all_events_link.yml | 21 ++++++ .../field.storage.paragraph.field_events.yml | 22 ++++++ ...rated_event_list.field_all_events_link.yml | 5 ++ ...agraph.curated_event_list.field_events.yml | 2 + ...phs.paragraphs_type.curated_event_list.yml | 2 + ...phs.paragraphs_type.curated_event_list.yml | 12 +++ tools/make/project/install.mk | 2 +- 16 files changed, 333 insertions(+), 14 deletions(-) create mode 100644 conf/cmi/core.entity_form_display.paragraph.curated_event_list.default.yml create mode 100644 conf/cmi/core.entity_view_display.linkedevents_event.linkedevents_event.default.yml create mode 100644 conf/cmi/core.entity_view_display.paragraph.curated_event_list.default.yml create mode 100644 conf/cmi/external_entities.external_entity_type.linkedevents_event.yml create mode 100644 conf/cmi/field.field.paragraph.curated_event_list.field_all_events_link.yml create mode 100644 conf/cmi/field.field.paragraph.curated_event_list.field_events.yml create mode 100644 conf/cmi/field.storage.paragraph.field_all_events_link.yml create mode 100644 conf/cmi/field.storage.paragraph.field_events.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_all_events_link.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_events.yml create mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.curated_event_list.yml create mode 100644 conf/cmi/paragraphs.paragraphs_type.curated_event_list.yml diff --git a/composer.lock b/composer.lock index a6754b4fb..cbc619cea 100644 --- a/composer.lock +++ b/composer.lock @@ -4253,16 +4253,16 @@ }, { "name": "drupal/hdbt", - "version": "6.7.16", + "version": "6.7.18", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "52d0f272cff444e5cdd2db2ccf7a660dce401849" + "reference": "643a333baebd357037bcacb7810d4a14dde39e4d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/52d0f272cff444e5cdd2db2ccf7a660dce401849", - "reference": "52d0f272cff444e5cdd2db2ccf7a660dce401849", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/643a333baebd357037bcacb7810d4a14dde39e4d", + "reference": "643a333baebd357037bcacb7810d4a14dde39e4d", "shasum": "" }, "require": { @@ -4281,10 +4281,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.16", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.7.18", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-10-21T15:06:33+00:00" + "time": "2024-10-22T12:59:01+00:00" }, { "name": "drupal/hdbt_admin", @@ -4589,16 +4589,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.6.18", + "version": "4.6.19", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "55434c5d123a8381c366ad2df1bcff6f3140d92d" + "reference": "c17835fd4b1629ab55852a857320d6bd102b963d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/55434c5d123a8381c366ad2df1bcff6f3140d92d", - "reference": "55434c5d123a8381c366ad2df1bcff6f3140d92d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c17835fd4b1629ab55852a857320d6bd102b963d", + "reference": "c17835fd4b1629ab55852a857320d6bd102b963d", "shasum": "" }, "require": { @@ -4717,10 +4717,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.18", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.6.19", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-10-21T09:00:36+00:00" + "time": "2024-10-22T08:56:56+00:00" }, { "name": "drupal/helfi_proxy", @@ -20754,6 +20754,6 @@ "platform": { "ext-libxml": "*" }, - "platform-dev": [], + "platform-dev": {}, "plugin-api-version": "2.6.0" } diff --git a/conf/cmi/core.entity_form_display.paragraph.curated_event_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.curated_event_list.default.yml new file mode 100644 index 000000000..2514fff17 --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.curated_event_list.default.yml @@ -0,0 +1,38 @@ +uuid: b5c5ed81-d651-4db2-8d72-a67e7b66390e +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.curated_event_list.field_all_events_link + - field.field.paragraph.curated_event_list.field_events + - paragraphs.paragraphs_type.curated_event_list + module: + - link +_core: + default_config_hash: xbLWsjGFnK8aSW5O_r3mVF5bAlCp8J6wP5mGihlXLfU +id: paragraph.curated_event_list.default +targetEntityType: paragraph +bundle: curated_event_list +mode: default +content: + field_all_events_link: + type: link_default + weight: 1 + region: content + settings: + placeholder_url: '' + placeholder_title: '' + third_party_settings: { } + field_events: + type: entity_reference_autocomplete + weight: 0 + region: content + settings: + match_operator: CONTAINS + match_limit: 5 + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + created: true + status: true diff --git a/conf/cmi/core.entity_view_display.linkedevents_event.linkedevents_event.default.yml b/conf/cmi/core.entity_view_display.linkedevents_event.linkedevents_event.default.yml new file mode 100644 index 000000000..78ab301ee --- /dev/null +++ b/conf/cmi/core.entity_view_display.linkedevents_event.linkedevents_event.default.yml @@ -0,0 +1,75 @@ +uuid: 22363443-8bc6-4b97-980f-6bfb225edb1b +langcode: en +status: true +dependencies: + config: + - responsive_image.styles.card_teaser + module: + - datetime + - external_entities + - imagecache_external + - linkit +_core: + default_config_hash: HLUzZHxqtb77OIc2B344fWXiNo5fO78woa0r4KmRGcA +id: linkedevents_event.linkedevents_event.default +targetEntityType: linkedevents_event +bundle: linkedevents_event +mode: default +content: + end_time: + type: datetime_default + label: hidden + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 3 + region: content + external_link: + type: linkit + label: hidden + settings: + trim_length: 80 + url_only: false + url_plain: false + rel: '' + target: '' + linkit_profile: default + third_party_settings: { } + weight: 4 + region: content + langcode: + type: string_default + label: hidden + settings: { } + third_party_settings: { } + weight: 5 + region: content + main_image: + type: imagecache_external_responsive_image + label: hidden + settings: + imagecache_external_link: '' + imagecache_external_responsive_style: card_teaser + third_party_settings: { } + weight: 1 + region: content + start_time: + type: datetime_default + label: hidden + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 2 + region: content + title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: + search_api_excerpt: true diff --git a/conf/cmi/core.entity_view_display.paragraph.curated_event_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.curated_event_list.default.yml new file mode 100644 index 000000000..966ffdd46 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.curated_event_list.default.yml @@ -0,0 +1,40 @@ +uuid: 313ec60d-d84a-4e82-9ae3-ee3221c0e631 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.curated_event_list.field_all_events_link + - field.field.paragraph.curated_event_list.field_events + - paragraphs.paragraphs_type.curated_event_list + module: + - link +_core: + default_config_hash: kSyBcsfddKV9vQJsToglwPaZvKFQSf3GDFPLqkzIfTQ +id: paragraph.curated_event_list.default +targetEntityType: paragraph +bundle: curated_event_list +mode: default +content: + field_all_events_link: + type: link + label: hidden + settings: + trim_length: 80 + url_only: false + url_plain: false + rel: '' + target: '' + third_party_settings: { } + weight: 1 + region: content + field_events: + type: entity_reference_entity_view + label: hidden + settings: + view_mode: default + link: false + third_party_settings: { } + weight: 0 + region: content +hidden: + search_api_excerpt: true diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 638ebc210..3bc1b8c18 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -72,6 +72,7 @@ module: helfi_paragraphs_columns: 0 helfi_paragraphs_contact_card_listing: 0 helfi_paragraphs_content_cards: 0 + helfi_paragraphs_curated_event_list: 0 helfi_paragraphs_hearings: 0 helfi_paragraphs_hero: 0 helfi_paragraphs_image: 0 diff --git a/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml b/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml new file mode 100644 index 000000000..f263c5183 --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.linkedevents_event.yml @@ -0,0 +1,38 @@ +uuid: 66fe8cbc-203c-40aa-ac7b-6e0e89470312 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: Ll_0kw3O6gGsRvmdTi7l4K2pwhUrL0yQT4uPcttspmA +id: linkedevents_event +label: 'LinkedEvents: Event' +label_plural: 'LinkedEvents: Events' +description: 'Event entities from https://api.hel.fi/linkedevents.' +generate_aliases: false +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: $.title + main_image: + uri: '$.images[0].url' + title: '$.images[0].alt_text' + start_time: + value: $.start_time + end_time: + value: $.end_time + external_link: + uri: $.external_link + title: $.clean_title +storage_client_id: linkedevents_events +storage_client_config: null +persistent_cache_max_age: 0 +annotation_entity_type_id: null +annotation_bundle_id: null +annotation_field_name: null +inherits_annotation_fields: false diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index 8d0566d9d..d5cbd87a8 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -9,6 +9,7 @@ dependencies: - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.content_cards + - paragraphs.paragraphs_type.curated_event_list - paragraphs.paragraphs_type.current - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library @@ -59,6 +60,7 @@ settings: chart: chart target_group_links: target_group_links hearings: hearings + curated_event_list: curated_event_list negate: 0 target_bundles_drag_drop: banner: @@ -73,6 +75,9 @@ settings: content_cards: weight: 1 enabled: true + curated_event_list: + weight: 15 + enabled: true current: weight: 15 enabled: true diff --git a/conf/cmi/field.field.paragraph.curated_event_list.field_all_events_link.yml b/conf/cmi/field.field.paragraph.curated_event_list.field_all_events_link.yml new file mode 100644 index 000000000..78d0b9356 --- /dev/null +++ b/conf/cmi/field.field.paragraph.curated_event_list.field_all_events_link.yml @@ -0,0 +1,30 @@ +uuid: b144b934-3c5a-4c5b-ae89-b477bfb8367d +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_all_events_link + - paragraphs.paragraphs_type.curated_event_list + module: + - link +_core: + default_config_hash: FfVydFQYnAcPJkSaTbBQoyzqe8k11WrSJ5tSxAt8b1k +id: paragraph.curated_event_list.field_all_events_link +field_name: field_all_events_link +entity_type: paragraph +bundle: curated_event_list +label: 'All events link' +description: "Add a link to the tapahtumat.hel.fi website. You may also filter the events in the event calendar as desired and copy the page's URL.\r\n

\r\nAlso provide a text for the link, eg. View all events." +required: false +translatable: false +default_value: + - + attributes: { } + uri: 'https://tapahtumat.hel.fi' + title: 'View all events' + options: { } +default_value_callback: '' +settings: + title: 2 + link_type: 16 +field_type: link diff --git a/conf/cmi/field.field.paragraph.curated_event_list.field_events.yml b/conf/cmi/field.field.paragraph.curated_event_list.field_events.yml new file mode 100644 index 000000000..896f3cdee --- /dev/null +++ b/conf/cmi/field.field.paragraph.curated_event_list.field_events.yml @@ -0,0 +1,28 @@ +uuid: 41acbd4d-63ba-4cb7-919c-d6435553d4a9 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_events + - paragraphs.paragraphs_type.curated_event_list +_core: + default_config_hash: XaOHQv-1E_t55GwYhhyvtA03_7mWbdEbmXA3YhGrHiA +id: paragraph.curated_event_list.field_events +field_name: field_events +entity_type: paragraph +bundle: curated_event_list +label: Events +description: "Pick events to display in the list. You may either search event by their name or enter their ID. \r\n

\r\nYou can find the ID of an event on tapahtumat.hel.fi site from the URL of the page. For example, in the url https://tapahtumat.hel.fi/fi/events/helsinki:agiy4m4ida the helsinki:agiy4m4ida part is the ID of the event.\r\n

\r\nThe page will display the top three events. You can arrange the events by dragging. Expired events will be automatically removed from the page." +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:linkedevents_event' + handler_settings: + target_bundles: null + sort: + field: _none + direction: ASC + auto_create: false +field_type: entity_reference diff --git a/conf/cmi/field.storage.paragraph.field_all_events_link.yml b/conf/cmi/field.storage.paragraph.field_all_events_link.yml new file mode 100644 index 000000000..046d3b06b --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_all_events_link.yml @@ -0,0 +1,21 @@ +uuid: 1dd4d7e6-e3be-490e-9309-e9380e0c33b4 +langcode: en +status: true +dependencies: + module: + - link + - paragraphs +_core: + default_config_hash: 7QiTeiuYd-9Za2xvC3WVShDfIhAcgIpMYzIV4PX2NLQ +id: paragraph.field_all_events_link +field_name: field_all_events_link +entity_type: paragraph +type: link +settings: { } +module: link +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_events.yml b/conf/cmi/field.storage.paragraph.field_events.yml new file mode 100644 index 000000000..aff4e3ba3 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_events.yml @@ -0,0 +1,22 @@ +uuid: a381685c-627a-4ba4-8be3-5bb2d2a705bd +langcode: en +status: true +dependencies: + module: + - external_entities + - paragraphs +_core: + default_config_hash: 5xBhIfvn2RSNE7qg7Ep4BljIMo7j78jrEekdHV_eCgo +id: paragraph.field_events +field_name: field_events +entity_type: paragraph +type: entity_reference +settings: + target_type: linkedevents_event +module: core +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_all_events_link.yml b/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_all_events_link.yml new file mode 100644 index 000000000..baa262793 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_all_events_link.yml @@ -0,0 +1,5 @@ +label: 'Kaikki tapahtumat -linkki' +description: "Lisää likki tapahtumat.hel.fi -sivulle. Voit halutessasi tehdä tapahtumakalenterissa haluamasi tapahtumien rajauksen ja kopioida sivun URL-osoitteen.\r\nLisää myös teksti linkille, esimerkiksi. Katso kaikki tapahtumat" +default_value: + - + title: 'Katso kaikki tapahtumat' diff --git a/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_events.yml b/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_events.yml new file mode 100644 index 000000000..65cac6a6e --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.curated_event_list.field_events.yml @@ -0,0 +1,2 @@ +label: Tapahtumat +description: "Valitse tapahtumat, jotka näytetään listassa. Voit hakea tapahtumaa sen nimellä tai tapahtuman ID:llä.\r\n

\r\nLöydät tapahtuman ID:n tapahtumat.hel.fi-sivun osoitteesta: esimerkiksi osoitteessa https://tapahtumat.hel.fi/fi/events/helsinki:agiy4m4ida kohta helsinki:agiy4m4ida on tapahtuman ID.\r\n

\r\nSivulla näytetään kolme ylintä tapahtumaa. Voit järjestää tapahtumia raahaamalla. Vanhentuneet tapahtumat poistuvat sivulta automaattisesti." diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.curated_event_list.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.curated_event_list.yml new file mode 100644 index 000000000..7d8f759d8 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.curated_event_list.yml @@ -0,0 +1,2 @@ +label: 'Kuratoitu tapahtumalista' +description: 'Manuaalisesti ylläpidettävä tapahtumalista tapahtumille Linked Events -rajapinnasta.' diff --git a/conf/cmi/paragraphs.paragraphs_type.curated_event_list.yml b/conf/cmi/paragraphs.paragraphs_type.curated_event_list.yml new file mode 100644 index 000000000..b729b022a --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.curated_event_list.yml @@ -0,0 +1,12 @@ +uuid: 5b0c689e-1733-47ff-ba7c-63923e4f2116 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: OdlftsJm7cyT434X7pj43aSTgKo7t5f7eYxG3ShBimY +id: curated_event_list +label: 'Curated event list' +icon_uuid: null +icon_default: null +description: 'Event list with curated event picks loaded from Linked Events API.' +behavior_plugins: { } diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index fade4de0d..483d64f7e 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -3,7 +3,7 @@ ifeq ($(DRUPAL_CONF_EXISTS),yes) else DRUPAL_NEW_TARGETS := up build drush-si drush-helfi-enable-modules drush-locale-update drush-helfi-locale-import drush-unblock drush-uli endif -DRUPAL_POST_INSTALL_TARGETS := drush-locale-update drush-deploy drush-helfi-locale-import drush-unblock +DRUPAL_POST_INSTALL_TARGETS := drush-deploy drush-locale-update drush-helfi-locale-import drush-unblock OC_LOGIN_TOKEN ?= $(shell bash -c 'read -s -p "You must obtain an API token by visiting https://oauth-openshift.apps.arodevtest.hel.fi/oauth/token/request (Token):" token; echo $$token')