From 588d43c8e5dc6340336a2fe2dac6f6ef3fe6f6ca Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Fri, 22 Mar 2024 11:32:46 +0000 Subject: [PATCH] Update configuration --- composer.lock | 98 +++++++++---------- ...form_display.node.landing_page.default.yml | 2 +- ...ty_form_display.node.news_item.default.yml | 2 +- ..._form_display.paragraph.banner.default.yml | 2 +- ...form_display.tpr_unit.tpr_unit.default.yml | 44 +++++++-- ...iew_display.paragraph.hearings.default.yml | 2 +- ...ce_channel.tpr_service_channel.default.yml | 7 +- ...ternal_entity_type.helfi_announcements.yml | 2 +- ...es.external_entity_type.helfi_hearings.yml | 2 +- ...tities.external_entity_type.helfi_news.yml | 2 +- ...external_entity_type.helfi_news_groups.yml | 2 +- ..._entity_type.helfi_news_neighbourhoods.yml | 2 +- ...s.external_entity_type.helfi_news_tags.yml | 2 +- ...orage.node.field_news_item_links_title.yml | 2 +- .../field.storage.node.field_short_title.yml | 2 +- 15 files changed, 102 insertions(+), 71 deletions(-) diff --git a/composer.lock b/composer.lock index b4c1f7f2..d5ce417e 100644 --- a/composer.lock +++ b/composer.lock @@ -3969,16 +3969,16 @@ }, { "name": "drupal/hdbt", - "version": "6.4.26", + "version": "6.4.29", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "c2eec066a3d16e08249f1ba0ce62ff87614eadb7" + "reference": "f97480ada8d7e82e0e0a2e0698a047033ac85d97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c2eec066a3d16e08249f1ba0ce62ff87614eadb7", - "reference": "c2eec066a3d16e08249f1ba0ce62ff87614eadb7", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/f97480ada8d7e82e0e0a2e0698a047033ac85d97", + "reference": "f97480ada8d7e82e0e0a2e0698a047033ac85d97", "shasum": "" }, "require": { @@ -3996,10 +3996,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.26", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.29", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-03-15T13:21:30+00:00" + "time": "2024-03-22T11:27:08+00:00" }, { "name": "drupal/hdbt_admin", @@ -4088,16 +4088,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.6.5", + "version": "2.6.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "6eaf1f2f4c92620efa786029719d34edd6d6b094" + "reference": "bab62d130e73772c12c6e1afdb19e5acb05fea18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/6eaf1f2f4c92620efa786029719d34edd6d6b094", - "reference": "6eaf1f2f4c92620efa786029719d34edd6d6b094", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/bab62d130e73772c12c6e1afdb19e5acb05fea18", + "reference": "bab62d130e73772c12c6e1afdb19e5acb05fea18", "shasum": "" }, "require": { @@ -4126,10 +4126,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.6.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.6.6", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-03-15T06:41:46+00:00" + "time": "2024-03-21T13:53:12+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4258,16 +4258,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "2.2.0", + "version": "2.2.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "0da4087a191d7fef371fd72924eaff2e33223f91" + "reference": "69ab951f8dc3bbd2c2916f67f3d9b597ab0b5bef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/0da4087a191d7fef371fd72924eaff2e33223f91", - "reference": "0da4087a191d7fef371fd72924eaff2e33223f91", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/69ab951f8dc3bbd2c2916f67f3d9b597ab0b5bef", + "reference": "69ab951f8dc3bbd2c2916f67f3d9b597ab0b5bef", "shasum": "" }, "require": { @@ -4285,23 +4285,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.2.0", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.2.1", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2024-01-16T08:17:38+00:00" + "time": "2024-03-20T15:55:31+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "4.3.26", + "version": "4.3.27", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "fd977de147c9629190e7c1d413a03d1cd20640c2" + "reference": "699d34010d1be3019cb60bd5fe52adce0f5ee81b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fd977de147c9629190e7c1d413a03d1cd20640c2", - "reference": "fd977de147c9629190e7c1d413a03d1cd20640c2", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/699d34010d1be3019cb60bd5fe52adce0f5ee81b", + "reference": "699d34010d1be3019cb60bd5fe52adce0f5ee81b", "shasum": "" }, "require": { @@ -4417,10 +4417,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.26", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.27", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-03-20T06:32:01+00:00" + "time": "2024-03-21T13:52:54+00:00" }, { "name": "drupal/helfi_proxy", @@ -4476,16 +4476,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.3.6", + "version": "2.3.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "44f69ad718b06aea6022fc9e66c4625525e056c4" + "reference": "17c56a4578f58d5b3f6ab48a9a9d8abb8e479ee9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/44f69ad718b06aea6022fc9e66c4625525e056c4", - "reference": "44f69ad718b06aea6022fc9e66c4625525e056c4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/17c56a4578f58d5b3f6ab48a9a9d8abb8e479ee9", + "reference": "17c56a4578f58d5b3f6ab48a9a9d8abb8e479ee9", "shasum": "" }, "require": { @@ -4497,7 +4497,7 @@ "php": "^8.0" }, "conflict": { - "drupal/helfi_api_base": "<2.0" + "drupal/helfi_api_base": "<2.6.6" }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", @@ -4511,23 +4511,23 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.3.7", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2024-03-01T14:46:13+00:00" + "time": "2024-03-21T13:53:08+00:00" }, { "name": "drupal/helfi_tunnistamo", - "version": "3.0.4", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "07c25d907de18d26f203463203129bd67608526d" + "reference": "826dabf40fadcfdb669740cfdf2b6911a68fd0ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/07c25d907de18d26f203463203129bd67608526d", - "reference": "07c25d907de18d26f203463203129bd67608526d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/826dabf40fadcfdb669740cfdf2b6911a68fd0ce", + "reference": "826dabf40fadcfdb669740cfdf2b6911a68fd0ce", "shasum": "" }, "require": { @@ -4544,10 +4544,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2024-01-25T07:06:50+00:00" + "time": "2024-03-21T08:26:56+00:00" }, { "name": "drupal/image_style_quality", @@ -7364,16 +7364,16 @@ }, { "name": "drush/drush", - "version": "12.5.0", + "version": "12.5.1", "source": { "type": "git", "url": "https://github.com/drush-ops/drush.git", - "reference": "48dc17e0678e9ac162d4598c9e0a7e9009344ed8" + "reference": "71fcea30a22e7336e17be18bb5945400b2c63fad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drush-ops/drush/zipball/48dc17e0678e9ac162d4598c9e0a7e9009344ed8", - "reference": "48dc17e0678e9ac162d4598c9e0a7e9009344ed8", + "url": "https://api.github.com/repos/drush-ops/drush/zipball/71fcea30a22e7336e17be18bb5945400b2c63fad", + "reference": "71fcea30a22e7336e17be18bb5945400b2c63fad", "shasum": "" }, "require": { @@ -7496,7 +7496,7 @@ "issues": "https://github.com/drush-ops/drush/issues", "security": "https://github.com/drush-ops/drush/security/advisories", "slack": "https://drupal.slack.com/messages/C62H9CWQM", - "source": "https://github.com/drush-ops/drush/tree/12.5.0" + "source": "https://github.com/drush-ops/drush/tree/12.5.1" }, "funding": [ { @@ -7504,7 +7504,7 @@ "type": "github" } ], - "time": "2024-03-18T17:30:17+00:00" + "time": "2024-03-20T15:03:27+00:00" }, { "name": "easyrdf/easyrdf", @@ -16799,16 +16799,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.26.0", + "version": "1.27.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" + "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", - "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/86e4d5a4b036f8f0be1464522f4c6b584c452757", + "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757", "shasum": "" }, "require": { @@ -16840,9 +16840,9 @@ "description": "PHPDoc parser with support for nullable, intersection and generic types", "support": { "issues": "https://github.com/phpstan/phpdoc-parser/issues", - "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.27.0" }, - "time": "2024-02-23T16:05:55+00:00" + "time": "2024-03-21T13:14:53+00:00" }, { "name": "phpstan/phpstan", diff --git a/conf/cmi/core.entity_form_display.node.landing_page.default.yml b/conf/cmi/core.entity_form_display.node.landing_page.default.yml index 289dc2d4..8252dbdc 100644 --- a/conf/cmi/core.entity_form_display.node.landing_page.default.yml +++ b/conf/cmi/core.entity_form_display.node.landing_page.default.yml @@ -128,9 +128,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 + region: content settings: { } third_party_settings: { } - region: content status: type: boolean_checkbox weight: 12 diff --git a/conf/cmi/core.entity_form_display.node.news_item.default.yml b/conf/cmi/core.entity_form_display.node.news_item.default.yml index 77b03308..0cc5316d 100644 --- a/conf/cmi/core.entity_form_display.node.news_item.default.yml +++ b/conf/cmi/core.entity_form_display.node.news_item.default.yml @@ -200,9 +200,9 @@ content: third_party_settings: { } simple_sitemap: weight: 10 + region: content settings: { } third_party_settings: { } - region: content status: type: boolean_checkbox weight: 14 diff --git a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml index 7f9b78c8..65acc246 100644 --- a/conf/cmi/core.entity_form_display.paragraph.banner.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.banner.default.yml @@ -42,8 +42,8 @@ content: weight: 4 region: content settings: - linkit_auto_link_text: false linkit_profile: helfi + linkit_auto_link_text: false third_party_settings: { } field_banner_link_design: type: design_field_widget 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 a02983c4..32505ed8 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 @@ -24,7 +24,7 @@ dependencies: - text - select2 _core: - default_config_hash: ilRrdsHOQ6StmQoz8EXvQCOoYTo8L_o2ZG8gNzEbtZM + default_config_hash: u4cfdWUfiLgxWmusemjNf4p9sa_VCrlVLyYe8slNTEk id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -422,6 +422,26 @@ content: formatter_settings: { } show_description: false third_party_settings: { } + field_categories: + type: readonly_field_widget + weight: 39 + region: content + settings: + label: above + formatter_type: null + formatter_settings: { } + show_description: false + third_party_settings: { } + field_hs_front_page: + type: entity_reference_autocomplete + weight: 31 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } field_ontologyword_details: type: readonly_field_widget weight: 40 @@ -432,6 +452,23 @@ content: formatter_settings: { } show_description: false third_party_settings: { } + field_study_field: + type: select2_entity_reference + weight: 31 + region: content + settings: + width: 100% + autocomplete: false + match_operator: CONTAINS + match_limit: 10 + third_party_settings: { } + hide_description: + type: boolean_checkbox + weight: 18 + region: content + settings: + display_label: true + third_party_settings: { } subgroup: type: readonly_field_widget weight: 40 @@ -444,10 +481,5 @@ content: third_party_settings: { } hidden: created: true - field_categories: true field_districts: true - field_hs_front_page: true - field_study_field: true - hide_description: true ontologyword_ids: true - show_www: true diff --git a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml index 83ee257b..6e70c020 100644 --- a/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.hearings.default.yml @@ -31,9 +31,9 @@ content: weight: 0 region: content list: - weight: 100 settings: { } third_party_settings: { } + weight: 100 region: content hidden: search_api_excerpt: true diff --git a/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml b/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml index 6458aaa6..cb8ca981 100644 --- a/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_service_channel.tpr_service_channel.default.yml @@ -9,7 +9,7 @@ dependencies: - telephone - text _core: - default_config_hash: NC4qX-7naY7U9PAcLK80wAYby0wkk8T8ZuqKK2_fRd0 + default_config_hash: 9XViQdkj3AGE9DnZ_8xfkqd8ZNNYMpNf7YLno-9_-40 id: tpr_service_channel.tpr_service_channel.default targetEntityType: tpr_service_channel bundle: tpr_service_channel @@ -72,10 +72,9 @@ content: weight: 19 region: content email: - type: string + type: email_mailto label: hidden - settings: - link_to_entity: false + settings: { } third_party_settings: { } weight: 9 region: content 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 7aa1ce2d..a27cc29a 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml @@ -8,8 +8,8 @@ id: helfi_announcements label: 'Helfi: Announcements' label_plural: 'Helfi: Announcements' description: '' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml index ede9d15b..a801a25a 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_hearings.yml @@ -8,8 +8,8 @@ id: helfi_hearings label: 'Helfi: Hearing' label_plural: 'Helfi: Hearing' description: 'Helfi hearings from hearing api.' -generate_aliases: false read_only: true +generate_aliases: false field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml index 9624bfab..078b81e6 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -8,8 +8,8 @@ id: helfi_news label: 'Helfi: News' label_plural: 'Helfi: News' description: '' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml index db30446f..3d164724 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml @@ -8,8 +8,8 @@ id: helfi_news_groups label: 'Helfi: News groups' label_plural: 'Helfi: News groups' description: 'Retrieves news groups taxonomy terms from Helfi' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml index 158b178d..a8558241 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -8,8 +8,8 @@ id: helfi_news_neighbourhoods label: 'Helfi: News neighbourhoods' label_plural: 'Helfi: News neighbourhoods' description: 'Retrieves news neighbourhoods taxonomy terms from Helfi' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml index 8fb6716d..57168a57 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml @@ -8,8 +8,8 @@ id: helfi_news_tags label: 'Helfi: News tags' label_plural: 'Helfi: News tags' description: 'Retrieves news tags taxonomy terms from Helfi' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/field.storage.node.field_news_item_links_title.yml b/conf/cmi/field.storage.node.field_news_item_links_title.yml index 4ee6fe06..6f344b6e 100644 --- a/conf/cmi/field.storage.node.field_news_item_links_title.yml +++ b/conf/cmi/field.storage.node.field_news_item_links_title.yml @@ -12,8 +12,8 @@ entity_type: node type: string settings: max_length: 255 - is_ascii: false case_sensitive: false + is_ascii: false module: core locked: false cardinality: 1 diff --git a/conf/cmi/field.storage.node.field_short_title.yml b/conf/cmi/field.storage.node.field_short_title.yml index 2f317a03..37d915f5 100644 --- a/conf/cmi/field.storage.node.field_short_title.yml +++ b/conf/cmi/field.storage.node.field_short_title.yml @@ -12,8 +12,8 @@ entity_type: node type: string settings: max_length: 255 - is_ascii: false case_sensitive: false + is_ascii: false module: core locked: false cardinality: 1