From 5059de34bee905d08f0ba6e9d84453dd3a7aa617 Mon Sep 17 00:00:00 2001 From: actions-bot Date: Mon, 18 Sep 2023 07:56:23 +0000 Subject: [PATCH] Update configuration --- composer.lock | 60 +++++++++---------- ...form_display.tpr_unit.tpr_unit.default.yml | 12 ++-- ...ternal_entity_type.helfi_announcements.yml | 6 +- conf/cmi/helfi_api_base.delete_revisions.yml | 6 ++ phpunit.xml.dist | 6 +- 5 files changed, 50 insertions(+), 40 deletions(-) create mode 100644 conf/cmi/helfi_api_base.delete_revisions.yml diff --git a/composer.lock b/composer.lock index 35625a0b5..dedda7ec5 100644 --- a/composer.lock +++ b/composer.lock @@ -3747,16 +3747,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.1", + "version": "5.6.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09" + "reference": "ac16cedbd3323e97c23d4e29c61260221601ec29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d4eeff38bc61f431613c8fa9a4d92a8755f66b09", - "reference": "d4eeff38bc61f431613c8fa9a4d92a8755f66b09", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/ac16cedbd3323e97c23d4e29c61260221601ec29", + "reference": "ac16cedbd3323e97c23d4e29c61260221601ec29", "shasum": "" }, "require": { @@ -3774,10 +3774,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.1", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.4", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-09-11T12:42:43+00:00" + "time": "2023-09-15T04:35:43+00:00" }, { "name": "drupal/hdbt_admin", @@ -3866,16 +3866,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.5.3", + "version": "2.5.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "f5fab16526d75c612e420a68ebe933efb5c72a0e" + "reference": "7ffd5b029f1d85590dc8966007f3936f14cb3c35" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/f5fab16526d75c612e420a68ebe933efb5c72a0e", - "reference": "f5fab16526d75c612e420a68ebe933efb5c72a0e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/7ffd5b029f1d85590dc8966007f3936f14cb3c35", + "reference": "7ffd5b029f1d85590dc8966007f3936f14cb3c35", "shasum": "" }, "require": { @@ -3901,10 +3901,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-09-13T05:29:57+00:00" + "time": "2023-09-18T06:55:18+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -3973,16 +3973,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "2.0.13", + "version": "2.1.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "c2497e87c7b4242354c323aad5c21ec09e37d3a7" + "reference": "668049d8601e4d9bbc2525fac4616b583960b97a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/c2497e87c7b4242354c323aad5c21ec09e37d3a7", - "reference": "c2497e87c7b4242354c323aad5c21ec09e37d3a7", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/668049d8601e4d9bbc2525fac4616b583960b97a", + "reference": "668049d8601e4d9bbc2525fac4616b583960b97a", "shasum": "" }, "require": { @@ -4000,23 +4000,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.0.13", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.1.0", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2023-09-13T05:51:44+00:00" + "time": "2023-09-16T04:24:11+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "3.4.5", + "version": "3.4.8", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "90394a0feab45409ed2c2101ef3d48c02906714e" + "reference": "af36011732e5569b39602252515a12f6b1b56c44" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/90394a0feab45409ed2c2101ef3d48c02906714e", - "reference": "90394a0feab45409ed2c2101ef3d48c02906714e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/af36011732e5569b39602252515a12f6b1b56c44", + "reference": "af36011732e5569b39602252515a12f6b1b56c44", "shasum": "" }, "require": { @@ -4119,10 +4119,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.5", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.8", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-09-13T06:57:57+00:00" + "time": "2023-09-18T07:53:37+00:00" }, { "name": "drupal/helfi_proxy", @@ -4170,16 +4170,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.2.6", + "version": "2.2.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "f73c27c4d30522303dfadf1228c7331e120f04ac" + "reference": "68a4e65acffc2038e5006f1d4b2763bc52017184" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/f73c27c4d30522303dfadf1228c7331e120f04ac", - "reference": "f73c27c4d30522303dfadf1228c7331e120f04ac", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/68a4e65acffc2038e5006f1d4b2763bc52017184", + "reference": "68a4e65acffc2038e5006f1d4b2763bc52017184", "shasum": "" }, "require": { @@ -4205,10 +4205,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.2.7", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2023-09-01T12:09:30+00:00" + "time": "2023-09-14T11:48:29+00:00" }, { "name": "drupal/helfi_tunnistamo", 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 b8e120f49..29e2f821c 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 @@ -84,8 +84,8 @@ content: third_party_settings: { } contacts: type: readonly_field_widget - region: content weight: 36 + region: content settings: label: above formatter_type: null @@ -176,8 +176,8 @@ content: third_party_settings: { } highlights: type: readonly_field_widget - region: content weight: 33 + region: content settings: label: above formatter_type: null @@ -203,8 +203,8 @@ content: third_party_settings: { } links: type: readonly_field_widget - region: content weight: 31 + region: content settings: label: above formatter_type: null @@ -241,8 +241,8 @@ content: third_party_settings: { } opening_hours: type: readonly_field_widget - region: content weight: 32 + region: content settings: label: above formatter_type: null @@ -251,8 +251,8 @@ content: third_party_settings: { } other_info: type: readonly_field_widget - region: content weight: 34 + region: content settings: label: above formatter_type: null @@ -294,8 +294,8 @@ content: third_party_settings: { } price_info: type: readonly_field_widget - region: content weight: 35 + region: content settings: label: above formatter_type: null diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml index c36603631..35b3b72d5 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml @@ -3,13 +3,13 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: XBOd0Lfy5FpXJkeuZi75vBaT7ffFCENINrui5kCVygo + default_config_hash: zY_1slrvSjIWdILbI-0OWc8A1RRz0fRVj4Gtz4m6zS0 id: helfi_announcements label: 'Helfi: Announcements' label_plural: 'Helfi: Announcements' description: '' -read_only: true generate_aliases: null +read_only: true field_mapper_id: jsonpath field_mapper_config: field_mappings: @@ -39,7 +39,7 @@ field_mapper_config: value: '$.attributes["field_announcement_link"]["uri"]' storage_client_id: helfi_announcements storage_client_config: { } -persistent_cache_max_age: 600 +persistent_cache_max_age: -1 annotation_entity_type_id: null annotation_bundle_id: null annotation_field_name: null diff --git a/conf/cmi/helfi_api_base.delete_revisions.yml b/conf/cmi/helfi_api_base.delete_revisions.yml new file mode 100644 index 000000000..6955f6676 --- /dev/null +++ b/conf/cmi/helfi_api_base.delete_revisions.yml @@ -0,0 +1,6 @@ +entity_types: + - node + - paragraph + - tpr_unit + - tpr_service + - tpr_errand_service diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 603e6d959..0ae082a9a 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -16,7 +16,7 @@ - + @@ -41,9 +41,13 @@ ./tests/dtt/src/ExistingSite + ./public/modules/custom/*/tests/src/ExistingSite + ./public/modules/contrib/*/tests/src/ExistingSite ./tests/dtt/src/ExistingSiteJavascript + ./public/modules/custom/*/tests/src/ExistingSiteJavascript + ./public/modules/contrib/*/tests/src/ExistingSiteJavascript