diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml index d4f85a89..461e0844 100644 --- a/.github/workflows/artifact.yml +++ b/.github/workflows/artifact.yml @@ -18,7 +18,7 @@ jobs: services: db: - image: mariadb:10.7 + image: mariadb env: MYSQL_USER: drupal MYSQL_PASSWORD: drupal diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 73c91835..51551c95 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: services: db: - image: mariadb:10.9 + image: mariadb env: MYSQL_USER: drupal MYSQL_PASSWORD: drupal diff --git a/.github/workflows/update-config.yml b/.github/workflows/update-config.yml index 2790c16f..eddbe50b 100644 --- a/.github/workflows/update-config.yml +++ b/.github/workflows/update-config.yml @@ -15,7 +15,7 @@ jobs: services: db: - image: mariadb:10.7 + image: mariadb env: MYSQL_USER: drupal MYSQL_PASSWORD: drupal diff --git a/composer.lock b/composer.lock index 291ed124..3e69c3f5 100644 --- a/composer.lock +++ b/composer.lock @@ -2204,16 +2204,16 @@ }, { "name": "drupal/core", - "version": "9.5.3", + "version": "9.5.5", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "67e34a5e8f48cafdd5c26e778a9570860e2d44a5" + "reference": "eae5e76a8b403cbd42b3465f567313b52d78b0dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/67e34a5e8f48cafdd5c26e778a9570860e2d44a5", - "reference": "67e34a5e8f48cafdd5c26e778a9570860e2d44a5", + "url": "https://api.github.com/repos/drupal/core/zipball/eae5e76a8b403cbd42b3465f567313b52d78b0dc", + "reference": "eae5e76a8b403cbd42b3465f567313b52d78b0dc", "shasum": "" }, "require": { @@ -2365,9 +2365,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.3" + "source": "https://github.com/drupal/core/tree/9.5.5" }, - "time": "2023-02-01T19:47:31+00:00" + "time": "2023-03-15T14:30:25+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -3987,16 +3987,16 @@ }, { "name": "drupal/hdbt", - "version": "4.4.17", + "version": "4.5.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "6065c40f968f5b3dfcb42b8fb295ad8b41867c15" + "reference": "e2d489ee1b463c8b5acde20751172611387e4df7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/6065c40f968f5b3dfcb42b8fb295ad8b41867c15", - "reference": "6065c40f968f5b3dfcb42b8fb295ad8b41867c15", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/e2d489ee1b463c8b5acde20751172611387e4df7", + "reference": "e2d489ee1b463c8b5acde20751172611387e4df7", "shasum": "" }, "require": { @@ -4011,10 +4011,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.4.17", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.5.2", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-02-28T07:38:40+00:00" + "time": "2023-03-13T07:59:03+00:00" }, { "name": "drupal/hdbt_admin", @@ -4140,16 +4140,16 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "1.1.2", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "e2486d70d0bcfb9c696065e2bded6c287fd7a079" + "reference": "17e7208e9e08ce015f80d7daf283355d467b0d02" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/e2486d70d0bcfb9c696065e2bded6c287fd7a079", - "reference": "e2486d70d0bcfb9c696065e2bded6c287fd7a079", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/17e7208e9e08ce015f80d7daf283355d467b0d02", + "reference": "17e7208e9e08ce015f80d7daf283355d467b0d02", "shasum": "" }, "require": { @@ -4165,10 +4165,10 @@ ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.1.2", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/1.2.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2022-11-15T03:27:28+00:00" + "time": "2023-03-11T05:51:21+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -4299,16 +4299,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.17.12", + "version": "2.18.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "9487709294a1c4f8626f344b8cbd51528838a1cd" + "reference": "b24ebf48f798aa5785749537b94a852d0b5741b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9487709294a1c4f8626f344b8cbd51528838a1cd", - "reference": "9487709294a1c4f8626f344b8cbd51528838a1cd", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/b24ebf48f798aa5785749537b94a852d0b5741b2", + "reference": "b24ebf48f798aa5785749537b94a852d0b5741b2", "shasum": "" }, "require": { @@ -4340,7 +4340,7 @@ "drupal/image_style_quality": "^1.4", "drupal/imagecache_external": "^3.0", "drupal/imagemagick": "^3.4", - "drupal/linkit": "^6.0@beta", + "drupal/linkit": "^6.0", "drupal/matomo": "^1.11", "drupal/matomo_reports": "^1.1", "drupal/media_entity_file_replace": "^1.0", @@ -4371,6 +4371,7 @@ "ext-curl": "*" }, "conflict": { + "drupal/core": "<9.5.4", "drupal/core-recommended": "<9.5", "drupal/ctools": "<3.11 || ^4.0.1" }, @@ -4388,7 +4389,7 @@ "[#UHF-4325] Strip whitespaces from twig debug comments": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/f7c0e380e2deb9a1b46bdf779fb27a945b466575/patches/drupal_core_strip_debug_mode_whitespaces_9.3.x.patch", "[#UHF-7008] Core localization file download URL is wrong (https://www.drupal.org/project/drupal/issues/3022876)": "https://git.drupalcode.org/project/drupal/-/commit/40a96136b2dfe4322338508dffa636f6cb407900.patch", "[#UHF-7008] Add multilingual support for caching basefield definitions (https://www.drupal.org/project/drupal/issues/3114824)": "https://www.drupal.org/files/issues/2020-02-20/3114824_2.patch", - "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://www.drupal.org/files/issues/2022-11-04/2313309-152.patch" + "[#UHF-7008] Admin toolbar and contextual links should always be rendered in the admin language (https://www.drupal.org/project/drupal/issues/2313309)": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/a42c905a162c8510348b17cdf60000a0a7f82037/patches/drupal-2313309-render-admin-toolbar-with-admin-language.patch" }, "drupal/default_content": { "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" @@ -4404,7 +4405,7 @@ "[#UHF-2059] Enhancements for the Admin UI": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/fdccb32397cc6fa19b4d0077b21a2b18aa6be297/patches/helfi_customizations_for_paragraphs_widget_8.x-1.12.patch" }, "drupal/linkit": { - "[#UHF-1872] Linkit support for link field": "https://www.drupal.org/files/issues/2021-08-20/avoid-linkit-CI-issue.patch" + "[#UHF-1872] Linkit support for link field (https://www.drupal.org/i/2712951)": "https://www.drupal.org/files/issues/2023-03-07/2712951_329.6.x.diff" }, "drupal/field_group": { "[#UHF-3268] Support for field group translations": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/736077493b73d83b63081820790dc68e226a6460/patches/field_group_fix-translations_label_description-3111107-31-rerolled.patch" @@ -4419,23 +4420,23 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.17.12", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.18.5", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-02-22T08:19:51+00:00" + "time": "2023-03-16T11:19:20+00:00" }, { "name": "drupal/helfi_proxy", - "version": "3.0.3", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "625d1baf0df705d96bd8b59fb9e6a6166dbcee77" + "reference": "f5125c5569c04781730d1420f0d1886ba1096c1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/625d1baf0df705d96bd8b59fb9e6a6166dbcee77", - "reference": "625d1baf0df705d96bd8b59fb9e6a6166dbcee77", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/f5125c5569c04781730d1420f0d1886ba1096c1f", + "reference": "f5125c5569c04781730d1420f0d1886ba1096c1f", "shasum": "" }, "require": { @@ -4461,23 +4462,23 @@ ], "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/3.0.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.0.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2023-02-28T07:10:49+00:00" + "time": "2023-03-14T06:27:48+00:00" }, { "name": "drupal/helfi_tpr", - "version": "2.1.9", + "version": "2.1.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "922bdb0ed7fb34858a007b04624e89fa07c7d55a" + "reference": "378724923a506a8f340542283242bf5f22d6c6a4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/922bdb0ed7fb34858a007b04624e89fa07c7d55a", - "reference": "922bdb0ed7fb34858a007b04624e89fa07c7d55a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/378724923a506a8f340542283242bf5f22d6c6a4", + "reference": "378724923a506a8f340542283242bf5f22d6c6a4", "shasum": "" }, "require": { @@ -4503,10 +4504,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.9", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.10", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-02-09T13:53:30+00:00" + "time": "2023-03-02T07:17:52+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -4543,29 +4544,35 @@ }, { "name": "drupal/image_style_quality", - "version": "1.4.0", + "version": "1.5.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/image_style_quality.git", - "reference": "8.x-1.4" + "reference": "8.x-1.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/image_style_quality-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "5c2e80cfe88d8902ac9c7b6b3c70f6e8c893ffe1" + "url": "https://ftp.drupal.org/files/projects/image_style_quality-8.x-1.5.zip", + "reference": "8.x-1.5", + "shasum": "1ba0ec041c1810286a2c51c01e91c0dc97abf607" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^8 || ^9 || ^10", + "php": ">=7.4" }, "require-dev": { - "drupal/imagemagick": "*" + "drupal/imagemagick": "*", + "drupal/imagick": "*" + }, + "suggest": { + "drupal/imagemagick": "*", + "drupal/imagick": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.4", - "datestamp": "1597367306", + "version": "8.x-1.5", + "datestamp": "1678374565", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4581,6 +4588,10 @@ "name": "Chris Charlton", "homepage": "https://www.drupal.org/user/17089" }, + { + "name": "heddn", + "homepage": "https://www.drupal.org/user/1463982" + }, { "name": "Sam152", "homepage": "https://www.drupal.org/user/1485048" @@ -4732,29 +4743,30 @@ }, { "name": "drupal/linkit", - "version": "6.0.0-beta3", + "version": "6.0.0-beta4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.0.0-beta3" + "reference": "6.0.0-beta4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0-beta3.zip", - "reference": "6.0.0-beta3", - "shasum": "39a5bf54cbc88324d788a573df7b3fecf7622065" + "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0-beta4.zip", + "reference": "6.0.0-beta4", + "shasum": "94274f0af2315ca91d9be8fc4e5103c9566860f0" }, "require": { - "drupal/core": "^8.7.7 || ^9" + "drupal/core": "^9.4 || ^10" }, "require-dev": { + "drupal/ckeditor": "*", "drupal/imce": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.0-beta3", - "datestamp": "1632946984", + "version": "6.0.0-beta4", + "datestamp": "1678030708", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -4775,6 +4787,10 @@ { "name": "johnwebdev", "homepage": "https://www.drupal.org/user/3331569" + }, + { + "name": "mark_fullmer", + "homepage": "https://www.drupal.org/user/2612816" } ], "description": "Linkit - Enriched linking experience", @@ -11334,16 +11350,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v3.2.0", + "version": "v3.2.1", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3" + "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/1ee04c65529dea5d8744774d474e7cbd2f1206d3", - "reference": "1ee04c65529dea5d8744774d474e7cbd2f1206d3", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", + "reference": "e2d1534420bd723d0ef5aec58a22c5fe60ce6f5e", "shasum": "" }, "require": { @@ -11381,7 +11397,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.0" + "source": "https://github.com/symfony/deprecation-contracts/tree/v3.2.1" }, "funding": [ { @@ -11397,7 +11413,7 @@ "type": "tidelift" } ], - "time": "2022-11-25T10:21:52+00:00" + "time": "2023-03-01T10:25:55+00:00" }, { "name": "symfony/error-handler", @@ -13590,16 +13606,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.19", + "version": "v5.4.21", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b" + "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", - "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6c5ac3a1be8b849d59a1a77877ee110e1b55eb74", + "reference": "6c5ac3a1be8b849d59a1a77877ee110e1b55eb74", "shasum": "" }, "require": { @@ -13659,7 +13675,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.19" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.21" }, "funding": [ { @@ -13675,7 +13691,7 @@ "type": "tidelift" } ], - "time": "2023-01-16T10:52:33+00:00" + "time": "2023-02-23T10:00:28+00:00" }, { "name": "symfony/yaml", diff --git a/conf/cmi/core.entity_form_display.paragraph.service_list_search.default.yml b/conf/cmi/core.entity_form_display.paragraph.service_list_search.default.yml new file mode 100644 index 00000000..5c5b419d --- /dev/null +++ b/conf/cmi/core.entity_form_display.paragraph.service_list_search.default.yml @@ -0,0 +1,53 @@ +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.service_list_search.field_service_list_description + - field.field.paragraph.service_list_search.field_service_list_service_ids + - field.field.paragraph.service_list_search.field_service_list_services + - field.field.paragraph.service_list_search.field_service_list_title + - paragraphs.paragraphs_type.service_list_search + module: + - select2 + - text +id: paragraph.service_list_search.default +targetEntityType: paragraph +bundle: service_list_search +mode: default +content: + field_service_list_description: + type: text_textarea + weight: 1 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_service_list_service_ids: + type: number + weight: 2 + region: content + settings: + placeholder: '' + third_party_settings: { } + field_service_list_services: + type: select2_entity_reference + weight: 3 + region: content + settings: + width: 100% + autocomplete: false + match_operator: CONTAINS + match_limit: 10 + third_party_settings: { } + field_service_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.paragraph.service_list_search.default.yml b/conf/cmi/core.entity_view_display.paragraph.service_list_search.default.yml new file mode 100644 index 00000000..57c1eb02 --- /dev/null +++ b/conf/cmi/core.entity_view_display.paragraph.service_list_search.default.yml @@ -0,0 +1,34 @@ +langcode: en +status: true +dependencies: + config: + - field.field.paragraph.service_list_search.field_service_list_description + - field.field.paragraph.service_list_search.field_service_list_service_ids + - field.field.paragraph.service_list_search.field_service_list_services + - field.field.paragraph.service_list_search.field_service_list_title + - paragraphs.paragraphs_type.service_list_search + module: + - text +id: paragraph.service_list_search.default +targetEntityType: paragraph +bundle: service_list_search +mode: default +content: + field_service_list_description: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 1 + region: content + field_service_list_title: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: + field_service_list_service_ids: true + field_service_list_services: 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 new file mode 100644 index 00000000..88c25a3d --- /dev/null +++ b/conf/cmi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml @@ -0,0 +1,101 @@ +langcode: en +status: true +dependencies: + config: + - core.entity_view_mode.tpr_service.teaser_search_result + - field.field.tpr_service.tpr_service.field_content + - field.field.tpr_service.tpr_service.field_lower_content + - field.field.tpr_service.tpr_service.field_metatags + - field.field.tpr_service.tpr_service.field_sidebar_content + module: + - helfi_tpr + - text +_core: + default_config_hash: xI-QgKUvsjLc0SRc8bpDE336uJXT5rVP6K8TirZUzw8 +id: tpr_service.tpr_service.teaser_search_result +targetEntityType: tpr_service +bundle: tpr_service +mode: teaser_search_result +content: + description: + type: text_summary_or_trimmed + label: hidden + settings: + trim_length: 600 + third_party_settings: { } + weight: 1 + region: content + errand_services: + type: tpr_service_err_channel_list + label: hidden + settings: + view_mode: default + sort_order: + ESERVICE: + label: E-service + weight: '0' + show: 0 + CHAT: + label: Chat + show: '1' + weight: '1' + EMAIL: + label: Email + show: '1' + weight: '2' + TELEPHONE: + label: Telephone + show: '1' + weight: '3' + PRINTABLE_FORM: + label: Form + show: '1' + weight: '4' + LOCAL: + label: 'Local service' + weight: '5' + show: 0 + SMS: + label: SMS + weight: '6' + show: 0 + WEBPAGE: + label: Webpage + weight: '7' + show: 0 + MAIL: + label: 'Postal mail' + weight: '8' + show: 0 + TELEFAX: + label: Telefax + weight: '9' + show: 0 + OFFICE: + label: 'Service point' + weight: '99' + show: 0 + third_party_settings: { } + weight: 2 + region: content + name: + type: string + label: hidden + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: + created: true + field_content: true + field_lower_content: true + field_metatags: true + field_sidebar_content: true + has_unit: true + langcode: true + links: true + name_override: true + name_synonyms: true + service_id: true + toc_enabled: true diff --git a/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml b/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml new file mode 100644 index 00000000..2cda5758 --- /dev/null +++ b/conf/cmi/core.entity_view_mode.tpr_service.teaser_search_result.yml @@ -0,0 +1,9 @@ +langcode: en +status: true +dependencies: + module: + - helfi_tpr +id: tpr_service.teaser_search_result +label: 'Teaser search result' +targetEntityType: tpr_service +cache: true diff --git a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_description.yml b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_description.yml new file mode 100644 index 00000000..b0263b7b --- /dev/null +++ b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_description.yml @@ -0,0 +1,24 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_service_list_description + - paragraphs.paragraphs_type.service_list_search + module: + - allowed_formats + - text +third_party_settings: + allowed_formats: + allowed_formats: { } +id: paragraph.service_list_search.field_service_list_description +field_name: field_service_list_description +entity_type: paragraph +bundle: service_list_search +label: Description +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_service_ids.yml b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_service_ids.yml new file mode 100644 index 00000000..6acf2158 --- /dev/null +++ b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_service_ids.yml @@ -0,0 +1,23 @@ +uuid: 721b3a78-57b6-4625-8ba2-1f6723f88620 +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_service_list_service_ids + - paragraphs.paragraphs_type.service_list_search +id: paragraph.service_list_search.field_service_list_service_ids +field_name: field_service_list_service_ids +entity_type: paragraph +bundle: service_list_search +label: 'Service group ID' +description: 'You’ll find the service group ID by opening a service you want to list for editing, and scrolling to the bottom of the form.' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + min: null + max: null + prefix: '' + suffix: '' +field_type: integer diff --git a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_services.yml b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_services.yml new file mode 100644 index 00000000..408bf639 --- /dev/null +++ b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_services.yml @@ -0,0 +1,24 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_service_list_services + - paragraphs.paragraphs_type.service_list_search +id: paragraph.service_list_search.field_service_list_services +field_name: field_service_list_services +entity_type: paragraph +bundle: service_list_search +label: 'Additional services' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: views + handler_settings: + view: + view_name: service_list + display_name: entity_reference_1 + arguments: { } +field_type: entity_reference diff --git a/conf/cmi/field.field.paragraph.service_list_search.field_service_list_title.yml b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_title.yml new file mode 100644 index 00000000..f1287f11 --- /dev/null +++ b/conf/cmi/field.field.paragraph.service_list_search.field_service_list_title.yml @@ -0,0 +1,18 @@ +langcode: en +status: true +dependencies: + config: + - field.storage.paragraph.field_service_list_title + - paragraphs.paragraphs_type.service_list_search +id: paragraph.service_list_search.field_service_list_title +field_name: field_service_list_title +entity_type: paragraph +bundle: service_list_search +label: Title +description: '' +required: true +translatable: true +default_value: { } +default_value_callback: '' +settings: { } +field_type: string diff --git a/conf/cmi/field.storage.paragraph.field_service_list_service_ids.yml b/conf/cmi/field.storage.paragraph.field_service_list_service_ids.yml new file mode 100644 index 00000000..8df88b9a --- /dev/null +++ b/conf/cmi/field.storage.paragraph.field_service_list_service_ids.yml @@ -0,0 +1,20 @@ +uuid: b424ec76-ae10-4cce-97a2-73118c94f168 +langcode: en +status: true +dependencies: + module: + - paragraphs +id: paragraph.field_service_list_service_ids +field_name: field_service_list_service_ids +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/language/fi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml b/conf/cmi/language/fi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml new file mode 100644 index 00000000..e24fe262 --- /dev/null +++ b/conf/cmi/language/fi/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml @@ -0,0 +1,26 @@ +content: + errand_services: + settings: + sort_order: + ESERVICE: + label: E-service + CHAT: + label: Chat + EMAIL: + label: Sähköposti + TELEPHONE: + label: Puhelin + PRINTABLE_FORM: + label: Lomake + LOCAL: + label: 'Local service' + SMS: + label: SMS + WEBPAGE: + label: Webpage + MAIL: + label: 'Postal mail' + TELEFAX: + label: Telefax + OFFICE: + label: Palvelupiste diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list_search.field_service_list_description.yml b/conf/cmi/language/fi/field.field.paragraph.service_list_search.field_service_list_description.yml new file mode 100644 index 00000000..0efaafda --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.service_list_search.field_service_list_description.yml @@ -0,0 +1 @@ +label: ' Kuvaus' diff --git a/conf/cmi/language/fi/field.field.paragraph.service_list_search.field_service_list_services.yml b/conf/cmi/language/fi/field.field.paragraph.service_list_search.field_service_list_services.yml new file mode 100644 index 00000000..06b02e99 --- /dev/null +++ b/conf/cmi/language/fi/field.field.paragraph.service_list_search.field_service_list_services.yml @@ -0,0 +1 @@ +label: Lisäpalvelut diff --git a/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list_search.yml b/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list_search.yml new file mode 100644 index 00000000..04bee319 --- /dev/null +++ b/conf/cmi/language/fi/paragraphs.paragraphs_type.service_list_search.yml @@ -0,0 +1 @@ +label: ' Palveluluettelohaku' diff --git a/conf/cmi/language/fi/views.view.service_list.yml b/conf/cmi/language/fi/views.view.service_list.yml index 452efa03..88839304 100644 --- a/conf/cmi/language/fi/views.view.service_list.yml +++ b/conf/cmi/language/fi/views.view.service_list.yml @@ -24,3 +24,18 @@ display: id: exception: title: Kaikki + block_search: + display_options: + exposed_form: + options: + submit_button: Etsi + pager: + options: + tags: + previous: Edellinen + next: Seuraava + filters: + combine: + expose: + label: 'Neuvontapalvelun nimi tai hakusana' + placeholder: 'Esim. Sosiaalineuvonta, terveys tai digi' diff --git a/conf/cmi/language/sv/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml b/conf/cmi/language/sv/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml new file mode 100644 index 00000000..abbecbd6 --- /dev/null +++ b/conf/cmi/language/sv/core.entity_view_display.tpr_service.tpr_service.teaser_search_result.yml @@ -0,0 +1,26 @@ +content: + errand_services: + settings: + sort_order: + ESERVICE: + label: E-service + CHAT: + label: Chatt + EMAIL: + label: E-post + TELEPHONE: + label: Telefon + PRINTABLE_FORM: + label: Blankett + LOCAL: + label: 'Local service' + SMS: + label: SMS + WEBPAGE: + label: Webpage + MAIL: + label: 'Postal mail' + TELEFAX: + label: Telefax + OFFICE: + label: Serviceställe diff --git a/conf/cmi/language/sv/field.field.paragraph.service_list_search.field_service_list_description.yml b/conf/cmi/language/sv/field.field.paragraph.service_list_search.field_service_list_description.yml new file mode 100644 index 00000000..45893182 --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.service_list_search.field_service_list_description.yml @@ -0,0 +1 @@ +label: Beskrivning diff --git a/conf/cmi/language/sv/field.field.paragraph.service_list_search.field_service_list_services.yml b/conf/cmi/language/sv/field.field.paragraph.service_list_search.field_service_list_services.yml new file mode 100644 index 00000000..f365d58a --- /dev/null +++ b/conf/cmi/language/sv/field.field.paragraph.service_list_search.field_service_list_services.yml @@ -0,0 +1 @@ +label: 'Ytterligare tjänster' diff --git a/conf/cmi/language/sv/paragraphs.paragraphs_type.service_list_search.yml b/conf/cmi/language/sv/paragraphs.paragraphs_type.service_list_search.yml new file mode 100644 index 00000000..a646c157 --- /dev/null +++ b/conf/cmi/language/sv/paragraphs.paragraphs_type.service_list_search.yml @@ -0,0 +1 @@ +label: 'Sök efter tjänstelista' diff --git a/conf/cmi/language/sv/views.view.service_list.yml b/conf/cmi/language/sv/views.view.service_list.yml index 095760af..5a74e8e1 100644 --- a/conf/cmi/language/sv/views.view.service_list.yml +++ b/conf/cmi/language/sv/views.view.service_list.yml @@ -8,3 +8,18 @@ display: previous: Föregående first: Första last: Sista + block_search: + display_options: + exposed_form: + options: + submit_button: Sök + pager: + options: + tags: + previous: Tidigare + next: Nästa + filters: + combine: + expose: + label: 'Rådgivningstjänstens namn eller sökterm' + placeholder: 't.ex. Socialrådgivning, hälsa eller digitalt Sök' diff --git a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml index 8e55a0c4..386a436e 100644 --- a/conf/cmi/metatag.metatag_defaults.node__landing_page.yml +++ b/conf/cmi/metatag.metatag_defaults.node__landing_page.yml @@ -6,4 +6,5 @@ _core: default_config_hash: 4LnWqTxx8bp4ew1DS7XZOmhHzO_B-us0REW1efp3xRk id: node__landing_page label: 'Content: Landing page' -tags: { } +tags: + description: '[node:field_hero:entity:field_hero_desc]' diff --git a/conf/cmi/paragraphs.paragraphs_type.service_list_search.yml b/conf/cmi/paragraphs.paragraphs_type.service_list_search.yml new file mode 100644 index 00000000..14506274 --- /dev/null +++ b/conf/cmi/paragraphs.paragraphs_type.service_list_search.yml @@ -0,0 +1,14 @@ +langcode: en +status: true +dependencies: + module: + - paragraphs_library +third_party_settings: + paragraphs_library: + allow_library_conversion: true +id: service_list_search +label: 'Service List Search' +icon_uuid: null +icon_default: null +description: '' +behavior_plugins: { } diff --git a/conf/cmi/user.role.anonymous.yml b/conf/cmi/user.role.anonymous.yml index 4bb4fae3..2fb140d3 100644 --- a/conf/cmi/user.role.anonymous.yml +++ b/conf/cmi/user.role.anonymous.yml @@ -9,8 +9,8 @@ dependencies: - helfi_api_base - helfi_tpr - media - - system - rest + - system _core: default_config_hash: j5zLMOdJBqC0bMvSdth5UebkprJB8g_2FXHqhfpJzow id: anonymous diff --git a/conf/cmi/user.role.authenticated.yml b/conf/cmi/user.role.authenticated.yml index 995e92e4..573abd07 100644 --- a/conf/cmi/user.role.authenticated.yml +++ b/conf/cmi/user.role.authenticated.yml @@ -9,9 +9,9 @@ dependencies: - helfi_api_base - helfi_tpr - media + - rest - system - toolbar - - rest _core: default_config_hash: dJ0L2DNSj5q6XVZAGsuVDpJTh5UeYkIPwKrUOOpr8YI id: authenticated diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index 7e0cf64d..606cea3e 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - core.entity_view_mode.tpr_service.teaser + - core.entity_view_mode.tpr_service.teaser_search_result module: - helfi_tpr - user @@ -561,3 +562,512 @@ display: - 'languages:language_interface' - user.permissions tags: { } + block_search: + id: block_search + display_title: Block + display_plugin: block + position: 3 + display_options: + title: 'Service list search' + fields: + name: + id: name + table: tpr_service_field_data + field: name + relationship: none + group_type: group + admin_label: '' + entity_type: null + entity_field: name + plugin_id: field + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: h2 + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + name_synonyms: + id: name_synonyms + table: tpr_service_field_data + field: name_synonyms + relationship: none + group_type: group + admin_label: '' + entity_type: tpr_service + entity_field: name_synonyms + plugin_id: field + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: basic_string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + description__summary: + id: description__summary + table: tpr_service_field_data + field: description__summary + relationship: none + group_type: group + admin_label: '' + entity_type: tpr_service + entity_field: description + plugin_id: field + label: '' + exclude: false + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: text_default + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + name_override: + id: name_override + table: tpr_service_field_data + field: name_override + relationship: none + group_type: group + admin_label: '' + entity_type: tpr_service + entity_field: name_override + plugin_id: field + label: '' + exclude: true + alter: + alter_text: false + text: '' + make_link: false + path: '' + absolute: false + external: false + replace_spaces: false + path_case: none + trim_whitespace: false + alt: '' + rel: '' + link_class: '' + prefix: '' + suffix: '' + target: '' + nl2br: false + max_length: 0 + word_boundary: true + ellipsis: true + more_link: false + more_link_text: '' + more_link_path: '' + strip_tags: false + trim: false + preserve_tags: '' + html: false + element_type: '' + element_class: '' + element_label_type: '' + element_label_class: '' + element_label_colon: false + element_wrapper_type: '' + element_wrapper_class: '' + element_default_classes: true + empty: '' + hide_empty: false + empty_zero: false + hide_alter_empty: true + click_sort_column: value + type: string + settings: + link_to_entity: false + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false + pager: + type: full + options: + offset: 0 + items_per_page: 5 + 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: + submit_button: Search + reset_button: false + reset_button_label: Reset + exposed_sorts_label: 'Sort by' + expose_sort_order: true + sort_asc_label: Asc + sort_desc_label: Desc + sorts: + name: + id: name + table: tpr_service_field_data + field: name + relationship: none + group_type: group + admin_label: '' + entity_type: tpr_service + entity_field: name + plugin_id: standard + order: ASC + expose: + label: '' + field_identifier: name + exposed: false + name_override: + id: name_override + table: tpr_service_field_data + field: name_override + relationship: none + group_type: group + admin_label: '' + entity_type: tpr_service + entity_field: name_override + plugin_id: standard + order: ASC + expose: + label: '' + field_identifier: name_override + exposed: false + arguments: + id_or_service_id: + id: id_or_service_id + table: tpr_service_field_data + field: id_or_service_id + relationship: none + group_type: group + admin_label: '' + entity_type: tpr_service + plugin_id: id_or_service_id_handler + default_action: ignore + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: fixed + default_argument_options: + argument: '' + default_argument_skip_url: false + summary_options: + base_path: '' + count: true + override: false + items_per_page: 25 + summary: + sort_order: asc + number_of_records: 0 + format: default_summary + specify_validation: false + validate: + type: none + fail: 'not found' + validate_options: { } + filters: + content_translation_status: + id: content_translation_status + table: tpr_service_field_data + field: content_translation_status + entity_type: tpr_service + entity_field: content_translation_status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + langcode: + id: langcode + table: tpr_service_field_data + field: langcode + relationship: none + group_type: group + admin_label: '' + entity_type: tpr_service + entity_field: langcode + plugin_id: language + operator: in + value: + '***LANGUAGE_language_content***': '***LANGUAGE_language_content***' + group: 1 + exposed: false + expose: + operator_id: '' + label: '' + description: '' + use_operator: false + operator: '' + operator_limit_selection: false + operator_list: { } + identifier: '' + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + reduce: false + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + combine: + id: combine + table: views + field: combine + relationship: none + group_type: group + admin_label: '' + plugin_id: combine + operator: word + value: '' + group: 1 + exposed: true + expose: + operator_id: combine_op + label: 'Advisory service name or Search term' + description: '' + use_operator: false + operator: combine_op + operator_limit_selection: false + operator_list: { } + identifier: combine + required: false + remember: false + multiple: false + remember_roles: + authenticated: authenticated + anonymous: '0' + read_only: '0' + content_producer: '0' + editor: '0' + admin: '0' + placeholder: 'e.g Social Counseling, Health, or Digital' + is_grouped: false + group_info: + label: '' + description: '' + identifier: '' + optional: true + widget: select + multiple: false + remember: false + default_group: All + default_group_multiple: { } + group_items: { } + fields: + name: name + name_synonyms: name_synonyms + description__summary: description__summary + name_override: name_override + filter_groups: + operator: AND + groups: + 1: AND + style: + type: default + options: + row_class: '' + default_row_class: true + uses_fields: true + row: + type: 'entity:tpr_service' + options: + relationship: none + view_mode: teaser_search_result + defaults: + title: false + pager: false + exposed_form: false + style: false + row: false + relationships: false + fields: false + sorts: false + arguments: false + filters: false + filter_groups: false + relationships: { } + display_extenders: + metatag_display_extender: + metatags: { } + tokenize: false + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - url.query_args + - user.permissions + tags: { } diff --git a/tools/make/common.mk b/tools/make/common.mk index a4aeeac1..0ede4457 100644 --- a/tools/make/common.mk +++ b/tools/make/common.mk @@ -60,7 +60,7 @@ shell-%: ## Login to remote instance PHONY += sync sync: ## Sync data from other environments - $(call group_step,Sync:$(NO_COLOR) $(SYNC_TARGETS)\n) + $(call group_step,Sync:$(NO_COLOR) $(SYNC_TARGETS)) @$(MAKE) $(SYNC_TARGETS) ENV=$(ENV) PHONY += gh-download-dump diff --git a/tools/make/project/install.mk b/tools/make/project/install.mk index 84ae5d1a..c38be143 100644 --- a/tools/make/project/install.mk +++ b/tools/make/project/install.mk @@ -25,7 +25,7 @@ PHONY += helfi-drush-enable-modules helfi-drush-enable-modules: ## Enable modules and base configurations. $(call step,Install base configurations...) $(call drush,cr) - $(call drush,en -y helfi_platform_config helfi_base_config) + $(call drush,en -y helfi_platform_config helfi_platform_config_base) PHONY += drush-locale-update drush-locale-update: ## Update translations. diff --git a/tools/make/symfony.mk b/tools/make/symfony.mk index 310ab44c..a756dc7b 100644 --- a/tools/make/symfony.mk +++ b/tools/make/symfony.mk @@ -47,9 +47,9 @@ fresh: ## Build fresh development environment @$(MAKE) $(SF_FRESH_TARGETS) PHONY += fix-symfony -fix-symfony: tools/php-cs-fixer/vendor ## Fix Symfony code style - $(call step,Fix Symfony code style in ./src ...\n) - $(call docker_compose_exec,tools/php-cs-fixer/vendor/bin/php-cs-fixer --ansi -vvvv fix src) +fix-symfony: ## Fix Symfony code style + $(call step,Fix Symfony code style...\n) + $(call docker_compose_exec,PHP_CS_FIXER_IGNORE_ENV=1 vendor/bin/php-cs-fixer fix --diff --ansi) PHONY += lint-symfony lint-symfony: PATHS := src @@ -57,11 +57,6 @@ lint-symfony: ## Lint Symfony code style $(call step,Lint Symfony code style...\n) $(call cs_symfony,$(PATHS)) -tools/php-cs-fixer/vendor: COMPOSER_JSON_PATH := tools/php-cs-fixer -tools/php-cs-fixer/vendor: - $(call step,Install php-cs-fixer...\n) - $(call composer,install) - ifeq ($(RUN_ON),docker) define sf_console $(call docker_compose_exec,bin/console $(1))