diff --git a/composer.lock b/composer.lock index 2709bf57..f63d4696 100644 --- a/composer.lock +++ b/composer.lock @@ -2728,6 +2728,10 @@ "name": "See other contributors", "homepage": "https://www.drupal.org/node/2159059/committers" }, + { + "name": "skek", + "homepage": "https://www.drupal.org/user/417078" + }, { "name": "sokru", "homepage": "https://www.drupal.org/user/388235" @@ -3501,23 +3505,21 @@ }, { "name": "drupal/focal_point", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/focal_point.git", - "reference": "2.0.2" + "reference": "2.0.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/focal_point-2.0.2.zip", - "reference": "2.0.2", - "shasum": "8e809795ec6a68a0bc3740b0b0a41bfa53d4d6d5" + "url": "https://ftp.drupal.org/files/projects/focal_point-2.0.3.zip", + "reference": "2.0.3", + "shasum": "5067b249e39c2f93799a4cadfcc3d3dc981f3ef5" }, "require": { "drupal/core": "^9.3 || ^10", - "drupal/crop": "^2.3", - "drupal/jquery_ui": "^1.6", - "drupal/jquery_ui_draggable": "^2.0" + "drupal/crop": "^2.3" }, "require-dev": { "drupal/crop": "*" @@ -3525,8 +3527,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1690451892", + "version": "2.0.3", + "datestamp": "1710483189", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3732,16 +3734,16 @@ }, { "name": "drupal/hdbt", - "version": "6.4.25", + "version": "6.4.26", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "fda238d677f4b044b239eb4916a5fd4a0a7e0eb5" + "reference": "c2eec066a3d16e08249f1ba0ce62ff87614eadb7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/fda238d677f4b044b239eb4916a5fd4a0a7e0eb5", - "reference": "fda238d677f4b044b239eb4916a5fd4a0a7e0eb5", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/c2eec066a3d16e08249f1ba0ce62ff87614eadb7", + "reference": "c2eec066a3d16e08249f1ba0ce62ff87614eadb7", "shasum": "" }, "require": { @@ -3759,10 +3761,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.25", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.4.26", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-03-12T12:56:27+00:00" + "time": "2024-03-15T13:21:30+00:00" }, { "name": "drupal/hdbt_admin", @@ -3851,16 +3853,16 @@ }, { "name": "drupal/helfi_api_base", - "version": "2.6.4", + "version": "2.6.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "778b6431d341db6f280aeb343d1bc673a378b5a0" + "reference": "6eaf1f2f4c92620efa786029719d34edd6d6b094" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/778b6431d341db6f280aeb343d1bc673a378b5a0", - "reference": "778b6431d341db6f280aeb343d1bc673a378b5a0", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/6eaf1f2f4c92620efa786029719d34edd6d6b094", + "reference": "6eaf1f2f4c92620efa786029719d34edd6d6b094", "shasum": "" }, "require": { @@ -3889,10 +3891,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.6.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.6.5", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2024-03-06T08:32:04+00:00" + "time": "2024-03-15T06:41:46+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -3940,12 +3942,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "f038bbff89056bc61ca57d2229b4d74127e8017c" + "reference": "75458dd3ea587b7f033a8bf6102d627d1a2abb50" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/f038bbff89056bc61ca57d2229b4d74127e8017c", - "reference": "f038bbff89056bc61ca57d2229b4d74127e8017c", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/75458dd3ea587b7f033a8bf6102d627d1a2abb50", + "reference": "75458dd3ea587b7f033a8bf6102d627d1a2abb50", "shasum": "" }, "require": { @@ -4017,7 +4019,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-03-07T07:59:22+00:00" + "time": "2024-03-14T08:10:18+00:00" }, { "name": "drupal/helfi_navigation", @@ -4055,16 +4057,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.20", + "version": "4.3.22", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "9d7def6814bf8a94f662f4fd983cb8fe5114ae03" + "reference": "94666805676f23b5e0bc5cf5604b012d763532a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/9d7def6814bf8a94f662f4fd983cb8fe5114ae03", - "reference": "9d7def6814bf8a94f662f4fd983cb8fe5114ae03", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/94666805676f23b5e0bc5cf5604b012d763532a5", + "reference": "94666805676f23b5e0bc5cf5604b012d763532a5", "shasum": "" }, "require": { @@ -4174,10 +4176,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.20", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.22", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-03-12T08:04:15+00:00" + "time": "2024-03-18T08:03:28+00:00" }, { "name": "drupal/helfi_proxy", @@ -4505,168 +4507,19 @@ "source": "https://git.drupalcode.org/project/imagemagick" } }, - { - "name": "drupal/jquery_ui", - "version": "1.6.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/jquery_ui.git", - "reference": "8.x-1.6" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jquery_ui-8.x-1.6.zip", - "reference": "8.x-1.6", - "shasum": "0ddccdcf35a066de1843e1d9670677ee1a2faac0" - }, - "require": { - "drupal/core": "^9.2 || ^10" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "8.x-1.6", - "datestamp": "1668521197", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "bnjmnm", - "homepage": "https://www.drupal.org/user/2369194" - }, - { - "name": "jjeff", - "homepage": "https://www.drupal.org/user/17190" - }, - { - "name": "lauriii", - "homepage": "https://www.drupal.org/user/1078742" - }, - { - "name": "litwol", - "homepage": "https://www.drupal.org/user/78134" - }, - { - "name": "mfb", - "homepage": "https://www.drupal.org/user/12302" - }, - { - "name": "mfer", - "homepage": "https://www.drupal.org/user/25701" - }, - { - "name": "mikelutz", - "homepage": "https://www.drupal.org/user/2972409" - }, - { - "name": "nod_", - "homepage": "https://www.drupal.org/user/598310" - }, - { - "name": "phenaproxima", - "homepage": "https://www.drupal.org/user/205645" - }, - { - "name": "RobLoach", - "homepage": "https://www.drupal.org/user/61114" - }, - { - "name": "sun", - "homepage": "https://www.drupal.org/user/54136" - }, - { - "name": "webchick", - "homepage": "https://www.drupal.org/user/24967" - }, - { - "name": "Wim Leers", - "homepage": "https://www.drupal.org/user/99777" - }, - { - "name": "zrpnr", - "homepage": "https://www.drupal.org/user/1448368" - } - ], - "description": "Provides jQuery UI library.", - "homepage": "https://www.drupal.org/project/jquery_ui", - "support": { - "source": "https://git.drupalcode.org/project/jquery_ui" - } - }, - { - "name": "drupal/jquery_ui_draggable", - "version": "2.0.0", - "source": { - "type": "git", - "url": "https://git.drupalcode.org/project/jquery_ui_draggable.git", - "reference": "2.0.0" - }, - "dist": { - "type": "zip", - "url": "https://ftp.drupal.org/files/projects/jquery_ui_draggable-2.0.0.zip", - "reference": "2.0.0", - "shasum": "13a8f4bf037449cd176ddb967fc9cba9a466a705" - }, - "require": { - "drupal/core": "^9.2 || ^10", - "drupal/jquery_ui": "^1.6" - }, - "type": "drupal-module", - "extra": { - "drupal": { - "version": "2.0.0", - "datestamp": "1670871516", - "security-coverage": { - "status": "covered", - "message": "Covered by Drupal's security advisory policy" - } - } - }, - "notification-url": "https://packages.drupal.org/8/downloads", - "license": [ - "GPL-2.0-or-later" - ], - "authors": [ - { - "name": "bnjmnm", - "homepage": "https://www.drupal.org/user/2369194" - }, - { - "name": "lauriii", - "homepage": "https://www.drupal.org/user/1078742" - }, - { - "name": "zrpnr", - "homepage": "https://www.drupal.org/user/1448368" - } - ], - "description": "Provides jQuery UI Draggable library.", - "homepage": "https://www.drupal.org/project/jquery_ui_draggable", - "support": { - "source": "https://git.drupalcode.org/project/jquery_ui_draggable" - } - }, { "name": "drupal/linkit", - "version": "6.1.2", + "version": "6.1.3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/linkit.git", - "reference": "6.1.2" + "reference": "6.1.3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/linkit-6.1.2.zip", - "reference": "6.1.2", - "shasum": "63fb311d2b78df81a9a588330429b640ec7da0e8" + "url": "https://ftp.drupal.org/files/projects/linkit-6.1.3.zip", + "reference": "6.1.3", + "shasum": "469a5e38269ed5e707998000ee4701ab4922e561" }, "require": { "drupal/core": "^10.1" @@ -4678,8 +4531,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "6.1.2", - "datestamp": "1696865478", + "version": "6.1.3", + "datestamp": "1710519126", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -4986,29 +4839,29 @@ }, { "name": "drupal/openid_connect", - "version": "3.0.0-alpha2", + "version": "3.0.0-alpha3", "source": { "type": "git", "url": "https://git.drupalcode.org/project/openid_connect.git", - "reference": "3.0.0-alpha2" + "reference": "3.0.0-alpha3" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha2.zip", - "reference": "3.0.0-alpha2", - "shasum": "7fedeecb38edc1785f4de01240275a29035a60d0" + "url": "https://ftp.drupal.org/files/projects/openid_connect-3.0.0-alpha3.zip", + "reference": "3.0.0-alpha3", + "shasum": "002616dc2bfeb6b23204297e77d1f7a5369e69b3" }, "require": { "drupal/core": "^9.3 || ^10", - "drupal/externalauth": "*", + "drupal/externalauth": "^2.0", "ext-json": "*", "php": ">=7.1.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "3.0.0-alpha2", - "datestamp": "1666251361", + "version": "3.0.0-alpha3", + "datestamp": "1710708951", "security-coverage": { "status": "not-covered", "message": "Alpha releases are not covered by Drupal security advisories." @@ -8100,16 +7953,16 @@ }, { "name": "league/container", - "version": "4.2.0", + "version": "4.2.2", "source": { "type": "git", "url": "https://github.com/thephpleague/container.git", - "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab" + "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/container/zipball/375d13cb828649599ef5d48a339c4af7a26cd0ab", - "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab", + "url": "https://api.github.com/repos/thephpleague/container/zipball/ff346319ca1ff0e78277dc2311a42107cc1aab88", + "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88", "shasum": "" }, "require": { @@ -8170,7 +8023,7 @@ ], "support": { "issues": "https://github.com/thephpleague/container/issues", - "source": "https://github.com/thephpleague/container/tree/4.2.0" + "source": "https://github.com/thephpleague/container/tree/4.2.2" }, "funding": [ { @@ -8178,7 +8031,7 @@ "type": "github" } ], - "time": "2021-11-16T10:29:06+00:00" + "time": "2024-03-13T13:12:53+00:00" }, { "name": "league/flysystem", @@ -9034,16 +8887,16 @@ }, { "name": "pear/archive_tar", - "version": "1.4.14", + "version": "1.5.0", "source": { "type": "git", "url": "https://github.com/pear/Archive_Tar.git", - "reference": "4d761c5334c790e45ef3245f0864b8955c562caa" + "reference": "b439c859564f5cbb0f64ad6002d0afe84a889602" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/4d761c5334c790e45ef3245f0864b8955c562caa", - "reference": "4d761c5334c790e45ef3245f0864b8955c562caa", + "url": "https://api.github.com/repos/pear/Archive_Tar/zipball/b439c859564f5cbb0f64ad6002d0afe84a889602", + "reference": "b439c859564f5cbb0f64ad6002d0afe84a889602", "shasum": "" }, "require": { @@ -9074,7 +8927,7 @@ "./" ], "license": [ - "BSD-3-Clause" + "BSD-2-Clause" ], "authors": [ { @@ -9100,17 +8953,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=Archive_Tar", "source": "https://github.com/pear/Archive_Tar" }, - "funding": [ - { - "url": "https://github.com/mrook", - "type": "github" - }, - { - "url": "https://www.patreon.com/michielrook", - "type": "patreon" - } - ], - "time": "2021-07-20T13:53:39+00:00" + "time": "2024-03-16T16:21:40+00:00" }, { "name": "pear/console_getopt", @@ -9169,12 +9012,12 @@ "source": { "type": "git", "url": "https://github.com/pear/pear-core-minimal.git", - "reference": "d457b5c93e5001fbf4b5726d21038266e029e3be" + "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/d457b5c93e5001fbf4b5726d21038266e029e3be", - "reference": "d457b5c93e5001fbf4b5726d21038266e029e3be", + "url": "https://api.github.com/repos/pear/pear-core-minimal/zipball/ce0adade8b97561656ace07cdaac4751c271ea8c", + "reference": "ce0adade8b97561656ace07cdaac4751c271ea8c", "shasum": "" }, "require": { @@ -9187,9 +9030,9 @@ }, "type": "library", "autoload": { - "psr-0": { - "": "src/" - } + "classmap": [ + "src/" + ] }, "notification-url": "https://packagist.org/downloads/", "include-path": [ @@ -9210,7 +9053,7 @@ "issues": "http://pear.php.net/bugs/search.php?cmd=display&package_name[]=PEAR", "source": "https://github.com/pear/pear-core-minimal" }, - "time": "2024-03-09T19:38:40+00:00" + "time": "2024-03-16T18:41:45+00:00" }, { "name": "pear/pear_exception", @@ -9941,16 +9784,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.0", + "version": "v0.12.2", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d" + "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/750bf031a48fd07c673dbe3f11f72362ea306d0d", - "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/9185c66c2165bbf4d71de78a69dccf4974f9538d", + "reference": "9185c66c2165bbf4d71de78a69dccf4974f9538d", "shasum": "" }, "require": { @@ -10014,9 +9857,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.0" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.2" }, - "time": "2023-12-20T15:28:09+00:00" + "time": "2024-03-17T01:53:00+00:00" }, { "name": "ralouphie/getallheaders", diff --git a/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml b/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml index 0d0e5d8b..cb7fa3f9 100644 --- a/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml +++ b/conf/cmi/core.entity_form_display.paragraph.event_list.default.yml @@ -15,9 +15,10 @@ dependencies: - paragraphs.paragraphs_type.event_list module: - link + - select2 - text _core: - default_config_hash: 26rzwNcMiiF5Bucl9iUliZYoL4vZcdmdNkYBAr9DYOU + default_config_hash: dZwlyUF3NrPYw3C78NA0FM0m7EBnAdTWaLWhAs-jtXo id: paragraph.event_list.default targetEntityType: paragraph bundle: event_list @@ -68,14 +69,14 @@ content: display_label: true third_party_settings: { } field_filter_keywords: - type: entity_reference_autocomplete_tags + type: select2_entity_reference weight: 8 region: content settings: + width: 100% + autocomplete: true match_operator: CONTAINS match_limit: 10 - size: 60 - placeholder: '' third_party_settings: { } field_free_events: type: boolean_checkbox diff --git a/conf/cmi/metatag.metatag_defaults.global.yml b/conf/cmi/metatag.metatag_defaults.global.yml index a485f867..07cb3c2c 100644 --- a/conf/cmi/metatag.metatag_defaults.global.yml +++ b/conf/cmi/metatag.metatag_defaults.global.yml @@ -12,6 +12,6 @@ tags: twitter_cards_page_url: '[current-page:url]' twitter_cards_title: '[current-page:title] | [site:page-title-suffix]' twitter_cards_type: summary_large_image - og_image: '[site:default-og-image]' - twitter_cards_image: '[site:default-og-image]' + og_image: '[site:shareable-image]' + twitter_cards_image: '[site:shareable-image]' og_site_name: '[site:page-title-suffix]' diff --git a/conf/cmi/metatag.metatag_defaults.tpr_unit.yml b/conf/cmi/metatag.metatag_defaults.tpr_unit.yml index 30e87cc6..9ad15de4 100644 --- a/conf/cmi/metatag.metatag_defaults.tpr_unit.yml +++ b/conf/cmi/metatag.metatag_defaults.tpr_unit.yml @@ -3,7 +3,7 @@ langcode: en status: true dependencies: { } _core: - default_config_hash: uQHYkeDAlKDP9QzcRcKciZc5r2PVOzL_jXwfU2ac4iY + default_config_hash: r_fYCDlLAs4HfH-xN1R6bh_xDzIajxsKD23WiQ11B2A id: tpr_unit label: 'TPR - Unit' tags: @@ -15,7 +15,7 @@ tags: article_published_time: '[tpr_unit:created:html_datetime]' og_description: '[tpr_unit:description:summary]' og_email: '[tpr_unit:email]' - og_image: '[tpr_unit:picture]' + og_image: '[tpr_unit:shareable-image]' og_latitude: '[tpr_unit:latitude]' og_longitude: '[tpr_unit:longitude]' og_phone_number: '[tpr_unit:phone]' diff --git a/docker-compose.yml b/docker-compose.yml index 14960c7f..218211a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,7 @@ services: STAGE_FILE_PROXY_ORIGIN_DIR: "${STAGE_FILE_PROXY_ORIGIN_DIR}" APP_ENV: "${APP_ENV:-local}" ELASTIC_PROXY_URL: ${ELASTIC_PROXY_URL:-""} - DRUPAL_ROUTES: "https://varnish-${DRUPAL_HOSTNAME},https://helfi-proxy.docker.so,http://${COMPOSE_PROJECT_NAME}-varnish" + DRUPAL_ROUTES: "https://varnish-${DRUPAL_HOSTNAME},https://helfi-proxy.docker.so,http://${COMPOSE_PROJECT_NAME}-varnish,http://${COMPOSE_PROJECT_NAME}" DRUPAL_REVERSE_PROXY_ADDRESS: helfi-proxy.docker.so DRUSH_OPTIONS_URI: "https://${DRUPAL_HOSTNAME}" # To enable xdebug, run `export XDEBUG_ENABLE=true` before (re)starting your project. diff --git a/docker/openshift/crons/linked-events.sh b/docker/openshift/crons/linked-events.sh new file mode 100644 index 00000000..4eecbdfb --- /dev/null +++ b/docker/openshift/crons/linked-events.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +while true +do + # Allow migrations to be run every 3 hours and reset stuck migrations every 12 hours. + drush migrate:import linked_events_keywords --interval 10800 --reset-threshold 43200 --no-progress + + # Sleep for 12 hours + sleep 86400 +done