diff --git a/composer.lock b/composer.lock index bd7a126b..d2db10f5 100644 --- a/composer.lock +++ b/composer.lock @@ -1285,16 +1285,16 @@ }, { "name": "doctrine/collections", - "version": "2.1.3", + "version": "2.1.4", "source": { "type": "git", "url": "https://github.com/doctrine/collections.git", - "reference": "3023e150f90a38843856147b58190aa8b46cc155" + "reference": "72328a11443a0de79967104ad36ba7b30bded134" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/collections/zipball/3023e150f90a38843856147b58190aa8b46cc155", - "reference": "3023e150f90a38843856147b58190aa8b46cc155", + "url": "https://api.github.com/repos/doctrine/collections/zipball/72328a11443a0de79967104ad36ba7b30bded134", + "reference": "72328a11443a0de79967104ad36ba7b30bded134", "shasum": "" }, "require": { @@ -1302,7 +1302,7 @@ "php": "^8.1" }, "require-dev": { - "doctrine/coding-standard": "^10.0", + "doctrine/coding-standard": "^12", "ext-json": "*", "phpstan/phpstan": "^1.8", "phpstan/phpstan-phpunit": "^1.0", @@ -1351,7 +1351,7 @@ ], "support": { "issues": "https://github.com/doctrine/collections/issues", - "source": "https://github.com/doctrine/collections/tree/2.1.3" + "source": "https://github.com/doctrine/collections/tree/2.1.4" }, "funding": [ { @@ -1367,20 +1367,20 @@ "type": "tidelift" } ], - "time": "2023-07-06T15:15:36+00:00" + "time": "2023-10-03T09:22:33+00:00" }, { "name": "doctrine/deprecations", - "version": "v1.1.1", + "version": "1.1.2", "source": { "type": "git", "url": "https://github.com/doctrine/deprecations.git", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3" + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/deprecations/zipball/612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", - "reference": "612a3ee5ab0d5dd97b7cf3874a6efe24325efac3", + "url": "https://api.github.com/repos/doctrine/deprecations/zipball/4f2d4f2836e7ec4e7a8625e75c6aa916004db931", + "reference": "4f2d4f2836e7ec4e7a8625e75c6aa916004db931", "shasum": "" }, "require": { @@ -1412,9 +1412,9 @@ "homepage": "https://www.doctrine-project.org/", "support": { "issues": "https://github.com/doctrine/deprecations/issues", - "source": "https://github.com/doctrine/deprecations/tree/v1.1.1" + "source": "https://github.com/doctrine/deprecations/tree/1.1.2" }, - "time": "2023-06-03T09:27:29+00:00" + "time": "2023-09-27T20:04:15+00:00" }, { "name": "doctrine/lexer", @@ -1647,17 +1647,17 @@ }, { "name": "drupal/admin_toolbar", - "version": "3.4.1", + "version": "3.4.2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/admin_toolbar.git", - "reference": "3.4.1" + "reference": "3.4.2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.1.zip", - "reference": "3.4.1", - "shasum": "bcb15ab40016becdb3ac8f21d7d1a721f48f3577" + "url": "https://ftp.drupal.org/files/projects/admin_toolbar-3.4.2.zip", + "reference": "3.4.2", + "shasum": "f5a008e5c73f5a11c6c8067c0ea6ebb76aa33854" }, "require": { "drupal/core": "^9.2 || ^10" @@ -1668,8 +1668,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "3.4.1", - "datestamp": "1684944156", + "version": "3.4.2", + "datestamp": "1696006195", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3747,16 +3747,16 @@ }, { "name": "drupal/hdbt", - "version": "5.6.12", + "version": "5.6.13", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "c24eecd637d0373f9da2bcc01336feee376fcaf1" + "reference": "00c6881d074393257e9c400268dc44e3d2e916b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c24eecd637d0373f9da2bcc01336feee376fcaf1", - "reference": "c24eecd637d0373f9da2bcc01336feee376fcaf1", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/00c6881d074393257e9c400268dc44e3d2e916b0", + "reference": "00c6881d074393257e9c400268dc44e3d2e916b0", "shasum": "" }, "require": { @@ -3774,10 +3774,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.12", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/5.6.13", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-09-26T09:47:13+00:00" + "time": "2023-09-28T05:10:25+00:00" }, { "name": "drupal/hdbt_admin", @@ -3866,16 +3866,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.5.5", + "version": "2.5.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "7ffd5b029f1d85590dc8966007f3936f14cb3c35" + "reference": "d304750c887b039f527299007331d1ea8935fb2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/7ffd5b029f1d85590dc8966007f3936f14cb3c35", - "reference": "7ffd5b029f1d85590dc8966007f3936f14cb3c35", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/d304750c887b039f527299007331d1ea8935fb2d", + "reference": "d304750c887b039f527299007331d1ea8935fb2d", "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.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.5.6", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2023-09-18T06:55:18+00:00" + "time": "2023-09-28T05:34:10+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -3973,16 +3973,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "5c0f648a21220a6e8b6c14543f8e60b4b843a918" + "reference": "d6250383d6d6b1c8fb70f7522737d625d1b6f148" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/5c0f648a21220a6e8b6c14543f8e60b4b843a918", - "reference": "5c0f648a21220a6e8b6c14543f8e60b4b843a918", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/d6250383d6d6b1c8fb70f7522737d625d1b6f148", + "reference": "d6250383d6d6b1c8fb70f7522737d625d1b6f148", "shasum": "" }, "require": { @@ -4000,23 +4000,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.1.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/2.1.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2023-09-21T08:34:22+00:00" + "time": "2023-10-04T11:36:07+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "3.4.17", + "version": "3.4.19", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "46244701cdef62af87c7e376b4e43391ee6c870c" + "reference": "2013f96158af6d4dfa9428a18fd6116c26ae5f37" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/46244701cdef62af87c7e376b4e43391ee6c870c", - "reference": "46244701cdef62af87c7e376b4e43391ee6c870c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/2013f96158af6d4dfa9428a18fd6116c26ae5f37", + "reference": "2013f96158af6d4dfa9428a18fd6116c26ae5f37", "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.17", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/3.4.19", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-09-27T08:15:04+00:00" + "time": "2023-10-04T11:35:55+00:00" }, { "name": "drupal/helfi_proxy", @@ -4593,17 +4593,17 @@ }, { "name": "drupal/linkit", - "version": "6.0.0", + "version": "6.0.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.0.0" + "reference": "6.0.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.0.0.zip", - "reference": "6.0.0", - "shasum": "3c4143eb797abee04e5af47eb1885a65e6321b51" + "url": "https://ftp.drupal.org/files/projects/linkit-6.0.1.zip", + "reference": "6.0.1", + "shasum": "c990a0fab63cb65d46dcf312aa0363f65e31ee68" }, "require": { "drupal/core": "^9.4 || ^10.0.0" @@ -4618,8 +4618,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.0.0", - "datestamp": "1688748025", + "version": "6.0.1", + "datestamp": "1696099905", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -13018,16 +13018,16 @@ }, { "name": "symfony/string", - "version": "v6.3.2", + "version": "v6.3.5", "source": { "type": "git", "url": "https://github.com/symfony/string.git", - "reference": "53d1a83225002635bca3482fcbf963001313fb68" + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/string/zipball/53d1a83225002635bca3482fcbf963001313fb68", - "reference": "53d1a83225002635bca3482fcbf963001313fb68", + "url": "https://api.github.com/repos/symfony/string/zipball/13d76d0fb049051ed12a04bef4f9de8715bea339", + "reference": "13d76d0fb049051ed12a04bef4f9de8715bea339", "shasum": "" }, "require": { @@ -13084,7 +13084,7 @@ "utf8" ], "support": { - "source": "https://github.com/symfony/string/tree/v6.3.2" + "source": "https://github.com/symfony/string/tree/v6.3.5" }, "funding": [ { @@ -13100,7 +13100,7 @@ "type": "tidelift" } ], - "time": "2023-07-05T08:41:27+00:00" + "time": "2023-09-18T10:38:32+00:00" }, { "name": "symfony/translation", @@ -13377,16 +13377,16 @@ }, { "name": "symfony/var-dumper", - "version": "v5.4.28", + "version": "v5.4.29", "source": { "type": "git", "url": "https://github.com/symfony/var-dumper.git", - "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73" + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/var-dumper/zipball/684b36ff415e1381d4a943c3ca2502cd2debad73", - "reference": "684b36ff415e1381d4a943c3ca2502cd2debad73", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/6172e4ae3534d25ee9e07eb487c20be7760fcc65", + "reference": "6172e4ae3534d25ee9e07eb487c20be7760fcc65", "shasum": "" }, "require": { @@ -13446,7 +13446,7 @@ "dump" ], "support": { - "source": "https://github.com/symfony/var-dumper/tree/v5.4.28" + "source": "https://github.com/symfony/var-dumper/tree/v5.4.29" }, "funding": [ { @@ -13462,7 +13462,7 @@ "type": "tidelift" } ], - "time": "2023-08-24T13:38:36+00:00" + "time": "2023-09-12T10:09:58+00:00" }, { "name": "symfony/yaml", 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 834c4cb8..65be1e32 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 59baec39..d376f185 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml @@ -8,8 +8,8 @@ id: helfi_announcements label: 'Helfi: Announcements' label_plural: 'Helfi: Announcements' description: '' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml b/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml deleted file mode 100644 index 8e55877d..00000000 --- a/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml +++ /dev/null @@ -1,4 +0,0 @@ -index: true -priority: '0.5' -changefreq: '' -include_images: false diff --git a/conf/cmi/simple_sitemap.settings.yml b/conf/cmi/simple_sitemap.settings.yml index dab3211a..92e8ef45 100644 --- a/conf/cmi/simple_sitemap.settings.yml +++ b/conf/cmi/simple_sitemap.settings.yml @@ -13,6 +13,5 @@ disable_language_hreflang: false excluded_languages: { } enabled_entity_types: - node - - menu_link_content - tpr_service - tpr_unit diff --git a/conf/cmi/views.view.service_list.yml b/conf/cmi/views.view.service_list.yml index 6c486770..5b6ba000 100644 --- a/conf/cmi/views.view.service_list.yml +++ b/conf/cmi/views.view.service_list.yml @@ -360,13 +360,13 @@ display: display_plugin: block position: 1 display_options: - display_extenders: { } pager: type: none options: offset: 0 defaults: pager: false + display_extenders: { } cache_metadata: max-age: -1 contexts: diff --git a/docker/openshift/crons/purge-queue.sh b/docker/openshift/crons/purge-queue.sh index d74ef3c4..2690144e 100644 --- a/docker/openshift/crons/purge-queue.sh +++ b/docker/openshift/crons/purge-queue.sh @@ -12,8 +12,15 @@ function has_items { while true do if has_items; then - drush p:queue-work --no-interaction --finish --format=json | jq --arg DATE "$(date +'%Y-%m-%dT%H:%M:%S%:z')" -c '.[] |= . + {"date" : $DATE}' + RESULT=$(drush p:queue-work --no-interaction --finish --format=json | jq --arg DATE "$(date +'%Y-%m-%dT%H:%M:%S%:z')" -c '.[] |= . + {"date" : $DATE}') + # RESULT is an array of json objects. Process each result and + # only output the failed items. + echo $RESULT | jq -c '.[]' | while read LINE; do + if [ $(echo "$LINE" | jq .failed) -gt "0" ]; then + echo $LINE + fi + done fi - # Sleep for 60 seconds. + sleep 60 done