From 520427e9f402bfae31a4f3782be87cd1182ed767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 14 Mar 2024 22:26:09 +0200 Subject: [PATCH 1/3] UHF-9755: Added helfi_kymp_config module and enabled it. Converted helfi_kymp specific customizations to use the rewrite-module. --- conf/cmi/core.extension.yml | 1 + .../rewrite/language/fi/views.view.news.yml | 7 ++++ .../rewrite/language/sv/views.view.news.yml | 12 +++++++ .../paragraphs.paragraphs_type.text.yml | 1 + .../helfi_kymp_config.info.yml | 5 +++ .../helfi_kymp_config.module | 33 +++++++++++++++++++ 6 files changed, 59 insertions(+) create mode 100644 public/modules/custom/helfi_kymp_config/config/rewrite/language/fi/views.view.news.yml create mode 100644 public/modules/custom/helfi_kymp_config/config/rewrite/language/sv/views.view.news.yml create mode 100644 public/modules/custom/helfi_kymp_config/config/rewrite/paragraphs.paragraphs_type.text.yml create mode 100644 public/modules/custom/helfi_kymp_config/helfi_kymp_config.info.yml create mode 100644 public/modules/custom/helfi_kymp_config/helfi_kymp_config.module diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 9801cf011..740e88986 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -49,6 +49,7 @@ module: helfi_eu_cookie_compliance: 0 helfi_global_announcement: 0 helfi_image_styles: 0 + helfi_kymp_config: 0 helfi_kymp_content: 0 helfi_kymp_migrations: 0 helfi_kymp_plans: 0 diff --git a/public/modules/custom/helfi_kymp_config/config/rewrite/language/fi/views.view.news.yml b/public/modules/custom/helfi_kymp_config/config/rewrite/language/fi/views.view.news.yml new file mode 100644 index 000000000..98bf78d39 --- /dev/null +++ b/public/modules/custom/helfi_kymp_config/config/rewrite/language/fi/views.view.news.yml @@ -0,0 +1,7 @@ +display: + latest_news: + display_title: 'Uusimmat uutiset' + display_options: + title: 'Uusimmat uutiset' + use_more_text: 'Katso kaikki uutiset' + link_url: /uutiset diff --git a/public/modules/custom/helfi_kymp_config/config/rewrite/language/sv/views.view.news.yml b/public/modules/custom/helfi_kymp_config/config/rewrite/language/sv/views.view.news.yml new file mode 100644 index 000000000..c4dae761f --- /dev/null +++ b/public/modules/custom/helfi_kymp_config/config/rewrite/language/sv/views.view.news.yml @@ -0,0 +1,12 @@ +display: + default: + display_options: + exposed_form: + options: + submit_button: Verkställ + latest_news: + display_title: 'Senaste nyheterna' + display_options: + title: 'Senaste nyheterna' + use_more_text: 'Se alla nyheter' + link_url: /nyheter diff --git a/public/modules/custom/helfi_kymp_config/config/rewrite/paragraphs.paragraphs_type.text.yml b/public/modules/custom/helfi_kymp_config/config/rewrite/paragraphs.paragraphs_type.text.yml new file mode 100644 index 000000000..50db51661 --- /dev/null +++ b/public/modules/custom/helfi_kymp_config/config/rewrite/paragraphs.paragraphs_type.text.yml @@ -0,0 +1 @@ +label: 'Text (supported in other languages)' diff --git a/public/modules/custom/helfi_kymp_config/helfi_kymp_config.info.yml b/public/modules/custom/helfi_kymp_config/helfi_kymp_config.info.yml new file mode 100644 index 000000000..10e978d4d --- /dev/null +++ b/public/modules/custom/helfi_kymp_config/helfi_kymp_config.info.yml @@ -0,0 +1,5 @@ +name: 'Helfi Kymp Config' +type: module +core_version_requirement: ^10 +dependencies: + - helfi_platform_config:helfi_platform_config diff --git a/public/modules/custom/helfi_kymp_config/helfi_kymp_config.module b/public/modules/custom/helfi_kymp_config/helfi_kymp_config.module new file mode 100644 index 000000000..f81885427 --- /dev/null +++ b/public/modules/custom/helfi_kymp_config/helfi_kymp_config.module @@ -0,0 +1,33 @@ +rewriteModuleConfig('helfi_kymp_config'); + } +} From 8db4d3c45c66fa61779c875a88157b1f7174e377 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Fri, 15 Mar 2024 07:33:21 +0200 Subject: [PATCH 2/3] UHF-9755: Updated configuration based on updates from helfi platform config module. --- ..._form_display.node.landing_page.default.yml | 2 +- ...y_form_display.paragraph.banner.default.yml | 2 +- ...ay.paragraph.list_of_links_item.default.yml | 3 ++- ...ty_view_display.paragraph.image.default.yml | 2 ++ ...xternal_entity_type.helfi_announcements.yml | 2 +- ...ies.external_entity_type.helfi_hearings.yml | 2 +- ...ntities.external_entity_type.helfi_news.yml | 2 +- ....external_entity_type.helfi_news_groups.yml | 2 +- ...l_entity_type.helfi_news_neighbourhoods.yml | 2 +- ...es.external_entity_type.helfi_news_tags.yml | 2 +- ...d.field.node.landing_page.field_content.yml | 18 +++++++++--------- conf/cmi/hdbt_admin_tools.site_settings.yml | 2 +- .../fi/views.view.user_admin_people.yml | 2 ++ ...paragraphs.paragraphs_type.contact_card.yml | 2 +- conf/cmi/language/sv/views.view.files.yml | 4 ++++ .../sv/views.view.paragraphs_library.yml | 2 ++ .../views.view.scheduler_scheduled_content.yml | 4 ++++ .../sv/views.view.user_admin_people.yml | 6 ++++++ conf/cmi/views.view.media_library.yml | 4 ++-- 19 files changed, 43 insertions(+), 22 deletions(-) diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml index bd7050827..01e934b40 100644 --- a/conf/cmi/core.entity_form_display.node.landing_page.default.yml +++ b/conf/cmi/core.entity_form_display.node.landing_page.default.yml @@ -128,9 +128,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 - region: content settings: { } third_party_settings: { } + region: content status: type: boolean_checkbox weight: 12 diff --git a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml index bffb05d4a..861403996 100644 --- a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml @@ -42,8 +42,8 @@ content: weight: 4 region: content settings: - linkit_profile: helfi linkit_auto_link_text: false + linkit_profile: helfi third_party_settings: { } field_banner_link_design: type: design_field_widget diff --git a/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml index d36e1bfb6..eddbd6556 100644 --- a/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.list_of_links_item.default.yml @@ -8,6 +8,7 @@ dependencies: - field.field.paragraph.list_of_links_item.field_list_of_links_link - paragraphs.paragraphs_type.list_of_links_item module: + - hdbt_admin_tools - media_library enforced: module: @@ -39,8 +40,8 @@ content: weight: 1 region: content settings: - linkit_profile: helfi linkit_auto_link_text: false + linkit_profile: helfi third_party_settings: { } hidden: created: true diff --git a/conf/cmi/core.entity_view_display.paragraph.image.default.yml b/conf/cmi/core.entity_view_display.paragraph.image.default.yml index 4326ed463..4360141c8 100644 --- a/conf/cmi/core.entity_view_display.paragraph.image.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.image.default.yml @@ -7,6 +7,8 @@ dependencies: - field.field.paragraph.image.field_image_caption - field.field.paragraph.image.field_original_aspect_ratio - paragraphs.paragraphs_type.image + module: + - helfi_platform_config _core: default_config_hash: WOIjdvfdwRn0wIU-TyaRDV4PKTm77QLskpKljuLGk5Q id: paragraph.image.default diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml index e45cfa62d..566a54859 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml @@ -8,8 +8,8 @@ id: helfi_announcements label: 'Helfi: Announcements' label_plural: 'Helfi: Announcements' description: '' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml index b38b6060a..03b537545 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml @@ -8,8 +8,8 @@ id: helfi_hearings label: 'Helfi: Hearing' label_plural: 'Helfi: Hearing' description: 'Helfi hearings from hearing api.' -read_only: true generate_aliases: false +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml index 0a4b4449a..53dec371d 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -8,8 +8,8 @@ id: helfi_news label: 'Helfi: News' label_plural: 'Helfi: News' description: '' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml index 55801df25..50be43e95 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml @@ -8,8 +8,8 @@ id: helfi_news_groups label: 'Helfi: News groups' label_plural: 'Helfi: News groups' description: 'Retrieves news groups taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml index 7d869b71a..883a3c0d5 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -8,8 +8,8 @@ id: helfi_news_neighbourhoods label: 'Helfi: News neighbourhoods' label_plural: 'Helfi: News neighbourhoods' description: 'Retrieves news neighbourhoods taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml index 782e465ca..158e6da0c 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml @@ -8,8 +8,8 @@ id: helfi_news_tags label: 'Helfi: News tags' label_plural: 'Helfi: News tags' description: 'Retrieves news tags taxonomy terms from Helfi' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index 0e85f53e9..4948a436a 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -46,25 +46,25 @@ settings: target_bundles: district_and_project_search: district_and_project_search list_of_plans: list_of_plans - columns: columns list_of_links: list_of_links content_cards: content_cards - content_liftup: content_liftup banner: banner liftup_with_image: liftup_with_image + popular_services: popular_services from_library: from_library - chart: chart - remote_video: remote_video - map: map - news_list: news_list - event_list: event_list + columns: columns phasing: phasing - popular_services: popular_services + map: map + remote_video: remote_video + chart: chart target_group_links: target_group_links + event_list: event_list + news_list: news_list hearings: hearings - unit_search: unit_search + content_liftup: content_liftup service_list: service_list service_list_search: service_list_search + unit_search: unit_search negate: 0 target_bundles_drag_drop: banner: diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml index d75529339..1de666bdc 100644 --- a/conf/cmi/hdbt_admin_tools.site_settings.yml +++ b/conf/cmi/hdbt_admin_tools.site_settings.yml @@ -1,10 +1,10 @@ _core: default_config_hash: OgPHnjkIjDn42IHAwLRXhNzdhX825gq2SrlYKw4kbQ8 langcode: en +path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json site_settings: default_icon: home-smoke theme_color: tram koro: vibration footer_settings: footer_color: dark -path_to_json: /themes/contrib/hdbt/src/icons/editor-selectable-icons.json diff --git a/conf/cmi/language/fi/views.view.user_admin_people.yml b/conf/cmi/language/fi/views.view.user_admin_people.yml index dacf9ecbe..c4aacfc79 100644 --- a/conf/cmi/language/fi/views.view.user_admin_people.yml +++ b/conf/cmi/language/fi/views.view.user_admin_people.yml @@ -21,6 +21,8 @@ display: label: 'Käyttäjä jo' access: label: 'Viimeksi paikalla' + settings: + past_format: '@interval sitten' operations: label: Toimenpiteet mail: diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml index d301f495b..93bfcdce6 100644 --- a/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml +++ b/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml @@ -1 +1 @@ -label: 'Contact card' +label: Kontaktkort diff --git a/conf/cmi/language/sv/views.view.files.yml b/conf/cmi/language/sv/views.view.files.yml index f65de5854..ff2d56fd8 100644 --- a/conf/cmi/language/sv/views.view.files.yml +++ b/conf/cmi/language/sv/views.view.files.yml @@ -41,6 +41,9 @@ display: label: 'Datum för ändring' count: label: 'Används i' + alter: + path: 'admin/content/files/usage/{{ fid }}' + format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz filters: filename: expose: @@ -81,6 +84,7 @@ display: label: 'Registrerar modul' count: label: 'Antal använd' + format_plural_string: !!binary MQNAY291bnQ= title: Filanvändning arguments: fid: diff --git a/conf/cmi/language/sv/views.view.paragraphs_library.yml b/conf/cmi/language/sv/views.view.paragraphs_library.yml index 382e21ecd..43c1c0c1f 100644 --- a/conf/cmi/language/sv/views.view.paragraphs_library.yml +++ b/conf/cmi/language/sv/views.view.paragraphs_library.yml @@ -39,6 +39,8 @@ display: separator: ', ' operations: label: Funktioner + count: + format_plural_string: !!binary MSBwbGFjZQNAY291bnQgcGxhY2Vz filters: label: expose: diff --git a/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml index 68c3d967a..7c74103fb 100644 --- a/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml +++ b/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml @@ -63,6 +63,9 @@ display: expose: label: Språk title: 'Scheduled Content' + empty: + area_text_custom: + content: 'Inget schemalagt innehåll.' display_title: Förvald overview: display_options: @@ -82,3 +85,4 @@ display: exception: title: Alla display_title: 'User profile tab' +description: 'Hitta och hantera schemalagt innehåll.' diff --git a/conf/cmi/language/sv/views.view.user_admin_people.yml b/conf/cmi/language/sv/views.view.user_admin_people.yml index 678dc242e..2a3559742 100644 --- a/conf/cmi/language/sv/views.view.user_admin_people.yml +++ b/conf/cmi/language/sv/views.view.user_admin_people.yml @@ -19,8 +19,14 @@ display: label: Roller created: label: 'Medlem i' + settings: + future_format: '@interval' + past_format: '@interval' access: label: 'Senast åtkomst' + settings: + future_format: '@interval därav' + past_format: '@interval sedan' operations: label: Funktioner mail: diff --git a/conf/cmi/views.view.media_library.yml b/conf/cmi/views.view.media_library.yml index c34081476..22736c47f 100644 --- a/conf/cmi/views.view.media_library.yml +++ b/conf/cmi/views.view.media_library.yml @@ -1336,7 +1336,7 @@ display: image_link: '' image_style: media_library image_loading: - attribute: lazy + attribute: eager name: id: name table: media_field_data @@ -1376,7 +1376,7 @@ display: custom_date_format: '' timezone: '' tooltip: - date_format: '' + date_format: long custom_date_format: '' time_diff: enabled: false From 343a9c141b166c17e4fa22972d07f8d01c82032b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Fri, 15 Mar 2024 07:34:38 +0200 Subject: [PATCH 3/3] UHF-9755: Removed helfi_kymp_config module for now. --- conf/cmi/core.extension.yml | 1 - .../rewrite/language/fi/views.view.news.yml | 7 ---- .../rewrite/language/sv/views.view.news.yml | 12 ------- .../paragraphs.paragraphs_type.text.yml | 1 - .../helfi_kymp_config.info.yml | 5 --- .../helfi_kymp_config.module | 33 ------------------- 6 files changed, 59 deletions(-) delete mode 100644 public/modules/custom/helfi_kymp_config/config/rewrite/language/fi/views.view.news.yml delete mode 100644 public/modules/custom/helfi_kymp_config/config/rewrite/language/sv/views.view.news.yml delete mode 100644 public/modules/custom/helfi_kymp_config/config/rewrite/paragraphs.paragraphs_type.text.yml delete mode 100644 public/modules/custom/helfi_kymp_config/helfi_kymp_config.info.yml delete mode 100644 public/modules/custom/helfi_kymp_config/helfi_kymp_config.module diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 740e88986..9801cf011 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -49,7 +49,6 @@ module: helfi_eu_cookie_compliance: 0 helfi_global_announcement: 0 helfi_image_styles: 0 - helfi_kymp_config: 0 helfi_kymp_content: 0 helfi_kymp_migrations: 0 helfi_kymp_plans: 0 diff --git a/public/modules/custom/helfi_kymp_config/config/rewrite/language/fi/views.view.news.yml b/public/modules/custom/helfi_kymp_config/config/rewrite/language/fi/views.view.news.yml deleted file mode 100644 index 98bf78d39..000000000 --- a/public/modules/custom/helfi_kymp_config/config/rewrite/language/fi/views.view.news.yml +++ /dev/null @@ -1,7 +0,0 @@ -display: - latest_news: - display_title: 'Uusimmat uutiset' - display_options: - title: 'Uusimmat uutiset' - use_more_text: 'Katso kaikki uutiset' - link_url: /uutiset diff --git a/public/modules/custom/helfi_kymp_config/config/rewrite/language/sv/views.view.news.yml b/public/modules/custom/helfi_kymp_config/config/rewrite/language/sv/views.view.news.yml deleted file mode 100644 index c4dae761f..000000000 --- a/public/modules/custom/helfi_kymp_config/config/rewrite/language/sv/views.view.news.yml +++ /dev/null @@ -1,12 +0,0 @@ -display: - default: - display_options: - exposed_form: - options: - submit_button: Verkställ - latest_news: - display_title: 'Senaste nyheterna' - display_options: - title: 'Senaste nyheterna' - use_more_text: 'Se alla nyheter' - link_url: /nyheter diff --git a/public/modules/custom/helfi_kymp_config/config/rewrite/paragraphs.paragraphs_type.text.yml b/public/modules/custom/helfi_kymp_config/config/rewrite/paragraphs.paragraphs_type.text.yml deleted file mode 100644 index 50db51661..000000000 --- a/public/modules/custom/helfi_kymp_config/config/rewrite/paragraphs.paragraphs_type.text.yml +++ /dev/null @@ -1 +0,0 @@ -label: 'Text (supported in other languages)' diff --git a/public/modules/custom/helfi_kymp_config/helfi_kymp_config.info.yml b/public/modules/custom/helfi_kymp_config/helfi_kymp_config.info.yml deleted file mode 100644 index 10e978d4d..000000000 --- a/public/modules/custom/helfi_kymp_config/helfi_kymp_config.info.yml +++ /dev/null @@ -1,5 +0,0 @@ -name: 'Helfi Kymp Config' -type: module -core_version_requirement: ^10 -dependencies: - - helfi_platform_config:helfi_platform_config diff --git a/public/modules/custom/helfi_kymp_config/helfi_kymp_config.module b/public/modules/custom/helfi_kymp_config/helfi_kymp_config.module deleted file mode 100644 index f81885427..000000000 --- a/public/modules/custom/helfi_kymp_config/helfi_kymp_config.module +++ /dev/null @@ -1,33 +0,0 @@ -rewriteModuleConfig('helfi_kymp_config'); - } -}