From 0dfcf5403c9bedee2b3f6fe097ed50cc96c7f125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 24 Oct 2022 22:20:24 +0300 Subject: [PATCH 01/10] UHF-7195: Install and configure helfi_news_feed module. --- ...rm_display.paragraph.news_list.default.yml | 78 +++++++++++++++++++ ..._display.helfi_news.helfi_news.default.yml | 38 +++++++++ ...ay.helfi_news.helfi_news.medium_teaser.yml | 40 ++++++++++ ...ew_display.paragraph.news_list.default.yml | 70 +++++++++++++++++ ...ity_view_mode.helfi_news.medium_teaser.yml | 12 +++ conf/cmi/core.extension.yml | 2 + ...tities.external_entity_type.helfi_news.yml | 42 ++++++++++ ...external_entity_type.helfi_news_groups.yml | 27 +++++++ ..._entity_type.helfi_news_neighbourhoods.yml | 27 +++++++ ...s.external_entity_type.helfi_news_tags.yml | 27 +++++++ ....field.node.landing_page.field_content.yml | 13 ++++ .../field.field.node.page.field_content.yml | 10 +++ ...ld.field.node.page.field_lower_content.yml | 10 +++ ...raph.news_list.field_helfi_news_groups.yml | 28 +++++++ ...s_list.field_helfi_news_neighbourhoods.yml | 28 +++++++ ...agraph.news_list.field_helfi_news_tags.yml | 28 +++++++ ....field.paragraph.news_list.field_limit.yml | 27 +++++++ ....news_list.field_news_list_description.yml | 28 +++++++ ...agraph.news_list.field_news_list_title.yml | 21 +++++ ...ervice.tpr_service.field_lower_content.yml | 5 ++ ....tpr_unit.tpr_unit.field_lower_content.yml | 6 ++ ...rage.paragraph.field_helfi_news_groups.yml | 22 ++++++ ...agraph.field_helfi_news_neighbourhoods.yml | 22 ++++++ ...torage.paragraph.field_helfi_news_tags.yml | 22 ++++++ .../field.storage.paragraph.field_limit.yml | 22 ++++++ ....paragraph.field_news_list_description.yml | 21 +++++ ...torage.paragraph.field_news_list_title.yml | 23 ++++++ .../paragraphs.paragraphs_type.news_list.yml | 12 +++ 28 files changed, 711 insertions(+) create mode 100644 conf/cmi/core.entity_form_display.paragraph.news_list.default.yml create mode 100644 conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml create mode 100644 conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml create mode 100644 conf/cmi/core.entity_view_display.paragraph.news_list.default.yml create mode 100644 conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml create mode 100644 conf/cmi/external_entities.external_entity_type.helfi_news.yml create mode 100644 conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml create mode 100644 conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml create mode 100644 conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml create mode 100644 conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml create mode 100644 conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml create mode 100644 conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml create mode 100644 conf/cmi/field.field.paragraph.news_list.field_limit.yml create mode 100644 conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml create mode 100644 conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml create mode 100644 conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml create mode 100644 conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml create mode 100644 conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml create mode 100644 conf/cmi/field.storage.paragraph.field_limit.yml create mode 100644 conf/cmi/field.storage.paragraph.field_news_list_description.yml create mode 100644 conf/cmi/field.storage.paragraph.field_news_list_title.yml create mode 100644 conf/cmi/paragraphs.paragraphs_type.news_list.yml diff --git a/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml new file mode 100644 index 00000000..2843a8dc --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.news_list.default.yml @@ -0,0 +1,78 @@ +uuid: 05e891a7-c15d-403a-8d39-d5fc57821c35 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.news_list.field_helfi_news_groups + - field.field.paragraph.news_list.field_helfi_news_neighbourhoods + - field.field.paragraph.news_list.field_helfi_news_tags + - field.field.paragraph.news_list.field_limit + - field.field.paragraph.news_list.field_news_list_description + - field.field.paragraph.news_list.field_news_list_title + - paragraphs.paragraphs_type.news_list + module: + - select2 + - text +_core: + default_config_hash: I_u6U4oQKvo0EjopuKoM3qEFFz3lzE8J-jWIN0OJqYg +id: paragraph.news_list.default +targetEntityType: paragraph +bundle: news_list +mode: default +content: + field_helfi_news_groups: + type: select2_entity_reference + weight: 4 + region: content + settings: + width: 100% + autocomplete: true + match_operator: CONTAINS + match_limit: 10 + third_party_settings: { } + field_helfi_news_neighbourhoods: + type: select2_entity_reference + weight: 5 + region: content + settings: + width: 100% + autocomplete: true + match_operator: CONTAINS + match_limit: 10 + third_party_settings: { } + field_helfi_news_tags: + type: select2_entity_reference + weight: 3 + region: content + settings: + width: 100% + autocomplete: true + match_operator: CONTAINS + match_limit: 10 + third_party_settings: { } + field_limit: + type: number + weight: 2 + region: content + settings: + placeholder: '' + third_party_settings: { } + field_news_list_description: + type: text_textarea + weight: 1 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_news_list_title: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + created: true + status: true diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml new file mode 100644 index 00000000..85b42f7b --- /dev/null +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml @@ -0,0 +1,38 @@ +uuid: e41ed1ae-21d2-4bf9-bb11-7ee02c854ee7 +langcode: en +status: true +dependencies: + module: + - external_entities + - imagecache_external +_core: + default_config_hash: k-bIvgFdaVICd0s60Gng2zWabkpeZTQ53HF1Eff7zDk +id: helfi_news.helfi_news.default +targetEntityType: helfi_news +bundle: helfi_news +mode: default +content: + main_image: + type: imagecache_external_responsive_image + label: hidden + settings: + imagecache_external_responsive_style: gallery_thumbnail + imagecache_external_link: '' + third_party_settings: { } + weight: 1 + region: content + title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: + groups: true + neighbourhoods: true + node_url: true + published_at: true + short_title: true + tags: true diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml new file mode 100644 index 00000000..ff46d998 --- /dev/null +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml @@ -0,0 +1,40 @@ +uuid: fe43148a-7f68-4263-b582-e0a19742cf9b +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.helfi_news.medium_teaser + module: + - external_entities + - imagecache_external +_core: + default_config_hash: XArB74ImuiEIsNGh_ic_b4csmzDUre1hUeswj9kCiOc +id: helfi_news.helfi_news.medium_teaser +targetEntityType: helfi_news +bundle: helfi_news +mode: medium_teaser +content: + main_image: + type: imagecache_external_responsive_image + label: hidden + settings: + imagecache_external_responsive_style: gallery_thumbnail + imagecache_external_link: '' + third_party_settings: { } + weight: 1 + region: content + title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: + groups: true + neighbourhoods: true + node_url: true + published_at: true + short_title: true + tags: true diff --git a/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml b/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml new file mode 100644 index 00000000..f9e6a32f --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.news_list.default.yml @@ -0,0 +1,70 @@ +uuid: 8400939b-781c-42e4-b580-c269aac21296 +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.news_list.field_helfi_news_groups + - field.field.paragraph.news_list.field_helfi_news_neighbourhoods + - field.field.paragraph.news_list.field_helfi_news_tags + - field.field.paragraph.news_list.field_limit + - field.field.paragraph.news_list.field_news_list_description + - field.field.paragraph.news_list.field_news_list_title + - paragraphs.paragraphs_type.news_list + module: + - text +_core: + default_config_hash: eCdT_XU1aIhxOLfurTn16KTFSsxHyWZu3HHm3q_5Mi8 +id: paragraph.news_list.default +targetEntityType: paragraph +bundle: news_list +mode: default +content: + field_helfi_news_groups: + type: entity_reference_entity_view + label: above + settings: + view_mode: default + link: true + third_party_settings: { } + weight: 3 + region: content + field_helfi_news_neighbourhoods: + type: entity_reference_entity_view + label: above + settings: + view_mode: default + link: true + third_party_settings: { } + weight: 5 + region: content + field_helfi_news_tags: + type: entity_reference_entity_view + label: above + settings: + view_mode: default + link: true + third_party_settings: { } + weight: 4 + region: content + field_news_list_description: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 1 + region: content + field_news_list_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + news_list: + settings: { } + third_party_settings: { } + weight: 2 + region: content +hidden: + field_limit: true diff --git a/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml new file mode 100644 index 00000000..9087971a --- /dev/null +++ b/conf/cmi/core.entity_view_mode.helfi_news.medium_teaser.yml @@ -0,0 +1,12 @@ +uuid: 11d3c7f8-ff45-4d1e-a885-17c2a8ecb17a +langcode: en +status: true +dependencies: + module: + - external_entities +_core: + default_config_hash: q8QZDYrGHAdl67dw9Z1DdTCTIhOo3lpW0dGN70STnCk +id: helfi_news.medium_teaser +label: 'Medium Teaser' +targetEntityType: helfi_news +cache: true diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index 6651d519..7ad4c7cc 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -27,6 +27,7 @@ module: entity: 0 entity_reference_revisions: 0 entity_usage: 0 + external_entities: 0 field: 0 field_group: 0 field_ui: 0 @@ -56,6 +57,7 @@ module: helfi_media_map: 0 helfi_media_map_config: 0 helfi_navigation: 0 + helfi_news_feed: 0 helfi_platform_config: 0 helfi_proxy: 0 helfi_toc: 0 diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml new file mode 100644 index 00000000..e4dc3329 --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -0,0 +1,42 @@ +uuid: 63e66dcf-1d42-465e-a961-78a808386a1e +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: BzWvGC8hEXxFUxhZtUxQ30sNFcsZNIAFC5JX9okISYY +id: helfi_news +label: 'Helfi: News' +label_plural: 'Helfi: News' +description: '' +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: '$.attributes[''title'']' + main_image: + uri: '$.relationships[''main_image''][''data''][''relationships''][''media_image''][''data''][''attributes''][''uri''][''url'']' + title: '$.relationships[''main_image''][''data''][''relationships''][''media_image''][''data''][''meta''][''alt'']' + tags: + value: '$.relationships[''tags''][''data''][*][''attributes''][''name'']' + groups: + value: '$.relationships[''groups''][''data''][*][''attributes''][''name'']' + neighbourhoods: + value: '$.relationships[''neighbourhoods''][''data''][*][''attributes''][''name'']' + node_url: + value: '$.attributes[''path''][''alias'']' + published_at: + value: '$.attributes[''published_at'']' + short_title: + value: '$.attributes[''short_title'']' +storage_client_id: helfi_news +storage_client_config: { } +persistent_cache_max_age: -1 +annotation_entity_type_id: null +annotation_bundle_id: null +annotation_field_name: null +inherits_annotation_fields: false 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 new file mode 100644 index 00000000..ab419b73 --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml @@ -0,0 +1,27 @@ +uuid: 0c7479bb-c52c-48cb-9a7c-3d89bc66a777 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: XSm-lbRmOWP_eJRFTo14HMiNtxsc5scm42lmq8Qjcy8 +id: helfi_news_groups +label: 'Helfi: News groups' +label_plural: 'Helfi: News groups' +description: 'Retrieves news groups taxonomy terms from Helfi' +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: '$.attributes["name"]' +storage_client_id: helfi_news_groups +storage_client_config: { } +persistent_cache_max_age: -1 +annotation_entity_type_id: null +annotation_bundle_id: null +annotation_field_name: null +inherits_annotation_fields: false 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 new file mode 100644 index 00000000..fdfdb02a --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -0,0 +1,27 @@ +uuid: 1d5b0975-b2d2-4ddd-a23e-36b2d90cab8c +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: h4y6pjlsSfKM9cgEi9tWGsJ57_zj1b4CelECji9A1Y0 +id: helfi_news_neighbourhoods +label: 'Helfi: News neighbourhoods' +label_plural: 'Helfi: News neighbourhoods' +description: 'Retrieves news neighbourhoods taxonomy terms from Helfi' +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: '$.attributes["name"]' +storage_client_id: helfi_news_neighbourhoods +storage_client_config: { } +persistent_cache_max_age: -1 +annotation_entity_type_id: null +annotation_bundle_id: null +annotation_field_name: null +inherits_annotation_fields: false 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 new file mode 100644 index 00000000..1534b56e --- /dev/null +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml @@ -0,0 +1,27 @@ +uuid: f61c9edc-a6a2-472c-8f3d-97dcf06b41da +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: wkWXjXpGr6lPWM3nZ-8RqlBCt7nsAuHiP7EC1Vh4oMc +id: helfi_news_tags +label: 'Helfi: News tags' +label_plural: 'Helfi: News tags' +description: 'Retrieves news tags taxonomy terms from Helfi' +read_only: true +field_mapper_id: jsonpath +field_mapper_config: + field_mappings: + id: + value: $.id + uuid: + value: $.id + title: + value: '$.attributes["name"]' +storage_client_id: helfi_news_tags +storage_client_config: { } +persistent_cache_max_age: -1 +annotation_entity_type_id: null +annotation_bundle_id: null +annotation_field_name: null +inherits_annotation_fields: false diff --git a/conf/cmi/field.field.node.landing_page.field_content.yml b/conf/cmi/field.field.node.landing_page.field_content.yml index 6c5ca3b9..2eebef3c 100644 --- a/conf/cmi/field.field.node.landing_page.field_content.yml +++ b/conf/cmi/field.field.node.landing_page.field_content.yml @@ -6,13 +6,22 @@ dependencies: - field.storage.node.field_content - node.type.landing_page - paragraphs.paragraphs_type.banner + - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.content_liftup + - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.map + - paragraphs.paragraphs_type.news_list + - paragraphs.paragraphs_type.phasing + - paragraphs.paragraphs_type.popular_services - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.service_list + - paragraphs.paragraphs_type.target_group_links + - paragraphs.paragraphs_type.unit_search module: - entity_reference_revisions _core: @@ -47,6 +56,7 @@ settings: target_group_links: target_group_links service_list: service_list unit_search: unit_search + news_list: news_list negate: 0 target_bundles_drag_drop: accordion: @@ -100,6 +110,9 @@ settings: map: weight: -20 enabled: true + news_list: + weight: 30 + enabled: true phasing: weight: 50 enabled: true diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml index 1d987b84..a69e6e4b 100644 --- a/conf/cmi/field.field.node.page.field_content.yml +++ b/conf/cmi/field.field.node.page.field_content.yml @@ -7,15 +7,21 @@ dependencies: - node.type.page - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner + - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns + - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.content_liftup + - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.map + - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video - paragraphs.paragraphs_type.text + - paragraphs.paragraphs_type.unit_search module: - entity_reference_revisions _core: @@ -50,6 +56,7 @@ settings: event_list: event_list phasing: phasing unit_search: unit_search + news_list: news_list negate: 0 target_bundles_drag_drop: accordion: @@ -109,6 +116,9 @@ settings: map: weight: -20 enabled: true + news_list: + weight: 30 + enabled: true phasing: weight: 50 enabled: true diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml index 33bc7c2d..f9da58ae 100644 --- a/conf/cmi/field.field.node.page.field_lower_content.yml +++ b/conf/cmi/field.field.node.page.field_lower_content.yml @@ -7,12 +7,18 @@ dependencies: - node.type.page - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner + - paragraphs.paragraphs_type.chart - paragraphs.paragraphs_type.columns + - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.content_liftup + - paragraphs.paragraphs_type.event_list - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.map + - paragraphs.paragraphs_type.news_list + - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video - paragraphs.paragraphs_type.text module: @@ -48,6 +54,7 @@ settings: contact_card_listing: contact_card_listing event_list: event_list phasing: phasing + news_list: news_list negate: 0 target_bundles_drag_drop: accordion: @@ -107,6 +114,9 @@ settings: map: weight: -21 enabled: true + news_list: + weight: 30 + enabled: true phasing: weight: 50 enabled: true diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml new file mode 100644 index 00000000..44ecdcf7 --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_groups.yml @@ -0,0 +1,28 @@ +uuid: c7310135-4ee9-48c6-9250-bc97d3be29da +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_helfi_news_groups + - paragraphs.paragraphs_type.news_list +_core: + default_config_hash: nmozVFbkBc-ubKtpWG_OgdeT4yNxsLcsbBYaGDHRnUQ +id: paragraph.news_list.field_helfi_news_groups +field_name: field_helfi_news_groups +entity_type: paragraph +bundle: news_list +label: 'Helfi groups' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:helfi_news_groups' + handler_settings: + target_bundles: null + sort: + field: _none + direction: ASC + auto_create: false +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml new file mode 100644 index 00000000..b7d19477 --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_neighbourhoods.yml @@ -0,0 +1,28 @@ +uuid: 178d29aa-7560-404a-9b23-4327082045db +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_helfi_news_neighbourhoods + - paragraphs.paragraphs_type.news_list +_core: + default_config_hash: If5nJKeaunQ7ITUWZ4daCyykb7mslZDLTVrLX7Gd1Qw +id: paragraph.news_list.field_helfi_news_neighbourhoods +field_name: field_helfi_news_neighbourhoods +entity_type: paragraph +bundle: news_list +label: 'Helfi neighbourhoods' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:helfi_news_neighbourhoods' + handler_settings: + target_bundles: null + sort: + field: _none + direction: ASC + auto_create: false +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml new file mode 100644 index 00000000..020596a8 --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_helfi_news_tags.yml @@ -0,0 +1,28 @@ +uuid: 610c0fd0-1a1a-402e-a316-99b553d42a01 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_helfi_news_tags + - paragraphs.paragraphs_type.news_list +_core: + default_config_hash: imhJdbO9eLYZPslj0VosAANrRZBizg4wyPgIYQ3SOXc +id: paragraph.news_list.field_helfi_news_tags +field_name: field_helfi_news_tags +entity_type: paragraph +bundle: news_list +label: 'Helfi tags' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:helfi_news_tags' + handler_settings: + target_bundles: null + sort: + field: _none + direction: ASC + auto_create: false +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.news_list.field_limit.yml b/conf/cmi/field.field.paragraph.news_list.field_limit.yml new file mode 100644 index 00000000..8c61fd38 --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_limit.yml @@ -0,0 +1,27 @@ +uuid: ceb29476-ffa7-42d1-9ad7-43d7809c787a +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_limit + - paragraphs.paragraphs_type.news_list +_core: + default_config_hash: U69lOLLSGh16cOtXvhZr3E_x2lmlZOfxD0CmQeIMb6U +id: paragraph.news_list.field_limit +field_name: field_limit +entity_type: paragraph +bundle: news_list +label: 'Number of items to show' +description: '' +required: true +translatable: false +default_value: + - + value: 10 +default_value_callback: '' +settings: + min: 1 + max: 50 + prefix: '' + suffix: '' +field_type: integer diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml new file mode 100644 index 00000000..4fbf74df --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_news_list_description.yml @@ -0,0 +1,28 @@ +uuid: eea108bd-2214-4a41-bd4f-eb7a1c479a33 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_news_list_description + - paragraphs.paragraphs_type.news_list + module: + - allowed_formats + - text +third_party_settings: + allowed_formats: + allowed_formats: + - minimal +_core: + default_config_hash: EIpWpSFct6BBIBWOTpd87zJbnbSe0QLPeFLW9-LP1-o +id: paragraph.news_list.field_news_list_description +field_name: field_news_list_description +entity_type: paragraph +bundle: news_list +label: Description +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml b/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml new file mode 100644 index 00000000..ed8556f6 --- /dev/null +++ b/conf/cmi/field.field.paragraph.news_list.field_news_list_title.yml @@ -0,0 +1,21 @@ +uuid: 71aac1f7-5325-48d4-92ad-a87998ae2fc9 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_news_list_title + - paragraphs.paragraphs_type.news_list +_core: + default_config_hash: BVbXiEVCf8X8ZJUYKyiiyevct1RogayM-YXEWiSnuDw +id: paragraph.news_list.field_news_list_title +field_name: field_news_list_title +entity_type: paragraph +bundle: news_list +label: Title +description: '' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml index bf4ea9f5..85b768ef 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml @@ -12,6 +12,7 @@ dependencies: - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video module: @@ -43,6 +44,7 @@ settings: from_library: from_library phasing: phasing remote_video: remote_video + news_list: news_list negate: 0 target_bundles_drag_drop: accordion: @@ -84,6 +86,9 @@ settings: list_of_links_item: weight: -17 enabled: false + news_list: + weight: 30 + enabled: true phasing: weight: 50 enabled: true diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml index a7fc76f1..05d18822 100644 --- a/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml @@ -7,11 +7,13 @@ dependencies: - paragraphs.paragraphs_type.accordion - paragraphs.paragraphs_type.banner - paragraphs.paragraphs_type.columns + - paragraphs.paragraphs_type.contact_card_listing - paragraphs.paragraphs_type.content_cards - paragraphs.paragraphs_type.from_library - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.remote_video module: - entity_reference_revisions @@ -42,6 +44,7 @@ settings: from_library: from_library remote_video: remote_video contact_card_listing: contact_card_listing + news_list: news_list negate: 0 target_bundles_drag_drop: accordion: @@ -89,6 +92,9 @@ settings: list_of_links_item: weight: -17 enabled: false + news_list: + weight: 30 + enabled: true remote_video: weight: 32 enabled: true diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml new file mode 100644 index 00000000..e1663f98 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_groups.yml @@ -0,0 +1,22 @@ +uuid: 80b6eed6-5a2c-4015-b604-e7385b9f73a7 +langcode: en +status: true +dependencies: + module: + - external_entities + - paragraphs +_core: + default_config_hash: _fM_KH15dd3VWM1oQkpfJUipPHD3pK-CiqLPcuj5ssQ +id: paragraph.field_helfi_news_groups +field_name: field_helfi_news_groups +entity_type: paragraph +type: entity_reference +settings: + target_type: helfi_news_groups +module: core +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml new file mode 100644 index 00000000..ece20346 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_neighbourhoods.yml @@ -0,0 +1,22 @@ +uuid: fa528277-51ac-412e-bca1-28fd181a9dd2 +langcode: en +status: true +dependencies: + module: + - external_entities + - paragraphs +_core: + default_config_hash: VVgm-VdlvDCYm-mIewtHi0RZp_7pCoE94esxuAat4CE +id: paragraph.field_helfi_news_neighbourhoods +field_name: field_helfi_news_neighbourhoods +entity_type: paragraph +type: entity_reference +settings: + target_type: helfi_news_neighbourhoods +module: core +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml b/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml new file mode 100644 index 00000000..da56a0a5 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_helfi_news_tags.yml @@ -0,0 +1,22 @@ +uuid: 98db567a-fcc2-4754-bb97-cdee3d4162c8 +langcode: en +status: true +dependencies: + module: + - external_entities + - paragraphs +_core: + default_config_hash: nWHDiteOOAcjVLeo90MtcJBVL0ABYuABPztRIvhiv_0 +id: paragraph.field_helfi_news_tags +field_name: field_helfi_news_tags +entity_type: paragraph +type: entity_reference +settings: + target_type: helfi_news_tags +module: core +locked: false +cardinality: -1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_limit.yml b/conf/cmi/field.storage.paragraph.field_limit.yml new file mode 100644 index 00000000..fa4c1ec2 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_limit.yml @@ -0,0 +1,22 @@ +uuid: d33ee3e0-c5bf-46f6-9098-77d3a58272af +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: BN27jqBir0CqxJ0z1RtYc8WNNohSkDdtzv_9l-HRKhk +id: paragraph.field_limit +field_name: field_limit +entity_type: paragraph +type: integer +settings: + unsigned: false + size: normal +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_news_list_description.yml b/conf/cmi/field.storage.paragraph.field_news_list_description.yml new file mode 100644 index 00000000..1fb411d3 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_news_list_description.yml @@ -0,0 +1,21 @@ +uuid: 1def960c-0725-4878-b978-f67987db0257 +langcode: en +status: true +dependencies: + module: + - paragraphs + - text +_core: + default_config_hash: V_erLPi4c9bT-uhAlgcpJJX8LbR02Btsi8yzMVAIpo4 +id: paragraph.field_news_list_description +field_name: field_news_list_description +entity_type: paragraph +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/field.storage.paragraph.field_news_list_title.yml b/conf/cmi/field.storage.paragraph.field_news_list_title.yml new file mode 100644 index 00000000..60321231 --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_news_list_title.yml @@ -0,0 +1,23 @@ +uuid: 6bdc22b3-9417-40d3-9bb2-6124ac458f25 +langcode: en +status: true +dependencies: + module: + - paragraphs +_core: + default_config_hash: xapLq-jZodnhyWktgf76RTu9dEBAgWBq-ay41DJpsXQ +id: paragraph.field_news_list_title +field_name: field_news_list_title +entity_type: paragraph +type: string +settings: + max_length: 255 + case_sensitive: false + is_ascii: false +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/conf/cmi/paragraphs.paragraphs_type.news_list.yml b/conf/cmi/paragraphs.paragraphs_type.news_list.yml new file mode 100644 index 00000000..50779f43 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.news_list.yml @@ -0,0 +1,12 @@ +uuid: 2421d214-a0df-4911-b31a-37f6060d6577 +langcode: en +status: true +dependencies: { } +_core: + default_config_hash: 4NG1c_DFfBfzUCPfnwS5Sneo_G7lU_0YRfarh-p749M +id: news_list +label: 'News list' +icon_uuid: null +icon_default: null +description: '' +behavior_plugins: { } From 61e7c85381d7190ca98b2960fe64c2de8c929564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Tue, 25 Oct 2022 08:54:47 +0300 Subject: [PATCH 02/10] UHF-7195: Updated configuration translations. --- ...tem.paragraphs_library_item.paragraphs.yml | 1 + ...display.paragraph.service_list.default.yml | 4 ++ ..._display.paragraph.unit_search.default.yml | 4 ++ ...isplay.tpr_service.tpr_service.default.yml | 13 ++++ ...form_display.tpr_unit.tpr_unit.default.yml | 9 +++ ...view_display.tpr_unit.tpr_unit.default.yml | 5 ++ ...re.entity_view_mode.tpr_service.teaser.yml | 1 + ...core.entity_view_mode.tpr_unit.minimal.yml | 1 + .../core.entity_view_mode.tpr_unit.teaser.yml | 1 + ...ement.field_announcement_service_pages.yml | 1 + ...uncement.field_announcement_unit_pages.yml | 1 + ....news_list.field_news_list_description.yml | 1 + ...agraph.news_list.field_news_list_title.yml | 1 + ...ce_list.field_service_list_description.yml | 1 + ..._list.field_service_list_meta_load_mor.yml | 4 ++ ...rvice_list.field_service_list_services.yml | 1 + ....service_list.field_service_list_title.yml | 1 + ...ormation.field_unit_accessibility_unit.yml | 1 + ..._contact_card.field_unit_contact_title.yml | 1 + ...t_contact_card.field_unit_contact_unit.yml | 2 + ...ct_card.field_unit_contact_use_address.yml | 1 + ...ct_card.field_unit_contact_use_details.yml | 1 + ...ntact_card.field_unit_contact_use_link.yml | 1 + ...ct_card.field_unit_contact_use_opening.yml | 1 + ...t_card.field_unit_contact_use_override.yml | 1 + ...tact_card.field_unit_contact_use_phone.yml | 1 + ...ct_card.field_unit_contact_use_picture.yml | 1 + ...act_card.field_unit_contact_use_postal.yml | 1 + ...t_search.field_unit_search_description.yml | 1 + ...t_search.field_unit_search_meta_button.yml | 4 ++ ...it_search.field_unit_search_meta_label.yml | 4 ++ ...earch.field_unit_search_meta_load_more.yml | 4 ++ ...earch.field_unit_search_meta_placehold.yml | 4 ++ ...ph.unit_search.field_unit_search_title.yml | 1 + ...ph.unit_search.field_unit_search_units.yml | 2 + ....tpr_service.tpr_service.field_content.yml | 1 + ...ervice.tpr_service.field_lower_content.yml | 1 + ...tpr_service.tpr_service.field_metatags.yml | 1 + ...vice.tpr_service.field_sidebar_content.yml | 1 + ....field.tpr_unit.tpr_unit.field_content.yml | 1 + ....tpr_unit.tpr_unit.field_lower_content.yml | 1 + ...field.tpr_unit.tpr_unit.field_metatags.yml | 1 + ...ield.tpr_unit.tpr_unit.field_unit_type.yml | 1 + ...ld.storage.paragraph.field_link_design.yml | 8 +++ .../metatag.metatag_defaults.tpr_service.yml | 1 + .../fi/metatag.metatag_defaults.tpr_unit.yml | 1 + ...aragraphs.paragraphs_type.service_list.yml | 2 + ...paragraphs.paragraphs_type.unit_search.yml | 2 + .../fi/system.action.node_delete_action.yml | 1 + ...ction.tpr_errand_service_update_action.yml | 1 + ...m.action.tpr_service_break_lock_action.yml | 1 + ...ystem.action.tpr_service_update_action.yml | 1 + ...stem.action.tpr_unit_break_lock_action.yml | 1 + .../system.action.tpr_unit_update_action.yml | 1 + conf/cmi/language/fi/views.view.content.yml | 2 +- .../language/fi/views.view.er_tpr_unit.yml | 41 ++++++++++++ conf/cmi/language/fi/views.view.files.yml | 2 +- conf/cmi/language/fi/views.view.media.yml | 2 +- .../fi/views.view.paragraphs_library.yml | 2 +- .../language/fi/views.view.service_units.yml | 31 +++++++++ .../fi/views.view.tpr_errand_service_list.yml | 64 +++++++++++++++++++ .../views.view.tpr_service_channel_list.yml | 64 +++++++++++++++++++ .../fi/views.view.tpr_service_list.yml | 55 ++++++++++++++++ .../language/fi/views.view.tpr_unit_list.yml | 61 ++++++++++++++++++ .../language/fi/views.view.unit_search.yml | 52 +++++++++++++++ .../language/fi/views.view.unit_services.yml | 28 ++++++++ .../fi/views.view.user_admin_people.yml | 2 +- ...tem.paragraphs_library_item.paragraphs.yml | 1 + ...lay.paragraph.popular_services.default.yml | 5 ++ ...isplay.tpr_service.tpr_service.default.yml | 13 ++++ ...form_display.tpr_unit.tpr_unit.default.yml | 9 +++ ...view_display.tpr_unit.tpr_unit.default.yml | 5 ++ ...re.entity_view_mode.tpr_service.teaser.yml | 1 + ...core.entity_view_mode.tpr_unit.minimal.yml | 1 + .../core.entity_view_mode.tpr_unit.teaser.yml | 1 + ...ement.field_announcement_service_pages.yml | 1 + ...uncement.field_announcement_unit_pages.yml | 1 + ...vent_list.field_event_list_description.yml | 1 + ...raph.event_list.field_event_list_title.yml | 1 + ....news_list.field_news_list_description.yml | 1 + ...agraph.news_list.field_news_list_title.yml | 1 + ...ce_list.field_service_list_description.yml | 1 + ....service_list.field_service_list_title.yml | 1 + ...t_search.field_unit_search_description.yml | 1 + ...ph.unit_search.field_unit_search_title.yml | 1 + ....tpr_service.tpr_service.field_content.yml | 1 + ...tpr_service.tpr_service.field_metatags.yml | 1 + ....field.tpr_unit.tpr_unit.field_content.yml | 1 + ...field.tpr_unit.tpr_unit.field_metatags.yml | 1 + ...aragraphs.paragraphs_type.contact_card.yml | 1 + .../sv/system.action.node_delete_action.yml | 1 + ...ction.tpr_errand_service_update_action.yml | 1 + ...ystem.action.tpr_service_update_action.yml | 1 + .../system.action.tpr_unit_update_action.yml | 1 + .../language/sv/views.view.er_tpr_unit.yml | 41 ++++++++++++ .../sv/views.view.locked_services.yml | 39 +++++++++++ .../language/sv/views.view.locked_units.yml | 43 +++++++++++++ .../language/sv/views.view.service_units.yml | 31 +++++++++ .../sv/views.view.tpr_errand_service_list.yml | 58 +++++++++++++++++ .../views.view.tpr_service_channel_list.yml | 58 +++++++++++++++++ .../sv/views.view.tpr_service_list.yml | 58 +++++++++++++++++ .../language/sv/views.view.tpr_unit_list.yml | 57 +++++++++++++++++ .../language/sv/views.view.unit_search.yml | 48 ++++++++++++++ .../language/sv/views.view.unit_services.yml | 28 ++++++++ 104 files changed, 1027 insertions(+), 5 deletions(-) create mode 100644 conf/cmi/language/fi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml create mode 100644 conf/cmi/language/fi/core.entity_form_display.paragraph.service_list.default.yml create mode 100644 conf/cmi/language/fi/core.entity_form_display.paragraph.unit_search.default.yml create mode 100644 conf/cmi/language/fi/core.entity_form_display.tpr_service.tpr_service.default.yml create mode 100644 conf/cmi/language/fi/core.entity_form_display.tpr_unit.tpr_unit.default.yml create mode 100644 conf/cmi/language/fi/core.entity_view_display.tpr_unit.tpr_unit.default.yml create mode 100644 conf/cmi/language/fi/core.entity_view_mode.tpr_service.teaser.yml create mode 100644 conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml create mode 100644 conf/cmi/language/fi/core.entity_view_mode.tpr_unit.teaser.yml create mode 100644 conf/cmi/language/fi/field.field.node.announcement.field_announcement_service_pages.yml create mode 100644 conf/cmi/language/fi/field.field.node.announcement.field_announcement_unit_pages.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_description.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_title.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_description.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_services.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_title.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_description.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_title.yml create mode 100644 conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_units.yml create mode 100644 conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_content.yml create mode 100644 conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_lower_content.yml create mode 100644 conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_metatags.yml create mode 100644 conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_sidebar_content.yml create mode 100644 conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_content.yml create mode 100644 conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_lower_content.yml create mode 100644 conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_metatags.yml create mode 100644 conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_unit_type.yml create mode 100644 conf/cmi/language/fi/field.storage.paragraph.field_link_design.yml create mode 100644 conf/cmi/language/fi/metatag.metatag_defaults.tpr_service.yml create mode 100644 conf/cmi/language/fi/metatag.metatag_defaults.tpr_unit.yml create mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.service_list.yml create mode 100644 conf/cmi/language/fi/paragraphs.paragraphs_type.unit_search.yml create mode 100644 conf/cmi/language/fi/system.action.node_delete_action.yml create mode 100644 conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml create mode 100644 conf/cmi/language/fi/system.action.tpr_service_break_lock_action.yml create mode 100644 conf/cmi/language/fi/system.action.tpr_service_update_action.yml create mode 100644 conf/cmi/language/fi/system.action.tpr_unit_break_lock_action.yml create mode 100644 conf/cmi/language/fi/system.action.tpr_unit_update_action.yml create mode 100644 conf/cmi/language/fi/views.view.er_tpr_unit.yml create mode 100644 conf/cmi/language/fi/views.view.service_units.yml create mode 100644 conf/cmi/language/fi/views.view.tpr_errand_service_list.yml create mode 100644 conf/cmi/language/fi/views.view.tpr_service_channel_list.yml create mode 100644 conf/cmi/language/fi/views.view.tpr_service_list.yml create mode 100644 conf/cmi/language/fi/views.view.tpr_unit_list.yml create mode 100644 conf/cmi/language/fi/views.view.unit_search.yml create mode 100644 conf/cmi/language/fi/views.view.unit_services.yml create mode 100644 conf/cmi/language/sv/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml create mode 100644 conf/cmi/language/sv/core.entity_form_display.paragraph.popular_services.default.yml create mode 100644 conf/cmi/language/sv/core.entity_form_display.tpr_service.tpr_service.default.yml create mode 100644 conf/cmi/language/sv/core.entity_form_display.tpr_unit.tpr_unit.default.yml create mode 100644 conf/cmi/language/sv/core.entity_view_display.tpr_unit.tpr_unit.default.yml create mode 100644 conf/cmi/language/sv/core.entity_view_mode.tpr_service.teaser.yml create mode 100644 conf/cmi/language/sv/core.entity_view_mode.tpr_unit.minimal.yml create mode 100644 conf/cmi/language/sv/core.entity_view_mode.tpr_unit.teaser.yml create mode 100644 conf/cmi/language/sv/field.field.node.announcement.field_announcement_service_pages.yml create mode 100644 conf/cmi/language/sv/field.field.node.announcement.field_announcement_unit_pages.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_description.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_title.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_description.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_title.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_description.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_title.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_description.yml create mode 100644 conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_title.yml create mode 100644 conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_content.yml create mode 100644 conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_metatags.yml create mode 100644 conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_content.yml create mode 100644 conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_metatags.yml create mode 100644 conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml create mode 100644 conf/cmi/language/sv/system.action.node_delete_action.yml create mode 100644 conf/cmi/language/sv/system.action.tpr_errand_service_update_action.yml create mode 100644 conf/cmi/language/sv/system.action.tpr_service_update_action.yml create mode 100644 conf/cmi/language/sv/system.action.tpr_unit_update_action.yml create mode 100644 conf/cmi/language/sv/views.view.er_tpr_unit.yml create mode 100644 conf/cmi/language/sv/views.view.locked_services.yml create mode 100644 conf/cmi/language/sv/views.view.locked_units.yml create mode 100644 conf/cmi/language/sv/views.view.service_units.yml create mode 100644 conf/cmi/language/sv/views.view.tpr_errand_service_list.yml create mode 100644 conf/cmi/language/sv/views.view.tpr_service_channel_list.yml create mode 100644 conf/cmi/language/sv/views.view.tpr_service_list.yml create mode 100644 conf/cmi/language/sv/views.view.tpr_unit_list.yml create mode 100644 conf/cmi/language/sv/views.view.unit_search.yml create mode 100644 conf/cmi/language/sv/views.view.unit_services.yml diff --git a/conf/cmi/language/fi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/conf/cmi/language/fi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml new file mode 100644 index 00000000..0506b0f2 --- /dev/null +++ b/conf/cmi/language/fi/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml @@ -0,0 +1 @@ +label: Lohkot diff --git a/conf/cmi/language/fi/core.entity_form_display.paragraph.service_list.default.yml b/conf/cmi/language/fi/core.entity_form_display.paragraph.service_list.default.yml new file mode 100644 index 00000000..4540f93d --- /dev/null +++ b/conf/cmi/language/fi/core.entity_form_display.paragraph.service_list.default.yml @@ -0,0 +1,4 @@ +third_party_settings: + field_group: + group_unit_search_metadata: + label: Metatiedot diff --git a/conf/cmi/language/fi/core.entity_form_display.paragraph.unit_search.default.yml b/conf/cmi/language/fi/core.entity_form_display.paragraph.unit_search.default.yml new file mode 100644 index 00000000..4540f93d --- /dev/null +++ b/conf/cmi/language/fi/core.entity_form_display.paragraph.unit_search.default.yml @@ -0,0 +1,4 @@ +third_party_settings: + field_group: + group_unit_search_metadata: + label: Metatiedot diff --git a/conf/cmi/language/fi/core.entity_form_display.tpr_service.tpr_service.default.yml b/conf/cmi/language/fi/core.entity_form_display.tpr_service.tpr_service.default.yml new file mode 100644 index 00000000..555b7d86 --- /dev/null +++ b/conf/cmi/language/fi/core.entity_form_display.tpr_service.tpr_service.default.yml @@ -0,0 +1,13 @@ +content: + field_content: + settings: + title: Lohko + title_plural: Lohkot + field_lower_content: + settings: + title: Lohko + title_plural: Lohkot + field_sidebar_content: + settings: + title: Lohko + title_plural: Lohkot diff --git a/conf/cmi/language/fi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/language/fi/core.entity_form_display.tpr_unit.tpr_unit.default.yml new file mode 100644 index 00000000..f79e5541 --- /dev/null +++ b/conf/cmi/language/fi/core.entity_form_display.tpr_unit.tpr_unit.default.yml @@ -0,0 +1,9 @@ +content: + field_content: + settings: + title: Lohko + title_plural: Lohkot + field_lower_content: + settings: + title: Lohko + title_plural: Lohkot diff --git a/conf/cmi/language/fi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/language/fi/core.entity_view_display.tpr_unit.tpr_unit.default.yml new file mode 100644 index 00000000..e718bed2 --- /dev/null +++ b/conf/cmi/language/fi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -0,0 +1,5 @@ +content: + service_map_embed: + settings: + iframe_title: 'Sijainti kartalla' + link_title: 'Avaa kartta uuteen ikkunaan' diff --git a/conf/cmi/language/fi/core.entity_view_mode.tpr_service.teaser.yml b/conf/cmi/language/fi/core.entity_view_mode.tpr_service.teaser.yml new file mode 100644 index 00000000..4e05661e --- /dev/null +++ b/conf/cmi/language/fi/core.entity_view_mode.tpr_service.teaser.yml @@ -0,0 +1 @@ +label: Lyhennelmä diff --git a/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml b/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml new file mode 100644 index 00000000..d11ac5ab --- /dev/null +++ b/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.minimal.yml @@ -0,0 +1 @@ +label: Minimaalinen diff --git a/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.teaser.yml b/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.teaser.yml new file mode 100644 index 00000000..4e05661e --- /dev/null +++ b/conf/cmi/language/fi/core.entity_view_mode.tpr_unit.teaser.yml @@ -0,0 +1 @@ +label: Lyhennelmä diff --git a/conf/cmi/language/fi/field.field.node.announcement.field_announcement_service_pages.yml b/conf/cmi/language/fi/field.field.node.announcement.field_announcement_service_pages.yml new file mode 100644 index 00000000..7ec3dade --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.announcement.field_announcement_service_pages.yml @@ -0,0 +1 @@ +label: 'Näytä palvelusivuilla' diff --git a/conf/cmi/language/fi/field.field.node.announcement.field_announcement_unit_pages.yml b/conf/cmi/language/fi/field.field.node.announcement.field_announcement_unit_pages.yml new file mode 100644 index 00000000..35a5d970 --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.announcement.field_announcement_unit_pages.yml @@ -0,0 +1 @@ +label: 'Näytä toimipistesivuilla' diff --git a/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_description.yml b/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_description.yml new file mode 100644 index 00000000..ed08ca71 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_description.yml @@ -0,0 +1 @@ +label: Kuvaus diff --git a/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_title.yml b/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_title.yml new file mode 100644 index 00000000..f02d7516 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.news_list.field_news_list_title.yml @@ -0,0 +1 @@ +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_description.yml b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_description.yml new file mode 100644 index 00000000..ed08ca71 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_description.yml @@ -0,0 +1 @@ +label: Kuvaus diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml new file mode 100644 index 00000000..391309c0 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_meta_load_mor.yml @@ -0,0 +1,4 @@ +label: 'Lataa lisää - otsikko' +default_value: + - + value: 'Lataa lisää palveluita' diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_services.yml b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_services.yml new file mode 100644 index 00000000..e1c99b01 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_services.yml @@ -0,0 +1 @@ +label: Palvelut diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_title.yml b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_title.yml new file mode 100644 index 00000000..f02d7516 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.service_list.field_service_list_title.yml @@ -0,0 +1 @@ +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml b/conf/cmi/language/fi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml new file mode 100644 index 00000000..88e5b786 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_accessibility_information.field_unit_accessibility_unit.yml @@ -0,0 +1 @@ +label: Toimipiste diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml new file mode 100644 index 00000000..f02d7516 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_title.yml @@ -0,0 +1 @@ +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml new file mode 100644 index 00000000..2b7d9378 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_unit.yml @@ -0,0 +1,2 @@ +label: Toimipiste +description: 'Lisää tähän sen toimipisteen otsikko jonka haluat nostaa sivulle. Toimipisteen ei tarvitse olla julkaistu.' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml new file mode 100644 index 00000000..4ec927ba --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_address.yml @@ -0,0 +1 @@ +label: 'Näytä katuosoite' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml new file mode 100644 index 00000000..cea1720e --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_details.yml @@ -0,0 +1 @@ +label: 'Näytä lisätiedot' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml new file mode 100644 index 00000000..d7e060bc --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_link.yml @@ -0,0 +1 @@ +label: 'Näytä linkki toimipistesivulle' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml new file mode 100644 index 00000000..9c558e5b --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_opening.yml @@ -0,0 +1 @@ +label: 'Näytä aukioloajat' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml new file mode 100644 index 00000000..7ced463e --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_override.yml @@ -0,0 +1 @@ +label: 'Suosi ylikirjoituskuvaa' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml new file mode 100644 index 00000000..e2d3e1b5 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_phone.yml @@ -0,0 +1 @@ +label: 'Näytä puhelinnumero' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml new file mode 100644 index 00000000..eae45b58 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_picture.yml @@ -0,0 +1 @@ +label: 'Näytä kuva' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml new file mode 100644 index 00000000..ee9ef69e --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_contact_card.field_unit_contact_use_postal.yml @@ -0,0 +1 @@ +label: 'Näytä postiosoite' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_description.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_description.yml new file mode 100644 index 00000000..ed08ca71 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_description.yml @@ -0,0 +1 @@ +label: Kuvaus diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml new file mode 100644 index 00000000..777540d9 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_button.yml @@ -0,0 +1,4 @@ +label: 'Hakukentän painike' +default_value: + - + value: 'Hae toimipisteitä' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml new file mode 100644 index 00000000..604b984b --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_label.yml @@ -0,0 +1,4 @@ +label: 'Hakukentän otsikko' +default_value: + - + value: 'Hae toimipisteitä' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml new file mode 100644 index 00000000..3af0e26f --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_load_more.yml @@ -0,0 +1,4 @@ +label: 'Lataa lisää - otsikko' +default_value: + - + value: 'Lataa lisää toimipisteitä' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml new file mode 100644 index 00000000..3c456672 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_meta_placehold.yml @@ -0,0 +1,4 @@ +label: 'Hakukentän oletusteksti' +default_value: + - + value: 'Syötä nimi, osoite tai postinumero' diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_title.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_title.yml new file mode 100644 index 00000000..f02d7516 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_title.yml @@ -0,0 +1 @@ +label: Otsikko diff --git a/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_units.yml b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_units.yml new file mode 100644 index 00000000..cb83006f --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.unit_search.field_unit_search_units.yml @@ -0,0 +1,2 @@ +label: Toimipisteet +description: 'Valitse toimipisteen joiden seasta haluat käyttäjän etsivän toimipisteitä.' diff --git a/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_content.yml b/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_content.yml new file mode 100644 index 00000000..f071da81 --- /dev/null +++ b/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_content.yml @@ -0,0 +1 @@ +label: 'Ylempi sisältöalue' diff --git a/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_lower_content.yml new file mode 100644 index 00000000..4b8c5358 --- /dev/null +++ b/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_lower_content.yml @@ -0,0 +1 @@ +label: 'Alempi sisältöalue' diff --git a/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_metatags.yml b/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_metatags.yml new file mode 100644 index 00000000..887475e2 --- /dev/null +++ b/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_metatags.yml @@ -0,0 +1 @@ +label: Metatunnisteet diff --git a/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_sidebar_content.yml b/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_sidebar_content.yml new file mode 100644 index 00000000..2c1140fd --- /dev/null +++ b/conf/cmi/language/fi/field.field.tpr_service.tpr_service.field_sidebar_content.yml @@ -0,0 +1 @@ +label: 'Sivupalkin sisältö' diff --git a/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_content.yml b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_content.yml new file mode 100644 index 00000000..f071da81 --- /dev/null +++ b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_content.yml @@ -0,0 +1 @@ +label: 'Ylempi sisältöalue' diff --git a/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_lower_content.yml b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_lower_content.yml new file mode 100644 index 00000000..4b8c5358 --- /dev/null +++ b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_lower_content.yml @@ -0,0 +1 @@ +label: 'Alempi sisältöalue' diff --git a/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_metatags.yml b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_metatags.yml new file mode 100644 index 00000000..887475e2 --- /dev/null +++ b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_metatags.yml @@ -0,0 +1 @@ +label: Metatunnisteet diff --git a/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_unit_type.yml b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_unit_type.yml new file mode 100644 index 00000000..f049ea53 --- /dev/null +++ b/conf/cmi/language/fi/field.field.tpr_unit.tpr_unit.field_unit_type.yml @@ -0,0 +1 @@ +label: 'Toimipisteen tyyppi' diff --git a/conf/cmi/language/fi/field.storage.paragraph.field_link_design.yml b/conf/cmi/language/fi/field.storage.paragraph.field_link_design.yml new file mode 100644 index 00000000..dc0c8829 --- /dev/null +++ b/conf/cmi/language/fi/field.storage.paragraph.field_link_design.yml @@ -0,0 +1,8 @@ +settings: + allowed_values: + - + label: 'Painike, täysvärinen' + - + label: 'Painike, kehystetty' + - + label: 'Painike, läpinäkyvä' diff --git a/conf/cmi/language/fi/metatag.metatag_defaults.tpr_service.yml b/conf/cmi/language/fi/metatag.metatag_defaults.tpr_service.yml new file mode 100644 index 00000000..0d3e4e59 --- /dev/null +++ b/conf/cmi/language/fi/metatag.metatag_defaults.tpr_service.yml @@ -0,0 +1 @@ +label: 'TPR - Palvelu' diff --git a/conf/cmi/language/fi/metatag.metatag_defaults.tpr_unit.yml b/conf/cmi/language/fi/metatag.metatag_defaults.tpr_unit.yml new file mode 100644 index 00000000..9ffa7dc1 --- /dev/null +++ b/conf/cmi/language/fi/metatag.metatag_defaults.tpr_unit.yml @@ -0,0 +1 @@ +label: 'TPR - Toimipiste' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list.yml new file mode 100644 index 00000000..fed53d89 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list.yml @@ -0,0 +1,2 @@ +label: Palvelulistaus +description: 'Palvelulistaus lohkolla sisällöntuottaja voi sijoittaa listan palveluista valitsemalleen sivulle. Lohkosta valitaan julkaistut palvelut joita halutaan näyttää loppukäyttäjälle.' diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.unit_search.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.unit_search.yml new file mode 100644 index 00000000..8f5aa9a8 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.unit_search.yml @@ -0,0 +1,2 @@ +label: Toimipistehaku +description: 'Toimipistehaku paragraafilla sisällöntuottaja voi sijoittaa toimipistehaun valitsemalleen sivulle. Paragraphista valitaan toimipisteet joita halutaan näyttää loppukäyttäjälle.' diff --git a/conf/cmi/language/fi/system.action.node_delete_action.yml b/conf/cmi/language/fi/system.action.node_delete_action.yml new file mode 100644 index 00000000..eede3d48 --- /dev/null +++ b/conf/cmi/language/fi/system.action.node_delete_action.yml @@ -0,0 +1 @@ +label: 'Poista sisältö' diff --git a/conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml b/conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml new file mode 100644 index 00000000..717de724 --- /dev/null +++ b/conf/cmi/language/fi/system.action.tpr_errand_service_update_action.yml @@ -0,0 +1 @@ +label: Päivitä diff --git a/conf/cmi/language/fi/system.action.tpr_service_break_lock_action.yml b/conf/cmi/language/fi/system.action.tpr_service_break_lock_action.yml new file mode 100644 index 00000000..fc42aa00 --- /dev/null +++ b/conf/cmi/language/fi/system.action.tpr_service_break_lock_action.yml @@ -0,0 +1 @@ +label: 'Riko lukko sisällöltä' diff --git a/conf/cmi/language/fi/system.action.tpr_service_update_action.yml b/conf/cmi/language/fi/system.action.tpr_service_update_action.yml new file mode 100644 index 00000000..717de724 --- /dev/null +++ b/conf/cmi/language/fi/system.action.tpr_service_update_action.yml @@ -0,0 +1 @@ +label: Päivitä diff --git a/conf/cmi/language/fi/system.action.tpr_unit_break_lock_action.yml b/conf/cmi/language/fi/system.action.tpr_unit_break_lock_action.yml new file mode 100644 index 00000000..fc42aa00 --- /dev/null +++ b/conf/cmi/language/fi/system.action.tpr_unit_break_lock_action.yml @@ -0,0 +1 @@ +label: 'Riko lukko sisällöltä' diff --git a/conf/cmi/language/fi/system.action.tpr_unit_update_action.yml b/conf/cmi/language/fi/system.action.tpr_unit_update_action.yml new file mode 100644 index 00000000..717de724 --- /dev/null +++ b/conf/cmi/language/fi/system.action.tpr_unit_update_action.yml @@ -0,0 +1 @@ +label: Päivitä diff --git a/conf/cmi/language/fi/views.view.content.yml b/conf/cmi/language/fi/views.view.content.yml index 2e9a5f1a..91e65853 100644 --- a/conf/cmi/language/fi/views.view.content.yml +++ b/conf/cmi/language/fi/views.view.content.yml @@ -30,7 +30,7 @@ display: last: 'Viimeinen »' exposed_form: options: - submit_button: Suodatin + submit_button: Suodata reset_button_label: Palauta exposed_sorts_label: Lajittele sort_asc_label: Nousevasti diff --git a/conf/cmi/language/fi/views.view.er_tpr_unit.yml b/conf/cmi/language/fi/views.view.er_tpr_unit.yml new file mode 100644 index 00000000..a11d669d --- /dev/null +++ b/conf/cmi/language/fi/views.view.er_tpr_unit.yml @@ -0,0 +1,41 @@ +display: + default: + display_title: Oletus + display_options: + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + expose: + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' + offset_label: Offset + tags: + previous: '‹ Edellinen' + next: 'Seuraava ›' + fields: + name: + separator: ', ' + empty: + area: + content: + value: "

Ei tuloksia

\r\n" + arguments: + id: + exception: + title: Kaikki + entity_reference: + display_title: Entiteettiviittaus + display_options: + fields: + name_override: + separator: ', ' + id: + separator: ', ' + name: + separator: ', ' diff --git a/conf/cmi/language/fi/views.view.files.yml b/conf/cmi/language/fi/views.view.files.yml index 1d1e66d2..32d7ce0d 100644 --- a/conf/cmi/language/fi/views.view.files.yml +++ b/conf/cmi/language/fi/views.view.files.yml @@ -6,7 +6,7 @@ display: display_options: exposed_form: options: - submit_button: Suodatin + submit_button: Suodata reset_button_label: Palauta exposed_sorts_label: Lajittele sort_asc_label: Nousevasti diff --git a/conf/cmi/language/fi/views.view.media.yml b/conf/cmi/language/fi/views.view.media.yml index 76eadad6..4e324388 100644 --- a/conf/cmi/language/fi/views.view.media.yml +++ b/conf/cmi/language/fi/views.view.media.yml @@ -44,7 +44,7 @@ display: offset_label: Offset exposed_form: options: - submit_button: Suodatin + submit_button: Suodata reset_button_label: Palauta exposed_sorts_label: Lajittele sort_asc_label: Nousevasti diff --git a/conf/cmi/language/fi/views.view.paragraphs_library.yml b/conf/cmi/language/fi/views.view.paragraphs_library.yml index 611cf9f2..dd254064 100644 --- a/conf/cmi/language/fi/views.view.paragraphs_library.yml +++ b/conf/cmi/language/fi/views.view.paragraphs_library.yml @@ -5,7 +5,7 @@ display: display_options: exposed_form: options: - submit_button: Suodatin + submit_button: Suodata reset_button_label: Palauta exposed_sorts_label: Lajittele sort_asc_label: Nousevasti diff --git a/conf/cmi/language/fi/views.view.service_units.yml b/conf/cmi/language/fi/views.view.service_units.yml new file mode 100644 index 00000000..88fea3cf --- /dev/null +++ b/conf/cmi/language/fi/views.view.service_units.yml @@ -0,0 +1,31 @@ +display: + default: + display_title: Oletus + display_options: + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + tags: + previous: '‹ Edellinen' + next: 'Seuraava ›' + expose: + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' + offset_label: Offset + views_infinite_scroll: + button_text: 'Lataa lisää palvelupaikkoja' + fields: + name: + separator: ', ' + arguments: + id: + exception: + title: Kaikki + service_units: + display_title: Lohko diff --git a/conf/cmi/language/fi/views.view.tpr_errand_service_list.yml b/conf/cmi/language/fi/views.view.tpr_errand_service_list.yml new file mode 100644 index 00000000..65b2b0d8 --- /dev/null +++ b/conf/cmi/language/fi/views.view.tpr_errand_service_list.yml @@ -0,0 +1,64 @@ +label: 'TPR Asiointipalvelut' +display: + default: + display_title: Oletus + display_options: + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + tags: + previous: '‹ Edellinen' + next: 'Seuraava ›' + first: '« Ensimmäinen' + last: 'Viimeinen »' + expose: + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' + offset_label: Offset + fields: + tpr_errand_service_bulk_form: + label: Massapäivitys + action_title: Toiminto + id: + label: ID + separator: ', ' + name: + label: Nimi + separator: ', ' + langcode: + label: Kieli + separator: ', ' + content_translation_status: + label: Tila + settings: + format_custom_true: Julkaistu + format_custom_false: Julkaisematon + separator: ', ' + content_translation_changed: + label: Päivitetty + separator: ', ' + operations: + label: Toimenpiteet + filters: + combine: + expose: + label: Search + langcode: + expose: + label: Kieli + title: 'TPR Asiointipalvelut' + header: + result: + content: 'Näytetään @start - @end / @total' + empty: + area: + content: + value: 'Ei tuloksia.' + page_1: + display_title: Sivu diff --git a/conf/cmi/language/fi/views.view.tpr_service_channel_list.yml b/conf/cmi/language/fi/views.view.tpr_service_channel_list.yml new file mode 100644 index 00000000..98b4365c --- /dev/null +++ b/conf/cmi/language/fi/views.view.tpr_service_channel_list.yml @@ -0,0 +1,64 @@ +label: 'TPR Palvelukanavat' +display: + default: + display_title: Oletus + display_options: + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + tags: + previous: '‹ Edellinen' + next: 'Seuraava ›' + first: '« Ensimmäinen' + last: 'Viimeinen »' + expose: + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' + offset_label: Offset + fields: + tpr_service_channel_bulk_form: + label: Massapäivitys + action_title: Toiminto + id: + label: ID + separator: ', ' + name: + label: Nimi + separator: ', ' + langcode: + label: Kieli + separator: ', ' + content_translation_status: + label: Tila + settings: + format_custom_true: Julkaistu + format_custom_false: Julkaisematon + separator: ', ' + content_translation_changed: + label: Päivitetty + separator: ', ' + operations: + label: Toimenpiteet + filters: + combine: + expose: + label: Search + langcode: + expose: + label: Kieli + title: 'TPR Palvelukanavat' + header: + result: + content: 'Näytetään @start - @end / @total' + empty: + area: + content: + value: 'Ei tuloksia.' + page_1: + display_title: Sivu diff --git a/conf/cmi/language/fi/views.view.tpr_service_list.yml b/conf/cmi/language/fi/views.view.tpr_service_list.yml new file mode 100644 index 00000000..b9917df6 --- /dev/null +++ b/conf/cmi/language/fi/views.view.tpr_service_list.yml @@ -0,0 +1,55 @@ +display: + default: + display_options: + exposed_form: + options: + submit_button: Suodata + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + tags: + previous: '‹ Edellinen' + next: 'Seuraava ›' + first: '« Ensimmäinen' + last: 'Viimeinen »' + expose: + items_per_page_label: 'Tuloksia sivua kohden' + items_per_page_options_all_label: '- Kaikki -' + fields: + tpr_service_bulk_form: + action_title: Toimenpide + name: + label: Nimi + langcode: + label: Kieli + content_translation_status: + label: Tila + settings: + format_custom_true: Julkaistu + format_custom_false: Julkaisematon + content_translation_changed: + label: Päivitetty + operations: + label: Toimenpiteet + filters: + combine: + expose: + label: Haku + langcode: + expose: + label: Kieli + title: 'TPR Palvelut' + header: + result: + content: 'Näytetään @start - @end / @total' + empty: + area: + content: + value: 'Palveluita ei löytynyt.' + format: plain_text + page_1: + display_title: Sivu +label: 'TPR Palvelut' diff --git a/conf/cmi/language/fi/views.view.tpr_unit_list.yml b/conf/cmi/language/fi/views.view.tpr_unit_list.yml new file mode 100644 index 00000000..49a1527c --- /dev/null +++ b/conf/cmi/language/fi/views.view.tpr_unit_list.yml @@ -0,0 +1,61 @@ +label: 'TPR Toimipisteet' +display: + default: + display_title: Oletus + display_options: + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + tags: + previous: '‹ Edellinen' + next: 'Seuraava ›' + first: '« Ensimmäinen' + last: 'Viimeinen »' + expose: + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' + offset_label: Offset + fields: + id: + label: ID + separator: ', ' + name: + label: Nimi + separator: ', ' + langcode: + label: Kieli + separator: ', ' + content_translation_status: + label: Tila + settings: + format_custom_true: Julkaistu + format_custom_false: Julkaisematon + separator: ', ' + content_translation_changed: + label: Päivitetty + separator: ', ' + operations: + label: Toimenpiteet + filters: + combine: + expose: + label: Search + langcode: + expose: + label: Kieli + title: 'TPR Toimipisteet' + header: + result: + content: 'Näytetään @start - @end / @total' + empty: + area: + content: + value: 'Ei tuloksia.' + page_1: + display_title: Sivu diff --git a/conf/cmi/language/fi/views.view.unit_search.yml b/conf/cmi/language/fi/views.view.unit_search.yml new file mode 100644 index 00000000..3aa28633 --- /dev/null +++ b/conf/cmi/language/fi/views.view.unit_search.yml @@ -0,0 +1,52 @@ +display: + default: + display_options: + empty: + area: + content: + format: full_html + value: "

Ei tuloksia

\r\n" + pager: + options: + tags: + previous: '‹ Edellinen' + next: 'Seuraava ›' + expose: + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' + offset_label: Offset + views_infinite_scroll: + button_text: 'Lataa lisää' + fields: + name: + separator: ', ' + address__postal_code: + separator: ', ' + address__address_line1: + separator: ', ' + address__address_line2: + separator: ', ' + filters: + combine: + expose: + label: Search + group_info: + label: 'Combine fields filter' + arguments: + id: + exception: + title: Kaikki + display_title: Oletus + block: + display_title: Lohko + entity_reference: + display_title: Entiteettiviittaus + display_options: + fields: + name_override: + separator: ', ' + id: + separator: ', ' + name: + separator: ', ' +label: Toimipistehaku diff --git a/conf/cmi/language/fi/views.view.unit_services.yml b/conf/cmi/language/fi/views.view.unit_services.yml new file mode 100644 index 00000000..d86ac366 --- /dev/null +++ b/conf/cmi/language/fi/views.view.unit_services.yml @@ -0,0 +1,28 @@ +display: + default: + display_title: Oletus + display_options: + exposed_form: + options: + submit_button: Käytä + reset_button_label: Palauta + exposed_sorts_label: Lajittele + sort_asc_label: Nousevasti + sort_desc_label: Laskevasti + pager: + options: + tags: + previous: '‹ Edellinen' + next: 'Seuraava ›' + expose: + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' + offset_label: Offset + views_infinite_scroll: + button_text: 'Lataa lisää palveluita' + arguments: + id: + exception: + title: Kaikki + unit_services: + display_title: Lohko 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 ea7ac35a..dacf9ecb 100644 --- a/conf/cmi/language/fi/views.view.user_admin_people.yml +++ b/conf/cmi/language/fi/views.view.user_admin_people.yml @@ -38,7 +38,7 @@ display: offset_label: Offset exposed_form: options: - submit_button: Suodatin + submit_button: Suodata reset_button_label: Palauta exposed_sorts_label: Lajittele sort_asc_label: Nousevasti diff --git a/conf/cmi/language/sv/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml b/conf/cmi/language/sv/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml new file mode 100644 index 00000000..6e922b8a --- /dev/null +++ b/conf/cmi/language/sv/core.base_field_override.paragraphs_library_item.paragraphs_library_item.paragraphs.yml @@ -0,0 +1 @@ +label: Paragrafer diff --git a/conf/cmi/language/sv/core.entity_form_display.paragraph.popular_services.default.yml b/conf/cmi/language/sv/core.entity_form_display.paragraph.popular_services.default.yml new file mode 100644 index 00000000..f891adbb --- /dev/null +++ b/conf/cmi/language/sv/core.entity_form_display.paragraph.popular_services.default.yml @@ -0,0 +1,5 @@ +content: + field_service_items: + settings: + title: Paragraf + title_plural: Paragrafer diff --git a/conf/cmi/language/sv/core.entity_form_display.tpr_service.tpr_service.default.yml b/conf/cmi/language/sv/core.entity_form_display.tpr_service.tpr_service.default.yml new file mode 100644 index 00000000..03f6617a --- /dev/null +++ b/conf/cmi/language/sv/core.entity_form_display.tpr_service.tpr_service.default.yml @@ -0,0 +1,13 @@ +content: + field_content: + settings: + title: Paragraf + title_plural: Paragrafer + field_lower_content: + settings: + title: Paragraf + title_plural: Paragrafer + field_sidebar_content: + settings: + title: Paragraf + title_plural: Paragrafer diff --git a/conf/cmi/language/sv/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/language/sv/core.entity_form_display.tpr_unit.tpr_unit.default.yml new file mode 100644 index 00000000..2fbadef9 --- /dev/null +++ b/conf/cmi/language/sv/core.entity_form_display.tpr_unit.tpr_unit.default.yml @@ -0,0 +1,9 @@ +content: + field_content: + settings: + title: Paragraf + title_plural: Paragrafer + field_lower_content: + settings: + title: Paragraf + title_plural: Paragrafer diff --git a/conf/cmi/language/sv/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/language/sv/core.entity_view_display.tpr_unit.tpr_unit.default.yml new file mode 100644 index 00000000..d3b91e5d --- /dev/null +++ b/conf/cmi/language/sv/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -0,0 +1,5 @@ +content: + service_map_embed: + settings: + iframe_title: 'Plats på kartan' + link_title: 'Öppna kartan i nytt fönster' diff --git a/conf/cmi/language/sv/core.entity_view_mode.tpr_service.teaser.yml b/conf/cmi/language/sv/core.entity_view_mode.tpr_service.teaser.yml new file mode 100644 index 00000000..9f41cd11 --- /dev/null +++ b/conf/cmi/language/sv/core.entity_view_mode.tpr_service.teaser.yml @@ -0,0 +1 @@ +label: Ingress diff --git a/conf/cmi/language/sv/core.entity_view_mode.tpr_unit.minimal.yml b/conf/cmi/language/sv/core.entity_view_mode.tpr_unit.minimal.yml new file mode 100644 index 00000000..06660f47 --- /dev/null +++ b/conf/cmi/language/sv/core.entity_view_mode.tpr_unit.minimal.yml @@ -0,0 +1 @@ +label: Minimal diff --git a/conf/cmi/language/sv/core.entity_view_mode.tpr_unit.teaser.yml b/conf/cmi/language/sv/core.entity_view_mode.tpr_unit.teaser.yml new file mode 100644 index 00000000..9f41cd11 --- /dev/null +++ b/conf/cmi/language/sv/core.entity_view_mode.tpr_unit.teaser.yml @@ -0,0 +1 @@ +label: Ingress diff --git a/conf/cmi/language/sv/field.field.node.announcement.field_announcement_service_pages.yml b/conf/cmi/language/sv/field.field.node.announcement.field_announcement_service_pages.yml new file mode 100644 index 00000000..d101e15d --- /dev/null +++ b/conf/cmi/language/sv/field.field.node.announcement.field_announcement_service_pages.yml @@ -0,0 +1 @@ +label: 'Visa på servicesidor' diff --git a/conf/cmi/language/sv/field.field.node.announcement.field_announcement_unit_pages.yml b/conf/cmi/language/sv/field.field.node.announcement.field_announcement_unit_pages.yml new file mode 100644 index 00000000..2a122002 --- /dev/null +++ b/conf/cmi/language/sv/field.field.node.announcement.field_announcement_unit_pages.yml @@ -0,0 +1 @@ +label: 'Visa på enhetssidor' diff --git a/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_description.yml b/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_description.yml new file mode 100644 index 00000000..45893182 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_description.yml @@ -0,0 +1 @@ +label: Beskrivning diff --git a/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_title.yml b/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_title.yml new file mode 100644 index 00000000..2711e04d --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.event_list.field_event_list_title.yml @@ -0,0 +1 @@ +label: Titel diff --git a/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_description.yml b/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_description.yml new file mode 100644 index 00000000..45893182 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_description.yml @@ -0,0 +1 @@ +label: Beskrivning diff --git a/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_title.yml b/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_title.yml new file mode 100644 index 00000000..2711e04d --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.news_list.field_news_list_title.yml @@ -0,0 +1 @@ +label: Titel diff --git a/conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_description.yml b/conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_description.yml new file mode 100644 index 00000000..45893182 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_description.yml @@ -0,0 +1 @@ +label: Beskrivning diff --git a/conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_title.yml b/conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_title.yml new file mode 100644 index 00000000..2711e04d --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.service_list.field_service_list_title.yml @@ -0,0 +1 @@ +label: Titel diff --git a/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_description.yml b/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_description.yml new file mode 100644 index 00000000..45893182 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_description.yml @@ -0,0 +1 @@ +label: Beskrivning diff --git a/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_title.yml b/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_title.yml new file mode 100644 index 00000000..2711e04d --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.unit_search.field_unit_search_title.yml @@ -0,0 +1 @@ +label: Titel diff --git a/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_content.yml b/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_content.yml new file mode 100644 index 00000000..0f9163b8 --- /dev/null +++ b/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_content.yml @@ -0,0 +1 @@ +label: Innehåll diff --git a/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_metatags.yml b/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_metatags.yml new file mode 100644 index 00000000..953a4a90 --- /dev/null +++ b/conf/cmi/language/sv/field.field.tpr_service.tpr_service.field_metatags.yml @@ -0,0 +1 @@ +label: Metatags diff --git a/conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_content.yml b/conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_content.yml new file mode 100644 index 00000000..0f9163b8 --- /dev/null +++ b/conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_content.yml @@ -0,0 +1 @@ +label: Innehåll diff --git a/conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_metatags.yml b/conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_metatags.yml new file mode 100644 index 00000000..953a4a90 --- /dev/null +++ b/conf/cmi/language/sv/field.field.tpr_unit.tpr_unit.field_metatags.yml @@ -0,0 +1 @@ +label: Metatags diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml new file mode 100644 index 00000000..93bfcdce --- /dev/null +++ b/conf/cmi/language/sv/paragraphs.paragraphs_type.contact_card.yml @@ -0,0 +1 @@ +label: Kontaktkort diff --git a/conf/cmi/language/sv/system.action.node_delete_action.yml b/conf/cmi/language/sv/system.action.node_delete_action.yml new file mode 100644 index 00000000..d0aa2eb6 --- /dev/null +++ b/conf/cmi/language/sv/system.action.node_delete_action.yml @@ -0,0 +1 @@ +label: 'Radera innehåll' diff --git a/conf/cmi/language/sv/system.action.tpr_errand_service_update_action.yml b/conf/cmi/language/sv/system.action.tpr_errand_service_update_action.yml new file mode 100644 index 00000000..808e4ef3 --- /dev/null +++ b/conf/cmi/language/sv/system.action.tpr_errand_service_update_action.yml @@ -0,0 +1 @@ +label: Uppdatera diff --git a/conf/cmi/language/sv/system.action.tpr_service_update_action.yml b/conf/cmi/language/sv/system.action.tpr_service_update_action.yml new file mode 100644 index 00000000..808e4ef3 --- /dev/null +++ b/conf/cmi/language/sv/system.action.tpr_service_update_action.yml @@ -0,0 +1 @@ +label: Uppdatera diff --git a/conf/cmi/language/sv/system.action.tpr_unit_update_action.yml b/conf/cmi/language/sv/system.action.tpr_unit_update_action.yml new file mode 100644 index 00000000..808e4ef3 --- /dev/null +++ b/conf/cmi/language/sv/system.action.tpr_unit_update_action.yml @@ -0,0 +1 @@ +label: Uppdatera diff --git a/conf/cmi/language/sv/views.view.er_tpr_unit.yml b/conf/cmi/language/sv/views.view.er_tpr_unit.yml new file mode 100644 index 00000000..78ab74c6 --- /dev/null +++ b/conf/cmi/language/sv/views.view.er_tpr_unit.yml @@ -0,0 +1,41 @@ +display: + default: + display_title: Förvald + display_options: + exposed_form: + options: + submit_button: Verkställ + 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: ‹‹ + next: ›› + fields: + name: + separator: ', ' + empty: + area: + content: + value: 'Inget resultat' + arguments: + id: + exception: + title: Alla + entity_reference: + display_title: Objektsreferens + display_options: + fields: + name_override: + separator: ', ' + id: + separator: ', ' + name: + separator: ', ' diff --git a/conf/cmi/language/sv/views.view.locked_services.yml b/conf/cmi/language/sv/views.view.locked_services.yml new file mode 100644 index 00000000..a7c6485d --- /dev/null +++ b/conf/cmi/language/sv/views.view.locked_services.yml @@ -0,0 +1,39 @@ +display: + default: + display_title: Förvald + display_options: + fields: + tpr_service_bulk_form: + label: Massuppdatera + action_title: Åtgärd + name: + label: Titel + separator: ', ' + name_1: + label: 'Lås ägare' + separator: ', ' + langcode: + label: 'Content language' + separator: ', ' + operations: + label: Funktioner + pager: + options: + tags: + next: 'Nästa ›' + previous: '‹ Föregående' + first: '« Första' + last: 'Sista »' + expose: + offset_label: Kompensera + exposed_form: + options: + submit_button: Filtrera + sort_asc_label: Ascending + sort_desc_label: Descending + filters: + name: + expose: + label: Titel + locked_services_block: + display_title: Block diff --git a/conf/cmi/language/sv/views.view.locked_units.yml b/conf/cmi/language/sv/views.view.locked_units.yml new file mode 100644 index 00000000..f871e6ff --- /dev/null +++ b/conf/cmi/language/sv/views.view.locked_units.yml @@ -0,0 +1,43 @@ +display: + default: + display_title: Förvald + display_options: + fields: + tpr_unit_bulk_form: + label: Massuppdatera + action_title: Åtgärd + name: + label: Titel + separator: ', ' + name_1: + label: 'Lås ägare' + separator: ', ' + langcode: + label: 'Content language' + separator: ', ' + operations: + label: Funktioner + 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: Verkställ + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande + filters: + name: + expose: + label: Titel + locked_units_block: + display_title: Block diff --git a/conf/cmi/language/sv/views.view.service_units.yml b/conf/cmi/language/sv/views.view.service_units.yml new file mode 100644 index 00000000..9244ccc0 --- /dev/null +++ b/conf/cmi/language/sv/views.view.service_units.yml @@ -0,0 +1,31 @@ +display: + default: + display_title: Förvald + display_options: + exposed_form: + options: + submit_button: Verkställ + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande + pager: + options: + tags: + previous: '‹ Föregående' + next: 'Nästa ›' + expose: + items_per_page_label: 'Inlägg per sida' + items_per_page_options_all_label: '- Alla -' + offset_label: Kompensera + views_infinite_scroll: + button_text: 'Ladda fler serviceställen' + fields: + name: + separator: ', ' + arguments: + id: + exception: + title: Alla + service_units: + display_title: Block diff --git a/conf/cmi/language/sv/views.view.tpr_errand_service_list.yml b/conf/cmi/language/sv/views.view.tpr_errand_service_list.yml new file mode 100644 index 00000000..482ed76b --- /dev/null +++ b/conf/cmi/language/sv/views.view.tpr_errand_service_list.yml @@ -0,0 +1,58 @@ +display: + default: + display_title: Förvald + display_options: + exposed_form: + options: + submit_button: Verkställ + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande + pager: + options: + tags: + previous: ‹‹ + next: ›› + first: '« Första' + last: 'Sista »' + expose: + items_per_page_label: 'Inlägg per sida' + items_per_page_options_all_label: '- Alla -' + offset_label: Kompensera + fields: + tpr_errand_service_bulk_form: + label: Massuppdatera + action_title: Åtgärd + id: + label: ID + separator: ', ' + name: + label: Namn + separator: ', ' + langcode: + label: Språk + separator: ', ' + content_translation_status: + label: Status + settings: + format_custom_true: Publicerad + format_custom_false: 'Ej publicerad' + separator: ', ' + content_translation_changed: + label: Uppdaterad + separator: ', ' + operations: + label: Funktioner + filters: + combine: + expose: + label: Sök + langcode: + expose: + label: Språk + header: + result: + content: 'Visar @start - @end av @total' + page_1: + display_title: Sida diff --git a/conf/cmi/language/sv/views.view.tpr_service_channel_list.yml b/conf/cmi/language/sv/views.view.tpr_service_channel_list.yml new file mode 100644 index 00000000..05d6822e --- /dev/null +++ b/conf/cmi/language/sv/views.view.tpr_service_channel_list.yml @@ -0,0 +1,58 @@ +display: + default: + display_title: Förvald + display_options: + exposed_form: + options: + submit_button: Verkställ + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande + pager: + options: + tags: + previous: ‹‹ + next: ›› + first: '« Första' + last: 'Sista »' + expose: + items_per_page_label: 'Inlägg per sida' + items_per_page_options_all_label: '- Alla -' + offset_label: Kompensera + fields: + tpr_service_channel_bulk_form: + label: Massuppdatera + action_title: Åtgärd + id: + label: ID + separator: ', ' + name: + label: Namn + separator: ', ' + langcode: + label: Språk + separator: ', ' + content_translation_status: + label: Status + settings: + format_custom_true: Publicerad + format_custom_false: 'Ej publicerad' + separator: ', ' + content_translation_changed: + label: Uppdaterad + separator: ', ' + operations: + label: Funktioner + filters: + combine: + expose: + label: Sök + langcode: + expose: + label: Språk + header: + result: + content: 'Visar @start - @end av @total' + page_1: + display_title: Sida diff --git a/conf/cmi/language/sv/views.view.tpr_service_list.yml b/conf/cmi/language/sv/views.view.tpr_service_list.yml new file mode 100644 index 00000000..b226ca01 --- /dev/null +++ b/conf/cmi/language/sv/views.view.tpr_service_list.yml @@ -0,0 +1,58 @@ +display: + default: + display_title: Förvald + display_options: + exposed_form: + options: + submit_button: Verkställ + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande + pager: + options: + tags: + previous: ‹‹ + next: ›› + first: '« Första' + last: 'Sista »' + expose: + items_per_page_label: 'Inlägg per sida' + items_per_page_options_all_label: '- Alla -' + offset_label: Kompensera + fields: + tpr_service_bulk_form: + label: Massuppdatera + action_title: Åtgärd + id: + label: ID + separator: ', ' + name: + label: Namn + separator: ', ' + langcode: + label: Språk + separator: ', ' + content_translation_status: + label: Status + settings: + format_custom_true: Publicerad + format_custom_false: 'Ej publicerad' + separator: ', ' + content_translation_changed: + label: Uppdaterad + separator: ', ' + operations: + label: Funktioner + filters: + combine: + expose: + label: Search + langcode: + expose: + label: Språk + header: + result: + content: 'Displaying @start - @end of @total' + page_1: + display_title: Sida diff --git a/conf/cmi/language/sv/views.view.tpr_unit_list.yml b/conf/cmi/language/sv/views.view.tpr_unit_list.yml new file mode 100644 index 00000000..5d74c47b --- /dev/null +++ b/conf/cmi/language/sv/views.view.tpr_unit_list.yml @@ -0,0 +1,57 @@ +label: 'TPR units' +display: + default: + display_title: Förvald + display_options: + exposed_form: + options: + submit_button: Verkställ + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande + pager: + options: + tags: + previous: ‹‹ + next: ›› + first: '« Första' + last: 'Sista »' + expose: + items_per_page_label: 'Inlägg per sida' + items_per_page_options_all_label: '- Alla -' + offset_label: Kompensera + fields: + id: + label: ID + separator: ', ' + name: + label: Namn + separator: ', ' + langcode: + label: Språk + separator: ', ' + content_translation_status: + label: Status + settings: + format_custom_true: Publicerad + format_custom_false: 'Ej publicerad' + separator: ', ' + content_translation_changed: + label: Uppdaterad + separator: ', ' + operations: + label: Funktioner + filters: + combine: + expose: + label: Sök + langcode: + expose: + label: Språk + title: 'TPR units' + header: + result: + content: 'Visar @start - @end av @total' + page_1: + display_title: Sida diff --git a/conf/cmi/language/sv/views.view.unit_search.yml b/conf/cmi/language/sv/views.view.unit_search.yml new file mode 100644 index 00000000..cefe6321 --- /dev/null +++ b/conf/cmi/language/sv/views.view.unit_search.yml @@ -0,0 +1,48 @@ +display: + default: + display_title: Förvald + display_options: + pager: + options: + tags: + previous: '‹ Föregående' + next: 'Nästa ›' + expose: + items_per_page_label: 'Inlägg per sida' + items_per_page_options_all_label: '- Alla -' + offset_label: Kompensera + fields: + name: + separator: ', ' + address__postal_code: + separator: ', ' + address__address_line1: + separator: ', ' + address__address_line2: + separator: ', ' + filters: + combine: + expose: + label: Sök + group_info: + label: 'Combine fields filter' + empty: + area: + content: + value: 'Inget resultat' + arguments: + id: + exception: + title: Alla + block: + display_title: Block + entity_reference: + display_title: Objektsreferens + display_options: + fields: + name_override: + separator: ', ' + id: + separator: ', ' + name: + separator: ', ' diff --git a/conf/cmi/language/sv/views.view.unit_services.yml b/conf/cmi/language/sv/views.view.unit_services.yml new file mode 100644 index 00000000..7f9a110b --- /dev/null +++ b/conf/cmi/language/sv/views.view.unit_services.yml @@ -0,0 +1,28 @@ +display: + default: + display_title: Förvald + display_options: + exposed_form: + options: + submit_button: Verkställ + reset_button_label: Återställ + exposed_sorts_label: 'Sortera efter' + sort_asc_label: Stigande + sort_desc_label: Fallande + pager: + options: + tags: + previous: '‹ Föregående' + next: 'Nästa ›' + expose: + items_per_page_label: 'Inlägg per sida' + items_per_page_options_all_label: '- Alla -' + offset_label: Kompensera + views_infinite_scroll: + button_text: 'Ladda fler tjänster' + arguments: + id: + exception: + title: Alla + unit_services: + display_title: Block From 440abcb25926e56835da55333b786b5dc14c227b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Risto-Pekka=20Nyka=CC=88nen?= Date: Thu, 27 Oct 2022 16:42:35 +0300 Subject: [PATCH 03/10] UHF-7282: removed openid, updated tunnistamo to get openid 3.x --- composer.json | 1 - composer.lock | 57 ++++++++++++++++++++++++++------------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index a6d3a875..4d963b31 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,6 @@ "drupal/helfi_proxy": "^2.0", "drupal/helfi_tpr": "^2.0", "drupal/helfi_tunnistamo": "^2.0", - "drupal/openid_connect": "2.0.0-alpha12", "drupal/redis": "^1.5", "drupal/stage_file_proxy": "^1.2", "drush/drush": "^10.4 || ^11" diff --git a/composer.lock b/composer.lock index 18489d9b..0055f817 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "aff11743978d1d2b208218c9d0ec6e3b", + "content-hash": "ac6fc2a67e66b98668a3821cf9782919", "packages": [ { "name": "asm89/stack-cors", @@ -4392,20 +4392,21 @@ }, { "name": "drupal/helfi_tunnistamo", - "version": "2.1.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "c81fcf4d430c6ba63dc92a4d2598be777867c247" + "reference": "74003bcd79dc5c3fadae46b16720147342cf66d5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/c81fcf4d430c6ba63dc92a4d2598be777867c247", - "reference": "c81fcf4d430c6ba63dc92a4d2598be777867c247", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/74003bcd79dc5c3fadae46b16720147342cf66d5", + "reference": "74003bcd79dc5c3fadae46b16720147342cf66d5", "shasum": "" }, "require": { - "drupal/openid_connect": "^2.0" + "drupal/helfi_api_base": "*", + "drupal/openid_connect": "^3.0" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", @@ -4417,10 +4418,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.1.0", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.2.1", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2022-10-10T12:19:37+00:00" + "time": "2022-10-27T07:49:55+00:00" }, { "name": "drupal/image_style_quality", @@ -5030,20 +5031,20 @@ }, { "name": "drupal/openid_connect", - "version": "2.0.0-alpha12", + "version": "3.0.0-alpha2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/openid_connect.git", - "reference": "2.0.0-alpha12" + "reference": "3.0.0-alpha2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/openid_connect-2.0.0-alpha12.zip", - "reference": "2.0.0-alpha12", - "shasum": "6680cdd5875c80cb6e9f28bd0bea7d0278230931" + "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha2.zip", + "reference": "3.0.0-alpha2", + "shasum": "7fedeecb38edc1785f4de01240275a29035a60d0" }, "require": { - "drupal/core": "^8.8 || ^9", + "drupal/core": "^9.3 || ^10", "drupal/externalauth": "*", "ext-json": "*", "php": ">=7.1.0" @@ -5051,8 +5052,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-alpha12", - "datestamp": "1640197185", + "version": "3.0.0-alpha2", + "datestamp": "1666251361", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -7113,16 +7114,16 @@ }, { "name": "ezimuel/ringphp", - "version": "1.2.0", + "version": "1.2.1", "source": { "type": "git", "url": "https://github.com/ezimuel/ringphp.git", - "reference": "92b8161404ab1ad84059ebed41d9f757e897ce74" + "reference": "8d00384f9e5c04713ef8448adf47824265791b50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/92b8161404ab1ad84059ebed41d9f757e897ce74", - "reference": "92b8161404ab1ad84059ebed41d9f757e897ce74", + "url": "https://api.github.com/repos/ezimuel/ringphp/zipball/8d00384f9e5c04713ef8448adf47824265791b50", + "reference": "8d00384f9e5c04713ef8448adf47824265791b50", "shasum": "" }, "require": { @@ -7164,9 +7165,9 @@ ], "description": "Fork of guzzle/RingPHP (abandoned) to be used with elasticsearch-php", "support": { - "source": "https://github.com/ezimuel/ringphp/tree/1.2.0" + "source": "https://github.com/ezimuel/ringphp/tree/1.2.1" }, - "time": "2021-11-16T11:51:30+00:00" + "time": "2022-10-25T12:54:22+00:00" }, { "name": "ezyang/htmlpurifier", @@ -14809,16 +14810,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.17", + "version": "9.2.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8" + "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8", - "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a", + "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a", "shasum": "" }, "require": { @@ -14874,7 +14875,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18" }, "funding": [ { @@ -14882,7 +14883,7 @@ "type": "github" } ], - "time": "2022-08-30T12:24:04+00:00" + "time": "2022-10-27T13:35:33+00:00" }, { "name": "phpunit/php-file-iterator", From efc09443d413610167e1fc6d3f6a278ea8e74662 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Fri, 28 Oct 2022 07:19:22 +0000 Subject: [PATCH 04/10] Update configuration --- composer.lock | 61 +++++++++++---------- conf/cmi/imagecache_external.settings.yml | 4 +- conf/cmi/openid_connect.settings.yml | 1 + docker/openshift/crons/content-scheduler.sh | 2 - docker/openshift/crons/drupal.sh | 9 --- docker/openshift/crons/migrate-tpr.sh | 10 ++-- docker/openshift/crons/purge-queue.sh | 5 +- 7 files changed, 41 insertions(+), 51 deletions(-) delete mode 100644 docker/openshift/crons/drupal.sh diff --git a/composer.lock b/composer.lock index 0055f817..86fb9d87 100644 --- a/composer.lock +++ b/composer.lock @@ -3929,16 +3929,16 @@ }, { "name": "drupal/hdbt", - "version": "4.1.8", + "version": "4.1.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "adf4d958ec7234a5aa5a8f02583d5992b8d8ee26" + "reference": "5282586e08cb2e54a0a68501b31fb2b90d7bab5f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/adf4d958ec7234a5aa5a8f02583d5992b8d8ee26", - "reference": "adf4d958ec7234a5aa5a8f02583d5992b8d8ee26", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/5282586e08cb2e54a0a68501b31fb2b90d7bab5f", + "reference": "5282586e08cb2e54a0a68501b31fb2b90d7bab5f", "shasum": "" }, "require": { @@ -3953,10 +3953,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.8", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.9", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-10-21T13:32:01+00:00" + "time": "2022-10-25T06:16:45+00:00" }, { "name": "drupal/hdbt_admin", @@ -4067,12 +4067,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "4e7e2bafd139b430dfe59d987f5caaeeff2c2bbc" + "reference": "1b3b712199e5deac408f51849e4f9b185b823816" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/4e7e2bafd139b430dfe59d987f5caaeeff2c2bbc", - "reference": "4e7e2bafd139b430dfe59d987f5caaeeff2c2bbc", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/1b3b712199e5deac408f51849e4f9b185b823816", + "reference": "1b3b712199e5deac408f51849e4f9b185b823816", "shasum": "" }, "default-branch": true, @@ -4085,7 +4085,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2022-05-25T07:04:38+00:00" + "time": "2022-10-28T07:06:17+00:00" }, { "name": "drupal/helfi_media_formtool", @@ -4189,16 +4189,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.13.6", + "version": "2.13.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "c8496487f8595dec1921d1e87b65650873fb7755" + "reference": "312e9ddfedc54228e67c8ea571fe0785da0c7533" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/c8496487f8595dec1921d1e87b65650873fb7755", - "reference": "c8496487f8595dec1921d1e87b65650873fb7755", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/312e9ddfedc54228e67c8ea571fe0785da0c7533", + "reference": "312e9ddfedc54228e67c8ea571fe0785da0c7533", "shasum": "" }, "require": { @@ -4308,10 +4308,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.6", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.7", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-10-19T07:23:46+00:00" + "time": "2022-10-27T14:24:33+00:00" }, { "name": "drupal/helfi_proxy", @@ -4354,26 +4354,29 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.1.2", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "da4349755942c53939b31e3fe0bca04f408ce851" + "reference": "5ed2a62fb51909446690421c0a89bcee38576b63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/da4349755942c53939b31e3fe0bca04f408ce851", - "reference": "da4349755942c53939b31e3fe0bca04f408ce851", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/5ed2a62fb51909446690421c0a89bcee38576b63", + "reference": "5ed2a62fb51909446690421c0a89bcee38576b63", "shasum": "" }, "require": { "drupal/address": "~1.0", - "drupal/helfi_api_base": "^2.0 || dev-main", + "drupal/helfi_api_base": "*", "drupal/readonly_field_widget": "^1.0", "drupal/twig_tweak": "^2.0 || ^3.0", "drupal/views_infinite_scroll": "^2.0", "php": "^8.0" }, + "conflict": { + "drupal/helfi_api_base": "<2.0" + }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "drupal/coder": "^8.3", @@ -4385,10 +4388,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.2", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.3", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2022-09-02T12:21:35+00:00" + "time": "2022-10-27T05:58:29+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -15128,16 +15131,16 @@ }, { "name": "phpunit/phpunit", - "version": "9.5.25", + "version": "9.5.26", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d" + "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", - "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/851867efcbb6a1b992ec515c71cdcf20d895e9d2", + "reference": "851867efcbb6a1b992ec515c71cdcf20d895e9d2", "shasum": "" }, "require": { @@ -15210,7 +15213,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/phpunit/issues", - "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25" + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.26" }, "funding": [ { @@ -15226,7 +15229,7 @@ "type": "tidelift" } ], - "time": "2022-09-25T03:44:45+00:00" + "time": "2022-10-28T06:00:21+00:00" }, { "name": "sebastian/cli-parser", diff --git a/conf/cmi/imagecache_external.settings.yml b/conf/cmi/imagecache_external.settings.yml index 3ab1ff2d..49a21c55 100644 --- a/conf/cmi/imagecache_external.settings.yml +++ b/conf/cmi/imagecache_external.settings.yml @@ -1,6 +1,7 @@ _core: default_config_hash: sYKKIgXKwriRVKA1-QEKqToS8jwnr-TasvZwHT0Asek imagecache_directory: externals +imagecache_subdirectories: false imagecache_default_extension: .jpg imagecache_external_batch_flush_limit: 1000 imagecache_external_hosts: '' @@ -21,5 +22,6 @@ imagecache_external_allowed_mimetypes: - binary/octet-stream - image/webp - image/webp;charset=utf-8 + - image/webp + - image/webp;charset=utf-8 imagecache_external_cron_flush_frequency: 0 -imagecache_subdirectories: false diff --git a/conf/cmi/openid_connect.settings.yml b/conf/cmi/openid_connect.settings.yml index bdf128bb..f8c3ac4d 100644 --- a/conf/cmi/openid_connect.settings.yml +++ b/conf/cmi/openid_connect.settings.yml @@ -1,6 +1,7 @@ always_save_userinfo: true connect_existing_users: true override_registration_settings: true +end_session_enabled: true user_login_display: above userinfo_mappings: timezone: zoneinfo diff --git a/docker/openshift/crons/content-scheduler.sh b/docker/openshift/crons/content-scheduler.sh index f5b2eb52..e495c6e4 100644 --- a/docker/openshift/crons/content-scheduler.sh +++ b/docker/openshift/crons/content-scheduler.sh @@ -1,7 +1,5 @@ #!/bin/bash -echo "Running content-scheduler" - while true do drush scheduler:cron -q diff --git a/docker/openshift/crons/drupal.sh b/docker/openshift/crons/drupal.sh deleted file mode 100644 index e72929ef..00000000 --- a/docker/openshift/crons/drupal.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -echo "Running Drupal cron" - -while true -do - drush cron - sleep 600 -done diff --git a/docker/openshift/crons/migrate-tpr.sh b/docker/openshift/crons/migrate-tpr.sh index e537503c..08006f13 100644 --- a/docker/openshift/crons/migrate-tpr.sh +++ b/docker/openshift/crons/migrate-tpr.sh @@ -1,7 +1,5 @@ #!/bin/bash -echo "Running TPR Migrations: $(date)" - function populate_variables { # Generate variables used to control which migrates needs # to be reset and which ones needs to be skipped based on @@ -46,19 +44,19 @@ do if run_migrate "tpr_unit"; then echo "Running TPR Unit migrate: $(date)" - PARTIAL_MIGRATE=1 drush migrate:import tpr_unit + PARTIAL_MIGRATE=1 drush migrate:import tpr_unit --no-progress fi if run_migrate "tpr_service"; then echo "Running TPR Service migrate: $(date)" - PARTIAL_MIGRATE=1 drush migrate:import tpr_service + PARTIAL_MIGRATE=1 drush migrate:import tpr_service --no-progress fi if run_migrate "tpr_errand_service"; then echo "Running TPR Errand Service migrate: $(date)" - PARTIAL_MIGRATE=1 drush migrate:import tpr_errand_service + PARTIAL_MIGRATE=1 drush migrate:import tpr_errand_service --no-progress fi if run_migrate "tpr_service_channel"; then echo "Running TPR Service Channel migrate: $(date)" - PARTIAL_MIGRATE=1 drush migrate:import tpr_service_channel + PARTIAL_MIGRATE=1 drush migrate:import tpr_service_channel --no-progress fi # Reset migrate status if migrate has been running for more # than 12 hours. diff --git a/docker/openshift/crons/purge-queue.sh b/docker/openshift/crons/purge-queue.sh index 7c7bbc0f..d74ef3c4 100644 --- a/docker/openshift/crons/purge-queue.sh +++ b/docker/openshift/crons/purge-queue.sh @@ -1,7 +1,5 @@ #!/bin/bash -echo "Running purge queue: $(date)" - function has_items { NUM_ITEMS=$(drush p:queue-stats --format=json | jq .number_of_items) @@ -14,8 +12,7 @@ function has_items { while true do if has_items; then - echo "Flushing purge queue: $(date)" - drush p:queue-work --no-interaction -q --finish + drush p:queue-work --no-interaction --finish --format=json | jq --arg DATE "$(date +'%Y-%m-%dT%H:%M:%S%:z')" -c '.[] |= . + {"date" : $DATE}' fi # Sleep for 60 seconds. sleep 60 From ceee7b8f58775dd1cbde6bcd74edcd305ba6b9fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Tue, 1 Nov 2022 09:29:31 +0200 Subject: [PATCH 05/10] Updated HDBT Admin theme. --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 8c224a51..9b922826 100644 --- a/composer.lock +++ b/composer.lock @@ -3956,16 +3956,16 @@ }, { "name": "drupal/hdbt_admin", - "version": "1.7.1", + "version": "1.7.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "96cbfd700b2076bc1a0a9b60948dfb47ca445bbd" + "reference": "c6782ceec2ed649a65280e6e958b1ac153949235" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/96cbfd700b2076bc1a0a9b60948dfb47ca445bbd", - "reference": "96cbfd700b2076bc1a0a9b60948dfb47ca445bbd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/c6782ceec2ed649a65280e6e958b1ac153949235", + "reference": "c6782ceec2ed649a65280e6e958b1ac153949235", "shasum": "" }, "require": { @@ -3981,10 +3981,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.1", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.2", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2022-10-14T06:09:35+00:00" + "time": "2022-11-01T07:28:12+00:00" }, { "name": "drupal/helfi_api_base", From 17d31fae668eacd3b097e5253dc4239bd1e92cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Tue, 1 Nov 2022 15:03:20 +0200 Subject: [PATCH 06/10] Updated HDBT Admin theme. --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index b6131efb..5aa89b8d 100644 --- a/composer.lock +++ b/composer.lock @@ -3960,16 +3960,16 @@ }, { "name": "drupal/hdbt_admin", - "version": "1.7.2", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "c6782ceec2ed649a65280e6e958b1ac153949235" + "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/c6782ceec2ed649a65280e6e958b1ac153949235", - "reference": "c6782ceec2ed649a65280e6e958b1ac153949235", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", + "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", "shasum": "" }, "require": { @@ -3985,10 +3985,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.2", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.3", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2022-11-01T07:28:12+00:00" + "time": "2022-11-01T12:58:43+00:00" }, { "name": "drupal/helfi_api_base", From 06f711866834a26ec95e5e1176edfc587eac9856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Tue, 1 Nov 2022 16:13:21 +0200 Subject: [PATCH 07/10] Updated HDBT Admin theme. --- composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 5aa89b8d..8681c91a 100644 --- a/composer.lock +++ b/composer.lock @@ -3960,16 +3960,16 @@ }, { "name": "drupal/hdbt_admin", - "version": "1.7.3", + "version": "1.7.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2" + "reference": "d0aa91a90ff2447a1a099e23d5e489e611d59223" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", - "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/d0aa91a90ff2447a1a099e23d5e489e611d59223", + "reference": "d0aa91a90ff2447a1a099e23d5e489e611d59223", "shasum": "" }, "require": { @@ -3985,10 +3985,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.3", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.4", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2022-11-01T12:58:43+00:00" + "time": "2022-11-01T14:12:11+00:00" }, { "name": "drupal/helfi_api_base", From 947f274271897c714d77476a22022afc538ad9b7 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 2 Nov 2022 07:25:51 +0000 Subject: [PATCH 08/10] Update configuration --- composer.lock | 213 ++++++------------ ...form_display.paragraph.phasing.default.yml | 7 +- ..._display.helfi_news.helfi_news.default.yml | 2 +- ...ay.helfi_news.helfi_news.medium_teaser.yml | 2 +- ...view_display.paragraph.phasing.default.yml | 7 - ...view_display.tpr_unit.tpr_unit.default.yml | 2 +- ..._view_display.tpr_unit.tpr_unit.teaser.yml | 2 +- ...ay.tpr_unit.tpr_unit.teaser_with_image.yml | 2 +- ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 2 +- conf/cmi/eu_cookie_compliance.settings.yml | 4 + ...ervice.tpr_service.field_lower_content.yml | 5 + ....tpr_unit.tpr_unit.field_lower_content.yml | 5 + conf/cmi/openid_connect.client.tunnistamo.yml | 1 + public/sites/default/settings.php | 12 +- 14 files changed, 104 insertions(+), 162 deletions(-) diff --git a/composer.lock b/composer.lock index 8681c91a..c2fb2af8 100644 --- a/composer.lock +++ b/composer.lock @@ -3227,26 +3227,26 @@ }, { "name": "drupal/eu_cookie_compliance", - "version": "1.19.0", + "version": "1.24.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/eu-cookie-compliance.git", - "reference": "8.x-1.19" + "reference": "8.x-1.24" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/eu_cookie_compliance-8.x-1.19.zip", - "reference": "8.x-1.19", - "shasum": "5a13cd53f87a58501cebd6e560c280ad7274035c" + "url": "https://ftp.drupal.org/files/projects/eu_cookie_compliance-8.x-1.24.zip", + "reference": "8.x-1.24", + "shasum": "ab8dcd866e5ad95cde6fdf9cbca509c7f399bd23" }, "require": { - "drupal/core": "^8.9 || ^9" + "drupal/core": "^8.9 || ^9 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.19", - "datestamp": "1633775773", + "version": "8.x-1.24", + "datestamp": "1665158185", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3514,29 +3514,26 @@ }, { "name": "drupal/field_group", - "version": "3.3.0", + "version": "3.4.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/field_group.git", - "reference": "8.x-3.3" + "reference": "8.x-3.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.3.zip", - "reference": "8.x-3.3", - "shasum": "c7a423b1d7643ee40dd1543d72fa04e8ac1756e4" + "url": "https://ftp.drupal.org/files/projects/field_group-8.x-3.4.zip", + "reference": "8.x-3.4", + "shasum": "80b937e1a11f8b29c69d853fc4bf798c057c6f94" }, "require": { - "drupal/core": "^8.8 || ^9" - }, - "require-dev": { - "drupal/jquery_ui_accordion": "^1.0" + "drupal/core": "^9.2 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-3.3", - "datestamp": "1663516404", + "version": "8.x-3.4", + "datestamp": "1667241979", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3576,58 +3573,6 @@ "issues": "https://www.drupal.org/project/issues/field_group" } }, - { - "name": "drupal/filelog", - "version": "2.1.1", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/filelog.git", - "reference": "2.1.1" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/filelog-2.1.1.zip", - "reference": "2.1.1", - "shasum": "647180cbfcb727a057bc3556b8f571946963bba6" - }, - "require": { - "drupal/core": "^9 || ^10", - "ext-zlib": "*", - "php": "^8" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "2.1.1", - "datestamp": "1655354915", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0+" - ], - "authors": [ - { - "name": "Christoph Burschka", - "homepage": "https://github.com/cburschka", - "email": "christoph@burschka.de", - "role": "Maintainer" - } - ], - "description": "Logs system events to a file.", - "homepage": "https://www.drupal.org/project/filelog", - "keywords": [ - "Drupal" - ], - "support": { - "source": "https://cgit.drupalcode.org/filelog", - "issues": "https://www.drupal.org/project/issues/filelog" - } - }, { "name": "drupal/flysystem", "version": "2.0.0-beta1", @@ -3929,16 +3874,16 @@ }, { "name": "drupal/hdbt", - "version": "4.1.9", + "version": "4.1.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "5282586e08cb2e54a0a68501b31fb2b90d7bab5f" + "reference": "472406aed1fa83569a6cf92f4cd72bdd9b880650" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/5282586e08cb2e54a0a68501b31fb2b90d7bab5f", - "reference": "5282586e08cb2e54a0a68501b31fb2b90d7bab5f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/472406aed1fa83569a6cf92f4cd72bdd9b880650", + "reference": "472406aed1fa83569a6cf92f4cd72bdd9b880650", "shasum": "" }, "require": { @@ -3953,23 +3898,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.9", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.10", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-10-25T06:16:45+00:00" + "time": "2022-10-28T12:05:09+00:00" }, { "name": "drupal/hdbt_admin", - "version": "1.7.4", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "d0aa91a90ff2447a1a099e23d5e489e611d59223" + "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/d0aa91a90ff2447a1a099e23d5e489e611d59223", - "reference": "d0aa91a90ff2447a1a099e23d5e489e611d59223", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", + "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", "shasum": "" }, "require": { @@ -3985,28 +3930,27 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.4", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.3", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2022-11-01T14:12:11+00:00" + "time": "2022-11-01T12:58:43+00:00" }, { "name": "drupal/helfi_api_base", - "version": "2.3.3", + "version": "2.3.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "403c56e5dc436ba0c404c240546e59de944eae2e" + "reference": "4eea1e45458b19a4a84bbecfd2af529c8bc6e6d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/403c56e5dc436ba0c404c240546e59de944eae2e", - "reference": "403c56e5dc436ba0c404c240546e59de944eae2e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/4eea1e45458b19a4a84bbecfd2af529c8bc6e6d9", + "reference": "4eea1e45458b19a4a84bbecfd2af529c8bc6e6d9", "shasum": "" }, "require": { "drupal/entity": "^1.0", - "drupal/filelog": "^2.1", "php": "^8.0", "t4web/composer-lock-parser": "^1.0" }, @@ -4024,10 +3968,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2022-10-24T06:09:19+00:00" + "time": "2022-10-31T06:47:40+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4189,16 +4133,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.13.7", + "version": "2.13.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "312e9ddfedc54228e67c8ea571fe0785da0c7533" + "reference": "685f4e467c04512b71e02130a34548edfbdfae50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/312e9ddfedc54228e67c8ea571fe0785da0c7533", - "reference": "312e9ddfedc54228e67c8ea571fe0785da0c7533", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/685f4e467c04512b71e02130a34548edfbdfae50", + "reference": "685f4e467c04512b71e02130a34548edfbdfae50", "shasum": "" }, "require": { @@ -4218,7 +4162,7 @@ "drupal/elasticsearch_connector": "^7.0@alpha", "drupal/entity_browser": "^2.5", "drupal/entity_usage": "^2.0@beta", - "drupal/eu_cookie_compliance": "1.19", + "drupal/eu_cookie_compliance": "^1.24", "drupal/external_entities": "^2.0@alpha", "drupal/features": "^3.12", "drupal/field_group": "^3.1", @@ -4279,8 +4223,7 @@ "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" }, "drupal/eu_cookie_compliance": { - "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/d1a6866b2138f7d3597df79f395a5c1a9e19ee2e/patches/eu_cookie_compliance_block_8.x-1.19.patch", - "[#UHF-2956] Fix JavaScript error at cookie preference page": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/97683d32e57808a4c9a4f6a2d20757af7a0b8c37/patches/eu_cookie_compliance_js_error_8.x-1.19-patched.patch" + "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/e02b73fc68bd7d9f3611a1d55da267f6fe826340/patches/eu_cookie_compliance_block_8.x-1.24.patch" }, "drupal/features": { "https://www.drupal.org/project/features/issues/2869336": "https://www.drupal.org/files/issues/features_export-config-translation-2869336-2.patch" @@ -4308,23 +4251,23 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.7", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.10", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-10-27T14:24:33+00:00" + "time": "2022-11-01T07:30:14+00:00" }, { "name": "drupal/helfi_proxy", - "version": "2.2.8", + "version": "2.2.9", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "e75e953316a551a2075ddb7edad8b09128b19723" + "reference": "949daf441d06906263dd34b7e05bcfe42dc5a9fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/e75e953316a551a2075ddb7edad8b09128b19723", - "reference": "e75e953316a551a2075ddb7edad8b09128b19723", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/949daf441d06906263dd34b7e05bcfe42dc5a9fe", + "reference": "949daf441d06906263dd34b7e05bcfe42dc5a9fe", "shasum": "" }, "require": { @@ -4347,10 +4290,10 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.2.8", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.2.9", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2022-10-25T06:04:50+00:00" + "time": "2022-11-02T07:15:53+00:00" }, { "name": "drupal/helfi_tpr", @@ -5068,10 +5011,6 @@ "GPL-2.0-or-later" ], "authors": [ - { - "name": "balintk", - "homepage": "https://www.drupal.org/user/613760" - }, { "name": "bojanz", "homepage": "https://www.drupal.org/user/86106" @@ -5080,10 +5019,6 @@ "name": "jcnventura", "homepage": "https://www.drupal.org/user/122464" }, - { - "name": "Mario Steinitz", - "homepage": "https://www.drupal.org/user/2536014" - }, { "name": "pfrilling", "homepage": "https://www.drupal.org/user/169695" @@ -5092,10 +5027,6 @@ "name": "pjcdawkins", "homepage": "https://www.drupal.org/user/1025236" }, - { - "name": "robertDouglass", - "homepage": "https://www.drupal.org/user/5449" - }, { "name": "sanduhrs", "homepage": "https://www.drupal.org/user/28074" @@ -9793,16 +9724,16 @@ }, { "name": "symfony/console", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7" + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/4f40012db8d55c956406890b5720f686fee7f7b7", - "reference": "4f40012db8d55c956406890b5720f686fee7f7b7", + "url": "https://api.github.com/repos/symfony/console/zipball/8e70c1cab07ac641b885ce80385b9824a293c623", + "reference": "8e70c1cab07ac641b885ce80385b9824a293c623", "shasum": "" }, "require": { @@ -9863,7 +9794,7 @@ "description": "Eases the creation of beautiful and testable command line interfaces", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/console/tree/v4.4.47" + "source": "https://github.com/symfony/console/tree/v4.4.48" }, "funding": [ { @@ -9879,7 +9810,7 @@ "type": "tidelift" } ], - "time": "2022-10-04T05:58:30+00:00" + "time": "2022-10-26T16:02:45+00:00" }, { "name": "symfony/debug", @@ -10539,16 +10470,16 @@ }, { "name": "symfony/http-foundation", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/http-foundation.git", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811" + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7eea76ae186c68466e7676e62812ce2769f96811", - "reference": "7eea76ae186c68466e7676e62812ce2769f96811", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/cd4f478e67f7c8776a13b17e7d44241fd66261ad", + "reference": "cd4f478e67f7c8776a13b17e7d44241fd66261ad", "shasum": "" }, "require": { @@ -10587,7 +10518,7 @@ "description": "Defines an object-oriented layer for the HTTP specification", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-foundation/tree/v4.4.47" + "source": "https://github.com/symfony/http-foundation/tree/v4.4.48" }, "funding": [ { @@ -10603,20 +10534,20 @@ "type": "tidelift" } ], - "time": "2022-10-01T21:39:02+00:00" + "time": "2022-10-12T09:40:54+00:00" }, { "name": "symfony/http-kernel", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d" + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/91cf5dbc9ea4d902470e596246a736179acfb79d", - "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/a6d5229dd9466e046674baad8449ad92ee24eddd", + "reference": "a6d5229dd9466e046674baad8449ad92ee24eddd", "shasum": "" }, "require": { @@ -10691,7 +10622,7 @@ "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/http-kernel/tree/v4.4.47" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.48" }, "funding": [ { @@ -10707,7 +10638,7 @@ "type": "tidelift" } ], - "time": "2022-10-12T07:05:45+00:00" + "time": "2022-10-28T16:49:22+00:00" }, { "name": "symfony/mime", @@ -12034,16 +11965,16 @@ }, { "name": "symfony/validator", - "version": "v4.4.47", + "version": "v4.4.48", "source": { "type": "git", "url": "https://github.com/symfony/validator.git", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8" + "reference": "54781a4c41efbd283b779110bf8ae7f263737775" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/validator/zipball/37456082bb034cb5f2d8602471a0de6c448535b8", - "reference": "37456082bb034cb5f2d8602471a0de6c448535b8", + "url": "https://api.github.com/repos/symfony/validator/zipball/54781a4c41efbd283b779110bf8ae7f263737775", + "reference": "54781a4c41efbd283b779110bf8ae7f263737775", "shasum": "" }, "require": { @@ -12120,7 +12051,7 @@ "description": "Provides tools to validate values", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/validator/tree/v4.4.47" + "source": "https://github.com/symfony/validator/tree/v4.4.48" }, "funding": [ { @@ -12136,7 +12067,7 @@ "type": "tidelift" } ], - "time": "2022-10-01T17:13:09+00:00" + "time": "2022-10-25T13:54:11+00:00" }, { "name": "symfony/var-dumper", diff --git a/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml index 92b0b149..8a204539 100644 --- a/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml @@ -44,12 +44,7 @@ content: collapse_edit_all: collapse_edit_all duplicate: duplicate third_party_settings: { } - field_phasing_item_title_level: - type: options_select - weight: 4 - region: content - settings: { } - third_party_settings: { } + field_phasing_item_title_level: { } field_phasing_title_level: type: options_select weight: 0 diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml index 85b42f7b..4c5af3e7 100644 --- a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.default.yml @@ -16,8 +16,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: gallery_thumbnail imagecache_external_link: '' + imagecache_external_responsive_style: gallery_thumbnail third_party_settings: { } weight: 1 region: content diff --git a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml index ff46d998..35a56a41 100644 --- a/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml +++ b/conf/cmi/core.entity_view_display.helfi_news.helfi_news.medium_teaser.yml @@ -18,8 +18,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: gallery_thumbnail imagecache_external_link: '' + imagecache_external_responsive_style: gallery_thumbnail third_party_settings: { } weight: 1 region: content diff --git a/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml index 45adaf05..77739f36 100644 --- a/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml @@ -35,13 +35,6 @@ content: third_party_settings: { } weight: 2 region: content - field_phasing_item_title_level: - type: list_default - label: hidden - settings: { } - third_party_settings: { } - weight: 3 - region: content field_phasing_title_level: type: list_key label: hidden diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index 50aeb038..a27195d8 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -155,8 +155,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 3 region: content diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml index 61700b52..fbf90dd9 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml @@ -46,8 +46,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 0 region: content diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml index 793d05d9..4a83e7f7 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml @@ -47,8 +47,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 0 region: content diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml index f5caa678..33c3f655 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml @@ -62,8 +62,8 @@ content: type: imagecache_external_responsive_image label: hidden settings: - imagecache_external_responsive_style: image__3_2 imagecache_external_link: '' + imagecache_external_responsive_style: image__3_2 third_party_settings: { } weight: 0 region: content diff --git a/conf/cmi/eu_cookie_compliance.settings.yml b/conf/cmi/eu_cookie_compliance.settings.yml index 7cb106e7..006cc71c 100644 --- a/conf/cmi/eu_cookie_compliance.settings.yml +++ b/conf/cmi/eu_cookie_compliance.settings.yml @@ -72,3 +72,7 @@ cookie_value_disagreed: '0' cookie_value_agreed_show_thank_you: '1' cookie_value_agreed: '2' accessibility_focus: false +close_button_action: close_banner +reject_button_label: '' +reject_button_enabled: false +close_button_enabled: false diff --git a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml index 85b768ef..4cf45871 100644 --- a/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_service.tpr_service.field_lower_content.yml @@ -15,6 +15,7 @@ dependencies: - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.event_list module: - entity_reference_revisions - helfi_tpr @@ -45,6 +46,7 @@ settings: phasing: phasing remote_video: remote_video news_list: news_list + event_list: event_list negate: 0 target_bundles_drag_drop: accordion: @@ -62,6 +64,9 @@ settings: content_cards: weight: -23 enabled: true + event_list: + weight: 44 + enabled: true from_library: weight: 21 enabled: true diff --git a/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml b/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml index 05d18822..43a4700a 100644 --- a/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml +++ b/conf/cmi/field.field.tpr_unit.tpr_unit.field_lower_content.yml @@ -15,6 +15,7 @@ dependencies: - paragraphs.paragraphs_type.list_of_links - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.event_list module: - entity_reference_revisions - helfi_tpr @@ -45,6 +46,7 @@ settings: remote_video: remote_video contact_card_listing: contact_card_listing news_list: news_list + event_list: event_list negate: 0 target_bundles_drag_drop: accordion: @@ -68,6 +70,9 @@ settings: content_cards: weight: -23 enabled: true + event_list: + weight: 44 + enabled: true from_library: weight: 21 enabled: true diff --git a/conf/cmi/openid_connect.client.tunnistamo.yml b/conf/cmi/openid_connect.client.tunnistamo.yml index e1c4e9be..780ff964 100644 --- a/conf/cmi/openid_connect.client.tunnistamo.yml +++ b/conf/cmi/openid_connect.client.tunnistamo.yml @@ -12,6 +12,7 @@ plugin: tunnistamo settings: client_id: placeholder client_secret: placeholder + iss_allowed_domains: '' is_production: 0 auto_login: 0 environment_url: '' diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php index 7507c1c0..2b34ca81 100755 --- a/public/sites/default/settings.php +++ b/public/sites/default/settings.php @@ -221,8 +221,16 @@ include __DIR__ . '/' . $env . '.settings.php'; } - if (file_exists(__DIR__ . '/' . $env . '.services.yml')) { - $settings['container_yamls'][] = __DIR__ . '/' . $env . '.services.yml'; + $servicesFiles = [ + 'services.yml', + 'all.services.yml', + $env . '.services.yml', + ]; + + foreach ($servicesFiles as $fileName) { + if (file_exists(__DIR__ . '/' . $fileName)) { + $settings['container_yamls'][] = __DIR__ . '/' . $fileName; + } } if (getenv('OPENSHIFT_BUILD_NAMESPACE') && file_exists(__DIR__ . '/azure.settings.php')) { From ee6ddccb424460808f4de5766c331d62463fa335 Mon Sep 17 00:00:00 2001 From: tuutti Date: Wed, 2 Nov 2022 11:10:29 +0200 Subject: [PATCH 09/10] Updated api base to re-install filelog module --- composer.lock | 65 ++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 59 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index c2fb2af8..95b53677 100644 --- a/composer.lock +++ b/composer.lock @@ -3573,6 +3573,58 @@ "issues": "https://www.drupal.org/project/issues/field_group" } }, + { + "name": "drupal/filelog", + "version": "2.1.1", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/filelog.git", + "reference": "2.1.1" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/filelog-2.1.1.zip", + "reference": "2.1.1", + "shasum": "647180cbfcb727a057bc3556b8f571946963bba6" + }, + "require": { + "drupal/core": "^9 || ^10", + "ext-zlib": "*", + "php": "^8" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.1.1", + "datestamp": "1655354915", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0+" + ], + "authors": [ + { + "name": "Christoph Burschka", + "homepage": "https://github.com/cburschka", + "email": "christoph@burschka.de", + "role": "Maintainer" + } + ], + "description": "Logs system events to a file.", + "homepage": "https://www.drupal.org/project/filelog", + "keywords": [ + "Drupal" + ], + "support": { + "source": "https://cgit.drupalcode.org/filelog", + "issues": "https://www.drupal.org/project/issues/filelog" + } + }, { "name": "drupal/flysystem", "version": "2.0.0-beta1", @@ -3937,20 +3989,21 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.3.4", + "version": "2.3.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "4eea1e45458b19a4a84bbecfd2af529c8bc6e6d9" + "reference": "f3560b56532df468b8f5433875a7dc79bab10c1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/4eea1e45458b19a4a84bbecfd2af529c8bc6e6d9", - "reference": "4eea1e45458b19a4a84bbecfd2af529c8bc6e6d9", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/f3560b56532df468b8f5433875a7dc79bab10c1f", + "reference": "f3560b56532df468b8f5433875a7dc79bab10c1f", "shasum": "" }, "require": { "drupal/entity": "^1.0", + "drupal/filelog": "^2.1", "php": "^8.0", "t4web/composer-lock-parser": "^1.0" }, @@ -3968,10 +4021,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2022-10-31T06:47:40+00:00" + "time": "2022-11-02T08:44:03+00:00" }, { "name": "drupal/helfi_azure_fs", From 9b7736981fdf3b8b349ceb54116cba51464f094e Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 8 Nov 2022 13:40:19 +0000 Subject: [PATCH 10/10] Update configuration --- .sonarcloud.properties | 1 + composer.lock | 100 +++++++++--------- ...form_display.paragraph.phasing.default.yml | 3 +- ...view_display.paragraph.phasing.default.yml | 3 +- conf/cmi/hdbt_admin_tools.site_settings.yml | 4 - .../fi/hdbt_admin_tools.site_settings.yml | 5 - .../sv/hdbt_admin_tools.site_settings.yml | 5 - 7 files changed, 56 insertions(+), 65 deletions(-) create mode 100644 .sonarcloud.properties delete mode 100644 conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml delete mode 100644 conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml diff --git a/.sonarcloud.properties b/.sonarcloud.properties new file mode 100644 index 00000000..ea01432f --- /dev/null +++ b/.sonarcloud.properties @@ -0,0 +1 @@ +sonar.exclusions=public/modules/custom/**/tests/** diff --git a/composer.lock b/composer.lock index 95b53677..25eefa0b 100644 --- a/composer.lock +++ b/composer.lock @@ -3926,16 +3926,16 @@ }, { "name": "drupal/hdbt", - "version": "4.1.10", + "version": "4.2.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "472406aed1fa83569a6cf92f4cd72bdd9b880650" + "reference": "5678e07a1442a3327bb596a351e02de822b5aaf9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/472406aed1fa83569a6cf92f4cd72bdd9b880650", - "reference": "472406aed1fa83569a6cf92f4cd72bdd9b880650", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/5678e07a1442a3327bb596a351e02de822b5aaf9", + "reference": "5678e07a1442a3327bb596a351e02de822b5aaf9", "shasum": "" }, "require": { @@ -3950,23 +3950,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.10", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.2.1", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-10-28T12:05:09+00:00" + "time": "2022-11-08T10:18:33+00:00" }, { "name": "drupal/hdbt_admin", - "version": "1.7.3", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2" + "reference": "42d74e27de19bd9392bbdda1bf45c3d6724b603f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", - "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/42d74e27de19bd9392bbdda1bf45c3d6724b603f", + "reference": "42d74e27de19bd9392bbdda1bf45c3d6724b603f", "shasum": "" }, "require": { @@ -3982,10 +3982,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.3", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.8.0", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2022-11-01T12:58:43+00:00" + "time": "2022-11-08T07:53:25+00:00" }, { "name": "drupal/helfi_api_base", @@ -4064,12 +4064,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "1b3b712199e5deac408f51849e4f9b185b823816" + "reference": "b2eae5c3b4f12ef9ddaa40118fa8119be6705cab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/1b3b712199e5deac408f51849e4f9b185b823816", - "reference": "1b3b712199e5deac408f51849e4f9b185b823816", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/b2eae5c3b4f12ef9ddaa40118fa8119be6705cab", + "reference": "b2eae5c3b4f12ef9ddaa40118fa8119be6705cab", "shasum": "" }, "default-branch": true, @@ -4082,7 +4082,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2022-10-28T07:06:17+00:00" + "time": "2022-11-03T07:13:59+00:00" }, { "name": "drupal/helfi_media_formtool", @@ -4153,16 +4153,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "1.0.6", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "3003eb95f3c51800391009bdbdd58cb1092ed945" + "reference": "63826cd16929888b7e517e4205faea2b8f342811" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/3003eb95f3c51800391009bdbdd58cb1092ed945", - "reference": "3003eb95f3c51800391009bdbdd58cb1092ed945", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/63826cd16929888b7e517e4205faea2b8f342811", + "reference": "63826cd16929888b7e517e4205faea2b8f342811", "shasum": "" }, "require": { @@ -4179,23 +4179,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/1.0.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/1.0.8", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2022-10-14T11:05:06+00:00" + "time": "2022-11-08T07:53:12+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "2.13.10", + "version": "2.13.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "685f4e467c04512b71e02130a34548edfbdfae50" + "reference": "d13b2b7ab66eedbed5af5c5896b5eb1973c90973" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/685f4e467c04512b71e02130a34548edfbdfae50", - "reference": "685f4e467c04512b71e02130a34548edfbdfae50", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d13b2b7ab66eedbed5af5c5896b5eb1973c90973", + "reference": "d13b2b7ab66eedbed5af5c5896b5eb1973c90973", "shasum": "" }, "require": { @@ -4276,7 +4276,7 @@ "https://www.drupal.org/project/default_content/issues/2640734#comment-14638943": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/main/patches/default_content_2.0.0-alpha2-2640734_manual_imports-e164a354.patch" }, "drupal/eu_cookie_compliance": { - "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/e02b73fc68bd7d9f3611a1d55da267f6fe826340/patches/eu_cookie_compliance_block_8.x-1.24.patch" + "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/923b35f699820b544397a35b7696570e101cd02c/patches/eu_cookie_compliance_block_8.x-1.24.patch" }, "drupal/features": { "https://www.drupal.org/project/features/issues/2869336": "https://www.drupal.org/files/issues/features_export-config-translation-2869336-2.patch" @@ -4304,34 +4304,36 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.10", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.13", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-11-01T07:30:14+00:00" + "time": "2022-11-08T13:18:34+00:00" }, { "name": "drupal/helfi_proxy", - "version": "2.2.9", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "949daf441d06906263dd34b7e05bcfe42dc5a9fe" + "reference": "cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/949daf441d06906263dd34b7e05bcfe42dc5a9fe", - "reference": "949daf441d06906263dd34b7e05bcfe42dc5a9fe", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7", + "reference": "cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7", "shasum": "" }, "require": { "drupal/helfi_api_base": "*", "drupal/purge": "^3.0", - "drupal/redirect": "^1.0", "drupal/varnish_purge": "^2.1", "ext-dom": "*", "ext-libxml": "*", "php": "^8.0" }, + "conflict": { + "drupal/helfi_tunnistamo": "<=2.2.1" + }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "drupal/coder": "^8.3", @@ -4343,10 +4345,10 @@ ], "description": "Provides various fixes so we can serve multiple Drupal instances in one domain.", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.2.9", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.3.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2022-11-02T07:15:53+00:00" + "time": "2022-11-08T11:03:23+00:00" }, { "name": "drupal/helfi_tpr", @@ -4391,16 +4393,16 @@ }, { "name": "drupal/helfi_tunnistamo", - "version": "2.2.1", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "74003bcd79dc5c3fadae46b16720147342cf66d5" + "reference": "b5329b75572bc00b4995c02d717cf168d5ccfa3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/74003bcd79dc5c3fadae46b16720147342cf66d5", - "reference": "74003bcd79dc5c3fadae46b16720147342cf66d5", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/b5329b75572bc00b4995c02d717cf168d5ccfa3b", + "reference": "b5329b75572bc00b4995c02d717cf168d5ccfa3b", "shasum": "" }, "require": { @@ -4417,10 +4419,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.2.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.2.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2022-10-27T07:49:55+00:00" + "time": "2022-11-08T10:24:33+00:00" }, { "name": "drupal/image_style_quality", @@ -5710,17 +5712,17 @@ }, { "name": "drupal/search_api", - "version": "1.27.0", + "version": "1.28.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.27" + "reference": "8.x-1.28" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.27.zip", - "reference": "8.x-1.27", - "shasum": "b8c9a055fe43435c09231fd93d3e07c5d2863a46" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.28.zip", + "reference": "8.x-1.28", + "shasum": "d3ae0bb3cf17c986d5e0c6edb87aee6580b6fc1e" }, "require": { "drupal/core": "^9.3 || ^10.0" @@ -5741,8 +5743,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.27", - "datestamp": "1666211720", + "version": "8.x-1.28", + "datestamp": "1667814116", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml index 8a204539..1c3867aa 100644 --- a/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml @@ -44,7 +44,8 @@ content: collapse_edit_all: collapse_edit_all duplicate: duplicate third_party_settings: { } - field_phasing_item_title_level: { } + field_phasing_item_title_level: + region: content field_phasing_title_level: type: options_select weight: 0 diff --git a/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml index 77739f36..22bbef1a 100644 --- a/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml @@ -60,4 +60,5 @@ content: third_party_settings: { } weight: 0 region: content -hidden: { } +hidden: + field_phasing_item_title_level: true diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml index 74ed1000..53cd2dcf 100644 --- a/conf/cmi/hdbt_admin_tools.site_settings.yml +++ b/conf/cmi/hdbt_admin_tools.site_settings.yml @@ -7,7 +7,3 @@ site_settings: koro: basic footer_settings: footer_color: dark - footer_top_title: 'Contact us' - footer_top_content: - value: "\r\n" - format: full_html diff --git a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml deleted file mode 100644 index c9a60da2..00000000 --- a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml +++ /dev/null @@ -1,5 +0,0 @@ -footer_settings: - footer_top_content: - value: "\r\n" - format: full_html - footer_top_title: 'Ota yhteyttä' diff --git a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml deleted file mode 100644 index 39193723..00000000 --- a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml +++ /dev/null @@ -1,5 +0,0 @@ -footer_settings: - footer_top_content: - value: "\r\n" - format: full_html - footer_top_title: 'Ta kontakt'