From 557d577db89ba18d365beee6005602fc915040f3 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Mon, 22 May 2023 07:08:40 +0000 Subject: [PATCH 1/3] Update configuration --- composer.lock | 119 +++++++++--------- .../block.block.ibmchatapp_watson_talpa.yml | 2 +- .../field.field.node.page.field_content.yml | 5 + ...ld.field.node.page.field_lower_content.yml | 5 + 4 files changed, 70 insertions(+), 61 deletions(-) diff --git a/composer.lock b/composer.lock index cf90d942..e5c09dc4 100644 --- a/composer.lock +++ b/composer.lock @@ -1570,20 +1570,20 @@ }, { "name": "drupal/address", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/address.git", - "reference": "8.x-1.11" + "reference": "8.x-1.12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/address-8.x-1.11.zip", - "reference": "8.x-1.11", - "shasum": "1cb40fb1a43e88041b888ac8fb6aa77a45ac85fb" + "url": "https://ftp.drupal.org/files/projects/address-8.x-1.12.zip", + "reference": "8.x-1.12", + "shasum": "67dd4699040aabf0cd6169e437706fa6a39b0b3a" }, "require": { - "commerceguys/addressing": "^1.4.0", + "commerceguys/addressing": "^1.4.2", "drupal/core": "^9.2 || ^10", "php": "^7.3 || ^8.0" }, @@ -1593,8 +1593,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.11", - "datestamp": "1659989858", + "version": "8.x-1.12", + "datestamp": "1684710176", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3005,17 +3005,17 @@ }, { "name": "drupal/entity_usage", - "version": "2.0.0-beta11", + "version": "2.0.0-beta12", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_usage.git", - "reference": "8.x-2.0-beta11" + "reference": "8.x-2.0-beta12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta11.zip", - "reference": "8.x-2.0-beta11", - "shasum": "31b7248887c917a5aa85bb0c8251467b96d53110" + "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta12.zip", + "reference": "8.x-2.0-beta12", + "shasum": "cdd31e6c413cad6fbdb1bd0aac9ad8a0331eb429" }, "require": { "drupal/core": "^9.1 || ^10" @@ -3035,8 +3035,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta11", - "datestamp": "1676966168", + "version": "8.x-2.0-beta12", + "datestamp": "1684309054", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -3147,27 +3147,30 @@ }, { "name": "drupal/external_entities", - "version": "2.0.0-alpha5", + "version": "2.0.0-alpha6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/external_entities.git", - "reference": "8.x-2.0-alpha5" + "reference": "8.x-2.0-alpha6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/external_entities-8.x-2.0-alpha5.zip", - "reference": "8.x-2.0-alpha5", - "shasum": "ce2402ec96805598f3664e8a61ad68b30190b92b" + "url": "https://ftp.drupal.org/files/projects/external_entities-8.x-2.0-alpha6.zip", + "reference": "8.x-2.0-alpha6", + "shasum": "3c11cc7ac7a4130131a188f6c6fba33937ca5244" }, "require": { - "drupal/core": "^8.8 || ^9", + "drupal/core": "^8.8 || ^9 || ^10", "galbar/jsonpath": "^2.0" }, + "require-dev": { + "drupal/inline_entity_form": "^1.0" + }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-alpha5", - "datestamp": "1648796532", + "version": "8.x-2.0-alpha6", + "datestamp": "1684406076", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -3992,16 +3995,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "3.0.34", + "version": "3.0.35", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "fd46eac5dd78eb35c9db3ef17171db75238b5706" + "reference": "d15e86fa5f25667763dcc059b59d4dd19099b09c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/fd46eac5dd78eb35c9db3ef17171db75238b5706", - "reference": "fd46eac5dd78eb35c9db3ef17171db75238b5706", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/d15e86fa5f25667763dcc059b59d4dd19099b09c", + "reference": "d15e86fa5f25667763dcc059b59d4dd19099b09c", "shasum": "" }, "require": { @@ -4101,10 +4104,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.34", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.0.35", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-05-16T12:28:05+00:00" + "time": "2023-05-22T07:00:58+00:00" }, { "name": "drupal/helfi_proxy", @@ -4192,16 +4195,16 @@ }, { "name": "drupal/helfi_tunnistamo", - "version": "2.2.3", + "version": "2.2.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git", - "reference": "74af769ef53213d89089fa3c67f641c4582a2593" + "reference": "17badf64ebfcc6a30458634b19a4387cb4ce3d34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/74af769ef53213d89089fa3c67f641c4582a2593", - "reference": "74af769ef53213d89089fa3c67f641c4582a2593", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/17badf64ebfcc6a30458634b19a4387cb4ce3d34", + "reference": "17badf64ebfcc6a30458634b19a4387cb4ce3d34", "shasum": "" }, "require": { @@ -4218,10 +4221,10 @@ ], "description": "Tunnistamo integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.2.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/2.2.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues" }, - "time": "2022-11-18T09:09:24+00:00" + "time": "2023-05-17T11:53:24+00:00" }, { "name": "drupal/image_style_quality", @@ -7105,21 +7108,21 @@ }, { "name": "guzzlehttp/guzzle", - "version": "7.6.1", + "version": "7.7.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "8444a2bacf1960bc6a2b62ed86b8e72e11eebe51" + "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/8444a2bacf1960bc6a2b62ed86b8e72e11eebe51", - "reference": "8444a2bacf1960bc6a2b62ed86b8e72e11eebe51", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/fb7566caccf22d74d1ab270de3551f72a58399f5", + "reference": "fb7566caccf22d74d1ab270de3551f72a58399f5", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.5", + "guzzlehttp/promises": "^1.5.3 || ^2.0", "guzzlehttp/psr7": "^1.9.1 || ^2.4.5", "php": "^7.2.5 || ^8.0", "psr/http-client": "^1.0", @@ -7131,7 +7134,8 @@ "require-dev": { "bamarni/composer-bin-plugin": "^1.8.1", "ext-curl": "*", - "php-http/client-integration-tests": "^3.0", + "php-http/client-integration-tests": "dev-master#2c025848417c1135031fdf9c728ee53d0a7ceaee as 3.0.999", + "php-http/message-factory": "^1.1", "phpunit/phpunit": "^8.5.29 || ^9.5.23", "psr/log": "^1.1 || ^2.0 || ^3.0" }, @@ -7210,7 +7214,7 @@ ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/7.6.1" + "source": "https://github.com/guzzle/guzzle/tree/7.7.0" }, "funding": [ { @@ -7226,20 +7230,20 @@ "type": "tidelift" } ], - "time": "2023-05-15T20:43:01+00:00" + "time": "2023-05-21T14:04:53+00:00" }, { "name": "guzzlehttp/promises", - "version": "1.5.2", + "version": "1.5.3", "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "b94b2807d85443f9719887892882d0329d1e2598" + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/b94b2807d85443f9719887892882d0329d1e2598", - "reference": "b94b2807d85443f9719887892882d0329d1e2598", + "url": "https://api.github.com/repos/guzzle/promises/zipball/67ab6e18aaa14d753cc148911d273f6e6cb6721e", + "reference": "67ab6e18aaa14d753cc148911d273f6e6cb6721e", "shasum": "" }, "require": { @@ -7249,11 +7253,6 @@ "symfony/phpunit-bridge": "^4.4 || ^5.1" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.5-dev" - } - }, "autoload": { "files": [ "src/functions_include.php" @@ -7294,7 +7293,7 @@ ], "support": { "issues": "https://github.com/guzzle/promises/issues", - "source": "https://github.com/guzzle/promises/tree/1.5.2" + "source": "https://github.com/guzzle/promises/tree/1.5.3" }, "funding": [ { @@ -7310,7 +7309,7 @@ "type": "tidelift" } ], - "time": "2022-08-28T14:55:35+00:00" + "time": "2023-05-21T12:31:43+00:00" }, { "name": "guzzlehttp/psr7", @@ -8739,16 +8738,16 @@ }, { "name": "nikic/php-parser", - "version": "v4.15.4", + "version": "v4.15.5", "source": { "type": "git", "url": "https://github.com/nikic/PHP-Parser.git", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290" + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/6bb5176bc4af8bcb7d926f88718db9b96a2d4290", - "reference": "6bb5176bc4af8bcb7d926f88718db9b96a2d4290", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/11e2663a5bc9db5d714eedb4277ee300403b4a9e", + "reference": "11e2663a5bc9db5d714eedb4277ee300403b4a9e", "shasum": "" }, "require": { @@ -8789,9 +8788,9 @@ ], "support": { "issues": "https://github.com/nikic/PHP-Parser/issues", - "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.4" + "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.5" }, - "time": "2023-03-05T19:49:14+00:00" + "time": "2023-05-19T20:20:00+00:00" }, { "name": "nodespark/des-connector", diff --git a/conf/cmi/block.block.ibmchatapp_watson_talpa.yml b/conf/cmi/block.block.ibmchatapp_watson_talpa.yml index 975865b2..b47323ec 100644 --- a/conf/cmi/block.block.ibmchatapp_watson_talpa.yml +++ b/conf/cmi/block.block.ibmchatapp_watson_talpa.yml @@ -20,7 +20,7 @@ settings: provider: helfi_platform_config hostname: 'https://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud' engagementId: talpa - tenantId: 'www-hel-fi-prod' + tenantId: www-hel-fi-prod assistantId: talpa visibility: request_path: diff --git a/conf/cmi/field.field.node.page.field_content.yml b/conf/cmi/field.field.node.page.field_content.yml index 2391ddad..d469c30a 100644 --- a/conf/cmi/field.field.node.page.field_content.yml +++ b/conf/cmi/field.field.node.page.field_content.yml @@ -20,6 +20,7 @@ dependencies: - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.service_list_search - paragraphs.paragraphs_type.text - paragraphs.paragraphs_type.unit_search module: @@ -55,6 +56,7 @@ settings: remote_video: remote_video map: map unit_search: unit_search + service_list_search: service_list_search negate: 0 target_bundles_drag_drop: accordion: @@ -102,6 +104,9 @@ settings: remote_video: weight: 0 enabled: true + service_list_search: + weight: 0 + enabled: true text: weight: 0 enabled: true diff --git a/conf/cmi/field.field.node.page.field_lower_content.yml b/conf/cmi/field.field.node.page.field_lower_content.yml index efd54012..07626c3d 100644 --- a/conf/cmi/field.field.node.page.field_lower_content.yml +++ b/conf/cmi/field.field.node.page.field_lower_content.yml @@ -20,6 +20,7 @@ dependencies: - paragraphs.paragraphs_type.news_list - paragraphs.paragraphs_type.phasing - paragraphs.paragraphs_type.remote_video + - paragraphs.paragraphs_type.service_list_search - paragraphs.paragraphs_type.text - paragraphs.paragraphs_type.unit_search module: @@ -55,6 +56,7 @@ settings: remote_video: remote_video map: map unit_search: unit_search + service_list_search: service_list_search negate: 0 target_bundles_drag_drop: accordion: @@ -102,6 +104,9 @@ settings: remote_video: weight: 0 enabled: true + service_list_search: + weight: 0 + enabled: true text: weight: 0 enabled: true From 3d85187e4dd856efe8b22af0394fe09d4d521c7e Mon Sep 17 00:00:00 2001 From: Juho Lehmonen Date: Tue, 23 May 2023 10:37:29 +0300 Subject: [PATCH 2/3] UHF-8238: Delete hdbt chat blocks, make new chatbot version changes to subtheme blocks. --- conf/cmi/block.block.chatleijuke.yml | 27 -------------- .../block.block.chatleijuke_talpa_watson.yml | 35 ------------------- ...hdbt_subtheme_chatleijuke_talpa_watson.yml | 2 +- .../block.block.ibmchatapp_watson_talpa.yml | 10 +++--- .../language/fi/block.block.chatleijuke.yml | 2 -- .../language/sv/block.block.chatleijuke.yml | 2 -- 6 files changed, 6 insertions(+), 72 deletions(-) delete mode 100644 conf/cmi/block.block.chatleijuke.yml delete mode 100644 conf/cmi/block.block.chatleijuke_talpa_watson.yml delete mode 100644 conf/cmi/language/fi/block.block.chatleijuke.yml delete mode 100644 conf/cmi/language/sv/block.block.chatleijuke.yml diff --git a/conf/cmi/block.block.chatleijuke.yml b/conf/cmi/block.block.chatleijuke.yml deleted file mode 100644 index a8335af0..00000000 --- a/conf/cmi/block.block.chatleijuke.yml +++ /dev/null @@ -1,27 +0,0 @@ -uuid: c1580372-3c2f-49ea-b3cb-118588cc4df0 -langcode: en -status: true -dependencies: - module: - - helfi_platform_config - - system - theme: - - hdbt -id: chatleijuke -theme: hdbt -region: attachments -weight: 0 -provider: null -plugin: chat_leijuke -settings: - id: chat_leijuke - label: 'Chat Leijuke Neuvonta' - label_display: '0' - provider: helfi_platform_config - chat_title: 'Ask about the city!' - chat_selection: genesys_neuvonta -visibility: - request_path: - id: request_path - negate: false - pages: "/neuvonta-ja-tuki/helsinki-info\r\n/informationstjanster-och-stod/helsingfors-info\r\n/advisory-and-support-services/helsinki-info\r\n/neuvonta-ja-tuki/helsinki-info/*\r\n/informationstjanster-och-stod/helsingfors-info/*\r\n/advisory-and-support-services/helsinki-info/*\r\n/ota-yhteytta/helsinki-info\r\n/ta-kontakt/helsingfors-info\r\n/contact-us/helsinki-info\r\n/ota-yhteytta-helsingin-kaupunkiin\r\n/kontakta-helsingfors-stad\r\n/contact-the-city-of-helsinki" diff --git a/conf/cmi/block.block.chatleijuke_talpa_watson.yml b/conf/cmi/block.block.chatleijuke_talpa_watson.yml deleted file mode 100644 index 0801726c..00000000 --- a/conf/cmi/block.block.chatleijuke_talpa_watson.yml +++ /dev/null @@ -1,35 +0,0 @@ -uuid: 79f78b82-b303-47dc-962d-a21e4ad10a39 -langcode: fi -status: false -dependencies: - module: - - helfi_platform_config - - language - - system - theme: - - hdbt -id: chatleijuke_talpa_watson -theme: hdbt -region: attachments -weight: 0 -provider: null -plugin: chat_leijuke -settings: - id: chat_leijuke - label: 'Chat Leijuke - TALPA Watson' - label_display: visible - provider: helfi_platform_config - chat_title: 'Aloita chatti' - chat_selection: watson_talpa -visibility: - language: - id: language - negate: false - context_mapping: - language: '@language.current_language_context:language_interface' - langcodes: - fi: fi - request_path: - id: request_path - negate: false - pages: "/ota-yhteytta/kaupungin-laskut-ja-maksut\r\n/ota-yhteytta/kaupungin-laskut-ja-maksut/kaupungille-osoitetut-laskut" diff --git a/conf/cmi/block.block.hdbt_subtheme_chatleijuke_talpa_watson.yml b/conf/cmi/block.block.hdbt_subtheme_chatleijuke_talpa_watson.yml index 980c2360..1868efd3 100644 --- a/conf/cmi/block.block.hdbt_subtheme_chatleijuke_talpa_watson.yml +++ b/conf/cmi/block.block.hdbt_subtheme_chatleijuke_talpa_watson.yml @@ -1,6 +1,6 @@ uuid: d0eff99f-8c0d-44bb-80bb-5f4b4372881c langcode: en -status: true +status: false dependencies: module: - helfi_platform_config diff --git a/conf/cmi/block.block.ibmchatapp_watson_talpa.yml b/conf/cmi/block.block.ibmchatapp_watson_talpa.yml index b47323ec..d4d738da 100644 --- a/conf/cmi/block.block.ibmchatapp_watson_talpa.yml +++ b/conf/cmi/block.block.ibmchatapp_watson_talpa.yml @@ -1,14 +1,14 @@ -uuid: c786bc09-2e9a-4ef9-8b51-c1dab7262461 -langcode: en +uuid: 63a30a19-824a-4d40-8f66-031d56598f8f +langcode: fi status: true dependencies: module: - helfi_platform_config - system theme: - - hdbt + - hdbt_subtheme id: ibmchatapp_watson_talpa -theme: hdbt +theme: hdbt_subtheme region: attachments weight: 0 provider: null @@ -16,7 +16,7 @@ plugin: ibm_chat_app settings: id: ibm_chat_app label: 'IBM Chat App Watson - TALPA' - label_display: '0' + label_display: visible provider: helfi_platform_config hostname: 'https://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud' engagementId: talpa diff --git a/conf/cmi/language/fi/block.block.chatleijuke.yml b/conf/cmi/language/fi/block.block.chatleijuke.yml deleted file mode 100644 index e1f4c655..00000000 --- a/conf/cmi/language/fi/block.block.chatleijuke.yml +++ /dev/null @@ -1,2 +0,0 @@ -settings: - chat_title: 'Kysy kaupungista!' diff --git a/conf/cmi/language/sv/block.block.chatleijuke.yml b/conf/cmi/language/sv/block.block.chatleijuke.yml deleted file mode 100644 index 052d397f..00000000 --- a/conf/cmi/language/sv/block.block.chatleijuke.yml +++ /dev/null @@ -1,2 +0,0 @@ -settings: - chat_title: 'Fråga staden!' From e988d14bde5caa9d34e3d83192eef9391dcbf4b3 Mon Sep 17 00:00:00 2001 From: Juho Lehmonen Date: Tue, 23 May 2023 10:55:10 +0300 Subject: [PATCH 3/3] UHF-8238: Fix block settings. --- conf/cmi/block.block.ibmchatapp_watson_talpa.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/cmi/block.block.ibmchatapp_watson_talpa.yml b/conf/cmi/block.block.ibmchatapp_watson_talpa.yml index d4d738da..40f632c5 100644 --- a/conf/cmi/block.block.ibmchatapp_watson_talpa.yml +++ b/conf/cmi/block.block.ibmchatapp_watson_talpa.yml @@ -1,5 +1,5 @@ uuid: 63a30a19-824a-4d40-8f66-031d56598f8f -langcode: fi +langcode: en status: true dependencies: module: @@ -16,7 +16,7 @@ plugin: ibm_chat_app settings: id: ibm_chat_app label: 'IBM Chat App Watson - TALPA' - label_display: visible + label_display: '0' provider: helfi_platform_config hostname: 'https://coh-chat-app-prod.ow6i4n9pdzm.eu-de.codeengine.appdomain.cloud' engagementId: talpa