From 055e1e79e5bc9d30bb876068dff5e4bd1c9eafd9 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Wed, 27 Dec 2023 11:11:40 +0000 Subject: [PATCH] Update configuration --- .platform/schema | 2 +- composer.json | 3 + composer.lock | 74 +++++++++---------- ...form_display.tpr_unit.tpr_unit.default.yml | 17 ++++- ...view_display.tpr_unit.tpr_unit.default.yml | 9 ++- ...view_display.tpr_unit.tpr_unit.minimal.yml | 3 +- ..._view_display.tpr_unit.tpr_unit.teaser.yml | 3 +- ...ay.tpr_unit.tpr_unit.teaser_with_image.yml | 3 +- ..._display.tpr_unit.tpr_unit.wide_teaser.yml | 3 +- .../metatag.metatag_defaults.tpr_service.yml | 1 + .../fi/metatag.metatag_defaults.tpr_unit.yml | 1 + docker-compose.yml | 1 + 12 files changed, 73 insertions(+), 47 deletions(-) create mode 100644 conf/cmi/language/fi/metatag.metatag_defaults.tpr_service.yml create mode 100644 conf/cmi/language/fi/metatag.metatag_defaults.tpr_unit.yml diff --git a/.platform/schema b/.platform/schema index bf0d87ab1..7813681f5 100644 --- a/.platform/schema +++ b/.platform/schema @@ -1 +1 @@ -4 \ No newline at end of file +5 \ No newline at end of file diff --git a/composer.json b/composer.json index f5eda6ba3..ebca224e0 100644 --- a/composer.json +++ b/composer.json @@ -101,6 +101,9 @@ "drush/Commands/{$name}": [ "type:drupal-drush" ] + }, + "patchLevel": { + "drupal/core": "-p2" } }, "repositories": [ diff --git a/composer.lock b/composer.lock index d598aa178..36e629fff 100644 --- a/composer.lock +++ b/composer.lock @@ -541,16 +541,16 @@ }, { "name": "consolidation/annotated-command", - "version": "4.9.1", + "version": "4.9.2", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "e01152f698eff4cb5df3ebfe5e097ef335dbd3c9" + "reference": "b5255dcbee1de95036185062a103dabc622224de" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/e01152f698eff4cb5df3ebfe5e097ef335dbd3c9", - "reference": "e01152f698eff4cb5df3ebfe5e097ef335dbd3c9", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/b5255dcbee1de95036185062a103dabc622224de", + "reference": "b5255dcbee1de95036185062a103dabc622224de", "shasum": "" }, "require": { @@ -591,9 +591,9 @@ "description": "Initialize Symfony Console commands from annotated command class methods.", "support": { "issues": "https://github.com/consolidation/annotated-command/issues", - "source": "https://github.com/consolidation/annotated-command/tree/4.9.1" + "source": "https://github.com/consolidation/annotated-command/tree/4.9.2" }, - "time": "2023-05-20T04:19:01+00:00" + "time": "2023-12-26T14:30:50+00:00" }, { "name": "consolidation/config", @@ -1515,10 +1515,6 @@ "name": "dww", "homepage": "https://www.drupal.org/user/46549" }, - { - "name": "googletorp", - "homepage": "https://www.drupal.org/user/386230" - }, { "name": "jsacksick", "homepage": "https://www.drupal.org/user/972218" @@ -3747,16 +3743,16 @@ }, { "name": "drupal/hdbt", - "version": "6.2.2", + "version": "6.3.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "8cfea20e3b7203f4ec48a1eaa8a708c2d679932a" + "reference": "e9882c29bb896a000c340720b353e110401e6da0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/8cfea20e3b7203f4ec48a1eaa8a708c2d679932a", - "reference": "8cfea20e3b7203f4ec48a1eaa8a708c2d679932a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/e9882c29bb896a000c340720b353e110401e6da0", + "reference": "e9882c29bb896a000c340720b353e110401e6da0", "shasum": "" }, "require": { @@ -3774,10 +3770,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.2.2", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.3.1", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-12-19T08:46:35+00:00" + "time": "2023-12-27T11:06:28+00:00" }, { "name": "drupal/hdbt_admin", @@ -3954,12 +3950,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "218297db1a13ae4dbae519ce5f81bf64277fe36d" + "reference": "fd2a0ddaaf03a12a2670f4d5b2c71b857bae08e7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/218297db1a13ae4dbae519ce5f81bf64277fe36d", - "reference": "218297db1a13ae4dbae519ce5f81bf64277fe36d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/fd2a0ddaaf03a12a2670f4d5b2c71b857bae08e7", + "reference": "fd2a0ddaaf03a12a2670f4d5b2c71b857bae08e7", "shasum": "" }, "require": { @@ -4001,7 +3997,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2023-11-30T13:43:09+00:00" + "time": "2023-12-22T10:17:34+00:00" }, { "name": "drupal/helfi_navigation", @@ -4040,16 +4036,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.2.5", + "version": "4.2.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "280929a9930c63500fbfe2e7a124777828e26d0f" + "reference": "eb0336758589fe27c79d0f2da389b37a3827872d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/280929a9930c63500fbfe2e7a124777828e26d0f", - "reference": "280929a9930c63500fbfe2e7a124777828e26d0f", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/eb0336758589fe27c79d0f2da389b37a3827872d", + "reference": "eb0336758589fe27c79d0f2da389b37a3827872d", "shasum": "" }, "require": { @@ -4163,23 +4159,23 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.2.5", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.2.7", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-12-21T06:30:26+00:00" + "time": "2023-12-22T13:09:21+00:00" }, { "name": "drupal/helfi_proxy", - "version": "3.1.1", + "version": "3.2.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "b14b5fc48eb3df0c88b2e77176561c94402674bf" + "reference": "cab652f056b9a8d8e9e435a758403408cb752c60" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/b14b5fc48eb3df0c88b2e77176561c94402674bf", - "reference": "b14b5fc48eb3df0c88b2e77176561c94402674bf", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/cab652f056b9a8d8e9e435a758403408cb752c60", + "reference": "cab652f056b9a8d8e9e435a758403408cb752c60", "shasum": "" }, "require": { @@ -4215,10 +4211,10 @@ ], "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.1.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.2.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2023-11-07T08:55:52+00:00" + "time": "2023-12-21T07:53:51+00:00" }, { "name": "drupal/helfi_tpr", @@ -4264,16 +4260,16 @@ }, { "name": "drupal/helfi_tunnistamo", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "a866ceb3c42f72bef8c2ae9878b24490f257607c" + "reference": "9e53539beaf01023ee23783560fb5b4c2f958ba5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/a866ceb3c42f72bef8c2ae9878b24490f257607c", - "reference": "a866ceb3c42f72bef8c2ae9878b24490f257607c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/9e53539beaf01023ee23783560fb5b4c2f958ba5", + "reference": "9e53539beaf01023ee23783560fb5b4c2f958ba5", "shasum": "" }, "require": { @@ -4290,10 +4286,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2023-12-20T09:14:52+00:00" + "time": "2023-12-21T07:28:26+00:00" }, { "name": "drupal/image_style_quality", @@ -4431,7 +4427,7 @@ "extra": { "drupal": { "version": "8.x-3.6", - "datestamp": "1703095475", + "datestamp": "1703241142", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" 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 5fa2278c8..81854787a 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 @@ -8,6 +8,7 @@ dependencies: - field.field.tpr_unit.tpr_unit.field_metatags - field.field.tpr_unit.tpr_unit.field_unit_type module: + - allowed_formats - hdbt_admin_tools - helfi_tpr - media_library @@ -15,8 +16,9 @@ dependencies: - paragraphs - path - readonly_field_widget + - text _core: - default_config_hash: iGJgv-B14-RUdc8dyC_MKfM3icDg5Cae4kFwC0MjyGQ + default_config_hash: ilRrdsHOQ6StmQoz8EXvQCOoYTo8L_o2ZG8gNzEbtZM id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -54,7 +56,7 @@ content: third_party_settings: { } address: type: readonly_field_widget - weight: 19 + weight: 20 region: content settings: label: above @@ -112,6 +114,17 @@ content: formatter_settings: { } show_description: false third_party_settings: { } + enrich_description: + type: text_textarea + weight: 19 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: + allowed_formats: + hide_help: '1' + hide_guidelines: '1' field_content: type: paragraphs weight: 28 diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml index e369a3033..5f9287d9c 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.default.yml @@ -18,7 +18,7 @@ dependencies: - telephone - text _core: - default_config_hash: 7xcZTrrfS31z_AAdwrXSDrgd2PAqTWFPgY-XoAEjXQ0 + default_config_hash: SoKM8cPSwNeMsP8ZRG0b8B8n-e1Uy9yoMmPk018vmoY id: tpr_unit.tpr_unit.default targetEntityType: tpr_unit bundle: tpr_unit @@ -103,6 +103,13 @@ content: third_party_settings: { } weight: 8 region: content + enrich_description: + type: text_default + label: hidden + settings: { } + third_party_settings: { } + weight: 3 + region: content field_content: type: entity_reference_revisions_entity_view label: hidden diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml index e5807741c..57aa9ac56 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.minimal.yml @@ -12,7 +12,7 @@ dependencies: - address - helfi_tpr _core: - default_config_hash: wvPWnthIC7o8oa1gJ6jI0ex6xi12GVsZEN5zyrlCLoU + default_config_hash: f5AGkO_5_TgZ9InGKOLMyzbGFaCCTKeiPJYeGuTLnq0 id: tpr_unit.tpr_unit.minimal targetEntityType: tpr_unit bundle: tpr_unit @@ -52,6 +52,7 @@ hidden: created: true description: true email: true + enrich_description: true field_content: true field_lower_content: true field_metatags: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml index 5bc9ce928..fd777276d 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser.yml @@ -14,7 +14,7 @@ dependencies: - helfi_tpr - imagecache_external _core: - default_config_hash: 8hru5uh55ouZ9y4kV_EEJ6PEjb2rGY_tFUc_3Sn12M0 + default_config_hash: 6HvSNKVwbTTTZp-QqRhArKx-A-rx42QloU6l9LZG9rQ id: tpr_unit.tpr_unit.teaser targetEntityType: tpr_unit bundle: tpr_unit @@ -72,6 +72,7 @@ hidden: created: true description: true email: true + enrich_description: true field_content: true field_lower_content: true field_metatags: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml index ea53fce22..fe78b12b9 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.teaser_with_image.yml @@ -15,7 +15,7 @@ dependencies: - imagecache_external - telephone _core: - default_config_hash: gOlhIa1n9jTIJdBPN_Kjp-jn3YnsvZb7HELaoqa8KGQ + default_config_hash: 7gCaVLldtjbDLtOqHqBK6K1NqvNzluQEbJG5bn945k4 id: tpr_unit.tpr_unit.teaser_with_image targetEntityType: tpr_unit bundle: tpr_unit @@ -73,6 +73,7 @@ hidden: created: true description: true email: true + enrich_description: true field_content: true field_lower_content: true field_metatags: true diff --git a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml index fd8ec6f8b..ab9b08fdb 100644 --- a/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml +++ b/conf/cmi/core.entity_view_display.tpr_unit.tpr_unit.wide_teaser.yml @@ -15,7 +15,7 @@ dependencies: - imagecache_external - telephone _core: - default_config_hash: 25YiuMfsdqG-daKeTND6nbYvwDgt7kE7bw23g2GyteI + default_config_hash: 0wDMf9-yI6dKb0je5d0tNyKMNCX5FmuYbFxMRzGs1kc id: tpr_unit.tpr_unit.wide_teaser targetEntityType: tpr_unit bundle: tpr_unit @@ -88,6 +88,7 @@ hidden: created: true description: true email: true + enrich_description: true field_content: true field_lower_content: true field_metatags: true diff --git a/conf/cmi/language/fi/metatag.metatag_defaults.tpr_service.yml b/conf/cmi/language/fi/metatag.metatag_defaults.tpr_service.yml new file mode 100644 index 000000000..0d3e4e595 --- /dev/null +++ b/conf/cmi/language/fi/metatag.metatag_defaults.tpr_service.yml @@ -0,0 +1 @@ +label: 'TPR - Palvelu' diff --git a/conf/cmi/language/fi/metatag.metatag_defaults.tpr_unit.yml b/conf/cmi/language/fi/metatag.metatag_defaults.tpr_unit.yml new file mode 100644 index 000000000..9ffa7dc18 --- /dev/null +++ b/conf/cmi/language/fi/metatag.metatag_defaults.tpr_unit.yml @@ -0,0 +1 @@ +label: 'TPR - Toimipiste' diff --git a/docker-compose.yml b/docker-compose.yml index 941446d7e..9318a816c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -29,6 +29,7 @@ services: SIMPLETEST_BASE_URL: "http://app:8888" SIMPLETEST_DB: "mysql://drupal:drupal@db:3306/drupal" BROWSERTEST_OUTPUT_BASE_URL: "https://${DRUPAL_HOSTNAME}" + BROWSERTEST_OUTPUT_DIRECTORY: "/app/public/sites/default/files/simpletest" DRUPAL_VARNISH_HOST: "${COMPOSE_PROJECT_NAME}-varnish" DRUPAL_VARNISH_PORT: 6081 REDIS_HOST: redis