From a45d5102e49dabc4096bdafeec70364a06f79edc Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 26 Sep 2023 09:51:55 +0000 Subject: [PATCH] Update configuration --- composer.lock | 32 +++++++++---------- ...field_override.node.announcement.title.yml | 20 ++++++++++++ ...form_display.node.announcement.default.yml | 27 ++++++++++------ ...view_display.node.announcement.default.yml | 11 ++++++- ..._view_display.node.announcement.teaser.yml | 4 ++- ...ternal_entity_type.helfi_announcements.yml | 6 ++-- ....announcement.field_announcement_title.yml | 21 ++++++++++++ ....storage.node.field_announcement_title.yml | 23 +++++++++++++ ....announcement.field_announcement_title.yml | 2 ++ 9 files changed, 117 insertions(+), 29 deletions(-) create mode 100644 conf/cmi/core.base_field_override.node.announcement.title.yml create mode 100644 conf/cmi/field.field.node.announcement.field_announcement_title.yml create mode 100644 conf/cmi/field.storage.node.field_announcement_title.yml create mode 100644 conf/cmi/language/fi/field.field.node.announcement.field_announcement_title.yml diff --git a/composer.lock b/composer.lock index 43b02449..896ed5e0 100644 --- a/composer.lock +++ b/composer.lock @@ -3747,16 +3747,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.11", + "version": "5.6.12", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "c60a99f2943db380fa3f409c36e4060a1b8ed69c" + "reference": "c24eecd637d0373f9da2bcc01336feee376fcaf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c60a99f2943db380fa3f409c36e4060a1b8ed69c", - "reference": "c60a99f2943db380fa3f409c36e4060a1b8ed69c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c24eecd637d0373f9da2bcc01336feee376fcaf1", + "reference": "c24eecd637d0373f9da2bcc01336feee376fcaf1", "shasum": "" }, "require": { @@ -3774,10 +3774,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.11", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.12", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-09-26T08:47:48+00:00" + "time": "2023-09-26T09:47:13+00:00" }, { "name": "drupal/hdbt_admin", @@ -3951,12 +3951,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "640edf67a34bf37e44c24b75e45e946c7ddb8ef0" + "reference": "8dfd9dda99f0934070119547e7f950d3f90a9ebc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/640edf67a34bf37e44c24b75e45e946c7ddb8ef0", - "reference": "640edf67a34bf37e44c24b75e45e946c7ddb8ef0", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/8dfd9dda99f0934070119547e7f950d3f90a9ebc", + "reference": "8dfd9dda99f0934070119547e7f950d3f90a9ebc", "shasum": "" }, "default-branch": true, @@ -3969,7 +3969,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-09-19T05:58:55+00:00" + "time": "2023-09-26T09:45:28+00:00" }, { "name": "drupal/helfi_navigation", @@ -4007,16 +4007,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.4.14", + "version": "3.4.15", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "f3a9eff8df01870a1b3124a87465ae62bb7c47ba" + "reference": "4c85285f69a08e58e04f9da7e27e410881793896" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/f3a9eff8df01870a1b3124a87465ae62bb7c47ba", - "reference": "f3a9eff8df01870a1b3124a87465ae62bb7c47ba", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/4c85285f69a08e58e04f9da7e27e410881793896", + "reference": "4c85285f69a08e58e04f9da7e27e410881793896", "shasum": "" }, "require": { @@ -4119,10 +4119,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.14", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.15", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-09-25T07:25:21+00:00" + "time": "2023-09-26T09:47:18+00:00" }, { "name": "drupal/helfi_proxy", diff --git a/conf/cmi/core.base_field_override.node.announcement.title.yml b/conf/cmi/core.base_field_override.node.announcement.title.yml new file mode 100644 index 00000000..7a974646 --- /dev/null +++ b/conf/cmi/core.base_field_override.node.announcement.title.yml @@ -0,0 +1,20 @@ +uuid: cb7008b4-d76d-4d1f-b1e6-3d3cd42a180e +langcode: en +status: true +dependencies: + config: + - node.type.announcement +_core: + default_config_hash: v0rg9ztfYRnKz2PXAcGD_Q52rTcPbwqaZLw3tXWd4rM +id: node.announcement.title +field_name: title +entity_type: node +bundle: announcement +label: 'Administrative title' +description: '' +required: true +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/core.entity_form_display.node.announcement.default.yml b/conf/cmi/core.entity_form_display.node.announcement.default.yml index e9d8f1f2..240833bc 100644 --- a/conf/cmi/core.entity_form_display.node.announcement.default.yml +++ b/conf/cmi/core.entity_form_display.node.announcement.default.yml @@ -8,6 +8,7 @@ dependencies: - field.field.node.announcement.field_announcement_content_pages - field.field.node.announcement.field_announcement_link - field.field.node.announcement.field_announcement_service_pages + - field.field.node.announcement.field_announcement_title - field.field.node.announcement.field_announcement_type - field.field.node.announcement.field_announcement_unit_pages - node.type.announcement @@ -20,7 +21,7 @@ dependencies: - select2 - text _core: - default_config_hash: le2Wzlas0qZ9Bj-o6WlJbHDeisFrucs9F4B3VOK8t_w + default_config_hash: 0ewsu2ZhpNhAo4t7wkUgEa9ABQAkcsF7IXtR-kFeDUg id: node.announcement.default targetEntityType: node bundle: announcement @@ -28,7 +29,7 @@ mode: default content: body: type: text_textarea_with_summary - weight: 15 + weight: 18 region: content settings: rows: 9 @@ -44,14 +45,14 @@ content: third_party_settings: { } field_announcement_all_pages: type: boolean_checkbox - weight: 11 + weight: 13 region: content settings: display_label: true third_party_settings: { } field_announcement_content_pages: type: select2_entity_reference - weight: 12 + weight: 14 region: content settings: width: 100% @@ -61,7 +62,7 @@ content: third_party_settings: { } field_announcement_link: type: link_default - weight: 16 + weight: 19 region: content settings: placeholder_url: '' @@ -69,7 +70,7 @@ content: third_party_settings: { } field_announcement_service_pages: type: select2_entity_reference - weight: 14 + weight: 16 region: content settings: width: 100% @@ -77,16 +78,24 @@ content: match_operator: CONTAINS match_limit: 20 third_party_settings: { } + field_announcement_title: + type: string_textfield + weight: 17 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } field_announcement_type: type: select2 - weight: 10 + weight: 11 region: content settings: width: 100% third_party_settings: { } field_announcement_unit_pages: type: select2_entity_reference - weight: 13 + weight: 15 region: content settings: width: 100% @@ -125,7 +134,7 @@ content: settings: { } third_party_settings: { } simple_sitemap: - weight: 10 + weight: 12 region: content settings: { } third_party_settings: { } diff --git a/conf/cmi/core.entity_view_display.node.announcement.default.yml b/conf/cmi/core.entity_view_display.node.announcement.default.yml index fb29dac6..d0485d9f 100644 --- a/conf/cmi/core.entity_view_display.node.announcement.default.yml +++ b/conf/cmi/core.entity_view_display.node.announcement.default.yml @@ -8,6 +8,7 @@ dependencies: - field.field.node.announcement.field_announcement_content_pages - field.field.node.announcement.field_announcement_link - field.field.node.announcement.field_announcement_service_pages + - field.field.node.announcement.field_announcement_title - field.field.node.announcement.field_announcement_type - field.field.node.announcement.field_announcement_unit_pages - node.type.announcement @@ -17,7 +18,7 @@ dependencies: - text - user _core: - default_config_hash: IHF-sP4Gq6tdTyWDxQDDEdLbHz3-QzklMNE1QA2mQU0 + default_config_hash: LQ9K_wCbd758UCcNEORQvFUQ7gNJddkukiwwYHrZv4c id: node.announcement.default targetEntityType: node bundle: announcement @@ -42,6 +43,14 @@ content: third_party_settings: { } weight: 3 region: content + field_announcement_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 4 + region: content field_announcement_type: type: list_default label: hidden diff --git a/conf/cmi/core.entity_view_display.node.announcement.teaser.yml b/conf/cmi/core.entity_view_display.node.announcement.teaser.yml index 5225c95f..66147438 100644 --- a/conf/cmi/core.entity_view_display.node.announcement.teaser.yml +++ b/conf/cmi/core.entity_view_display.node.announcement.teaser.yml @@ -9,6 +9,7 @@ dependencies: - field.field.node.announcement.field_announcement_content_pages - field.field.node.announcement.field_announcement_link - field.field.node.announcement.field_announcement_service_pages + - field.field.node.announcement.field_announcement_title - field.field.node.announcement.field_announcement_type - field.field.node.announcement.field_announcement_unit_pages - node.type.announcement @@ -16,7 +17,7 @@ dependencies: - text - user _core: - default_config_hash: FhIJpRvY90w782EYtR2V2Yfppyglwp191xkVdXEEbbM + default_config_hash: OwH532HYBVjDOUW0iJnoDWc2yFGZwwGJnAZEmZPjLCA id: node.announcement.teaser targetEntityType: node bundle: announcement @@ -40,6 +41,7 @@ hidden: field_announcement_content_pages: true field_announcement_link: true field_announcement_service_pages: true + field_announcement_title: true field_announcement_type: true field_announcement_unit_pages: true langcode: true diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml index 6d0ee433..59baec39 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml @@ -3,13 +3,13 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: XBOd0Lfy5FpXJkeuZi75vBaT7ffFCENINrui5kCVygo + default_config_hash: ZjzZvHTvsEfBX_dhlTXEZmLbS_ELM5uV7xbXTaR7D7g id: helfi_announcements label: 'Helfi: Announcements' label_plural: 'Helfi: Announcements' description: '' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: @@ -37,6 +37,8 @@ field_mapper_config: value: '$.attributes["field_announcement_link"]["title"]' announcement_link_url: value: '$.attributes["field_announcement_link"]["uri"]' + announcement_assistive_technology_close_button_title: + value: '$.attributes["field_announcement_title"]' storage_client_id: helfi_announcements storage_client_config: { } persistent_cache_max_age: 600 diff --git a/conf/cmi/field.field.node.announcement.field_announcement_title.yml b/conf/cmi/field.field.node.announcement.field_announcement_title.yml new file mode 100644 index 00000000..cf50a6ad --- /dev/null +++ b/conf/cmi/field.field.node.announcement.field_announcement_title.yml @@ -0,0 +1,21 @@ +uuid: 85488315-e91e-4a55-9830-496ead4d6421 +langcode: en +status: true +dependencies: + config: + - field.storage.node.field_announcement_title + - node.type.announcement +_core: + default_config_hash: f0piVjyoLRnZfc5fbRP6BdQ6_iMw7az35Req0V6Z4mg +id: node.announcement.field_announcement_title +field_name: field_announcement_title +entity_type: node +bundle: announcement +label: 'Announcement title' +description: 'This title is only available to users of assistive technology. ' +required: true +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.storage.node.field_announcement_title.yml b/conf/cmi/field.storage.node.field_announcement_title.yml new file mode 100644 index 00000000..945b638c --- /dev/null +++ b/conf/cmi/field.storage.node.field_announcement_title.yml @@ -0,0 +1,23 @@ +uuid: 2ee47656-585e-411f-a972-66d316bba4ce +langcode: en +status: true +dependencies: + module: + - node +_core: + default_config_hash: dDVMTZxf5aD5P9HjLJX_6ThWFSclPORpZMThR3dd_XY +id: node.field_announcement_title +field_name: field_announcement_title +entity_type: node +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/language/fi/field.field.node.announcement.field_announcement_title.yml b/conf/cmi/language/fi/field.field.node.announcement.field_announcement_title.yml new file mode 100644 index 00000000..8d33f85f --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.announcement.field_announcement_title.yml @@ -0,0 +1,2 @@ +label: 'Poikkeusilmoituksen otsikko' +description: 'Tämä otsikko on avustavan teknologian käyttäjiä varten.'