From 43a49087589b77db30f0da81730f2ff72d3a228e Mon Sep 17 00:00:00 2001 From: actions-bot Date: Tue, 8 Nov 2022 13:40:10 +0000 Subject: [PATCH] Update configuration --- .sonarcloud.properties | 1 + composer.lock | 100 +++++++++--------- ...form_display.paragraph.phasing.default.yml | 3 +- ...view_display.paragraph.phasing.default.yml | 3 +- conf/cmi/hdbt_admin_tools.site_settings.yml | 4 - ...field.node.news_item.field_news_groups.yml | 1 + ...de.news_item.field_news_neighbourhoods.yml | 1 + .../fi/hdbt_admin_tools.site_settings.yml | 4 - .../sv/hdbt_admin_tools.site_settings.yml | 4 - 9 files changed, 58 insertions(+), 63 deletions(-) create mode 100644 .sonarcloud.properties create mode 100644 conf/cmi/language/fi/field.field.node.news_item.field_news_groups.yml create mode 100644 conf/cmi/language/fi/field.field.node.news_item.field_news_neighbourhoods.yml diff --git a/.sonarcloud.properties b/.sonarcloud.properties new file mode 100644 index 00000000..ea01432f --- /dev/null +++ b/.sonarcloud.properties @@ -0,0 +1 @@ +sonar.exclusions=public/modules/custom/**/tests/** diff --git a/composer.lock b/composer.lock index d4212658..928c25b1 100644 --- a/composer.lock +++ b/composer.lock @@ -4054,16 +4054,16 @@ }, { "name": "drupal/hdbt", - "version": "4.1.10", + "version": "4.2.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "472406aed1fa83569a6cf92f4cd72bdd9b880650" + "reference": "5678e07a1442a3327bb596a351e02de822b5aaf9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/472406aed1fa83569a6cf92f4cd72bdd9b880650", - "reference": "472406aed1fa83569a6cf92f4cd72bdd9b880650", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/5678e07a1442a3327bb596a351e02de822b5aaf9", + "reference": "5678e07a1442a3327bb596a351e02de822b5aaf9", "shasum": "" }, "require": { @@ -4078,23 +4078,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.10", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.2.1", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-10-28T12:05:09+00:00" + "time": "2022-11-08T10:18:33+00:00" }, { "name": "drupal/hdbt_admin", - "version": "1.7.3", + "version": "1.8.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2" + "reference": "42d74e27de19bd9392bbdda1bf45c3d6724b603f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", - "reference": "9b2881a546e9d6ba6d6bfa3bdf848b82182b28d2", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/42d74e27de19bd9392bbdda1bf45c3d6724b603f", + "reference": "42d74e27de19bd9392bbdda1bf45c3d6724b603f", "shasum": "" }, "require": { @@ -4110,10 +4110,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.3", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.8.0", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2022-11-01T12:58:43+00:00" + "time": "2022-11-08T07:53:25+00:00" }, { "name": "drupal/helfi_ahjo", @@ -4225,12 +4225,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "1b3b712199e5deac408f51849e4f9b185b823816" + "reference": "b2eae5c3b4f12ef9ddaa40118fa8119be6705cab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/1b3b712199e5deac408f51849e4f9b185b823816", - "reference": "1b3b712199e5deac408f51849e4f9b185b823816", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/b2eae5c3b4f12ef9ddaa40118fa8119be6705cab", + "reference": "b2eae5c3b4f12ef9ddaa40118fa8119be6705cab", "shasum": "" }, "default-branch": true, @@ -4243,7 +4243,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2022-10-28T07:06:17+00:00" + "time": "2022-11-03T07:13:59+00:00" }, { "name": "drupal/helfi_hauki", @@ -4349,16 +4349,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "1.0.6", + "version": "1.0.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "3003eb95f3c51800391009bdbdd58cb1092ed945" + "reference": "63826cd16929888b7e517e4205faea2b8f342811" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/3003eb95f3c51800391009bdbdd58cb1092ed945", - "reference": "3003eb95f3c51800391009bdbdd58cb1092ed945", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/63826cd16929888b7e517e4205faea2b8f342811", + "reference": "63826cd16929888b7e517e4205faea2b8f342811", "shasum": "" }, "require": { @@ -4375,23 +4375,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/1.0.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/1.0.8", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2022-10-14T11:05:06+00:00" + "time": "2022-11-08T07:53:12+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "2.13.10", + "version": "2.13.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "685f4e467c04512b71e02130a34548edfbdfae50" + "reference": "d13b2b7ab66eedbed5af5c5896b5eb1973c90973" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/685f4e467c04512b71e02130a34548edfbdfae50", - "reference": "685f4e467c04512b71e02130a34548edfbdfae50", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d13b2b7ab66eedbed5af5c5896b5eb1973c90973", + "reference": "d13b2b7ab66eedbed5af5c5896b5eb1973c90973", "shasum": "" }, "require": { @@ -4472,7 +4472,7 @@ "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" }, "drupal/eu_cookie_compliance": { - "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/e02b73fc68bd7d9f3611a1d55da267f6fe826340/patches/eu_cookie_compliance_block_8.x-1.24.patch" + "[#UHF-885] Helfi-specific customizations to EU Cookie Compliance": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/923b35f699820b544397a35b7696570e101cd02c/patches/eu_cookie_compliance_block_8.x-1.24.patch" }, "drupal/features": { "https://www.drupal.org/project/features/issues/2869336": "https://www.drupal.org/files/issues/features_export-config-translation-2869336-2.patch" @@ -4500,34 +4500,36 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.10", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.13", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-11-01T07:30:14+00:00" + "time": "2022-11-08T13:18:34+00:00" }, { "name": "drupal/helfi_proxy", - "version": "2.2.9", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy.git", - "reference": "949daf441d06906263dd34b7e05bcfe42dc5a9fe" + "reference": "cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/949daf441d06906263dd34b7e05bcfe42dc5a9fe", - "reference": "949daf441d06906263dd34b7e05bcfe42dc5a9fe", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-proxy/zipball/cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7", + "reference": "cae301f5f3b2d5a2dc723cbc03d6cc9a47bec6f7", "shasum": "" }, "require": { "drupal/helfi_api_base": "*", "drupal/purge": "^3.0", - "drupal/redirect": "^1.0", "drupal/varnish_purge": "^2.1", "ext-dom": "*", "ext-libxml": "*", "php": "^8.0" }, + "conflict": { + "drupal/helfi_tunnistamo": "<=2.2.1" + }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "drupal/coder": "^8.3", @@ -4539,10 +4541,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/2.2.9", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/tree/2.3.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-proxy/issues" }, - "time": "2022-11-02T07:15:53+00:00" + "time": "2022-11-08T11:03:23+00:00" }, { "name": "drupal/helfi_tpr", @@ -4587,16 +4589,16 @@ }, { "name": "drupal/helfi_tunnistamo", - "version": "2.2.1", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "74003bcd79dc5c3fadae46b16720147342cf66d5" + "reference": "b5329b75572bc00b4995c02d717cf168d5ccfa3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/74003bcd79dc5c3fadae46b16720147342cf66d5", - "reference": "74003bcd79dc5c3fadae46b16720147342cf66d5", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/b5329b75572bc00b4995c02d717cf168d5ccfa3b", + "reference": "b5329b75572bc00b4995c02d717cf168d5ccfa3b", "shasum": "" }, "require": { @@ -4613,10 +4615,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.2.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.2.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2022-10-27T07:49:55+00:00" + "time": "2022-11-08T10:24:33+00:00" }, { "name": "drupal/image_style_quality", @@ -6023,17 +6025,17 @@ }, { "name": "drupal/search_api", - "version": "1.27.0", + "version": "1.28.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.27" + "reference": "8.x-1.28" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.27.zip", - "reference": "8.x-1.27", - "shasum": "b8c9a055fe43435c09231fd93d3e07c5d2863a46" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.28.zip", + "reference": "8.x-1.28", + "shasum": "d3ae0bb3cf17c986d5e0c6edb87aee6580b6fc1e" }, "require": { "drupal/core": "^9.3 || ^10.0" @@ -6054,8 +6056,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.27", - "datestamp": "1666211720", + "version": "8.x-1.28", + "datestamp": "1667814116", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml index e5c4d15d..cc4a39d7 100644 --- a/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.phasing.default.yml @@ -44,7 +44,8 @@ content: collapse_edit_all: collapse_edit_all duplicate: duplicate third_party_settings: { } - field_phasing_item_title_level: { } + field_phasing_item_title_level: + region: content field_phasing_title_level: type: options_select weight: 0 diff --git a/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml b/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml index 8d09291d..61a9b05a 100644 --- a/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml +++ b/conf/cmi/core.entity_view_display.paragraph.phasing.default.yml @@ -60,4 +60,5 @@ content: third_party_settings: { } weight: 0 region: content -hidden: { } +hidden: + field_phasing_item_title_level: true diff --git a/conf/cmi/hdbt_admin_tools.site_settings.yml b/conf/cmi/hdbt_admin_tools.site_settings.yml index 3ad7c944..f1b09a5f 100644 --- a/conf/cmi/hdbt_admin_tools.site_settings.yml +++ b/conf/cmi/hdbt_admin_tools.site_settings.yml @@ -7,7 +7,3 @@ site_settings: koro: basic footer_settings: footer_color: dark - footer_top_title: 'Contact us' - footer_top_content: - value: "\r\n" - format: full_html diff --git a/conf/cmi/language/fi/field.field.node.news_item.field_news_groups.yml b/conf/cmi/language/fi/field.field.node.news_item.field_news_groups.yml new file mode 100644 index 00000000..47b7b1f8 --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.news_item.field_news_groups.yml @@ -0,0 +1 @@ +label: Kohderyhmät diff --git a/conf/cmi/language/fi/field.field.node.news_item.field_news_neighbourhoods.yml b/conf/cmi/language/fi/field.field.node.news_item.field_news_neighbourhoods.yml new file mode 100644 index 00000000..07ef95b4 --- /dev/null +++ b/conf/cmi/language/fi/field.field.node.news_item.field_news_neighbourhoods.yml @@ -0,0 +1 @@ +label: Kaupunginosat diff --git a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml index cc820284..da2c6288 100644 --- a/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml +++ b/conf/cmi/language/fi/hdbt_admin_tools.site_settings.yml @@ -1,7 +1,3 @@ site_settings: theme_color: gold default_icon: star-fill -footer_settings: - footer_top_content: - value: "\r\n" - footer_top_title: 'Ota yhteyttä' diff --git a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml index b9c994fd..da2c6288 100644 --- a/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml +++ b/conf/cmi/language/sv/hdbt_admin_tools.site_settings.yml @@ -1,7 +1,3 @@ site_settings: theme_color: gold default_icon: star-fill -footer_settings: - footer_top_content: - value: "\r\n" - footer_top_title: 'Ta kontakt'