diff --git a/composer.lock b/composer.lock index f4f0cfed..1479c38a 100644 --- a/composer.lock +++ b/composer.lock @@ -1951,8 +1951,8 @@ "version": "1.0.2", "datestamp": "1695740655", "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" } } }, @@ -1961,10 +1961,6 @@ "GPL-2.0-or-later" ], "authors": [ - { - "name": "dczepierga", - "homepage": "https://www.drupal.org/user/911466" - }, { "name": "hass", "homepage": "https://www.drupal.org/user/85918" @@ -1982,13 +1978,9 @@ "homepage": "https://www.drupal.org/user/1078742" }, { - "name": "Magnus", + "name": "magnus", "homepage": "https://www.drupal.org/user/73919" }, - { - "name": "mkesicki", - "homepage": "https://www.drupal.org/user/922884" - }, { "name": "nod_", "homepage": "https://www.drupal.org/user/598310" @@ -2002,7 +1994,7 @@ "homepage": "https://www.drupal.org/user/2793801" }, { - "name": "Wim Leers", + "name": "wim leers", "homepage": "https://www.drupal.org/user/99777" }, { @@ -4073,16 +4065,16 @@ }, { "name": "drupal/hdbt", - "version": "6.9.1", + "version": "6.9.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "8a050722a8ab5805fc0a37ea57337dcc80fccc9e" + "reference": "1ac79a980c2e3f4849b7ac7c00793c896c797a51" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/8a050722a8ab5805fc0a37ea57337dcc80fccc9e", - "reference": "8a050722a8ab5805fc0a37ea57337dcc80fccc9e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/1ac79a980c2e3f4849b7ac7c00793c896c797a51", + "reference": "1ac79a980c2e3f4849b7ac7c00793c896c797a51", "shasum": "" }, "require": { @@ -4101,10 +4093,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.1", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.9.2", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2025-01-23T15:20:18+00:00" + "time": "2025-01-24T14:58:09+00:00" }, { "name": "drupal/hdbt_admin", @@ -4410,16 +4402,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.12.7", + "version": "4.12.11", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "068c9418620f842e3de24354694bb4734e059fbb" + "reference": "a542544eeefecd426e7e5a780682d7036771fc1d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/068c9418620f842e3de24354694bb4734e059fbb", - "reference": "068c9418620f842e3de24354694bb4734e059fbb", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a542544eeefecd426e7e5a780682d7036771fc1d", + "reference": "a542544eeefecd426e7e5a780682d7036771fc1d", "shasum": "" }, "require": { @@ -4543,10 +4535,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.12.11", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2025-01-24T06:40:31+00:00" + "time": "2025-01-27T12:55:19+00:00" }, { "name": "drupal/helfi_proxy", 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 3cbfb7e9..be33879c 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: '' -generate_aliases: false read_only: true +generate_aliases: false 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 9d3ca154..67683769 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' -generate_aliases: null read_only: true +generate_aliases: null 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 c56ea7ed..4b7ab20a 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' -generate_aliases: null read_only: true +generate_aliases: null 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 a2cc1677..b56911a5 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' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml index 3ba79232..ca1460b2 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: group theme_color: silver koro: basic 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.content.yml b/conf/cmi/language/fi/views.view.content.yml index fb036d95..f9f7edeb 100644 --- a/conf/cmi/language/fi/views.view.content.yml +++ b/conf/cmi/language/fi/views.view.content.yml @@ -54,6 +54,8 @@ display: group_items: 1: title: Julkaistu + 2: + title: Julkaisematon langcode: expose: label: Kieli diff --git a/conf/cmi/language/fi/views.view.locked_content.yml b/conf/cmi/language/fi/views.view.locked_content.yml index 063ed8d8..c879a926 100644 --- a/conf/cmi/language/fi/views.view.locked_content.yml +++ b/conf/cmi/language/fi/views.view.locked_content.yml @@ -58,7 +58,7 @@ display: label: Otsikko empty: area_text_custom: - content: 'Lukittuja toimipisteitä ei ole.' + content: 'Lukittua sisältöä ei ole.' page_1: display_title: Sivu display_options: diff --git a/conf/cmi/language/fi/views.view.media_library.yml b/conf/cmi/language/fi/views.view.media_library.yml index 3ac1af27..33489d22 100644 --- a/conf/cmi/language/fi/views.view.media_library.yml +++ b/conf/cmi/language/fi/views.view.media_library.yml @@ -45,6 +45,8 @@ display: group_items: 1: title: Julkaistu + 2: + title: Julkaisematon name: expose: label: Nimi diff --git a/conf/cmi/language/sv/views.view.content.yml b/conf/cmi/language/sv/views.view.content.yml index 61393d4d..7c14dd03 100644 --- a/conf/cmi/language/sv/views.view.content.yml +++ b/conf/cmi/language/sv/views.view.content.yml @@ -13,10 +13,10 @@ display: name: label: Författare status: - label: Status settings: format_custom_false: 'Ej publicerad' format_custom_true: Publicerad + label: Status changed: label: Uppdaterad operations: @@ -47,13 +47,15 @@ display: expose: label: Innehållstyp status: - expose: - label: Status group_info: label: 'Status för publicering' group_items: 1: title: Publicerad + 2: + title: 'Ej publicerad' + expose: + label: Status langcode: expose: label: Språk diff --git a/conf/cmi/language/sv/views.view.helfi_redirect.yml b/conf/cmi/language/sv/views.view.helfi_redirect.yml index de7deb5d..e4267989 100644 --- a/conf/cmi/language/sv/views.view.helfi_redirect.yml +++ b/conf/cmi/language/sv/views.view.helfi_redirect.yml @@ -1,71 +1,83 @@ -label: Omdirigera -description: 'Lista över omdirigeringar' display: default: - display_title: Förvald display_options: - title: Omdirigera - fields: - redirect_bulk_form: - action_title: 'Med urval' - redirect_source__path: - label: Från - separator: ', ' - is_custom: - label: Anpassad - separator: ', ' - created: - label: Skapad - status: - label: Publicerad - separator: ', ' - pager: - options: - tags: - next: 'nästa ›' - previous: '‹ föregående' - first: '« första' - last: 'sista »' - expose: - items_per_page_label: 'Inlägg per sida' - items_per_page_options_all_label: '- Alla -' - offset_label: Kompensera - exposed_form: - options: - submit_button: Filtrera - reset_button_label: Återställ - exposed_sorts_label: 'Sortera efter' - sort_asc_label: Stigande - sort_desc_label: Fallande - empty: - area_text_custom: - content: 'Det finns ingen omdirigering ännu.' filters: + status_code: + group_info: + group_items: + 1: + title: '300 Flera val' + 2: + title: '301 Flyttad permanent' + 3: + title: '302 Hittad' + 4: + title: '303 Se annan' + 5: + title: '304 Ej modifierad' + 6: + title: '305 Använd proxy' + 7: + title: '307 Tillfällig omdirigering' + label: Statuskod + expose: + label: Statuskod redirect_source__path: expose: label: Från redirect_redirect__uri: expose: label: Till - status_code: - expose: - label: Statuskod - group_info: - label: Statuskod - group_items: - 7: - title: '300 Multiple Choices' language: expose: - label: Ursprungsspråk + label: Originalspråk is_custom: expose: - label: Anpassad + label: Användarskapad status: expose: label: Publicerad + exposed_form: + options: + submit_button: Filtrera + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande + pager: + options: + expose: + items_per_page_label: 'Inlägg per sida' + items_per_page_options_all_label: '- Alla -' + offset_label: Kompensera + tags: + previous: '‹ föregående' + next: 'nästa ›' + first: '« första' + last: 'sista »' + fields: + redirect_bulk_form: + action_title: 'Med valda' + redirect_source__path: + label: Från + separator: ', ' + created: + label: Skapad + is_custom: + label: Användarskapad + separator: ', ' + status: + label: Publicerad + separator: ', ' + empty: + area_text_custom: + content: 'Det finns inga omdirigeringar ännu.' + title: Redirect + display_title: Förvald page_1: display_title: Sida display_options: menu: - title: Omdirigera + title: Redirect +label: Redirect +description: 'List of redirects' diff --git a/conf/cmi/language/sv/views.view.locked_content.yml b/conf/cmi/language/sv/views.view.locked_content.yml index 83dfa1e4..b384244b 100644 --- a/conf/cmi/language/sv/views.view.locked_content.yml +++ b/conf/cmi/language/sv/views.view.locked_content.yml @@ -1,4 +1,3 @@ -label: 'Locked content' display: default: display_title: Förvald @@ -13,10 +12,10 @@ display: pager: options: tags: - previous: ‹‹ - next: ›› first: '« Första' last: 'Sista »' + next: ›› + previous: ‹‹ expose: items_per_page_label: 'Inlägg per sida' items_per_page_options_all_label: '- Alla -' @@ -31,7 +30,7 @@ display: label: Innehållstyp separator: ', ' name: - label: 'Lock owner' + label: 'Lås ägare' separator: ', ' operations: label: Funktioner @@ -44,15 +43,16 @@ display: group_items: 1: title: Publicerad - type: - expose: - label: Innehållstyp title: expose: label: Titel - title: 'Locked content' + type: + expose: + label: Innehållstyp + title: 'Låst innehåll' page_1: display_title: Sida display_options: menu: - title: 'Locked content' + title: 'Låst innehåll' +label: 'Låst innehåll' diff --git a/conf/cmi/language/sv/views.view.locked_services.yml b/conf/cmi/language/sv/views.view.locked_services.yml index 76ae533b..ef16b557 100644 --- a/conf/cmi/language/sv/views.view.locked_services.yml +++ b/conf/cmi/language/sv/views.view.locked_services.yml @@ -10,7 +10,7 @@ display: label: Titel separator: ', ' name_1: - label: 'Lock owner' + label: 'Lås ägare' separator: ', ' langcode: label: 'Content language' diff --git a/conf/cmi/language/sv/views.view.locked_units.yml b/conf/cmi/language/sv/views.view.locked_units.yml index c53e1ef4..f871e6ff 100644 --- a/conf/cmi/language/sv/views.view.locked_units.yml +++ b/conf/cmi/language/sv/views.view.locked_units.yml @@ -10,7 +10,7 @@ display: label: Titel separator: ', ' name_1: - label: 'Lock owner' + label: 'Lås ägare' separator: ', ' langcode: label: 'Content language' diff --git a/conf/cmi/language/sv/views.view.media_library.yml b/conf/cmi/language/sv/views.view.media_library.yml index 0370700e..b69148e8 100644 --- a/conf/cmi/language/sv/views.view.media_library.yml +++ b/conf/cmi/language/sv/views.view.media_library.yml @@ -44,6 +44,8 @@ display: group_items: 1: title: Publicerad + 2: + title: 'Ej publicerad' name: expose: label: Namn diff --git a/conf/cmi/language/sv/views.view.redirect.yml b/conf/cmi/language/sv/views.view.redirect.yml index 68be3634..1af0dfc2 100644 --- a/conf/cmi/language/sv/views.view.redirect.yml +++ b/conf/cmi/language/sv/views.view.redirect.yml @@ -1,5 +1,5 @@ -label: Omdirigera -description: 'Lista över omdirigeringar' +label: Redirect +description: 'List of redirects' display: default: display_title: Förvald @@ -24,7 +24,7 @@ display: offset_label: Kompensera fields: redirect_bulk_form: - action_title: 'Med urval' + action_title: 'Med valda' redirect_source__path: label: Från separator: ', ' @@ -44,13 +44,25 @@ display: label: Statuskod group_items: 7: - title: '300 Multiple Choices' + title: '307 Tillfällig omdirigering' + 1: + title: '300 Flera val' + 2: + title: '301 Flyttad permanent' + 3: + title: '302 Hittad' + 4: + title: '303 Se annan' + 5: + title: '304 Ej modifierad' + 6: + title: '305 Använd proxy' language: expose: - label: Ursprungsspråk - title: Omdirigera + label: Originalspråk + title: Redirect empty: area_text_custom: - content: 'Det finns ingen omdirigering ännu.' + content: 'Det finns inga omdirigeringar ännu.' page_1: display_title: Sida 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 1104311a..b430f582 100644 --- a/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml +++ b/conf/cmi/language/sv/views.view.scheduler_scheduled_content.yml @@ -14,10 +14,10 @@ display: label: Författare separator: ', ' status: - label: Status settings: format_custom_true: Publicerad format_custom_false: 'Ej publicerad' + label: Status separator: ', ' publish_on: label: 'Publicera den' @@ -35,8 +35,6 @@ display: expose: label: Innehållstyp status: - expose: - label: Status group_info: label: 'Status för publicering' group_items: @@ -44,6 +42,8 @@ display: title: Publicerad 2: title: 'Ej publicerad' + expose: + label: Status langcode: expose: label: Språk diff --git a/conf/cmi/views.view.content.yml b/conf/cmi/views.view.content.yml index a53fc692..c13acc19 100644 --- a/conf/cmi/views.view.content.yml +++ b/conf/cmi/views.view.content.yml @@ -474,11 +474,11 @@ display: default_group: All default_group_multiple: { } group_items: - - + 1: title: Published operator: '=' value: '1' - - + 2: title: Unpublished operator: '=' value: '0' @@ -544,7 +544,7 @@ display: filter_groups: operator: AND groups: - - AND + 1: AND style: type: table options: diff --git a/conf/cmi/views.view.er_tpr_unit.yml b/conf/cmi/views.view.er_tpr_unit.yml index f12ee5c5..77d884d4 100644 --- a/conf/cmi/views.view.er_tpr_unit.yml +++ b/conf/cmi/views.view.er_tpr_unit.yml @@ -91,7 +91,6 @@ display: type: mini options: offset: 0 - pagination_heading_level: h4 items_per_page: 10 total_pages: null id: 0 @@ -106,6 +105,7 @@ display: items_per_page_options_all_label: '- All -' offset: false offset_label: Offset + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_services.yml b/conf/cmi/views.view.locked_services.yml index aa17491f..2293c485 100644 --- a/conf/cmi/views.view.locked_services.yml +++ b/conf/cmi/views.view.locked_services.yml @@ -381,7 +381,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -399,6 +398,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.locked_units.yml b/conf/cmi/views.view.locked_units.yml index 8ea1d1bd..5d755e20 100644 --- a/conf/cmi/views.view.locked_units.yml +++ b/conf/cmi/views.view.locked_units.yml @@ -381,7 +381,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 50 total_pages: null id: 0 @@ -399,6 +398,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.media_library.yml b/conf/cmi/views.view.media_library.yml index 438e8ac5..ee153a03 100644 --- a/conf/cmi/views.view.media_library.yml +++ b/conf/cmi/views.view.media_library.yml @@ -271,11 +271,11 @@ display: default_group: All default_group_multiple: { } group_items: - - + 1: title: Published operator: '=' value: '1' - - + 2: title: Unpublished operator: '=' value: '0' @@ -477,13 +477,13 @@ display: cache_metadata: max-age: 0 contexts: + - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - 'url.query_args:sort_by' - user - user.permissions - - 'languages:language_content' tags: { } page: id: page diff --git a/conf/cmi/views.view.scheduler_scheduled_content.yml b/conf/cmi/views.view.scheduler_scheduled_content.yml index 5adc074c..8a1764ff 100644 --- a/conf/cmi/views.view.scheduler_scheduled_content.yml +++ b/conf/cmi/views.view.scheduler_scheduled_content.yml @@ -2,8 +2,6 @@ uuid: 59a3ae5d-40e7-43f3-916d-e533a8b60577 langcode: en status: true dependencies: - config: - - system.menu.admin module: - node - scheduler @@ -20,7 +18,7 @@ base_field: vid display: default: id: default - display_title: Master + display_title: Default display_plugin: default position: 0 display_options: @@ -723,8 +721,8 @@ display: remember: false multiple: false remember_roles: - anonymous: '0' authenticated: '0' + anonymous: '0' administrator: '0' is_grouped: true group_info: diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index e0d9d02a..746f7477 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -109,7 +109,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 4 total_pages: null id: 0 @@ -127,6 +126,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: @@ -646,7 +646,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 5 total_pages: null id: 0 @@ -664,6 +663,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.service_units.yml b/conf/cmi/views.view.service_units.yml index 85678618..1f74d3c3 100644 --- a/conf/cmi/views.view.service_units.yml +++ b/conf/cmi/views.view.service_units.yml @@ -93,7 +93,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 8 total_pages: null id: 0 @@ -111,6 +110,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: diff --git a/conf/cmi/views.view.unit_search.yml b/conf/cmi/views.view.unit_search.yml index 38c913d8..91cf0ae6 100644 --- a/conf/cmi/views.view.unit_search.yml +++ b/conf/cmi/views.view.unit_search.yml @@ -286,7 +286,6 @@ display: type: full options: offset: 0 - pagination_heading_level: h4 items_per_page: 15 total_pages: null id: 0 @@ -304,6 +303,7 @@ display: offset: false offset_label: Offset quantity: 9 + pagination_heading_level: h4 exposed_form: type: basic options: