From f4699f762646321c76d5ae9253d7cab015121b91 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Mon, 26 Feb 2024 14:40:12 +0000 Subject: [PATCH] Update configuration --- composer.lock | 78 +++++++-------- ...splay.paragraph.accordion_item.default.yml | 2 +- conf/cmi/editor.editor.full_html.yml | 6 +- ....accordion.field_accordion_description.yml | 2 +- ...ccordion.field_accordion_heading_level.yml | 8 +- ...agraph.accordion.field_accordion_items.yml | 2 +- ...agraph.accordion.field_accordion_title.yml | 4 +- ....accordion.field_accordion_title_level.yml | 4 +- conf/cmi/filter.format.full_html.yml | 4 +- ...ccordion.field_accordion_heading_level.yml | 4 +- ...agraph.accordion.field_accordion_title.yml | 2 +- ....accordion.field_accordion_title_level.yml | 2 +- ...agraphs.paragraphs_type.accordion_item.yml | 2 +- conf/cmi/purge.logger_channels.yml | 6 ++ conf/cmi/purge.plugins.yml | 4 + conf/cmi/varnish_purger.settings.assets.yml | 30 ++++++ docker-compose.yml | 1 + public/sites/default/settings.php | 96 +++++++++++-------- 18 files changed, 159 insertions(+), 98 deletions(-) create mode 100644 conf/cmi/varnish_purger.settings.assets.yml diff --git a/composer.lock b/composer.lock index 95652134..fff87967 100644 --- a/composer.lock +++ b/composer.lock @@ -3724,16 +3724,16 @@ }, { "name": "drupal/hdbt", - "version": "6.4.13", + "version": "6.4.14", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "c76de24931e368362b1991f0c4f75c37786234cb" + "reference": "d33cb4edcb2c7574a5dc3b08fc24426137542197" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c76de24931e368362b1991f0c4f75c37786234cb", - "reference": "c76de24931e368362b1991f0c4f75c37786234cb", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d33cb4edcb2c7574a5dc3b08fc24426137542197", + "reference": "d33cb4edcb2c7574a5dc3b08fc24426137542197", "shasum": "" }, "require": { @@ -3751,10 +3751,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.13", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.14", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-02-22T08:40:40+00:00" + "time": "2024-02-26T14:05:44+00:00" }, { "name": "drupal/hdbt_admin", @@ -4017,16 +4017,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.13", + "version": "4.3.14", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "4f4c6facbe49620a5aa90d8530bb0f1522b4f2c4" + "reference": "2c441c9a06430d2e69decb30f92792230a12de98" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/4f4c6facbe49620a5aa90d8530bb0f1522b4f2c4", - "reference": "4f4c6facbe49620a5aa90d8530bb0f1522b4f2c4", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/2c441c9a06430d2e69decb30f92792230a12de98", + "reference": "2c441c9a06430d2e69decb30f92792230a12de98", "shasum": "" }, "require": { @@ -4135,23 +4135,23 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.13", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.14", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-02-22T10:20:01+00:00" + "time": "2024-02-26T14:37:27+00:00" }, { "name": "drupal/helfi_proxy", - "version": "3.2.1", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "1ecaece7ca13117f3170b0fa5cf363e316b1dcf3" + "reference": "20dda60b28e43508d06fd08e4bfa705538f483bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/1ecaece7ca13117f3170b0fa5cf363e316b1dcf3", - "reference": "1ecaece7ca13117f3170b0fa5cf363e316b1dcf3", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/20dda60b28e43508d06fd08e4bfa705538f483bf", + "reference": "20dda60b28e43508d06fd08e4bfa705538f483bf", "shasum": "" }, "require": { @@ -4187,10 +4187,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.2.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/3.2.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2024-01-08T07:35:45+00:00" + "time": "2024-02-23T10:27:26+00:00" }, { "name": "drupal/helfi_tpr", @@ -6441,24 +6441,24 @@ }, { "name": "drupal/twig_tweak", - "version": "3.2.1", + "version": "3.3.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/twig_tweak.git", - "reference": "3.2.1" + "reference": "3.3.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/twig_tweak-3.2.1.zip", - "reference": "3.2.1", - "shasum": "89fc08b60f494a7d786251b6c2c493c536218222" + "url": "https://ftp.drupal.org/files/projects/twig_tweak-3.3.0.zip", + "reference": "3.3.0", + "shasum": "a029ab1775b62f08e573e5ad1ab27bc833e7f5b9" }, "require": { "drupal/core": "^9.3 || ^10.0", "ext-json": "*", "php": ">=7.3", "symfony/polyfill-php80": "^1.17", - "twig/twig": "^2.12 || ^3.3.8" + "twig/twig": "^2.15.3 || ^3.4.3" }, "suggest": { "symfony/var-dumper": "Better dump() function for debugging Twig variables" @@ -6466,8 +6466,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.2.1", - "datestamp": "1677404306", + "version": "3.3.0", + "datestamp": "1708670116", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -15992,21 +15992,21 @@ }, { "name": "phpdocumentor/type-resolver", - "version": "1.8.1", + "version": "1.8.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353" + "reference": "153ae662783729388a584b4361f2545e4d841e3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353", - "reference": "bc3dc91a5e9b14aa06d1d9e90647c5c5a2cc5353", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/153ae662783729388a584b4361f2545e4d841e3c", + "reference": "153ae662783729388a584b4361f2545e4d841e3c", "shasum": "" }, "require": { "doctrine/deprecations": "^1.0", - "php": "^7.4 || ^8.0", + "php": "^7.3 || ^8.0", "phpdocumentor/reflection-common": "^2.0", "phpstan/phpdoc-parser": "^1.13" }, @@ -16044,9 +16044,9 @@ "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", "support": { "issues": "https://github.com/phpDocumentor/TypeResolver/issues", - "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.1" + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.8.2" }, - "time": "2024-01-18T19:15:27+00:00" + "time": "2024-02-23T11:10:43+00:00" }, { "name": "phpspec/prophecy", @@ -16215,16 +16215,16 @@ }, { "name": "phpstan/phpdoc-parser", - "version": "1.25.0", + "version": "1.26.0", "source": { "type": "git", "url": "https://github.com/phpstan/phpdoc-parser.git", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240" + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/bd84b629c8de41aa2ae82c067c955e06f1b00240", - "reference": "bd84b629c8de41aa2ae82c067c955e06f1b00240", + "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227", + "reference": "231e3186624c03d7e7c890ec662b81e6b0405227", "shasum": "" }, "require": { @@ -16256,9 +16256,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.25.0" + "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0" }, - "time": "2024-01-04T17:06:16+00:00" + "time": "2024-02-23T16:05:55+00:00" }, { "name": "phpstan/phpstan", diff --git a/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml b/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml index d8c8e641..be914a6b 100644 --- a/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.accordion_item.default.yml @@ -14,7 +14,7 @@ dependencies: config: - paragraphs.paragraphs_type.accordion_item _core: - default_config_hash: 7N37krPnWHQwmRjb9_0yq6TseyB-RZ-qkVpklV7rR98 + default_config_hash: f3ncPjM7WKsN-bLZVQXMbSKIUMZYRk51A9j1Yly5XsE id: paragraph.accordion_item.default targetEntityType: paragraph bundle: accordion_item diff --git a/conf/cmi/editor.editor.full_html.yml b/conf/cmi/editor.editor.full_html.yml index dd625fbc..782dce40 100644 --- a/conf/cmi/editor.editor.full_html.yml +++ b/conf/cmi/editor.editor.full_html.yml @@ -7,7 +7,7 @@ dependencies: module: - ckeditor5 _core: - default_config_hash: yobPkyFHZ_T4qFbTwAFPEgpYYtGpRMfUOE4xTRUVREk + default_config_hash: 6rE3ZrnVZlyWJ666VxrZAjXyipoRfxSuvcgxoWduDKQ format: full_html editor: ckeditor5 settings: @@ -131,7 +131,9 @@ settings: search: '(.*?)<\/a>' replace: $1 ckeditor5_sourceEditing: - allowed_tags: { } + allowed_tags: + - '
' + - '
' helfi_ckeditor_helfi_link: helfi_link_attributes: - '' diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml index 5d62dacd..787dacff 100644 --- a/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml +++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_description.yml @@ -13,7 +13,7 @@ third_party_settings: allowed_formats: - minimal _core: - default_config_hash: gVzq6qdbsUyvmWQ8IChMyCFTZU-X4iYXHPs6DJJhHeg + default_config_hash: kOxXsJuDVcymIAy7jnni6GM5q5SPGSrxwmWJiJ4Sr7c id: paragraph.accordion.field_accordion_description field_name: field_accordion_description entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_heading_level.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_heading_level.yml index dc82f2d6..9f813273 100644 --- a/conf/cmi/field.field.paragraph.accordion.field_accordion_heading_level.yml +++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_heading_level.yml @@ -8,18 +8,18 @@ dependencies: module: - options _core: - default_config_hash: r0RWH_0f6SuVDi0TYIGH_OquoPDpwrqZzSqRcFS3Mcg + default_config_hash: HZVr6AVX7ihLKrsewEHabJxkhrHFUugKszp7Z_B1slk id: paragraph.accordion.field_accordion_heading_level field_name: field_accordion_heading_level entity_type: paragraph bundle: accordion -label: 'Items heading level' -description: 'Select the heading level of the accordion so that they are semantically correct with the rest of the content.' +label: 'Accordion item title level' +description: "If the accordion has a title, the level for accordion item titles should be one level lower. If the accordion doesn't have a title, the level of the accordion title will be used for accordion item titles." required: true translatable: false default_value: - - value: '2' + value: '3' default_value_callback: '' settings: { } field_type: list_string diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_items.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_items.yml index a736b02d..c7f4657a 100644 --- a/conf/cmi/field.field.paragraph.accordion.field_accordion_items.yml +++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_items.yml @@ -12,7 +12,7 @@ dependencies: config: - paragraphs.paragraphs_type.accordion_item _core: - default_config_hash: PCUbQBrVhsW-yyr2nuJTneoebeVthz457CEgW9QDdMk + default_config_hash: Nx_3yq3vNPc667kG9nez6rTv_w54aS3h3rnbAmt7kZ4 id: paragraph.accordion.field_accordion_items field_name: field_accordion_items entity_type: paragraph diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_title.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_title.yml index efceaf23..4bdfd73a 100644 --- a/conf/cmi/field.field.paragraph.accordion.field_accordion_title.yml +++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_title.yml @@ -6,12 +6,12 @@ dependencies: - field.storage.paragraph.field_accordion_title - paragraphs.paragraphs_type.accordion _core: - default_config_hash: WZxryNwlw3rxyo34KM7HrRApzz92Anm7WVJ24RGZaJ4 + default_config_hash: TqiIVq0xav9ieDerAH8CFF0bSAAeZxPsNXWyqpBPm_U id: paragraph.accordion.field_accordion_title field_name: field_accordion_title entity_type: paragraph bundle: accordion -label: Title +label: 'Accordion title' description: '' required: false translatable: false diff --git a/conf/cmi/field.field.paragraph.accordion.field_accordion_title_level.yml b/conf/cmi/field.field.paragraph.accordion.field_accordion_title_level.yml index e2c62608..e8d17ae3 100644 --- a/conf/cmi/field.field.paragraph.accordion.field_accordion_title_level.yml +++ b/conf/cmi/field.field.paragraph.accordion.field_accordion_title_level.yml @@ -8,13 +8,13 @@ dependencies: module: - options _core: - default_config_hash: Njd4TsBh_iVsjSjzTPokGFk04Ud5veMBNxkgZ4nSoNw + default_config_hash: O1itPj2x6F-IUHyrssTSWUsnWXk5ljT5U3jjQrxd0cY id: paragraph.accordion.field_accordion_title_level field_name: field_accordion_title_level entity_type: paragraph bundle: accordion label: 'Accordion title level' -description: 'Select the title level of the accordion so that they are semantically correct with the rest of the content.' +description: 'Choose the appropriate level for the accordion title in the page title hierarchy. Typically, the accordion title level is H2.' required: true translatable: false default_value: diff --git a/conf/cmi/filter.format.full_html.yml b/conf/cmi/filter.format.full_html.yml index 6967f965..ff570c36 100644 --- a/conf/cmi/filter.format.full_html.yml +++ b/conf/cmi/filter.format.full_html.yml @@ -7,7 +7,7 @@ dependencies: - helfi_api_base - linkit _core: - default_config_hash: cg0rnV0ZUaA2jwkBl-DZrGfjFIk-La0SU7GAtL6vwGI + default_config_hash: b1oU0qRmI0LdV1sazHQHpTgk64EjNss5_RdX8BAHdno name: HTML format: full_html weight: 0 @@ -42,7 +42,7 @@ filters: status: true weight: -50 settings: - allowed_html: '