From 0090615428a7ca8b72bb6762c881a204ad921635 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 26 Sep 2023 09:51:54 +0000 Subject: [PATCH] Update configuration --- composer.lock | 98 +++++++++---------- ...field_override.node.announcement.title.yml | 20 ++++ ...form_display.node.announcement.default.yml | 27 +++-- ...isplay.tpr_service.tpr_service.default.yml | 33 ++++--- ...form_display.tpr_unit.tpr_unit.default.yml | 12 +-- ...view_display.node.announcement.default.yml | 11 ++- ..._view_display.node.announcement.teaser.yml | 4 +- ...isplay.tpr_service.tpr_service.default.yml | 3 +- ...display.tpr_service.tpr_service.teaser.yml | 3 +- ...rvice.tpr_service.teaser_search_result.yml | 3 +- ...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 + .../language/ru/views.view.unit_services.yml | 9 -- conf/cmi/views.view.service_list.yml | 8 +- conf/cmi/views.view.unit_services.yml | 21 +--- docker-compose.yml | 16 --- 18 files changed, 191 insertions(+), 129 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 dedda7ec5..f36f3e794 100644 --- a/composer.lock +++ b/composer.lock @@ -2035,16 +2035,16 @@ }, { "name": "drupal/core", - "version": "9.5.10", + "version": "9.5.11", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "c84bab7403943fbc4ed90ffcdde4460a94642b06" + "reference": "8afcb233c2a71501b35fed2713167c37831d5c19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/c84bab7403943fbc4ed90ffcdde4460a94642b06", - "reference": "c84bab7403943fbc4ed90ffcdde4460a94642b06", + "url": "https://api.github.com/repos/drupal/core/zipball/8afcb233c2a71501b35fed2713167c37831d5c19", + "reference": "8afcb233c2a71501b35fed2713167c37831d5c19", "shasum": "" }, "require": { @@ -2196,9 +2196,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.5.10" + "source": "https://github.com/drupal/core/tree/9.5.11" }, - "time": "2023-07-05T09:26:59+00:00" + "time": "2023-09-19T17:58:28+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -3747,16 +3747,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.4", + "version": "5.6.12", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "ac16cedbd3323e97c23d4e29c61260221601ec29" + "reference": "c24eecd637d0373f9da2bcc01336feee376fcaf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/ac16cedbd3323e97c23d4e29c61260221601ec29", - "reference": "ac16cedbd3323e97c23d4e29c61260221601ec29", + "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.4", + "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-15T04:35:43+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": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa" + "reference": "8dfd9dda99f0934070119547e7f950d3f90a9ebc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa", - "reference": "0ebc9e72b92b37fa37bd3eb003c4f4d0db329bfa", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/8dfd9dda99f0934070119547e7f950d3f90a9ebc", + "reference": "8dfd9dda99f0934070119547e7f950d3f90a9ebc", "shasum": "" }, "default-branch": true, @@ -3969,20 +3969,20 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-09-06T06:27:11+00:00" + "time": "2023-09-26T09:45:28+00:00" }, { "name": "drupal/helfi_navigation", - "version": "2.1.0", + "version": "2.1.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "668049d8601e4d9bbc2525fac4616b583960b97a" + "reference": "5c0f648a21220a6e8b6c14543f8e60b4b843a918" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/668049d8601e4d9bbc2525fac4616b583960b97a", - "reference": "668049d8601e4d9bbc2525fac4616b583960b97a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/5c0f648a21220a6e8b6c14543f8e60b4b843a918", + "reference": "5c0f648a21220a6e8b6c14543f8e60b4b843a918", "shasum": "" }, "require": { @@ -4000,23 +4000,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.1.0", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.1.1", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2023-09-16T04:24:11+00:00" + "time": "2023-09-21T08:34:22+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "3.4.8", + "version": "3.4.15", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "af36011732e5569b39602252515a12f6b1b56c44" + "reference": "4c85285f69a08e58e04f9da7e27e410881793896" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/af36011732e5569b39602252515a12f6b1b56c44", - "reference": "af36011732e5569b39602252515a12f6b1b56c44", + "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.8", + "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-18T07:53:37+00:00" + "time": "2023-09-26T09:47:18+00:00" }, { "name": "drupal/helfi_proxy", @@ -8002,30 +8002,30 @@ }, { "name": "laminas/laminas-stdlib", - "version": "3.17.0", + "version": "3.18.0", "source": { "type": "git", "url": "https://github.com/laminas/laminas-stdlib.git", - "reference": "dd35c868075bad80b6718959740913e178eb4274" + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/dd35c868075bad80b6718959740913e178eb4274", - "reference": "dd35c868075bad80b6718959740913e178eb4274", + "url": "https://api.github.com/repos/laminas/laminas-stdlib/zipball/e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", + "reference": "e85b29076c6216e7fc98e72b42dbe1bbc3b95ecf", "shasum": "" }, "require": { - "php": "~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "conflict": { "zendframework/zend-stdlib": "*" }, "require-dev": { "laminas/laminas-coding-standard": "^2.5", - "phpbench/phpbench": "^1.2.9", - "phpunit/phpunit": "^10.0.16", + "phpbench/phpbench": "^1.2.14", + "phpunit/phpunit": "^10.3.3", "psalm/plugin-phpunit": "^0.18.4", - "vimeo/psalm": "^5.8" + "vimeo/psalm": "^5.15.0" }, "type": "library", "autoload": { @@ -8057,7 +8057,7 @@ "type": "community_bridge" } ], - "time": "2023-03-20T13:51:37+00:00" + "time": "2023-09-19T10:15:21+00:00" }, { "name": "league/container", @@ -9955,16 +9955,16 @@ }, { "name": "psr/http-client", - "version": "1.0.2", + "version": "1.0.3", "source": { "type": "git", "url": "https://github.com/php-fig/http-client.git", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31" + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/http-client/zipball/0955afe48220520692d2d09f7ab7e0f93ffd6a31", - "reference": "0955afe48220520692d2d09f7ab7e0f93ffd6a31", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90", + "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90", "shasum": "" }, "require": { @@ -10001,9 +10001,9 @@ "psr-18" ], "support": { - "source": "https://github.com/php-fig/http-client/tree/1.0.2" + "source": "https://github.com/php-fig/http-client" }, - "time": "2023-04-10T20:12:12+00:00" + "time": "2023-09-23T14:17:50+00:00" }, { "name": "psr/http-factory", @@ -15631,16 +15631,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.24.0", + "version": "1.24.1", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6" + "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/3510b0a6274cc42f7219367cb3abfc123ffa09d6", - "reference": "3510b0a6274cc42f7219367cb3abfc123ffa09d6", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01", + "reference": "9f854d275c2dbf84915a5c0ec9a2d17d2cd86b01", "shasum": "" }, "require": { @@ -15672,9 +15672,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.24.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.24.1" }, - "time": "2023-09-07T20:46:32+00:00" + "time": "2023-09-18T12:18:02+00:00" }, { "name": "phpunit/php-code-coverage", 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 000000000..e9584158f --- /dev/null +++ b/conf/cmi/core.base_field_override.node.announcement.title.yml @@ -0,0 +1,20 @@ +uuid: 219f60c3-afb8-4832-9a40-5813c3d46ce3 +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 b030a24bf..27c897286 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_form_display.tpr_service.tpr_service.default.yml b/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml index 7a950011b..1287c2722 100644 --- a/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml +++ b/conf/cmi/core.entity_form_display.tpr_service.tpr_service.default.yml @@ -15,7 +15,7 @@ dependencies: - path - readonly_field_widget _core: - default_config_hash: fBGDQ46DbT3UoCm-GrCSgq6Fd6pARcmF3BNBKxO-qaE + default_config_hash: TuN2oM9gnDHnqYyB_3Y28xQmAKLYtQD0cry_Qo4jByo id: tpr_service.tpr_service.default targetEntityType: tpr_service bundle: tpr_service @@ -33,7 +33,7 @@ content: third_party_settings: { } errand_services: type: readonly_field_widget - weight: 7 + weight: 8 region: content settings: label: above @@ -43,7 +43,7 @@ content: third_party_settings: { } field_content: type: paragraphs - weight: 9 + weight: 11 region: content settings: title: Paragraph @@ -62,7 +62,7 @@ content: third_party_settings: { } field_lower_content: type: paragraphs - weight: 11 + weight: 15 region: content settings: title: Paragraph @@ -81,14 +81,14 @@ content: third_party_settings: { } field_metatags: type: metatag_firehose - weight: 8 + weight: 10 region: content settings: sidebar: false third_party_settings: { } field_sidebar_content: type: paragraphs - weight: 10 + weight: 12 region: content settings: title: Paragraph @@ -107,7 +107,7 @@ content: third_party_settings: { } has_unit: type: readonly_field_widget - weight: 27 + weight: 18 region: content settings: label: above @@ -115,9 +115,16 @@ content: formatter_settings: { } show_description: false third_party_settings: { } + hide_service_points: + type: boolean_checkbox + weight: 14 + region: content + settings: + display_label: true + third_party_settings: { } hide_sidebar_navigation: type: boolean_checkbox - weight: 21 + weight: 16 region: content settings: display_label: true @@ -131,7 +138,7 @@ content: third_party_settings: { } links: type: readonly_field_widget - weight: 6 + weight: 7 region: content settings: label: above @@ -159,7 +166,7 @@ content: third_party_settings: { } name_synonyms: type: readonly_field_widget - weight: 26 + weight: 17 region: content settings: label: above @@ -169,13 +176,13 @@ content: third_party_settings: { } path: type: path - weight: 7 + weight: 9 region: content settings: { } third_party_settings: { } service_id: type: readonly_field_widget - weight: 28 + weight: 19 region: content settings: label: above @@ -184,7 +191,7 @@ content: show_description: false third_party_settings: { } simple_sitemap: - weight: 10 + weight: 13 region: content settings: { } third_party_settings: { } 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 29e2f821c..b8e120f49 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 @@ -84,8 +84,8 @@ content: third_party_settings: { } contacts: type: readonly_field_widget - weight: 36 region: content + weight: 36 settings: label: above formatter_type: null @@ -176,8 +176,8 @@ content: third_party_settings: { } highlights: type: readonly_field_widget - weight: 33 region: content + weight: 33 settings: label: above formatter_type: null @@ -203,8 +203,8 @@ content: third_party_settings: { } links: type: readonly_field_widget - weight: 31 region: content + weight: 31 settings: label: above formatter_type: null @@ -241,8 +241,8 @@ content: third_party_settings: { } opening_hours: type: readonly_field_widget - weight: 32 region: content + weight: 32 settings: label: above formatter_type: null @@ -251,8 +251,8 @@ content: third_party_settings: { } other_info: type: readonly_field_widget - weight: 34 region: content + weight: 34 settings: label: above formatter_type: null @@ -294,8 +294,8 @@ content: third_party_settings: { } price_info: type: readonly_field_widget - weight: 35 region: content + weight: 35 settings: label: above formatter_type: null 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 1600cda2f..fa55122dc 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 3e0a551d0..0e04fc6dd 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/core.entity_view_display.tpr_service.tpr_service.default.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml index 656c24e67..644dbec86 100644 --- a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.default.yml @@ -14,7 +14,7 @@ dependencies: - metatag - text _core: - default_config_hash: 26lfekZ94e-EhgSzEv_7KLsDbUr7VnPlFuJk0GdpVtc + default_config_hash: bipB-zcUXW3e12wtjBTJ42I9vKovNlR8ZW8o-73Reas id: tpr_service.tpr_service.default targetEntityType: tpr_service bundle: tpr_service @@ -111,6 +111,7 @@ content: hidden: created: true has_unit: true + hide_service_points: true langcode: true name_synonyms: true search_api_excerpt: true diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml index 06aca0227..d74927e8d 100644 --- a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser.yml @@ -12,7 +12,7 @@ dependencies: - helfi_tpr - text _core: - default_config_hash: arzHjXolWlH8pmxrz3B8CZjJ9zTVIIXnLNyZD3EK6uw + default_config_hash: _3hhx9CkvItBW_aQmvGwqAsj65Tat3XlacXqHwECJgo id: tpr_service.tpr_service.teaser targetEntityType: tpr_service bundle: tpr_service @@ -49,6 +49,7 @@ hidden: field_metatags: true field_sidebar_content: true has_unit: true + hide_service_points: true langcode: true links: true name_synonyms: true diff --git a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml index 82a52f21e..4be18dd49 100644 --- a/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml +++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml @@ -12,7 +12,7 @@ dependencies: - helfi_tpr - text _core: - default_config_hash: xB11NuB4PFanx7E4ETdV0gOTv4_GPPPt-Ix-sw4MKHU + default_config_hash: eoKQQ4Dm1sXFoG58JFBy_EocUfCV1R4fVs65N63D7xo id: tpr_service.tpr_service.teaser_search_result targetEntityType: tpr_service bundle: tpr_service @@ -93,6 +93,7 @@ hidden: field_metatags: true field_sidebar_content: true has_unit: true + hide_service_points: true langcode: true links: true name_override: 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 35b3b72d5..eb03380b9 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: zY_1slrvSjIWdILbI-0OWc8A1RRz0fRVj4Gtz4m6zS0 + default_config_hash: ZjzZvHTvsEfBX_dhlTXEZmLbS_ELM5uV7xbXTaR7D7g id: helfi_announcements label: 'Helfi: Announcements' label_plural: 'Helfi: Announcements' @@ -37,9 +37,11 @@ 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: -1 +persistent_cache_max_age: 600 annotation_entity_type_id: null annotation_bundle_id: null annotation_field_name: null 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 000000000..3ad84b414 --- /dev/null +++ b/conf/cmi/field.field.node.announcement.field_announcement_title.yml @@ -0,0 +1,21 @@ +uuid: 02e6281a-879f-4513-b561-7b74482f4788 +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 000000000..150887787 --- /dev/null +++ b/conf/cmi/field.storage.node.field_announcement_title.yml @@ -0,0 +1,23 @@ +uuid: ae6a557b-0fec-4070-9389-792c374a82f9 +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 000000000..8d33f85f2 --- /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.' diff --git a/conf/cmi/language/ru/views.view.unit_services.yml b/conf/cmi/language/ru/views.view.unit_services.yml index ea0204bbc..cd751d2f3 100644 --- a/conf/cmi/language/ru/views.view.unit_services.yml +++ b/conf/cmi/language/ru/views.view.unit_services.yml @@ -9,15 +9,6 @@ display: exposed_sorts_label: 'Сортировать по' sort_asc_label: 'По возрастанию' sort_desc_label: 'По убыванию' - pager: - options: - tags: - previous: '‹ Предыдущий' - next: 'Следующий ›' - expose: - items_per_page_label: 'Элементов на страницу' - items_per_page_options_all_label: '- Все -' - offset_label: Пропустить arguments: id: exception: diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index 973d4b542..6c486770e 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: pUd-EuRjmmZcRI9CC31DmD1tyVIMUKNtqAHiBjxB9Q0 + default_config_hash: MvCiaSrdVcljMT3wLlt5V47it0_DgXogcHidiHT4sug id: service_list label: 'Service list' module: views @@ -361,6 +361,12 @@ display: position: 1 display_options: display_extenders: { } + pager: + type: none + options: + offset: 0 + defaults: + pager: false cache_metadata: max-age: -1 contexts: diff --git a/conf/cmi/views.view.unit_services.yml b/conf/cmi/views.view.unit_services.yml index 24c4c0a9a..2df7e7903 100644 --- a/conf/cmi/views.view.unit_services.yml +++ b/conf/cmi/views.view.unit_services.yml @@ -8,7 +8,7 @@ dependencies: - helfi_tpr - user _core: - default_config_hash: GYMoCqFGp9UJCDJroJyIx4UVbaoO32pYdkm6p6oP2f8 + default_config_hash: 42qkvrqMtYpQiMgt2YU8fcfrF2DGfBmfrwlRksq3laE id: unit_services label: 'Unit services' module: views @@ -77,26 +77,9 @@ display: hide_alter_empty: true view_mode: teaser pager: - type: full + type: none options: offset: 0 - items_per_page: 4 - total_pages: null - id: 0 - tags: - next: Next - previous: Previous - first: First - last: Last - expose: - items_per_page: false - items_per_page_label: 'Items per page' - items_per_page_options: '5, 10, 25, 50' - items_per_page_options_all: false - items_per_page_options_all_label: '- All -' - offset: false - offset_label: Offset - quantity: 9 exposed_form: type: basic options: diff --git a/docker-compose.yml b/docker-compose.yml index e8b205098..c9be64c76 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -82,22 +82,6 @@ services: - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-varnish.tls=true" - "traefik.http.services.${COMPOSE_PROJECT_NAME}-varnish.loadbalancer.server.port=6081" - "traefik.docker.network=stonehenge-network" - robo: - image: ghcr.io/city-of-helsinki/drupal-robo:latest - shm_size: '2gb' - tty: true - volumes: - - .:/app:delegated - networks: - - internal - - stonehenge-network - depends_on: - - app - profiles: - - testing - extra_hosts: - - "${DRUPAL_HOSTNAME}:host-gateway" - - "varnish-${DRUPAL_HOSTNAME}:host-gateway" networks: internal: external: false