From 69943bb655f387b32cdb9ded2243773f0753e6a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 28 Nov 2024 12:43:42 +0200 Subject: [PATCH 01/23] UHF-10555: Moved the helfi news entity view mode configurations from optional configuration folder to install folder. --- ...rm_display.helfi_news_groups.helfi_news_groups.default.yml | 0 ..._news_neighbourhoods.helfi_news_neighbourhoods.default.yml | 0 ...y_form_display.helfi_news_tags.helfi_news_tags.default.yml | 0 .../core.entity_form_display.paragraph.news_list.default.yml | 0 ...core.entity_view_display.helfi_news.helfi_news.default.yml | 0 ...ntity_view_display.helfi_news.helfi_news.medium_teaser.yml | 0 ...ew_display.helfi_news_groups.helfi_news_groups.default.yml | 0 ..._news_neighbourhoods.helfi_news_neighbourhoods.default.yml | 0 ...y_view_display.helfi_news_tags.helfi_news_tags.default.yml | 0 .../core.entity_view_display.paragraph.news_list.default.yml | 0 .../core.entity_view_mode.helfi_news.medium_teaser.yml | 0 .../helfi_paragraphs_news_list.install | 4 ++-- 12 files changed, 2 insertions(+), 2 deletions(-) rename modules/helfi_paragraphs_news_list/config/{optional => install}/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml (100%) rename modules/helfi_paragraphs_news_list/config/{optional => install}/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml (100%) rename modules/helfi_paragraphs_news_list/config/{optional => install}/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml (100%) rename modules/helfi_paragraphs_news_list/config/{optional => install}/core.entity_form_display.paragraph.news_list.default.yml (100%) rename modules/helfi_paragraphs_news_list/config/{optional => install}/core.entity_view_display.helfi_news.helfi_news.default.yml (100%) rename modules/helfi_paragraphs_news_list/config/{optional => install}/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml (100%) rename modules/helfi_paragraphs_news_list/config/{optional => install}/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml (100%) rename modules/helfi_paragraphs_news_list/config/{optional => install}/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml (100%) rename modules/helfi_paragraphs_news_list/config/{optional => install}/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml (100%) rename modules/helfi_paragraphs_news_list/config/{optional => install}/core.entity_view_display.paragraph.news_list.default.yml (100%) rename modules/helfi_paragraphs_news_list/config/{optional => install}/core.entity_view_mode.helfi_news.medium_teaser.yml (100%) diff --git a/modules/helfi_paragraphs_news_list/config/optional/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml similarity index 100% rename from modules/helfi_paragraphs_news_list/config/optional/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml rename to modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml diff --git a/modules/helfi_paragraphs_news_list/config/optional/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml similarity index 100% rename from modules/helfi_paragraphs_news_list/config/optional/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml rename to modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml diff --git a/modules/helfi_paragraphs_news_list/config/optional/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml similarity index 100% rename from modules/helfi_paragraphs_news_list/config/optional/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml rename to modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml diff --git a/modules/helfi_paragraphs_news_list/config/optional/core.entity_form_display.paragraph.news_list.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.paragraph.news_list.default.yml similarity index 100% rename from modules/helfi_paragraphs_news_list/config/optional/core.entity_form_display.paragraph.news_list.default.yml rename to modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.paragraph.news_list.default.yml diff --git a/modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.helfi_news.helfi_news.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.default.yml similarity index 100% rename from modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.helfi_news.helfi_news.default.yml rename to modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.default.yml diff --git a/modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml similarity index 100% rename from modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml rename to modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml diff --git a/modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml similarity index 100% rename from modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml rename to modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news_groups.helfi_news_groups.default.yml diff --git a/modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml similarity index 100% rename from modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml rename to modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml diff --git a/modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml similarity index 100% rename from modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml rename to modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news_tags.helfi_news_tags.default.yml diff --git a/modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.paragraph.news_list.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.paragraph.news_list.default.yml similarity index 100% rename from modules/helfi_paragraphs_news_list/config/optional/core.entity_view_display.paragraph.news_list.default.yml rename to modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.paragraph.news_list.default.yml diff --git a/modules/helfi_paragraphs_news_list/config/optional/core.entity_view_mode.helfi_news.medium_teaser.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_view_mode.helfi_news.medium_teaser.yml similarity index 100% rename from modules/helfi_paragraphs_news_list/config/optional/core.entity_view_mode.helfi_news.medium_teaser.yml rename to modules/helfi_paragraphs_news_list/config/install/core.entity_view_mode.helfi_news.medium_teaser.yml diff --git a/modules/helfi_paragraphs_news_list/helfi_paragraphs_news_list.install b/modules/helfi_paragraphs_news_list/helfi_paragraphs_news_list.install index ca5eb855b..755e6f684 100644 --- a/modules/helfi_paragraphs_news_list/helfi_paragraphs_news_list.install +++ b/modules/helfi_paragraphs_news_list/helfi_paragraphs_news_list.install @@ -129,9 +129,9 @@ function helfi_paragraphs_news_list_update_9007() : void { } /** - * UHF-8974 Update the translations for the news list paragraph type. + * UHF-10555 Update news list entity view modes. */ -function helfi_paragraphs_news_list_update_9008() : void { +function helfi_paragraphs_news_list_update_9009() : void { \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_paragraphs_news_list'); } From a7972d6d735c7839f2a8b438316cbaab72959039 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 28 Nov 2024 14:53:57 +0200 Subject: [PATCH 02/23] UHF-10555: Update the news_list paragraph configuration to match what the core sites have configured --- ..._display.helfi_news_groups.helfi_news_groups.default.yml | 3 ++- ...ews_neighbourhoods.helfi_news_neighbourhoods.default.yml | 3 ++- ...form_display.helfi_news_tags.helfi_news_tags.default.yml | 3 ++- ...re.entity_view_display.helfi_news.helfi_news.default.yml | 3 +++ ...ity_view_display.helfi_news.helfi_news.medium_teaser.yml | 6 ++++++ 5 files changed, 15 insertions(+), 3 deletions(-) diff --git a/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml index 6665f91a6..d9ffd9f83 100644 --- a/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml +++ b/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_groups.helfi_news_groups.default.yml @@ -19,4 +19,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + tid: true diff --git a/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml index 624a0ef8c..78d45a49e 100644 --- a/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml +++ b/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_neighbourhoods.helfi_news_neighbourhoods.default.yml @@ -19,4 +19,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + tid: true diff --git a/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml index ba0d2a595..08d626b1c 100644 --- a/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml +++ b/modules/helfi_paragraphs_news_list/config/install/core.entity_form_display.helfi_news_tags.helfi_news_tags.default.yml @@ -19,4 +19,5 @@ content: size: 60 placeholder: '' third_party_settings: { } -hidden: { } +hidden: + tid: true diff --git a/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.default.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.default.yml index 7e602a715..4e4cad92a 100644 --- a/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.default.yml +++ b/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.default.yml @@ -21,8 +21,11 @@ content: region: content hidden: groups: true + groups_uuid: true neighbourhoods: true + neighbourhoods_uuid: true node_url: true published_at: true short_title: true tags: true + tags_uuid: true diff --git a/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml b/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml index 1624a7586..6582ebe9b 100644 --- a/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml +++ b/modules/helfi_paragraphs_news_list/config/install/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml @@ -22,5 +22,11 @@ content: region: content hidden: groups: true + groups_uuid: true neighbourhoods: true + neighbourhoods_uuid: true + node_url: true + published_at: true + short_title: true tags: true + tags_uuid: true From 1b282e4df9176cfbbc8e441c88e919a71d2b5bec Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 28 Nov 2024 15:52:59 +0200 Subject: [PATCH 03/23] UHF-10555: Remove deprecated media display image_content_area --- ...display.media.image.image_content_area.yml | 44 ------------------- ...ity_view_mode.media.image_content_area.yml | 11 ----- .../helfi_node_news_item.install | 11 +++-- 3 files changed, 7 insertions(+), 59 deletions(-) delete mode 100644 modules/helfi_node_news_item/config/install/core.entity_view_display.media.image.image_content_area.yml delete mode 100644 modules/helfi_node_news_item/config/install/core.entity_view_mode.media.image_content_area.yml diff --git a/modules/helfi_node_news_item/config/install/core.entity_view_display.media.image.image_content_area.yml b/modules/helfi_node_news_item/config/install/core.entity_view_display.media.image.image_content_area.yml deleted file mode 100644 index 9602a7abb..000000000 --- a/modules/helfi_node_news_item/config/install/core.entity_view_display.media.image.image_content_area.yml +++ /dev/null @@ -1,44 +0,0 @@ -uuid: 8d523472-410f-4d3d-84a1-e404e06fbcb9 -langcode: en -status: true -dependencies: - module: - - responsive_image - enforced: - config: - - core.entity_view_mode.media.image_content_area - - field.field.media.image.field_media_image - - field.field.media.image.field_photographer - - media.type.image - - responsive_image.styles.image__3_2_content_area -id: media.image.image_content_area -targetEntityType: media -bundle: image -mode: image_content_area -content: - field_media_image: - type: responsive_image - label: hidden - settings: - responsive_image_style: image__3_2_content_area - image_link: '' - image_loading: - attribute: eager - third_party_settings: { } - weight: 0 - region: content - field_photographer: - type: string - label: inline - settings: - link_to_entity: false - third_party_settings: { } - weight: 1 - region: content -hidden: - created: true - langcode: true - name: true - search_api_excerpt: true - thumbnail: true - uid: true diff --git a/modules/helfi_node_news_item/config/install/core.entity_view_mode.media.image_content_area.yml b/modules/helfi_node_news_item/config/install/core.entity_view_mode.media.image_content_area.yml deleted file mode 100644 index 606230e09..000000000 --- a/modules/helfi_node_news_item/config/install/core.entity_view_mode.media.image_content_area.yml +++ /dev/null @@ -1,11 +0,0 @@ -uuid: 93710237-c4ff-44cc-b51b-1d7782a3a824 -langcode: en -status: true -dependencies: - module: - - media -id: media.image_content_area -label: 'Image (content area)' -description: '' -targetEntityType: media -cache: true diff --git a/modules/helfi_node_news_item/helfi_node_news_item.install b/modules/helfi_node_news_item/helfi_node_news_item.install index 4a416db09..4fb3701d4 100644 --- a/modules/helfi_node_news_item/helfi_node_news_item.install +++ b/modules/helfi_node_news_item/helfi_node_news_item.install @@ -81,15 +81,18 @@ function helfi_node_news_item_install($is_syncing) : void { } /** - * UHF-10191: Changed news item view displays to use new image styles. + * UHF-10555: Removed references to media display that is no longer used. */ -function helfi_node_news_item_update_9003(): void { +function helfi_node_news_item_update_9005(): void { \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_node_news_item'); } /** - * UHF-10774: Removed. + * UHF-10555: Removed unused media display. */ -function helfi_node_news_item_update_9004(): void { +function helfi_node_news_item_update_9006(): void { + $config_factory = Drupal::configFactory(); + $config_factory->getEditable('media.image_content_area')->delete(); + $config_factory->getEditable('media.image.image_content_area')->delete(); } From 1503c077fb38764b9879c0c1b693b0bc3226df0f Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 28 Nov 2024 15:54:43 +0200 Subject: [PATCH 04/23] UHF-10555: Replace responsive image style gallery_thumbnail dependency with card in hearings paragraph --- ...ity_view_display.helfi_hearings.helfi_hearings.default.yml | 2 +- .../helfi_paragraphs_hearings.install | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/helfi_paragraphs_hearings/config/install/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml b/modules/helfi_paragraphs_hearings/config/install/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml index 482b92a19..b34f16c94 100644 --- a/modules/helfi_paragraphs_hearings/config/install/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml +++ b/modules/helfi_paragraphs_hearings/config/install/core.entity_view_display.helfi_hearings.helfi_hearings.default.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: config: - - responsive_image.styles.gallery_thumbnail + - responsive_image.styles.card module: - external_entities - imagecache_external diff --git a/modules/helfi_paragraphs_hearings/helfi_paragraphs_hearings.install b/modules/helfi_paragraphs_hearings/helfi_paragraphs_hearings.install index 003721459..1940bd9d1 100644 --- a/modules/helfi_paragraphs_hearings/helfi_paragraphs_hearings.install +++ b/modules/helfi_paragraphs_hearings/helfi_paragraphs_hearings.install @@ -6,9 +6,9 @@ */ /** - * UHF-10191: Change the responsive image style used to new one. + * UHF-10555: Import fixed configuration again. */ -function helfi_paragraphs_hearings_update_9001(): void { +function helfi_paragraphs_hearings_update_9002(): void { \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_paragraphs_hearings'); } From 383ebee49cb75f837b2a6856534dfb3135004d83 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 28 Nov 2024 16:02:47 +0200 Subject: [PATCH 05/23] UHF-10555: Fix incorrect names of the image_content_area configuration to be deleted --- modules/helfi_node_news_item/helfi_node_news_item.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/helfi_node_news_item/helfi_node_news_item.install b/modules/helfi_node_news_item/helfi_node_news_item.install index 4fb3701d4..9c6e1d15e 100644 --- a/modules/helfi_node_news_item/helfi_node_news_item.install +++ b/modules/helfi_node_news_item/helfi_node_news_item.install @@ -93,6 +93,6 @@ function helfi_node_news_item_update_9005(): void { */ function helfi_node_news_item_update_9006(): void { $config_factory = Drupal::configFactory(); - $config_factory->getEditable('media.image_content_area')->delete(); - $config_factory->getEditable('media.image.image_content_area')->delete(); + $config_factory->getEditable('core.entity_view_mode.media.image_content_area')->delete(); + $config_factory->getEditable('core.entity_view_display.media.image.image_content_area')->delete(); } From fdbc314529473671011cb693dd03888e1e998408 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Thu, 28 Nov 2024 17:08:06 +0200 Subject: [PATCH 06/23] UHF-10555: Remove references to image__3_2 responsive image style from configuration that had dependencies to it --- ....entity_view_display.media.image.image.yml | 4 +- modules/helfi_media/helfi_media.install | 4 +- ..._view_display.tpr_unit.tpr_unit.teaser.yml | 4 +- ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 118 ++++++++++++++++++ .../helfi_tpr_config/helfi_tpr_config.install | 4 +- 5 files changed, 126 insertions(+), 8 deletions(-) create mode 100644 modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml diff --git a/modules/helfi_media/config/install/core.entity_view_display.media.image.image.yml b/modules/helfi_media/config/install/core.entity_view_display.media.image.image.yml index 12b603694..2fc76d736 100644 --- a/modules/helfi_media/config/install/core.entity_view_display.media.image.image.yml +++ b/modules/helfi_media/config/install/core.entity_view_display.media.image.image.yml @@ -7,7 +7,7 @@ dependencies: - field.field.media.image.field_media_image - field.field.media.image.field_photographer - media.type.image - - responsive_image.styles.image__3_2 + - responsive_image.styles.image_fixed module: - responsive_image id: media.image.image @@ -19,7 +19,7 @@ content: type: responsive_image label: hidden settings: - responsive_image_style: image__3_2 + responsive_image_style: image_fixed image_link: '' image_loading: attribute: eager diff --git a/modules/helfi_media/helfi_media.install b/modules/helfi_media/helfi_media.install index 04ef15a18..a4bf2be27 100644 --- a/modules/helfi_media/helfi_media.install +++ b/modules/helfi_media/helfi_media.install @@ -118,9 +118,9 @@ function helfi_media_update_9013(): void { } /** - * UHF-10239: Add new view mode for Image media type. + * UHF-10555: Remove references to deprecated responsive image styles. */ -function helfi_media_update_9016(): void { +function helfi_media_update_9017(): void { // Re-import 'helfi_media' configuration. \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_media'); diff --git a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml index 1e5e923bb..6a29801ec 100644 --- a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml +++ b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml @@ -10,7 +10,7 @@ dependencies: - field.field.tpr_unit.tpr_unit.field_phone_label - field.field.tpr_unit.tpr_unit.field_phone_with_contacts - field.field.tpr_unit.tpr_unit.field_unit_type - - responsive_image.styles.image__3_2 + - responsive_image.styles.card module: - address - helfi_tpr @@ -48,7 +48,7 @@ content: label: hidden settings: imagecache_external_link: '' - imagecache_external_responsive_style: image__3_2 + imagecache_external_responsive_style: card third_party_settings: { } weight: 0 region: content diff --git a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml new file mode 100644 index 000000000..dcae831a6 --- /dev/null +++ b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml @@ -0,0 +1,118 @@ +uuid: fd9accf5-a552-4c97-baa2-43d66e9dbcea +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.tpr_unit.wide_teaser + - field.field.tpr_unit.tpr_unit.field_content + - field.field.tpr_unit.tpr_unit.field_districts + - field.field.tpr_unit.tpr_unit.field_lower_content + - field.field.tpr_unit.tpr_unit.field_metatags + - field.field.tpr_unit.tpr_unit.field_phone_label + - field.field.tpr_unit.tpr_unit.field_phone_with_contacts + - field.field.tpr_unit.tpr_unit.field_unit_type + - responsive_image.styles.card + module: + - address + - helfi_tpr + - imagecache_external + - telephone +id: tpr_unit.tpr_unit.wide_teaser +targetEntityType: tpr_unit +bundle: tpr_unit +mode: wide_teaser +content: + address: + type: address_plain + label: hidden + settings: { } + third_party_settings: { } + weight: 4 + region: content + name: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 2 + region: content + name_override: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 3 + region: content + opening_hours: + type: tpr_connection + label: hidden + settings: { } + third_party_settings: { } + weight: 6 + region: content + phone: + type: telephone_link + label: hidden + settings: + title: '' + third_party_settings: { } + weight: 5 + region: content + picture_url: + type: imagecache_external_responsive_image + label: hidden + settings: + imagecache_external_link: '' + imagecache_external_responsive_style: card + third_party_settings: { } + weight: 0 + region: content + picture_url_override: + type: entity_reference_entity_view + label: hidden + settings: + view_mode: image + link: false + third_party_settings: { } + weight: 1 + region: content +hidden: + accessibility_email: true + accessibility_phone: true + accessibility_sentences: true + accessibility_www: true + address_postal: true + call_charge_info: true + contacts: true + created: true + description: true + email: true + enrich_description: true + field_content: true + field_districts: true + field_lower_content: true + field_metatags: true + field_phone_label: true + field_phone_with_contacts: true + field_unit_type: true + hide_description: true + highlights: true + langcode: true + latitude: true + links: true + longitude: true + other_info: true + price_info: true + provided_languages: true + search_api_excerpt: true + service_map_embed: true + services: true + show_www: true + streetview_entrance_url: true + subgroup: true + toc_enabled: true + topical: true + unit_picture_caption: true + www: true diff --git a/modules/helfi_tpr_config/helfi_tpr_config.install b/modules/helfi_tpr_config/helfi_tpr_config.install index 39e3e139a..a3eb0c8c4 100644 --- a/modules/helfi_tpr_config/helfi_tpr_config.install +++ b/modules/helfi_tpr_config/helfi_tpr_config.install @@ -389,9 +389,9 @@ function helfi_tpr_config_update_9069(): void { } /** - * UHF-9509 Add "Unit contact card" to paragraphs library. + * UHF-9509 Change unit teaser and wide_teaser image style. */ -function helfi_tpr_config_update_9070(): void { +function helfi_tpr_config_update_9071(): void { \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_tpr_config'); } From f1c075f7bcfda28f8747fa6d417800566faba2d6 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 29 Nov 2024 15:25:14 +0200 Subject: [PATCH 07/23] UHF-10555: Move the image_content_area media display removal to a place where it works in all instances --- helfi_platform_config.install | 13 +++++++++++++ .../helfi_node_news_item.install | 9 --------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/helfi_platform_config.install b/helfi_platform_config.install index cbcc2e3e3..892581ee7 100644 --- a/helfi_platform_config.install +++ b/helfi_platform_config.install @@ -202,3 +202,16 @@ function helfi_platform_config_update_9313() : void { $module_installer->install(['helfi_paragraphs_curated_event_list']); } } + +/** + * UHF-10555: Removed unused media display. + */ +function helfi_platform_config_update_9314(): void { + // We need to remove some unused configuration that has swum to all instances + // but is now part of helfi_node_news_item module. The module is not on in + // all instances so that is why the configuration is removed here. + $config_factory = Drupal::configFactory(); + $config_factory->getEditable('core.entity_view_mode.media.image_content_area')->delete(); + $config_factory->getEditable('core.entity_view_display.media.image.image_content_area')->delete(); +} + diff --git a/modules/helfi_node_news_item/helfi_node_news_item.install b/modules/helfi_node_news_item/helfi_node_news_item.install index 9c6e1d15e..0ac130cc3 100644 --- a/modules/helfi_node_news_item/helfi_node_news_item.install +++ b/modules/helfi_node_news_item/helfi_node_news_item.install @@ -87,12 +87,3 @@ function helfi_node_news_item_update_9005(): void { \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_node_news_item'); } - -/** - * UHF-10555: Removed unused media display. - */ -function helfi_node_news_item_update_9006(): void { - $config_factory = Drupal::configFactory(); - $config_factory->getEditable('core.entity_view_mode.media.image_content_area')->delete(); - $config_factory->getEditable('core.entity_view_display.media.image.image_content_area')->delete(); -} From f378acd1c424bba3a544107704d2eb7ce0e652e0 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 29 Nov 2024 16:15:51 +0200 Subject: [PATCH 08/23] UHF-10555: Fix PHPCS --- helfi_platform_config.install | 1 - 1 file changed, 1 deletion(-) diff --git a/helfi_platform_config.install b/helfi_platform_config.install index 892581ee7..cbd2c6cd0 100644 --- a/helfi_platform_config.install +++ b/helfi_platform_config.install @@ -214,4 +214,3 @@ function helfi_platform_config_update_9314(): void { $config_factory->getEditable('core.entity_view_mode.media.image_content_area')->delete(); $config_factory->getEditable('core.entity_view_display.media.image.image_content_area')->delete(); } - From 52ac5ba976e4b629c6589caf68ddf0a4561e2635 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Fri, 29 Nov 2024 17:31:58 +0200 Subject: [PATCH 09/23] UHF-10555: Remove hero__background responsive image style and image styles used in it --- .../config/install/image.style.23_10_l.yml | 17 ---- .../config/install/image.style.23_10_l_2x.yml | 24 ------ .../config/install/image.style.23_10_m.yml | 17 ---- .../config/install/image.style.23_10_m_2x.yml | 24 ------ .../config/install/image.style.23_10_s.yml | 17 ---- .../config/install/image.style.23_10_s_2x.yml | 24 ------ .../config/install/image.style.23_10_xl.yml | 17 ---- .../install/image.style.23_10_xl_2x.yml | 24 ------ .../config/install/image.style.23_10_xs.yml | 17 ---- .../install/image.style.23_10_xs_2x.yml | 24 ------ .../config/install/image.style.23_10_xxs.yml | 17 ---- .../install/image.style.23_10_xxs_2x.yml | 24 ------ ...sponsive_image.styles.hero__background.yml | 82 ------------------- .../helfi_image_styles.install | 21 +++++ 14 files changed, 21 insertions(+), 328 deletions(-) delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_l.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_l_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_m.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_m_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_s.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_s_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_xl.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_xl_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_xs.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_xs_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_xxs.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.23_10_xxs_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/responsive_image.styles.hero__background.yml diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_l.yml b/modules/helfi_image_styles/config/install/image.style.23_10_l.yml deleted file mode 100644 index c642f0e93..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_l.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: d7f264d1-74b6-4816-a9a8-470b0574f379 -langcode: en -status: true -dependencies: - module: - - focal_point -name: 23_10_l -label: 'DEPRECATED 2.3:1 L' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1440 - height: 626 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_l_2x.yml b/modules/helfi_image_styles/config/install/image.style.23_10_l_2x.yml deleted file mode 100644 index a0aba7313..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_l_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 4115e6ae-6bbb-40b8-b58a-334e0177cfa9 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 23_10_l_2x -label: 'DEPRECATED 2.3:1 L (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2880 - height: 1252 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_m.yml b/modules/helfi_image_styles/config/install/image.style.23_10_m.yml deleted file mode 100644 index 9e34512d3..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_m.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 2d802400-59b0-48d1-9b34-63c4e53469f5 -langcode: en -status: true -dependencies: - module: - - focal_point -name: 23_10_m -label: 'DEPRECATED 2.3:1 M' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1024 - height: 445 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_m_2x.yml b/modules/helfi_image_styles/config/install/image.style.23_10_m_2x.yml deleted file mode 100644 index 0c416a66d..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_m_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: e7725f84-82a6-4c10-aa39-8614c489a929 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 23_10_m_2x -label: 'DEPRECATED 2.3:1 M (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2048 - height: 890 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_s.yml b/modules/helfi_image_styles/config/install/image.style.23_10_s.yml deleted file mode 100644 index d40b60c62..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_s.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 68cebaef-2e0c-439d-b275-9c6ae5f885a6 -langcode: en -status: true -dependencies: - module: - - focal_point -name: 23_10_s -label: 'DEPRECATED 2.3:1 S' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 800 - height: 348 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_s_2x.yml b/modules/helfi_image_styles/config/install/image.style.23_10_s_2x.yml deleted file mode 100644 index 491218bd5..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_s_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 42c4666a-983f-4127-b631-e153bf7b53e5 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 23_10_s_2x -label: 'DEPRECATED 2.3:1 S (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1600 - height: 696 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_xl.yml b/modules/helfi_image_styles/config/install/image.style.23_10_xl.yml deleted file mode 100644 index 4845a48d9..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_xl.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 65fad2b3-964a-410b-a75a-ba735d216db3 -langcode: en -status: true -dependencies: - module: - - focal_point -name: 23_10_xl -label: 'DEPRECATED 2.3:1 XL' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1920 - height: 835 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_xl_2x.yml b/modules/helfi_image_styles/config/install/image.style.23_10_xl_2x.yml deleted file mode 100644 index 21d9743be..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_xl_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 7cb80437-6366-4ea9-995a-7f2829e4f6d0 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 23_10_xl_2x -label: 'DEPRECATED 2.3:1 XL (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 3840 - height: 1670 - crop_type: focal_point - 4b95d242-03d3-43e7-b80b-80d660ed0a26: - uuid: 4b95d242-03d3-43e7-b80b-80d660ed0a26 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_xs.yml b/modules/helfi_image_styles/config/install/image.style.23_10_xs.yml deleted file mode 100644 index 83e82463e..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_xs.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: da7bf3e9-0043-4713-8f31-7d2c35d6228d -langcode: en -status: true -dependencies: - module: - - focal_point -name: 23_10_xs -label: 'DEPRECATED 2.3:1 XS' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 600 - height: 261 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_xs_2x.yml b/modules/helfi_image_styles/config/install/image.style.23_10_xs_2x.yml deleted file mode 100644 index f6dafa7b8..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_xs_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: c8cdfe28-13e3-4f28-a58c-08477d1e7d39 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 23_10_xs_2x -label: 'DEPRECATED 2.3:1 XS (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1200 - height: 522 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_xxs.yml b/modules/helfi_image_styles/config/install/image.style.23_10_xxs.yml deleted file mode 100644 index 3d4ae8b01..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_xxs.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: a357c995-1ba7-4dd4-93ef-0fc36b1c0667 -langcode: en -status: true -dependencies: - module: - - focal_point -name: 23_10_xxs -label: 'DEPRECATED 2.3:1 XXS' -effects: - 6e091026-4f44-46e3-a4ac-aef3e6e3571b: - uuid: 6e091026-4f44-46e3-a4ac-aef3e6e3571b - id: focal_point_scale_and_crop - weight: 1 - data: - width: 320 - height: 139 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.23_10_xxs_2x.yml b/modules/helfi_image_styles/config/install/image.style.23_10_xxs_2x.yml deleted file mode 100644 index d5d2ed218..000000000 --- a/modules/helfi_image_styles/config/install/image.style.23_10_xxs_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 07c225a7-4fc4-4198-88b9-46c6850725b5 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 23_10_xxs_2x -label: 'DEPRECATED 2.3:1 XXS (2X)' -effects: - a9f4372f-0393-406a-b2e9-c388fd1374f1: - uuid: a9f4372f-0393-406a-b2e9-c388fd1374f1 - id: focal_point_scale_and_crop - weight: 1 - data: - width: 640 - height: 278 - crop_type: focal_point - 6c4d1aca-1b29-495e-8d33-cf39504feb5a: - uuid: 6c4d1aca-1b29-495e-8d33-cf39504feb5a - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/responsive_image.styles.hero__background.yml b/modules/helfi_image_styles/config/install/responsive_image.styles.hero__background.yml deleted file mode 100644 index 1ac8d3bba..000000000 --- a/modules/helfi_image_styles/config/install/responsive_image.styles.hero__background.yml +++ /dev/null @@ -1,82 +0,0 @@ -uuid: b0391e84-4c00-494e-8dc1-b7ccddb9a57b -langcode: en -status: true -dependencies: - config: - - image.style.23_10_l - - image.style.23_10_l_2x - - image.style.23_10_m - - image.style.23_10_m_2x - - image.style.23_10_s - - image.style.23_10_s_2x - - image.style.23_10_xl - - image.style.23_10_xl_2x - - image.style.23_10_xs - - image.style.23_10_xs_2x - module: - - helfi_image_styles -id: hero__background -label: 'DEPRECATED Hero Background' -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: 23_10_xl - breakpoint_id: helfi_image_styles.xl - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_xl_2x - breakpoint_id: helfi_image_styles.xl - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 23_10_l - breakpoint_id: helfi_image_styles.l - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_l_2x - breakpoint_id: helfi_image_styles.l - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 23_10_m - breakpoint_id: helfi_image_styles.m - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_m_2x - breakpoint_id: helfi_image_styles.m - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 23_10_s - breakpoint_id: helfi_image_styles.s - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_s_2x - breakpoint_id: helfi_image_styles.s - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 23_10_xs - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_xs - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 23_10_xs_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 23_10_xs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: 23_10_m diff --git a/modules/helfi_image_styles/helfi_image_styles.install b/modules/helfi_image_styles/helfi_image_styles.install index 9d48fa73e..ce5ce3df9 100644 --- a/modules/helfi_image_styles/helfi_image_styles.install +++ b/modules/helfi_image_styles/helfi_image_styles.install @@ -22,3 +22,24 @@ function helfi_image_styles_update_9004(): void { \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_image_styles'); } + +/** + * UHF-10555: Removed deprecated responsive image style and associated image + * styles. + */ +function helfi_image_styles_update_9005(): void { + $config_factory = Drupal::configFactory(); + $config_factory->getEditable('responsive_image.styles.hero__background')->delete(); + $config_factory->getEditable('image.style.23_10_l')->delete(); + $config_factory->getEditable('image.style.23_10_l_2x')->delete(); + $config_factory->getEditable('image.style.23_10_m')->delete(); + $config_factory->getEditable('image.style.23_10_m_2x')->delete(); + $config_factory->getEditable('image.style.23_10_s')->delete(); + $config_factory->getEditable('image.style.23_10_s_2x')->delete(); + $config_factory->getEditable('image.style.23_10_xl')->delete(); + $config_factory->getEditable('image.style.23_10_xl_2x')->delete(); + $config_factory->getEditable('image.style.23_10_xs')->delete(); + $config_factory->getEditable('image.style.23_10_xs_2x')->delete(); + $config_factory->getEditable('image.style.23_10_xxs')->delete(); + $config_factory->getEditable('image.style.23_10_xxs_2x')->delete(); +} From 70bdb82687fe991b51f081a9d124a9c198e391ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 2 Dec 2024 08:43:58 +0200 Subject: [PATCH 10/23] UHF-10555: Fixed phpcs. --- modules/helfi_image_styles/helfi_image_styles.install | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/modules/helfi_image_styles/helfi_image_styles.install b/modules/helfi_image_styles/helfi_image_styles.install index ce5ce3df9..6ba6e156f 100644 --- a/modules/helfi_image_styles/helfi_image_styles.install +++ b/modules/helfi_image_styles/helfi_image_styles.install @@ -7,14 +7,6 @@ declare(strict_types=1); -/** - * UHF-10191 Add new image styles. - */ -function helfi_image_styles_update_9002(): void { - \Drupal::service('helfi_platform_config.config_update_helper') - ->update('helfi_image_styles'); -} - /** * UHF-10239 Adds new image styles used by image gallery. */ @@ -24,8 +16,7 @@ function helfi_image_styles_update_9004(): void { } /** - * UHF-10555: Removed deprecated responsive image style and associated image - * styles. + * UHF-10555: Removed deprecated image styles. */ function helfi_image_styles_update_9005(): void { $config_factory = Drupal::configFactory(); From 4c2e8335b945b29f43c4c3d7e329dd894a4a58fd Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 2 Dec 2024 11:51:07 +0200 Subject: [PATCH 11/23] UHF-10555: Remove gallery_thumbnail responsive image style and associated image styles --- .../install/image.style.1_1_thumbnail.yml | 17 ---------- .../install/image.style.1_1_thumbnail_2x.yml | 24 ------------- ...ponsive_image.styles.gallery_thumbnail.yml | 34 ------------------- .../helfi_image_styles.install | 7 ++-- 4 files changed, 5 insertions(+), 77 deletions(-) delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_thumbnail.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_thumbnail_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/responsive_image.styles.gallery_thumbnail.yml diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_thumbnail.yml b/modules/helfi_image_styles/config/install/image.style.1_1_thumbnail.yml deleted file mode 100644 index f4bc10cc8..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_thumbnail.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 18ef4120-b1e9-45cb-bded-9ce9267e40fe -langcode: en -status: true -dependencies: - module: - - focal_point -name: 1_1_thumbnail -label: 'DEPRECATED 1:1 thumbnail' -effects: - 281cebc2-0471-44f8-a46c-4111298d4398: - uuid: 281cebc2-0471-44f8-a46c-4111298d4398 - id: focal_point_scale_and_crop - weight: 1 - data: - width: 180 - height: 180 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_thumbnail_2x.yml b/modules/helfi_image_styles/config/install/image.style.1_1_thumbnail_2x.yml deleted file mode 100644 index a607ba720..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_thumbnail_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 4634300d-2cd2-4ff9-80dc-00a537f8704b -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 1_1_thumbnail_2x -label: 'DEPRECATED 1:1 thumbnail (2x)' -effects: - bbeb2baa-6c3e-4865-a1e4-c7e35f9fa4eb: - uuid: bbeb2baa-6c3e-4865-a1e4-c7e35f9fa4eb - id: focal_point_scale_and_crop - weight: 1 - data: - width: 360 - height: 360 - crop_type: focal_point - b101e3cd-1bc6-421f-9148-b989422d754e: - uuid: b101e3cd-1bc6-421f-9148-b989422d754e - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/responsive_image.styles.gallery_thumbnail.yml b/modules/helfi_image_styles/config/install/responsive_image.styles.gallery_thumbnail.yml deleted file mode 100644 index e04ad0490..000000000 --- a/modules/helfi_image_styles/config/install/responsive_image.styles.gallery_thumbnail.yml +++ /dev/null @@ -1,34 +0,0 @@ -uuid: 7baf798e-fe0d-4106-8046-1fe1ef595886 -langcode: en -status: true -dependencies: - config: - - image.style.1_1_thumbnail - - image.style.1_1_thumbnail_2x - module: - - helfi_image_styles -id: gallery_thumbnail -label: 'DEPRECATED Gallery thumbnail' -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: 1_1_thumbnail - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 1_1_thumbnail - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 1_1_thumbnail_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 1_1_thumbnail_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: 1_1_thumbnail diff --git a/modules/helfi_image_styles/helfi_image_styles.install b/modules/helfi_image_styles/helfi_image_styles.install index ce5ce3df9..3836a418a 100644 --- a/modules/helfi_image_styles/helfi_image_styles.install +++ b/modules/helfi_image_styles/helfi_image_styles.install @@ -24,12 +24,13 @@ function helfi_image_styles_update_9004(): void { } /** - * UHF-10555: Removed deprecated responsive image style and associated image + * UHF-10555: Removed deprecated responsive image styles and associated image * styles. */ -function helfi_image_styles_update_9005(): void { +function helfi_image_styles_update_9007(): void { $config_factory = Drupal::configFactory(); $config_factory->getEditable('responsive_image.styles.hero__background')->delete(); + $config_factory->getEditable('responsive_image.styles.gallery_thumbnail')->delete(); $config_factory->getEditable('image.style.23_10_l')->delete(); $config_factory->getEditable('image.style.23_10_l_2x')->delete(); $config_factory->getEditable('image.style.23_10_m')->delete(); @@ -42,4 +43,6 @@ function helfi_image_styles_update_9005(): void { $config_factory->getEditable('image.style.23_10_xs_2x')->delete(); $config_factory->getEditable('image.style.23_10_xxs')->delete(); $config_factory->getEditable('image.style.23_10_xxs_2x')->delete(); + $config_factory->getEditable('image.style.1_1_thumbnail')->delete(); + $config_factory->getEditable('image.style.1_1_thumbnail_2x')->delete(); } From 4faff6f075a2b0bff583e67b6cc7d6aae1b998f2 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 2 Dec 2024 12:47:55 +0200 Subject: [PATCH 12/23] UHF-10555: Fix the PHPCS again --- modules/helfi_image_styles/helfi_image_styles.install | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/helfi_image_styles/helfi_image_styles.install b/modules/helfi_image_styles/helfi_image_styles.install index f334f1204..6dd3eb12d 100644 --- a/modules/helfi_image_styles/helfi_image_styles.install +++ b/modules/helfi_image_styles/helfi_image_styles.install @@ -16,8 +16,7 @@ function helfi_image_styles_update_9004(): void { } /** - * UHF-10555: Removed deprecated responsive image styles and associated image - * styles. + * UHF-10555: Removed deprecated image styles. */ function helfi_image_styles_update_9005(): void { $config_factory = Drupal::configFactory(); From 0218f1355e2facde6629e1fab91526d4f11cab94 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 2 Dec 2024 14:47:56 +0200 Subject: [PATCH 13/23] UHF-10555: Remove unused tpr_unit.wide_teaser display --- ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 118 ------------------ .../helfi_tpr_config/helfi_tpr_config.install | 8 ++ 2 files changed, 8 insertions(+), 118 deletions(-) delete mode 100644 modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml diff --git a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml deleted file mode 100644 index dcae831a6..000000000 --- a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml +++ /dev/null @@ -1,118 +0,0 @@ -uuid: fd9accf5-a552-4c97-baa2-43d66e9dbcea -langcode: en -status: true -dependencies: - config: - - core.entity_view_mode.tpr_unit.wide_teaser - - field.field.tpr_unit.tpr_unit.field_content - - field.field.tpr_unit.tpr_unit.field_districts - - field.field.tpr_unit.tpr_unit.field_lower_content - - field.field.tpr_unit.tpr_unit.field_metatags - - field.field.tpr_unit.tpr_unit.field_phone_label - - field.field.tpr_unit.tpr_unit.field_phone_with_contacts - - field.field.tpr_unit.tpr_unit.field_unit_type - - responsive_image.styles.card - module: - - address - - helfi_tpr - - imagecache_external - - telephone -id: tpr_unit.tpr_unit.wide_teaser -targetEntityType: tpr_unit -bundle: tpr_unit -mode: wide_teaser -content: - address: - type: address_plain - label: hidden - settings: { } - third_party_settings: { } - weight: 4 - region: content - name: - type: string - label: hidden - settings: - link_to_entity: false - third_party_settings: { } - weight: 2 - region: content - name_override: - type: string - label: hidden - settings: - link_to_entity: false - third_party_settings: { } - weight: 3 - region: content - opening_hours: - type: tpr_connection - label: hidden - settings: { } - third_party_settings: { } - weight: 6 - region: content - phone: - type: telephone_link - label: hidden - settings: - title: '' - third_party_settings: { } - weight: 5 - region: content - picture_url: - type: imagecache_external_responsive_image - label: hidden - settings: - imagecache_external_link: '' - imagecache_external_responsive_style: card - third_party_settings: { } - weight: 0 - region: content - picture_url_override: - type: entity_reference_entity_view - label: hidden - settings: - view_mode: image - link: false - third_party_settings: { } - weight: 1 - region: content -hidden: - accessibility_email: true - accessibility_phone: true - accessibility_sentences: true - accessibility_www: true - address_postal: true - call_charge_info: true - contacts: true - created: true - description: true - email: true - enrich_description: true - field_content: true - field_districts: true - field_lower_content: true - field_metatags: true - field_phone_label: true - field_phone_with_contacts: true - field_unit_type: true - hide_description: true - highlights: true - langcode: true - latitude: true - links: true - longitude: true - other_info: true - price_info: true - provided_languages: true - search_api_excerpt: true - service_map_embed: true - services: true - show_www: true - streetview_entrance_url: true - subgroup: true - toc_enabled: true - topical: true - unit_picture_caption: true - www: true diff --git a/modules/helfi_tpr_config/helfi_tpr_config.install b/modules/helfi_tpr_config/helfi_tpr_config.install index a3eb0c8c4..5b5fb1c59 100644 --- a/modules/helfi_tpr_config/helfi_tpr_config.install +++ b/modules/helfi_tpr_config/helfi_tpr_config.install @@ -395,3 +395,11 @@ function helfi_tpr_config_update_9071(): void { \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_tpr_config'); } + +/** + * UHF-10555: Removed unused TPR-unit display. + */ +function helfi_tpr_config_update_9072(): void { + $config_factory = Drupal::configFactory(); + $config_factory->getEditable('core.entity_view_display.tpr_unit.tpr_unit.wide_teaser')->delete(); +} From 84b51c3fafdf141c0b14959a9de791e05a8df95d Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 2 Dec 2024 17:44:08 +0200 Subject: [PATCH 14/23] UHF-10555: Remove list_of_links__thumbnail responsive image style and associated image styles --- .../config/install/image.style.1_1_l.yml | 17 ------- .../config/install/image.style.1_1_l_2x.yml | 24 ---------- .../config/install/image.style.1_1_m.yml | 17 ------- .../config/install/image.style.1_1_m_2x.yml | 24 ---------- .../config/install/image.style.1_1_s.yml | 17 ------- .../config/install/image.style.1_1_s_2x.yml | 24 ---------- .../config/install/image.style.1_1_xl.yml | 17 ------- .../config/install/image.style.1_1_xl_2x.yml | 24 ---------- .../config/install/image.style.1_1_xs.yml | 17 ------- .../config/install/image.style.1_1_xs_2x.yml | 24 ---------- ..._image.styles.list_of_links__thumbnail.yml | 46 ------------------- .../helfi_image_styles.install | 11 +++++ 12 files changed, 11 insertions(+), 251 deletions(-) delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_l.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_l_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_m.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_m_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_s.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_s_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_xl.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_xl_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_xs.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.1_1_xs_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/responsive_image.styles.list_of_links__thumbnail.yml diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_l.yml b/modules/helfi_image_styles/config/install/image.style.1_1_l.yml deleted file mode 100644 index 25e9007a6..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_l.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 903dc7cf-a0ac-4bf8-aa5d-209cd2bba650 -langcode: en -status: true -dependencies: - module: - - focal_point -name: 1_1_l -label: 'DEPRECATED 1:1 L' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1440 - height: 1440 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_l_2x.yml b/modules/helfi_image_styles/config/install/image.style.1_1_l_2x.yml deleted file mode 100644 index 9dbc1e59d..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_l_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 42562539-22b4-4e07-ba46-7c558084d5cf -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 1_1_l_2x -label: 'DEPRECATED 1:1 L (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2880 - height: 2880 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_m.yml b/modules/helfi_image_styles/config/install/image.style.1_1_m.yml deleted file mode 100644 index d54e0a9de..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_m.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 12cc9639-cbcd-4efb-894c-570f935ae5cc -langcode: en -status: true -dependencies: - module: - - focal_point -name: 1_1_m -label: 'DEPRECATED 1:1 M' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1024 - height: 1024 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_m_2x.yml b/modules/helfi_image_styles/config/install/image.style.1_1_m_2x.yml deleted file mode 100644 index 7ebd2d686..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_m_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: b558561b-a069-423b-b7a4-9a5f740f5fd2 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 1_1_m_2x -label: 'DEPRECATED 1:1 M (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2048 - height: 2048 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_s.yml b/modules/helfi_image_styles/config/install/image.style.1_1_s.yml deleted file mode 100644 index e77254622..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_s.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 8a3f202c-0656-457b-88cc-c50ff5e9a4a8 -langcode: en -status: true -dependencies: - module: - - focal_point -name: 1_1_s -label: 'DEPRECATED 1:1 S' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 800 - height: 800 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_s_2x.yml b/modules/helfi_image_styles/config/install/image.style.1_1_s_2x.yml deleted file mode 100644 index 17bb4739f..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_s_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 287a2865-693d-4653-908c-0661563a700c -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 1_1_s_2x -label: 'DEPRECATED 1:1 S (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1600 - height: 1600 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_xl.yml b/modules/helfi_image_styles/config/install/image.style.1_1_xl.yml deleted file mode 100644 index 165c65e04..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_xl.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 56362b42-9cff-4f83-b645-2ab9cbca2e12 -langcode: en -status: true -dependencies: - module: - - focal_point -name: 1_1_xl -label: 'DEPRECATED 1:1 XL' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1920 - height: 1920 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_xl_2x.yml b/modules/helfi_image_styles/config/install/image.style.1_1_xl_2x.yml deleted file mode 100644 index e93f712d6..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_xl_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 2a42814f-347c-44b0-a3fc-1b4a8e2661aa -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 1_1_xl_2x -label: 'DEPRECATED 1:1 XL (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 3840 - height: 3840 - crop_type: focal_point - 4b95d242-03d3-43e7-b80b-80d660ed0a26: - uuid: 4b95d242-03d3-43e7-b80b-80d660ed0a26 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_xs.yml b/modules/helfi_image_styles/config/install/image.style.1_1_xs.yml deleted file mode 100644 index 74793548b..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_xs.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 2c25db07-e066-413d-9a96-719a145a1b1b -langcode: en -status: true -dependencies: - module: - - focal_point -name: 1_1_xs -label: 'DEPRECATED 1:1 XS' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 600 - height: 600 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.1_1_xs_2x.yml b/modules/helfi_image_styles/config/install/image.style.1_1_xs_2x.yml deleted file mode 100644 index 41b20b70c..000000000 --- a/modules/helfi_image_styles/config/install/image.style.1_1_xs_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 960d128c-e31e-48aa-9107-0e90122abfe1 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 1_1_xs_2x -label: 'DEPRECATED 1:1 XS (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1200 - height: 1200 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/responsive_image.styles.list_of_links__thumbnail.yml b/modules/helfi_image_styles/config/install/responsive_image.styles.list_of_links__thumbnail.yml deleted file mode 100644 index a10b9cc00..000000000 --- a/modules/helfi_image_styles/config/install/responsive_image.styles.list_of_links__thumbnail.yml +++ /dev/null @@ -1,46 +0,0 @@ -uuid: fc534aac-1c04-4dbb-b438-32f916dc3bb4 -langcode: en -status: true -dependencies: - config: - - image.style.1_1_s - - image.style.1_1_s_2x - - image.style.1_1_xs - - image.style.1_1_xs_2x - module: - - helfi_image_styles -id: list_of_links__thumbnail -label: 'DEPRECATED List of Links Thumbnail' -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: 1_1_s - breakpoint_id: helfi_image_styles.s - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 1_1_s_2x - breakpoint_id: helfi_image_styles.s - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 1_1_xs - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 1_1_xs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 1_1_xs_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 1_1_xs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: 1_1_s diff --git a/modules/helfi_image_styles/helfi_image_styles.install b/modules/helfi_image_styles/helfi_image_styles.install index 6dd3eb12d..bf1849c51 100644 --- a/modules/helfi_image_styles/helfi_image_styles.install +++ b/modules/helfi_image_styles/helfi_image_styles.install @@ -22,6 +22,7 @@ function helfi_image_styles_update_9005(): void { $config_factory = Drupal::configFactory(); $config_factory->getEditable('responsive_image.styles.hero__background')->delete(); $config_factory->getEditable('responsive_image.styles.gallery_thumbnail')->delete(); + $config_factory->getEditable('responsive_image.styles.list_of_links__thumbnail')->delete(); $config_factory->getEditable('image.style.23_10_l')->delete(); $config_factory->getEditable('image.style.23_10_l_2x')->delete(); $config_factory->getEditable('image.style.23_10_m')->delete(); @@ -36,4 +37,14 @@ function helfi_image_styles_update_9005(): void { $config_factory->getEditable('image.style.23_10_xxs_2x')->delete(); $config_factory->getEditable('image.style.1_1_thumbnail')->delete(); $config_factory->getEditable('image.style.1_1_thumbnail_2x')->delete(); + $config_factory->getEditable('image.style.1_1_l')->delete(); + $config_factory->getEditable('image.style.1_1_l_2x')->delete(); + $config_factory->getEditable('image.style.1_1_m')->delete(); + $config_factory->getEditable('image.style.1_1_m_2x')->delete(); + $config_factory->getEditable('image.style.1_1_s')->delete(); + $config_factory->getEditable('image.style.1_1_s_2x')->delete(); + $config_factory->getEditable('image.style.1_1_xl')->delete(); + $config_factory->getEditable('image.style.1_1_xl_2x')->delete(); + $config_factory->getEditable('image.style.1_1_xs')->delete(); + $config_factory->getEditable('image.style.1_1_xs_2x')->delete(); } From 3f26fc6b803022b1fb7f5ffe16eaf33abbac5a9a Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 2 Dec 2024 18:35:31 +0200 Subject: [PATCH 15/23] UHF-10555: Remove original responsive image style and associated image styles --- .../config/install/image.style.original_l.yml | 15 ---- .../install/image.style.original_l_2x.yml | 23 ------ .../config/install/image.style.original_m.yml | 15 ---- .../install/image.style.original_m_2x.yml | 23 ------ .../config/install/image.style.original_s.yml | 15 ---- .../install/image.style.original_s_2x.yml | 23 ------ .../install/image.style.original_xs.yml | 15 ---- .../install/image.style.original_xs_2x.yml | 23 ------ .../install/image.style.original_xxs.yml | 15 ---- .../install/image.style.original_xxs_2x.yml | 23 ------ .../responsive_image.styles.original.yml | 72 ------------------- .../helfi_image_styles.install | 11 +++ 12 files changed, 11 insertions(+), 262 deletions(-) delete mode 100644 modules/helfi_image_styles/config/install/image.style.original_l.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.original_l_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.original_m.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.original_m_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.original_s.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.original_s_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.original_xs.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.original_xs_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.original_xxs.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.original_xxs_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/responsive_image.styles.original.yml diff --git a/modules/helfi_image_styles/config/install/image.style.original_l.yml b/modules/helfi_image_styles/config/install/image.style.original_l.yml deleted file mode 100644 index e56d75f8d..000000000 --- a/modules/helfi_image_styles/config/install/image.style.original_l.yml +++ /dev/null @@ -1,15 +0,0 @@ -uuid: feab3776-d8dc-4d6e-aa3a-994192c42e9e -langcode: en -status: true -dependencies: { } -name: original_l -label: 'DEPRECATED Original L' -effects: - 0c465a35-1ef2-4e25-b6a9-30b461a5f89d: - uuid: 0c465a35-1ef2-4e25-b6a9-30b461a5f89d - id: image_scale - weight: 1 - data: - width: 1200 - height: null - upscale: true diff --git a/modules/helfi_image_styles/config/install/image.style.original_l_2x.yml b/modules/helfi_image_styles/config/install/image.style.original_l_2x.yml deleted file mode 100644 index 2a2667650..000000000 --- a/modules/helfi_image_styles/config/install/image.style.original_l_2x.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: f6c3893f-7108-44e2-ab6d-db68fc9e5fd4 -langcode: en -status: true -dependencies: - module: - - image_style_quality -name: original_l_2x -label: 'DEPRECATED Original L (2x)' -effects: - 0249bded-7547-49ab-b241-4d6f8b6973f6: - uuid: 0249bded-7547-49ab-b241-4d6f8b6973f6 - id: image_scale - weight: 1 - data: - width: 2400 - height: null - upscale: true - b80b3bcc-ae09-4126-8c1d-af47b9390cf8: - uuid: b80b3bcc-ae09-4126-8c1d-af47b9390cf8 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.original_m.yml b/modules/helfi_image_styles/config/install/image.style.original_m.yml deleted file mode 100644 index c3de2d806..000000000 --- a/modules/helfi_image_styles/config/install/image.style.original_m.yml +++ /dev/null @@ -1,15 +0,0 @@ -uuid: abb5c976-5706-498d-afed-d43804bf4a35 -langcode: en -status: true -dependencies: { } -name: original_m -label: 'DEPRECATED Original M' -effects: - d223a0ce-9eaa-472d-89ef-d1d82b407a66: - uuid: d223a0ce-9eaa-472d-89ef-d1d82b407a66 - id: image_scale - weight: 1 - data: - width: 943 - height: null - upscale: true diff --git a/modules/helfi_image_styles/config/install/image.style.original_m_2x.yml b/modules/helfi_image_styles/config/install/image.style.original_m_2x.yml deleted file mode 100644 index 93d259b87..000000000 --- a/modules/helfi_image_styles/config/install/image.style.original_m_2x.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 5d23e949-2b8a-4293-a963-602c95129219 -langcode: en -status: true -dependencies: - module: - - image_style_quality -name: original_m_2x -label: 'DEPRECATED Original M (2x)' -effects: - 030a8bc9-6a90-44d4-b920-691c51ace740: - uuid: 030a8bc9-6a90-44d4-b920-691c51ace740 - id: image_scale - weight: 1 - data: - width: 1886 - height: null - upscale: true - 02e23d47-dd80-431b-a22e-a9799489208e: - uuid: 02e23d47-dd80-431b-a22e-a9799489208e - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.original_s.yml b/modules/helfi_image_styles/config/install/image.style.original_s.yml deleted file mode 100644 index cba6c0778..000000000 --- a/modules/helfi_image_styles/config/install/image.style.original_s.yml +++ /dev/null @@ -1,15 +0,0 @@ -uuid: bed0bf95-b2fa-4f0e-9c23-b332e46351d8 -langcode: en -status: true -dependencies: { } -name: original_s -label: 'DEPRECATED Original S' -effects: - 409c7a0a-40f8-4f01-a20d-28fce5e24ed1: - uuid: 409c7a0a-40f8-4f01-a20d-28fce5e24ed1 - id: image_scale - weight: 1 - data: - width: 768 - height: null - upscale: true diff --git a/modules/helfi_image_styles/config/install/image.style.original_s_2x.yml b/modules/helfi_image_styles/config/install/image.style.original_s_2x.yml deleted file mode 100644 index 2636f2a58..000000000 --- a/modules/helfi_image_styles/config/install/image.style.original_s_2x.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 1cd01845-a2da-4b39-a6ec-0bc16c7200e7 -langcode: en -status: true -dependencies: - module: - - image_style_quality -name: original_s_2x -label: 'DEPRECATED Original S (2x)' -effects: - 4a8a2af8-c602-444e-9d0d-9ae25bdc428a: - uuid: 4a8a2af8-c602-444e-9d0d-9ae25bdc428a - id: image_scale - weight: 1 - data: - width: 1535 - height: null - upscale: true - 9dc8ae09-bca0-4c20-81ce-3324078d1084: - uuid: 9dc8ae09-bca0-4c20-81ce-3324078d1084 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.original_xs.yml b/modules/helfi_image_styles/config/install/image.style.original_xs.yml deleted file mode 100644 index adefd0473..000000000 --- a/modules/helfi_image_styles/config/install/image.style.original_xs.yml +++ /dev/null @@ -1,15 +0,0 @@ -uuid: 37b6e8c1-da10-452b-8e50-5d40047ed5b2 -langcode: en -status: true -dependencies: { } -name: original_xs -label: 'DEPRECATED Original XS' -effects: - 41feb5a7-5a5f-432f-a6f4-ef53ae096713: - uuid: 41feb5a7-5a5f-432f-a6f4-ef53ae096713 - id: image_scale - weight: 1 - data: - width: 576 - height: null - upscale: true diff --git a/modules/helfi_image_styles/config/install/image.style.original_xs_2x.yml b/modules/helfi_image_styles/config/install/image.style.original_xs_2x.yml deleted file mode 100644 index 301d33c61..000000000 --- a/modules/helfi_image_styles/config/install/image.style.original_xs_2x.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 09c02759-d49c-4fa7-af13-168860ad6688 -langcode: en -status: true -dependencies: - module: - - image_style_quality -name: original_xs_2x -label: 'DEPRECATED Original XS (2x)' -effects: - a3a2adef-0ea9-4dc0-93bc-f9e1bb2a2545: - uuid: a3a2adef-0ea9-4dc0-93bc-f9e1bb2a2545 - id: image_scale - weight: 1 - data: - width: 1152 - height: null - upscale: true - 1d56f6dd-eff0-4213-95ea-6304b0dddb20: - uuid: 1d56f6dd-eff0-4213-95ea-6304b0dddb20 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.original_xxs.yml b/modules/helfi_image_styles/config/install/image.style.original_xxs.yml deleted file mode 100644 index c062a5b63..000000000 --- a/modules/helfi_image_styles/config/install/image.style.original_xxs.yml +++ /dev/null @@ -1,15 +0,0 @@ -uuid: 442f173e-28ae-49f2-8644-9c453ed403e0 -langcode: en -status: true -dependencies: { } -name: original_xxs -label: 'DEPRECATED Original XXS' -effects: - 414ab756-ad1e-443d-9818-065d764efefc: - uuid: 414ab756-ad1e-443d-9818-065d764efefc - id: image_scale - weight: 1 - data: - width: 320 - height: null - upscale: true diff --git a/modules/helfi_image_styles/config/install/image.style.original_xxs_2x.yml b/modules/helfi_image_styles/config/install/image.style.original_xxs_2x.yml deleted file mode 100644 index d7631e2cd..000000000 --- a/modules/helfi_image_styles/config/install/image.style.original_xxs_2x.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 0a5e8aaa-865a-470e-ad39-5eef092e376c -langcode: en -status: true -dependencies: - module: - - image_style_quality -name: original_xxs_2x -label: 'DEPRECATED Original XXS (2x)' -effects: - c96a6172-5713-4b5c-ab12-fe821d715ddb: - uuid: c96a6172-5713-4b5c-ab12-fe821d715ddb - id: image_scale - weight: 1 - data: - width: 640 - height: null - upscale: true - ad88bb2e-9122-43b0-aa76-8b8a463e8a27: - uuid: ad88bb2e-9122-43b0-aa76-8b8a463e8a27 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/responsive_image.styles.original.yml b/modules/helfi_image_styles/config/install/responsive_image.styles.original.yml deleted file mode 100644 index ffe31e7a3..000000000 --- a/modules/helfi_image_styles/config/install/responsive_image.styles.original.yml +++ /dev/null @@ -1,72 +0,0 @@ -uuid: bcf4e304-2c65-47c5-b95f-69ae2f933a9c -langcode: en -status: true -dependencies: - config: - - image.style.original_l - - image.style.original_l_2x - - image.style.original_m - - image.style.original_m_2x - - image.style.original_s - - image.style.original_s_2x - - image.style.original_xs - - image.style.original_xs_2x - - image.style.original_xxs - - image.style.original_xxs_2x - module: - - helfi_image_styles -id: original -label: "DEPRECATED Original" -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: original_l - breakpoint_id: helfi_image_styles.l - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: original_l_2x - breakpoint_id: helfi_image_styles.l - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: original_m - breakpoint_id: helfi_image_styles.m - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: original_m_2x - breakpoint_id: helfi_image_styles.m - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: original_s - breakpoint_id: helfi_image_styles.s - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: original_s_2x - breakpoint_id: helfi_image_styles.s - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: original_xs - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: original_xxs - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: original_xs_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: original_xxs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: original_l diff --git a/modules/helfi_image_styles/helfi_image_styles.install b/modules/helfi_image_styles/helfi_image_styles.install index bf1849c51..ac5f024a2 100644 --- a/modules/helfi_image_styles/helfi_image_styles.install +++ b/modules/helfi_image_styles/helfi_image_styles.install @@ -23,6 +23,7 @@ function helfi_image_styles_update_9005(): void { $config_factory->getEditable('responsive_image.styles.hero__background')->delete(); $config_factory->getEditable('responsive_image.styles.gallery_thumbnail')->delete(); $config_factory->getEditable('responsive_image.styles.list_of_links__thumbnail')->delete(); + $config_factory->getEditable('responsive_image.styles.original')->delete(); $config_factory->getEditable('image.style.23_10_l')->delete(); $config_factory->getEditable('image.style.23_10_l_2x')->delete(); $config_factory->getEditable('image.style.23_10_m')->delete(); @@ -47,4 +48,14 @@ function helfi_image_styles_update_9005(): void { $config_factory->getEditable('image.style.1_1_xl_2x')->delete(); $config_factory->getEditable('image.style.1_1_xs')->delete(); $config_factory->getEditable('image.style.1_1_xs_2x')->delete(); + $config_factory->getEditable('image.style.original_l')->delete(); + $config_factory->getEditable('image.style.original_l_2x')->delete(); + $config_factory->getEditable('image.style.original_m')->delete(); + $config_factory->getEditable('image.style.original_m_2x')->delete(); + $config_factory->getEditable('image.style.original_s')->delete(); + $config_factory->getEditable('image.style.original_s_2x')->delete(); + $config_factory->getEditable('image.style.original_xs')->delete(); + $config_factory->getEditable('image.style.original_xs_2x')->delete(); + $config_factory->getEditable('image.style.original_xxs')->delete(); + $config_factory->getEditable('image.style.original_xxs_2x')->delete(); } From 465048065ae62bf2870fe13d49d863230657bb05 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 2 Dec 2024 18:51:18 +0200 Subject: [PATCH 16/23] UHF-10555: Remove deprecated og_image image style --- modules/helfi_image_styles/helfi_image_styles.install | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/helfi_image_styles/helfi_image_styles.install b/modules/helfi_image_styles/helfi_image_styles.install index ac5f024a2..d6de897c5 100644 --- a/modules/helfi_image_styles/helfi_image_styles.install +++ b/modules/helfi_image_styles/helfi_image_styles.install @@ -58,4 +58,5 @@ function helfi_image_styles_update_9005(): void { $config_factory->getEditable('image.style.original_xs_2x')->delete(); $config_factory->getEditable('image.style.original_xxs')->delete(); $config_factory->getEditable('image.style.original_xxs_2x')->delete(); + $config_factory->getEditable('image.style.og_image')->delete(); } From 0dc1dd3936a9550ff6c5d1d9550f1fc85e19f1c2 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 2 Dec 2024 18:51:41 +0200 Subject: [PATCH 17/23] UHF-10555: Remove deprecated og_image image style configuration --- .../config/install/image.style.og_image.yml | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 modules/helfi_image_styles/config/install/image.style.og_image.yml diff --git a/modules/helfi_image_styles/config/install/image.style.og_image.yml b/modules/helfi_image_styles/config/install/image.style.og_image.yml deleted file mode 100644 index 34e3a0fa9..000000000 --- a/modules/helfi_image_styles/config/install/image.style.og_image.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 0e797a63-db8d-4cbf-81e8-7ea14cce0c86 -langcode: en -status: true -dependencies: - module: - - focal_point -name: og_image -label: 'DEPRECATED OG Image' -effects: - 828a0b3f-55e7-4534-9248-c3e02c1fd93c: - uuid: 828a0b3f-55e7-4534-9248-c3e02c1fd93c - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1200 - height: 630 - crop_type: focal_point From 84592520fd73497bc4e9aae5f909c258027f9b70 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Mon, 2 Dec 2024 18:52:59 +0200 Subject: [PATCH 18/23] UHF-10555: Remove deprecated tiny_square_image image style and configuration --- .../install/image.style.tiny_square_image.yml | 17 ----------------- .../helfi_image_styles.install | 1 + 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 modules/helfi_image_styles/config/install/image.style.tiny_square_image.yml diff --git a/modules/helfi_image_styles/config/install/image.style.tiny_square_image.yml b/modules/helfi_image_styles/config/install/image.style.tiny_square_image.yml deleted file mode 100644 index a394a4550..000000000 --- a/modules/helfi_image_styles/config/install/image.style.tiny_square_image.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: a4aea86c-1f7c-4e6d-b61d-54db8196f799 -langcode: en -status: true -dependencies: - module: - - focal_point -name: tiny_square_image -label: 'DEPRECATED Tiny Square Image (200x200)' -effects: - c3a0bc95-5d64-4f1e-a46e-dd25f6787fd7: - uuid: c3a0bc95-5d64-4f1e-a46e-dd25f6787fd7 - id: focal_point_scale_and_crop - weight: 1 - data: - width: 200 - height: 200 - crop_type: focal_point diff --git a/modules/helfi_image_styles/helfi_image_styles.install b/modules/helfi_image_styles/helfi_image_styles.install index d6de897c5..df28124c1 100644 --- a/modules/helfi_image_styles/helfi_image_styles.install +++ b/modules/helfi_image_styles/helfi_image_styles.install @@ -59,4 +59,5 @@ function helfi_image_styles_update_9005(): void { $config_factory->getEditable('image.style.original_xxs')->delete(); $config_factory->getEditable('image.style.original_xxs_2x')->delete(); $config_factory->getEditable('image.style.og_image')->delete(); + $config_factory->getEditable('image.style.tiny_square_image')->delete(); } From d31a1b71fc3ad7077023a54ae83a2ee5a6466427 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Tue, 3 Dec 2024 16:47:51 +0200 Subject: [PATCH 19/23] UHF-10555: Remove deprecated image__3_2 and image_3_2_content_area responsive image styles and related image styles and their configuration --- .../config/install/image.style.3_2_l.yml | 17 ----- .../config/install/image.style.3_2_l_2x.yml | 24 ------- .../config/install/image.style.3_2_m.yml | 17 ----- .../config/install/image.style.3_2_m_2x.yml | 24 ------- .../config/install/image.style.3_2_s.yml | 17 ----- .../config/install/image.style.3_2_s_2x.yml | 24 ------- .../config/install/image.style.3_2_xl.yml | 17 ----- .../config/install/image.style.3_2_xl_2x.yml | 24 ------- .../config/install/image.style.3_2_xs.yml | 17 ----- .../config/install/image.style.3_2_xs_2x.yml | 24 ------- .../config/install/image.style.3_2_xxs.yml | 17 ----- .../config/install/image.style.3_2_xxs_2x.yml | 24 ------- .../responsive_image.styles.image__3_2.yml | 72 ------------------- ...e_image.styles.image__3_2_content_area.yml | 60 ---------------- .../helfi_image_styles.install | 14 ++++ 15 files changed, 14 insertions(+), 378 deletions(-) delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_l.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_l_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_m.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_m_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_s.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_s_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_xl.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_xl_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_xs.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_xs_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_xxs.yml delete mode 100644 modules/helfi_image_styles/config/install/image.style.3_2_xxs_2x.yml delete mode 100644 modules/helfi_image_styles/config/install/responsive_image.styles.image__3_2.yml delete mode 100644 modules/helfi_image_styles/config/install/responsive_image.styles.image__3_2_content_area.yml diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_l.yml b/modules/helfi_image_styles/config/install/image.style.3_2_l.yml deleted file mode 100644 index 0a195ea84..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_l.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 72eba44f-aa0a-407a-848a-1da8e4c96c0d -langcode: en -status: true -dependencies: - module: - - focal_point -name: 3_2_l -label: 'DEPRECATED 3:2 L' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1440 - height: 960 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_l_2x.yml b/modules/helfi_image_styles/config/install/image.style.3_2_l_2x.yml deleted file mode 100644 index 8b5bda7d9..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_l_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 5712deb4-f768-440a-8349-8105d9a13e78 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 3_2_l_2x -label: 'DEPRECATED 3:2 L (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2880 - height: 1920 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_m.yml b/modules/helfi_image_styles/config/install/image.style.3_2_m.yml deleted file mode 100644 index be4bae704..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_m.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: bbeb2864-1f7f-4b65-bb40-ee0c3ad708e2 -langcode: en -status: true -dependencies: - module: - - focal_point -name: 3_2_m -label: 'DEPRECATED 3:2 M' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1024 - height: 683 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_m_2x.yml b/modules/helfi_image_styles/config/install/image.style.3_2_m_2x.yml deleted file mode 100644 index bad4b8e69..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_m_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 797f790d-1e25-4b59-bbb0-9311b1e2b6e7 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 3_2_m_2x -label: 'DEPRECATED 3:2 M (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 2048 - height: 1366 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_s.yml b/modules/helfi_image_styles/config/install/image.style.3_2_s.yml deleted file mode 100644 index 7bd3cf0a6..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_s.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 9aa0bb5a-d98d-4e67-b000-01a752dcb5be -langcode: en -status: true -dependencies: - module: - - focal_point -name: 3_2_s -label: 'DEPRECATED 3:2 S' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 800 - height: 533 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_s_2x.yml b/modules/helfi_image_styles/config/install/image.style.3_2_s_2x.yml deleted file mode 100644 index 9bf6a8acb..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_s_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: cba7c5a0-9bb4-4af7-8983-2d14eaa303bd -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 3_2_s_2x -label: 'DEPRECATED 3:2 S (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1600 - height: 1066 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_xl.yml b/modules/helfi_image_styles/config/install/image.style.3_2_xl.yml deleted file mode 100644 index a05ba0174..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_xl.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 851afe7e-dc6d-4350-805b-73e8fd1005c3 -langcode: en -status: true -dependencies: - module: - - focal_point -name: 3_2_xl -label: 'DEPRECATED 3:2 XL' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1920 - height: 1280 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_xl_2x.yml b/modules/helfi_image_styles/config/install/image.style.3_2_xl_2x.yml deleted file mode 100644 index c5062ba7f..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_xl_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: cedb22ef-f824-4ac8-989b-50a4112a4e62 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 3_2_xl_2x -label: 'DEPRECATED 3:2 XL (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 3840 - height: 2560 - crop_type: focal_point - 4b95d242-03d3-43e7-b80b-80d660ed0a26: - uuid: 4b95d242-03d3-43e7-b80b-80d660ed0a26 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_xs.yml b/modules/helfi_image_styles/config/install/image.style.3_2_xs.yml deleted file mode 100644 index abfac57a3..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_xs.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: f4f9a857-685d-4883-a924-a57ea245acea -langcode: en -status: true -dependencies: - module: - - focal_point -name: 3_2_xs -label: 'DEPRECATED 3:2 XS' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 600 - height: 400 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_xs_2x.yml b/modules/helfi_image_styles/config/install/image.style.3_2_xs_2x.yml deleted file mode 100644 index dd8e000b4..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_xs_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 1ef22301-81ca-45b3-b595-b2bd31bc0093 -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 3_2_xs_2x -label: 'DEPRECATED 3:2 XS (2x)' -effects: - e7da735e-aa35-463b-b99a-b61aba89a53f: - uuid: e7da735e-aa35-463b-b99a-b61aba89a53f - id: focal_point_scale_and_crop - weight: 1 - data: - width: 1200 - height: 800 - crop_type: focal_point - a9ed654a-a81b-4bfb-8f0e-0ca3188de581: - uuid: a9ed654a-a81b-4bfb-8f0e-0ca3188de581 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_xxs.yml b/modules/helfi_image_styles/config/install/image.style.3_2_xxs.yml deleted file mode 100644 index 49547c05d..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_xxs.yml +++ /dev/null @@ -1,17 +0,0 @@ -uuid: 77628eb9-3d62-4f5c-90ef-fe634cbdb9b5 -langcode: en -status: true -dependencies: - module: - - focal_point -name: 3_2_xxs -label: 'DEPRECATED 3:2 XXS' -effects: - 6bc1f53e-970d-4a85-a1a0-c41af5f5834b: - uuid: 6bc1f53e-970d-4a85-a1a0-c41af5f5834b - id: focal_point_scale_and_crop - weight: 1 - data: - width: 320 - height: 213 - crop_type: focal_point diff --git a/modules/helfi_image_styles/config/install/image.style.3_2_xxs_2x.yml b/modules/helfi_image_styles/config/install/image.style.3_2_xxs_2x.yml deleted file mode 100644 index 2c71420f3..000000000 --- a/modules/helfi_image_styles/config/install/image.style.3_2_xxs_2x.yml +++ /dev/null @@ -1,24 +0,0 @@ -uuid: 6eeb3e8d-fcee-4dcb-ac63-17a90335a6aa -langcode: en -status: true -dependencies: - module: - - focal_point - - image_style_quality -name: 3_2_xxs_2x -label: 'DEPRECATED 3:2 XXS (2x)' -effects: - 04ed67a0-ed4c-4b01-b5be-cee1205f62d8: - uuid: 04ed67a0-ed4c-4b01-b5be-cee1205f62d8 - id: focal_point_scale_and_crop - weight: 1 - data: - width: 640 - height: 427 - crop_type: focal_point - e7aa43d0-465e-4fd2-b3bd-c5cfa976bdd0: - uuid: e7aa43d0-465e-4fd2-b3bd-c5cfa976bdd0 - id: image_style_quality - weight: 2 - data: - quality: 65 diff --git a/modules/helfi_image_styles/config/install/responsive_image.styles.image__3_2.yml b/modules/helfi_image_styles/config/install/responsive_image.styles.image__3_2.yml deleted file mode 100644 index 4a55990a2..000000000 --- a/modules/helfi_image_styles/config/install/responsive_image.styles.image__3_2.yml +++ /dev/null @@ -1,72 +0,0 @@ -uuid: 8443f7a6-b2c1-46d7-aa18-be4b51056cd2 -langcode: en -status: true -dependencies: - config: - - image.style.3_2_l - - image.style.3_2_l_2x - - image.style.3_2_m - - image.style.3_2_m_2x - - image.style.3_2_s - - image.style.3_2_s_2x - - image.style.3_2_xs - - image.style.3_2_xs_2x - - image.style.3_2_xxs - - image.style.3_2_xxs_2x - module: - - helfi_image_styles -id: image__3_2 -label: 'DEPRECATED Image 3:2' -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: 3_2_l - breakpoint_id: helfi_image_styles.l - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_l_2x - breakpoint_id: helfi_image_styles.l - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_m - breakpoint_id: helfi_image_styles.m - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_m_2x - breakpoint_id: helfi_image_styles.m - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_s - breakpoint_id: helfi_image_styles.s - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_s_2x - breakpoint_id: helfi_image_styles.s - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_xs - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_xxs - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_xs_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_xxs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: 3_2_m diff --git a/modules/helfi_image_styles/config/install/responsive_image.styles.image__3_2_content_area.yml b/modules/helfi_image_styles/config/install/responsive_image.styles.image__3_2_content_area.yml deleted file mode 100644 index f4c21afb9..000000000 --- a/modules/helfi_image_styles/config/install/responsive_image.styles.image__3_2_content_area.yml +++ /dev/null @@ -1,60 +0,0 @@ -uuid: dd6a5062-ad08-4036-9065-6bf90a7cab3f -langcode: en -status: true -dependencies: - config: - - image.style.3_2_m - - image.style.3_2_m_2x - - image.style.3_2_s - - image.style.3_2_s_2x - - image.style.3_2_xs - - image.style.3_2_xs_2x - - image.style.3_2_xxs - - image.style.3_2_xxs_2x - module: - - helfi_image_styles -id: image__3_2_content_area -label: 'DEPRECATED Image 3:2 (content area)' -image_style_mappings: - - - image_mapping_type: image_style - image_mapping: 3_2_m - breakpoint_id: helfi_image_styles.m - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_m_2x - breakpoint_id: helfi_image_styles.m - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_s - breakpoint_id: helfi_image_styles.s - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_s_2x - breakpoint_id: helfi_image_styles.s - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_xs - breakpoint_id: helfi_image_styles.xs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_xxs - breakpoint_id: helfi_image_styles.xxs - multiplier: 1x - - - image_mapping_type: image_style - image_mapping: 3_2_xs_2x - breakpoint_id: helfi_image_styles.xs - multiplier: 2x - - - image_mapping_type: image_style - image_mapping: 3_2_xxs_2x - breakpoint_id: helfi_image_styles.xxs - multiplier: 2x -breakpoint_group: helfi_image_styles -fallback_image_style: 3_2_m diff --git a/modules/helfi_image_styles/helfi_image_styles.install b/modules/helfi_image_styles/helfi_image_styles.install index df28124c1..3baffd5ba 100644 --- a/modules/helfi_image_styles/helfi_image_styles.install +++ b/modules/helfi_image_styles/helfi_image_styles.install @@ -24,6 +24,8 @@ function helfi_image_styles_update_9005(): void { $config_factory->getEditable('responsive_image.styles.gallery_thumbnail')->delete(); $config_factory->getEditable('responsive_image.styles.list_of_links__thumbnail')->delete(); $config_factory->getEditable('responsive_image.styles.original')->delete(); + $config_factory->getEditable('responsive_image.styles.image__3_2')->delete(); + $config_factory->getEditable('responsive_image.styles.image__3_2_content_area')->delete(); $config_factory->getEditable('image.style.23_10_l')->delete(); $config_factory->getEditable('image.style.23_10_l_2x')->delete(); $config_factory->getEditable('image.style.23_10_m')->delete(); @@ -60,4 +62,16 @@ function helfi_image_styles_update_9005(): void { $config_factory->getEditable('image.style.original_xxs_2x')->delete(); $config_factory->getEditable('image.style.og_image')->delete(); $config_factory->getEditable('image.style.tiny_square_image')->delete(); + $config_factory->getEditable('image.style.3_2_l')->delete(); + $config_factory->getEditable('image.style.3_2_l_2x')->delete(); + $config_factory->getEditable('image.style.3_2_m')->delete(); + $config_factory->getEditable('image.style.3_2_m_2x')->delete(); + $config_factory->getEditable('image.style.3_2_s')->delete(); + $config_factory->getEditable('image.style.3_2_s_2x')->delete(); + $config_factory->getEditable('image.style.3_2_xl')->delete(); + $config_factory->getEditable('image.style.3_2_xl_2x')->delete(); + $config_factory->getEditable('image.style.3_2_xs')->delete(); + $config_factory->getEditable('image.style.3_2_xs_2x')->delete(); + $config_factory->getEditable('image.style.3_2_xxs')->delete(); + $config_factory->getEditable('image.style.3_2_xxs_2x')->delete(); } From 722c0bab833f1588fddafd8b81c695f871e3fe74 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Tue, 3 Dec 2024 17:09:30 +0200 Subject: [PATCH 20/23] UHF-10555: Fix the PHPCS again --- helfi_platform_config.install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helfi_platform_config.install b/helfi_platform_config.install index 27b8d4772..9aa37628e 100644 --- a/helfi_platform_config.install +++ b/helfi_platform_config.install @@ -217,7 +217,7 @@ function helfi_platform_config_update_9314() : void { } /** -* UHF-10555: Removed unused media display. + * UHF-10555: Removed unused media display. */ function helfi_platform_config_update_9315(): void { // We need to remove some unused configuration that has swum to all instances From ce3029b944c3e0a67f9f3967c9d7a990cbe31ebf Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Tue, 3 Dec 2024 17:53:25 +0200 Subject: [PATCH 21/23] UHF-10555: Add the tpr_unit.wide_teaser back since it is unclear if it is still used --- ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml diff --git a/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml new file mode 100644 index 000000000..72aae5145 --- /dev/null +++ b/modules/helfi_tpr_config/config/install/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml @@ -0,0 +1,116 @@ +uuid: fd9accf5-a552-4c97-baa2-43d66e9dbcea +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.tpr_unit.wide_teaser + - field.field.tpr_unit.tpr_unit.field_content + - field.field.tpr_unit.tpr_unit.field_lower_content + - field.field.tpr_unit.tpr_unit.field_metatags + - field.field.tpr_unit.tpr_unit.field_phone_label + - field.field.tpr_unit.tpr_unit.field_phone_with_contacts + - field.field.tpr_unit.tpr_unit.field_unit_type + - responsive_image.styles.card + module: + - address + - helfi_tpr + - imagecache_external + - telephone +id: tpr_unit.tpr_unit.wide_teaser +targetEntityType: tpr_unit +bundle: tpr_unit +mode: wide_teaser +content: + address: + type: address_plain + label: hidden + settings: { } + third_party_settings: { } + weight: 4 + region: content + name: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 2 + region: content + name_override: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 3 + region: content + opening_hours: + type: tpr_connection + label: hidden + settings: { } + third_party_settings: { } + weight: 6 + region: content + phone: + type: telephone_link + label: hidden + settings: + title: '' + third_party_settings: { } + weight: 5 + region: content + picture_url: + type: imagecache_external_responsive_image + label: hidden + settings: + imagecache_external_link: '' + imagecache_external_responsive_style: card + third_party_settings: { } + weight: 0 + region: content + picture_url_override: + type: entity_reference_entity_view + label: hidden + settings: + view_mode: image + link: false + third_party_settings: { } + weight: 1 + region: content +hidden: + accessibility_email: true + accessibility_phone: true + accessibility_sentences: true + accessibility_www: true + address_postal: true + call_charge_info: true + contacts: true + created: true + description: true + email: true + enrich_description: true + field_content: true + field_lower_content: true + field_metatags: true + field_phone_label: true + field_phone_with_contacts: true + field_unit_type: true + hide_description: true + highlights: true + langcode: true + latitude: true + links: true + longitude: true + other_info: true + price_info: true + provided_languages: true + search_api_excerpt: true + service_map_embed: true + services: true + show_www: true + streetview_entrance_url: true + subgroup: true + toc_enabled: true + topical: true + unit_picture_caption: true + www: true From 163acb22a86502a48dad560a670661b127c575f0 Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Tue, 3 Dec 2024 18:00:37 +0200 Subject: [PATCH 22/23] UHF-10555: Change the update hook to update configuration instead of removing the wide_teaser --- modules/helfi_tpr_config/helfi_tpr_config.install | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/modules/helfi_tpr_config/helfi_tpr_config.install b/modules/helfi_tpr_config/helfi_tpr_config.install index 5b5fb1c59..d97e467d0 100644 --- a/modules/helfi_tpr_config/helfi_tpr_config.install +++ b/modules/helfi_tpr_config/helfi_tpr_config.install @@ -389,17 +389,9 @@ function helfi_tpr_config_update_9069(): void { } /** - * UHF-9509 Change unit teaser and wide_teaser image style. + * UHF-10555: Update TPR Unit wide teaser display. */ -function helfi_tpr_config_update_9071(): void { +function helfi_tpr_config_update_9072(): void { \Drupal::service('helfi_platform_config.config_update_helper') ->update('helfi_tpr_config'); } - -/** - * UHF-10555: Removed unused TPR-unit display. - */ -function helfi_tpr_config_update_9072(): void { - $config_factory = Drupal::configFactory(); - $config_factory->getEditable('core.entity_view_display.tpr_unit.tpr_unit.wide_teaser')->delete(); -} From f7fd8e4474194bca1f7d74f7d15f2357f5b6c66f Mon Sep 17 00:00:00 2001 From: Tero Elonen Date: Wed, 4 Dec 2024 12:17:49 +0200 Subject: [PATCH 23/23] UHF-10555: Add missing configuration for wide_teaser --- .../core.entity_view_mode.tpr_unit.wide_teaser.yml | 11 +++++++++++ modules/helfi_tpr_config/helfi_tpr_config.install | 8 -------- 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 modules/helfi_tpr_config/config/install/core.entity_view_mode.tpr_unit.wide_teaser.yml diff --git a/modules/helfi_tpr_config/config/install/core.entity_view_mode.tpr_unit.wide_teaser.yml b/modules/helfi_tpr_config/config/install/core.entity_view_mode.tpr_unit.wide_teaser.yml new file mode 100644 index 000000000..5d3c7a505 --- /dev/null +++ b/modules/helfi_tpr_config/config/install/core.entity_view_mode.tpr_unit.wide_teaser.yml @@ -0,0 +1,11 @@ +uuid: de6e541f-0a28-4a0f-ad67-cca1564b5946 +langcode: en +status: true +dependencies: + module: + - helfi_tpr +id: tpr_unit.wide_teaser +label: 'Wide Teaser' +description: '' +targetEntityType: tpr_unit +cache: true diff --git a/modules/helfi_tpr_config/helfi_tpr_config.install b/modules/helfi_tpr_config/helfi_tpr_config.install index d97e467d0..d4ecf610b 100644 --- a/modules/helfi_tpr_config/helfi_tpr_config.install +++ b/modules/helfi_tpr_config/helfi_tpr_config.install @@ -380,14 +380,6 @@ function helfi_tpr_config_update_9052() : void { ->update('helfi_tpr_config'); } -/** - * UHF-9101 Add "Unit contact card" to standard page and landing page. - */ -function helfi_tpr_config_update_9069(): void { - \Drupal::service('helfi_platform_config.config_update_helper') - ->update('helfi_tpr_config'); -} - /** * UHF-10555: Update TPR Unit wide teaser display. */