From d5642096d1dd37ee5bdc252793b73afff115cb8d Mon Sep 17 00:00:00 2001 From: actions-bot Date: Fri, 24 Nov 2023 12:21:44 +0000 Subject: [PATCH] Update configuration --- composer.lock | 36 +++++++++---------- ...form_display.tpr_unit.tpr_unit.default.yml | 3 +- ...view_display.tpr_unit.tpr_unit.default.yml | 3 +- ...view_display.tpr_unit.tpr_unit.minimal.yml | 3 +- ..._view_display.tpr_unit.tpr_unit.teaser.yml | 3 +- ...ay.tpr_unit.tpr_unit.teaser_with_image.yml | 3 +- ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 3 +- conf/cmi/core.extension.yml | 1 - ....tpr_unit.tpr_unit.field_lower_content.yml | 10 ++++++ .../language/fi/views.view.er_tpr_unit.yml | 24 ++++++------- conf/cmi/views.view.service_list.yml | 2 +- 11 files changed, 53 insertions(+), 38 deletions(-) diff --git a/composer.lock b/composer.lock index 79399ff0..f77348c5 100644 --- a/composer.lock +++ b/composer.lock @@ -3906,16 +3906,16 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "92684fb57edbe6fbc2704c57637ba877583de254" + "reference": "bfd7671b58300db948d8cd230b4756ecca73c237" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/92684fb57edbe6fbc2704c57637ba877583de254", - "reference": "92684fb57edbe6fbc2704c57637ba877583de254", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/bfd7671b58300db948d8cd230b4756ecca73c237", + "reference": "bfd7671b58300db948d8cd230b4756ecca73c237", "shasum": "" }, "require": { @@ -3939,10 +3939,10 @@ ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2023-11-08T06:50:43+00:00" + "time": "2023-11-21T07:23:44+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -4032,16 +4032,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.0.0", + "version": "4.0.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "0302b326ad9804a77dafd2e6336a547917bd4a4d" + "reference": "adfc86f94a3090b5c0b4a9f397474affb50fa115" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/0302b326ad9804a77dafd2e6336a547917bd4a4d", - "reference": "0302b326ad9804a77dafd2e6336a547917bd4a4d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/adfc86f94a3090b5c0b4a9f397474affb50fa115", + "reference": "adfc86f94a3090b5c0b4a9f397474affb50fa115", "shasum": "" }, "require": { @@ -4152,10 +4152,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.0.0", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.0.2", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-11-16T07:54:31+00:00" + "time": "2023-11-24T12:18:45+00:00" }, { "name": "drupal/helfi_proxy", @@ -4211,16 +4211,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.3.0", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "afed5dbe60d641edb619f9dd0ac812025c6d5a79" + "reference": "1c35432dba2972ff608b038849cd2e83e98ebe83" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/afed5dbe60d641edb619f9dd0ac812025c6d5a79", - "reference": "afed5dbe60d641edb619f9dd0ac812025c6d5a79", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/1c35432dba2972ff608b038849cd2e83e98ebe83", + "reference": "1c35432dba2972ff608b038849cd2e83e98ebe83", "shasum": "" }, "require": { @@ -4246,10 +4246,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.0", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.1", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-11-16T09:05:15+00:00" + "time": "2023-11-21T11:43:29+00:00" }, { "name": "drupal/helfi_tunnistamo", diff --git a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml index c7e8abdd..5a36616b 100644 --- a/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_form_display.tpr_unit.tpr_unit.default.yml @@ -16,7 +16,7 @@ dependencies: - path - readonly_field_widget _core: - default_config_hash: C2Xc2BwYmiIL9SayNQLxaufcoqA5SLusFthQgnmb10A + default_config_hash: iGJgv-B14-RUdc8dyC_MKfM3icDg5Cae4kFwC0MjyGQ id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -408,3 +408,4 @@ hidden: hide_description: true ontologyword_ids: true show_www: true + subgroup: true 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 3877b725..4d3b6c22 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 @@ -18,7 +18,7 @@ dependencies: - telephone - text _core: - default_config_hash: tfkOTFeDgVhyd9NcyUP7yambOlzTfsjNcKwlLHPsbhw + default_config_hash: 7xcZTrrfS31z_AAdwrXSDrgd2PAqTWFPgY-XoAEjXQ0 id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -290,3 +290,4 @@ hidden: langcode: true show_www: true streetview_entrance_url: true + subgroup: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml index 1669417e..2fa119d1 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml @@ -12,7 +12,7 @@ dependencies: - address - helfi_tpr _core: - default_config_hash: PouCEjXDV9qruMvBHQAwEjr84IOJOn77scrXQSzvxds + default_config_hash: wvPWnthIC7o8oa1gJ6jI0ex6xi12GVsZEN5zyrlCLoU id: tpr_unit.tpr_unit.minimal targetEntityType: tpr_unit bundle: tpr_unit @@ -73,6 +73,7 @@ hidden: services: true show_www: true streetview_entrance_url: true + subgroup: true toc_enabled: true topical: true unit_picture_caption: true 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 71f2f687..5b0d924e 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 @@ -14,7 +14,7 @@ dependencies: - helfi_tpr - imagecache_external _core: - default_config_hash: 38N-rHkqJOOsX8_Ww-SmyCqRGIxVHf-0OngooKeYAVI + default_config_hash: 8hru5uh55ouZ9y4kV_EEJ6PEjb2rGY_tFUc_3Sn12M0 id: tpr_unit.tpr_unit.teaser targetEntityType: tpr_unit bundle: tpr_unit @@ -91,6 +91,7 @@ hidden: services: true show_www: true streetview_entrance_url: true + subgroup: true toc_enabled: true topical: true unit_picture_caption: true 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 64956d29..c328d0d3 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 @@ -15,7 +15,7 @@ dependencies: - imagecache_external - telephone _core: - default_config_hash: Ibwu6ghoi4cuIpb_xkzuwiOVxa2SoY6lX-BJnVPFSdE + default_config_hash: gOlhIa1n9jTIJdBPN_Kjp-jn3YnsvZb7HELaoqa8KGQ id: tpr_unit.tpr_unit.teaser_with_image targetEntityType: tpr_unit bundle: tpr_unit @@ -92,6 +92,7 @@ hidden: services: true show_www: true streetview_entrance_url: true + subgroup: true toc_enabled: true topical: true unit_picture_caption: true 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 d0e3a6c4..68c079a7 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 @@ -15,7 +15,7 @@ dependencies: - imagecache_external - telephone _core: - default_config_hash: cbtj72q0WqHIiipxyV67zGXit9W_E8evc0_6J-CtIpA + default_config_hash: 25YiuMfsdqG-daKeTND6nbYvwDgt7kE7bw23g2GyteI id: tpr_unit.tpr_unit.wide_teaser targetEntityType: tpr_unit bundle: tpr_unit @@ -105,6 +105,7 @@ hidden: services: true show_www: true streetview_entrance_url: true + subgroup: true toc_enabled: true topical: true unit_picture_caption: true diff --git a/conf/cmi/core.extension.yml b/conf/cmi/core.extension.yml index d22e8d45..b68af56f 100644 --- a/conf/cmi/core.extension.yml +++ b/conf/cmi/core.extension.yml @@ -34,7 +34,6 @@ module: file_mdm: 0 filter: 0 flysystem: 0 - flysystem_azure: 0 focal_point: 0 gin_toolbar: 0 hal: 0 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 21511238..da892035 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 @@ -14,8 +14,10 @@ dependencies: - paragraphs.paragraphs_type.image - paragraphs.paragraphs_type.liftup_with_image - paragraphs.paragraphs_type.list_of_links + - paragraphs.paragraphs_type.map - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.text module: - entity_reference_revisions - helfi_tpr @@ -47,6 +49,8 @@ settings: contact_card_listing: contact_card_listing remote_video: remote_video event_list: event_list + map: map + text: text negate: 0 target_bundles_drag_drop: accordion: @@ -79,10 +83,16 @@ settings: list_of_links: weight: 0 enabled: true + map: + weight: 0 + enabled: true news_list: weight: 0 enabled: true remote_video: weight: 0 enabled: true + text: + weight: 0 + enabled: true field_type: entity_reference_revisions diff --git a/conf/cmi/language/fi/views.view.er_tpr_unit.yml b/conf/cmi/language/fi/views.view.er_tpr_unit.yml index a11d669d..95724063 100644 --- a/conf/cmi/language/fi/views.view.er_tpr_unit.yml +++ b/conf/cmi/language/fi/views.view.er_tpr_unit.yml @@ -2,6 +2,18 @@ display: default: display_title: Oletus display_options: + fields: + name: + separator: ', ' + pager: + options: + tags: + next: 'Seuraava ›' + previous: '‹ Edellinen' + expose: + items_per_page_label: 'Merkintöjä sivua kohti' + items_per_page_options_all_label: '- Kaikki -' + offset_label: Offset exposed_form: options: submit_button: Käytä @@ -9,18 +21,6 @@ display: 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: diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index 5b6ba000..ebedde76 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -10,7 +10,7 @@ dependencies: - text - user _core: - default_config_hash: MvCiaSrdVcljMT3wLlt5V47it0_DgXogcHidiHT4sug + default_config_hash: Onde7zmLJhxKFNX9U2CaS7memiRbiKGiDMf4Wf7UO2M id: service_list label: 'Service list' module: views